On Mon, 23 Feb 2015 19:14:57 -0500 Trond Myklebust
<trond.myklebust@xxxxxxxxxxxxxxx> wrote:
> If the server does not return a valid set of attributes that we can
> use to either create a file or refresh the inode, then there is no
> value in calling nfs_prime_dcache().
>
> However if we're just refreshing the inode using the attributes that
> the server returned, then it shouldn't matter whether or not we have
> a filehandle, as long as we check the fsid+fileid combination.
>
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> ---
> fs/nfs/dir.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index 0da617a61c0b..c19e16f0b2d0 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -408,14 +408,22 @@ static int xdr_decode(nfs_readdir_descriptor_t *desc,
> return 0;
> }
>
> +/* Match file and dirent using either filehandle or fileid
> + * Note: caller is responsible for checking the fsid
> + */
> static
> int nfs_same_file(struct dentry *dentry, struct nfs_entry *entry)
> {
> + struct nfs_inode *nfsi;
> +
> if (dentry->d_inode == NULL)
> goto different;
> - if (nfs_compare_fh(entry->fh, NFS_FH(dentry->d_inode)) != 0)
> - goto different;
> - return 1;
> +
> + nfsi = NFS_I(dentry->d_inode);
> + if (entry->fattr->fileid == nfsi->fileid)
> + return 1;
> + if (nfs_compare_fh(entry->fh, &nfsi->fh) == 0)
> + return 1;
> different:
> return 0;
> }
> @@ -469,6 +477,10 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
> struct inode *inode;
> int status;
>
> + if (!(entry->fattr->valid & NFS_ATTR_FATTR_FILEID))
> + return;
> + if (!(entry->fattr->valid & NFS_ATTR_FATTR_FSID))
> + return;
> if (filename.name[0] == '.') {
> if (filename.len == 1)
> return;
I believe this will fix the observed problem. This is partly because the
Linux NFSv3 server either returns both a filehandle and attributes, or
neither.
If a server happened to return postop attributes, but no filehandle, then the
"nfs_compare_fh()" would be a meaningless test.
I think you should abort nfs_prime_dcache if entry->fh->size is zero for
exactly the same reason that you abort if NFS_ATTR_FATTR_FSID is not set.
NeilBrown
Attachment:
pgpc8Vp15yY41.pgp
Description: OpenPGP digital signature
