diff options
| author | Li Nan <linan122@huawei.com> | 2023-12-11 10:53:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-26 02:35:25 +0300 |
| commit | 89665b3daea47fee90828d315353518ed0689048 (patch) | |
| tree | eb9eae1f71242536a71b515dabeb4ce1d2a1c9f7 /block/genhd.c | |
| parent | 1e1fe2bd87ac923b1e9a74871f567fc832104104 (diff) | |
| download | linux-89665b3daea47fee90828d315353518ed0689048.tar.xz | |
block: Set memalloc_noio to false on device_add_disk() error path
[ Upstream commit 5fa3d1a00c2d4ba14f1300371ad39d5456e890d7 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index cc32a0c704eb..95a4b8ae2aea 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: |