On Sat, Nov 27, 2010 at 01:24:00PM -0500, Trond Myklebust wrote:
> On Sat, 2010-11-27 at 02:27 -0800, Simon Kirby wrote:
> > Ok, so I tracked them down, and they didn't seem to be particularly
> > unusual, so I tried a not-particularly-unusual thing that I figured might
> > work, and reproduced it:
> >
> > server: echo test > a
> > client: ls -l
> > server: echo test > b ; mv b a
> > client: ls -l
> >
> > That's it. The kernel (2.6.37-rc3), on the final "ls -l", says:
> >
> > [12814.611197] NFS: server 10.10.52.228 error: fileid changed
> > [12814.611200] fsid 0:3f: expected fileid 0x122efbf1, got 0x122efc15
> >
> > "ls -li" shows the inode updated, so maybe this isn't even a bug?
>
> Ah! I think I see it now, and yes it is a bug...
>
> Does the following patch fix it?
Indeed, it does! I verified that I can reproduce it on 2.6.37-rc3
without this patch, and I can no longer reproduce it with this patch.
Thanks muchly!
Tested-by: Simon Kirby <sim@xxxxxxxxxx>
Simon-
> Cheers
> Trond
> -------------------------------------------------------------------------------------
> NFS: Fix a readdirplus bug
> From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
>
> When comparing filehandles in the helper nfs_same_file(), we should not be
> using 'strncmp()': filehandles are not null terminated strings.
>
> Instead, we should just use the existing helper nfs_compare_fh().
>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
> ---
>
> fs/nfs/dir.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
>
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index 8ea4a41..f0a384e 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -395,13 +395,9 @@ int xdr_decode(nfs_readdir_descriptor_t *desc, struct nfs_entry *entry, struct x
> static
> int nfs_same_file(struct dentry *dentry, struct nfs_entry *entry)
> {
> - struct nfs_inode *node;
> if (dentry->d_inode == NULL)
> goto different;
> - node = NFS_I(dentry->d_inode);
> - if (node->fh.size != entry->fh->size)
> - goto different;
> - if (strncmp(node->fh.data, entry->fh->data, node->fh.size) != 0)
> + if (nfs_compare_fh(entry->fh, NFS_FH(dentry->d_inode)) != 0)
> goto different;
> return 1;
> different:
>
>
> --
> Trond Myklebust
> Linux NFS client maintainer
>
> NetApp
> Trond.Myklebust@xxxxxxxxxx
> www.netapp.com
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
