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

Commit 54514aa4 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

null_blk: do not del gendisk with lightnvm 



The gendisk structure has not been initialized when using lightnvm.
Make sure to not delete it upon exit. Also make sure that we use the
appropriate disk_name at unregistration.

Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 5b40db99

drivers/block/null_blk.c

+5 −3
Original line number Diff line number Diff line
@@ -435,11 +435,13 @@ static void null_del_dev(struct nullb *nullb) 
	list_del_init(&nullb->list);



	if (use_lightnvm)

		nvm_unregister(nullb->disk->disk_name);

		nvm_unregister(nullb->disk_name);

	else

		del_gendisk(nullb->disk);

	blk_cleanup_queue(nullb->q);

	if (queue_mode == NULL_Q_MQ)

		blk_mq_free_tag_set(&nullb->tag_set);

	if (!use_lightnvm)

		put_disk(nullb->disk);

	cleanup_queues(nullb);

	kfree(nullb);