Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp449648pxb; Thu, 21 Jan 2021 10:53:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMxCLXRmhCc2/oscDYnoJ7ppyUeEVETpHorJ1qlmtwnq2Y4eGf5xBjybiAVPMdisARd3Er X-Received: by 2002:a50:fa86:: with SMTP id w6mr451250edr.98.1611255217175; Thu, 21 Jan 2021 10:53:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611255217; cv=none; d=google.com; s=arc-20160816; b=QnkGUBpD5zlue+X5YpWROxOA34OXxelGBY7hUG6j1paqzd07dMNaxIz/odCLhyPu1/ z1m8/JLwzAjv3D7xIHgYrCrTbnuoP8DzPNgzV/xVRr9VUCuVFk2hn6lzZPrFUeUNsrGZ XskZ7HDyb50Un0zSWAtv1KkWVl9k5MphoRwy//cI8jTvqe+CD6a3oyiApcYBJ54giWi6 4Tf4zW4zCGvvU/DjU56cvhFqlJb+ubwK7RfecAhmW1RM0wNAEm5lgFsq4BoBAGaLIfgi kLx2USRu3wLD2HCs91obhPAVja6pFxgdyXPXLTqoEVzblaRz35cG7vZ9Bc797v+z947j 2uZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-filter; bh=Qmy6anTEqzh0NzHKRhRrULL8aFaTUeT+LWOpPXq08og=; b=mFVDnDhirpW36K0tOWNL5P2oYN35m94BXQTuHeZYpjXTkj+3CFOgh2QHu7zeHIPUm0 G7T9sIJaTL3XR8gPZfH4IAhWhhot/9U/Pcy64gnXmR4Scf+GaStu+eANRs3z/XwiOpGd 1uaCvo2PQjrY2uE3p1OO/YxWfJejmh5p4+0h9pIN9dwwsWUd467OsXlME+Biexua6S9+ e4SzJTo1qv0mv4Q1x7KhDYEv2xl43G+OIEGXPckRBFjBlYqn7+xhgI0mOIfHfffofZxV ExAQmzXkf53ubWjzDG9nFbxGyvBUlwEXEOZ/dD3hoaTIxWtI0pDAE3PikGjCF7jVl8lQ DpzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dm10si1818392ejc.64.2021.01.21.10.53.05; Thu, 21 Jan 2021 10:53:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726411AbhAUSwI (ORCPT + 99 others); Thu, 21 Jan 2021 13:52:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbhAUSux (ORCPT ); Thu, 21 Jan 2021 13:50:53 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B980CC061794 for ; Thu, 21 Jan 2021 10:49:59 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 66B8468A6; Thu, 21 Jan 2021 13:49:58 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 66B8468A6 From: "J. Bruce Fields" To: Chuck Lever Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 1/9] nfsd4: simplify process_lookup1 Date: Thu, 21 Jan 2021 13:49:47 -0500 Message-Id: <1611254995-23131-1-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <6D288689-85E5-4E3E-9117-B71FB45FFABB@oracle.com> References: <6D288689-85E5-4E3E-9117-B71FB45FFABB@oracle.com> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" This STALE_CLIENTID check is redundant with the one in lookup_clientid(). There's a difference in behavior is in case of memory allocation failure, which I think isn't a big deal. Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 1d2cd6a88f61..f9f89229dba6 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4680,8 +4680,6 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate, struct nfs4_openowner *oo = NULL; __be32 status; - if (STALE_CLIENTID(&open->op_clientid, nn)) - return nfserr_stale_clientid; /* * In case we need it later, after we've already created the * file and don't want to risk a further failure: -- 2.29.2