Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=37958fb040cf6f88b354b9fa7e846014ffbd3b73
Commit:     37958fb040cf6f88b354b9fa7e846014ffbd3b73
Parent:     8f3b8fa9afe75cafc4feb317d305444f6c5271fb
Author:     Darrick J. Wong <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 11 14:15:15 2007 -0800
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Sat Jan 13 16:17:04 2007 -0600

    [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: Darrick J. Wong <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/libsas/sas_scsi_host.c |   17 -----------------
 include/scsi/libsas.h               |    1 -
 2 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/drivers/scsi/libsas/sas_scsi_host.c 
b/drivers/scsi/libsas/sas_scsi_host.c
index 3f647c6..f90c332 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -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);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 0689d66..1d39485 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to