diff for duplicates of <20241118211413.3756-6-cel@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 05abbbe..400a8db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,32 +1,54 @@ -From: Chuck Lever <chuck.lever@oracle.com> +[ Sasha's backport helper bot ] -[ Upstream commit 8286f8b622990194207df9ab852e0f87c60d35e9 ] +Hi, -The error flow in nfsd4_copy() calls cleanup_async_copy(), which -already decrements nn->pending_async_copies. +The upstream commit SHA1 provided is correct: 8286f8b622990194207df9ab852e0f87c60d35e9 -Reported-by: Olga Kornievskaia <okorniev@redhat.com> -Fixes: aadc3bbea163 ("NFSD: Limit the number of concurrent async COPY operations") -Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +WARNING: Author mismatch between patch and upstream commit: +Backport author: cel@kernel.org +Commit author: Chuck Lever <chuck.lever@oracle.com> + +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (different SHA1: 1421883aa30c) | +| 6.6.y | Not found | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: --- - fs/nfsd/nfs4proc.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c -index 444f68ade80c..d64f792964e1 100644 ---- a/fs/nfsd/nfs4proc.c -+++ b/fs/nfsd/nfs4proc.c -@@ -1820,10 +1820,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, - refcount_set(&async_copy->refcount, 1); - /* Arbitrary cap on number of pending async copy operations */ - if (atomic_inc_return(&nn->pending_async_copies) > -- (int)rqstp->rq_pool->sp_nrthreads) { -- atomic_dec(&nn->pending_async_copies); -+ (int)rqstp->rq_pool->sp_nrthreads) - goto out_err; -- } - async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL); - if (!async_copy->cp_src) - goto out_err; --- -2.47.0 +--- - 2024-11-18 23:59:31.421354519 -0500 ++++ /tmp/tmp.lcSzHSawOv 2024-11-18 23:59:31.413848668 -0500 +@@ -1,3 +1,5 @@ ++[ Upstream commit 8286f8b622990194207df9ab852e0f87c60d35e9 ] ++ + The error flow in nfsd4_copy() calls cleanup_async_copy(), which + already decrements nn->pending_async_copies. + +@@ -9,10 +11,10 @@ + 1 file changed, 1 insertion(+), 3 deletions(-) + + diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c +-index 5fd1ce3fc8fb7..d32f2dfd148fe 100644 ++index 444f68ade80c..d64f792964e1 100644 + --- a/fs/nfsd/nfs4proc.c + +++ b/fs/nfsd/nfs4proc.c +-@@ -1845,10 +1845,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ++@@ -1820,10 +1820,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + refcount_set(&async_copy->refcount, 1); + /* Arbitrary cap on number of pending async copy operations */ + if (atomic_inc_return(&nn->pending_async_copies) > +@@ -24,3 +26,6 @@ + async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL); + if (!async_copy->cp_src) + goto out_err; ++-- ++2.47.0 ++ +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.6.y | Success | Success | diff --git a/a/content_digest b/N1/content_digest index 4133a69..459f50f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,45 +1,64 @@ - "ref\020241118211413.3756-1-cel@kernel.org\0" - "From\0cel@kernel.org\0" - "Subject\0[PATCH 6.6 5/5] NFSD: Never decrement pending_async_copies on error\0" - "Date\0Mon, 18 Nov 2024 16:14:13 -0500\0" - "To\0<stable@vger.kernel.org>\0" - "Cc\0<linux-nfs@vger.kernel.org>" - Jeff Layton <jlayton@kernel.org> - Chuck Lever <chuck.lever@oracle.com> - " Olga Kornievskaia <okorniev@redhat.com>\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 6.6 5/5] NFSD: Never decrement pending_async_copies on error\0" + "Date\0Tue, 19 Nov 2024 07:31:16 -0500\0" + "To\0stable@vger.kernel.org\0" + "Cc\0cel@kernel.org" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "From: Chuck Lever <chuck.lever@oracle.com>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "[ Upstream commit 8286f8b622990194207df9ab852e0f87c60d35e9 ]\n" + "Hi,\n" "\n" - "The error flow in nfsd4_copy() calls cleanup_async_copy(), which\n" - "already decrements nn->pending_async_copies.\n" + "The upstream commit SHA1 provided is correct: 8286f8b622990194207df9ab852e0f87c60d35e9\n" "\n" - "Reported-by: Olga Kornievskaia <okorniev@redhat.com>\n" - "Fixes: aadc3bbea163 (\"NFSD: Limit the number of concurrent async COPY operations\")\n" - "Signed-off-by: Chuck Lever <chuck.lever@oracle.com>\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: cel@kernel.org\n" + "Commit author: Chuck Lever <chuck.lever@oracle.com>\n" + "\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (different SHA1: 1421883aa30c) |\n" + "| 6.6.y | Not found |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" "---\n" - " fs/nfsd/nfs4proc.c | 4 +---\n" - " 1 file changed, 1 insertion(+), 3 deletions(-)\n" - "\n" - "diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c\n" - "index 444f68ade80c..d64f792964e1 100644\n" - "--- a/fs/nfsd/nfs4proc.c\n" - "+++ b/fs/nfsd/nfs4proc.c\n" - "@@ -1820,10 +1820,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" - " \t\trefcount_set(&async_copy->refcount, 1);\n" - " \t\t/* Arbitrary cap on number of pending async copy operations */\n" - " \t\tif (atomic_inc_return(&nn->pending_async_copies) >\n" - "-\t\t\t\t(int)rqstp->rq_pool->sp_nrthreads) {\n" - "-\t\t\tatomic_dec(&nn->pending_async_copies);\n" - "+\t\t\t\t(int)rqstp->rq_pool->sp_nrthreads)\n" - " \t\t\tgoto out_err;\n" - "-\t\t}\n" - " \t\tasync_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);\n" - " \t\tif (!async_copy->cp_src)\n" - " \t\t\tgoto out_err;\n" - "-- \n" - 2.47.0 + "--- -\t2024-11-18 23:59:31.421354519 -0500\n" + "+++ /tmp/tmp.lcSzHSawOv\t2024-11-18 23:59:31.413848668 -0500\n" + "@@ -1,3 +1,5 @@\n" + "+[ Upstream commit 8286f8b622990194207df9ab852e0f87c60d35e9 ]\n" + "+\n" + " The error flow in nfsd4_copy() calls cleanup_async_copy(), which\n" + " already decrements nn->pending_async_copies.\n" + " \n" + "@@ -9,10 +11,10 @@\n" + " 1 file changed, 1 insertion(+), 3 deletions(-)\n" + " \n" + " diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c\n" + "-index 5fd1ce3fc8fb7..d32f2dfd148fe 100644\n" + "+index 444f68ade80c..d64f792964e1 100644\n" + " --- a/fs/nfsd/nfs4proc.c\n" + " +++ b/fs/nfsd/nfs4proc.c\n" + "-@@ -1845,10 +1845,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + "+@@ -1820,10 +1820,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,\n" + " \t\trefcount_set(&async_copy->refcount, 1);\n" + " \t\t/* Arbitrary cap on number of pending async copy operations */\n" + " \t\tif (atomic_inc_return(&nn->pending_async_copies) >\n" + "@@ -24,3 +26,6 @@\n" + " \t\tasync_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);\n" + " \t\tif (!async_copy->cp_src)\n" + " \t\t\tgoto out_err;\n" + "+-- \n" + "+2.47.0\n" + "+\n" + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + | stable/linux-6.6.y | Success | Success | -03b1c36af61c569d1fed3830904fc291ccc9225b0289e5cc62a8d7fbb76745b0 +f4d45d004bc74e782b33d0a137723fd3823fba342c0a19ddd37a7c8cdb36cde3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.