aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2013-11-07 00:05:19 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2013-11-07 17:25:02 -0500
commit4a9a6c8d538eff6d627fa14409c7c25aff652541 (patch)
treedded7528c07556c7b666e8c4351ca0eeb9097c3d /drivers/infiniband
parent5277797dc4ed873d067477d84e910b39d113f649 (diff)
target: Drop left-over se_lun->lun_cmd_list shutdown code
Now with percpu refcounting for se_lun in place, go ahead and drop the legacy per se_cmd accounting for se_lun shutdown. This includes __transport_clear_lun_from_sessions(), the associated transport_lun_wait_for_tasks() logic, along with a handful of now unused se_cmd structure members and ->transport_state bits. Cc: Kent Overstreet <kmo@daterainc.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/ulp/srpt/ib_srpt.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 653ac6bfc57a..16087966cb7d 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1352,11 +1352,8 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)
1352 1352
1353 /* XXX(hch): this is a horrible layering violation.. */ 1353 /* XXX(hch): this is a horrible layering violation.. */
1354 spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags); 1354 spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
1355 ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
1356 ioctx->cmd.transport_state &= ~CMD_T_ACTIVE; 1355 ioctx->cmd.transport_state &= ~CMD_T_ACTIVE;
1357 spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags); 1356 spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
1358
1359 complete(&ioctx->cmd.transport_lun_stop_comp);
1360 break; 1357 break;
1361 case SRPT_STATE_CMD_RSP_SENT: 1358 case SRPT_STATE_CMD_RSP_SENT:
1362 /* 1359 /*
@@ -1364,9 +1361,6 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)
1364 * not been received in time. 1361 * not been received in time.
1365 */ 1362 */
1366 srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx); 1363 srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);
1367 spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
1368 ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
1369 spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
1370 target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd); 1364 target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);
1371 break; 1365 break;
1372 case SRPT_STATE_MGMT_RSP_SENT: 1366 case SRPT_STATE_MGMT_RSP_SENT:
@@ -1476,7 +1470,6 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch,
1476{ 1470{
1477 struct se_cmd *cmd; 1471 struct se_cmd *cmd;
1478 enum srpt_command_state state; 1472 enum srpt_command_state state;
1479 unsigned long flags;
1480 1473
1481 cmd = &ioctx->cmd; 1474 cmd = &ioctx->cmd;
1482 state = srpt_get_cmd_state(ioctx); 1475 state = srpt_get_cmd_state(ioctx);
@@ -1496,9 +1489,6 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch,
1496 __func__, __LINE__, state); 1489 __func__, __LINE__, state);
1497 break; 1490 break;
1498 case SRPT_RDMA_WRITE_LAST: 1491 case SRPT_RDMA_WRITE_LAST:
1499 spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
1500 ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
1501 spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
1502 break; 1492 break;
1503 default: 1493 default:
1504 printk(KERN_ERR "%s[%d]: opcode = %u\n", __func__, 1494 printk(KERN_ERR "%s[%d]: opcode = %u\n", __func__,