Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH 3/3] cciss: add put_disk into cleanup routines

Browse source 
Jeff Garzik pointed me to his code to see how to remove a disk from
the system _properly_. Well, here it is...
Every place we remove disks we are now testing before calling del_gendisk
or blk_cleanup_queue and then call put_disk.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
This commit is contained in:
mikem 2005-11-18 22:05:36 +01:00 committed by Jens Axboe
parent 15534d3803
commit 6f5a0f7c95
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/block/cciss.c
View file

@ -1139,8 +1139,15 @@ static int revalidate_allvol(ctlr_info_t *host)
for(i=0; i< NWD; i++) { for(i=0; i< NWD; i++) {
struct gendisk *disk = host->gendisk[i]; struct gendisk *disk = host->gendisk[i];
if (disk->flags & GENHD_FL_UP) if (disk) {
del_gendisk(disk); request_queue_t *q = disk->queue;
if (disk->flags & GENHD_FL_UP)
del_gendisk(disk);
if (q)
blk_cleanup_queue(q);
put_disk(disk);
}
} }
/* /*
@ -1454,10 +1461,13 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv,
* allows us to delete disk zero but keep the controller registered. * allows us to delete disk zero but keep the controller registered.
*/ */
if (h->gendisk[0] != disk){ if (h->gendisk[0] != disk){
if (disk->flags & GENHD_FL_UP){ if (disk) {
blk_cleanup_queue(disk->queue); request_queue_t *q = disk->queue;
del_gendisk(disk); if (disk->flags & GENHD_FL_UP)
drv->queue = NULL; del_gendisk(disk);
if (q)
blk_cleanup_queue(q);
put_disk(disk);
} }
} }
@ -3226,9 +3236,14 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev)
/* remove it from the disk list */ /* remove it from the disk list */
for (j = 0; j < NWD; j++) { for (j = 0; j < NWD; j++) {
struct gendisk *disk = hba[i]->gendisk[j]; struct gendisk *disk = hba[i]->gendisk[j];
if (disk->flags & GENHD_FL_UP) { if (disk) {
del_gendisk(disk); request_queue_t *q = disk->queue;
blk_cleanup_queue(disk->queue);
if (disk->flags & GENHD_FL_UP)
del_gendisk(disk);
if (q)
blk_cleanup_queue(q);
put_disk(disk);
} }
} }