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

Commit 51e2e084 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFS: Fix up handling of outstanding layoutcommit in nfs_update_inode() 



[ Upstream commit 709fa5769914b377af87962bbe4ff81ffb019b2d ]

If there is an outstanding layoutcommit, then the list of attributes
whose values are expected to change is not the full set. So let's
be explicit about the full list.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Stable-dep-of: b01f21cacde9 ("NFS: Fix the setting of capabilities when automounting a new filesystem")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46c44bb4

fs/nfs/inode.c

+5 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	nfs_wcc_update_inode(inode, fattr);



	if (pnfs_layoutcommit_outstanding(inode)) {

		nfsi->cache_validity |= save_cache_validity & NFS_INO_INVALID_ATTR;

		nfsi->cache_validity |=

			save_cache_validity &

			(NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_CTIME |

			 NFS_INO_INVALID_MTIME | NFS_INO_INVALID_SIZE |

			 NFS_INO_REVAL_FORCED);

		cache_revalidated = false;

	}