Commit 2f6331fa authored Dec 12, 2005 by Mike Miller Committed by Linus Torvalds Dec 12, 2005

[PATCH] cciss: fix for deregister_disk



This patch adds setting our drv->queue = NULL back in deregister_disk.  The
drv->queue is part of our controller struct.  blk_cleanup_queue works only
on the queue in the gendisk struct.

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>

parent 8309cf66

drivers/block/cciss.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1464,8 +1464,10 @@ static int deregister_disk(struct gendisk disk, drive_info_struct drv,
		request_queue_t *q = disk->queue;
		if (disk->flags & GENHD_FL_UP)
		del_gendisk(disk);
		if (q)
		if (q) {
		blk_cleanup_queue(q);
		drv->queue = NULL;
		}
		}
		}

Admin message