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

Commit 8aaf440a authored by Bart Van Assche's avatar Bart Van Assche Committed by Peter Kalauskas
Browse files

UPSTREAM: zram: 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: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>

(cherry picked from commit 392db38058eb47250a9d0cc737af37e78a7e443d)
Signed-off-by: default avatarPeter Kalauskas <peskal@google.com>
Bug: 112488418
Change-Id: I89931dc1f7f52c1940d6b7f8f375e85eab59c75e
parent 3c77b56d

drivers/block/zram/zram_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1629,8 +1629,8 @@ static int zram_remove(struct zram *zram) 


	pr_info("Removed device: %s\n", zram->disk->disk_name);



	blk_cleanup_queue(zram->disk->queue);

	del_gendisk(zram->disk);

	blk_cleanup_queue(zram->disk->queue);

	put_disk(zram->disk);

	kfree(zram);

	return 0;