From: Chuck Lever <chuck.lever@oracle.com>
Date: Sat, 1 Mar 2025 18:31:47 +0000 (-0500)
Subject: NFSD: OFFLOAD_CANCEL should mark an async COPY as completed
X-Git-Tag: v6.16-rc1~138^2~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f2b6d0b9b09e1d68636d189e5543912be5cbdcc;p=thirdparty%2Flinux.git

NFSD: OFFLOAD_CANCEL should mark an async COPY as completed

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.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index b397246dae7b7..fc19886cf9aaf 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, &copy->cp_flags))
+	if (!test_and_set_bit(NFSD4_COPY_F_STOPPED, &copy->cp_flags)) {
 		kthread_stop(copy->copy_task);
+		copy->nfserr = nfs_ok;
+		set_bit(NFSD4_COPY_F_COMPLETED, &copy->cp_flags);
+	}
 	nfs4_put_copy(copy);
 }