diff options
author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-02-28 10:15:30 -0800 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-02-28 12:23:35 -0700 |
commit | 392db38058eb47250a9d0cc737af37e78a7e443d (patch) | |
tree | aec4a6d336d91851920429cb157d27ebf4f178a8 /drivers/block/zram | |
parent | d8115c35bf3ee575cfc9c51ac9853f58a21a43dc (diff) | |
download | blackbird-obmc-linux-392db38058eb47250a9d0cc737af37e78a7e443d.tar.gz blackbird-obmc-linux-392db38058eb47250a9d0cc737af37e78a7e443d.zip |
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: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: Ming 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: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/zram')
-rw-r--r-- | drivers/block/zram/zram_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 0afa6c8c3857..85110e7931e5 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1620,8 +1620,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; |