From mboxrd@z Thu Jan 1 00:00:00 1970 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 0D9DF154BF0; Mon, 18 Nov 2024 21:19:07 +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=1731964747; cv=none; b=HzWFoPmXJmOLnxdV5lpwjQGgBty6TFZM/Gpg9Yv59V27TVvFNffONMzoTo/vL7TSY7pp2Ss+kX9+2wx/yL6qXbpU3pYgVDZ5/E8yxsJ310NQnfWV19D6J7lDyVvZff6+K1bweHPjJDP/X2eBSwNTi9AR5gCw9rjlX7Qe+dB5xmk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731964747; c=relaxed/simple; bh=jfdx65p7Fv7dUHacMnQ8f9wuz98vapBGuGj22cg29NA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hssGZWWGp8z3aOyfS9edBu3E2oK4BWwTVmbYZWsUw6NVNZMZqMpsQrWdFU1Zmjyf19joolMDmdgJfIwWMgVB7utV0Ux5MZNicjehTsGm2n2BBcSrra37Tva+zg8AMOblP6qp29dci5+811pv0Ioj+TFRx+d6OHHhRgivGUFEsrE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MTRFlxyc; 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="MTRFlxyc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58AACC4CED9; Mon, 18 Nov 2024 21:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731964746; bh=jfdx65p7Fv7dUHacMnQ8f9wuz98vapBGuGj22cg29NA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MTRFlxycNLBhqMhX+0pxDrKXLK0GD/XIlQ/AKyRJ+tjHDZc4ViviJSMVintUcxn87 ARl2ejVEWzL0SaQ+3bkcfWzcOMkZLKz3nFOKr7r5XbNwwokR/i8jSjjYrH5fsDQ9ke EAY2e1x3ZdYaM4zJEg1pQsuZ6rqvfcl6hrgGXa5CjKmna/oI8qcsCppWqsFCJaHRuB 7eBAHjLpkyJrh/wuwwWJGWrjExin4OSu+JPFrIRG/CiS6jt8lRT9UAea+m9c3Ez6ZT TeyBZ0/1cTg39ftcjauuBeRmPDiOl2LpGBsOneRHMgBwkLyVAsnY5m9hZbhQXvCbZs Y6m5dtQENhG4Q== From: cel@kernel.org To: Cc: , Jeff Layton , Dai Ngo , Chen Hanxiao Subject: [PATCH 6.1 1/5] NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point Date: Mon, 18 Nov 2024 16:18:56 -0500 Message-ID: <20241118211900.3808-2-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241118211900.3808-1-cel@kernel.org> References: <20241118211900.3808-1-cel@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Dai Ngo [ Upstream commit 15d1975b7279693d6f09398e0e2e31aca2310275 ] Prepare for adding server copy trace points. Signed-off-by: Dai Ngo Tested-by: Chen Hanxiao Stable-dep-of: 9ed666eba4e0 ("NFSD: Async COPY result needs to return a write verifier") Signed-off-by: Chuck Lever --- 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 df9dbd93663e..50f17cee8bcf 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1768,6 +1768,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, __be32 status; struct nfsd4_copy *async_copy = NULL; + copy->cp_clp = cstate->clp; if (nfsd4_ssc_is_inter(copy)) { if (!inter_copy_offload_enable || nfsd4_copy_is_sync(copy)) { status = nfserr_notsupp; @@ -1782,7 +1783,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status; } - copy->cp_clp = cstate->clp; memcpy(©->fh, &cstate->current_fh.fh_handle, sizeof(struct knfsd_fh)); if (nfsd4_copy_is_async(copy)) { -- 2.47.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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 EA8AF15252D for ; Tue, 19 Nov 2024 04:36:17 +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=1731990978; cv=none; b=JBi+AFROiAun/vY/iNZc/my1yBx/kHYESoYTHC4HPZ5tLpm8OTfNdeAPN1v1PTIjiNQ1pyL1rxfzFkBLawPy7evYp7HAKFzL9afByZZtgOAqH4L35EaWr/P5QD9/U86HD82yn10nAQ9i3L3hgzK0JrLtOcMO/97D9efBeQh0504= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731990978; c=relaxed/simple; bh=FOkWe1BSdBm9DUz2SFey9h5o9GKVZXx1xYtQwy0wehU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S5vaDGYWUS0PrsEPtxUzjsTleVx4G6Qo6VfShzK0lFd5dD0YSm2PvMwzwf6tgoOifKRVqfPVEfNknATQpSX5Gbk1918kmfyXLN75T1WFrYHJZWIm8VmiOfBHeKZwchRo/AcMLMavE1qv3eIX0bylQwObp5tRnwcl7SRPwnRhE5Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eVRIJpdN; 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="eVRIJpdN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03558C4CECF; Tue, 19 Nov 2024 04:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731990977; bh=FOkWe1BSdBm9DUz2SFey9h5o9GKVZXx1xYtQwy0wehU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eVRIJpdN7JC243XcTFgSU+Kx5+fBsvNyYu1eB2GjuxGWIXdM+qXZwY7r1IBsoJ+7B Na0SpKtQRO1znudSBh8b2IariZyN7h+LDmoGPVekwbOLzF32RF/BA2B+e9Ncvv+jv9 9tB7diE3FnNR0LiDJsQpPqzuP98DoCeDoeXxM7Z8B7S5AP+gVXd1bm9YF/gvEmbdKh 81C8zhds0Jz5EprUIqDnc86tTBq1OMaWbzzuAcWwUMMQTXccou/Q1DHOwEzHPcsKNj 8nAoHRe6fjLJ/qNOvEp7aekjmu8pazaDDrSKJTX6Ex7O6C2ZdeOi/+VbLR5od5VHtL 1Ti2vX75cSKiA== From: Sasha Levin To: stable@vger.kernel.org Cc: cel@kernel.org, Sasha Levin Subject: Re: [PATCH 6.1 1/5] NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point Date: Mon, 18 Nov 2024 23:36:15 -0500 Message-ID: <20241118211900.3808-2-cel@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241118211900.3808-2-cel@kernel.org> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: <20241119043615.CvCwUZmCxZ6yHMnwsUbeiJb9_U2lI8Lvshy59Ytq9B8@z> [ 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@kernel.org Commit author: Dai Ngo 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 Tested-by: Chen Hanxiao +Stable-dep-of: 9ed666eba4e0 ("NFSD: Async COPY result needs to return a write verifier") Signed-off-by: Chuck Lever --- 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 |