2006-10-11 11:26:56

by Greg Banks

[permalink] [raw]
Subject: [PATCH 3/8] knfsd: repcache: inline hash_refile

knfsd: Explicitly inline the duplicate request cache's hash_refile()
function, it's only used in one place anyway.

Signed-off-by: Greg Banks <[email protected]>
---

fs/nfsd/nfscache.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)

Index: linux-git-20061009/fs/nfsd/nfscache.c
===================================================================
--- linux-git-20061009.orig/fs/nfsd/nfscache.c 2006-10-10 16:37:37.316411743 +1000
+++ linux-git-20061009/fs/nfsd/nfscache.c 2006-10-10 16:37:52.170497220 +1000
@@ -121,16 +121,6 @@ lru_put_end(struct svc_cacherep *rp)
}

/*
- * Move a cache entry from one hash list to another
- */
-static void
-hash_refile(struct svc_cacherep *rp)
-{
- hlist_del_init(&rp->c_hash);
- hlist_add_head(&rp->c_hash, hash_list + request_hash(rp->c_xid));
-}
-
-/*
* Try to find an entry matching the current call in the cache. When none
* is found, we grab the oldest unlocked entry off the LRU list.
* Note that no operation within the loop may sleep.
@@ -203,7 +193,9 @@ nfsd_cache_lookup(struct svc_rqst *rqstp
rp->c_vers = vers;
rp->c_timestamp = jiffies;

- hash_refile(rp);
+ /* Move the cache entry from one hash list to another */
+ hlist_del_init(&rp->c_hash);
+ hlist_add_head(&rp->c_hash, hash_list + request_hash(rp->c_xid));

/* release any buffer */
if (rp->c_type == RC_REPLBUFF) {

Greg.
--
Greg Banks, R&D Software Engineer, SGI Australian Software Group.
I don't speak for SGI.



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs