Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp6776849rwp; Tue, 18 Jul 2023 05:55:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlHauPqPQyxisiTI2Ms97yDT+kL1s/KlCgRIt4t/TtYYtConnQrDY+kDm+PoxjqvZxQzcG49 X-Received: by 2002:a17:906:253:b0:993:eb4b:ed51 with SMTP id 19-20020a170906025300b00993eb4bed51mr2095540ejl.27.1689684935893; Tue, 18 Jul 2023 05:55:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689684935; cv=none; d=google.com; s=arc-20160816; b=mft99aiFIdnw/rgvrp406/AhS+eM2Itogx+8uwxI4kYpJVTkfPVtOcG4YTl0vgVbpB yXpz1CZ+paN1lasp/4BIgI4UdLQY0VdUMExF2w2pZeF30Fl3lS/hB2YVLGiEoCxlSYvc rXDCTJwJ/8lqiR8FNmbb0NSJp7xH1kuWT2i5T7/Pz+KYgusiUjobQR1KJcEHNr04nDqb thfZ+T3Z4T3uzYmkojVSe2zS2/gHkimgTd1qauwvQDWGgy4+EHriPj/Tc/sU85AQIO7q b2Ii52B7xyV8E1Ll7e5y40Mv5oZIKndemxtxWO5XP/jEjwkWta62syQrL58vZK08wn/r 12+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=MuGQu3BdyrQwM3nTk1fWUxb+Zi2dAayQ38JROul2jNQ=; fh=5fcatimaf2CzTNOF3quUTZdMGp3y9BuqNihXO5sOOSo=; b=kw2pF67mXJBbhB6pYgXEqwjPUt9hqhlUbZFrGgcGjDHpyhccjUitHnMEgTb6eDw9TH GGV1nVDOxtYDAP6dUkcgIOxjzzOVltPjxX6wY5eA9CDsjSr+8k8foA+jKEVzB6KIwmcP ckXvLGXlcE+80qJFwJ8CDy02QqQoP6glNFvT1N/vXERtL6DfIDFexnGUQY5ixFcqY0DV YKQ49TyW+g1+26hbvm/rdTsO7E0Z6jAM6m+zk/iHm6FhZB9F0cnBSZulSZlIVootqFK8 7hwmnAH9wV3ilN2+Qh/5GG3k5RyUa+hAy7FmhkHa8+vG7lyKg+dO6VJALqrIPWn1sZ7k bQXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qUYfJQuV; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d11-20020a170906370b00b00992f45c9343si1071818ejc.1025.2023.07.18.05.55.03; Tue, 18 Jul 2023 05:55:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qUYfJQuV; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230187AbjGRMoq (ORCPT + 99 others); Tue, 18 Jul 2023 08:44:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229908AbjGRMop (ORCPT ); Tue, 18 Jul 2023 08:44:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15411188 for ; Tue, 18 Jul 2023 05:44:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 832D66156A for ; Tue, 18 Jul 2023 12:44:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A63D8C433C7; Tue, 18 Jul 2023 12:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689684283; bh=IoUNfcaF7/tZbN2IZSKCjZTyL731YwfjWh/+43zItSs=; h=From:To:Cc:Subject:Date:From; b=qUYfJQuVBQKS0EuP+gGybAjm5pLDribNvOIltNQY+oUq3Ca5rJfWqxZHvh64qbhLK ifhKPfhcwJw7tJ6T/lZeJrhPPFkuICY5hkrGlSt1XA/z64LWYCxE/bBxHVTBnLcSmP D7eTKuWLX+h7JV9Ws8muOIP76DnwcJX73Ha/XTmiy7fmepBQ2K49AC4dBnhlc/Ab67 21jBSNbRSYntYgmlj3zhhCgSDr0senNNneu0femlsPGV3C3QrAdK0qG9t9D7BOV8jZ PTTcQeGTsALFbiwjs3KTghdtse2ycHHLlJ8LDQqJgJDwfYCuZpOl/OJ1goTXfb5EM3 u5/DICpatHRww== From: trondmy@kernel.org To: Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH] nfsd: Remove incorrect check in nfsd4_validate_stateid Date: Tue, 18 Jul 2023 08:38:37 -0400 Message-ID: <20230718123837.124780-1-trondmy@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust If the client is calling TEST_STATEID, then it is because some event occurred that requires it to check all the stateids for validity and call FREE_STATEID on the ones that have been revoked. In this case, either the stateid exists in the list of stateids associated with that nfs4_client, in which case it should be tested, or it does not. There are no additional conditions to be considered. Reported-by: Frank Ch. Eigler Fixes: 663e36f07666 ("nfsd4: kill warnings on testing stateids with mismatched clientids") Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6e61fa3acaf1..3aefbad4cc09 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -6341,8 +6341,6 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid) if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) || CLOSE_STATEID(stateid)) return status; - if (!same_clid(&stateid->si_opaque.so_clid, &cl->cl_clientid)) - return status; spin_lock(&cl->cl_lock); s = find_stateid_locked(cl, stateid); if (!s) -- 2.41.0