From patchwork Mon Jan 28 19:41:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 2058101 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 B77273FD1A for ; Mon, 28 Jan 2013 19:47:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751166Ab3A1TrI (ORCPT ); Mon, 28 Jan 2013 14:47:08 -0500 Received: from mail-gg0-f172.google.com ([209.85.161.172]:45695 "EHLO mail-gg0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906Ab3A1TrH (ORCPT ); Mon, 28 Jan 2013 14:47:07 -0500 Received: by mail-gg0-f172.google.com with SMTP id f4so468111ggn.17 for ; Mon, 28 Jan 2013 11:47:07 -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=3B1uDvlrFhTfG6/w4ZEIr4TWVNMHwDw9lc7PJemu5ck=; b=BK3HjwYpizGp8Q8vw+wEa9iCZqnpkrcz0uwm8h5j4nLymFW5ikJ+2Pwc1MGX+7EtAb 4zNQ+yzudMJqYCCHnbUGwtf3V+nCLP9K+jNhnuGVvX3u51NPsX+oSZ2yZ0PLfiwH4V9Y usAwc23LeRwJOwOMogiWh7mm9a/6sJdjJGyFpw+Q+oSG+hZPGYOtu0cWxCyiQnhGsYMR 3ixd6oRhCvE4LiLTbP+ZI4AxgtEiiREPv9ldpj6Anno/jpjvxSu9kbuI0eOzHmpiAij2 VChH6yagALh+x6zjc9Fw/39RmXkT6zYg/MtlTzYb4Csc1EfQeC4fsGincfUZCxUC1k8M JDKQ== X-Received: by 10.236.75.200 with SMTP id z48mr16590929yhd.41.1359402109277; Mon, 28 Jan 2013 11:41:49 -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 i24sm9712873ann.16.2013.01.28.11.41.46 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Jan 2013 11:41:47 -0800 (PST) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 06/16] nfsd: remove redundant test from nfsd_reply_cache_free Date: Mon, 28 Jan 2013 14:41:12 -0500 Message-Id: <1359402082-29195-7-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1359402082-29195-1-git-send-email-jlayton@redhat.com> References: <1359402082-29195-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQmhSaD0mv7hlyfZvGbiY2yYEuJtljPIP5Wv0jK8eJMw66mziw+YZVZHush5tjMJUryI8XNp Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Entries can only get a c_type of RC_REPLBUFF iff they are RC_DONE. Therefore the test for RC_DONE isn't necessary here. Signed-off-by: Jeff Layton --- fs/nfsd/nfscache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 363bc61..2cdc4be 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -65,7 +65,7 @@ nfsd_reply_cache_alloc(void) static void nfsd_reply_cache_free_locked(struct svc_cacherep *rp) { - if (rp->c_state == RC_DONE && rp->c_type == RC_REPLBUFF) + if (rp->c_type == RC_REPLBUFF) kfree(rp->c_replvec.iov_base); list_del(&rp->c_lru); kmem_cache_free(drc_slab, rp);