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

Commit 27dc1cd3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: nfs_wcc_update_inode() should set nfsi->attr_gencount 



If the call to nfs_wcc_update_inode() results in an attribute update, we
need to ensure that the inode's attr_gencount gets bumped too, otherwise
we are not protected against races with other GETATTR calls.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b2a2897d

fs/nfs/inode.c

+17 −9
Original line number Diff line number Diff line
@@ -881,9 +881,10 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping) 
	return ret;

}



static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)

static unsigned long nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	unsigned long ret = 0;



	if ((fattr->valid & NFS_ATTR_FATTR_PRECHANGE)

			&& (fattr->valid & NFS_ATTR_FATTR_CHANGE)
@@ -891,12 +892,15 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
		nfsi->change_attr = fattr->change_attr;

		if (S_ISDIR(inode->i_mode))

			nfsi->cache_validity |= NFS_INO_INVALID_DATA;

		ret |= NFS_INO_INVALID_ATTR;

	}

	/* If we have atomic WCC data, we may update some attributes */

	if ((fattr->valid & NFS_ATTR_FATTR_PRECTIME)

			&& (fattr->valid & NFS_ATTR_FATTR_CTIME)

			&& timespec_equal(&inode->i_ctime, &fattr->pre_ctime))

			&& timespec_equal(&inode->i_ctime, &fattr->pre_ctime)) {

		memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));

		ret |= NFS_INO_INVALID_ATTR;

	}



	if ((fattr->valid & NFS_ATTR_FATTR_PREMTIME)

			&& (fattr->valid & NFS_ATTR_FATTR_MTIME)
@@ -904,12 +908,16 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
		memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime));

		if (S_ISDIR(inode->i_mode))

			nfsi->cache_validity |= NFS_INO_INVALID_DATA;

		ret |= NFS_INO_INVALID_ATTR;

	}

	if ((fattr->valid & NFS_ATTR_FATTR_PRESIZE)

			&& (fattr->valid & NFS_ATTR_FATTR_SIZE)

			&& i_size_read(inode) == nfs_size_to_loff_t(fattr->pre_size)

			&& nfsi->npages == 0)

			&& nfsi->npages == 0) {

		i_size_write(inode, nfs_size_to_loff_t(fattr->size));

		ret |= NFS_INO_INVALID_ATTR;

	}

	return ret;

}



/**
@@ -1223,7 +1231,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			| NFS_INO_REVAL_PAGECACHE);



	/* Do atomic weak cache consistency updates */

	nfs_wcc_update_inode(inode, fattr);

	invalid |= nfs_wcc_update_inode(inode, fattr);



	/* More cache consistency checks */

	if (fattr->valid & NFS_ATTR_FATTR_CHANGE) {