Merge by hand (conflicts between pending drivers and kfree cleanups)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

4 files changed, 31 insertions, 13 deletions

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9a96f0588393..914b55f4abbb 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -441,6 +441,7 @@
 #define PCI_DEVICE_ID_IBM_SNIPE         0x0180
 #define PCI_DEVICE_ID_IBM_CITRINE               0x028C
 #define PCI_DEVICE_ID_IBM_GEMSTONE              0xB166
+#define PCI_DEVICE_ID_IBM_OBSIDIAN              0x02BD
 #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1 0x0031
 #define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219
 #define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX         0x021A
@@ -2144,6 +2145,7 @@
 #define PCI_DEVICE_ID_ADAPTEC2_7899B    0x00c1
 #define PCI_DEVICE_ID_ADAPTEC2_7899D    0x00c3
 #define PCI_DEVICE_ID_ADAPTEC2_7899P    0x00cf
+#define PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN   0x0500
 #define PCI_DEVICE_ID_ADAPTEC2_SCAMP    0x0503
 
 
diff --git a/include/linux/raid_class.h b/include/linux/raid_class.h
index a71123c28272..48831eac2910 100644
--- a/include/linux/raid_class.h
+++ b/include/linux/raid_class.h
@@ -1,4 +1,9 @@
 /*
+ * raid_class.h - a generic raid visualisation class
+ *
+ * Copyright (c) 2005 - James Bottomley <James.Bottomley@steeleye.com>
+ *
+ * This file is licensed under GPLv2
  */
 #include <linux/transport_class.h>
 
@@ -14,20 +19,35 @@ struct raid_function_template {
 };
 
 enum raid_state {
-        RAID_ACTIVE = 1,
-        RAID_DEGRADED,
-        RAID_RESYNCING,
-        RAID_OFFLINE,
+        RAID_STATE_UNKNOWN = 0,
+        RAID_STATE_ACTIVE,
+        RAID_STATE_DEGRADED,
+        RAID_STATE_RESYNCING,
+        RAID_STATE_OFFLINE,
+};
+
+enum raid_level {
+        RAID_LEVEL_UNKNOWN = 0,
+        RAID_LEVEL_LINEAR,
+        RAID_LEVEL_0,
+        RAID_LEVEL_1,
+        RAID_LEVEL_3,
+        RAID_LEVEL_4,
+        RAID_LEVEL_5,
+        RAID_LEVEL_6,
 };
 
 struct raid_data {
         struct list_head component_list;
         int component_count;
-        int level;
+        enum raid_level level;
         enum raid_state state;
         int resync;
 };
 
+/* resync complete goes from 0 to this */
+#define RAID_MAX_RESYNC         (10000)
+
 #define DEFINE_RAID_ATTRIBUTE(type, attr)                                     \
 static inline void                                                            \
 raid_set_##attr(struct raid_template *r, struct device *dev, type value) {    \
@@ -48,7 +68,7 @@ raid_get_##attr(struct raid_template *r, struct device *dev) {		      \
         return rd->attr;                                                      \
 }
 
-DEFINE_RAID_ATTRIBUTE(int, level)
+DEFINE_RAID_ATTRIBUTE(enum raid_level, level)
 DEFINE_RAID_ATTRIBUTE(int, resync)
 DEFINE_RAID_ATTRIBUTE(enum raid_state, state)
         
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index ecd53d7872d2..6cbb1982ed03 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -7,6 +7,7 @@
 #include <linux/workqueue.h>
 
 struct block_device;
+struct completion;
 struct module;
 struct scsi_cmnd;
 struct scsi_device;
@@ -467,10 +468,8 @@ struct Scsi_Host {
 
         struct list_head        eh_cmd_q;
         struct task_struct    * ehandler;  /* Error recovery thread. */
-        struct semaphore      * eh_action; /* Wait for specific actions on the
-                                          host. */
-        unsigned int            eh_active:1; /* Indicates the eh thread is awake and active if
-                                          this is true. */
+        struct completion     * eh_action; /* Wait for specific actions on the
+                                              host. */
         wait_queue_head_t       host_wait;
         struct scsi_host_template *hostt;
         struct scsi_transport_template *transportt;
diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h
index 2539debb7993..98d69fdb851c 100644
--- a/include/scsi/scsi_request.h
+++ b/include/scsi/scsi_request.h
@@ -47,9 +47,6 @@ struct scsi_request {
 
 extern struct scsi_request *scsi_allocate_request(struct scsi_device *, gfp_t);
 extern void scsi_release_request(struct scsi_request *);
-extern void scsi_wait_req(struct scsi_request *, const void *cmnd,
-                          void *buffer, unsigned bufflen,
-                          int timeout, int retries);
 extern void scsi_do_req(struct scsi_request *, const void *cmnd,
                         void *buffer, unsigned bufflen,
                         void (*done) (struct scsi_cmnd *),