diff options
Diffstat (limited to 'block/genhd.c')
-rw-r--r-- | block/genhd.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/block/genhd.c b/block/genhd.c index fda9c7a63c29..b922d4801c87 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -653,15 +653,21 @@ void genhd_media_change_notify(struct gendisk *disk) | |||
653 | EXPORT_SYMBOL_GPL(genhd_media_change_notify); | 653 | EXPORT_SYMBOL_GPL(genhd_media_change_notify); |
654 | #endif /* 0 */ | 654 | #endif /* 0 */ |
655 | 655 | ||
656 | dev_t blk_lookup_devt(const char *name) | 656 | dev_t blk_lookup_devt(const char *name, int part) |
657 | { | 657 | { |
658 | struct device *dev; | 658 | struct device *dev; |
659 | dev_t devt = MKDEV(0, 0); | 659 | dev_t devt = MKDEV(0, 0); |
660 | 660 | ||
661 | mutex_lock(&block_class_lock); | 661 | mutex_lock(&block_class_lock); |
662 | list_for_each_entry(dev, &block_class.devices, node) { | 662 | list_for_each_entry(dev, &block_class.devices, node) { |
663 | if (dev->type != &disk_type) | ||
664 | continue; | ||
663 | if (strcmp(dev->bus_id, name) == 0) { | 665 | if (strcmp(dev->bus_id, name) == 0) { |
664 | devt = dev->devt; | 666 | struct gendisk *disk = dev_to_disk(dev); |
667 | |||
668 | if (part < disk->minors) | ||
669 | devt = MKDEV(MAJOR(dev->devt), | ||
670 | MINOR(dev->devt) + part); | ||
665 | break; | 671 | break; |
666 | } | 672 | } |
667 | } | 673 | } |
@@ -669,7 +675,6 @@ dev_t blk_lookup_devt(const char *name) | |||
669 | 675 | ||
670 | return devt; | 676 | return devt; |
671 | } | 677 | } |
672 | |||
673 | EXPORT_SYMBOL(blk_lookup_devt); | 678 | EXPORT_SYMBOL(blk_lookup_devt); |
674 | 679 | ||
675 | struct gendisk *alloc_disk(int minors) | 680 | struct gendisk *alloc_disk(int minors) |