Merge USB 4.20-rc8 mergepoint into usb-next

We need the USB changes in here for additional patches to be able to
apply cleanly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 8a5e823e0b33..f0b3700cec95 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1217,6 +1217,8 @@ static void xs_reset_transport(struct sock_xprt *transport)
 
         trace_rpc_socket_close(xprt, sock);
         sock_release(sock);
+
+        xprt_disconnect_done(xprt);
 }
 
 /**
@@ -1237,8 +1239,6 @@ static void xs_close(struct rpc_xprt *xprt)
 
         xs_reset_transport(transport);
         xprt->reestablish_timeout = 0;
-
-        xprt_disconnect_done(xprt);
 }
 
 static void xs_inject_disconnect(struct rpc_xprt *xprt)
@@ -1489,8 +1489,6 @@ static void xs_tcp_state_change(struct sock *sk)
                                         &transport->sock_state))
                         xprt_clear_connecting(xprt);
                 clear_bit(XPRT_CLOSING, &xprt->state);
-                if (sk->sk_err)
-                        xprt_wake_pending_tasks(xprt, -sk->sk_err);
                 /* Trigger the socket release */
                 xs_tcp_force_close(xprt);
         }
@@ -2092,8 +2090,8 @@ static void xs_udp_setup_socket(struct work_struct *work)
         trace_rpc_socket_connect(xprt, sock, 0);
         status = 0;
 out:
-        xprt_unlock_connect(xprt, transport);
         xprt_clear_connecting(xprt);
+        xprt_unlock_connect(xprt, transport);
         xprt_wake_pending_tasks(xprt, status);
 }
 
@@ -2329,8 +2327,8 @@ static void xs_tcp_setup_socket(struct work_struct *work)
         }
         status = -EAGAIN;
 out:
-        xprt_unlock_connect(xprt, transport);
         xprt_clear_connecting(xprt);
+        xprt_unlock_connect(xprt, transport);
         xprt_wake_pending_tasks(xprt, status);
 }