From patchwork Mon Oct 1 14:41:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10622275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC738175A for ; Mon, 1 Oct 2018 14:42:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B23FC28DDB for ; Mon, 1 Oct 2018 14:42:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6CDB29437; Mon, 1 Oct 2018 14:42:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CB3D28DDB for ; Mon, 1 Oct 2018 14:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729529AbeJAVUk (ORCPT ); Mon, 1 Oct 2018 17:20:40 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:54897 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729497AbeJAVUj (ORCPT ); Mon, 1 Oct 2018 17:20:39 -0400 Received: by mail-it1-f194.google.com with SMTP id l191-v6so6018553ita.4 for ; Mon, 01 Oct 2018 07:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Isqe5odlcymqI4ojIcRhZVq0alyinkP4/Aup/uBqLXM=; b=huSqVW2Vt5LJM8+Os/M0ceKhPQXo4W/MgMdXC/uH85LZbTCLl3Vv11jSG2sURZfZR5 PNKj37Pvb43/kZlgVk5xCkIJELn/HCf2iwbe/o+Gw1QidPWXZMvFvIBqvw3WOKv2qc4f RLalAoY5Ngt0r0Ks38aA11MIa/UNHyP9HHD96l5cTvlpQc7NJZbIf249FvQryQI1GsOi O2bDhki/5GjxC5QsQJJKrtrnzfavGlzHrrwpYyPr6ZYeuxCuzFBiRu8LZLmrlYpubyLP VvDG8MBdsQUmjjRAVG3h9HTNgnwQSVlYjnPBisM2WrYuL0fDB6gmrmFSdo02QFXwBO8C jLeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Isqe5odlcymqI4ojIcRhZVq0alyinkP4/Aup/uBqLXM=; b=PznQ6UT0X8vTLVI2I0jHXFPSOQII+1UTfOSdkKn+v86TQvRp3cg3ShPCul4vo/notJ NYkbClaSWH7ZhZq1w91b3CElocfHsBZ9EWwgNtKQ6o4gdhw7cxWprBZcODwjcCvZbac3 CuwhzMe7mRmjWxAAHOlH17twHgKAUhIfXyCwq6tCpEPR4eAVjVvDGeuKp9JbR5EzXtpP hd5ndC0eghCXHNl9EQFU72TDfB02rs0XSk5p33ftVDzOXsfrYfai4n4q2gp51YW6P6xi rWT3QIk3jUPflHDakXaDBXKBaG0XsbRLE+Tjaq/fsT0bBMBYQC4RdjjETxH+kWcQCMME y02A== X-Gm-Message-State: ABuFfohMwoGb8q9oQcHo6/x1B/aC7MiYyyxIDQRVxjrkr3d7AnrlAfxl BXCWiteldgF/GjHQEUB4fQ== X-Google-Smtp-Source: ACcGV60tWyaMlsjY9aWcUSRKYYd+AYKHmbBACdr6XbntQwXYfOMqGO8XspojYe6+NXVimUpXZq8L6g== X-Received: by 2002:a24:5e0a:: with SMTP id h10-v6mr10164732itb.43.1538404950272; Mon, 01 Oct 2018 07:42:30 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-40-195-73.hsd1.mi.comcast.net. [68.40.195.73]) by smtp.gmail.com with ESMTPSA id j75-v6sm2055597itj.33.2018.10.01.07.42.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Oct 2018 07:42:29 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: "J . Bruce Fields" Cc: linux-nfs@vger.kernel.org Subject: [PATCH 12/15] knfsd: Remove dead code from nfsd_cache_lookup Date: Mon, 1 Oct 2018 10:41:54 -0400 Message-Id: <20181001144157.3515-13-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181001144157.3515-12-trond.myklebust@hammerspace.com> References: <20181001144157.3515-1-trond.myklebust@hammerspace.com> <20181001144157.3515-2-trond.myklebust@hammerspace.com> <20181001144157.3515-3-trond.myklebust@hammerspace.com> <20181001144157.3515-4-trond.myklebust@hammerspace.com> <20181001144157.3515-5-trond.myklebust@hammerspace.com> <20181001144157.3515-6-trond.myklebust@hammerspace.com> <20181001144157.3515-7-trond.myklebust@hammerspace.com> <20181001144157.3515-8-trond.myklebust@hammerspace.com> <20181001144157.3515-9-trond.myklebust@hammerspace.com> <20181001144157.3515-10-trond.myklebust@hammerspace.com> <20181001144157.3515-11-trond.myklebust@hammerspace.com> <20181001144157.3515-12-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The preallocated cache entry is always set to type RC_NOCACHE, and that type isn't changed until we later call nfsd_cache_update(). Signed-off-by: Trond Myklebust --- fs/nfsd/nfscache.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index dbdeb9d6af03..cef4686f87ef 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -446,14 +446,6 @@ nfsd_cache_lookup(struct svc_rqst *rqstp) rp->c_csum = csum; lru_put_end(b, rp); - - /* release any buffer */ - if (rp->c_type == RC_REPLBUFF) { - drc_mem_usage -= rp->c_replvec.iov_len; - kfree(rp->c_replvec.iov_base); - rp->c_replvec.iov_base = NULL; - } - rp->c_type = RC_NOCACHE; out: spin_unlock(&b->cache_lock); return rtn;