Commit b4788f6d authored Dec 12, 2005 by Jens Axboe Committed by Linus Torvalds Dec 12, 2005

[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>

parent adad0f33

drivers/block/cciss.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

Admin message