Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ce59025 authored by Jens Axboe's avatar Jens Axboe
Browse files

paride/pf: cleanup queues when detection fails 



The driver allocates queues for all the units it potentially
supports. But if we fail to detect any drives, then we fail
loading the module without cleaning up those queues. This is
now evident with the switch to blk-mq, though the bug has
been there forever as far as I can tell.

Also fix cleanup through regular module exit.

Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Tested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9e98c678

drivers/block/paride/pf.c

+11 −5
Original line number Diff line number Diff line
@@ -761,8 +761,12 @@ static int pf_detect(void) 
		return 0;



	printk("%s: No ATAPI disk detected\n", name);

	for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++)

	for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {

		blk_cleanup_queue(pf->disk->queue);

		pf->disk->queue = NULL;

		blk_mq_free_tag_set(&pf->tag_set);

		put_disk(pf->disk);

	}

	pi_unregister_driver(par_drv);

	return -1;

}
@@ -1047,12 +1051,14 @@ static void __exit pf_exit(void) 
	int unit;

	unregister_blkdev(major, name);

	for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {

		if (!pf->present)

			continue;

		if (pf->present)

			del_gendisk(pf->disk);



		blk_cleanup_queue(pf->disk->queue);

		blk_mq_free_tag_set(&pf->tag_set);

		put_disk(pf->disk);



		if (pf->present)

			pi_release(pf->pi);

	}

}