Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp593569pxb; Thu, 21 Jan 2021 15:00:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxp4mAH5hAGSNgVIKNa4XuEaScyEEMmHGgJtcgrN+v/1OhanLUV7t2I+OqKJ3L5FyQ/glY5 X-Received: by 2002:a50:ec05:: with SMTP id g5mr1108173edr.182.1611270031336; Thu, 21 Jan 2021 15:00:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611270031; cv=none; d=google.com; s=arc-20160816; b=JZljFWcoRY5XmNf2ibcDlqGcR0luFc8QPiWT4h+nhEQoNbDNJHmyD7Zh+dY9mgUD5D qzKBK5XYwLzIgEIbEjkJgl1RgyI7kYLNdkH/8bOXNvdcOfiApHd6d6+GbP35tV/ynawE D7k2ecnCnbIb2k2tcdFIhQahx5YF1/1w5Rju57chs4lGPI5Ge7Rh+K5JntphPtHjz/Ad +5sa5cKJPTPdqbgrVNx0Z2abOb+QsXL7g0SoeQcBf2mwcRiCaVaoJs8j+6yhzZN3mslX eIgdtrEqdeXyF0PPeg5dA5KTQo6ERLmi+GNmkkOb026vJ+ioWCTE93YSXHaPlvAhMoJj 2BqA== 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=tOeKyD4mluEJBJBK8HH8h4r9uG2ddwJceZ/D/6eC9N2JdeRPspx/4Aoj3l6zK/EehK Bgz/KKzEtW7nPfbggjpJXIuCfBf7meF8Ev2Z+fkIgCLz/+lPt3YodZU1/chQDQQdwPzo RMS1n5siEJUhE+rYGKf+nF1Qq3chOBCCFA+5+zPdkjsns8ytxwvaqedN5vvWq/fisW73 Mg+9Hm1OhkHoFBZiymJuUu5hfPnJeQEtqIxNkmPh4yWn+bkSIuUPvf3JE5eZy4nSPO8a f3d/SR/TBhZDjQivnvDGTaRtXpoeRnwQQ7BT3M6UfdiQGytN2IBjd2Qd8rnMSI2OoevA UZ/g== 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 va10si2333696ejb.247.2021.01.21.14.59.57; Thu, 21 Jan 2021 15:00:31 -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 S1727051AbhAUW6z (ORCPT + 99 others); Thu, 21 Jan 2021 17:58:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727123AbhAUW6v (ORCPT ); Thu, 21 Jan 2021 17:58:51 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2EF1C0617A9 for ; Thu, 21 Jan 2021 14:57:47 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 7413A3C33; Thu, 21 Jan 2021 17:57:46 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 7413A3C33 From: "J. Bruce Fields" To: Chuck Lever Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH v3 1/9] nfsd4: simplify process_lookup1 Date: Thu, 21 Jan 2021 17:57:37 -0500 Message-Id: <1611269865-30153-1-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20210121204251.GB13298@pick.fieldses.org> References: <20210121204251.GB13298@pick.fieldses.org> 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