Commit 4609dff6 authored Feb 08, 2012 by Vivek Goyal Committed by Jens Axboe Feb 08, 2012

floppy: Fix a crash during rmmod

floppy driver does not call add_disk() on all the drives hence we don't take
gendisk reference on request queue for these drives. Don't call put_disk()
with disk->queue set, otherwise we try to put the reference we never took.

Reported-and-tested-by: Dirk Gouders <gouders@et.bocholt.fh-gelsenkirchen.de>
Signed-off-by: Vivek <Goyal<vgoyal@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 3f9a5aab

drivers/block/floppy.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -4585,6 +4585,15 @@ static void __exit floppy_module_exit(void)
		platform_device_unregister(&floppy_device[drive]);
		}
		blk_cleanup_queue(disks[drive]->queue);

		/*
		* These disks have not called add_disk(). Don't put down
		* queue reference in put_disk().
		*/
		if (!(allowed_drive_mask & (1 << drive)) \|\|
		fdc_state[FDC(drive)].version == FDC_NONE)
		disks[drive]->queue = NULL;

		put_disk(disks[drive]);
		}