nfsd: fix failure to set eof in readdir in some situations
Before14f7dd6320
"[PATCH] Copy XFS readdir hack into nfsd code", readdir_cd->err was reset to eof before each call to vfs_readdir; afterwards, it is set only once. Similarly,c002a6c797
"[PATCH] Optimise NFS readdir hack slightly", can cause us to exit without nfserr_eof set. Fix this. This ensures the "eof" bit is set when needed in readdir replies. (The particular case I saw was an nfsv4 readdir of an empty directory, which returned with no entries (the protocol requires "." and ".." to be filtered out), but with eof unset.) Cc: David Woodhouse <David.Woodhouse@intel.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
0173a3265b
commit
8d7c4203c6
|
@ -1912,6 +1912,7 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func,
|
|||
de = (struct buffered_dirent *)((char *)de + reclen);
|
||||
}
|
||||
offset = vfs_llseek(file, 0, SEEK_CUR);
|
||||
cdp->err = nfserr_eof;
|
||||
if (!buf.full)
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue