diff mbox series

block: Set memalloc_noio to false on device_add_disk() error path

Message ID 20231211075356.1839282-1-linan666@huaweicloud.com (mailing list archive)
State New, archived
Headers show
Series block: Set memalloc_noio to false on device_add_disk() error path | expand

Commit Message

Li Nan Dec. 11, 2023, 7:53 a.m. UTC 
From: Li Nan <linan122@huawei.com>

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>
---
 block/genhd.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Christoph Hellwig Dec. 11, 2023, 4:49 p.m. UTC | #1 
On Mon, Dec 11, 2023 at 03:53:56PM +0800, linan666@huaweicloud.com wrote:
> From: Li Nan <linan122@huawei.com>
> 
> 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.

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>
Jens Axboe Dec. 13, 2023, 3:20 p.m. UTC | #2 
On Mon, 11 Dec 2023 15:53:56 +0800, linan666@huaweicloud.com wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] block: Set memalloc_noio to false on device_add_disk() error path
      commit: 5fa3d1a00c2d4ba14f1300371ad39d5456e890d7

Best regards,
diff mbox series

Patch

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 @@  int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
 	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: