scsi: target/core: Remove the write_pending_status() callback function

[linux-2.6-microblaze.git] / drivers / scsi / qla2xxx / tcm_qla2xxx.c

diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 283e6b8..8a3075d 100644 (file)
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -420,26 +420,6 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd)
        return qlt_rdy_to_xfer(cmd);
 }
 
-static int tcm_qla2xxx_write_pending_status(struct se_cmd *se_cmd)
-{
-       unsigned long flags;
-       /*
-        * Check for WRITE_PENDING status to determine if we need to wait for
-        * CTIO aborts to be posted via hardware in tcm_qla2xxx_handle_data().
-        */
-       spin_lock_irqsave(&se_cmd->t_state_lock, flags);
-       if (se_cmd->t_state == TRANSPORT_WRITE_PENDING ||
-           se_cmd->t_state == TRANSPORT_COMPLETE_QF_WP) {
-               spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
-               wait_for_completion_timeout(&se_cmd->t_transport_stop_comp,
-                                               50);
-               return 0;
-       }
-       spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
-
-       return 0;
-}
-
 static void tcm_qla2xxx_set_default_node_attrs(struct se_node_acl *nacl)
 {
        return;
@@ -537,15 +517,6 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work)
 
        cmd->qpair->tgt_counters.qla_core_ret_ctio++;
        if (!cmd->write_data_transferred) {
-               /*
-                * Check if se_cmd has already been aborted via LUN_RESET, and
-                * waiting upon completion in tcm_qla2xxx_write_pending_status()
-                */
-               if (cmd->se_cmd.transport_state & CMD_T_ABORTED) {
-                       complete(&cmd->se_cmd.t_transport_stop_comp);
-                       return;
-               }
-
                switch (cmd->dif_err_code) {
                case DIF_ERR_GRD:
                        cmd->se_cmd.pi_err =
@@ -1902,7 +1873,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
        .sess_get_index                 = tcm_qla2xxx_sess_get_index,
        .sess_get_initiator_sid         = NULL,
        .write_pending                  = tcm_qla2xxx_write_pending,
-       .write_pending_status           = tcm_qla2xxx_write_pending_status,
        .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
        .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
        .queue_data_in                  = tcm_qla2xxx_queue_data_in,
@@ -1943,7 +1913,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
        .sess_get_index                 = tcm_qla2xxx_sess_get_index,
        .sess_get_initiator_sid         = NULL,
        .write_pending                  = tcm_qla2xxx_write_pending,
-       .write_pending_status           = tcm_qla2xxx_write_pending_status,
        .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
        .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
        .queue_data_in                  = tcm_qla2xxx_queue_data_in,