From patchwork Sun Aug 3 17:06:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 4666071 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E10DBC033A for ; Sun, 3 Aug 2014 17:06:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14668201C7 for ; Sun, 3 Aug 2014 17:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EC1D201BF for ; Sun, 3 Aug 2014 17:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753106AbaHCRGL (ORCPT ); Sun, 3 Aug 2014 13:06:11 -0400 Received: from mail-qg0-f53.google.com ([209.85.192.53]:38910 "EHLO mail-qg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753101AbaHCRGK (ORCPT ); Sun, 3 Aug 2014 13:06:10 -0400 Received: by mail-qg0-f53.google.com with SMTP id q107so8021734qgd.12 for ; Sun, 03 Aug 2014 10:06:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IiojG/mfQJxIncJKb1vtPZm5PMq4//oxZflG40AKFm8=; b=mMmY35brRVDO28CuFe/pOhIsHfKn+0hQ99jwtIzx8SgwOmcSWiOrqQQMzCWCLyy+pR UaRmJ+ksRkxX4akAHLbuSDKuWBX4S7B1aXR1Bq2Xy/J4+hFoUhU1cCDa4AKGt5zW9Yak xKoVjZh4qpYZ84MkEO+i4PH4fBRiGc8h+x/Tc/K2/D//NU+1ZveHNXOZ78ykOLmlrVHY xolucLbEfLKyIA62hjxN4vkJN1qwNEy+NrX0IFknV8YW1tbM7gRPMF224qHaxdQWkKOp iDUWBVVokuW8ZblgtaNYkzZI1delEBlkEMWqZc56RAGWIhInNlBPCXoFppNPUfDBOrCr wPjg== X-Gm-Message-State: ALoCoQm4egZZc+AU2Lua0x0cSPOu17CMJff8KS4DEUe/TAKYJCZWA333JFvrpLPq3v2knFDkuxu5 X-Received: by 10.224.64.201 with SMTP id f9mr30336664qai.64.1407085569898; Sun, 03 Aug 2014 10:06:09 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-33-225-239.drr02.mskg.mi.frontiernet.net. [50.33.225.239]) by mx.google.com with ESMTPSA id g35sm16473060qgf.49.2014.08.03.10.06.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Aug 2014 10:06:09 -0700 (PDT) From: Trond Myklebust To: Bruce Fields Cc: linux-nfs@vger.kernel.org Subject: [PATCH 3/6] nfsd: Remove the cache_hash list Date: Sun, 3 Aug 2014 13:06:01 -0400 Message-Id: <1407085564-3227-4-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1407085564-3227-3-git-send-email-trond.myklebust@primarydata.com> References: <1407085564-3227-1-git-send-email-trond.myklebust@primarydata.com> <1407085564-3227-2-git-send-email-trond.myklebust@primarydata.com> <1407085564-3227-3-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that the lru list is per-bucket, we don't need a second list for searches. Signed-off-by: Trond Myklebust --- fs/nfsd/cache.h | 1 - fs/nfsd/nfscache.c | 19 ++----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/fs/nfsd/cache.h b/fs/nfsd/cache.h index b582f9ab6b2a..dd96a3830004 100644 --- a/fs/nfsd/cache.h +++ b/fs/nfsd/cache.h @@ -18,7 +18,6 @@ * is much larger than a sockaddr_in6. */ struct svc_cacherep { - struct hlist_node c_hash; struct list_head c_lru; unsigned char c_state, /* unused, inprog, done */ diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index a387d443641f..8abec475f80f 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -28,7 +28,6 @@ #define TARGET_BUCKET_SIZE 64 struct nfsd_drc_bucket { - struct hlist_head cache_hash; struct list_head lru_head; }; @@ -137,7 +136,6 @@ nfsd_reply_cache_alloc(void) rp->c_state = RC_UNUSED; rp->c_type = RC_NOCACHE; INIT_LIST_HEAD(&rp->c_lru); - INIT_HLIST_NODE(&rp->c_hash); } return rp; } @@ -149,8 +147,6 @@ nfsd_reply_cache_free_locked(struct svc_cacherep *rp) drc_mem_usage -= rp->c_replvec.iov_len; kfree(rp->c_replvec.iov_base); } - if (!hlist_unhashed(&rp->c_hash)) - hlist_del(&rp->c_hash); list_del(&rp->c_lru); --num_drc_entries; drc_mem_usage -= sizeof(*rp); @@ -233,16 +229,6 @@ lru_put_end(struct nfsd_drc_bucket *b, struct svc_cacherep *rp) schedule_delayed_work(&cache_cleaner, RC_EXPIRE); } -/* - * Move a cache entry from one hash list to another - */ -static void -hash_refile(struct nfsd_drc_bucket *b, struct svc_cacherep *rp) -{ - hlist_del(&rp->c_hash); - hlist_add_head(&rp->c_hash, &b->cache_hash); -} - static long prune_bucket(struct nfsd_drc_bucket *b) { @@ -386,10 +372,10 @@ nfsd_cache_search(struct nfsd_drc_bucket *b, struct svc_rqst *rqstp, __wsum csum) { struct svc_cacherep *rp, *ret = NULL; - struct hlist_head *rh = &b->cache_hash; + struct list_head *rh = &b->lru_head; unsigned int entries = 0; - hlist_for_each_entry(rp, rh, c_hash) { + list_for_each_entry(rp, rh, c_lru) { ++entries; if (nfsd_cache_match(rqstp, csum, rp)) { ret = rp; @@ -479,7 +465,6 @@ nfsd_cache_lookup(struct svc_rqst *rqstp) rp->c_len = rqstp->rq_arg.len; rp->c_csum = csum; - hash_refile(b, rp); lru_put_end(b, rp); /* release any buffer */