Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nfsd-6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever:
- Fix a v6.12-rc regression when exporting ext4 filesystems with NFSD
* tag 'nfsd-6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
NFSD: Fix READDIR on NFSv3 mounts of ext4 exports
+5
-8
+5
-8
fs/nfsd/vfs.c
+5
-8
fs/nfsd/vfs.c
···
903
903
goto out;
904
904
}
905
905
906
-
if (may_flags & NFSD_MAY_64BIT_COOKIE)
907
-
file->f_mode |= FMODE_64BITHASH;
908
-
else
909
-
file->f_mode |= FMODE_32BITHASH;
910
-
911
906
*filp = file;
912
907
out:
913
908
return host_err;
···
2169
2174
loff_t offset = *offsetp;
2170
2175
int may_flags = NFSD_MAY_READ;
2171
2176
2172
-
if (fhp->fh_64bit_cookies)
2173
-
may_flags |= NFSD_MAY_64BIT_COOKIE;
2174
-
2175
2177
err = nfsd_open(rqstp, fhp, S_IFDIR, may_flags, &file);
2176
2178
if (err)
2177
2179
goto out;
2180
+
2181
+
if (fhp->fh_64bit_cookies)
2182
+
file->f_mode |= FMODE_64BITHASH;
2183
+
else
2184
+
file->f_mode |= FMODE_32BITHASH;
2178
2185
2179
2186
offset = vfs_llseek(file, offset, SEEK_SET);
2180
2187
if (offset < 0) {