From patchwork Sat Mar 1 18:31:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13997653 X-Patchwork-Delegate: cel@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D9131E5B65 for ; Sat, 1 Mar 2025 18:31:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740853918; cv=none; b=hEcrq3QPcnL/unFlu/crK3jmImTf9p7DQXU3RXswA2noPoRfRnJ6kjm56p17YwloEc/aRcOwlu8/zR562P9czhcGO4mqh4Q4MjoS0gkfRrzQ2VCZM+jIEBInaQ7tUPOHbD1tDXekUFKtsE70odoyimtjgU/gWIfzIBWbjxJ0Uq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740853918; c=relaxed/simple; bh=ShlpwZvS0/FdZJH/EwCVVZGCktVyn1oBkGmi/uM5D98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MaOYZ2PLSxAyj6pOh7luG++46Vfbp8H/hFViaU6OebsjC88sHj2UZBOhcFJc5OCMOgpmnfdXBBE7UfsqNtMrFjQXeKXd7F9wsY0PJzeAts1VYqTfddAg3irlFEI+3huSwC0JIn4msUNqc5FcPs9QCTLvVpKHerImd3kCnhEIGN0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ghJUGgKp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ghJUGgKp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 847EAC4CEE2; Sat, 1 Mar 2025 18:31:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740853916; bh=ShlpwZvS0/FdZJH/EwCVVZGCktVyn1oBkGmi/uM5D98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ghJUGgKpRTG7sHSOY1Ua3iOmrbbHQKOtks/1dgGIkXtz1KUGIZgqGvVeJE/ZuyIZ8 7tAZdldod3i0e2DCHa7P8ZT5w09tMFJQ46VitkQvpkHk7g8SPlUty4bFdjgj7ZW5up Q8yiysS821fs51hiZQr7oMJyUatj9Keyu8vbwSR7Dlz0lCfbRVEPvduBxVRfKRb8aM pRkShDrF6P47yF6PUmSpI7TPneymS6VPCPAwGqjKqSNp4Dd5WAeT0elu71GqfptYNC +uTFFAt1kzeB595SKgS3TYuXBfC5SRfynNSI1eCOwmhfRyEFZ3N+EkETr/eTtojDCG CLRKXWtCOd5yA== From: cel@kernel.org To: Neil Brown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: , Chuck Lever Subject: [PATCH v2 1/5] NFSD: OFFLOAD_CANCEL should mark an async COPY as completed Date: Sat, 1 Mar 2025 13:31:47 -0500 Message-ID: <20250301183151.11362-2-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250301183151.11362-1-cel@kernel.org> References: <20250301183151.11362-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever Update the status of an async COPY operation when it has been stopped. OFFLOAD_STATUS needs to indicate that the COPY is no longer running. Signed-off-by: Chuck Lever --- fs/nfsd/nfs4proc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index f6e06c779d09..9a0e68aa246f 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1379,8 +1379,11 @@ static void nfs4_put_copy(struct nfsd4_copy *copy) static void nfsd4_stop_copy(struct nfsd4_copy *copy) { trace_nfsd_copy_async_cancel(copy); - if (!test_and_set_bit(NFSD4_COPY_F_STOPPED, ©->cp_flags)) + if (!test_and_set_bit(NFSD4_COPY_F_STOPPED, ©->cp_flags)) { kthread_stop(copy->copy_task); + copy->nfserr = nfs_ok; + set_bit(NFSD4_COPY_F_COMPLETED, ©->cp_flags); + } nfs4_put_copy(copy); }