Commit 37958fb0 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by James Bottomley
Browse files

[SCSI] libsas: Remove SAS_TASK_INITIATOR_ABORTED flag 



This flag is no longer necessary because we push tasks to be aborted into
the EH as soon as we possibly can, and let the SCSI EH code take care of
the coordination for which this flag was used.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 8f3b8fa9

drivers/scsi/libsas/sas_scsi_host.c

+0 −17
Original line number Diff line number Diff line
@@ -310,15 +310,6 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task) 
		spin_unlock_irqrestore(&core->task_queue_lock, flags);

	}



	spin_lock_irqsave(&task->task_state_lock, flags);

	if (task->task_state_flags & SAS_TASK_INITIATOR_ABORTED) {

		spin_unlock_irqrestore(&task->task_state_lock, flags);

		SAS_DPRINTK("%s: task 0x%p already aborted\n",

			    __FUNCTION__, task);

		return TASK_IS_ABORTED;

	}

	spin_unlock_irqrestore(&task->task_state_lock, flags);



	for (i = 0; i < 5; i++) {

		SAS_DPRINTK("%s: aborting task 0x%p\n", __FUNCTION__, task);

		res = si->dft->lldd_abort_task(task);
@@ -534,12 +525,6 @@ enum scsi_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd) 
	}



	spin_lock_irqsave(&task->task_state_lock, flags);

	if (task->task_state_flags & SAS_TASK_INITIATOR_ABORTED) {

		spin_unlock_irqrestore(&task->task_state_lock, flags);

		SAS_DPRINTK("command 0x%p, task 0x%p, aborted by initiator: "

			    "EH_NOT_HANDLED\n", cmd, task);

		return EH_NOT_HANDLED;

	}

	if (task->task_state_flags & SAS_TASK_STATE_DONE) {

		spin_unlock_irqrestore(&task->task_state_lock, flags);

		SAS_DPRINTK("command 0x%p, task 0x%p, timed out: EH_HANDLED\n",
@@ -826,7 +811,6 @@ static int do_sas_task_abort(struct sas_task *task) 
		return 0;

	}



	task->task_state_flags |= SAS_TASK_INITIATOR_ABORTED;

	if (!(task->task_state_flags & SAS_TASK_STATE_DONE))

		task->task_state_flags |= SAS_TASK_STATE_ABORTED;

	spin_unlock_irqrestore(&task->task_state_lock, flags);
@@ -849,7 +833,6 @@ static int do_sas_task_abort(struct sas_task *task) 
	}



	spin_lock_irqsave(&task->task_state_lock, flags);

	task->task_state_flags &= ~SAS_TASK_INITIATOR_ABORTED;

	if (!(task->task_state_flags & SAS_TASK_STATE_DONE))

		task->task_state_flags &= ~SAS_TASK_STATE_ABORTED;

	spin_unlock_irqrestore(&task->task_state_lock, flags);

include/scsi/libsas.h

+0 −1
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ struct sas_task { 
#define SAS_TASK_STATE_PENDING      1

#define SAS_TASK_STATE_DONE         2

#define SAS_TASK_STATE_ABORTED      4

#define SAS_TASK_INITIATOR_ABORTED  8

#define SAS_TASK_AT_INITIATOR       16



static inline struct sas_task *sas_alloc_task(gfp_t flags)

CRA Git | Maintained and supported by SUSTech CRA and CCSE