Commit 2de7d462 authored Nov 25, 2015 by Jeff Layton Committed by Sasha Levin Jan 21, 2016

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>

parent d48e82da

fs/nfs/inode.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1717,7 +1717,11 @@ static int nfs_update_inode(struct inode inode, struct nfs_fattr fattr)
		nfsi->attrtimeo_timestamp = now;
		}
		}

		/* 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)))