vserver 2.0 rc7

[linux-2.6.git] / drivers / block / cciss.h

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 8ab689c..8fb1920 100644 (file)
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -13,6 +13,8 @@
 #define IO_OK          0
 #define IO_ERROR       1
 
+#define MAJOR_NR COMPAQ_CISS_MAJOR
+
 struct ctlr_info;
 typedef struct ctlr_info ctlr_info_t;
 
@@ -50,6 +52,7 @@ struct ctlr_info
        CfgTable_struct __iomem *cfgtable;
        unsigned int intr;
        int     interrupts_enabled;
+       int     major;
        int     max_commands;
        int     commands_outstanding;
        int     max_outstanding; /* Debug */ 
@@ -81,6 +84,11 @@ struct ctlr_info
        int                     nr_frees; 
        int                     busy_configuring;
 
+       /* This element holds the zero based queue number of the last
+        * queue to be started.  It is used for fairness.
+       */
+       int                     next_to_run;
+
        // Disk structures we need to pass back
        struct gendisk   *gendisk[NWD];
 #ifdef CONFIG_CISS_SCSI_TAPE