diff options
| author | Jeff Layton <jlayton@poochiereds.net> | 2015-11-25 21:50:11 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 18:15:33 +0300 |
| commit | 5cd25ba84bd375bb62ff8a8de68d3788591ecb6b (patch) | |
| tree | 9d151962deb5cf74b9119ceded7a1c03d85d97bd | |
| parent | a8d3a5b24da10c5d6b7c2bc2ee26def66f9f46ec (diff) | |
| download | linux-5cd25ba84bd375bb62ff8a8de68d3788591ecb6b.tar.xz | |
nfs: if we have no valid attrs, then don't declare the attribute cache valid
commit c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85 upstream.
If we pass in an empty nfs_fattr struct to nfs_update_inode, it will
(correctly) not update any of the attributes, but it then clears the
NFS_INO_INVALID_ATTR flag, which indicates that the attributes are
up to date. Don't clear the flag if the fattr struct has no valid
attrs to apply.
Reviewed-by: Steve French <steve.french@primarydata.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | fs/nfs/inode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a6d59054e8b3..bf980b5821cc 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1458,7 +1458,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) nfsi->attrtimeo_timestamp = now; } } - invalid &= ~NFS_INO_INVALID_ATTR; + + /* Don't declare attrcache up to date if there were no attrs! */ + if (fattr->valid != 0) + invalid &= ~NFS_INO_INVALID_ATTR; + /* Don't invalidate the data if we were to blame */ if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))) |