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

Commit 0fa8ebdd authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block/loop: Delete gendisk before cleaning up the request queue 



Remove the disk, partition and bdi sysfs attributes before cleaning up
the request queue associated with the disk.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Cc: Josef Bacik <jbacik@fb.com>
Cc: Shaohua Li <shli@fb.com>
Cc: Omar Sandoval <osandov@fb.com>
Cc: Hannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 24941b90

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -1864,8 +1864,8 @@ static int loop_add(struct loop_device **l, int i) 


static void loop_remove(struct loop_device *lo)

{

	blk_cleanup_queue(lo->lo_queue);

	del_gendisk(lo->lo_disk);

	blk_cleanup_queue(lo->lo_queue);

	blk_mq_free_tag_set(&lo->tag_set);

	put_disk(lo->lo_disk);

	kfree(lo);