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

Commit c812012f authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

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: default avatarSteve French <steve.french@primarydata.com>
Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 616c3196

fs/nfs/inode.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -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)

		if ((long)fattr->gencount - (long)nfsi->attr_gencount > 0)

			nfsi->attr_gencount = fattr->gencount;

			nfsi->attr_gencount = fattr->gencount;

	}

	}



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

	if (fattr->valid != 0)

		invalid &= ~NFS_INO_INVALID_ATTR;

		invalid &= ~NFS_INO_INVALID_ATTR;



	/* Don't invalidate the data if we were to blame */

	/* Don't invalidate the data if we were to blame */

	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)

	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)

				|| S_ISLNK(inode->i_mode)))

				|| S_ISLNK(inode->i_mode)))