diff options
| author | Jeff Layton <jlayton@poochiereds.net> | 2015-11-25 13:50:11 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-11-25 15:31:49 -0500 |
| commit | c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85 (patch) | |
| tree | 3227d80014fadef23401c3a58b658c3a4b1ad1f1 /fs/nfs/inode.c | |
| parent | 616c319683e34d10952b74a73ee12e080531b476 (diff) | |
| download | linux-c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85.tar.gz linux-c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85.tar.bz2 linux-c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85.zip | |
nfs: if we have no valid attrs, then don't declare the attribute cache valid
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>
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/inode.c')
| -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 eda3da3f3a7b..31b0a52223a7 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1827,7 +1827,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) if ((long)fattr->gencount - (long)nfsi->attr_gencount > 0) nfsi->attr_gencount = fattr->gencount; } - 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))) |