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

Commit 38478b24 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: More page cache revalidation fixups 



Whenever the directory changes, we want to make sure that we always
invalidate its page cache. Fix up update_changeattr() and
nfs_mark_for_revalidate() so that they do so.

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

fs/nfs/nfs4proc.c

+5 −5
Original line number Diff line number Diff line
@@ -185,15 +185,15 @@ static void renew_lease(const struct nfs_server *server, unsigned long timestamp 
	spin_unlock(&clp->cl_lock);

}



static void update_changeattr(struct inode *inode, struct nfs4_change_info *cinfo)

static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	struct nfs_inode *nfsi = NFS_I(dir);



	spin_lock(&inode->i_lock);

	nfsi->cache_validity |= NFS_INO_INVALID_ATTR;

	spin_lock(&dir->i_lock);

	nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;

	if (cinfo->before == nfsi->change_attr && cinfo->atomic)

		nfsi->change_attr = cinfo->after;

	spin_unlock(&inode->i_lock);

	spin_unlock(&dir->i_lock);

}



struct nfs4_opendata {

include/linux/nfs_fs.h

+5 −1
Original line number Diff line number Diff line
@@ -234,8 +234,12 @@ static inline int nfs_caches_unstable(struct inode *inode) 


static inline void nfs_mark_for_revalidate(struct inode *inode)

{

	struct nfs_inode *nfsi = NFS_I(inode);



	spin_lock(&inode->i_lock);

	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;

	nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS;

	if (S_ISDIR(inode->i_mode))

		nfsi->cache_validity |= NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;

	spin_unlock(&inode->i_lock);

}