Commit 8d7c4203 authored Oct 30, 2008 by J. Bruce Fields

nfsd: fix failure to set eof in readdir in some situations



Before 14f7dd63 "[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,
c002a6c7 "[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>

parent 0173a326

fs/nfsd/vfs.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message