aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2014-09-17 16:17:55 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2014-09-17 16:33:14 -0400
commit1d30686da4a40029cb48eab28442896b58aeceef (patch)
tree0478a7167324ad6e93fd514a57c1deb75e31425e
parent5c22e2294156377b7e2d2d99aaffea9ae6994452 (diff)
iscsi-target: Drop duplicate __iscsi_target_login_thread check
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>
-rw-r--r--drivers/target/iscsi/iscsi_target_login.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index b1ae5cbe70f8..02d5ccd0eaa1 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -1267,8 +1267,6 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
1267 iscsit_put_transport(conn->conn_transport); 1267 iscsit_put_transport(conn->conn_transport);
1268 kfree(conn); 1268 kfree(conn);
1269 conn = NULL; 1269 conn = NULL;
1270 if (ret == -ENODEV)
1271 goto out;
1272 /* Get another socket */ 1270 /* Get another socket */
1273 return 1; 1271 return 1;
1274 } 1272 }