summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLi Nan <linan122@huawei.com>2023-12-11 10:53:56 +0300
committerJens Axboe <axboe@kernel.dk>2023-12-13 18:17:02 +0300
commit5fa3d1a00c2d4ba14f1300371ad39d5456e890d7 (patch)
tree54ce84d94e4baf81c52ad53cdb129cd08438813c /block
parent9e4bf6a08d1e127bcc4bd72557f2dfafc6bc7f41 (diff)
downloadlinux-5fa3d1a00c2d4ba14f1300371ad39d5456e890d7.tar.xz
block: Set memalloc_noio to false on device_add_disk() error path
On the error path of device_add_disk(), device's memalloc_noio flag was set but not cleared. As the comment of pm_runtime_set_memalloc_noio(), "The function should be called between device_add() and device_del()". Clear this flag before device_del() now. Fixes: 25e823c8c37d ("block/genhd.c: apply pm_runtime_set_memalloc_noio on block devices") Signed-off-by: Li Nan <linan122@huawei.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20231211075356.1839282-1-linan666@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c
index c9d06f72c587..13db3a7943d8 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -542,6 +542,7 @@ out_put_holder_dir:
kobject_put(disk->part0->bd_holder_dir);
out_del_block_link:
sysfs_remove_link(block_depr, dev_name(ddev));
+ pm_runtime_set_memalloc_noio(ddev, false);
out_device_del:
device_del(ddev);
out_free_ext_minor: