korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

block: factor out a part_devt helper

Browse Source 
Add a helper to find the dev_t for a disk + partno tuple.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20210525061301.2242282-8-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-05-25 08:13:00 +02:00 committed by Jens Axboe
parent ab4b57057d
commit c97d93c31e
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
block/genhd.c
View File

@ -1227,6 +1227,19 @@ static int __init proc_genhd_init(void)
module_init(proc_genhd_init); module_init(proc_genhd_init);
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
dev_t part_devt(struct gendisk *disk, u8 partno)
{
struct block_device *part = bdget_disk(disk, partno);
dev_t devt = 0;
if (part) {
devt = part->bd_dev;
bdput(part);
}
return devt;
}
dev_t blk_lookup_devt(const char *name, int partno) dev_t blk_lookup_devt(const char *name, int partno)
{ {
dev_t devt = MKDEV(0, 0); dev_t devt = MKDEV(0, 0);
@ -1236,7 +1249,6 @@ dev_t blk_lookup_devt(const char *name, int partno)
class_dev_iter_init(&iter, &block_class, NULL, &disk_type); class_dev_iter_init(&iter, &block_class, NULL, &disk_type);
while ((dev = class_dev_iter_next(&iter))) { while ((dev = class_dev_iter_next(&iter))) {
struct gendisk *disk = dev_to_disk(dev); struct gendisk *disk = dev_to_disk(dev);
struct block_device *part;
if (strcmp(dev_name(dev), name)) if (strcmp(dev_name(dev), name))
continue; continue;
@ -1247,13 +1259,10 @@ dev_t blk_lookup_devt(const char *name, int partno)
*/ */
devt = MKDEV(MAJOR(dev->devt), devt = MKDEV(MAJOR(dev->devt),
MINOR(dev->devt) + partno); MINOR(dev->devt) + partno);
break; } else {
} devt = part_devt(disk, partno);
part = bdget_disk(disk, partno); if (devt)
if (part) { break;
devt = part->bd_dev;
bdput(part);
break;
} }
} }
class_dev_iter_exit(&iter); class_dev_iter_exit(&iter);

1
include/linux/genhd.h
View File

@ -333,6 +333,7 @@ static inline void bd_unlink_disk_holder(struct block_device *bdev,
} }
#endif /* CONFIG_SYSFS */ #endif /* CONFIG_SYSFS */
dev_t part_devt(struct gendisk *disk, u8 partno);
dev_t blk_lookup_devt(const char *name, int partno); dev_t blk_lookup_devt(const char *name, int partno);
void blk_request_module(dev_t devt); void blk_request_module(dev_t devt);
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK

10
init/do_mounts.c
View File

@ -133,14 +133,8 @@ static dev_t devt_from_partuuid(const char *uuid_str)
* Attempt to find the requested partition by adding an offset * Attempt to find the requested partition by adding an offset
* to the partition number found by UUID. * to the partition number found by UUID.
*/ */
struct block_device *part; devt = part_devt(dev_to_disk(dev),
dev_to_bdev(dev)->bd_partno + offset);
part = bdget_disk(dev_to_disk(dev),
dev_to_bdev(dev)->bd_partno + offset);
if (part) {
devt = part->bd_dev;
bdput(part);
}
} else { } else {
devt = dev->devt; devt = dev->devt;
} }