diff mbox series

[v2,1/1] SUNRPC release the transport of a relocated task with an assigned transport

Message ID 20220420202333.90903-1-olga.kornievskaia@gmail.com (mailing list archive)
State New
Headers show
Series [v2,1/1] SUNRPC release the transport of a relocated task with an assigned transport | expand

Commit Message

Olga Kornievskaia April 20, 2022, 8:23 p.m. UTC
From: Olga Kornievskaia <kolga@netapp.com>

A relocated task must release its previous transport.

Fixes: 82ee41b85cef1 ("SUNRPC don't resend a task on an offlined transport")
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
 net/sunrpc/clnt.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Trond Myklebust April 20, 2022, 8:32 p.m. UTC | #1
On Wed, 2022-04-20 at 16:23 -0400, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
> 
> A relocated task must release its previous transport.
> 
> Fixes: 82ee41b85cef1 ("SUNRPC don't resend a task on an offlined
> transport")
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
>  net/sunrpc/clnt.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index af0174d7ce5a..7fb3cdef2a60 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -1065,10 +1065,14 @@ rpc_task_get_next_xprt(struct rpc_clnt *clnt)
>  static
>  void rpc_task_set_transport(struct rpc_task *task, struct rpc_clnt
> *clnt)
>  {
> -       if (task->tk_xprt &&
> -                       !(test_bit(XPRT_OFFLINE, &task->tk_xprt-
> >state) &&
> -                        (task->tk_flags & RPC_TASK_MOVEABLE)))
> +       if (task->tk_xprt) {
> +               if (!(test_bit(XPRT_OFFLINE, &task->tk_xprt->state)
> &&
> +                       (task->tk_flags & RPC_TASK_MOVEABLE))) {
> +                       xprt_release(task);
> +                       xprt_put(task->tk_xprt);
> +               }
>                 return;
> +       }


diff mbox series

Patch

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index af0174d7ce5a..7fb3cdef2a60 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1065,10 +1065,14 @@  rpc_task_get_next_xprt(struct rpc_clnt *clnt)
 static
 void rpc_task_set_transport(struct rpc_task *task, struct rpc_clnt *clnt)
 {
-	if (task->tk_xprt &&
-			!(test_bit(XPRT_OFFLINE, &task->tk_xprt->state) &&
-                        (task->tk_flags & RPC_TASK_MOVEABLE)))
+	if (task->tk_xprt) {
+		if (!(test_bit(XPRT_OFFLINE, &task->tk_xprt->state) &&
+			(task->tk_flags & RPC_TASK_MOVEABLE))) {
+			xprt_release(task);
+			xprt_put(task->tk_xprt);
+		}
 		return;
+	}
 	if (task->tk_flags & RPC_TASK_NO_ROUND_ROBIN)
 		task->tk_xprt = rpc_task_get_first_xprt(clnt);
 	else