Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (97 commits)
  [SCSI] zfcp: removed wrong comment
  [SCSI] zfcp: use of uninitialized variable
  [SCSI] zfcp: Invalid locking order
  [SCSI] aic79xx: use dma_get_required_mask()
  [SCSI] aic79xx: fix bracket mismatch in unused macro
  [SCSI] BusLogic: Replace 'boolean' by 'bool'
  [SCSI] advansys: clean up warnings
  [SCSI] 53c7xx: brackets fix in uncompiled code
  [SCSI] nsp_cs: remove old scsi code
  [SCSI] aic79xx: make ahd_match_scb() static
  [SCSI] DAC960: kmalloc->kzalloc/Casting cleanups
  [SCSI] scsi_kmap_atomic_sg(): check that local irqs are disabled
  [SCSI] Buslogic: local_irq_disable() is redundant after local_irq_save()
  [SCSI] aic94xx: update for v28 firmware
  [SCSI] scsi_error: Fix lost EH commands
  [SCSI] aic94xx: Add default bus reset handler
  [SCSI] aic94xx: Remove TMF result code munging
  [SCSI] libsas: Add an LU reset mechanism to the error handler
  [SCSI] libsas: Don't BUG when connecting two expanders via wide port
  [SCSI] st: fix Tape dies if wrong block size used, bug 7919
  ...

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index d202ed5a6709..e2ad5bed9403 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -349,6 +349,7 @@ Again:
 
         spin_lock_irqsave(&task->task_state_lock, flags);
         task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
+        task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
         task->task_state_flags |= SAS_TASK_STATE_DONE;
         if (unlikely((task->task_state_flags & SAS_TASK_STATE_ABORTED))) {
                 spin_unlock_irqrestore(&task->task_state_lock, flags);
@@ -557,6 +558,7 @@ int asd_execute_task(struct sas_task *task, const int num,
         struct sas_task *t = task;
         struct asd_ascb *ascb = NULL, *a;
         struct asd_ha_struct *asd_ha = task->dev->port->ha->lldd_ha;
+        unsigned long flags;
 
         res = asd_can_queue(asd_ha, num);
         if (res)
@@ -599,6 +601,10 @@ int asd_execute_task(struct sas_task *task, const int num,
                 }
                 if (res)
                         goto out_err_unmap;
+
+                spin_lock_irqsave(&t->task_state_lock, flags);
+                t->task_state_flags |= SAS_TASK_AT_INITIATOR;
+                spin_unlock_irqrestore(&t->task_state_lock, flags);
         }
         list_del_init(&alist);
 
@@ -617,6 +623,9 @@ out_err_unmap:
                         if (a == b)
                                 break;
                         t = a->uldd_task;
+                        spin_lock_irqsave(&t->task_state_lock, flags);
+                        t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
+                        spin_unlock_irqrestore(&t->task_state_lock, flags);
                         switch (t->task_proto) {
                         case SATA_PROTO:
                         case SAS_PROTO_STP: