diff options
-rw-r--r-- | drivers/infiniband/ulp/isert/ib_isert.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index ae09561f7399..1b133372e2d9 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c | |||
@@ -76,7 +76,7 @@ isert_prot_cmd(struct isert_conn *conn, struct se_cmd *cmd) | |||
76 | static void | 76 | static void |
77 | isert_qp_event_callback(struct ib_event *e, void *context) | 77 | isert_qp_event_callback(struct ib_event *e, void *context) |
78 | { | 78 | { |
79 | struct isert_conn *isert_conn = (struct isert_conn *)context; | 79 | struct isert_conn *isert_conn = context; |
80 | 80 | ||
81 | isert_err("conn %p event: %d\n", isert_conn, e->event); | 81 | isert_err("conn %p event: %d\n", isert_conn, e->event); |
82 | switch (e->event) { | 82 | switch (e->event) { |
@@ -1200,7 +1200,7 @@ isert_rx_login_req(struct isert_conn *isert_conn) | |||
1200 | static struct iscsi_cmd | 1200 | static struct iscsi_cmd |
1201 | *isert_allocate_cmd(struct iscsi_conn *conn) | 1201 | *isert_allocate_cmd(struct iscsi_conn *conn) |
1202 | { | 1202 | { |
1203 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 1203 | struct isert_conn *isert_conn = conn->context; |
1204 | struct isert_cmd *isert_cmd; | 1204 | struct isert_cmd *isert_cmd; |
1205 | struct iscsi_cmd *cmd; | 1205 | struct iscsi_cmd *cmd; |
1206 | 1206 | ||
@@ -2085,7 +2085,7 @@ static int | |||
2085 | isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd) | 2085 | isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd) |
2086 | { | 2086 | { |
2087 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2087 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2088 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2088 | struct isert_conn *isert_conn = conn->context; |
2089 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; | 2089 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; |
2090 | struct iscsi_scsi_rsp *hdr = (struct iscsi_scsi_rsp *) | 2090 | struct iscsi_scsi_rsp *hdr = (struct iscsi_scsi_rsp *) |
2091 | &isert_cmd->tx_desc.iscsi_header; | 2091 | &isert_cmd->tx_desc.iscsi_header; |
@@ -2134,7 +2134,7 @@ static void | |||
2134 | isert_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) | 2134 | isert_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) |
2135 | { | 2135 | { |
2136 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2136 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2137 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2137 | struct isert_conn *isert_conn = conn->context; |
2138 | struct isert_device *device = isert_conn->conn_device; | 2138 | struct isert_device *device = isert_conn->conn_device; |
2139 | 2139 | ||
2140 | spin_lock_bh(&conn->cmd_lock); | 2140 | spin_lock_bh(&conn->cmd_lock); |
@@ -2151,7 +2151,7 @@ isert_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) | |||
2151 | static enum target_prot_op | 2151 | static enum target_prot_op |
2152 | isert_get_sup_prot_ops(struct iscsi_conn *conn) | 2152 | isert_get_sup_prot_ops(struct iscsi_conn *conn) |
2153 | { | 2153 | { |
2154 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2154 | struct isert_conn *isert_conn = conn->context; |
2155 | struct isert_device *device = isert_conn->conn_device; | 2155 | struct isert_device *device = isert_conn->conn_device; |
2156 | 2156 | ||
2157 | if (conn->tpg->tpg_attrib.t10_pi) { | 2157 | if (conn->tpg->tpg_attrib.t10_pi) { |
@@ -2173,7 +2173,7 @@ isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn, | |||
2173 | bool nopout_response) | 2173 | bool nopout_response) |
2174 | { | 2174 | { |
2175 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2175 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2176 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2176 | struct isert_conn *isert_conn = conn->context; |
2177 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; | 2177 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; |
2178 | 2178 | ||
2179 | isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc); | 2179 | isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc); |
@@ -2192,7 +2192,7 @@ static int | |||
2192 | isert_put_logout_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) | 2192 | isert_put_logout_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) |
2193 | { | 2193 | { |
2194 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2194 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2195 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2195 | struct isert_conn *isert_conn = conn->context; |
2196 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; | 2196 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; |
2197 | 2197 | ||
2198 | isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc); | 2198 | isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc); |
@@ -2210,7 +2210,7 @@ static int | |||
2210 | isert_put_tm_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) | 2210 | isert_put_tm_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) |
2211 | { | 2211 | { |
2212 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2212 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2213 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2213 | struct isert_conn *isert_conn = conn->context; |
2214 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; | 2214 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; |
2215 | 2215 | ||
2216 | isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc); | 2216 | isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc); |
@@ -2228,7 +2228,7 @@ static int | |||
2228 | isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn) | 2228 | isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn) |
2229 | { | 2229 | { |
2230 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2230 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2231 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2231 | struct isert_conn *isert_conn = conn->context; |
2232 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; | 2232 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; |
2233 | struct isert_device *device = isert_conn->conn_device; | 2233 | struct isert_device *device = isert_conn->conn_device; |
2234 | struct ib_device *ib_dev = device->ib_device; | 2234 | struct ib_device *ib_dev = device->ib_device; |
@@ -2261,7 +2261,7 @@ static int | |||
2261 | isert_put_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) | 2261 | isert_put_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) |
2262 | { | 2262 | { |
2263 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2263 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2264 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2264 | struct isert_conn *isert_conn = conn->context; |
2265 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; | 2265 | struct ib_send_wr *send_wr = &isert_cmd->tx_desc.send_wr; |
2266 | struct iscsi_text_rsp *hdr = | 2266 | struct iscsi_text_rsp *hdr = |
2267 | (struct iscsi_text_rsp *)&isert_cmd->tx_desc.iscsi_header; | 2267 | (struct iscsi_text_rsp *)&isert_cmd->tx_desc.iscsi_header; |
@@ -2352,7 +2352,7 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd, | |||
2352 | { | 2352 | { |
2353 | struct se_cmd *se_cmd = &cmd->se_cmd; | 2353 | struct se_cmd *se_cmd = &cmd->se_cmd; |
2354 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2354 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2355 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2355 | struct isert_conn *isert_conn = conn->context; |
2356 | struct isert_data_buf *data = &wr->data; | 2356 | struct isert_data_buf *data = &wr->data; |
2357 | struct ib_send_wr *send_wr; | 2357 | struct ib_send_wr *send_wr; |
2358 | struct ib_sge *ib_sge; | 2358 | struct ib_sge *ib_sge; |
@@ -2836,7 +2836,7 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd) | |||
2836 | struct se_cmd *se_cmd = &cmd->se_cmd; | 2836 | struct se_cmd *se_cmd = &cmd->se_cmd; |
2837 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2837 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2838 | struct isert_rdma_wr *wr = &isert_cmd->rdma_wr; | 2838 | struct isert_rdma_wr *wr = &isert_cmd->rdma_wr; |
2839 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2839 | struct isert_conn *isert_conn = conn->context; |
2840 | struct isert_device *device = isert_conn->conn_device; | 2840 | struct isert_device *device = isert_conn->conn_device; |
2841 | struct ib_send_wr *wr_failed; | 2841 | struct ib_send_wr *wr_failed; |
2842 | int rc; | 2842 | int rc; |
@@ -2886,7 +2886,7 @@ isert_get_dataout(struct iscsi_conn *conn, struct iscsi_cmd *cmd, bool recovery) | |||
2886 | struct se_cmd *se_cmd = &cmd->se_cmd; | 2886 | struct se_cmd *se_cmd = &cmd->se_cmd; |
2887 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); | 2887 | struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd); |
2888 | struct isert_rdma_wr *wr = &isert_cmd->rdma_wr; | 2888 | struct isert_rdma_wr *wr = &isert_cmd->rdma_wr; |
2889 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 2889 | struct isert_conn *isert_conn = conn->context; |
2890 | struct isert_device *device = isert_conn->conn_device; | 2890 | struct isert_device *device = isert_conn->conn_device; |
2891 | struct ib_send_wr *wr_failed; | 2891 | struct ib_send_wr *wr_failed; |
2892 | int rc; | 2892 | int rc; |
@@ -3074,7 +3074,7 @@ isert_rdma_accept(struct isert_conn *isert_conn) | |||
3074 | static int | 3074 | static int |
3075 | isert_get_login_rx(struct iscsi_conn *conn, struct iscsi_login *login) | 3075 | isert_get_login_rx(struct iscsi_conn *conn, struct iscsi_login *login) |
3076 | { | 3076 | { |
3077 | struct isert_conn *isert_conn = (struct isert_conn *)conn->context; | 3077 | struct isert_conn *isert_conn = conn->context; |
3078 | int ret; | 3078 | int ret; |
3079 | 3079 | ||
3080 | isert_info("before login_req comp conn: %p\n", isert_conn); | 3080 | isert_info("before login_req comp conn: %p\n", isert_conn); |
@@ -3144,7 +3144,7 @@ isert_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn, | |||
3144 | static int | 3144 | static int |
3145 | isert_accept_np(struct iscsi_np *np, struct iscsi_conn *conn) | 3145 | isert_accept_np(struct iscsi_np *np, struct iscsi_conn *conn) |
3146 | { | 3146 | { |
3147 | struct isert_np *isert_np = (struct isert_np *)np->np_context; | 3147 | struct isert_np *isert_np = np->np_context; |
3148 | struct isert_conn *isert_conn; | 3148 | struct isert_conn *isert_conn; |
3149 | int max_accept = 0, ret; | 3149 | int max_accept = 0, ret; |
3150 | 3150 | ||
@@ -3191,7 +3191,7 @@ accept_wait: | |||
3191 | static void | 3191 | static void |
3192 | isert_free_np(struct iscsi_np *np) | 3192 | isert_free_np(struct iscsi_np *np) |
3193 | { | 3193 | { |
3194 | struct isert_np *isert_np = (struct isert_np *)np->np_context; | 3194 | struct isert_np *isert_np = np->np_context; |
3195 | struct isert_conn *isert_conn, *n; | 3195 | struct isert_conn *isert_conn, *n; |
3196 | 3196 | ||
3197 | if (isert_np->np_cm_id) | 3197 | if (isert_np->np_cm_id) |