@@ -606,11 +606,6 @@ static int transport_cmd_check_stop_to_fabric(struct se_cmd *cmd)
target_remove_from_state_list(cmd);
- /*
- * Clear struct se_cmd->se_lun before the handoff to FE.
- */
- cmd->se_lun = NULL;
-
spin_lock_irqsave(&cmd->t_state_lock, flags);
/*
* Determine if frontend context caller is requesting the stopping of
@@ -639,17 +634,6 @@ static int transport_cmd_check_stop_to_fabric(struct se_cmd *cmd)
: 0;
}
-static void transport_lun_remove_cmd(struct se_cmd *cmd)
-{
- struct se_lun *lun = cmd->se_lun;
-
- if (!lun)
- return;
-
- if (cmpxchg(&cmd->lun_ref_active, true, false))
- percpu_ref_put(&lun->lun_ref);
-}
-
static void target_complete_failure_work(struct work_struct *work)
{
struct se_cmd *cmd = container_of(work, struct se_cmd, work);
@@ -686,8 +670,6 @@ static void target_handle_abort(struct se_cmd *cmd)
pr_debug("tag %#llx: send_abort_response = %d\n", cmd->tag,
cmd->send_abort_response);
- transport_lun_remove_cmd(cmd);
-
if (cmd->send_abort_response) {
if (!(cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)) {
cmd->scsi_status = SAM_STAT_TASK_ABORTED;
@@ -1762,7 +1744,6 @@ void transport_generic_request_failure(struct se_cmd *cmd,
goto queue_full;
check_stop:
- transport_lun_remove_cmd(cmd);
transport_cmd_check_stop_to_fabric(cmd);
return;
@@ -2037,7 +2018,6 @@ static void transport_complete_qf(struct se_cmd *cmd)
transport_handle_queue_full(cmd, cmd->se_dev);
return;
}
- transport_lun_remove_cmd(cmd);
transport_cmd_check_stop_to_fabric(cmd);
}
@@ -2111,7 +2091,6 @@ static void target_complete_ok_work(struct work_struct *work)
if (ret == -EAGAIN || ret == -ENOMEM)
goto queue_full;
- transport_lun_remove_cmd(cmd);
transport_cmd_check_stop_to_fabric(cmd);
return;
}
@@ -2137,7 +2116,6 @@ static void target_complete_ok_work(struct work_struct *work)
if (ret == -EAGAIN || ret == -ENOMEM)
goto queue_full;
- transport_lun_remove_cmd(cmd);
transport_cmd_check_stop_to_fabric(cmd);
return;
}
@@ -2162,7 +2140,6 @@ static void target_complete_ok_work(struct work_struct *work)
if (ret == -EAGAIN || ret == -ENOMEM)
goto queue_full;
- transport_lun_remove_cmd(cmd);
transport_cmd_check_stop_to_fabric(cmd);
return;
}
@@ -2198,7 +2175,6 @@ static void target_complete_ok_work(struct work_struct *work)
break;
}
- transport_lun_remove_cmd(cmd);
transport_cmd_check_stop_to_fabric(cmd);
return;
@@ -2511,9 +2487,6 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
*/
if (cmd->state_active)
target_remove_from_state_list(cmd);
-
- if (cmd->se_lun)
- transport_lun_remove_cmd(cmd);
}
BUG_ON(!cmd->se_tfo);
return target_put_sess_cmd(cmd);
@@ -2577,6 +2550,9 @@ static void target_release_cmd_kref(struct kref *kref)
WARN_ON_ONCE(atomic_read(&se_cmd->tgt_ref.refcount) != 0);
+ if (se_cmd->lun_ref_active)
+ percpu_ref_put(&se_cmd->se_lun->lun_ref);
+
if (se_sess) {
spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
if (likely(!list_empty(&se_cmd->se_cmd_list))) {