iscsi-target: Drop duplicate __iscsi_target_login_thread check
authorNicholas Bellinger <nab@linux-iscsi.org>
Wed, 17 Sep 2014 20:17:55 +0000 (13:17 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Wed, 17 Sep 2014 20:33:14 +0000 (13:33 -0700)
This patch drops the now duplicate + unnecessary check for -ENODEV from
iscsi_transport->iscsit_accept_np() for jumping to out:, or immediately
returning 1 in __iscsi_target_login_thread() code.

Since commit 81a9c5e72b the jump to out: and returning 1 have the same
effect, and end up hitting the ISCSI_NP_THREAD_SHUTDOWN check regardless
at the top of __iscsi_target_login_thread() during next loop iteration.

So that said, it's safe to go ahead and remove this duplicate check.

Reported-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/iscsi/iscsi_target_login.c

index b1ae5cbe70f80990a634de0bc6d3a4809dea9b09..02d5ccd0eaa1d636b8ef7bb809c0e65de564b96a 100644 (file)
@@ -1267,8 +1267,6 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
                        iscsit_put_transport(conn->conn_transport);
                        kfree(conn);
                        conn = NULL;
-                       if (ret == -ENODEV)
-                               goto out;
                        /* Get another socket */
                        return 1;
                }