[SCSI] iscsi_tcp: add iscsi_tcp prefix to iscsi_tcp functions
Add iscsi_tcp prefix to most functions. Some are not changed becuase they are going to move in the next patch. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
cfeb2cf957
commit
30b4915015
1 changed files with 16 additions and 22 deletions
|
@ -516,12 +516,11 @@ static void iscsi_tcp_cleanup_task(struct iscsi_task *task)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iscsi_data_in - SCSI Data-In Response processing
|
* iscsi_tcp_data_in - SCSI Data-In Response processing
|
||||||
* @conn: iscsi connection
|
* @conn: iscsi connection
|
||||||
* @task: scsi command task
|
* @task: scsi command task
|
||||||
**/
|
*/
|
||||||
static int
|
static int iscsi_tcp_data_in(struct iscsi_conn *conn, struct iscsi_task *task)
|
||||||
iscsi_data_in(struct iscsi_conn *conn, struct iscsi_task *task)
|
|
||||||
{
|
{
|
||||||
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
||||||
struct iscsi_tcp_task *tcp_task = task->dd_data;
|
struct iscsi_tcp_task *tcp_task = task->dd_data;
|
||||||
|
@ -554,12 +553,11 @@ iscsi_data_in(struct iscsi_conn *conn, struct iscsi_task *task)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iscsi_r2t_rsp - iSCSI R2T Response processing
|
* iscsi_tcp_r2t_rsp - iSCSI R2T Response processing
|
||||||
* @conn: iscsi connection
|
* @conn: iscsi connection
|
||||||
* @task: scsi command task
|
* @task: scsi command task
|
||||||
**/
|
*/
|
||||||
static int
|
static int iscsi_tcp_r2t_rsp(struct iscsi_conn *conn, struct iscsi_task *task)
|
||||||
iscsi_r2t_rsp(struct iscsi_conn *conn, struct iscsi_task *task)
|
|
||||||
{
|
{
|
||||||
struct iscsi_session *session = conn->session;
|
struct iscsi_session *session = conn->session;
|
||||||
struct iscsi_tcp_task *tcp_task = task->dd_data;
|
struct iscsi_tcp_task *tcp_task = task->dd_data;
|
||||||
|
@ -710,7 +708,7 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
|
||||||
if (!task)
|
if (!task)
|
||||||
rc = ISCSI_ERR_BAD_ITT;
|
rc = ISCSI_ERR_BAD_ITT;
|
||||||
else
|
else
|
||||||
rc = iscsi_data_in(conn, task);
|
rc = iscsi_tcp_data_in(conn, task);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
spin_unlock(&conn->session->lock);
|
spin_unlock(&conn->session->lock);
|
||||||
break;
|
break;
|
||||||
|
@ -765,7 +763,7 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
|
||||||
else if (ahslen)
|
else if (ahslen)
|
||||||
rc = ISCSI_ERR_AHSLEN;
|
rc = ISCSI_ERR_AHSLEN;
|
||||||
else if (task->sc->sc_data_direction == DMA_TO_DEVICE)
|
else if (task->sc->sc_data_direction == DMA_TO_DEVICE)
|
||||||
rc = iscsi_r2t_rsp(conn, task);
|
rc = iscsi_tcp_r2t_rsp(conn, task);
|
||||||
else
|
else
|
||||||
rc = ISCSI_ERR_PROTO;
|
rc = ISCSI_ERR_PROTO;
|
||||||
spin_unlock(&conn->session->lock);
|
spin_unlock(&conn->session->lock);
|
||||||
|
@ -1053,8 +1051,7 @@ iscsi_tcp_state_change(struct sock *sk)
|
||||||
* iscsi_write_space - Called when more output buffer space is available
|
* iscsi_write_space - Called when more output buffer space is available
|
||||||
* @sk: socket space is available for
|
* @sk: socket space is available for
|
||||||
**/
|
**/
|
||||||
static void
|
static void iscsi_tcp_write_space(struct sock *sk)
|
||||||
iscsi_write_space(struct sock *sk)
|
|
||||||
{
|
{
|
||||||
struct iscsi_conn *conn = (struct iscsi_conn*)sk->sk_user_data;
|
struct iscsi_conn *conn = (struct iscsi_conn*)sk->sk_user_data;
|
||||||
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
||||||
|
@ -1064,8 +1061,7 @@ iscsi_write_space(struct sock *sk)
|
||||||
scsi_queue_work(conn->session->host, &conn->xmitwork);
|
scsi_queue_work(conn->session->host, &conn->xmitwork);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void iscsi_tcp_conn_set_callbacks(struct iscsi_conn *conn)
|
||||||
iscsi_conn_set_callbacks(struct iscsi_conn *conn)
|
|
||||||
{
|
{
|
||||||
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
||||||
struct sock *sk = tcp_conn->sock->sk;
|
struct sock *sk = tcp_conn->sock->sk;
|
||||||
|
@ -1078,12 +1074,11 @@ iscsi_conn_set_callbacks(struct iscsi_conn *conn)
|
||||||
tcp_conn->old_write_space = sk->sk_write_space;
|
tcp_conn->old_write_space = sk->sk_write_space;
|
||||||
sk->sk_data_ready = iscsi_tcp_data_ready;
|
sk->sk_data_ready = iscsi_tcp_data_ready;
|
||||||
sk->sk_state_change = iscsi_tcp_state_change;
|
sk->sk_state_change = iscsi_tcp_state_change;
|
||||||
sk->sk_write_space = iscsi_write_space;
|
sk->sk_write_space = iscsi_tcp_write_space;
|
||||||
write_unlock_bh(&sk->sk_callback_lock);
|
write_unlock_bh(&sk->sk_callback_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void iscsi_conn_restore_callbacks(struct iscsi_tcp_conn *tcp_conn)
|
||||||
iscsi_conn_restore_callbacks(struct iscsi_tcp_conn *tcp_conn)
|
|
||||||
{
|
{
|
||||||
struct sock *sk = tcp_conn->sock->sk;
|
struct sock *sk = tcp_conn->sock->sk;
|
||||||
|
|
||||||
|
@ -1098,10 +1093,9 @@ iscsi_conn_restore_callbacks(struct iscsi_tcp_conn *tcp_conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iscsi_xmit - TCP transmit
|
* iscsi_tcp_xmit - TCP transmit
|
||||||
**/
|
**/
|
||||||
static int
|
static int iscsi_tcp_xmit(struct iscsi_conn *conn)
|
||||||
iscsi_xmit(struct iscsi_conn *conn)
|
|
||||||
{
|
{
|
||||||
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
|
||||||
struct iscsi_segment *segment = &tcp_conn->out.segment;
|
struct iscsi_segment *segment = &tcp_conn->out.segment;
|
||||||
|
@ -1159,7 +1153,7 @@ static int iscsi_tcp_flush(struct iscsi_task *task)
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
while (iscsi_tcp_xmit_qlen(conn)) {
|
while (iscsi_tcp_xmit_qlen(conn)) {
|
||||||
rc = iscsi_xmit(conn);
|
rc = iscsi_tcp_xmit(conn);
|
||||||
if (rc == 0)
|
if (rc == 0)
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
|
@ -1625,7 +1619,7 @@ iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session,
|
||||||
sk->sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */
|
sk->sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */
|
||||||
sk->sk_allocation = GFP_ATOMIC;
|
sk->sk_allocation = GFP_ATOMIC;
|
||||||
|
|
||||||
iscsi_conn_set_callbacks(conn);
|
iscsi_tcp_conn_set_callbacks(conn);
|
||||||
tcp_conn->sendpage = tcp_conn->sock->ops->sendpage;
|
tcp_conn->sendpage = tcp_conn->sock->ops->sendpage;
|
||||||
/*
|
/*
|
||||||
* set receive state machine into initial state
|
* set receive state machine into initial state
|
||||||
|
|
Reference in a new issue