loop: deprecate autoloading callback loop_probe()

commit 23881aec85 upstream.

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 fbdee71bb5 ("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>
Cc: Sven Joachim <svenjoac@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mauricio Faria de Oliveira
2023-07-20 11:30:32 -03:00
committed by Greg Kroah-Hartman
parent 75c27bdb21
commit a413b88cdb

View File

@@ -2118,6 +2118,7 @@ static void loop_remove(struct loop_device *lo)
put_disk(lo->lo_disk); put_disk(lo->lo_disk);
} }
#ifdef CONFIG_BLOCK_LEGACY_AUTOLOAD
static void loop_probe(dev_t dev) static void loop_probe(dev_t dev)
{ {
int idx = MINOR(dev) >> part_shift; int idx = MINOR(dev) >> part_shift;
@@ -2126,6 +2127,9 @@ static void loop_probe(dev_t dev)
return; return;
loop_add(idx); loop_add(idx);
} }
#else
#define loop_probe NULL
#endif /* !CONFIG_BLOCK_LEGACY_AUTOLOAD */
static int loop_control_remove(int idx) static int loop_control_remove(int idx)
{ {