Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3125958pxb; Tue, 19 Jan 2021 14:38:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCDrENJm1IwisQAbSad1idx58X0zzo4O+IN0NZl6taCeGmmcbdPQZijIBC+YpBiXitNS9h X-Received: by 2002:a05:6402:4382:: with SMTP id o2mr5240000edc.371.1611095935847; Tue, 19 Jan 2021 14:38:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611095935; cv=none; d=google.com; s=arc-20160816; b=01Dwrh3exGJH/FPRPGaoAGCT+TAPOvIjj66v+SlpLl8mmv6Q9BR/Qsw0sdZJdJuY1q jVptQehmoKb4fpBxu9B8mwpDEDjuMLabrShtobecixwpAIEp0B9UOxP6Z30LKXu/rdk5 CqKTmydqVWNgnkUYmu4MCsVp86qZSHnLgOjPkbhHqd0UbqbNvqVDRKF8VZd+gVsLJxmW yhKz4nPqwsmDTGi/ygjRVWl4UO1n2cbIy0pO1DFbVStRs6t3XTzIcSXpB4BsY7y/vThG V+AC6TAjSPT8Nw77qKZs2NYtkHWvgZ/qsBfcEN9dexJOudM2DIAoP8NF8zDFAooRlMke Bfwg== 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=vg7oL18kFwwSUbEKMD1Y9V3zPAU/uEaDrxs6/XpWaUZ1H7b4lRICqQa1Kaj9dj5YsD 1iHQFrU32mwN+oF4+9SWH3717+knPEsliJGtNAWpzDsGmBAFNjNIRSSpoTyS9bPLy8m7 fGeNAa/npzjloOg4ZEo9L6PkqqXMq0c3ZWj+yI7YNFpCUWIsIfNEV9c6hFeFAa8ucsQV EgMJ1b/cW1L+FF6XCk6cHbQLcvn1AXpBPZ3z4wEyxsF0GdHe7K9LuuHe7LvU1oEj9ndv HVb3L+3RbWxwKHKZqOxrQ1URh9cXK55tnq5tPDkiJIvmKFF3ISk0UnFJBZCqkmylTetZ M8jA== 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 dv5si58096ejb.231.2021.01.19.14.38.36; Tue, 19 Jan 2021 14:38:55 -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 S1728645AbhASWhI (ORCPT + 99 others); Tue, 19 Jan 2021 17:37:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727498AbhASWgR (ORCPT ); Tue, 19 Jan 2021 17:36:17 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5524C061575 for ; Tue, 19 Jan 2021 14:35:35 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 261FFC52; Tue, 19 Jan 2021 17:35:35 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 261FFC52 From: "J. Bruce Fields" To: Chuck Lever Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 1/8] nfsd4: simplify process_lookup1 Date: Tue, 19 Jan 2021 17:35:22 -0500 Message-Id: <1611095729-31104-2-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1611095729-31104-1-git-send-email-bfields@redhat.com> References: <1611095729-31104-1-git-send-email-bfields@redhat.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