scsi: iscsi: iscsi_tcp: Start socket shutdown during conn stop

Make sure the conn socket shutdown starts before we start the timer to fail
commands to upper layers.

Link: https://lore.kernel.org/r/20210525181821.7617-10-michael.christie@oracle.com
Reviewed-by: Lee Duncan <lduncan@suse.com>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 553e95ad619720a774daab20fe750adcc7d59247..1bc37593c88ffbffa8ab619e2e10682070537c28 100644 (file)
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -600,6 +600,12 @@ static void iscsi_sw_tcp_release_conn(struct iscsi_conn *conn)
        if (!sock)
                return;
 
+       /*
+        * Make sure we start socket shutdown now in case userspace is up
+        * but delayed in releasing the socket.
+        */
+       kernel_sock_shutdown(sock, SHUT_RDWR);
+
        sock_hold(sock->sk);
        iscsi_sw_tcp_conn_restore_callbacks(conn);
        sock_put(sock->sk);