Received: by 2002:a05:7412:b101:b0:e2:908c:2ebd with SMTP id az1csp2807757rdb; Wed, 15 Nov 2023 11:02:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IGojAGDibXa8WoSj/gC21iFLBfji3qMtKPYZw6Fp30YnMN90ToVThb2Yv3RFNnLpFqJc3QE X-Received: by 2002:a05:6808:10c9:b0:3ae:b06:2131 with SMTP id s9-20020a05680810c900b003ae0b062131mr19278316ois.0.1700074943157; Wed, 15 Nov 2023 11:02:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700074943; cv=none; d=google.com; s=arc-20160816; b=KsH8+5Xz4hqxgPmvXCRtu2mAp45c7AL7m769b+vziwOWLKIQsCAZg44hxPfr9CSAnU IJDMO3PfOSPzbxJbZuXkgSbybwxdj5121tnujK0N7j2LB8UG1MvzVISHclLqOjckzAkO SKDqntDMnJ3074iqYlv/C7M4giisZ1wFxrsNuj03pTAHnu+yAiiow50HAbpcfho7+96u kfdZSubH5OAGug6C9QcDy+kBDo9uIA2jJvT3wmxtwH+OYtcEjeritpJruwwZNQFoaIUC hFNO2P11jkIietADW6AgFVsca9fkoxYsHIS+TvMYiRny3Er/Ty/+EAW8S7Xu3FG5kHvA axIQ== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=tDvKQJf+SWQbu4lOApu2FjJcXb18X3xDuAESfgKLf6g=; fh=Mys3y4MwsHRytUQMpdfGBn3oGRYLcLloxNwkFYMYMmg=; b=TxDdrf/fLJL9KHBFYo69Uv+ip6XwziNEwj2Xb9RZos0RLLQbvLYZ1mzjceYRZ3feO1 ABITh11gwPrS7la5wbHtI7ebqEg2x9xpH8CX47hOE0u9MK/wG1nCUO0ZD97iTp1Qct6H gnAHbIWhVzdzRcgoztlY1zccL/CNaOZyOvP73UooJgMJlkrV7M5JvXBZ6BG84SMGJ/z/ 6E0qrGxn3f5b+DawNqvGcAyweZDTx7JhTQVS6+HptFALXa7uboCXVNilXMmKnzRHF/jQ iLaos2sCV5Lpa6beTNv/+E36weSwsci603qJG9Y1pc66YspEOSsZmXT4HCs5izbTdBqH 75tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="tbsd97z/"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id bj11-20020a056808198b00b003b2df61bc76si4091792oib.180.2023.11.15.11.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 11:02:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="tbsd97z/"; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2D81380A2657; Wed, 15 Nov 2023 11:02:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbjKOTCW (ORCPT + 99 others); Wed, 15 Nov 2023 14:02:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbjKOTCV (ORCPT ); Wed, 15 Nov 2023 14:02:21 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B9BAE5 for ; Wed, 15 Nov 2023 11:02:17 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1DA3C433CA for ; Wed, 15 Nov 2023 19:02:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700074937; bh=Oxl0F+p87/Zb7F7ROl2xmY/7M8/1Z0fxZEGCh8/KSVc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=tbsd97z/IHKHj0EtAf0Lc2RDXWIrdalQs5ATrPlaH+lVv/+nRXwJ/GaqO1jSj8UUJ aE66cqRAngM2UFSL2YBTOwnrwy0srejpHJfCtjHZyqucG17beEZCZiXubGULDy1QMl yrJNaMUX4CAbuxmPYHJUfTOnkuENgNz6RP1AZi/88gFLtYQpppBMS9HtTHCSkAIKv4 uwEVIx6BTyjgayK8MBaedfKRtJyU2jt/vS5TDDWvapwxWCKaL/D1xKgL9rzYlNYbn+ nim9U0NZogfAPE8MYFDSzxvFaN/uPrD+Fon3EQb5dwwqtsg9beIwYu0F9JqmqeiZDY LLOBEVE34vvtA== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH 3/3] NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT Date: Wed, 15 Nov 2023 13:55:29 -0500 Message-ID: <20231115185529.303842-3-trondmy@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115185529.303842-2-trondmy@kernel.org> References: <20231115185529.303842-1-trondmy@kernel.org> <20231115185529.303842-2-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.2 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 15 Nov 2023 11:02:21 -0800 (PST) From: Trond Myklebust Once the client has processed the CB_LAYOUTRECALL, but has not yet successfully returned the layout, the server is supposed to switch to returning NFS4ERR_RETURNCONFLICT. This patch ensures that we handle that return value correctly. Fixes: 183d9e7b112a ("pnfs: rework LAYOUTGET retry handling") Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index e7e80c67d82b..7e3053339d6a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -170,6 +170,7 @@ static int nfs4_map_errors(int err) case -NFS4ERR_RESOURCE: case -NFS4ERR_LAYOUTTRYLATER: case -NFS4ERR_RECALLCONFLICT: + case -NFS4ERR_RETURNCONFLICT: return -EREMOTEIO; case -NFS4ERR_WRONGSEC: case -NFS4ERR_WRONG_CRED: @@ -558,6 +559,7 @@ static int nfs4_do_handle_exception(struct nfs_server *server, case -NFS4ERR_GRACE: case -NFS4ERR_LAYOUTTRYLATER: case -NFS4ERR_RECALLCONFLICT: + case -NFS4ERR_RETURNCONFLICT: exception->delay = 1; return 0; @@ -9691,6 +9693,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, status = -EBUSY; break; case -NFS4ERR_RECALLCONFLICT: + case -NFS4ERR_RETURNCONFLICT: status = -ERECALLCONFLICT; break; case -NFS4ERR_DELEG_REVOKED: -- 2.41.0