]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
nfsd: fix failure to set eof in readdir in some situations
authorJ. Bruce Fields <bfields@citi.umich.edu>
Thu, 30 Oct 2008 17:48:33 +0000 (13:48 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Thu, 30 Oct 2008 21:16:49 +0000 (17:16 -0400)
commit8d7c4203c681a3ec359eccff4e53bc8c0ccf403b
tree78c848023b6fbefcd387602529c6e87039f4946e
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92
nfsd: fix failure to set eof in readdir in some situations

Before 14f7dd632011bb89c035722edd6ea0d90ca6b078 "[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,
c002a6c7977320f95b5edede5ce4e0eeecf291ff "[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>
fs/nfsd/vfs.c