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

Commit 03c6f7d6 authored by NeilBrown's avatar NeilBrown Committed by Trond Myklebust
Browse files

NFS: remove jiffies field from access cache 



This field hasn't been used since commit 57b69181 ("NFS: Cache
access checks more aggressively").

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 779eafab

fs/nfs/dir.c

+0 −4
Original line number Diff line number Diff line
@@ -2260,7 +2260,6 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str 
		spin_lock(&inode->i_lock);

		retry = false;

	}

	res->jiffies = cache->jiffies;

	res->cred = cache->cred;

	res->mask = cache->mask;

	list_move_tail(&cache->lru, &nfsi->access_cache_entry_lru);
@@ -2296,7 +2295,6 @@ static int nfs_access_get_cached_rcu(struct inode *inode, struct rpc_cred *cred, 
		goto out;

	if (nfs_check_cache_invalid(inode, NFS_INO_INVALID_ACCESS))

		goto out;

	res->jiffies = cache->jiffies;

	res->cred = cache->cred;

	res->mask = cache->mask;

	err = 0;
@@ -2344,7 +2342,6 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set) 
	if (cache == NULL)

		return;

	RB_CLEAR_NODE(&cache->rb_node);

	cache->jiffies = set->jiffies;

	cache->cred = get_rpccred(set->cred);

	cache->mask = set->mask;
@@ -2432,7 +2429,6 @@ static int nfs_do_access(struct inode *inode, struct rpc_cred *cred, int mask) 
	cache.mask = NFS_MAY_LOOKUP | NFS_MAY_EXECUTE

		     | NFS_MAY_WRITE | NFS_MAY_READ;

	cache.cred = cred;

	cache.jiffies = jiffies;

	status = NFS_PROTO(inode)->access(inode, &cache);

	if (status != 0) {

		if (status == -ESTALE) {

fs/nfs/nfs4proc.c

+0 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,6 @@ static int nfs4_opendata_access(struct rpc_cred *cred, 
		mask = NFS4_ACCESS_READ;



	cache.cred = cred;

	cache.jiffies = jiffies;

	nfs_access_set_mask(&cache, opendata->o_res.access_result);

	nfs_access_add_cache(state->inode, &cache);

include/linux/nfs_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
struct nfs_access_entry {

	struct rb_node		rb_node;

	struct list_head	lru;

	unsigned long		jiffies;

	struct rpc_cred *	cred;

	__u32			mask;

	struct rcu_head		rcu_head;