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

Commit a1643a92 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: NFS_CACHEINV() should not test for nfs_caches_unstable() 



The fact that we're in the process of modifying the inode does not mean
that we should not invalidate the attribute and data caches. The defensive
thing is to always invalidate when we're confronted with inode
mtime/ctime or change_attribute updates that we do not immediately
recognise.

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

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd) 
out_zap_parent:

	nfs_zap_caches(dir);

 out_bad:

	NFS_CACHEINV(dir);

	nfs_mark_for_revalidate(dir);

	if (inode && S_ISDIR(inode->i_mode)) {

		/* Purge readdir caches. */

		nfs_zap_caches(inode);

include/linux/nfs_fs.h

+0 −6
Original line number Diff line number Diff line
@@ -240,12 +240,6 @@ static inline void nfs_mark_for_revalidate(struct inode *inode) 
	spin_unlock(&inode->i_lock);

}



static inline void NFS_CACHEINV(struct inode *inode)

{

	if (!nfs_caches_unstable(inode))

		nfs_mark_for_revalidate(inode);

}



static inline int nfs_server_capable(struct inode *inode, int cap)

{

	return NFS_SERVER(inode)->caps & cap;