Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 66cd9d4e 编写于 作者: M Max Gurtovoy 提交者： Martin K. Petersen
浏览文件
操作

scsi: target: iscsi: Rename iscsi_cmd to iscsit_cmd 

The structure iscsi_cmd naming is used by the iSCSI initiator driver.
Rename the target cmd to iscsit_cmd to have more readable code.

Link: https://lore.kernel.org/r/20220428092939.36768-1-mgurtovoy@nvidia.comReviewed-by: NMike Christie <michael.christie@oracle.com>
Signed-off-by: NMax Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
上级 256bd4f2
展开全部 显示空白变更内容
内联 并排
Showing with 393 addition and 393 deletion
drivers/infiniband/ulp/isert/ib_isert.c
浏览文件 @ 66cd9d4e
...@@ -46,7 +46,7 @@ static struct workqueue_struct *isert_comp_wq; ...@@ -46,7 +46,7 @@ static struct workqueue_struct *isert_comp_wq;
static struct workqueue_struct *isert_release_wq; static struct workqueue_struct *isert_release_wq;
static int static int
isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd); isert_put_response(struct iscsi_conn *conn, struct iscsit_cmd *cmd);
static int static int
isert_login_post_recv(struct isert_conn *isert_conn); isert_login_post_recv(struct isert_conn *isert_conn);
static int static int
...@@ -1020,21 +1020,21 @@ isert_rx_login_req(struct isert_conn *isert_conn) ...@@ -1020,21 +1020,21 @@ isert_rx_login_req(struct isert_conn *isert_conn)
schedule_delayed_work(&conn->login_work, 0); schedule_delayed_work(&conn->login_work, 0);
} }
static struct iscsi_cmd static struct iscsit_cmd
*isert_allocate_cmd(struct iscsi_conn *conn, struct iser_rx_desc *rx_desc) *isert_allocate_cmd(struct iscsi_conn *conn, struct iser_rx_desc *rx_desc)
{ {
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
struct isert_cmd *isert_cmd; struct isert_cmd *isert_cmd;
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE); cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE);
if (!cmd) { if (!cmd) {
isert_err("Unable to allocate iscsi_cmd + isert_cmd\n"); isert_err("Unable to allocate iscsit_cmd + isert_cmd\n");
return NULL; return NULL;
} }
isert_cmd = iscsit_priv_cmd(cmd); isert_cmd = iscsit_priv_cmd(cmd);
isert_cmd->conn = isert_conn; isert_cmd->conn = isert_conn;
isert_cmd->iscsi_cmd = cmd; isert_cmd->iscsit_cmd = cmd;
isert_cmd->rx_desc = rx_desc; isert_cmd->rx_desc = rx_desc;
return cmd; return cmd;
...@@ -1042,7 +1042,7 @@ static struct iscsi_cmd ...@@ -1042,7 +1042,7 @@ static struct iscsi_cmd
static int static int
isert_handle_scsi_cmd(struct isert_conn *isert_conn, isert_handle_scsi_cmd(struct isert_conn *isert_conn,
struct isert_cmd *isert_cmd, struct iscsi_cmd *cmd, struct isert_cmd *isert_cmd, struct iscsit_cmd *cmd,
struct iser_rx_desc *rx_desc, unsigned char *buf) struct iser_rx_desc *rx_desc, unsigned char *buf)
{ {
struct iscsi_conn *conn = isert_conn->conn; struct iscsi_conn *conn = isert_conn->conn;
...@@ -1115,7 +1115,7 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn, ...@@ -1115,7 +1115,7 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
{ {
struct scatterlist *sg_start; struct scatterlist *sg_start;
struct iscsi_conn *conn = isert_conn->conn; struct iscsi_conn *conn = isert_conn->conn;
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
struct iscsi_data *hdr = (struct iscsi_data *)buf; struct iscsi_data *hdr = (struct iscsi_data *)buf;
u32 unsol_data_len = ntoh24(hdr->dlength); u32 unsol_data_len = ntoh24(hdr->dlength);
int rc, sg_nents, sg_off, page_off; int rc, sg_nents, sg_off, page_off;
...@@ -1171,7 +1171,7 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn, ...@@ -1171,7 +1171,7 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
static int static int
isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd, isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
struct iscsi_cmd *cmd, struct iser_rx_desc *rx_desc, struct iscsit_cmd *cmd, struct iser_rx_desc *rx_desc,
unsigned char *buf) unsigned char *buf)
{ {
struct iscsi_conn *conn = isert_conn->conn; struct iscsi_conn *conn = isert_conn->conn;
...@@ -1190,7 +1190,7 @@ isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd, ...@@ -1190,7 +1190,7 @@ isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
static int static int
isert_handle_text_cmd(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd, isert_handle_text_cmd(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
struct iscsi_cmd *cmd, struct iser_rx_desc *rx_desc, struct iscsit_cmd *cmd, struct iser_rx_desc *rx_desc,
struct iscsi_text *hdr) struct iscsi_text *hdr)
{ {
struct iscsi_conn *conn = isert_conn->conn; struct iscsi_conn *conn = isert_conn->conn;
...@@ -1221,7 +1221,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc, ...@@ -1221,7 +1221,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
{ {
struct iscsi_hdr *hdr = isert_get_iscsi_hdr(rx_desc); struct iscsi_hdr *hdr = isert_get_iscsi_hdr(rx_desc);
struct iscsi_conn *conn = isert_conn->conn; struct iscsi_conn *conn = isert_conn->conn;
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
struct isert_cmd *isert_cmd; struct isert_cmd *isert_cmd;
int ret = -EINVAL; int ret = -EINVAL;
u8 opcode = (hdr->opcode & ISCSI_OPCODE_MASK); u8 opcode = (hdr->opcode & ISCSI_OPCODE_MASK);
...@@ -1404,7 +1404,7 @@ isert_login_recv_done(struct ib_cq *cq, struct ib_wc *wc) ...@@ -1404,7 +1404,7 @@ isert_login_recv_done(struct ib_cq *cq, struct ib_wc *wc)
static void static void
isert_rdma_rw_ctx_destroy(struct isert_cmd *cmd, struct isert_conn *conn) isert_rdma_rw_ctx_destroy(struct isert_cmd *cmd, struct isert_conn *conn)
{ {
struct se_cmd *se_cmd = &cmd->iscsi_cmd->se_cmd; struct se_cmd *se_cmd = &cmd->iscsit_cmd->se_cmd;
enum dma_data_direction dir = target_reverse_dma_direction(se_cmd); enum dma_data_direction dir = target_reverse_dma_direction(se_cmd);
if (!cmd->rw.nr_ops) if (!cmd->rw.nr_ops)
...@@ -1426,7 +1426,7 @@ isert_rdma_rw_ctx_destroy(struct isert_cmd *cmd, struct isert_conn *conn) ...@@ -1426,7 +1426,7 @@ isert_rdma_rw_ctx_destroy(struct isert_cmd *cmd, struct isert_conn *conn)
static void static void
isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err) isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err)
{ {
struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd; struct iscsit_cmd *cmd = isert_cmd->iscsit_cmd;
struct isert_conn *isert_conn = isert_cmd->conn; struct isert_conn *isert_conn = isert_cmd->conn;
struct iscsi_conn *conn = isert_conn->conn; struct iscsi_conn *conn = isert_conn->conn;
struct iscsi_text_rsp *hdr; struct iscsi_text_rsp *hdr;
...@@ -1575,7 +1575,7 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc) ...@@ -1575,7 +1575,7 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc)
struct isert_device *device = isert_conn->device; struct isert_device *device = isert_conn->device;
struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe); struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe);
struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc); struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc);
struct se_cmd *cmd = &isert_cmd->iscsi_cmd->se_cmd; struct se_cmd *cmd = &isert_cmd->iscsit_cmd->se_cmd;
int ret = 0; int ret = 0;
if (unlikely(wc->status != IB_WC_SUCCESS)) { if (unlikely(wc->status != IB_WC_SUCCESS)) {
...@@ -1604,7 +1604,7 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc) ...@@ -1604,7 +1604,7 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc)
/* /*
* XXX: isert_put_response() failure is not retried. * XXX: isert_put_response() failure is not retried.
*/ */
ret = isert_put_response(isert_conn->conn, isert_cmd->iscsi_cmd); ret = isert_put_response(isert_conn->conn, isert_cmd->iscsit_cmd);
if (ret) if (ret)
pr_warn_ratelimited("isert_put_response() ret: %d\n", ret); pr_warn_ratelimited("isert_put_response() ret: %d\n", ret);
} }
...@@ -1617,7 +1617,7 @@ isert_rdma_read_done(struct ib_cq *cq, struct ib_wc *wc) ...@@ -1617,7 +1617,7 @@ isert_rdma_read_done(struct ib_cq *cq, struct ib_wc *wc)
struct isert_device *device = isert_conn->device; struct isert_device *device = isert_conn->device;
struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe); struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe);
struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc); struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc);
struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd; struct iscsit_cmd *cmd = isert_cmd->iscsit_cmd;
struct se_cmd *se_cmd = &cmd->se_cmd; struct se_cmd *se_cmd = &cmd->se_cmd;
int ret = 0; int ret = 0;
...@@ -1662,7 +1662,7 @@ isert_do_control_comp(struct work_struct *work) ...@@ -1662,7 +1662,7 @@ isert_do_control_comp(struct work_struct *work)
struct isert_cmd, comp_work); struct isert_cmd, comp_work);
struct isert_conn *isert_conn = isert_cmd->conn; struct isert_conn *isert_conn = isert_cmd->conn;
struct ib_device *ib_dev = isert_conn->cm_id->device; struct ib_device *ib_dev = isert_conn->cm_id->device;
struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd; struct iscsit_cmd *cmd = isert_cmd->iscsit_cmd;
isert_dbg("Cmd %p i_state %d\n", isert_cmd, cmd->i_state); isert_dbg("Cmd %p i_state %d\n", isert_cmd, cmd->i_state);
...@@ -1720,7 +1720,7 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc) ...@@ -1720,7 +1720,7 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc)
isert_dbg("Cmd %p\n", isert_cmd); isert_dbg("Cmd %p\n", isert_cmd);
switch (isert_cmd->iscsi_cmd->i_state) { switch (isert_cmd->iscsit_cmd->i_state) {
case ISTATE_SEND_TASKMGTRSP: case ISTATE_SEND_TASKMGTRSP:
case ISTATE_SEND_LOGOUTRSP: case ISTATE_SEND_LOGOUTRSP:
case ISTATE_SEND_REJECT: case ISTATE_SEND_REJECT:
...@@ -1731,7 +1731,7 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc) ...@@ -1731,7 +1731,7 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc)
queue_work(isert_comp_wq, &isert_cmd->comp_work); queue_work(isert_comp_wq, &isert_cmd->comp_work);
return; return;
default: default:
isert_cmd->iscsi_cmd->i_state = ISTATE_SENT_STATUS; isert_cmd->iscsit_cmd->i_state = ISTATE_SENT_STATUS;
isert_completion_put(tx_desc, isert_cmd, ib_dev, false); isert_completion_put(tx_desc, isert_cmd, ib_dev, false);
break; break;
} }
...@@ -1755,7 +1755,7 @@ isert_post_response(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd) ...@@ -1755,7 +1755,7 @@ isert_post_response(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd)
} }
static int static int
isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd) isert_put_response(struct iscsi_conn *conn, struct iscsit_cmd *cmd)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
...@@ -1806,7 +1806,7 @@ isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd) ...@@ -1806,7 +1806,7 @@ isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
} }
static void static void
isert_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) isert_aborted_task(struct iscsi_conn *conn, struct iscsit_cmd *cmd)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
...@@ -1842,7 +1842,7 @@ isert_get_sup_prot_ops(struct iscsi_conn *conn) ...@@ -1842,7 +1842,7 @@ isert_get_sup_prot_ops(struct iscsi_conn *conn)
} }
static int static int
isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn, isert_put_nopin(struct iscsit_cmd *cmd, struct iscsi_conn *conn,
bool nopout_response) bool nopout_response)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
...@@ -1862,7 +1862,7 @@ isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn, ...@@ -1862,7 +1862,7 @@ isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn,
} }
static int static int
isert_put_logout_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) isert_put_logout_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
...@@ -1880,7 +1880,7 @@ isert_put_logout_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) ...@@ -1880,7 +1880,7 @@ isert_put_logout_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
} }
static int static int
isert_put_tm_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) isert_put_tm_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
...@@ -1898,7 +1898,7 @@ isert_put_tm_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) ...@@ -1898,7 +1898,7 @@ isert_put_tm_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
} }
static int static int
isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn) isert_put_reject(struct iscsit_cmd *cmd, struct iscsi_conn *conn)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
...@@ -1933,7 +1933,7 @@ isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn) ...@@ -1933,7 +1933,7 @@ isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
} }
static int static int
isert_put_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) isert_put_text_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
...@@ -2035,7 +2035,7 @@ static int ...@@ -2035,7 +2035,7 @@ static int
isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn, isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn,
struct ib_cqe *cqe, struct ib_send_wr *chain_wr) struct ib_cqe *cqe, struct ib_send_wr *chain_wr)
{ {
struct se_cmd *se_cmd = &cmd->iscsi_cmd->se_cmd; struct se_cmd *se_cmd = &cmd->iscsit_cmd->se_cmd;
enum dma_data_direction dir = target_reverse_dma_direction(se_cmd); enum dma_data_direction dir = target_reverse_dma_direction(se_cmd);
u8 port_num = conn->cm_id->port_num; u8 port_num = conn->cm_id->port_num;
u64 addr; u64 addr;
...@@ -2048,7 +2048,7 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn, ...@@ -2048,7 +2048,7 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn,
if (dir == DMA_FROM_DEVICE) { if (dir == DMA_FROM_DEVICE) {
addr = cmd->write_va; addr = cmd->write_va;
rkey = cmd->write_stag; rkey = cmd->write_stag;
offset = cmd->iscsi_cmd->write_data_done; offset = cmd->iscsit_cmd->write_data_done;
} else { } else {
addr = cmd->read_va; addr = cmd->read_va;
rkey = cmd->read_stag; rkey = cmd->read_stag;
...@@ -2088,7 +2088,7 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn, ...@@ -2088,7 +2088,7 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn,
} }
static int static int
isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd) isert_put_datain(struct iscsi_conn *conn, struct iscsit_cmd *cmd)
{ {
struct se_cmd *se_cmd = &cmd->se_cmd; struct se_cmd *se_cmd = &cmd->se_cmd;
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
...@@ -2129,7 +2129,7 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd) ...@@ -2129,7 +2129,7 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
} }
static int static int
isert_get_dataout(struct iscsi_conn *conn, struct iscsi_cmd *cmd, bool recovery) isert_get_dataout(struct iscsi_conn *conn, struct iscsit_cmd *cmd, bool recovery)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
int ret; int ret;
...@@ -2147,7 +2147,7 @@ isert_get_dataout(struct iscsi_conn *conn, struct iscsi_cmd *cmd, bool recovery) ...@@ -2147,7 +2147,7 @@ isert_get_dataout(struct iscsi_conn *conn, struct iscsi_cmd *cmd, bool recovery)
} }
static int static int
isert_immediate_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state) isert_immediate_queue(struct iscsi_conn *conn, struct iscsit_cmd *cmd, int state)
{ {
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
int ret = 0; int ret = 0;
...@@ -2172,7 +2172,7 @@ isert_immediate_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state) ...@@ -2172,7 +2172,7 @@ isert_immediate_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state)
} }
static int static int
isert_response_queue(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int state) isert_response_queue(struct iscsi_conn *conn, struct iscsit_cmd *cmd, int state)
{ {
struct isert_conn *isert_conn = conn->context; struct isert_conn *isert_conn = conn->context;
int ret; int ret;
...@@ -2523,7 +2523,7 @@ isert_wait4cmds(struct iscsi_conn *conn) ...@@ -2523,7 +2523,7 @@ isert_wait4cmds(struct iscsi_conn *conn)
static void static void
isert_put_unsol_pending_cmds(struct iscsi_conn *conn) isert_put_unsol_pending_cmds(struct iscsi_conn *conn)
{ {
struct iscsi_cmd *cmd, *tmp; struct iscsit_cmd *cmd, *tmp;
static LIST_HEAD(drop_cmd_list); static LIST_HEAD(drop_cmd_list);
spin_lock_bh(&conn->cmd_lock); spin_lock_bh(&conn->cmd_lock);
......
drivers/infiniband/ulp/isert/ib_isert.h
浏览文件 @ 66cd9d4e
...@@ -146,7 +146,7 @@ struct isert_cmd { ...@@ -146,7 +146,7 @@ struct isert_cmd {
u64 pdu_buf_dma; u64 pdu_buf_dma;
u32 pdu_buf_len; u32 pdu_buf_len;
struct isert_conn *conn; struct isert_conn *conn;
struct iscsi_cmd *iscsi_cmd; struct iscsit_cmd *iscsit_cmd;
struct iser_tx_desc tx_desc; struct iser_tx_desc tx_desc;
struct iser_rx_desc *rx_desc; struct iser_rx_desc *rx_desc;
struct rdma_rw_ctx rw; struct rdma_rw_ctx rw;
......
drivers/target/iscsi/cxgbit/cxgbit.h
浏览文件 @ 66cd9d4e
...@@ -327,9 +327,9 @@ int cxgbit_l2t_send(struct cxgbit_device *, struct sk_buff *, ...@@ -327,9 +327,9 @@ int cxgbit_l2t_send(struct cxgbit_device *, struct sk_buff *,
struct l2t_entry *); struct l2t_entry *);
void cxgbit_push_tx_frames(struct cxgbit_sock *); void cxgbit_push_tx_frames(struct cxgbit_sock *);
int cxgbit_put_login_tx(struct iscsi_conn *, struct iscsi_login *, u32); int cxgbit_put_login_tx(struct iscsi_conn *, struct iscsi_login *, u32);
int cxgbit_xmit_pdu(struct iscsi_conn *, struct iscsi_cmd *, int cxgbit_xmit_pdu(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_datain_req *, const void *, u32); struct iscsi_datain_req *, const void *, u32);
void cxgbit_get_r2t_ttt(struct iscsi_conn *, struct iscsi_cmd *, void cxgbit_get_r2t_ttt(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_r2t *); struct iscsi_r2t *);
u32 cxgbit_send_tx_flowc_wr(struct cxgbit_sock *); u32 cxgbit_send_tx_flowc_wr(struct cxgbit_sock *);
int cxgbit_ofld_send(struct cxgbit_device *, struct sk_buff *); int cxgbit_ofld_send(struct cxgbit_device *, struct sk_buff *);
...@@ -340,8 +340,8 @@ struct cxgbit_device *cxgbit_find_device(struct net_device *, u8 *); ...@@ -340,8 +340,8 @@ struct cxgbit_device *cxgbit_find_device(struct net_device *, u8 *);
/* DDP */ /* DDP */
int cxgbit_ddp_init(struct cxgbit_device *); int cxgbit_ddp_init(struct cxgbit_device *);
int cxgbit_setup_conn_pgidx(struct cxgbit_sock *, u32); int cxgbit_setup_conn_pgidx(struct cxgbit_sock *, u32);
int cxgbit_reserve_ttt(struct cxgbit_sock *, struct iscsi_cmd *); int cxgbit_reserve_ttt(struct cxgbit_sock *, struct iscsit_cmd *);
void cxgbit_unmap_cmd(struct iscsi_conn *, struct iscsi_cmd *); void cxgbit_unmap_cmd(struct iscsi_conn *, struct iscsit_cmd *);
static inline static inline
struct cxgbi_ppm *cdev2ppm(struct cxgbit_device *cdev) struct cxgbi_ppm *cdev2ppm(struct cxgbit_device *cdev)
......
drivers/target/iscsi/cxgbit/cxgbit_ddp.c
浏览文件 @ 66cd9d4e
...@@ -227,7 +227,7 @@ cxgbit_ddp_reserve(struct cxgbit_sock *csk, struct cxgbi_task_tag_info *ttinfo, ...@@ -227,7 +227,7 @@ cxgbit_ddp_reserve(struct cxgbit_sock *csk, struct cxgbi_task_tag_info *ttinfo,
} }
void void
cxgbit_get_r2t_ttt(struct iscsi_conn *conn, struct iscsi_cmd *cmd, cxgbit_get_r2t_ttt(struct iscsi_conn *conn, struct iscsit_cmd *cmd,
struct iscsi_r2t *r2t) struct iscsi_r2t *r2t)
{ {
struct cxgbit_sock *csk = conn->context; struct cxgbit_sock *csk = conn->context;
...@@ -260,7 +260,7 @@ cxgbit_get_r2t_ttt(struct iscsi_conn *conn, struct iscsi_cmd *cmd, ...@@ -260,7 +260,7 @@ cxgbit_get_r2t_ttt(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
r2t->targ_xfer_tag = ttinfo->tag; r2t->targ_xfer_tag = ttinfo->tag;
} }
void cxgbit_unmap_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd) void cxgbit_unmap_cmd(struct iscsi_conn *conn, struct iscsit_cmd *cmd)
{ {
struct cxgbit_cmd *ccmd = iscsit_priv_cmd(cmd); struct cxgbit_cmd *ccmd = iscsit_priv_cmd(cmd);
......
drivers/target/iscsi/cxgbit/cxgbit_target.c
浏览文件 @ 66cd9d4e
...@@ -337,7 +337,7 @@ static int cxgbit_queue_skb(struct cxgbit_sock *csk, struct sk_buff *skb) ...@@ -337,7 +337,7 @@ static int cxgbit_queue_skb(struct cxgbit_sock *csk, struct sk_buff *skb)
} }
static int static int
cxgbit_map_skb(struct iscsi_cmd *cmd, struct sk_buff *skb, u32 data_offset, cxgbit_map_skb(struct iscsit_cmd *cmd, struct sk_buff *skb, u32 data_offset,
u32 data_length) u32 data_length)
{ {
u32 i = 0, nr_frags = MAX_SKB_FRAGS; u32 i = 0, nr_frags = MAX_SKB_FRAGS;
...@@ -390,7 +390,7 @@ cxgbit_map_skb(struct iscsi_cmd *cmd, struct sk_buff *skb, u32 data_offset, ...@@ -390,7 +390,7 @@ cxgbit_map_skb(struct iscsi_cmd *cmd, struct sk_buff *skb, u32 data_offset,
} }
static int static int
cxgbit_tx_datain_iso(struct cxgbit_sock *csk, struct iscsi_cmd *cmd, cxgbit_tx_datain_iso(struct cxgbit_sock *csk, struct iscsit_cmd *cmd,
struct iscsi_datain_req *dr) struct iscsi_datain_req *dr)
{ {
struct iscsi_conn *conn = csk->conn; struct iscsi_conn *conn = csk->conn;
...@@ -481,7 +481,7 @@ cxgbit_tx_datain_iso(struct cxgbit_sock *csk, struct iscsi_cmd *cmd, ...@@ -481,7 +481,7 @@ cxgbit_tx_datain_iso(struct cxgbit_sock *csk, struct iscsi_cmd *cmd,
} }
static int static int
cxgbit_tx_datain(struct cxgbit_sock *csk, struct iscsi_cmd *cmd, cxgbit_tx_datain(struct cxgbit_sock *csk, struct iscsit_cmd *cmd,
const struct iscsi_datain *datain) const struct iscsi_datain *datain)
{ {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -510,7 +510,7 @@ cxgbit_tx_datain(struct cxgbit_sock *csk, struct iscsi_cmd *cmd, ...@@ -510,7 +510,7 @@ cxgbit_tx_datain(struct cxgbit_sock *csk, struct iscsi_cmd *cmd,
} }
static int static int
cxgbit_xmit_datain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd, cxgbit_xmit_datain_pdu(struct iscsi_conn *conn, struct iscsit_cmd *cmd,
struct iscsi_datain_req *dr, struct iscsi_datain_req *dr,
const struct iscsi_datain *datain) const struct iscsi_datain *datain)
{ {
...@@ -530,7 +530,7 @@ cxgbit_xmit_datain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd, ...@@ -530,7 +530,7 @@ cxgbit_xmit_datain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
} }
static int static int
cxgbit_xmit_nondatain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd, cxgbit_xmit_nondatain_pdu(struct iscsi_conn *conn, struct iscsit_cmd *cmd,
const void *data_buf, u32 data_buf_len) const void *data_buf, u32 data_buf_len)
{ {
struct cxgbit_sock *csk = conn->context; struct cxgbit_sock *csk = conn->context;
...@@ -560,7 +560,7 @@ cxgbit_xmit_nondatain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd, ...@@ -560,7 +560,7 @@ cxgbit_xmit_nondatain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
} }
int int
cxgbit_xmit_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd, cxgbit_xmit_pdu(struct iscsi_conn *conn, struct iscsit_cmd *cmd,
struct iscsi_datain_req *dr, const void *buf, u32 buf_len) struct iscsi_datain_req *dr, const void *buf, u32 buf_len)
{ {
if (dr) if (dr)
...@@ -832,16 +832,16 @@ cxgbit_skb_copy_to_sg(struct sk_buff *skb, struct scatterlist *sg, ...@@ -832,16 +832,16 @@ cxgbit_skb_copy_to_sg(struct sk_buff *skb, struct scatterlist *sg,
} }
} }
static struct iscsi_cmd *cxgbit_allocate_cmd(struct cxgbit_sock *csk) static struct iscsit_cmd *cxgbit_allocate_cmd(struct cxgbit_sock *csk)
{ {
struct iscsi_conn *conn = csk->conn; struct iscsi_conn *conn = csk->conn;
struct cxgbi_ppm *ppm = cdev2ppm(csk->com.cdev); struct cxgbi_ppm *ppm = cdev2ppm(csk->com.cdev);
struct cxgbit_cmd *ccmd; struct cxgbit_cmd *ccmd;
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE); cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE);
if (!cmd) { if (!cmd) {
pr_err("Unable to allocate iscsi_cmd + cxgbit_cmd\n"); pr_err("Unable to allocate iscsit_cmd + cxgbit_cmd\n");
return NULL; return NULL;
} }
...@@ -853,7 +853,7 @@ static struct iscsi_cmd *cxgbit_allocate_cmd(struct cxgbit_sock *csk) ...@@ -853,7 +853,7 @@ static struct iscsi_cmd *cxgbit_allocate_cmd(struct cxgbit_sock *csk)
} }
static int static int
cxgbit_handle_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, cxgbit_handle_immediate_data(struct iscsit_cmd *cmd, struct iscsi_scsi_req *hdr,
u32 length) u32 length)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -910,7 +910,7 @@ cxgbit_handle_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, ...@@ -910,7 +910,7 @@ cxgbit_handle_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr,
} }
static int static int
cxgbit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, cxgbit_get_immediate_data(struct iscsit_cmd *cmd, struct iscsi_scsi_req *hdr,
bool dump_payload) bool dump_payload)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -964,7 +964,7 @@ cxgbit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, ...@@ -964,7 +964,7 @@ cxgbit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr,
} }
static int static int
cxgbit_handle_scsi_cmd(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) cxgbit_handle_scsi_cmd(struct cxgbit_sock *csk, struct iscsit_cmd *cmd)
{ {
struct iscsi_conn *conn = csk->conn; struct iscsi_conn *conn = csk->conn;
struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb); struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
...@@ -996,7 +996,7 @@ static int cxgbit_handle_iscsi_dataout(struct cxgbit_sock *csk) ...@@ -996,7 +996,7 @@ static int cxgbit_handle_iscsi_dataout(struct cxgbit_sock *csk)
{ {
struct scatterlist *sg_start; struct scatterlist *sg_start;
struct iscsi_conn *conn = csk->conn; struct iscsi_conn *conn = csk->conn;
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
struct cxgbit_cmd *ccmd; struct cxgbit_cmd *ccmd;
struct cxgbi_task_tag_info *ttinfo; struct cxgbi_task_tag_info *ttinfo;
struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb); struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
...@@ -1084,7 +1084,7 @@ static int cxgbit_handle_iscsi_dataout(struct cxgbit_sock *csk) ...@@ -1084,7 +1084,7 @@ static int cxgbit_handle_iscsi_dataout(struct cxgbit_sock *csk)
return 0; return 0;
} }
static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsit_cmd *cmd)
{ {
struct iscsi_conn *conn = csk->conn; struct iscsi_conn *conn = csk->conn;
struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb); struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
...@@ -1134,7 +1134,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) ...@@ -1134,7 +1134,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd)
ping_data[payload_length] = '\0'; ping_data[payload_length] = '\0';
/* /*
* Attach ping data to struct iscsi_cmd->buf_ptr. * Attach ping data to struct iscsit_cmd->buf_ptr.
*/ */
cmd->buf_ptr = ping_data; cmd->buf_ptr = ping_data;
cmd->buf_ptr_size = payload_length; cmd->buf_ptr_size = payload_length;
...@@ -1152,7 +1152,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) ...@@ -1152,7 +1152,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd)
} }
static int static int
cxgbit_handle_text_cmd(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) cxgbit_handle_text_cmd(struct cxgbit_sock *csk, struct iscsit_cmd *cmd)
{ {
struct iscsi_conn *conn = csk->conn; struct iscsi_conn *conn = csk->conn;
struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb); struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
...@@ -1210,7 +1210,7 @@ static int cxgbit_target_rx_opcode(struct cxgbit_sock *csk) ...@@ -1210,7 +1210,7 @@ static int cxgbit_target_rx_opcode(struct cxgbit_sock *csk)
struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb); struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
struct iscsi_hdr *hdr = (struct iscsi_hdr *)pdu_cb->hdr; struct iscsi_hdr *hdr = (struct iscsi_hdr *)pdu_cb->hdr;
struct iscsi_conn *conn = csk->conn; struct iscsi_conn *conn = csk->conn;
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
u8 opcode = (hdr->opcode & ISCSI_OPCODE_MASK); u8 opcode = (hdr->opcode & ISCSI_OPCODE_MASK);
int ret = -EINVAL; int ret = -EINVAL;
......
drivers/target/iscsi/iscsi_target.c
浏览文件 @ 66cd9d4e
此差异已折叠。
drivers/target/iscsi/iscsi_target.h
浏览文件 @ 66cd9d4e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_conn; struct iscsi_conn;
struct iscsi_np; struct iscsi_np;
struct iscsi_portal_group; struct iscsi_portal_group;
...@@ -30,13 +30,13 @@ extern struct iscsi_np *iscsit_add_np(struct sockaddr_storage *, ...@@ -30,13 +30,13 @@ extern struct iscsi_np *iscsit_add_np(struct sockaddr_storage *,
extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *, extern int iscsit_reset_np_thread(struct iscsi_np *, struct iscsi_tpg_np *,
struct iscsi_portal_group *, bool); struct iscsi_portal_group *, bool);
extern int iscsit_del_np(struct iscsi_np *); extern int iscsit_del_np(struct iscsi_np *);
extern int iscsit_reject_cmd(struct iscsi_cmd *cmd, u8, unsigned char *); extern int iscsit_reject_cmd(struct iscsit_cmd *cmd, u8, unsigned char *);
extern void iscsit_set_unsolicited_dataout(struct iscsi_cmd *); extern void iscsit_set_unsolicited_dataout(struct iscsit_cmd *);
extern int iscsit_logout_closesession(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_logout_closesession(struct iscsit_cmd *, struct iscsi_conn *);
extern int iscsit_logout_closeconnection(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_logout_closeconnection(struct iscsit_cmd *, struct iscsi_conn *);
extern int iscsit_logout_removeconnforrecovery(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_logout_removeconnforrecovery(struct iscsit_cmd *, struct iscsi_conn *);
extern int iscsit_send_async_msg(struct iscsi_conn *, u16, u8, u8); extern int iscsit_send_async_msg(struct iscsi_conn *, u16, u8, u8);
extern int iscsit_build_r2ts_for_cmd(struct iscsi_conn *, struct iscsi_cmd *, bool recovery); extern int iscsit_build_r2ts_for_cmd(struct iscsi_conn *, struct iscsit_cmd *, bool recovery);
extern void iscsit_thread_get_cpumask(struct iscsi_conn *); extern void iscsit_thread_get_cpumask(struct iscsi_conn *);
extern int iscsi_target_tx_thread(void *); extern int iscsi_target_tx_thread(void *);
extern int iscsi_target_rx_thread(void *); extern int iscsi_target_rx_thread(void *);
......
drivers/target/iscsi/iscsi_target_configfs.c
浏览文件 @ 66cd9d4e
...@@ -1340,7 +1340,7 @@ static struct configfs_attribute *lio_target_discovery_auth_attrs[] = { ...@@ -1340,7 +1340,7 @@ static struct configfs_attribute *lio_target_discovery_auth_attrs[] = {
static int iscsi_get_cmd_state(struct se_cmd *se_cmd) static int iscsi_get_cmd_state(struct se_cmd *se_cmd)
{ {
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsit_cmd *cmd = container_of(se_cmd, struct iscsit_cmd, se_cmd);
return cmd->i_state; return cmd->i_state;
} }
...@@ -1366,7 +1366,7 @@ static u32 lio_sess_get_initiator_sid( ...@@ -1366,7 +1366,7 @@ static u32 lio_sess_get_initiator_sid(
static int lio_queue_data_in(struct se_cmd *se_cmd) static int lio_queue_data_in(struct se_cmd *se_cmd)
{ {
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsit_cmd *cmd = container_of(se_cmd, struct iscsit_cmd, se_cmd);
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
cmd->i_state = ISTATE_SEND_DATAIN; cmd->i_state = ISTATE_SEND_DATAIN;
...@@ -1375,7 +1375,7 @@ static int lio_queue_data_in(struct se_cmd *se_cmd) ...@@ -1375,7 +1375,7 @@ static int lio_queue_data_in(struct se_cmd *se_cmd)
static int lio_write_pending(struct se_cmd *se_cmd) static int lio_write_pending(struct se_cmd *se_cmd)
{ {
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsit_cmd *cmd = container_of(se_cmd, struct iscsit_cmd, se_cmd);
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
if (!cmd->immediate_data && !cmd->unsolicited_data) if (!cmd->immediate_data && !cmd->unsolicited_data)
...@@ -1386,7 +1386,7 @@ static int lio_write_pending(struct se_cmd *se_cmd) ...@@ -1386,7 +1386,7 @@ static int lio_write_pending(struct se_cmd *se_cmd)
static int lio_queue_status(struct se_cmd *se_cmd) static int lio_queue_status(struct se_cmd *se_cmd)
{ {
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsit_cmd *cmd = container_of(se_cmd, struct iscsit_cmd, se_cmd);
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
cmd->i_state = ISTATE_SEND_STATUS; cmd->i_state = ISTATE_SEND_STATUS;
...@@ -1399,7 +1399,7 @@ static int lio_queue_status(struct se_cmd *se_cmd) ...@@ -1399,7 +1399,7 @@ static int lio_queue_status(struct se_cmd *se_cmd)
static void lio_queue_tm_rsp(struct se_cmd *se_cmd) static void lio_queue_tm_rsp(struct se_cmd *se_cmd)
{ {
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsit_cmd *cmd = container_of(se_cmd, struct iscsit_cmd, se_cmd);
cmd->i_state = ISTATE_SEND_TASKMGTRSP; cmd->i_state = ISTATE_SEND_TASKMGTRSP;
iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state); iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state);
...@@ -1407,7 +1407,7 @@ static void lio_queue_tm_rsp(struct se_cmd *se_cmd) ...@@ -1407,7 +1407,7 @@ static void lio_queue_tm_rsp(struct se_cmd *se_cmd)
static void lio_aborted_task(struct se_cmd *se_cmd) static void lio_aborted_task(struct se_cmd *se_cmd)
{ {
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsit_cmd *cmd = container_of(se_cmd, struct iscsit_cmd, se_cmd);
cmd->conn->conn_transport->iscsit_aborted_task(cmd->conn, cmd); cmd->conn->conn_transport->iscsit_aborted_task(cmd->conn, cmd);
} }
...@@ -1522,7 +1522,7 @@ static int lio_check_stop_free(struct se_cmd *se_cmd) ...@@ -1522,7 +1522,7 @@ static int lio_check_stop_free(struct se_cmd *se_cmd)
static void lio_release_cmd(struct se_cmd *se_cmd) static void lio_release_cmd(struct se_cmd *se_cmd)
{ {
struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd); struct iscsit_cmd *cmd = container_of(se_cmd, struct iscsit_cmd, se_cmd);
pr_debug("Entering lio_release_cmd for se_cmd: %p\n", se_cmd); pr_debug("Entering lio_release_cmd for se_cmd: %p\n", se_cmd);
iscsit_release_cmd(cmd); iscsit_release_cmd(cmd);
......
drivers/target/iscsi/iscsi_target_datain_values.c
浏览文件 @ 66cd9d4e
...@@ -32,14 +32,14 @@ struct iscsi_datain_req *iscsit_allocate_datain_req(void) ...@@ -32,14 +32,14 @@ struct iscsi_datain_req *iscsit_allocate_datain_req(void)
return dr; return dr;
} }
void iscsit_attach_datain_req(struct iscsi_cmd *cmd, struct iscsi_datain_req *dr) void iscsit_attach_datain_req(struct iscsit_cmd *cmd, struct iscsi_datain_req *dr)
{ {
spin_lock(&cmd->datain_lock); spin_lock(&cmd->datain_lock);
list_add_tail(&dr->cmd_datain_node, &cmd->datain_list); list_add_tail(&dr->cmd_datain_node, &cmd->datain_list);
spin_unlock(&cmd->datain_lock); spin_unlock(&cmd->datain_lock);
} }
void iscsit_free_datain_req(struct iscsi_cmd *cmd, struct iscsi_datain_req *dr) void iscsit_free_datain_req(struct iscsit_cmd *cmd, struct iscsi_datain_req *dr)
{ {
spin_lock(&cmd->datain_lock); spin_lock(&cmd->datain_lock);
list_del(&dr->cmd_datain_node); list_del(&dr->cmd_datain_node);
...@@ -48,7 +48,7 @@ void iscsit_free_datain_req(struct iscsi_cmd *cmd, struct iscsi_datain_req *dr) ...@@ -48,7 +48,7 @@ void iscsit_free_datain_req(struct iscsi_cmd *cmd, struct iscsi_datain_req *dr)
kmem_cache_free(lio_dr_cache, dr); kmem_cache_free(lio_dr_cache, dr);
} }
void iscsit_free_all_datain_reqs(struct iscsi_cmd *cmd) void iscsit_free_all_datain_reqs(struct iscsit_cmd *cmd)
{ {
struct iscsi_datain_req *dr, *dr_tmp; struct iscsi_datain_req *dr, *dr_tmp;
...@@ -60,7 +60,7 @@ void iscsit_free_all_datain_reqs(struct iscsi_cmd *cmd) ...@@ -60,7 +60,7 @@ void iscsit_free_all_datain_reqs(struct iscsi_cmd *cmd)
spin_unlock(&cmd->datain_lock); spin_unlock(&cmd->datain_lock);
} }
struct iscsi_datain_req *iscsit_get_datain_req(struct iscsi_cmd *cmd) struct iscsi_datain_req *iscsit_get_datain_req(struct iscsit_cmd *cmd)
{ {
if (list_empty(&cmd->datain_list)) { if (list_empty(&cmd->datain_list)) {
pr_err("cmd->datain_list is empty for ITT:" pr_err("cmd->datain_list is empty for ITT:"
...@@ -76,7 +76,7 @@ struct iscsi_datain_req *iscsit_get_datain_req(struct iscsi_cmd *cmd) ...@@ -76,7 +76,7 @@ struct iscsi_datain_req *iscsit_get_datain_req(struct iscsi_cmd *cmd)
* For Normal and Recovery DataSequenceInOrder=Yes and DataPDUInOrder=Yes. * For Normal and Recovery DataSequenceInOrder=Yes and DataPDUInOrder=Yes.
*/ */
static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_yes( static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_yes(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_datain *datain) struct iscsi_datain *datain)
{ {
u32 next_burst_len, read_data_done, read_data_left; u32 next_burst_len, read_data_done, read_data_left;
...@@ -174,7 +174,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_yes( ...@@ -174,7 +174,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_yes(
* For Normal and Recovery DataSequenceInOrder=No and DataPDUInOrder=Yes. * For Normal and Recovery DataSequenceInOrder=No and DataPDUInOrder=Yes.
*/ */
static struct iscsi_datain_req *iscsit_set_datain_values_no_and_yes( static struct iscsi_datain_req *iscsit_set_datain_values_no_and_yes(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_datain *datain) struct iscsi_datain *datain)
{ {
u32 offset, read_data_done, read_data_left, seq_send_order; u32 offset, read_data_done, read_data_left, seq_send_order;
...@@ -295,7 +295,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_no_and_yes( ...@@ -295,7 +295,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_no_and_yes(
* For Normal and Recovery DataSequenceInOrder=Yes and DataPDUInOrder=No. * For Normal and Recovery DataSequenceInOrder=Yes and DataPDUInOrder=No.
*/ */
static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_no( static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_no(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_datain *datain) struct iscsi_datain *datain)
{ {
u32 next_burst_len, read_data_done, read_data_left; u32 next_burst_len, read_data_done, read_data_left;
...@@ -394,7 +394,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_no( ...@@ -394,7 +394,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_yes_and_no(
* For Normal and Recovery DataSequenceInOrder=No and DataPDUInOrder=No. * For Normal and Recovery DataSequenceInOrder=No and DataPDUInOrder=No.
*/ */
static struct iscsi_datain_req *iscsit_set_datain_values_no_and_no( static struct iscsi_datain_req *iscsit_set_datain_values_no_and_no(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_datain *datain) struct iscsi_datain *datain)
{ {
u32 read_data_done, read_data_left, seq_send_order; u32 read_data_done, read_data_left, seq_send_order;
...@@ -496,7 +496,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_no_and_no( ...@@ -496,7 +496,7 @@ static struct iscsi_datain_req *iscsit_set_datain_values_no_and_no(
} }
struct iscsi_datain_req *iscsit_get_datain_values( struct iscsi_datain_req *iscsit_get_datain_values(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_datain *datain) struct iscsi_datain *datain)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
......
drivers/target/iscsi/iscsi_target_datain_values.h
浏览文件 @ 66cd9d4e
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
#ifndef ISCSI_TARGET_DATAIN_VALUES_H #ifndef ISCSI_TARGET_DATAIN_VALUES_H
#define ISCSI_TARGET_DATAIN_VALUES_H #define ISCSI_TARGET_DATAIN_VALUES_H
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_datain; struct iscsi_datain;
extern struct iscsi_datain_req *iscsit_allocate_datain_req(void); extern struct iscsi_datain_req *iscsit_allocate_datain_req(void);
extern void iscsit_attach_datain_req(struct iscsi_cmd *, struct iscsi_datain_req *); extern void iscsit_attach_datain_req(struct iscsit_cmd *, struct iscsi_datain_req *);
extern void iscsit_free_datain_req(struct iscsi_cmd *, struct iscsi_datain_req *); extern void iscsit_free_datain_req(struct iscsit_cmd *, struct iscsi_datain_req *);
extern void iscsit_free_all_datain_reqs(struct iscsi_cmd *); extern void iscsit_free_all_datain_reqs(struct iscsit_cmd *);
extern struct iscsi_datain_req *iscsit_get_datain_req(struct iscsi_cmd *); extern struct iscsi_datain_req *iscsit_get_datain_req(struct iscsit_cmd *);
extern struct iscsi_datain_req *iscsit_get_datain_values(struct iscsi_cmd *, extern struct iscsi_datain_req *iscsit_get_datain_values(struct iscsit_cmd *,
struct iscsi_datain *); struct iscsi_datain *);
#endif /*** ISCSI_TARGET_DATAIN_VALUES_H ***/ #endif /*** ISCSI_TARGET_DATAIN_VALUES_H ***/
drivers/target/iscsi/iscsi_target_device.c
浏览文件 @ 66cd9d4e
...@@ -42,7 +42,7 @@ void iscsit_determine_maxcmdsn(struct iscsi_session *sess) ...@@ -42,7 +42,7 @@ void iscsit_determine_maxcmdsn(struct iscsi_session *sess)
atomic_add(se_nacl->queue_depth - 1, &sess->max_cmd_sn); atomic_add(se_nacl->queue_depth - 1, &sess->max_cmd_sn);
} }
void iscsit_increment_maxcmdsn(struct iscsi_cmd *cmd, struct iscsi_session *sess) void iscsit_increment_maxcmdsn(struct iscsit_cmd *cmd, struct iscsi_session *sess)
{ {
u32 max_cmd_sn; u32 max_cmd_sn;
......
drivers/target/iscsi/iscsi_target_device.h
浏览文件 @ 66cd9d4e
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
#ifndef ISCSI_TARGET_DEVICE_H #ifndef ISCSI_TARGET_DEVICE_H
#define ISCSI_TARGET_DEVICE_H #define ISCSI_TARGET_DEVICE_H
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_session; struct iscsi_session;
extern void iscsit_determine_maxcmdsn(struct iscsi_session *); extern void iscsit_determine_maxcmdsn(struct iscsi_session *);
extern void iscsit_increment_maxcmdsn(struct iscsi_cmd *, struct iscsi_session *); extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsi_session *);
#endif /* ISCSI_TARGET_DEVICE_H */ #endif /* ISCSI_TARGET_DEVICE_H */
drivers/target/iscsi/iscsi_target_erl0.c
浏览文件 @ 66cd9d4e
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
#include "iscsi_target.h" #include "iscsi_target.h"
/* /*
* Used to set values in struct iscsi_cmd that iscsit_dataout_check_sequence() * Used to set values in struct iscsit_cmd that iscsit_dataout_check_sequence()
* checks against to determine a PDU's Offset+Length is within the current * checks against to determine a PDU's Offset+Length is within the current
* DataOUT Sequence. Used for DataSequenceInOrder=Yes only. * DataOUT Sequence. Used for DataSequenceInOrder=Yes only.
*/ */
void iscsit_set_dataout_sequence_values( void iscsit_set_dataout_sequence_values(
struct iscsi_cmd *cmd) struct iscsit_cmd *cmd)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
/* /*
...@@ -63,7 +63,7 @@ void iscsit_set_dataout_sequence_values( ...@@ -63,7 +63,7 @@ void iscsit_set_dataout_sequence_values(
} }
static int iscsit_dataout_within_command_recovery_check( static int iscsit_dataout_within_command_recovery_check(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -129,7 +129,7 @@ static int iscsit_dataout_within_command_recovery_check( ...@@ -129,7 +129,7 @@ static int iscsit_dataout_within_command_recovery_check(
} }
static int iscsit_dataout_check_unsolicited_sequence( static int iscsit_dataout_check_unsolicited_sequence(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
u32 first_burst_len; u32 first_burst_len;
...@@ -204,7 +204,7 @@ static int iscsit_dataout_check_unsolicited_sequence( ...@@ -204,7 +204,7 @@ static int iscsit_dataout_check_unsolicited_sequence(
} }
static int iscsit_dataout_check_sequence( static int iscsit_dataout_check_sequence(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
u32 next_burst_len; u32 next_burst_len;
...@@ -333,7 +333,7 @@ static int iscsit_dataout_check_sequence( ...@@ -333,7 +333,7 @@ static int iscsit_dataout_check_sequence(
} }
static int iscsit_dataout_check_datasn( static int iscsit_dataout_check_datasn(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
u32 data_sn = 0; u32 data_sn = 0;
...@@ -384,7 +384,7 @@ static int iscsit_dataout_check_datasn( ...@@ -384,7 +384,7 @@ static int iscsit_dataout_check_datasn(
} }
static int iscsit_dataout_pre_datapduinorder_yes( static int iscsit_dataout_pre_datapduinorder_yes(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
int dump = 0, recovery = 0; int dump = 0, recovery = 0;
...@@ -394,7 +394,7 @@ static int iscsit_dataout_pre_datapduinorder_yes( ...@@ -394,7 +394,7 @@ static int iscsit_dataout_pre_datapduinorder_yes(
/* /*
* For DataSequenceInOrder=Yes: If the offset is greater than the global * For DataSequenceInOrder=Yes: If the offset is greater than the global
* DataPDUInOrder=Yes offset counter in struct iscsi_cmd a protcol error has * DataPDUInOrder=Yes offset counter in struct iscsit_cmd a protcol error has
* occurred and fail the connection. * occurred and fail the connection.
* *
* For DataSequenceInOrder=No: If the offset is greater than the per * For DataSequenceInOrder=No: If the offset is greater than the per
...@@ -446,7 +446,7 @@ static int iscsit_dataout_pre_datapduinorder_yes( ...@@ -446,7 +446,7 @@ static int iscsit_dataout_pre_datapduinorder_yes(
} }
static int iscsit_dataout_pre_datapduinorder_no( static int iscsit_dataout_pre_datapduinorder_no(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
struct iscsi_pdu *pdu; struct iscsi_pdu *pdu;
...@@ -477,7 +477,7 @@ static int iscsit_dataout_pre_datapduinorder_no( ...@@ -477,7 +477,7 @@ static int iscsit_dataout_pre_datapduinorder_no(
return DATAOUT_NORMAL; return DATAOUT_NORMAL;
} }
static int iscsit_dataout_update_r2t(struct iscsi_cmd *cmd, u32 offset, u32 length) static int iscsit_dataout_update_r2t(struct iscsit_cmd *cmd, u32 offset, u32 length)
{ {
struct iscsi_r2t *r2t; struct iscsi_r2t *r2t;
...@@ -497,7 +497,7 @@ static int iscsit_dataout_update_r2t(struct iscsi_cmd *cmd, u32 offset, u32 leng ...@@ -497,7 +497,7 @@ static int iscsit_dataout_update_r2t(struct iscsi_cmd *cmd, u32 offset, u32 leng
} }
static int iscsit_dataout_update_datapduinorder_no( static int iscsit_dataout_update_datapduinorder_no(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 data_sn, u32 data_sn,
int f_bit) int f_bit)
{ {
...@@ -530,7 +530,7 @@ static int iscsit_dataout_update_datapduinorder_no( ...@@ -530,7 +530,7 @@ static int iscsit_dataout_update_datapduinorder_no(
} }
static int iscsit_dataout_post_crc_passed( static int iscsit_dataout_post_crc_passed(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
int ret, send_r2t = 0; int ret, send_r2t = 0;
...@@ -641,7 +641,7 @@ static int iscsit_dataout_post_crc_passed( ...@@ -641,7 +641,7 @@ static int iscsit_dataout_post_crc_passed(
} }
static int iscsit_dataout_post_crc_failed( static int iscsit_dataout_post_crc_failed(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -679,7 +679,7 @@ static int iscsit_dataout_post_crc_failed( ...@@ -679,7 +679,7 @@ static int iscsit_dataout_post_crc_failed(
* and CRC computed. * and CRC computed.
*/ */
int iscsit_check_pre_dataout( int iscsit_check_pre_dataout(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
int ret; int ret;
...@@ -717,7 +717,7 @@ int iscsit_check_pre_dataout( ...@@ -717,7 +717,7 @@ int iscsit_check_pre_dataout(
* and CRC computed. * and CRC computed.
*/ */
int iscsit_check_post_dataout( int iscsit_check_post_dataout(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf, unsigned char *buf,
u8 data_crc_failed) u8 data_crc_failed)
{ {
......
drivers/target/iscsi/iscsi_target_erl0.h
浏览文件 @ 66cd9d4e
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
#include <linux/types.h> #include <linux/types.h>
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_conn; struct iscsi_conn;
struct iscsi_session; struct iscsi_session;
extern void iscsit_set_dataout_sequence_values(struct iscsi_cmd *); extern void iscsit_set_dataout_sequence_values(struct iscsit_cmd *);
extern int iscsit_check_pre_dataout(struct iscsi_cmd *, unsigned char *); extern int iscsit_check_pre_dataout(struct iscsit_cmd *, unsigned char *);
extern int iscsit_check_post_dataout(struct iscsi_cmd *, unsigned char *, u8); extern int iscsit_check_post_dataout(struct iscsit_cmd *, unsigned char *, u8);
extern void iscsit_start_time2retain_handler(struct iscsi_session *); extern void iscsit_start_time2retain_handler(struct iscsi_session *);
extern void iscsit_handle_time2retain_timeout(struct timer_list *t); extern void iscsit_handle_time2retain_timeout(struct timer_list *t);
extern int iscsit_stop_time2retain_timer(struct iscsi_session *); extern int iscsit_stop_time2retain_timer(struct iscsi_session *);
......
drivers/target/iscsi/iscsi_target_erl1.c
浏览文件 @ 66cd9d4e
...@@ -87,7 +87,7 @@ int iscsit_dump_data_payload( ...@@ -87,7 +87,7 @@ int iscsit_dump_data_payload(
* Used for retransmitting R2Ts from a R2T SNACK request. * Used for retransmitting R2Ts from a R2T SNACK request.
*/ */
static int iscsit_send_recovery_r2t_for_snack( static int iscsit_send_recovery_r2t_for_snack(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_r2t *r2t) struct iscsi_r2t *r2t)
{ {
/* /*
...@@ -109,7 +109,7 @@ static int iscsit_send_recovery_r2t_for_snack( ...@@ -109,7 +109,7 @@ static int iscsit_send_recovery_r2t_for_snack(
} }
static int iscsit_handle_r2t_snack( static int iscsit_handle_r2t_snack(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf, unsigned char *buf,
u32 begrun, u32 begrun,
u32 runlength) u32 runlength)
...@@ -167,7 +167,7 @@ static int iscsit_handle_r2t_snack( ...@@ -167,7 +167,7 @@ static int iscsit_handle_r2t_snack(
* FIXME: How is this handled for a RData SNACK? * FIXME: How is this handled for a RData SNACK?
*/ */
int iscsit_create_recovery_datain_values_datasequenceinorder_yes( int iscsit_create_recovery_datain_values_datasequenceinorder_yes(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_datain_req *dr) struct iscsi_datain_req *dr)
{ {
u32 data_sn = 0, data_sn_count = 0; u32 data_sn = 0, data_sn_count = 0;
...@@ -213,7 +213,7 @@ int iscsit_create_recovery_datain_values_datasequenceinorder_yes( ...@@ -213,7 +213,7 @@ int iscsit_create_recovery_datain_values_datasequenceinorder_yes(
* FIXME: How is this handled for a RData SNACK? * FIXME: How is this handled for a RData SNACK?
*/ */
int iscsit_create_recovery_datain_values_datasequenceinorder_no( int iscsit_create_recovery_datain_values_datasequenceinorder_no(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_datain_req *dr) struct iscsi_datain_req *dr)
{ {
int found_seq = 0, i; int found_seq = 0, i;
...@@ -224,7 +224,7 @@ int iscsit_create_recovery_datain_values_datasequenceinorder_no( ...@@ -224,7 +224,7 @@ int iscsit_create_recovery_datain_values_datasequenceinorder_no(
struct iscsi_seq *first_seq = NULL, *seq = NULL; struct iscsi_seq *first_seq = NULL, *seq = NULL;
if (!cmd->seq_list) { if (!cmd->seq_list) {
pr_err("struct iscsi_cmd->seq_list is NULL!\n"); pr_err("struct iscsit_cmd->seq_list is NULL!\n");
return -1; return -1;
} }
...@@ -371,7 +371,7 @@ int iscsit_create_recovery_datain_values_datasequenceinorder_no( ...@@ -371,7 +371,7 @@ int iscsit_create_recovery_datain_values_datasequenceinorder_no(
} }
static int iscsit_handle_recovery_datain( static int iscsit_handle_recovery_datain(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf, unsigned char *buf,
u32 begrun, u32 begrun,
u32 runlength) u32 runlength)
...@@ -439,7 +439,7 @@ int iscsit_handle_recovery_datain_or_r2t( ...@@ -439,7 +439,7 @@ int iscsit_handle_recovery_datain_or_r2t(
u32 begrun, u32 begrun,
u32 runlength) u32 runlength)
{ {
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
cmd = iscsit_find_cmd_from_itt(conn, init_task_tag); cmd = iscsit_find_cmd_from_itt(conn, init_task_tag);
if (!cmd) if (!cmd)
...@@ -471,7 +471,7 @@ int iscsit_handle_status_snack( ...@@ -471,7 +471,7 @@ int iscsit_handle_status_snack(
u32 begrun, u32 begrun,
u32 runlength) u32 runlength)
{ {
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
u32 last_statsn; u32 last_statsn;
int found_cmd; int found_cmd;
...@@ -534,7 +534,7 @@ int iscsit_handle_data_ack( ...@@ -534,7 +534,7 @@ int iscsit_handle_data_ack(
u32 begrun, u32 begrun,
u32 runlength) u32 runlength)
{ {
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
cmd = iscsit_find_cmd_from_ttt(conn, targ_xfer_tag); cmd = iscsit_find_cmd_from_ttt(conn, targ_xfer_tag);
if (!cmd) { if (!cmd) {
...@@ -565,7 +565,7 @@ int iscsit_handle_data_ack( ...@@ -565,7 +565,7 @@ int iscsit_handle_data_ack(
} }
static int iscsit_send_recovery_r2t( static int iscsit_send_recovery_r2t(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 offset, u32 offset,
u32 xfer_len) u32 xfer_len)
{ {
...@@ -579,7 +579,7 @@ static int iscsit_send_recovery_r2t( ...@@ -579,7 +579,7 @@ static int iscsit_send_recovery_r2t(
} }
int iscsit_dataout_datapduinorder_no_fbit( int iscsit_dataout_datapduinorder_no_fbit(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_pdu *pdu) struct iscsi_pdu *pdu)
{ {
int i, send_recovery_r2t = 0, recovery = 0; int i, send_recovery_r2t = 0, recovery = 0;
...@@ -655,7 +655,7 @@ int iscsit_dataout_datapduinorder_no_fbit( ...@@ -655,7 +655,7 @@ int iscsit_dataout_datapduinorder_no_fbit(
} }
static int iscsit_recalculate_dataout_values( static int iscsit_recalculate_dataout_values(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 pdu_offset, u32 pdu_offset,
u32 pdu_length, u32 pdu_length,
u32 *r2t_offset, u32 *r2t_offset,
...@@ -732,7 +732,7 @@ static int iscsit_recalculate_dataout_values( ...@@ -732,7 +732,7 @@ static int iscsit_recalculate_dataout_values(
} }
int iscsit_recover_dataout_sequence( int iscsit_recover_dataout_sequence(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 pdu_offset, u32 pdu_offset,
u32 pdu_length) u32 pdu_length)
{ {
...@@ -843,7 +843,7 @@ void iscsit_clear_ooo_cmdsns_for_conn(struct iscsi_conn *conn) ...@@ -843,7 +843,7 @@ void iscsit_clear_ooo_cmdsns_for_conn(struct iscsi_conn *conn)
int iscsit_execute_ooo_cmdsns(struct iscsi_session *sess) int iscsit_execute_ooo_cmdsns(struct iscsi_session *sess)
{ {
int ooo_count = 0; int ooo_count = 0;
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
struct iscsi_ooo_cmdsn *ooo_cmdsn, *ooo_cmdsn_tmp; struct iscsi_ooo_cmdsn *ooo_cmdsn, *ooo_cmdsn_tmp;
lockdep_assert_held(&sess->cmdsn_mutex); lockdep_assert_held(&sess->cmdsn_mutex);
...@@ -884,7 +884,7 @@ int iscsit_execute_ooo_cmdsns(struct iscsi_session *sess) ...@@ -884,7 +884,7 @@ int iscsit_execute_ooo_cmdsns(struct iscsi_session *sess)
* 2. With no locks held directly from iscsi_handle_XXX_pdu() functions * 2. With no locks held directly from iscsi_handle_XXX_pdu() functions
* for immediate commands. * for immediate commands.
*/ */
int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo) int iscsit_execute_cmd(struct iscsit_cmd *cmd, int ooo)
{ {
struct se_cmd *se_cmd = &cmd->se_cmd; struct se_cmd *se_cmd = &cmd->se_cmd;
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -1010,7 +1010,7 @@ void iscsit_free_all_ooo_cmdsns(struct iscsi_session *sess) ...@@ -1010,7 +1010,7 @@ void iscsit_free_all_ooo_cmdsns(struct iscsi_session *sess)
int iscsit_handle_ooo_cmdsn( int iscsit_handle_ooo_cmdsn(
struct iscsi_session *sess, struct iscsi_session *sess,
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 cmdsn) u32 cmdsn)
{ {
int batch = 0; int batch = 0;
...@@ -1049,7 +1049,7 @@ int iscsit_handle_ooo_cmdsn( ...@@ -1049,7 +1049,7 @@ int iscsit_handle_ooo_cmdsn(
} }
static int iscsit_set_dataout_timeout_values( static int iscsit_set_dataout_timeout_values(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 *offset, u32 *offset,
u32 *length) u32 *length)
{ {
...@@ -1095,7 +1095,7 @@ void iscsit_handle_dataout_timeout(struct timer_list *t) ...@@ -1095,7 +1095,7 @@ void iscsit_handle_dataout_timeout(struct timer_list *t)
{ {
u32 pdu_length = 0, pdu_offset = 0; u32 pdu_length = 0, pdu_offset = 0;
u32 r2t_length = 0, r2t_offset = 0; u32 r2t_length = 0, r2t_offset = 0;
struct iscsi_cmd *cmd = from_timer(cmd, t, dataout_timer); struct iscsit_cmd *cmd = from_timer(cmd, t, dataout_timer);
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
struct iscsi_session *sess = NULL; struct iscsi_session *sess = NULL;
struct iscsi_node_attrib *na; struct iscsi_node_attrib *na;
...@@ -1179,7 +1179,7 @@ void iscsit_handle_dataout_timeout(struct timer_list *t) ...@@ -1179,7 +1179,7 @@ void iscsit_handle_dataout_timeout(struct timer_list *t)
iscsit_dec_conn_usage_count(conn); iscsit_dec_conn_usage_count(conn);
} }
void iscsit_mod_dataout_timer(struct iscsi_cmd *cmd) void iscsit_mod_dataout_timer(struct iscsit_cmd *cmd)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
struct iscsi_session *sess = conn->sess; struct iscsi_session *sess = conn->sess;
...@@ -1199,7 +1199,7 @@ void iscsit_mod_dataout_timer(struct iscsi_cmd *cmd) ...@@ -1199,7 +1199,7 @@ void iscsit_mod_dataout_timer(struct iscsi_cmd *cmd)
} }
void iscsit_start_dataout_timer( void iscsit_start_dataout_timer(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_session *sess = conn->sess; struct iscsi_session *sess = conn->sess;
...@@ -1218,7 +1218,7 @@ void iscsit_start_dataout_timer( ...@@ -1218,7 +1218,7 @@ void iscsit_start_dataout_timer(
mod_timer(&cmd->dataout_timer, jiffies + na->dataout_timeout * HZ); mod_timer(&cmd->dataout_timer, jiffies + na->dataout_timeout * HZ);
} }
void iscsit_stop_dataout_timer(struct iscsi_cmd *cmd) void iscsit_stop_dataout_timer(struct iscsit_cmd *cmd)
{ {
spin_lock_bh(&cmd->dataout_timeout_lock); spin_lock_bh(&cmd->dataout_timeout_lock);
if (!(cmd->dataout_timer_flags & ISCSI_TF_RUNNING)) { if (!(cmd->dataout_timer_flags & ISCSI_TF_RUNNING)) {
......
drivers/target/iscsi/iscsi_target_erl1.h
浏览文件 @ 66cd9d4e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <scsi/iscsi_proto.h> /* itt_t */ #include <scsi/iscsi_proto.h> /* itt_t */
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_conn; struct iscsi_conn;
struct iscsi_datain_req; struct iscsi_datain_req;
struct iscsi_ooo_cmdsn; struct iscsi_ooo_cmdsn;
...@@ -14,25 +14,25 @@ struct iscsi_session; ...@@ -14,25 +14,25 @@ struct iscsi_session;
extern int iscsit_dump_data_payload(struct iscsi_conn *, u32, int); extern int iscsit_dump_data_payload(struct iscsi_conn *, u32, int);
extern int iscsit_create_recovery_datain_values_datasequenceinorder_yes( extern int iscsit_create_recovery_datain_values_datasequenceinorder_yes(
struct iscsi_cmd *, struct iscsi_datain_req *); struct iscsit_cmd *, struct iscsi_datain_req *);
extern int iscsit_create_recovery_datain_values_datasequenceinorder_no( extern int iscsit_create_recovery_datain_values_datasequenceinorder_no(
struct iscsi_cmd *, struct iscsi_datain_req *); struct iscsit_cmd *, struct iscsi_datain_req *);
extern int iscsit_handle_recovery_datain_or_r2t(struct iscsi_conn *, unsigned char *, extern int iscsit_handle_recovery_datain_or_r2t(struct iscsi_conn *, unsigned char *,
itt_t, u32, u32, u32); itt_t, u32, u32, u32);
extern int iscsit_handle_status_snack(struct iscsi_conn *, itt_t, u32, extern int iscsit_handle_status_snack(struct iscsi_conn *, itt_t, u32,
u32, u32); u32, u32);
extern int iscsit_handle_data_ack(struct iscsi_conn *, u32, u32, u32); extern int iscsit_handle_data_ack(struct iscsi_conn *, u32, u32, u32);
extern int iscsit_dataout_datapduinorder_no_fbit(struct iscsi_cmd *, struct iscsi_pdu *); extern int iscsit_dataout_datapduinorder_no_fbit(struct iscsit_cmd *, struct iscsi_pdu *);
extern int iscsit_recover_dataout_sequence(struct iscsi_cmd *, u32, u32); extern int iscsit_recover_dataout_sequence(struct iscsit_cmd *, u32, u32);
extern void iscsit_clear_ooo_cmdsns_for_conn(struct iscsi_conn *); extern void iscsit_clear_ooo_cmdsns_for_conn(struct iscsi_conn *);
extern void iscsit_free_all_ooo_cmdsns(struct iscsi_session *); extern void iscsit_free_all_ooo_cmdsns(struct iscsi_session *);
extern int iscsit_execute_ooo_cmdsns(struct iscsi_session *); extern int iscsit_execute_ooo_cmdsns(struct iscsi_session *);
extern int iscsit_execute_cmd(struct iscsi_cmd *, int); extern int iscsit_execute_cmd(struct iscsit_cmd *, int);
extern int iscsit_handle_ooo_cmdsn(struct iscsi_session *, struct iscsi_cmd *, u32); extern int iscsit_handle_ooo_cmdsn(struct iscsi_session *, struct iscsit_cmd *, u32);
extern void iscsit_remove_ooo_cmdsn(struct iscsi_session *, struct iscsi_ooo_cmdsn *); extern void iscsit_remove_ooo_cmdsn(struct iscsi_session *, struct iscsi_ooo_cmdsn *);
extern void iscsit_handle_dataout_timeout(struct timer_list *t); extern void iscsit_handle_dataout_timeout(struct timer_list *t);
extern void iscsit_mod_dataout_timer(struct iscsi_cmd *); extern void iscsit_mod_dataout_timer(struct iscsit_cmd *);
extern void iscsit_start_dataout_timer(struct iscsi_cmd *, struct iscsi_conn *); extern void iscsit_start_dataout_timer(struct iscsit_cmd *, struct iscsi_conn *);
extern void iscsit_stop_dataout_timer(struct iscsi_cmd *); extern void iscsit_stop_dataout_timer(struct iscsit_cmd *);
#endif /* ISCSI_TARGET_ERL1_H */ #endif /* ISCSI_TARGET_ERL1_H */
drivers/target/iscsi/iscsi_target_erl2.c
浏览文件 @ 66cd9d4e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* FIXME: Does RData SNACK apply here as well? * FIXME: Does RData SNACK apply here as well?
*/ */
void iscsit_create_conn_recovery_datain_values( void iscsit_create_conn_recovery_datain_values(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
__be32 exp_data_sn) __be32 exp_data_sn)
{ {
u32 data_sn = 0; u32 data_sn = 0;
...@@ -54,7 +54,7 @@ void iscsit_create_conn_recovery_datain_values( ...@@ -54,7 +54,7 @@ void iscsit_create_conn_recovery_datain_values(
} }
void iscsit_create_conn_recovery_dataout_values( void iscsit_create_conn_recovery_dataout_values(
struct iscsi_cmd *cmd) struct iscsit_cmd *cmd)
{ {
u32 write_data_done = 0; u32 write_data_done = 0;
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -119,7 +119,7 @@ struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry( ...@@ -119,7 +119,7 @@ struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(
void iscsit_free_connection_recovery_entries(struct iscsi_session *sess) void iscsit_free_connection_recovery_entries(struct iscsi_session *sess)
{ {
struct iscsi_cmd *cmd, *cmd_tmp; struct iscsit_cmd *cmd, *cmd_tmp;
struct iscsi_conn_recovery *cr, *cr_tmp; struct iscsi_conn_recovery *cr, *cr_tmp;
spin_lock(&sess->cr_a_lock); spin_lock(&sess->cr_a_lock);
...@@ -197,7 +197,7 @@ static void iscsit_remove_inactive_connection_recovery_entry( ...@@ -197,7 +197,7 @@ static void iscsit_remove_inactive_connection_recovery_entry(
* Called with cr->conn_recovery_cmd_lock help. * Called with cr->conn_recovery_cmd_lock help.
*/ */
int iscsit_remove_cmd_from_connection_recovery( int iscsit_remove_cmd_from_connection_recovery(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_session *sess) struct iscsi_session *sess)
{ {
struct iscsi_conn_recovery *cr; struct iscsi_conn_recovery *cr;
...@@ -218,7 +218,7 @@ void iscsit_discard_cr_cmds_by_expstatsn( ...@@ -218,7 +218,7 @@ void iscsit_discard_cr_cmds_by_expstatsn(
u32 exp_statsn) u32 exp_statsn)
{ {
u32 dropped_count = 0; u32 dropped_count = 0;
struct iscsi_cmd *cmd, *cmd_tmp; struct iscsit_cmd *cmd, *cmd_tmp;
struct iscsi_session *sess = cr->sess; struct iscsi_session *sess = cr->sess;
spin_lock(&cr->conn_recovery_cmd_lock); spin_lock(&cr->conn_recovery_cmd_lock);
...@@ -266,7 +266,7 @@ void iscsit_discard_cr_cmds_by_expstatsn( ...@@ -266,7 +266,7 @@ void iscsit_discard_cr_cmds_by_expstatsn(
int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *conn) int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *conn)
{ {
u32 dropped_count = 0; u32 dropped_count = 0;
struct iscsi_cmd *cmd, *cmd_tmp; struct iscsit_cmd *cmd, *cmd_tmp;
struct iscsi_ooo_cmdsn *ooo_cmdsn, *ooo_cmdsn_tmp; struct iscsi_ooo_cmdsn *ooo_cmdsn, *ooo_cmdsn_tmp;
struct iscsi_session *sess = conn->sess; struct iscsi_session *sess = conn->sess;
...@@ -307,13 +307,13 @@ int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *conn) ...@@ -307,13 +307,13 @@ int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *conn)
int iscsit_prepare_cmds_for_reallegiance(struct iscsi_conn *conn) int iscsit_prepare_cmds_for_reallegiance(struct iscsi_conn *conn)
{ {
u32 cmd_count = 0; u32 cmd_count = 0;
struct iscsi_cmd *cmd, *cmd_tmp; struct iscsit_cmd *cmd, *cmd_tmp;
struct iscsi_conn_recovery *cr; struct iscsi_conn_recovery *cr;
/* /*
* Allocate an struct iscsi_conn_recovery for this connection. * Allocate an struct iscsi_conn_recovery for this connection.
* Each struct iscsi_cmd contains an struct iscsi_conn_recovery pointer * Each struct iscsit_cmd contains an struct iscsi_conn_recovery pointer
* (struct iscsi_cmd->cr) so we need to allocate this before preparing the * (struct iscsit_cmd->cr) so we need to allocate this before preparing the
* connection's command list for connection recovery. * connection's command list for connection recovery.
*/ */
cr = kzalloc(sizeof(struct iscsi_conn_recovery), GFP_KERNEL); cr = kzalloc(sizeof(struct iscsi_conn_recovery), GFP_KERNEL);
...@@ -393,7 +393,7 @@ int iscsit_prepare_cmds_for_reallegiance(struct iscsi_conn *conn) ...@@ -393,7 +393,7 @@ int iscsit_prepare_cmds_for_reallegiance(struct iscsi_conn *conn)
transport_wait_for_tasks(&cmd->se_cmd); transport_wait_for_tasks(&cmd->se_cmd);
/* /*
* Add the struct iscsi_cmd to the connection recovery cmd list * Add the struct iscsit_cmd to the connection recovery cmd list
*/ */
spin_lock(&cr->conn_recovery_cmd_lock); spin_lock(&cr->conn_recovery_cmd_lock);
list_add_tail(&cmd->i_conn_node, &cr->conn_recovery_cmd_list); list_add_tail(&cmd->i_conn_node, &cr->conn_recovery_cmd_list);
......
drivers/target/iscsi/iscsi_target_erl2.h
浏览文件 @ 66cd9d4e
...@@ -4,19 +4,19 @@ ...@@ -4,19 +4,19 @@
#include <linux/types.h> #include <linux/types.h>
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_conn; struct iscsi_conn;
struct iscsi_conn_recovery; struct iscsi_conn_recovery;
struct iscsi_session; struct iscsi_session;
extern void iscsit_create_conn_recovery_datain_values(struct iscsi_cmd *, __be32); extern void iscsit_create_conn_recovery_datain_values(struct iscsit_cmd *, __be32);
extern void iscsit_create_conn_recovery_dataout_values(struct iscsi_cmd *); extern void iscsit_create_conn_recovery_dataout_values(struct iscsit_cmd *);
extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry( extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(
struct iscsi_session *, u16); struct iscsi_session *, u16);
extern void iscsit_free_connection_recovery_entries(struct iscsi_session *); extern void iscsit_free_connection_recovery_entries(struct iscsi_session *);
extern int iscsit_remove_active_connection_recovery_entry( extern int iscsit_remove_active_connection_recovery_entry(
struct iscsi_conn_recovery *, struct iscsi_session *); struct iscsi_conn_recovery *, struct iscsi_session *);
extern int iscsit_remove_cmd_from_connection_recovery(struct iscsi_cmd *, extern int iscsit_remove_cmd_from_connection_recovery(struct iscsit_cmd *,
struct iscsi_session *); struct iscsi_session *);
extern void iscsit_discard_cr_cmds_by_expstatsn(struct iscsi_conn_recovery *, u32); extern void iscsit_discard_cr_cmds_by_expstatsn(struct iscsi_conn_recovery *, u32);
extern int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *); extern int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsi_conn *);
......
drivers/target/iscsi/iscsi_target_nego.c
浏览文件 @ 66cd9d4e
...@@ -1272,7 +1272,7 @@ int iscsi_target_locate_portal( ...@@ -1272,7 +1272,7 @@ int iscsi_target_locate_portal(
alloc_tags: alloc_tags:
tag_num = max_t(u32, ISCSIT_MIN_TAGS, queue_depth); tag_num = max_t(u32, ISCSIT_MIN_TAGS, queue_depth);
tag_num = (tag_num * 2) + ISCSIT_EXTRA_TAGS; tag_num = (tag_num * 2) + ISCSIT_EXTRA_TAGS;
tag_size = sizeof(struct iscsi_cmd) + conn->conn_transport->priv_size; tag_size = sizeof(struct iscsit_cmd) + conn->conn_transport->priv_size;
ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size); ret = transport_alloc_session_tags(sess->se_sess, tag_num, tag_size);
if (ret < 0) { if (ret < 0) {
......
drivers/target/iscsi/iscsi_target_seq_pdu_list.c
浏览文件 @ 66cd9d4e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "iscsi_target_seq_pdu_list.h" #include "iscsi_target_seq_pdu_list.h"
#ifdef DEBUG #ifdef DEBUG
static void iscsit_dump_seq_list(struct iscsi_cmd *cmd) static void iscsit_dump_seq_list(struct iscsit_cmd *cmd)
{ {
int i; int i;
struct iscsi_seq *seq; struct iscsi_seq *seq;
...@@ -36,7 +36,7 @@ static void iscsit_dump_seq_list(struct iscsi_cmd *cmd) ...@@ -36,7 +36,7 @@ static void iscsit_dump_seq_list(struct iscsi_cmd *cmd)
} }
} }
static void iscsit_dump_pdu_list(struct iscsi_cmd *cmd) static void iscsit_dump_pdu_list(struct iscsit_cmd *cmd)
{ {
int i; int i;
struct iscsi_pdu *pdu; struct iscsi_pdu *pdu;
...@@ -52,12 +52,12 @@ static void iscsit_dump_pdu_list(struct iscsi_cmd *cmd) ...@@ -52,12 +52,12 @@ static void iscsit_dump_pdu_list(struct iscsi_cmd *cmd)
} }
} }
#else #else
static void iscsit_dump_seq_list(struct iscsi_cmd *cmd) {} static void iscsit_dump_seq_list(struct iscsit_cmd *cmd) {}
static void iscsit_dump_pdu_list(struct iscsi_cmd *cmd) {} static void iscsit_dump_pdu_list(struct iscsit_cmd *cmd) {}
#endif #endif
static void iscsit_ordered_seq_lists( static void iscsit_ordered_seq_lists(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u8 type) u8 type)
{ {
u32 i, seq_count = 0; u32 i, seq_count = 0;
...@@ -70,7 +70,7 @@ static void iscsit_ordered_seq_lists( ...@@ -70,7 +70,7 @@ static void iscsit_ordered_seq_lists(
} }
static void iscsit_ordered_pdu_lists( static void iscsit_ordered_pdu_lists(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u8 type) u8 type)
{ {
u32 i, pdu_send_order = 0, seq_no = 0; u32 i, pdu_send_order = 0, seq_no = 0;
...@@ -117,7 +117,7 @@ static void iscsit_create_random_array(u32 *array, u32 count) ...@@ -117,7 +117,7 @@ static void iscsit_create_random_array(u32 *array, u32 count)
} }
static int iscsit_randomize_pdu_lists( static int iscsit_randomize_pdu_lists(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u8 type) u8 type)
{ {
int i = 0; int i = 0;
...@@ -167,7 +167,7 @@ static int iscsit_randomize_pdu_lists( ...@@ -167,7 +167,7 @@ static int iscsit_randomize_pdu_lists(
} }
static int iscsit_randomize_seq_lists( static int iscsit_randomize_seq_lists(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u8 type) u8 type)
{ {
int i, j = 0; int i, j = 0;
...@@ -199,7 +199,7 @@ static int iscsit_randomize_seq_lists( ...@@ -199,7 +199,7 @@ static int iscsit_randomize_seq_lists(
} }
static void iscsit_determine_counts_for_list( static void iscsit_determine_counts_for_list(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_build_list *bl, struct iscsi_build_list *bl,
u32 *seq_count, u32 *seq_count,
u32 *pdu_count) u32 *pdu_count)
...@@ -283,7 +283,7 @@ static void iscsit_determine_counts_for_list( ...@@ -283,7 +283,7 @@ static void iscsit_determine_counts_for_list(
* or DataPDUInOrder=No. * or DataPDUInOrder=No.
*/ */
static int iscsit_do_build_pdu_and_seq_lists( static int iscsit_do_build_pdu_and_seq_lists(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_build_list *bl) struct iscsi_build_list *bl)
{ {
int check_immediate = 0, datapduinorder, datasequenceinorder; int check_immediate = 0, datapduinorder, datasequenceinorder;
...@@ -484,7 +484,7 @@ static int iscsit_do_build_pdu_and_seq_lists( ...@@ -484,7 +484,7 @@ static int iscsit_do_build_pdu_and_seq_lists(
} }
int iscsit_build_pdu_and_seq_lists( int iscsit_build_pdu_and_seq_lists(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 immediate_data_length) u32 immediate_data_length)
{ {
struct iscsi_build_list bl; struct iscsi_build_list bl;
...@@ -559,7 +559,7 @@ int iscsit_build_pdu_and_seq_lists( ...@@ -559,7 +559,7 @@ int iscsit_build_pdu_and_seq_lists(
} }
struct iscsi_pdu *iscsit_get_pdu_holder( struct iscsi_pdu *iscsit_get_pdu_holder(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 offset, u32 offset,
u32 length) u32 length)
{ {
...@@ -567,7 +567,7 @@ struct iscsi_pdu *iscsit_get_pdu_holder( ...@@ -567,7 +567,7 @@ struct iscsi_pdu *iscsit_get_pdu_holder(
struct iscsi_pdu *pdu = NULL; struct iscsi_pdu *pdu = NULL;
if (!cmd->pdu_list) { if (!cmd->pdu_list) {
pr_err("struct iscsi_cmd->pdu_list is NULL!\n"); pr_err("struct iscsit_cmd->pdu_list is NULL!\n");
return NULL; return NULL;
} }
...@@ -583,7 +583,7 @@ struct iscsi_pdu *iscsit_get_pdu_holder( ...@@ -583,7 +583,7 @@ struct iscsi_pdu *iscsit_get_pdu_holder(
} }
struct iscsi_pdu *iscsit_get_pdu_holder_for_seq( struct iscsi_pdu *iscsit_get_pdu_holder_for_seq(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_seq *seq) struct iscsi_seq *seq)
{ {
u32 i; u32 i;
...@@ -591,7 +591,7 @@ struct iscsi_pdu *iscsit_get_pdu_holder_for_seq( ...@@ -591,7 +591,7 @@ struct iscsi_pdu *iscsit_get_pdu_holder_for_seq(
struct iscsi_pdu *pdu = NULL; struct iscsi_pdu *pdu = NULL;
if (!cmd->pdu_list) { if (!cmd->pdu_list) {
pr_err("struct iscsi_cmd->pdu_list is NULL!\n"); pr_err("struct iscsit_cmd->pdu_list is NULL!\n");
return NULL; return NULL;
} }
...@@ -660,14 +660,14 @@ struct iscsi_pdu *iscsit_get_pdu_holder_for_seq( ...@@ -660,14 +660,14 @@ struct iscsi_pdu *iscsit_get_pdu_holder_for_seq(
} }
struct iscsi_seq *iscsit_get_seq_holder( struct iscsi_seq *iscsit_get_seq_holder(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 offset, u32 offset,
u32 length) u32 length)
{ {
u32 i; u32 i;
if (!cmd->seq_list) { if (!cmd->seq_list) {
pr_err("struct iscsi_cmd->seq_list is NULL!\n"); pr_err("struct iscsit_cmd->seq_list is NULL!\n");
return NULL; return NULL;
} }
......
drivers/target/iscsi/iscsi_target_seq_pdu_list.h
浏览文件 @ 66cd9d4e
...@@ -82,11 +82,11 @@ struct iscsi_seq { ...@@ -82,11 +82,11 @@ struct iscsi_seq {
u32 xfer_len; u32 xfer_len;
} ____cacheline_aligned; } ____cacheline_aligned;
struct iscsi_cmd; struct iscsit_cmd;
extern int iscsit_build_pdu_and_seq_lists(struct iscsi_cmd *, u32); extern int iscsit_build_pdu_and_seq_lists(struct iscsit_cmd *, u32);
extern struct iscsi_pdu *iscsit_get_pdu_holder(struct iscsi_cmd *, u32, u32); extern struct iscsi_pdu *iscsit_get_pdu_holder(struct iscsit_cmd *, u32, u32);
extern struct iscsi_pdu *iscsit_get_pdu_holder_for_seq(struct iscsi_cmd *, struct iscsi_seq *); extern struct iscsi_pdu *iscsit_get_pdu_holder_for_seq(struct iscsit_cmd *, struct iscsi_seq *);
extern struct iscsi_seq *iscsit_get_seq_holder(struct iscsi_cmd *, u32, u32); extern struct iscsi_seq *iscsit_get_seq_holder(struct iscsit_cmd *, u32, u32);
#endif /* ISCSI_SEQ_AND_PDU_LIST_H */ #endif /* ISCSI_SEQ_AND_PDU_LIST_H */
drivers/target/iscsi/iscsi_target_tmr.c
浏览文件 @ 66cd9d4e
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
#include "iscsi_target.h" #include "iscsi_target.h"
u8 iscsit_tmr_abort_task( u8 iscsit_tmr_abort_task(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
struct iscsi_cmd *ref_cmd; struct iscsit_cmd *ref_cmd;
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
struct iscsi_tmr_req *tmr_req = cmd->tmr_req; struct iscsi_tmr_req *tmr_req = cmd->tmr_req;
struct se_tmr_req *se_tmr = cmd->se_cmd.se_tmr_req; struct se_tmr_req *se_tmr = cmd->se_cmd.se_tmr_req;
...@@ -103,10 +103,10 @@ int iscsit_tmr_task_cold_reset( ...@@ -103,10 +103,10 @@ int iscsit_tmr_task_cold_reset(
} }
u8 iscsit_tmr_task_reassign( u8 iscsit_tmr_task_reassign(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
unsigned char *buf) unsigned char *buf)
{ {
struct iscsi_cmd *ref_cmd = NULL; struct iscsit_cmd *ref_cmd = NULL;
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
struct iscsi_conn_recovery *cr = NULL; struct iscsi_conn_recovery *cr = NULL;
struct iscsi_tmr_req *tmr_req = cmd->tmr_req; struct iscsi_tmr_req *tmr_req = cmd->tmr_req;
...@@ -175,7 +175,7 @@ u8 iscsit_tmr_task_reassign( ...@@ -175,7 +175,7 @@ u8 iscsit_tmr_task_reassign(
} }
static void iscsit_task_reassign_remove_cmd( static void iscsit_task_reassign_remove_cmd(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn_recovery *cr, struct iscsi_conn_recovery *cr,
struct iscsi_session *sess) struct iscsi_session *sess)
{ {
...@@ -195,7 +195,7 @@ static int iscsit_task_reassign_complete_nop_out( ...@@ -195,7 +195,7 @@ static int iscsit_task_reassign_complete_nop_out(
struct iscsi_tmr_req *tmr_req, struct iscsi_tmr_req *tmr_req,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_cmd *cmd = tmr_req->ref_cmd; struct iscsit_cmd *cmd = tmr_req->ref_cmd;
struct iscsi_conn_recovery *cr; struct iscsi_conn_recovery *cr;
if (!cmd->cr) { if (!cmd->cr) {
...@@ -224,7 +224,7 @@ static int iscsit_task_reassign_complete_nop_out( ...@@ -224,7 +224,7 @@ static int iscsit_task_reassign_complete_nop_out(
} }
static int iscsit_task_reassign_complete_write( static int iscsit_task_reassign_complete_write(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_tmr_req *tmr_req) struct iscsi_tmr_req *tmr_req)
{ {
int no_build_r2ts = 0; int no_build_r2ts = 0;
...@@ -296,7 +296,7 @@ static int iscsit_task_reassign_complete_write( ...@@ -296,7 +296,7 @@ static int iscsit_task_reassign_complete_write(
} }
static int iscsit_task_reassign_complete_read( static int iscsit_task_reassign_complete_read(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_tmr_req *tmr_req) struct iscsi_tmr_req *tmr_req)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -349,7 +349,7 @@ static int iscsit_task_reassign_complete_read( ...@@ -349,7 +349,7 @@ static int iscsit_task_reassign_complete_read(
} }
static int iscsit_task_reassign_complete_none( static int iscsit_task_reassign_complete_none(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_tmr_req *tmr_req) struct iscsi_tmr_req *tmr_req)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -363,7 +363,7 @@ static int iscsit_task_reassign_complete_scsi_cmnd( ...@@ -363,7 +363,7 @@ static int iscsit_task_reassign_complete_scsi_cmnd(
struct iscsi_tmr_req *tmr_req, struct iscsi_tmr_req *tmr_req,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_cmd *cmd = tmr_req->ref_cmd; struct iscsit_cmd *cmd = tmr_req->ref_cmd;
struct iscsi_conn_recovery *cr; struct iscsi_conn_recovery *cr;
if (!cmd->cr) { if (!cmd->cr) {
...@@ -412,11 +412,11 @@ static int iscsit_task_reassign_complete( ...@@ -412,11 +412,11 @@ static int iscsit_task_reassign_complete(
struct iscsi_tmr_req *tmr_req, struct iscsi_tmr_req *tmr_req,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
int ret = 0; int ret = 0;
if (!tmr_req->ref_cmd) { if (!tmr_req->ref_cmd) {
pr_err("TMR Request is missing a RefCmd struct iscsi_cmd.\n"); pr_err("TMR Request is missing a RefCmd struct iscsit_cmd.\n");
return -1; return -1;
} }
cmd = tmr_req->ref_cmd; cmd = tmr_req->ref_cmd;
...@@ -451,7 +451,7 @@ static int iscsit_task_reassign_complete( ...@@ -451,7 +451,7 @@ static int iscsit_task_reassign_complete(
* Right now the only one that its really needed for is * Right now the only one that its really needed for is
* connection recovery releated TASK_REASSIGN. * connection recovery releated TASK_REASSIGN.
*/ */
int iscsit_tmr_post_handler(struct iscsi_cmd *cmd, struct iscsi_conn *conn) int iscsit_tmr_post_handler(struct iscsit_cmd *cmd, struct iscsi_conn *conn)
{ {
struct iscsi_tmr_req *tmr_req = cmd->tmr_req; struct iscsi_tmr_req *tmr_req = cmd->tmr_req;
struct se_tmr_req *se_tmr = cmd->se_cmd.se_tmr_req; struct se_tmr_req *se_tmr = cmd->se_cmd.se_tmr_req;
...@@ -475,7 +475,7 @@ static int iscsit_task_reassign_prepare_read( ...@@ -475,7 +475,7 @@ static int iscsit_task_reassign_prepare_read(
} }
static void iscsit_task_reassign_prepare_unsolicited_dataout( static void iscsit_task_reassign_prepare_unsolicited_dataout(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
int i, j; int i, j;
...@@ -546,7 +546,7 @@ static int iscsit_task_reassign_prepare_write( ...@@ -546,7 +546,7 @@ static int iscsit_task_reassign_prepare_write(
struct iscsi_tmr_req *tmr_req, struct iscsi_tmr_req *tmr_req,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_cmd *cmd = tmr_req->ref_cmd; struct iscsit_cmd *cmd = tmr_req->ref_cmd;
struct iscsi_pdu *pdu = NULL; struct iscsi_pdu *pdu = NULL;
struct iscsi_r2t *r2t = NULL, *r2t_tmp; struct iscsi_r2t *r2t = NULL, *r2t_tmp;
int first_incomplete_r2t = 1, i = 0; int first_incomplete_r2t = 1, i = 0;
...@@ -575,7 +575,7 @@ static int iscsit_task_reassign_prepare_write( ...@@ -575,7 +575,7 @@ static int iscsit_task_reassign_prepare_write(
* *
* If we have not received all DataOUT in question, we must * If we have not received all DataOUT in question, we must
* make sure to make the appropriate changes to values in * make sure to make the appropriate changes to values in
* struct iscsi_cmd (and elsewhere depending on session parameters) * struct iscsit_cmd (and elsewhere depending on session parameters)
* so iscsit_build_r2ts_for_cmd() in iscsit_task_reassign_complete_write() * so iscsit_build_r2ts_for_cmd() in iscsit_task_reassign_complete_write()
* will resend a new R2T for the DataOUT sequences in question. * will resend a new R2T for the DataOUT sequences in question.
*/ */
...@@ -708,7 +708,7 @@ static int iscsit_task_reassign_prepare_write( ...@@ -708,7 +708,7 @@ static int iscsit_task_reassign_prepare_write(
* to check that the Initiator is not requesting R2Ts for DataOUT * to check that the Initiator is not requesting R2Ts for DataOUT
* sequences it has already completed. * sequences it has already completed.
* *
* Free each R2T in question and adjust values in struct iscsi_cmd * Free each R2T in question and adjust values in struct iscsit_cmd
* accordingly so iscsit_build_r2ts_for_cmd() do the rest of * accordingly so iscsit_build_r2ts_for_cmd() do the rest of
* the work after the TMR TASK_REASSIGN Response is sent. * the work after the TMR TASK_REASSIGN Response is sent.
*/ */
...@@ -773,13 +773,13 @@ static int iscsit_task_reassign_prepare_write( ...@@ -773,13 +773,13 @@ static int iscsit_task_reassign_prepare_write(
/* /*
* Performs sanity checks TMR TASK_REASSIGN's ExpDataSN for * Performs sanity checks TMR TASK_REASSIGN's ExpDataSN for
* a given struct iscsi_cmd. * a given struct iscsit_cmd.
*/ */
int iscsit_check_task_reassign_expdatasn( int iscsit_check_task_reassign_expdatasn(
struct iscsi_tmr_req *tmr_req, struct iscsi_tmr_req *tmr_req,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_cmd *ref_cmd = tmr_req->ref_cmd; struct iscsit_cmd *ref_cmd = tmr_req->ref_cmd;
if (ref_cmd->iscsi_opcode != ISCSI_OP_SCSI_CMD) if (ref_cmd->iscsi_opcode != ISCSI_OP_SCSI_CMD)
return 0; return 0;
......
drivers/target/iscsi/iscsi_target_tmr.h
浏览文件 @ 66cd9d4e
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
#include <linux/types.h> #include <linux/types.h>
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_conn; struct iscsi_conn;
struct iscsi_tmr_req; struct iscsi_tmr_req;
extern u8 iscsit_tmr_abort_task(struct iscsi_cmd *, unsigned char *); extern u8 iscsit_tmr_abort_task(struct iscsit_cmd *, unsigned char *);
extern int iscsit_tmr_task_warm_reset(struct iscsi_conn *, struct iscsi_tmr_req *, extern int iscsit_tmr_task_warm_reset(struct iscsi_conn *, struct iscsi_tmr_req *,
unsigned char *); unsigned char *);
extern int iscsit_tmr_task_cold_reset(struct iscsi_conn *, struct iscsi_tmr_req *, extern int iscsit_tmr_task_cold_reset(struct iscsi_conn *, struct iscsi_tmr_req *,
unsigned char *); unsigned char *);
extern u8 iscsit_tmr_task_reassign(struct iscsi_cmd *, unsigned char *); extern u8 iscsit_tmr_task_reassign(struct iscsit_cmd *, unsigned char *);
extern int iscsit_tmr_post_handler(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_tmr_post_handler(struct iscsit_cmd *, struct iscsi_conn *);
extern int iscsit_check_task_reassign_expdatasn(struct iscsi_tmr_req *, extern int iscsit_check_task_reassign_expdatasn(struct iscsi_tmr_req *,
struct iscsi_conn *); struct iscsi_conn *);
......
drivers/target/iscsi/iscsi_target_util.c
浏览文件 @ 66cd9d4e
...@@ -32,7 +32,7 @@ extern struct list_head g_tiqn_list; ...@@ -32,7 +32,7 @@ extern struct list_head g_tiqn_list;
extern spinlock_t tiqn_lock; extern spinlock_t tiqn_lock;
int iscsit_add_r2t_to_list( int iscsit_add_r2t_to_list(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 offset, u32 offset,
u32 xfer_len, u32 xfer_len,
int recovery, int recovery,
...@@ -65,7 +65,7 @@ int iscsit_add_r2t_to_list( ...@@ -65,7 +65,7 @@ int iscsit_add_r2t_to_list(
} }
struct iscsi_r2t *iscsit_get_r2t_for_eos( struct iscsi_r2t *iscsit_get_r2t_for_eos(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 offset, u32 offset,
u32 length) u32 length)
{ {
...@@ -86,7 +86,7 @@ struct iscsi_r2t *iscsit_get_r2t_for_eos( ...@@ -86,7 +86,7 @@ struct iscsi_r2t *iscsit_get_r2t_for_eos(
return NULL; return NULL;
} }
struct iscsi_r2t *iscsit_get_r2t_from_list(struct iscsi_cmd *cmd) struct iscsi_r2t *iscsit_get_r2t_from_list(struct iscsit_cmd *cmd)
{ {
struct iscsi_r2t *r2t; struct iscsi_r2t *r2t;
...@@ -104,7 +104,7 @@ struct iscsi_r2t *iscsit_get_r2t_from_list(struct iscsi_cmd *cmd) ...@@ -104,7 +104,7 @@ struct iscsi_r2t *iscsit_get_r2t_from_list(struct iscsi_cmd *cmd)
return NULL; return NULL;
} }
void iscsit_free_r2t(struct iscsi_r2t *r2t, struct iscsi_cmd *cmd) void iscsit_free_r2t(struct iscsi_r2t *r2t, struct iscsit_cmd *cmd)
{ {
lockdep_assert_held(&cmd->r2t_lock); lockdep_assert_held(&cmd->r2t_lock);
...@@ -112,7 +112,7 @@ void iscsit_free_r2t(struct iscsi_r2t *r2t, struct iscsi_cmd *cmd) ...@@ -112,7 +112,7 @@ void iscsit_free_r2t(struct iscsi_r2t *r2t, struct iscsi_cmd *cmd)
kmem_cache_free(lio_r2t_cache, r2t); kmem_cache_free(lio_r2t_cache, r2t);
} }
void iscsit_free_r2ts_from_list(struct iscsi_cmd *cmd) void iscsit_free_r2ts_from_list(struct iscsit_cmd *cmd)
{ {
struct iscsi_r2t *r2t, *r2t_tmp; struct iscsi_r2t *r2t, *r2t_tmp;
...@@ -152,9 +152,9 @@ static int iscsit_wait_for_tag(struct se_session *se_sess, int state, int *cpup) ...@@ -152,9 +152,9 @@ static int iscsit_wait_for_tag(struct se_session *se_sess, int state, int *cpup)
* May be called from software interrupt (timer) context for allocating * May be called from software interrupt (timer) context for allocating
* iSCSI NopINs. * iSCSI NopINs.
*/ */
struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, int state) struct iscsit_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, int state)
{ {
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
struct se_session *se_sess = conn->sess->se_sess; struct se_session *se_sess = conn->sess->se_sess;
int size, tag, cpu; int size, tag, cpu;
...@@ -164,8 +164,8 @@ struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, int state) ...@@ -164,8 +164,8 @@ struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, int state)
if (tag < 0) if (tag < 0)
return NULL; return NULL;
size = sizeof(struct iscsi_cmd) + conn->conn_transport->priv_size; size = sizeof(struct iscsit_cmd) + conn->conn_transport->priv_size;
cmd = (struct iscsi_cmd *)(se_sess->sess_cmd_map + (tag * size)); cmd = (struct iscsit_cmd *)(se_sess->sess_cmd_map + (tag * size));
memset(cmd, 0, size); memset(cmd, 0, size);
cmd->se_cmd.map_tag = tag; cmd->se_cmd.map_tag = tag;
...@@ -187,7 +187,7 @@ struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, int state) ...@@ -187,7 +187,7 @@ struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, int state)
EXPORT_SYMBOL(iscsit_allocate_cmd); EXPORT_SYMBOL(iscsit_allocate_cmd);
struct iscsi_seq *iscsit_get_seq_holder_for_datain( struct iscsi_seq *iscsit_get_seq_holder_for_datain(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 seq_send_order) u32 seq_send_order)
{ {
u32 i; u32 i;
...@@ -199,12 +199,12 @@ struct iscsi_seq *iscsit_get_seq_holder_for_datain( ...@@ -199,12 +199,12 @@ struct iscsi_seq *iscsit_get_seq_holder_for_datain(
return NULL; return NULL;
} }
struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsi_cmd *cmd) struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsit_cmd *cmd)
{ {
u32 i; u32 i;
if (!cmd->seq_list) { if (!cmd->seq_list) {
pr_err("struct iscsi_cmd->seq_list is NULL!\n"); pr_err("struct iscsit_cmd->seq_list is NULL!\n");
return NULL; return NULL;
} }
...@@ -221,7 +221,7 @@ struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsi_cmd *cmd) ...@@ -221,7 +221,7 @@ struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsi_cmd *cmd)
} }
struct iscsi_r2t *iscsit_get_holder_for_r2tsn( struct iscsi_r2t *iscsit_get_holder_for_r2tsn(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
u32 r2t_sn) u32 r2t_sn)
{ {
struct iscsi_r2t *r2t; struct iscsi_r2t *r2t;
...@@ -282,7 +282,7 @@ static inline int iscsit_check_received_cmdsn(struct iscsi_session *sess, u32 cm ...@@ -282,7 +282,7 @@ static inline int iscsit_check_received_cmdsn(struct iscsi_session *sess, u32 cm
* Commands may be received out of order if MC/S is in use. * Commands may be received out of order if MC/S is in use.
* Ensure they are executed in CmdSN order. * Ensure they are executed in CmdSN order.
*/ */
int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsit_cmd *cmd,
unsigned char *buf, __be32 cmdsn) unsigned char *buf, __be32 cmdsn)
{ {
int ret, cmdsn_ret; int ret, cmdsn_ret;
...@@ -333,7 +333,7 @@ int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, ...@@ -333,7 +333,7 @@ int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
} }
EXPORT_SYMBOL(iscsit_sequence_cmd); EXPORT_SYMBOL(iscsit_sequence_cmd);
int iscsit_check_unsolicited_dataout(struct iscsi_cmd *cmd, unsigned char *buf) int iscsit_check_unsolicited_dataout(struct iscsit_cmd *cmd, unsigned char *buf)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
struct se_cmd *se_cmd = &cmd->se_cmd; struct se_cmd *se_cmd = &cmd->se_cmd;
...@@ -377,11 +377,11 @@ int iscsit_check_unsolicited_dataout(struct iscsi_cmd *cmd, unsigned char *buf) ...@@ -377,11 +377,11 @@ int iscsit_check_unsolicited_dataout(struct iscsi_cmd *cmd, unsigned char *buf)
return 0; return 0;
} }
struct iscsi_cmd *iscsit_find_cmd_from_itt( struct iscsit_cmd *iscsit_find_cmd_from_itt(
struct iscsi_conn *conn, struct iscsi_conn *conn,
itt_t init_task_tag) itt_t init_task_tag)
{ {
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
spin_lock_bh(&conn->cmd_lock); spin_lock_bh(&conn->cmd_lock);
list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) { list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {
...@@ -398,12 +398,12 @@ struct iscsi_cmd *iscsit_find_cmd_from_itt( ...@@ -398,12 +398,12 @@ struct iscsi_cmd *iscsit_find_cmd_from_itt(
} }
EXPORT_SYMBOL(iscsit_find_cmd_from_itt); EXPORT_SYMBOL(iscsit_find_cmd_from_itt);
struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump( struct iscsit_cmd *iscsit_find_cmd_from_itt_or_dump(
struct iscsi_conn *conn, struct iscsi_conn *conn,
itt_t init_task_tag, itt_t init_task_tag,
u32 length) u32 length)
{ {
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
spin_lock_bh(&conn->cmd_lock); spin_lock_bh(&conn->cmd_lock);
list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) { list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {
...@@ -425,11 +425,11 @@ struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump( ...@@ -425,11 +425,11 @@ struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump(
} }
EXPORT_SYMBOL(iscsit_find_cmd_from_itt_or_dump); EXPORT_SYMBOL(iscsit_find_cmd_from_itt_or_dump);
struct iscsi_cmd *iscsit_find_cmd_from_ttt( struct iscsit_cmd *iscsit_find_cmd_from_ttt(
struct iscsi_conn *conn, struct iscsi_conn *conn,
u32 targ_xfer_tag) u32 targ_xfer_tag)
{ {
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
spin_lock_bh(&conn->cmd_lock); spin_lock_bh(&conn->cmd_lock);
list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) { list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {
...@@ -447,11 +447,11 @@ struct iscsi_cmd *iscsit_find_cmd_from_ttt( ...@@ -447,11 +447,11 @@ struct iscsi_cmd *iscsit_find_cmd_from_ttt(
int iscsit_find_cmd_for_recovery( int iscsit_find_cmd_for_recovery(
struct iscsi_session *sess, struct iscsi_session *sess,
struct iscsi_cmd **cmd_ptr, struct iscsit_cmd **cmd_ptr,
struct iscsi_conn_recovery **cr_ptr, struct iscsi_conn_recovery **cr_ptr,
itt_t init_task_tag) itt_t init_task_tag)
{ {
struct iscsi_cmd *cmd = NULL; struct iscsit_cmd *cmd = NULL;
struct iscsi_conn_recovery *cr; struct iscsi_conn_recovery *cr;
/* /*
* Scan through the inactive connection recovery list's command list. * Scan through the inactive connection recovery list's command list.
...@@ -498,7 +498,7 @@ int iscsit_find_cmd_for_recovery( ...@@ -498,7 +498,7 @@ int iscsit_find_cmd_for_recovery(
} }
void iscsit_add_cmd_to_immediate_queue( void iscsit_add_cmd_to_immediate_queue(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn, struct iscsi_conn *conn,
u8 state) u8 state)
{ {
...@@ -545,7 +545,7 @@ struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_conn *c ...@@ -545,7 +545,7 @@ struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_conn *c
} }
static void iscsit_remove_cmd_from_immediate_queue( static void iscsit_remove_cmd_from_immediate_queue(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_queue_req *qr, *qr_tmp; struct iscsi_queue_req *qr, *qr_tmp;
...@@ -574,7 +574,7 @@ static void iscsit_remove_cmd_from_immediate_queue( ...@@ -574,7 +574,7 @@ static void iscsit_remove_cmd_from_immediate_queue(
} }
int iscsit_add_cmd_to_response_queue( int iscsit_add_cmd_to_response_queue(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn, struct iscsi_conn *conn,
u8 state) u8 state)
{ {
...@@ -621,7 +621,7 @@ struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *co ...@@ -621,7 +621,7 @@ struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *co
} }
static void iscsit_remove_cmd_from_response_queue( static void iscsit_remove_cmd_from_response_queue(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct iscsi_queue_req *qr, *qr_tmp; struct iscsi_queue_req *qr, *qr_tmp;
...@@ -694,7 +694,7 @@ void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *conn) ...@@ -694,7 +694,7 @@ void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *conn)
spin_unlock_bh(&conn->response_queue_lock); spin_unlock_bh(&conn->response_queue_lock);
} }
void iscsit_release_cmd(struct iscsi_cmd *cmd) void iscsit_release_cmd(struct iscsit_cmd *cmd)
{ {
struct iscsi_session *sess; struct iscsi_session *sess;
struct se_cmd *se_cmd = &cmd->se_cmd; struct se_cmd *se_cmd = &cmd->se_cmd;
...@@ -720,7 +720,7 @@ void iscsit_release_cmd(struct iscsi_cmd *cmd) ...@@ -720,7 +720,7 @@ void iscsit_release_cmd(struct iscsi_cmd *cmd)
} }
EXPORT_SYMBOL(iscsit_release_cmd); EXPORT_SYMBOL(iscsit_release_cmd);
void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool check_queues) void __iscsit_free_cmd(struct iscsit_cmd *cmd, bool check_queues)
{ {
struct iscsi_conn *conn = cmd->conn; struct iscsi_conn *conn = cmd->conn;
...@@ -742,7 +742,7 @@ void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool check_queues) ...@@ -742,7 +742,7 @@ void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool check_queues)
conn->conn_transport->iscsit_unmap_cmd(conn, cmd); conn->conn_transport->iscsit_unmap_cmd(conn, cmd);
} }
void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) void iscsit_free_cmd(struct iscsit_cmd *cmd, bool shutdown)
{ {
struct se_cmd *se_cmd = cmd->se_cmd.se_tfo ? &cmd->se_cmd : NULL; struct se_cmd *se_cmd = cmd->se_cmd.se_tfo ? &cmd->se_cmd : NULL;
int rc; int rc;
...@@ -870,7 +870,7 @@ void iscsit_inc_conn_usage_count(struct iscsi_conn *conn) ...@@ -870,7 +870,7 @@ void iscsit_inc_conn_usage_count(struct iscsi_conn *conn)
static int iscsit_add_nopin(struct iscsi_conn *conn, int want_response) static int iscsit_add_nopin(struct iscsi_conn *conn, int want_response)
{ {
u8 state; u8 state;
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
cmd = iscsit_allocate_cmd(conn, TASK_RUNNING); cmd = iscsit_allocate_cmd(conn, TASK_RUNNING);
if (!cmd) if (!cmd)
...@@ -1041,7 +1041,7 @@ void iscsit_stop_nopin_timer(struct iscsi_conn *conn) ...@@ -1041,7 +1041,7 @@ void iscsit_stop_nopin_timer(struct iscsi_conn *conn)
} }
int iscsit_send_tx_data( int iscsit_send_tx_data(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn, struct iscsi_conn *conn,
int use_misc) int use_misc)
{ {
...@@ -1074,7 +1074,7 @@ int iscsit_send_tx_data( ...@@ -1074,7 +1074,7 @@ int iscsit_send_tx_data(
} }
int iscsit_fe_sendpage_sg( int iscsit_fe_sendpage_sg(
struct iscsi_cmd *cmd, struct iscsit_cmd *cmd,
struct iscsi_conn *conn) struct iscsi_conn *conn)
{ {
struct scatterlist *sg = cmd->first_data_sg; struct scatterlist *sg = cmd->first_data_sg;
......
drivers/target/iscsi/iscsi_target_util.h
浏览文件 @ 66cd9d4e
...@@ -7,39 +7,39 @@ ...@@ -7,39 +7,39 @@
#define MARKER_SIZE 8 #define MARKER_SIZE 8
struct iscsi_cmd; struct iscsit_cmd;
struct iscsi_conn; struct iscsi_conn;
struct iscsi_conn_recovery; struct iscsi_conn_recovery;
struct iscsi_session; struct iscsi_session;
extern int iscsit_add_r2t_to_list(struct iscsi_cmd *, u32, u32, int, u32); extern int iscsit_add_r2t_to_list(struct iscsit_cmd *, u32, u32, int, u32);
extern struct iscsi_r2t *iscsit_get_r2t_for_eos(struct iscsi_cmd *, u32, u32); extern struct iscsi_r2t *iscsit_get_r2t_for_eos(struct iscsit_cmd *, u32, u32);
extern struct iscsi_r2t *iscsit_get_r2t_from_list(struct iscsi_cmd *); extern struct iscsi_r2t *iscsit_get_r2t_from_list(struct iscsit_cmd *);
extern void iscsit_free_r2t(struct iscsi_r2t *, struct iscsi_cmd *); extern void iscsit_free_r2t(struct iscsi_r2t *, struct iscsit_cmd *);
extern void iscsit_free_r2ts_from_list(struct iscsi_cmd *); extern void iscsit_free_r2ts_from_list(struct iscsit_cmd *);
extern struct iscsi_cmd *iscsit_alloc_cmd(struct iscsi_conn *, gfp_t); extern struct iscsit_cmd *iscsit_alloc_cmd(struct iscsi_conn *, gfp_t);
extern struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *, int); extern struct iscsit_cmd *iscsit_allocate_cmd(struct iscsi_conn *, int);
extern struct iscsi_seq *iscsit_get_seq_holder_for_datain(struct iscsi_cmd *, u32); extern struct iscsi_seq *iscsit_get_seq_holder_for_datain(struct iscsit_cmd *, u32);
extern struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsi_cmd *); extern struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsit_cmd *);
extern struct iscsi_r2t *iscsit_get_holder_for_r2tsn(struct iscsi_cmd *, u32); extern struct iscsi_r2t *iscsit_get_holder_for_r2tsn(struct iscsit_cmd *, u32);
extern int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, extern int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsit_cmd *cmd,
unsigned char * ,__be32 cmdsn); unsigned char * ,__be32 cmdsn);
extern int iscsit_check_unsolicited_dataout(struct iscsi_cmd *, unsigned char *); extern int iscsit_check_unsolicited_dataout(struct iscsit_cmd *, unsigned char *);
extern struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump(struct iscsi_conn *, extern struct iscsit_cmd *iscsit_find_cmd_from_itt_or_dump(struct iscsi_conn *,
itt_t, u32); itt_t, u32);
extern struct iscsi_cmd *iscsit_find_cmd_from_ttt(struct iscsi_conn *, u32); extern struct iscsit_cmd *iscsit_find_cmd_from_ttt(struct iscsi_conn *, u32);
extern int iscsit_find_cmd_for_recovery(struct iscsi_session *, struct iscsi_cmd **, extern int iscsit_find_cmd_for_recovery(struct iscsi_session *, struct iscsit_cmd **,
struct iscsi_conn_recovery **, itt_t); struct iscsi_conn_recovery **, itt_t);
extern void iscsit_add_cmd_to_immediate_queue(struct iscsi_cmd *, struct iscsi_conn *, u8); extern void iscsit_add_cmd_to_immediate_queue(struct iscsit_cmd *, struct iscsi_conn *, u8);
extern struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_conn *); extern struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_conn *);
extern int iscsit_add_cmd_to_response_queue(struct iscsi_cmd *, struct iscsi_conn *, u8); extern int iscsit_add_cmd_to_response_queue(struct iscsit_cmd *, struct iscsi_conn *, u8);
extern struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *); extern struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *);
extern void iscsit_remove_cmd_from_tx_queues(struct iscsi_cmd *, struct iscsi_conn *); extern void iscsit_remove_cmd_from_tx_queues(struct iscsit_cmd *, struct iscsi_conn *);
extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *); extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *);
extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *); extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *);
extern void iscsit_release_cmd(struct iscsi_cmd *); extern void iscsit_release_cmd(struct iscsit_cmd *);
extern void __iscsit_free_cmd(struct iscsi_cmd *, bool); extern void __iscsit_free_cmd(struct iscsit_cmd *, bool);
extern void iscsit_free_cmd(struct iscsi_cmd *, bool); extern void iscsit_free_cmd(struct iscsit_cmd *, bool);
extern bool iscsit_check_session_usage_count(struct iscsi_session *sess, bool can_sleep); extern bool iscsit_check_session_usage_count(struct iscsi_session *sess, bool can_sleep);
extern void iscsit_dec_session_usage_count(struct iscsi_session *); extern void iscsit_dec_session_usage_count(struct iscsi_session *);
extern void iscsit_inc_session_usage_count(struct iscsi_session *); extern void iscsit_inc_session_usage_count(struct iscsi_session *);
...@@ -56,8 +56,8 @@ extern void iscsit_handle_nopin_timeout(struct timer_list *t); ...@@ -56,8 +56,8 @@ extern void iscsit_handle_nopin_timeout(struct timer_list *t);
extern void __iscsit_start_nopin_timer(struct iscsi_conn *); extern void __iscsit_start_nopin_timer(struct iscsi_conn *);
extern void iscsit_start_nopin_timer(struct iscsi_conn *); extern void iscsit_start_nopin_timer(struct iscsi_conn *);
extern void iscsit_stop_nopin_timer(struct iscsi_conn *); extern void iscsit_stop_nopin_timer(struct iscsi_conn *);
extern int iscsit_send_tx_data(struct iscsi_cmd *, struct iscsi_conn *, int); extern int iscsit_send_tx_data(struct iscsit_cmd *, struct iscsi_conn *, int);
extern int iscsit_fe_sendpage_sg(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_fe_sendpage_sg(struct iscsit_cmd *, struct iscsi_conn *);
extern int iscsit_tx_login_rsp(struct iscsi_conn *, u8, u8); extern int iscsit_tx_login_rsp(struct iscsi_conn *, u8, u8);
extern void iscsit_print_session_params(struct iscsi_session *); extern void iscsit_print_session_params(struct iscsi_session *);
extern int iscsit_print_dev_to_proc(char *, char **, off_t, int); extern int iscsit_print_dev_to_proc(char *, char **, off_t, int);
......
include/target/iscsi/iscsi_target_core.h
浏览文件 @ 66cd9d4e
...@@ -143,7 +143,7 @@ enum tiqn_state_table { ...@@ -143,7 +143,7 @@ enum tiqn_state_table {
TIQN_STATE_SHUTDOWN = 2, TIQN_STATE_SHUTDOWN = 2,
}; };
/* struct iscsi_cmd->cmd_flags */ /* struct iscsit_cmd->cmd_flags */
enum cmd_flags_table { enum cmd_flags_table {
ICF_GOT_LAST_DATAOUT = 0x00000001, ICF_GOT_LAST_DATAOUT = 0x00000001,
ICF_GOT_DATACK_SNACK = 0x00000002, ICF_GOT_DATACK_SNACK = 0x00000002,
...@@ -157,7 +157,7 @@ enum cmd_flags_table { ...@@ -157,7 +157,7 @@ enum cmd_flags_table {
ICF_SENDTARGETS_SINGLE = 0x00000200, ICF_SENDTARGETS_SINGLE = 0x00000200,
}; };
/* struct iscsi_cmd->i_state */ /* struct iscsit_cmd->i_state */
enum cmd_i_state_table { enum cmd_i_state_table {
ISTATE_NO_STATE = 0, ISTATE_NO_STATE = 0,
ISTATE_NEW_CMD = 1, ISTATE_NEW_CMD = 1,
...@@ -297,7 +297,7 @@ struct iscsi_sess_ops { ...@@ -297,7 +297,7 @@ struct iscsi_sess_ops {
struct iscsi_queue_req { struct iscsi_queue_req {
int state; int state;
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
struct list_head qr_list; struct list_head qr_list;
}; };
...@@ -327,7 +327,7 @@ struct iscsi_ooo_cmdsn { ...@@ -327,7 +327,7 @@ struct iscsi_ooo_cmdsn {
u32 batch_count; u32 batch_count;
u32 cmdsn; u32 cmdsn;
u32 exp_cmdsn; u32 exp_cmdsn;
struct iscsi_cmd *cmd; struct iscsit_cmd *cmd;
struct list_head ooo_list; struct list_head ooo_list;
} ____cacheline_aligned; } ____cacheline_aligned;
...@@ -349,7 +349,7 @@ struct iscsi_r2t { ...@@ -349,7 +349,7 @@ struct iscsi_r2t {
struct list_head r2t_list; struct list_head r2t_list;
} ____cacheline_aligned; } ____cacheline_aligned;
struct iscsi_cmd { struct iscsit_cmd {
enum iscsi_timer_flags_table dataout_timer_flags; enum iscsi_timer_flags_table dataout_timer_flags;
/* DataOUT timeout retries */ /* DataOUT timeout retries */
u8 dataout_timeout_retries; u8 dataout_timeout_retries;
...@@ -405,22 +405,22 @@ struct iscsi_cmd { ...@@ -405,22 +405,22 @@ struct iscsi_cmd {
u32 outstanding_r2ts; u32 outstanding_r2ts;
/* Next R2T Offset when DataSequenceInOrder=Yes */ /* Next R2T Offset when DataSequenceInOrder=Yes */
u32 r2t_offset; u32 r2t_offset;
/* Iovec current and orig count for iscsi_cmd->iov_data */ /* Iovec current and orig count for iscsit_cmd->iov_data */
u32 iov_data_count; u32 iov_data_count;
u32 orig_iov_data_count; u32 orig_iov_data_count;
/* Number of miscellaneous iovecs used for IP stack calls */ /* Number of miscellaneous iovecs used for IP stack calls */
u32 iov_misc_count; u32 iov_misc_count;
/* Number of struct iscsi_pdu in struct iscsi_cmd->pdu_list */ /* Number of struct iscsi_pdu in struct iscsit_cmd->pdu_list */
u32 pdu_count; u32 pdu_count;
/* Next struct iscsi_pdu to send in struct iscsi_cmd->pdu_list */ /* Next struct iscsi_pdu to send in struct iscsit_cmd->pdu_list */
u32 pdu_send_order; u32 pdu_send_order;
/* Current struct iscsi_pdu in struct iscsi_cmd->pdu_list */ /* Current struct iscsi_pdu in struct iscsit_cmd->pdu_list */
u32 pdu_start; u32 pdu_start;
/* Next struct iscsi_seq to send in struct iscsi_cmd->seq_list */ /* Next struct iscsi_seq to send in struct iscsit_cmd->seq_list */
u32 seq_send_order; u32 seq_send_order;
/* Number of struct iscsi_seq in struct iscsi_cmd->seq_list */ /* Number of struct iscsi_seq in struct iscsit_cmd->seq_list */
u32 seq_count; u32 seq_count;
/* Current struct iscsi_seq in struct iscsi_cmd->seq_list */ /* Current struct iscsi_seq in struct iscsit_cmd->seq_list */
u32 seq_no; u32 seq_no;
/* Lowest offset in current DataOUT sequence */ /* Lowest offset in current DataOUT sequence */
u32 seq_start_offset; u32 seq_start_offset;
...@@ -444,12 +444,12 @@ struct iscsi_cmd { ...@@ -444,12 +444,12 @@ struct iscsi_cmd {
enum dma_data_direction data_direction; enum dma_data_direction data_direction;
/* iSCSI PDU Header + CRC */ /* iSCSI PDU Header + CRC */
unsigned char pdu[ISCSI_HDR_LEN + ISCSI_CRC_LEN]; unsigned char pdu[ISCSI_HDR_LEN + ISCSI_CRC_LEN];
/* Number of times struct iscsi_cmd is present in immediate queue */ /* Number of times struct iscsit_cmd is present in immediate queue */
atomic_t immed_queue_count; atomic_t immed_queue_count;
atomic_t response_queue_count; atomic_t response_queue_count;
spinlock_t datain_lock; spinlock_t datain_lock;
spinlock_t dataout_timeout_lock; spinlock_t dataout_timeout_lock;
/* spinlock for protecting struct iscsi_cmd->i_state */ /* spinlock for protecting struct iscsit_cmd->i_state */
spinlock_t istate_lock; spinlock_t istate_lock;
/* spinlock for adding within command recovery entries */ /* spinlock for adding within command recovery entries */
spinlock_t error_lock; spinlock_t error_lock;
...@@ -503,7 +503,7 @@ struct iscsi_cmd { ...@@ -503,7 +503,7 @@ struct iscsi_cmd {
struct iscsi_tmr_req { struct iscsi_tmr_req {
bool task_reassign:1; bool task_reassign:1;
u32 exp_data_sn; u32 exp_data_sn;
struct iscsi_cmd *ref_cmd; struct iscsit_cmd *ref_cmd;
struct iscsi_conn_recovery *conn_recovery; struct iscsi_conn_recovery *conn_recovery;
struct se_tmr_req *se_tmr_req; struct se_tmr_req *se_tmr_req;
}; };
...@@ -583,7 +583,7 @@ struct iscsi_conn { ...@@ -583,7 +583,7 @@ struct iscsi_conn {
cpumask_var_t allowed_cpumask; cpumask_var_t allowed_cpumask;
unsigned int conn_rx_reset_cpumask:1; unsigned int conn_rx_reset_cpumask:1;
unsigned int conn_tx_reset_cpumask:1; unsigned int conn_tx_reset_cpumask:1;
/* list_head of struct iscsi_cmd for this connection */ /* list_head of struct iscsit_cmd for this connection */
struct list_head conn_cmd_list; struct list_head conn_cmd_list;
struct list_head immed_queue_list; struct list_head immed_queue_list;
struct list_head response_queue_list; struct list_head response_queue_list;
...@@ -898,7 +898,7 @@ static inline u32 session_get_next_ttt(struct iscsi_session *session) ...@@ -898,7 +898,7 @@ static inline u32 session_get_next_ttt(struct iscsi_session *session)
return ttt; return ttt;
} }
extern struct iscsi_cmd *iscsit_find_cmd_from_itt(struct iscsi_conn *, itt_t); extern struct iscsit_cmd *iscsit_find_cmd_from_itt(struct iscsi_conn *, itt_t);
extern void iscsit_thread_check_cpumask(struct iscsi_conn *conn, extern void iscsit_thread_check_cpumask(struct iscsi_conn *conn,
struct task_struct *p, struct task_struct *p,
......
include/target/iscsi/iscsi_transport.h
浏览文件 @ 66cd9d4e
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include "iscsi_target_core.h" /* struct iscsi_cmd */ #include "iscsi_target_core.h" /* struct iscsit_cmd */
struct sockaddr_storage; struct sockaddr_storage;
...@@ -18,23 +18,23 @@ struct iscsit_transport { ...@@ -18,23 +18,23 @@ struct iscsit_transport {
void (*iscsit_free_conn)(struct iscsi_conn *); void (*iscsit_free_conn)(struct iscsi_conn *);
int (*iscsit_get_login_rx)(struct iscsi_conn *, struct iscsi_login *); int (*iscsit_get_login_rx)(struct iscsi_conn *, struct iscsi_login *);
int (*iscsit_put_login_tx)(struct iscsi_conn *, struct iscsi_login *, u32); int (*iscsit_put_login_tx)(struct iscsi_conn *, struct iscsi_login *, u32);
int (*iscsit_immediate_queue)(struct iscsi_conn *, struct iscsi_cmd *, int); int (*iscsit_immediate_queue)(struct iscsi_conn *, struct iscsit_cmd *, int);
int (*iscsit_response_queue)(struct iscsi_conn *, struct iscsi_cmd *, int); int (*iscsit_response_queue)(struct iscsi_conn *, struct iscsit_cmd *, int);
int (*iscsit_get_dataout)(struct iscsi_conn *, struct iscsi_cmd *, bool); int (*iscsit_get_dataout)(struct iscsi_conn *, struct iscsit_cmd *, bool);
int (*iscsit_queue_data_in)(struct iscsi_conn *, struct iscsi_cmd *); int (*iscsit_queue_data_in)(struct iscsi_conn *, struct iscsit_cmd *);
int (*iscsit_queue_status)(struct iscsi_conn *, struct iscsi_cmd *); int (*iscsit_queue_status)(struct iscsi_conn *, struct iscsit_cmd *);
void (*iscsit_aborted_task)(struct iscsi_conn *, struct iscsi_cmd *); void (*iscsit_aborted_task)(struct iscsi_conn *, struct iscsit_cmd *);
int (*iscsit_xmit_pdu)(struct iscsi_conn *, struct iscsi_cmd *, int (*iscsit_xmit_pdu)(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_datain_req *, const void *, u32); struct iscsi_datain_req *, const void *, u32);
void (*iscsit_unmap_cmd)(struct iscsi_conn *, struct iscsi_cmd *); void (*iscsit_unmap_cmd)(struct iscsi_conn *, struct iscsit_cmd *);
void (*iscsit_get_rx_pdu)(struct iscsi_conn *); void (*iscsit_get_rx_pdu)(struct iscsi_conn *);
int (*iscsit_validate_params)(struct iscsi_conn *); int (*iscsit_validate_params)(struct iscsi_conn *);
void (*iscsit_get_r2t_ttt)(struct iscsi_conn *, struct iscsi_cmd *, void (*iscsit_get_r2t_ttt)(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_r2t *); struct iscsi_r2t *);
enum target_prot_op (*iscsit_get_sup_prot_ops)(struct iscsi_conn *); enum target_prot_op (*iscsit_get_sup_prot_ops)(struct iscsi_conn *);
}; };
static inline void *iscsit_priv_cmd(struct iscsi_cmd *cmd) static inline void *iscsit_priv_cmd(struct iscsit_cmd *cmd)
{ {
return (void *)(cmd + 1); return (void *)(cmd + 1);
} }
...@@ -51,61 +51,61 @@ extern void iscsit_put_transport(struct iscsit_transport *); ...@@ -51,61 +51,61 @@ extern void iscsit_put_transport(struct iscsit_transport *);
/* /*
* From iscsi_target.c * From iscsi_target.c
*/ */
extern int iscsit_setup_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_setup_scsi_cmd(struct iscsi_conn *, struct iscsit_cmd *,
unsigned char *); unsigned char *);
extern void iscsit_set_unsolicited_dataout(struct iscsi_cmd *); extern void iscsit_set_unsolicited_dataout(struct iscsit_cmd *);
extern int iscsit_process_scsi_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_process_scsi_cmd(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_scsi_req *); struct iscsi_scsi_req *);
extern int extern int
__iscsit_check_dataout_hdr(struct iscsi_conn *, void *, __iscsit_check_dataout_hdr(struct iscsi_conn *, void *,
struct iscsi_cmd *, u32, bool *); struct iscsit_cmd *, u32, bool *);
extern int extern int
iscsit_check_dataout_hdr(struct iscsi_conn *conn, void *buf, iscsit_check_dataout_hdr(struct iscsi_conn *conn, void *buf,
struct iscsi_cmd **out_cmd); struct iscsit_cmd **out_cmd);
extern int iscsit_check_dataout_payload(struct iscsi_cmd *, struct iscsi_data *, extern int iscsit_check_dataout_payload(struct iscsit_cmd *, struct iscsi_data *,
bool); bool);
extern int iscsit_setup_nop_out(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_setup_nop_out(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_nopout *); struct iscsi_nopout *);
extern int iscsit_process_nop_out(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_process_nop_out(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_nopout *); struct iscsi_nopout *);
extern int iscsit_handle_logout_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_handle_logout_cmd(struct iscsi_conn *, struct iscsit_cmd *,
unsigned char *); unsigned char *);
extern int iscsit_handle_task_mgt_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_handle_task_mgt_cmd(struct iscsi_conn *, struct iscsit_cmd *,
unsigned char *); unsigned char *);
extern int iscsit_setup_text_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_setup_text_cmd(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_text *); struct iscsi_text *);
extern int iscsit_process_text_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_process_text_cmd(struct iscsi_conn *, struct iscsit_cmd *,
struct iscsi_text *); struct iscsi_text *);
extern void iscsit_build_rsp_pdu(struct iscsi_cmd *, struct iscsi_conn *, extern void iscsit_build_rsp_pdu(struct iscsit_cmd *, struct iscsi_conn *,
bool, struct iscsi_scsi_rsp *); bool, struct iscsi_scsi_rsp *);
extern void iscsit_build_nopin_rsp(struct iscsi_cmd *, struct iscsi_conn *, extern void iscsit_build_nopin_rsp(struct iscsit_cmd *, struct iscsi_conn *,
struct iscsi_nopin *, bool); struct iscsi_nopin *, bool);
extern void iscsit_build_task_mgt_rsp(struct iscsi_cmd *, struct iscsi_conn *, extern void iscsit_build_task_mgt_rsp(struct iscsit_cmd *, struct iscsi_conn *,
struct iscsi_tm_rsp *); struct iscsi_tm_rsp *);
extern int iscsit_build_text_rsp(struct iscsi_cmd *, struct iscsi_conn *, extern int iscsit_build_text_rsp(struct iscsit_cmd *, struct iscsi_conn *,
struct iscsi_text_rsp *, struct iscsi_text_rsp *,
enum iscsit_transport_type); enum iscsit_transport_type);
extern void iscsit_build_reject(struct iscsi_cmd *, struct iscsi_conn *, extern void iscsit_build_reject(struct iscsit_cmd *, struct iscsi_conn *,
struct iscsi_reject *); struct iscsi_reject *);
extern int iscsit_build_logout_rsp(struct iscsi_cmd *, struct iscsi_conn *, extern int iscsit_build_logout_rsp(struct iscsit_cmd *, struct iscsi_conn *,
struct iscsi_logout_rsp *); struct iscsi_logout_rsp *);
extern int iscsit_logout_post_handler(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_logout_post_handler(struct iscsit_cmd *, struct iscsi_conn *);
extern int iscsit_queue_rsp(struct iscsi_conn *, struct iscsi_cmd *); extern int iscsit_queue_rsp(struct iscsi_conn *, struct iscsit_cmd *);
extern void iscsit_aborted_task(struct iscsi_conn *, struct iscsi_cmd *); extern void iscsit_aborted_task(struct iscsi_conn *, struct iscsit_cmd *);
extern int iscsit_add_reject(struct iscsi_conn *, u8, unsigned char *); extern int iscsit_add_reject(struct iscsi_conn *, u8, unsigned char *);
extern int iscsit_reject_cmd(struct iscsi_cmd *, u8, unsigned char *); extern int iscsit_reject_cmd(struct iscsit_cmd *, u8, unsigned char *);
extern int iscsit_handle_snack(struct iscsi_conn *, unsigned char *); extern int iscsit_handle_snack(struct iscsi_conn *, unsigned char *);
extern void iscsit_build_datain_pdu(struct iscsi_cmd *, struct iscsi_conn *, extern void iscsit_build_datain_pdu(struct iscsit_cmd *, struct iscsi_conn *,
struct iscsi_datain *, struct iscsi_datain *,
struct iscsi_data_rsp *, bool); struct iscsi_data_rsp *, bool);
extern int iscsit_build_r2ts_for_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_build_r2ts_for_cmd(struct iscsi_conn *, struct iscsit_cmd *,
bool); bool);
extern int iscsit_immediate_queue(struct iscsi_conn *, struct iscsi_cmd *, int); extern int iscsit_immediate_queue(struct iscsi_conn *, struct iscsit_cmd *, int);
extern int iscsit_response_queue(struct iscsi_conn *, struct iscsi_cmd *, int); extern int iscsit_response_queue(struct iscsi_conn *, struct iscsit_cmd *, int);
/* /*
* From iscsi_target_device.c * From iscsi_target_device.c
*/ */
extern void iscsit_increment_maxcmdsn(struct iscsi_cmd *, struct iscsi_session *); extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsi_session *);
/* /*
* From iscsi_target_erl0.c * From iscsi_target_erl0.c
*/ */
...@@ -113,24 +113,24 @@ extern void iscsit_cause_connection_reinstatement(struct iscsi_conn *, int); ...@@ -113,24 +113,24 @@ extern void iscsit_cause_connection_reinstatement(struct iscsi_conn *, int);
/* /*
* From iscsi_target_erl1.c * From iscsi_target_erl1.c
*/ */
extern void iscsit_stop_dataout_timer(struct iscsi_cmd *); extern void iscsit_stop_dataout_timer(struct iscsit_cmd *);
/* /*
* From iscsi_target_tmr.c * From iscsi_target_tmr.c
*/ */
extern int iscsit_tmr_post_handler(struct iscsi_cmd *, struct iscsi_conn *); extern int iscsit_tmr_post_handler(struct iscsit_cmd *, struct iscsi_conn *);
/* /*
* From iscsi_target_util.c * From iscsi_target_util.c
*/ */
extern struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *, int); extern struct iscsit_cmd *iscsit_allocate_cmd(struct iscsi_conn *, int);
extern int iscsit_sequence_cmd(struct iscsi_conn *, struct iscsi_cmd *, extern int iscsit_sequence_cmd(struct iscsi_conn *, struct iscsit_cmd *,
unsigned char *, __be32); unsigned char *, __be32);
extern void iscsit_release_cmd(struct iscsi_cmd *); extern void iscsit_release_cmd(struct iscsit_cmd *);
extern void iscsit_free_cmd(struct iscsi_cmd *, bool); extern void iscsit_free_cmd(struct iscsit_cmd *, bool);
extern void iscsit_add_cmd_to_immediate_queue(struct iscsi_cmd *, extern void iscsit_add_cmd_to_immediate_queue(struct iscsit_cmd *,
struct iscsi_conn *, u8); struct iscsi_conn *, u8);
extern struct iscsi_cmd * extern struct iscsit_cmd *
iscsit_find_cmd_from_itt_or_dump(struct iscsi_conn *conn, iscsit_find_cmd_from_itt_or_dump(struct iscsi_conn *conn,
itt_t init_task_tag, u32 length); itt_t init_task_tag, u32 length);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或