diff options
| author | Avi Kaplan <savik751@gmail.com> | 2010-04-09 22:07:38 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 14:04:04 -0500 |
| commit | c484a50a4db33c3d69a7750fd4fbf7b60d39940d (patch) | |
| tree | b41325e8bc0273c1d418c31366127ef31ff9e514 /drivers/scsi/iscsi_tcp.c | |
| parent | 5738d4449c1baf05e8345684d12371f76296473d (diff) | |
| download | lwn-c484a50a4db33c3d69a7750fd4fbf7b60d39940d.tar.gz lwn-c484a50a4db33c3d69a7750fd4fbf7b60d39940d.zip | |
[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/iscsi_tcp.c')
| -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) } 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; /* 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; sock_hold(sock->sk); - iscsi_sw_tcp_conn_restore_callbacks(tcp_sw_conn); + iscsi_sw_tcp_conn_restore_callbacks(conn); sock_put(sock->sk); spin_lock_bh(&session->lock); |