diff mbox series

[9/9] loop: rewrite loop_exit using idr_for_each_entry

Message ID 20210621101547.3764003-10-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series [1/9] loop: reorder loop_exit | expand

Commit Message

Christoph Hellwig June 21, 2021, 10:15 a.m. UTC 
Use idr_for_each_entry to simplify removing all devices.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/block/loop.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Comments

Chaitanya Kulkarni June 21, 2021, 8:20 p.m. UTC | #1 
On 6/21/21 03:42, Christoph Hellwig wrote:
> Use idr_for_each_entry to simplify removing all devices.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

I actually thought about this while reviewing the first
patch. Looks good.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
diff mbox series

Patch

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 2ff5162bd28b..a9fd1f0d0ded 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2349,21 +2349,17 @@  static int __init loop_init(void)
 	return err;
 }
 
-static int loop_exit_cb(int id, void *ptr, void *data)
-{
-	struct loop_device *lo = ptr;
-
-	loop_remove(lo);
-	return 0;
-}
-
 static void __exit loop_exit(void)
 {
+	struct loop_device *lo;
+	int id;
+
 	unregister_blkdev(LOOP_MAJOR, "loop");
 	misc_deregister(&loop_misc);
 
 	mutex_lock(&loop_ctl_mutex);
-	idr_for_each(&loop_index_idr, &loop_exit_cb, NULL);
+	idr_for_each_entry(&loop_index_idr, lo, id)
+		loop_remove(lo);
 	mutex_unlock(&loop_ctl_mutex);
 
 	idr_destroy(&loop_index_idr);