Commit 10b7e9ad authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS: Don't mark the inode as revalidated if a LAYOUTCOMMIT is outstanding 



We know that the attributes will need updating if there is still a
LAYOUTCOMMIT outstanding.

Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 8b7d9d09

fs/nfs/inode.c

+4 −1
Original line number Diff line number Diff line
@@ -1664,7 +1664,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	unsigned long now = jiffies;

	unsigned long save_cache_validity;

	bool have_writers = nfs_file_has_buffered_writers(nfsi);

	bool cache_revalidated = true;

	bool cache_revalidated;



	dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",

			__func__, inode->i_sb->s_id, inode->i_ino,
@@ -1713,6 +1713,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	/* Do atomic weak cache consistency updates */

	invalid |= nfs_wcc_update_inode(inode, fattr);





	cache_revalidated = !pnfs_layoutcommit_outstanding(inode);



	/* More cache consistency checks */

	if (fattr->valid & NFS_ATTR_FATTR_CHANGE) {

		if (inode->i_version != fattr->change_attr) {

fs/nfs/pnfs.h

+7 −0
Original line number Diff line number Diff line
@@ -628,6 +628,13 @@ pnfs_sync_inode(struct inode *inode, bool datasync) 
	return 0;

}



static inline bool

pnfs_layoutcommit_outstanding(struct inode *inode)

{

	return false;

}





static inline bool

pnfs_roc(struct inode *ino)

{