[PATCH] cciss per disk queue

This patch adds per disk queue functionality to cciss.  Sometime back I
submitted a patch but it looks like only part of what I needed.  In the 2.6
kernel if we have more than one logical volume the driver will Oops during
rmmod.  It seems all of the queues actually point back to the same queue.
So after deleting the first volume you hit a null pointer on the second
one.

This has been tested in our labs.  There is no difference in performance,
it just fixes the Oops.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 8fb19206eddb..566587d0a500 100644
--- 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 */