scsi: target: iscsi: calling iscsit_stop_session() inside iscsit_close_session()...
authorMaurizio Lombardi <mlombard@redhat.com>
Fri, 13 Mar 2020 17:06:56 +0000 (18:06 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 27 Mar 2020 01:47:47 +0000 (21:47 -0400)
iscsit_close_session() can only be called when nconn is zero (otherwise a
kernel panic is triggered). If nconn is zero then iscsit_stop_session()
does nothing and exits, so calling it makes no sense.

We still need to call iscsit_check_session_usage_count() because this
function will sleep if the session's refcount is not zero and we don't want
to destroy the session structure if it's still being referenced.

Link: https://lore.kernel.org/r/20200313170656.9716-4-mlombard@redhat.com
Tested-by: Rahul Kundu <rahul.kundu@chelsio.com>
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/target/iscsi/iscsi_target.c

index 8ef5cf6..3704073 100644 (file)
@@ -4381,8 +4381,7 @@ int iscsit_close_session(struct iscsi_session *sess)
         * restart the timer and exit.
         */
        if (!in_interrupt()) {
-               if (iscsit_check_session_usage_count(sess) == 1)
-                       iscsit_stop_session(sess, 1, 1);
+               iscsit_check_session_usage_count(sess);
        } else {
                if (iscsit_check_session_usage_count(sess) == 2) {
                        atomic_set(&sess->session_logout, 0);