Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac88f94 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Don't force unnecessary cache invalidation in nfs_update_inode() 



If we managed to revalidate all the attributes, then there is no reason
to mark them as invalid again. We do, however want to ensure that we
set nfsi->attrtimeo correctly.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 783b194c

fs/nfs/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -1799,6 +1799,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
					| NFS_INO_INVALID_DATA

					| NFS_INO_INVALID_ACCESS

					| NFS_INO_INVALID_ACL;

				/* Force revalidate of all attributes */

				save_cache_validity |= NFS_INO_INVALID_ATTR;

				if (S_ISDIR(inode->i_mode))

					nfs_force_lookup_revalidate(inode);

			}
@@ -1937,6 +1939,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 


	/* Update attrtimeo value if we're out of the unstable period */

	if (invalid & NFS_INO_INVALID_ATTR) {

		invalid &= ~NFS_INO_INVALID_ATTR;

		nfs_inc_stats(inode, NFSIOS_ATTRINVALIDATE);

		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);

		nfsi->attrtimeo_timestamp = now;
@@ -1957,10 +1960,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			nfsi->attr_gencount = fattr->gencount;

	}



	/* Don't declare attrcache up to date if there were no attrs! */

	if (cache_revalidated)

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