loop: rewrite loop_exit using idr_for_each_entry

Use idr_for_each_entry to simplify removing all devices.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Link: https://lore.kernel.org/r/20210623145908.92973-10-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index ff7014608ef6f4e45a2fdb5544723970322fe451..39c05cf518fb7e99e4ada1ddc3a53d3df6877aec 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2518,21 +2518,17 @@ err_out:
        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);