From patchwork Mon Feb 4 13:18:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 2091841 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 729B53FD56 for ; Mon, 4 Feb 2013 13:18:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755176Ab3BDNSV (ORCPT ); Mon, 4 Feb 2013 08:18:21 -0500 Received: from mail-gh0-f169.google.com ([209.85.160.169]:53129 "EHLO mail-gh0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754819Ab3BDNSV (ORCPT ); Mon, 4 Feb 2013 08:18:21 -0500 Received: by mail-gh0-f169.google.com with SMTP id r18so1513690ghr.14 for ; Mon, 04 Feb 2013 05:18:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=mBda/yMWFyqNLm8+D5p30OTB0nbqe64JsxfasuMZ6og=; b=BzyZyT+39WMx7f0RlUr51//3oBQYaCtS2ID0fD73bCRLwv87H1MnOT1elATy2Qe1U7 QN/h2nIuEb1X8IPdfUJ0aps8wOKoh7Q7vgDJk9xi9QRAm9FjuZKwihYpkseLjnVjdid6 6fT/Fc+kxzfxXjDrtya8hqCckKflBHdMe81vftXeOxPnwKbt3cs4d8VJeIjrCwf5SlTm NKWV3ZxUpNVDBJSIXt3L77cJYjpJ369Selu+8KzqI4wLYJLyafAeAsR7fG+S30Pz58Y2 wYHa5J6ZIUOwPq1B5A4KX9u0GvXvvKzBWADzeD8t1eZkcTOeTxrhOcrf8bOS/ulm/tzI PcFQ== X-Received: by 10.236.118.178 with SMTP id l38mr18102588yhh.31.1359983900437; Mon, 04 Feb 2013 05:18:20 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-113-143.nc.res.rr.com. [107.15.113.143]) by mx.google.com with ESMTPS id d80sm980595yhg.4.2013.02.04.05.18.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Feb 2013 05:18:19 -0800 (PST) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 4/8] nfsd: remove the cache_disabled flag Date: Mon, 4 Feb 2013 08:18:03 -0500 Message-Id: <1359983887-28535-5-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1359983887-28535-1-git-send-email-jlayton@redhat.com> References: <1359983887-28535-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQlWebmYlTpV5sCmWJh6oXfTs9oaes0eFYYa93Q67e31NtZQ2Bzvd9sNNYl49ywYAIQB8mxB Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org With the change to dynamically allocate entries, the cache is never disabled on the fly. Remove this flag. Signed-off-by: Jeff Layton --- fs/nfsd/nfscache.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index d213e6e..69d29d4 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -21,7 +21,6 @@ static struct hlist_head * cache_hash; static struct list_head lru_head; -static int cache_disabled = 1; static struct kmem_cache *drc_slab; static unsigned int num_drc_entries; static unsigned int max_drc_entries; @@ -113,7 +112,6 @@ int nfsd_reply_cache_init(void) INIT_LIST_HEAD(&lru_head); max_drc_entries = nfsd_cache_size_limit(); num_drc_entries = 0; - cache_disabled = 0; return 0; out_nomem: printk(KERN_ERR "nfsd: failed to allocate reply cache\n"); @@ -130,8 +128,6 @@ void nfsd_reply_cache_shutdown(void) nfsd_reply_cache_free_locked(rp); } - cache_disabled = 1; - kfree (cache_hash); cache_hash = NULL; @@ -215,7 +211,7 @@ nfsd_cache_lookup(struct svc_rqst *rqstp) int rtn; rqstp->rq_cacherep = NULL; - if (cache_disabled || type == RC_NOCACHE) { + if (type == RC_NOCACHE) { nfsdstats.rcnocache++; return RC_DOIT; } @@ -345,11 +341,11 @@ found_entry: void nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp) { - struct svc_cacherep *rp; + struct svc_cacherep *rp = rqstp->rq_cacherep; struct kvec *resv = &rqstp->rq_res.head[0], *cachv; int len; - if (!(rp = rqstp->rq_cacherep) || cache_disabled) + if (!rp) return; len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);