summaryrefslogtreecommitdiffstats
path: root/drivers/block/loop.c
diff options
context:
space:
mode:
authorMauricio Faria de Oliveira <mfo@canonical.com>2023-07-20 16:30:32 +0200
committerJens Axboe <axboe@kernel.dk>2023-07-21 21:20:48 +0200
commit23881aec85f3219e8462e87c708815ee2cd82358 (patch)
tree81374fbb781a2640203b2a72742c4cc186fbf2fa /drivers/block/loop.c
parentsbitmap: fix batching wakeup (diff)
downloadlinux-23881aec85f3219e8462e87c708815ee2cd82358.tar.xz
linux-23881aec85f3219e8462e87c708815ee2cd82358.zip
loop: deprecate autoloading callback loop_probe()
The 'probe' callback in __register_blkdev() is only used under the CONFIG_BLOCK_LEGACY_AUTOLOAD deprecation guard. The loop_probe() function is only used for that callback, so guard it too, accordingly. See commit fbdee71bb5d8 ("block: deprecate autoloading based on dev_t"). Signed-off-by: Mauricio Faria de Oliveira <mfo@canonical.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230720143033.841001-2-mfo@canonical.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
-rw-r--r--drivers/block/loop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 37511d2b2caf..6e56c3faacac 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2093,6 +2093,7 @@ static void loop_remove(struct loop_device *lo)
put_disk(lo->lo_disk);
}
+#ifdef CONFIG_BLOCK_LEGACY_AUTOLOAD
static void loop_probe(dev_t dev)
{
int idx = MINOR(dev) >> part_shift;
@@ -2101,6 +2102,9 @@ static void loop_probe(dev_t dev)
return;
loop_add(idx);
}
+#else
+#define loop_probe NULL
+#endif /* !CONFIG_BLOCK_LEGACY_AUTOLOAD */
static int loop_control_remove(int idx)
{