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 64F41196; Tue, 19 Nov 2024 00:47:36 +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=1731977256; cv=none; b=DwvX9pxnNpqU4kkR3pUK6ZvE+J1RlrYDA/79mDSyRAKKX/Q7f3JGfZlmO9QG9dnbqNjZAHebov2ioxK0rOfCi1P1luUgzVBdDNXwCoXUj9Vfn2i7FiwpGRQA67hQEEODokntPX5+UnrwmSKjNrKeJJmCkA7WP5fl4SxTNcYxS/E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731977256; c=relaxed/simple; bh=Y/t9DqFLgpHIwTerHxr91KCR8QJ6dvKYi6drrUFjCLs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WtPiK9UrZ3QE3rd/oyUhnteUBnHmvt8wJYKOmi16qpH5i8TtVUUQpT2Ot7frbs9hnacqWbtvcCfcWBVON9Mwy9VOhonstmAh0DY24/VqEMfMcdlXTYo/0SwB6p+0xSTpeSEcN4VJE7+41e6LLwu6luyef/yksTwmA7WS8E8bB4U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=F+XjMk7s; 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="F+XjMk7s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EE1DC4CECF; Tue, 19 Nov 2024 00:47:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731977255; bh=Y/t9DqFLgpHIwTerHxr91KCR8QJ6dvKYi6drrUFjCLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F+XjMk7s+DEsPoivKYX41ALsdEoHrVVhsTnXNwHNVTS9Welsgr1yD6cTwAW9e8KX8 9s9spKgzzP8vJiXHz5xteBuH7BKm46fHABY9WKEyuYJFf4G+sp6HJSNnILLQmiEVny 0Pv8suFTwZ5TTbASVvOa8lO86+YUoqksyyk7A2B0jHW8QA3ZK/SWX8AsmuYJ4kRVxc BvEUtW2/ve/DRvAFyweRE+F4jQ4iMV63i6B6Gb6+5/j/KPrWMwc+apz4qe65FGdTqc RM2VZB+e8vzeY6ENOSz+y7vwxcmjq3htrCovnsC5UnGEHZenqZXQcFuc5nuYm8PaPb smVMKRSc9S4QA== From: cel@kernel.org To: Cc: , Jeff Layton , Dai Ngo , Chen Hanxiao Subject: [PATCH 5.10 1/5] NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point Date: Mon, 18 Nov 2024 19:47:28 -0500 Message-ID: <20241119004732.4703-2-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241119004732.4703-1-cel@kernel.org> References: <20241119004732.4703-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 f10e70f37285..fbd42c1a3fcd 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1769,6 +1769,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; @@ -1783,7 +1784,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 BD1B513B780 for ; Tue, 19 Nov 2024 12:30:37 +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=1732019437; cv=none; b=dfUsBL8Zzs4MWvPAibSOjjOuJ5PHjXAczh3Fwr2WzWbh60ma0Z1oeMAdyFt5Q5ZnnJbJte5AhN9weWruj41BDQvq+HKcGj7eFdKnWZTDAzdEqjkGsz5RH+8gZMNaStZ6JN+uwyqJntFj31P9IRmFeJP11UygpGjznAtlARXE46U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732019437; c=relaxed/simple; bh=40bTpCND5CaZu6fyyI/8Zn7RYyG9tU5D6RNYrLZeib4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qzLm51UmYH8gOSukza/BzSnFow2fPmaBm9EtpHTtOSIGR9SxPRUhy9dWC50dNBnmo+DXFHyZ+DziXkj2t3DfEJdIYxxUl3q1Bhq4vnZ4oha0jqDMOQLH+9Mm+G/EtDar30OtbGGR4RxSX4uUyxyjKqPMgsJYomZc5EJSDaUD4NA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G0Hj2gMn; 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="G0Hj2gMn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1930C4CECF; Tue, 19 Nov 2024 12:30:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732019437; bh=40bTpCND5CaZu6fyyI/8Zn7RYyG9tU5D6RNYrLZeib4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G0Hj2gMnphmkzvRSmmKXMKIHTsapkwBStcxrP80dgY+pqHs1uKXZXwZCzXsD6usHm A2fDQABx8p5CXy9rLjXnI4RHQaIOhuMgboFSduEE9uTglc0zg34BVnwsbSg1WIraIr XX10lYPjcSkpIm3rxtF5SPzIwFZAIULwt9y5CkorOU+Khd4kxC6szj0vZGit9YAAqY Mq46S6bYxCppp85Mhw51q0rT/XFZL+jGHBFaAJPwcJrIrQEcWVjb8ZXYVStJAXXUR3 v9eo9GZxd1k5/cdxOvab7+5lN0l4irbGGFLYnHokeTKF1h2mxUwGXRxj8atFoZ5O18 fqOYvDfRJlZNQ== From: Sasha Levin To: stable@vger.kernel.org Cc: cel@kernel.org, Sasha Levin Subject: Re: [PATCH 5.10 1/5] NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point Date: Tue, 19 Nov 2024 07:30:35 -0500 Message-ID: <20241119004732.4703-2-cel@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241119004732.4703-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: <20241119123035.epi4dPxlTHEtiMHnmhr165gFEELGn_zvNCJIkgIg4zU@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 | | 5.15.y | Not found | | 5.10.y | Not found | |-----------------|----------------------------------------------| Note: The patch differs from the upstream commit: --- --- - 2024-11-19 02:00:35.132231426 -0500 +++ /tmp/tmp.2OL4ABMh5G 2024-11-19 02:00:35.126441883 -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 f10e70f37285..fbd42c1a3fcd 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, +@@ -1769,6 +1769,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, +@@ -1783,7 +1784,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-5.10.y | Success | Success |