Re: 2.6.28-rc3 truncates nfsd results

[David Woodhouse]

On Tue, 2008-11-04 at 13:43 -0500, Jeff Garzik wrote:
> I'll try reverting this and see if the behavior improves, thanks for the 
> pointer...

See attached...

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@xxxxxxxxx                              Intel Corporation
> --- Begin Message ---
> From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
>
> 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@xxxxxxxxx>
> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
> ---
>  fs/nfsd/vfs.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> I'm queuing this up for 2.6.28.--b.
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index 0bc56f6..848a03e 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -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;
>  	}
> -- 
> 1.5.5.rc1
>
>
> --- End Message ---