diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-23 18:51:32 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-03-01 23:23:07 -0500 |
| commit | fa9233699cc1dc236f4cf42245d13e40966938c5 (patch) | |
| tree | 26928a81290415cc0a8db037664da087963965d8 /fs | |
| parent | 1ae04b252351188cfa66af1b8b0628512a72dd7b (diff) | |
NFS: Don't require a filehandle to refresh the inode in nfs_prime_dcache()
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@primarydata.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/dir.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 4ad7fff9ccaf..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, | |||
| 408 | return 0; | 408 | return 0; |
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | /* Match file and dirent using either filehandle or fileid | ||
| 412 | * Note: caller is responsible for checking the fsid | ||
| 413 | */ | ||
| 411 | static | 414 | static |
| 412 | int nfs_same_file(struct dentry *dentry, struct nfs_entry *entry) | 415 | int nfs_same_file(struct dentry *dentry, struct nfs_entry *entry) |
| 413 | { | 416 | { |
| 417 | struct nfs_inode *nfsi; | ||
| 418 | |||
| 414 | if (dentry->d_inode == NULL) | 419 | if (dentry->d_inode == NULL) |
| 415 | goto different; | 420 | goto different; |
| 416 | if (nfs_compare_fh(entry->fh, NFS_FH(dentry->d_inode)) != 0) | 421 | |
| 417 | goto different; | 422 | nfsi = NFS_I(dentry->d_inode); |
| 418 | return 1; | 423 | if (entry->fattr->fileid == nfsi->fileid) |
| 424 | return 1; | ||
| 425 | if (nfs_compare_fh(entry->fh, &nfsi->fh) == 0) | ||
| 426 | return 1; | ||
| 419 | different: | 427 | different: |
| 420 | return 0; | 428 | return 0; |
| 421 | } | 429 | } |
| @@ -469,6 +477,8 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry) | |||
| 469 | struct inode *inode; | 477 | struct inode *inode; |
| 470 | int status; | 478 | int status; |
| 471 | 479 | ||
| 480 | if (!(entry->fattr->valid & NFS_ATTR_FATTR_FILEID)) | ||
| 481 | return; | ||
| 472 | if (!(entry->fattr->valid & NFS_ATTR_FATTR_FSID)) | 482 | if (!(entry->fattr->valid & NFS_ATTR_FATTR_FSID)) |
| 473 | return; | 483 | return; |
| 474 | if (filename.name[0] == '.') { | 484 | if (filename.name[0] == '.') { |