summaryrefslogtreecommitdiff
path: root/drivers/md/dm-table.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-05-31 15:55:30 +0300
committerJens Axboe <axboe@kernel.dk>2023-06-05 19:57:40 +0300
commitd4a28d7defe79006e59293a4b43d518ba8483fb0 (patch)
treefebeabd7b852358564e9a33e2fe5a271142b43ad /drivers/md/dm-table.c
parent49177377e910a8fd5cd1388c966d8fbb51075c3c (diff)
downloadlinux-d4a28d7defe79006e59293a4b43d518ba8483fb0.tar.xz
dm: remove dm_get_dev_t
Open code dm_get_dev_t in the only remaining caller, and propagate the exact error code from lookup_bdev and early_lookup_bdev. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230531125535.676098-20-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/dm-table.c')
-rw-r--r--drivers/md/dm-table.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 05aa16da43b0..1576b408768d 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -324,20 +324,6 @@ static int upgrade_mode(struct dm_dev_internal *dd, fmode_t new_mode,
}
/*
- * Convert the path to a device
- */
-dev_t dm_get_dev_t(const char *path)
-{
- dev_t dev;
-
- if (lookup_bdev(path, &dev) &&
- early_lookup_bdev(path, &dev))
- return 0;
- return dev;
-}
-EXPORT_SYMBOL_GPL(dm_get_dev_t);
-
-/*
* Add a device to the list, or just increment the usage count if
* it's already present.
*/
@@ -359,9 +345,11 @@ int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode,
if (MAJOR(dev) != major || MINOR(dev) != minor)
return -EOVERFLOW;
} else {
- dev = dm_get_dev_t(path);
- if (!dev)
- return -ENODEV;
+ r = lookup_bdev(path, &dev);
+ if (r)
+ r = early_lookup_bdev(path, &dev);
+ if (r)
+ return r;
}
if (dev == disk_devt(t->md->disk))
return -EINVAL;