forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
...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: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton 2013-02-04 08:18:00 -05:00 • committed by J. Bruce Fields
parent 2eeb9b2abc
commit 56c2548b2d
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/nfsd/nfscache.c
View file

@ -129,6 +129,7 @@ void nfsd_reply_cache_shutdown(void)
static void static void
lru_put_end(struct svc_cacherep *rp) lru_put_end(struct svc_cacherep *rp)
{ {
rp->c_timestamp = jiffies;
list_move_tail(&rp->c_lru, &lru_head); 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))); rpc_set_port((struct sockaddr *)&rp->c_addr, rpc_get_port(svc_addr(rqstp)));
rp->c_prot = proto; rp->c_prot = proto;
rp->c_vers = vers; rp->c_vers = vers;
rp->c_timestamp = jiffies;
hash_refile(rp); hash_refile(rp);
lru_put_end(rp);
/* release any buffer */ /* release any buffer */
if (rp->c_type == RC_REPLBUFF) { if (rp->c_type == RC_REPLBUFF) {
@ -262,7 +263,6 @@ nfsd_cache_lookup(struct svc_rqst *rqstp)
found_entry: found_entry:
/* We found a matching entry which is either in progress or done. */ /* We found a matching entry which is either in progress or done. */
age = jiffies - rp->c_timestamp; age = jiffies - rp->c_timestamp;
rp->c_timestamp = jiffies;
lru_put_end(rp); lru_put_end(rp);
rtn = RC_DROPIT; 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_secure = rqstp->rq_secure;
rp->c_type = cachetype; rp->c_type = cachetype;
rp->c_state = RC_DONE; rp->c_state = RC_DONE;
rp->c_timestamp = jiffies;
spin_unlock(&cache_lock); spin_unlock(&cache_lock);
return; return;
} }