aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSagi Grimberg <sagig@mellanox.com>2014-12-02 09:57:39 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2014-12-13 02:32:28 -0500
commitb0a191e703dfc6a1496a668a2650f8fc9360936d (patch)
tree70e128cec9de4d85a47b08f18616b7a138a326b0
parentdf43debdfd926fd1f13d5b0902d330d3e04ca05f (diff)
iser-target: Cast wr_id with uintptr_t instead of unsinged long
Nit, uintptr_t is designed for pointer casting, use it. Signed-off-by: Sagi Grimberg <sagig@mellanox.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/infiniband/ulp/isert/ib_isert.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index bbfdd62f9724..c4b9c6d3662b 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -961,7 +961,7 @@ isert_post_recv(struct isert_conn *isert_conn, u32 count)
961 961
962 for (rx_wr = isert_conn->conn_rx_wr, i = 0; i < count; i++, rx_wr++) { 962 for (rx_wr = isert_conn->conn_rx_wr, i = 0; i < count; i++, rx_wr++) {
963 rx_desc = &isert_conn->conn_rx_descs[rx_head]; 963 rx_desc = &isert_conn->conn_rx_descs[rx_head];
964 rx_wr->wr_id = (unsigned long)rx_desc; 964 rx_wr->wr_id = (uintptr_t)rx_desc;
965 rx_wr->sg_list = &rx_desc->rx_sg; 965 rx_wr->sg_list = &rx_desc->rx_sg;
966 rx_wr->num_sge = 1; 966 rx_wr->num_sge = 1;
967 rx_wr->next = rx_wr + 1; 967 rx_wr->next = rx_wr + 1;
@@ -995,7 +995,7 @@ isert_post_send(struct isert_conn *isert_conn, struct iser_tx_desc *tx_desc)
995 ISER_HEADERS_LEN, DMA_TO_DEVICE); 995 ISER_HEADERS_LEN, DMA_TO_DEVICE);
996 996
997 send_wr.next = NULL; 997 send_wr.next = NULL;
998 send_wr.wr_id = (unsigned long)tx_desc; 998 send_wr.wr_id = (uintptr_t)tx_desc;
999 send_wr.sg_list = tx_desc->tx_sg; 999 send_wr.sg_list = tx_desc->tx_sg;
1000 send_wr.num_sge = tx_desc->num_sge; 1000 send_wr.num_sge = tx_desc->num_sge;
1001 send_wr.opcode = IB_WR_SEND; 1001 send_wr.opcode = IB_WR_SEND;
@@ -1067,7 +1067,7 @@ isert_init_send_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
1067 struct iser_tx_desc *tx_desc = &isert_cmd->tx_desc; 1067 struct iser_tx_desc *tx_desc = &isert_cmd->tx_desc;
1068 1068
1069 isert_cmd->rdma_wr.iser_ib_op = ISER_IB_SEND; 1069 isert_cmd->rdma_wr.iser_ib_op = ISER_IB_SEND;
1070 send_wr->wr_id = (unsigned long)&isert_cmd->tx_desc; 1070 send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;
1071 send_wr->opcode = IB_WR_SEND; 1071 send_wr->opcode = IB_WR_SEND;
1072 send_wr->sg_list = &tx_desc->tx_sg[0]; 1072 send_wr->sg_list = &tx_desc->tx_sg[0];
1073 send_wr->num_sge = isert_cmd->tx_desc.num_sge; 1073 send_wr->num_sge = isert_cmd->tx_desc.num_sge;
@@ -1090,7 +1090,7 @@ isert_rdma_post_recvl(struct isert_conn *isert_conn)
1090 sge.addr, sge.length, sge.lkey); 1090 sge.addr, sge.length, sge.lkey);
1091 1091
1092 memset(&rx_wr, 0, sizeof(struct ib_recv_wr)); 1092 memset(&rx_wr, 0, sizeof(struct ib_recv_wr));
1093 rx_wr.wr_id = (unsigned long)isert_conn->login_req_buf; 1093 rx_wr.wr_id = (uintptr_t)isert_conn->login_req_buf;
1094 rx_wr.sg_list = &sge; 1094 rx_wr.sg_list = &sge;
1095 rx_wr.num_sge = 1; 1095 rx_wr.num_sge = 1;
1096 1096
@@ -2061,7 +2061,7 @@ isert_cq_tx_work(struct work_struct *work)
2061 struct ib_wc wc; 2061 struct ib_wc wc;
2062 2062
2063 while (ib_poll_cq(tx_cq, 1, &wc) == 1) { 2063 while (ib_poll_cq(tx_cq, 1, &wc) == 1) {
2064 tx_desc = (struct iser_tx_desc *)(unsigned long)wc.wr_id; 2064 tx_desc = (struct iser_tx_desc *)(uintptr_t)wc.wr_id;
2065 isert_conn = wc.qp->qp_context; 2065 isert_conn = wc.qp->qp_context;
2066 2066
2067 if (wc.status == IB_WC_SUCCESS) { 2067 if (wc.status == IB_WC_SUCCESS) {
@@ -2101,7 +2101,7 @@ isert_cq_rx_work(struct work_struct *work)
2101 unsigned long xfer_len; 2101 unsigned long xfer_len;
2102 2102
2103 while (ib_poll_cq(rx_cq, 1, &wc) == 1) { 2103 while (ib_poll_cq(rx_cq, 1, &wc) == 1) {
2104 rx_desc = (struct iser_rx_desc *)(unsigned long)wc.wr_id; 2104 rx_desc = (struct iser_rx_desc *)(uintptr_t)wc.wr_id;
2105 isert_conn = wc.qp->qp_context; 2105 isert_conn = wc.qp->qp_context;
2106 2106
2107 if (wc.status == IB_WC_SUCCESS) { 2107 if (wc.status == IB_WC_SUCCESS) {
@@ -2379,7 +2379,7 @@ isert_build_rdma_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,
2379 2379
2380 send_wr->sg_list = ib_sge; 2380 send_wr->sg_list = ib_sge;
2381 send_wr->num_sge = sg_nents; 2381 send_wr->num_sge = sg_nents;
2382 send_wr->wr_id = (unsigned long)&isert_cmd->tx_desc; 2382 send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;
2383 /* 2383 /*
2384 * Perform mapping of TCM scatterlist memory ib_sge dma_addr. 2384 * Perform mapping of TCM scatterlist memory ib_sge dma_addr.
2385 */ 2385 */
@@ -2864,7 +2864,7 @@ isert_reg_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
2864 send_wr = &isert_cmd->rdma_wr.s_send_wr; 2864 send_wr = &isert_cmd->rdma_wr.s_send_wr;
2865 send_wr->sg_list = &wr->s_ib_sge; 2865 send_wr->sg_list = &wr->s_ib_sge;
2866 send_wr->num_sge = 1; 2866 send_wr->num_sge = 1;
2867 send_wr->wr_id = (unsigned long)&isert_cmd->tx_desc; 2867 send_wr->wr_id = (uintptr_t)&isert_cmd->tx_desc;
2868 if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) { 2868 if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {
2869 send_wr->opcode = IB_WR_RDMA_WRITE; 2869 send_wr->opcode = IB_WR_RDMA_WRITE;
2870 send_wr->wr.rdma.remote_addr = isert_cmd->read_va; 2870 send_wr->wr.rdma.remote_addr = isert_cmd->read_va;