On Mon, Nov 18, 2024 at 11:36:15PM -0500, Sasha Levin wrote:
> [ Sasha's backport helper bot ]
>
> Hi,
>
> The upstream commit SHA1 provided is correct: 15d1975b7279693d6f09398e0e2e31aca2310275
>
> WARNING: Author mismatch between patch and upstream commit:
> Backport author: cel@xxxxxxxxxx
> Commit author: Dai Ngo <dai.ngo@xxxxxxxxxx>
Is this a bug in my backport script? Should patches backported
to LTS retain the upstream patch author, or should they be From:
the backporter? If the former, I can adjust my scripts.
> Commit in newer trees:
>
> |-----------------|----------------------------------------------|
> | 6.11.y | Present (exact SHA1) |
> | 6.6.y | Not found |
> | 6.1.y | Not found |
> |-----------------|----------------------------------------------|
>
> Note: The patch differs from the upstream commit:
> ---
> --- - 2024-11-18 23:00:36.794064423 -0500
> +++ /tmp/tmp.6a2P3hH3a2 2024-11-18 23:00:36.786070330 -0500
> @@ -1,17 +1,20 @@
> +[ Upstream commit 15d1975b7279693d6f09398e0e2e31aca2310275 ]
> +
> Prepare for adding server copy trace points.
>
> Signed-off-by: Dai Ngo <dai.ngo@xxxxxxxxxx>
> Tested-by: Chen Hanxiao <chenhx.fnst@xxxxxxxxxxx>
> +Stable-dep-of: 9ed666eba4e0 ("NFSD: Async COPY result needs to return a write verifier")
> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
> fs/nfsd/nfs4proc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> -index 4199ede0583c7..c27f2fdcea32c 100644
> +index df9dbd93663e..50f17cee8bcf 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> -@@ -1798,6 +1798,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> +@@ -1768,6 +1768,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> __be32 status;
> struct nfsd4_copy *async_copy = NULL;
>
> @@ -19,7 +22,7 @@
> if (nfsd4_ssc_is_inter(copy)) {
> if (!inter_copy_offload_enable || nfsd4_copy_is_sync(copy)) {
> status = nfserr_notsupp;
> -@@ -1812,7 +1813,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> +@@ -1782,7 +1783,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> return status;
> }
>
> @@ -27,3 +30,6 @@
> memcpy(©->fh, &cstate->current_fh.fh_handle,
> sizeof(struct knfsd_fh));
> if (nfsd4_copy_is_async(copy)) {
> +--
> +2.47.0
> +
> ---
>
> Results of testing on various branches:
>
> | Branch | Patch Apply | Build Test |
> |---------------------------|-------------|------------|
> | stable/linux-6.1.y | Success | Success |
--
Chuck Lever
