[PATCH] cciss per disk queue

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

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 8fb19206eddb2d04acde4b2759d0272c4e2aae60..566587d0a5003726dc75e5fe7ea67ad639581c54 100644 (file)
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -29,6 +29,7 @@ typedef struct _drive_info_struct
 {
        __u32   LunID;  
        int     usage_count;
+       struct request_queue *queue;
        sector_t nr_blocks;
        int     block_size;
        int     heads;
@@ -72,7 +73,6 @@ struct ctlr_info
        unsigned int maxQsinceinit;
        unsigned int maxSG;
        spinlock_t lock;
-       struct request_queue *queue;
 
        //* pointers to command and error info pool */ 
        CommandList_struct      *cmd_pool;
@@ -260,7 +260,7 @@ struct board_type {
        struct access_method *access;
 };
 
-#define CCISS_LOCK(i)  (hba[i]->queue->queue_lock)
+#define CCISS_LOCK(i)  (&hba[i]->lock)
 
 #endif /* CCISS_H */