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

Commit 56c2548b authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: always move DRC entries to the end of LRU list when updating timestamp 



...otherwise, we end up with the list ordering wrong. Currently, it's
not a problem since we skip RC_INPROG entries, but keeping the ordering
strict will be necessary for a later patch that adds a cache cleaner.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 2eeb9b2a

fs/nfsd/nfscache.c

+2 −3
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ void nfsd_reply_cache_shutdown(void) 
static void

lru_put_end(struct svc_cacherep *rp)

{

	rp->c_timestamp = jiffies;

	list_move_tail(&rp->c_lru, &lru_head);

}
@@ -245,9 +246,9 @@ nfsd_cache_lookup(struct svc_rqst *rqstp) 
	rpc_set_port((struct sockaddr *)&rp->c_addr, rpc_get_port(svc_addr(rqstp)));

	rp->c_prot = proto;

	rp->c_vers = vers;

	rp->c_timestamp = jiffies;



	hash_refile(rp);

	lru_put_end(rp);



	/* release any buffer */

	if (rp->c_type == RC_REPLBUFF) {
@@ -262,7 +263,6 @@ nfsd_cache_lookup(struct svc_rqst *rqstp) 
found_entry:

	/* We found a matching entry which is either in progress or done. */

	age = jiffies - rp->c_timestamp;

	rp->c_timestamp = jiffies;

	lru_put_end(rp);



	rtn = RC_DROPIT;
@@ -354,7 +354,6 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp) 
	rp->c_secure = rqstp->rq_secure;

	rp->c_type = cachetype;

	rp->c_state = RC_DONE;

	rp->c_timestamp = jiffies;

	spin_unlock(&cache_lock);

	return;

}