From: Jeff Layton Date: Wed, 25 Nov 2015 18:50:11 +0000 (-0500) Subject: nfs: if we have no valid attrs, then don't declare the attribute cache valid X-Git-Tag: v3.16.35~869 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=850c33c963e2d85d3b007b3bfbbbd1f914a26429;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust [ luis: backported to 3.16: adjusted context ] Signed-off-by: Luis Henriques --- diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index fa8d1b632d493..3a8c1a7d5bc64 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1704,7 +1704,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)))