6 files changed, 64 insertions, 20 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a26baab09dbf..6800e578e4b1 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -194,8 +194,7 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
         struct scsi_device *device;
 
         if (unlikely(!scsicmd || !scsicmd->scsi_done )) {
-                dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"))
-;
+                dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"));
                 aac_fib_complete(fibptr);
                 aac_fib_free(fibptr);
                 return 0;
@@ -1689,23 +1688,23 @@ static void synchronize_callback(void *context, struct fib *fibptr)
         if (!aac_valid_context(cmd, fibptr))
                 return;
 
-        dprintk((KERN_DEBUG "synchronize_callback[cpu %d]: t = %ld.\n", 
+        dprintk((KERN_DEBUG "synchronize_callback[cpu %d]: t = %ld.\n",
                                 smp_processor_id(), jiffies));
         BUG_ON(fibptr == NULL);
 
 
         synchronizereply = fib_data(fibptr);
         if (le32_to_cpu(synchronizereply->status) == CT_OK)
-                cmd->result = DID_OK << 16 | 
+                cmd->result = DID_OK << 16 |
                         COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
         else {
                 struct scsi_device *sdev = cmd->device;
                 struct aac_dev *dev = fibptr->dev;
                 u32 cid = sdev_id(sdev);
-                printk(KERN_WARNING 
+                printk(KERN_WARNING
                      "synchronize_callback: synchronize failed, status = %d\n",
                      le32_to_cpu(synchronizereply->status));
-                cmd->result = DID_OK << 16 | 
+                cmd->result = DID_OK << 16 |
                         COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
                 set_sense((u8 *)&dev->fsa_dev[cid].sense_data,
                                     HARDWARE_ERROR,
@@ -1713,7 +1712,7 @@ static void synchronize_callback(void *context, struct fib *fibptr)
                                     ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
                                     0, 0);
                 memcpy(cmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
-                  min(sizeof(dev->fsa_dev[cid].sense_data), 
+                  min(sizeof(dev->fsa_dev[cid].sense_data),
                           sizeof(cmd->sense_buffer)));
         }
 
@@ -1731,6 +1730,9 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd)
         struct scsi_device *sdev = scsicmd->device;
         int active = 0;
         struct aac_dev *aac;
+        u64 lba = ((u64)scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16) |
+                (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
+        u32 count = (scsicmd->cmnd[7] << 8) | scsicmd->cmnd[8];
         unsigned long flags;
 
         /*
@@ -1739,7 +1741,51 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd)
          */
         spin_lock_irqsave(&sdev->list_lock, flags);
         list_for_each_entry(cmd, &sdev->cmd_list, list)
-                if (cmd != scsicmd && cmd->SCp.phase == AAC_OWNER_FIRMWARE) {
+                if (cmd->SCp.phase == AAC_OWNER_FIRMWARE) {
+                        u64 cmnd_lba;
+                        u32 cmnd_count;
+
+                        if (cmd->cmnd[0] == WRITE_6) {
+                                cmnd_lba = ((cmd->cmnd[1] & 0x1F) << 16) |
+                                        (cmd->cmnd[2] << 8) |
+                                        cmd->cmnd[3];
+                                cmnd_count = cmd->cmnd[4];
+                                if (cmnd_count == 0)
+                                        cmnd_count = 256;
+                        } else if (cmd->cmnd[0] == WRITE_16) {
+                                cmnd_lba = ((u64)cmd->cmnd[2] << 56) |
+                                        ((u64)cmd->cmnd[3] << 48) |
+                                        ((u64)cmd->cmnd[4] << 40) |
+                                        ((u64)cmd->cmnd[5] << 32) |
+                                        ((u64)cmd->cmnd[6] << 24) |
+                                        (cmd->cmnd[7] << 16) |
+                                        (cmd->cmnd[8] << 8) |
+                                        cmd->cmnd[9];
+                                cmnd_count = (cmd->cmnd[10] << 24) |
+                                        (cmd->cmnd[11] << 16) |
+                                        (cmd->cmnd[12] << 8) |
+                                        cmd->cmnd[13];
+                        } else if (cmd->cmnd[0] == WRITE_12) {
+                                cmnd_lba = ((u64)cmd->cmnd[2] << 24) |
+                                        (cmd->cmnd[3] << 16) |
+                                        (cmd->cmnd[4] << 8) |
+                                        cmd->cmnd[5];
+                                cmnd_count = (cmd->cmnd[6] << 24) |
+                                        (cmd->cmnd[7] << 16) |
+                                        (cmd->cmnd[8] << 8) |
+                                        cmd->cmnd[9];
+                        } else if (cmd->cmnd[0] == WRITE_10) {
+                                cmnd_lba = ((u64)cmd->cmnd[2] << 24) |
+                                        (cmd->cmnd[3] << 16) |
+                                        (cmd->cmnd[4] << 8) |
+                                        cmd->cmnd[5];
+                                cmnd_count = (cmd->cmnd[7] << 8) |
+                                        cmd->cmnd[8];
+                        } else
+                                continue;
+                        if (((cmnd_lba + cmnd_count) < lba) ||
+                          (count && ((lba + count) < cmnd_lba)))
+                                continue;
                         ++active;
                         break;
                 }
@@ -1768,7 +1814,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd)
         synchronizecmd->command = cpu_to_le32(VM_ContainerConfig);
         synchronizecmd->type = cpu_to_le32(CT_FLUSH_CACHE);
         synchronizecmd->cid = cpu_to_le32(scmd_id(scsicmd));
-        synchronizecmd->count = 
+        synchronizecmd->count =
              cpu_to_le32(sizeof(((struct aac_synchronize_reply *)NULL)->data));
 
         /*
@@ -1790,7 +1836,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd)
                 return 0;
         }
 
-        printk(KERN_WARNING 
+        printk(KERN_WARNING
                 "aac_synchronize: aac_fib_send failed with status: %d.\n", status);
         aac_fib_complete(cmd_fibcontext);
         aac_fib_free(cmd_fibcontext);
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 400d03403cd5..94727b9375ec 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 2447
+# define AAC_DRIVER_BUILD 2449
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
@@ -1807,10 +1807,10 @@ struct aac_aifcmd {
  *      accounting for the fact capacity could be a 64 bit value
  *
  */
-static inline u32 cap_to_cyls(sector_t capacity, u32 divisor)
+static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor)
 {
         sector_div(capacity, divisor);
-        return (u32)capacity;
+        return capacity;
 }
 
 /* SCp.phase values */
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index c709dc8ad99d..813556c60007 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -826,7 +826,7 @@ static ssize_t aac_show_reset_adapter(struct class_device *class_dev,
         tmp = aac_adapter_check_health(dev);
         if ((tmp == 0) && dev->in_reset)
                 tmp = -EBUSY;
-        len = snprintf(buf, PAGE_SIZE, "0x%x", tmp);
+        len = snprintf(buf, PAGE_SIZE, "0x%x\n", tmp);
         return len;
 }
 
@@ -1126,9 +1126,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
 static void aac_shutdown(struct pci_dev *dev)
 {
         struct Scsi_Host *shost = pci_get_drvdata(dev);
-        struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
         scsi_block_requests(shost);
-        __aac_shutdown(aac);
+        __aac_shutdown((struct aac_dev *)shost->hostdata);
 }
 
 static void __devexit aac_remove_one(struct pci_dev *pdev)
diff --git a/drivers/scsi/aacraid/nark.c b/drivers/scsi/aacraid/nark.c
index a8ace5677813..c55f7c862f0e 100644
--- a/drivers/scsi/aacraid/nark.c
+++ b/drivers/scsi/aacraid/nark.c
@@ -1,11 +1,10 @@
 /*
  *      Adaptec AAC series RAID controller driver
- *      (c) Copyright 2001 Red Hat Inc. <alan@redhat.com>
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2006-2007 Adaptec, Inc. (aacraid@adaptec.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index 9c5fcfb398c2..8cd6588a83e3 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -5,7 +5,7 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index ebc65b9fea92..73eef3dc5dc6 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -472,7 +472,7 @@ static int aac_rx_restart_adapter(struct aac_dev *dev, int bled)
                 else {
                         bled = aac_adapter_sync_cmd(dev, IOP_RESET_ALWAYS,
                           0, 0, 0, 0, 0, 0, &var, NULL, NULL, NULL, NULL);
-                        if (!bled && (var != 0x00000001))
+                        if (!bled && (var != 0x00000001) && (var != 0x3803000F))
                                 bled = -EINVAL;
                 }
                 if (bled && (bled != -ETIMEDOUT))