diff options
| author | Jeff Layton <jlayton@poochiereds.net> | 2015-11-25 13:50:11 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-01-21 11:23:29 -0500 |
| commit | 2de7d46289702bcc5727cb70857f8f6860c85ce8 (patch) | |
| tree | f3e66daca79fd48fc4c64f422c0aa51155a053d8 /fs/nfs | |
| parent | d48e82da8b064ed3ce8bfa2d8b17d8566e811f4f (diff) | |
nfs: if we have no valid attrs, then don't declare the attribute cache valid
[ Upstream commit c812012f9ca7cf89c9e1a1cd512e6c3b5be04b85 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs/nfs')
| -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 00689a8a85e4..d7cfc6e42b5e 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1717,7 +1717,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))) |