From: Nicholas Bellinger Date: Thu, 5 Sep 2013 21:55:37 +0000 (-0700) Subject: iscsi-target: Remove left-over iscsi_target_do_login_io X-Git-Tag: firefly_0821_release~176^2~5311^2~43 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea3a179abee6792b2b08f8710e19adbc75e866b1;p=firefly-linux-kernel-4.4.55.git 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 --- 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) {