summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kaplan <savik751@gmail.com>2010-03-02 12:42:21 +0200
committerMike Christie <michaelc@cs.wisc.edu>2010-03-02 22:00:42 -0600
commit1b6a16b5df857e37d75379371aeaa30de6e0f769 (patch)
tree51c60dc90b710d52972eea6107331e065915f8e9
parentb68b79b8a4b6d80c5c85179ae9446e3b6ef34029 (diff)
downloadopen-iscsi-1b6a16b5df857e37d75379371aeaa30de6e0f769.tar.gz
Change restore_callbacks argument iscsi_sw_tcp_conn to iscsi_conn
Signed-off-by: Avi Kaplan <savik751@gmail.com>
-rw-r--r--kernel/iscsi_tcp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/iscsi_tcp.c b/kernel/iscsi_tcp.c
index aa4abdb..acc7096 100644
--- a/kernel/iscsi_tcp.c
+++ b/kernel/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);