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

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

NFS: define a function to update nfsi->cache_change_attribute 



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

fs/nfs/dir.c

+15 −0
Original line number Diff line number Diff line
@@ -638,6 +638,21 @@ static int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync) 
	return 0;

}



/**

 * nfs_force_lookup_revalidate - Mark the directory as having changed

 * @dir - pointer to directory inode

 *

 * This forces the revalidation code in nfs_lookup_revalidate() to do a

 * full lookup on all child dentries of 'dir' whenever a change occurs

 * on the server that might have invalidated our dcache.

 *

 * The caller should be holding dir->i_lock

 */

void nfs_force_lookup_revalidate(struct inode *dir)

{

	NFS_I(dir)->cache_change_attribute = jiffies;

}



/*

 * A check for whether or not the parent directory has changed.

 * In the case it has, we assume that the dentries are untrustworthy

fs/nfs/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -1029,7 +1029,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			dprintk("NFS: mtime change on server for file %s/%ld\n",

					inode->i_sb->s_id, inode->i_ino);

			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;

			nfsi->cache_change_attribute = now;

			if (S_ISDIR(inode->i_mode))

				nfs_force_lookup_revalidate(inode);

		}

		/* If ctime has changed we should definitely clear access+acl caches */

		if (!timespec_equal(&inode->i_ctime, &fattr->ctime))
@@ -1038,7 +1039,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
		dprintk("NFS: change_attr change on server for file %s/%ld\n",

				inode->i_sb->s_id, inode->i_ino);

		invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;

		nfsi->cache_change_attribute = now;

		if (S_ISDIR(inode->i_mode))

			nfs_force_lookup_revalidate(inode);

	}



	/* Check if our cached file size is stale */

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo) 
	spin_lock(&dir->i_lock);

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

	if (!cinfo->atomic || cinfo->before != nfsi->change_attr)

		nfsi->cache_change_attribute = jiffies;

		nfs_force_lookup_revalidate(dir);

	nfsi->change_attr = cinfo->after;

	spin_unlock(&dir->i_lock);

}

include/linux/nfs_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ extern const struct inode_operations nfs3_dir_inode_operations; 
extern const struct file_operations nfs_dir_operations;

extern struct dentry_operations nfs_dentry_operations;



extern void nfs_force_lookup_revalidate(struct inode *dir);

extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, struct nfs_fattr *fattr);

extern int nfs_may_open(struct inode *inode, struct rpc_cred *cred, int openflags);

extern void nfs_access_zap_cache(struct inode *inode);