diff options
author | Avi Kaplan <savik751@gmail.com> | 2010-04-09 23:07:38 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 15:04:04 -0400 |
commit | c484a50a4db33c3d69a7750fd4fbf7b60d39940d (patch) | |
tree | b41325e8bc0273c1d418c31366127ef31ff9e514 /drivers/scsi | |
parent | 5738d4449c1baf05e8345684d12371f76296473d (diff) |
[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: Avi Kaplan <savik751@gmail.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 0ee725ced511..d0bb1f9c5741 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -206,8 +206,10 @@ static void iscsi_sw_tcp_conn_set_callbacks(struct iscsi_conn *conn) | |||
206 | } | 206 | } |
207 | 207 | ||
208 | static void | 208 | static void |
209 | iscsi_sw_tcp_conn_restore_callbacks(struct iscsi_sw_tcp_conn *tcp_sw_conn) | 209 | iscsi_sw_tcp_conn_restore_callbacks(struct iscsi_conn *conn) |
210 | { | 210 | { |
211 | struct iscsi_tcp_conn *tcp_conn = conn->dd_data; | ||
212 | struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data; | ||
211 | struct sock *sk = tcp_sw_conn->sock->sk; | 213 | struct sock *sk = tcp_sw_conn->sock->sk; |
212 | 214 | ||
213 | /* restore socket callbacks, see also: iscsi_conn_set_callbacks() */ | 215 | /* restore socket callbacks, see also: iscsi_conn_set_callbacks() */ |
@@ -555,7 +557,7 @@ static void iscsi_sw_tcp_release_conn(struct iscsi_conn *conn) | |||
555 | return; | 557 | return; |
556 | 558 | ||
557 | sock_hold(sock->sk); | 559 | sock_hold(sock->sk); |
558 | iscsi_sw_tcp_conn_restore_callbacks(tcp_sw_conn); | 560 | iscsi_sw_tcp_conn_restore_callbacks(conn); |
559 | sock_put(sock->sk); | 561 | sock_put(sock->sk); |
560 | 562 | ||
561 | spin_lock_bh(&session->lock); | 563 | spin_lock_bh(&session->lock); |