diff options
| author | Jens Axboe <axboe@suse.de> | 2005-12-12 09:37:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 17:57:43 +0100 |
| commit | b4788f6d55548e587ced330ece711456f40ec8f1 (patch) | |
| tree | 42468e3b7fbdcb5d9e7f93857df39003dbaa6b46 /drivers/block/cciss.c | |
| parent | [PATCH] kprobes: fix race in aggregate kprobe registration (diff) | |
| download | linux-b4788f6d55548e587ced330ece711456f40ec8f1.tar.xz linux-b4788f6d55548e587ced330ece711456f40ec8f1.zip | |
[PATCH] cciss: double put_disk()
This undoes the put_disk patch I sent in before.
If I had been paying attention I would have seen that we call put_disk
from free_hba during driver unload. That's the only time we want to
call it. If it's called from deregister disk we may remove the
controller (cNd0) unintentionally.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index a9e33db46e68..e34104d32637 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1146,7 +1146,6 @@ static int revalidate_allvol(ctlr_info_t *host) del_gendisk(disk); if (q) blk_cleanup_queue(q); - put_disk(disk); } } @@ -1467,7 +1466,6 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, del_gendisk(disk); if (q) blk_cleanup_queue(q); - put_disk(disk); } } @@ -3243,7 +3241,6 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev) del_gendisk(disk); if (q) blk_cleanup_queue(q); - put_disk(disk); } } |