Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / nfsd / nfscache.c

diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index ca43664..62c1ee1 100644 (file)
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -281,7 +281,6 @@ static struct svc_cacherep *
 nfsd_cache_search(struct svc_rqst *rqstp, __wsum csum)
 {
        struct svc_cacherep     *rp;
-       struct hlist_node       *hn;
        struct hlist_head       *rh;
        __be32                  xid = rqstp->rq_xid;
        u32                     proto =  rqstp->rq_prot,
@@ -289,7 +288,7 @@ nfsd_cache_search(struct svc_rqst *rqstp, __wsum csum)
                                proc = rqstp->rq_proc;
 
        rh = &cache_hash[request_hash(xid)];
-       hlist_for_each_entry(rp, hn, rh, c_hash) {
+       hlist_for_each_entry(rp, rh, c_hash) {
                if (xid == rp->c_xid && proc == rp->c_proc &&
                    proto == rp->c_prot && vers == rp->c_vers &&
                    rqstp->rq_arg.len == rp->c_len && csum == rp->c_csum &&