This is a note to let you know that I've just added the patch titled
SUNRPC: Remove dead code in svc_tcp_release_rqst()
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sunrpc-remove-dead-code-in-svc_tcp_release_rqst.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 8378669d037be02618244b1052f221a02063b502
Author: Chuck Lever <chuck.lever@xxxxxxxxxx>
Date: Sun Apr 3 12:25:55 2022 -0400
SUNRPC: Remove dead code in svc_tcp_release_rqst()
[ Upstream commit 4af8b42e5629b97bdde287d5d6c250535d324676 ]
Clean up: svc_tcp_sendto() always sets rq_xprt_ctxt to NULL.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Stable-dep-of: 948f072ada23 ("SUNRPC: always free ctxt when freeing deferred request")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 6ea3d87e11475..a28a6820852b2 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -117,15 +117,6 @@ static void svc_reclassify_socket(struct socket *sock)
*/
static void svc_tcp_release_rqst(struct svc_rqst *rqstp)
{
- struct sk_buff *skb = rqstp->rq_xprt_ctxt;
-
- if (skb) {
- struct svc_sock *svsk =
- container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);
-
- rqstp->rq_xprt_ctxt = NULL;
- skb_free_datagram_locked(svsk->sk_sk, skb);
- }
}
/**
