From: Greg Kroah-Hartman Date: Mon, 16 May 2022 21:35:06 +0000 (+0200) Subject: fix up queue-5.10/sunrpc-don-t-call-connect-more-than-once-on-a-tcp-socket.patch X-Git-Tag: v4.9.315~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6360310d6761e8d006bc3fb25ae2ce85ab6744d;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-5.10/sunrpc-don-t-call-connect-more-than-once-on-a-tcp-socket.patch --- diff --git a/queue-5.10/sunrpc-don-t-call-connect-more-than-once-on-a-tcp-socket.patch b/queue-5.10/sunrpc-don-t-call-connect-more-than-once-on-a-tcp-socket.patch index 0a886c176ce..cf1fd300ed6 100644 --- a/queue-5.10/sunrpc-don-t-call-connect-more-than-once-on-a-tcp-socket.patch +++ b/queue-5.10/sunrpc-don-t-call-connect-more-than-once-on-a-tcp-socket.patch @@ -20,8 +20,8 @@ Signed-off-by: Meena Shanmugam Signed-off-by: Greg Kroah-Hartman --- include/linux/sunrpc/xprtsock.h | 1 + - net/sunrpc/xprtsock.c | 21 +++++++++++---------- - 2 files changed, 12 insertions(+), 10 deletions(-) + net/sunrpc/xprtsock.c | 22 ++++++++++++---------- + 2 files changed, 13 insertions(+), 10 deletions(-) --- a/include/linux/sunrpc/xprtsock.h +++ b/include/linux/sunrpc/xprtsock.h @@ -53,15 +53,16 @@ Signed-off-by: Greg Kroah-Hartman if (IS_ERR(sock)) { status = PTR_ERR(sock); goto out; -@@ -2294,6 +2298,7 @@ static void xs_tcp_setup_socket(struct w +@@ -2294,6 +2298,8 @@ static void xs_tcp_setup_socket(struct w break; case 0: case -EINPROGRESS: + set_bit(XPRT_SOCK_CONNECT_SENT, &transport->sock_state); ++ fallthrough; case -EALREADY: xprt_unlock_connect(xprt, transport); return; -@@ -2345,13 +2350,9 @@ static void xs_connect(struct rpc_xprt * +@@ -2345,13 +2351,9 @@ static void xs_connect(struct rpc_xprt * WARN_ON_ONCE(!xprt_lock_connect(xprt, task, transport));