Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c484a50a authored by Avi Kaplan's avatar Avi Kaplan Committed by James Bottomley
Browse files

[SCSI] iscsi_tcp: Change iscsi_sw_tcp_conn_restore_callbacks arguments 



This patch changes the arguments to iscsi_sw_tcp_conn_restore_callbacks,
so that it works like the function to set the callbacks and because
in upcoming patches we need a iscsi_conn.

Signed-off-by: default avatarAvi Kaplan <savik751@gmail.com>
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 5738d444

drivers/scsi/iscsi_tcp.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -206,8 +206,10 @@ static void iscsi_sw_tcp_conn_set_callbacks(struct iscsi_conn *conn) 
}

}





static void

static void

iscsi_sw_tcp_conn_restore_callbacks(struct iscsi_sw_tcp_conn *tcp_sw_conn)

iscsi_sw_tcp_conn_restore_callbacks(struct iscsi_conn *conn)

{

{

	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;

	struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;

	struct sock *sk = tcp_sw_conn->sock->sk;

	struct sock *sk = tcp_sw_conn->sock->sk;





	/* restore socket callbacks, see also: iscsi_conn_set_callbacks() */

	/* restore socket callbacks, see also: iscsi_conn_set_callbacks() */
@@ -555,7 +557,7 @@ static void iscsi_sw_tcp_release_conn(struct iscsi_conn *conn) 
		return;

		return;





	sock_hold(sock->sk);

	sock_hold(sock->sk);

	iscsi_sw_tcp_conn_restore_callbacks(tcp_sw_conn);

	iscsi_sw_tcp_conn_restore_callbacks(conn);

	sock_put(sock->sk);

	sock_put(sock->sk);





	spin_lock_bh(&session->lock);

	spin_lock_bh(&session->lock);