summaryrefslogtreecommitdiffstats
path: root/drivers/target/iscsi/iscsi_target_nego.c
diff options
context:
space:
mode:
authorNicholas Bellinger2013-09-05 23:55:37 +0200
committerNicholas Bellinger2013-09-09 23:26:48 +0200
commitea3a179abee6792b2b08f8710e19adbc75e866b1 (patch)
treef79d26f00ca02f11fd2e88055c159c6a11cc27f4 /drivers/target/iscsi/iscsi_target_nego.c
parentiscsi-target: Add sk->sk_state_change to cleanup after TCP failure (diff)
downloadkernel-qcow2-linux-ea3a179abee6792b2b08f8710e19adbc75e866b1.tar.gz
kernel-qcow2-linux-ea3a179abee6792b2b08f8710e19adbc75e866b1.tar.xz
kernel-qcow2-linux-ea3a179abee6792b2b08f8710e19adbc75e866b1.zip
iscsi-target: Remove left-over iscsi_target_do_login_io
There is no need for iscsi_target_do_login_io() anymore in modern code, so go ahead and call iscsi_target_do_tx_login_io() directly within iscsi_target_do_login(). Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_nego.c')
-rw-r--r--drivers/target/iscsi/iscsi_target_nego.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index 9d0c910e41f9..2cce636d1113 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -657,14 +657,6 @@ static void iscsi_target_sk_state_change(struct sock *sk)
orig_state_change(sk);
}
-static int iscsi_target_do_login_io(struct iscsi_conn *conn, struct iscsi_login *login)
-{
- if (iscsi_target_do_tx_login_io(conn, login) < 0)
- return -1;
-
- return 0;
-}
-
/*
* NOTE: We check for existing sessions or connections AFTER the initiator
* has been successfully authenticated in order to protect against faked
@@ -934,7 +926,7 @@ static int iscsi_target_do_login(struct iscsi_conn *conn, struct iscsi_login *lo
break;
}
- if (iscsi_target_do_login_io(conn, login) < 0)
+ if (iscsi_target_do_tx_login_io(conn, login) < 0)
return -1;
if (login_rsp->flags & ISCSI_FLAG_LOGIN_TRANSIT) {