summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-11-24 12:01:45 +0100
committerJens Axboe <axboe@kernel.dk>2020-12-01 14:53:40 -0700
commit231926dbf0f084211e4ec4f4c006f0bf1f47809a (patch)
tree77076293127f7e2b7f216f5b6b63e72cb97f97f1 /init
parent29ff57c61094e7bbd921ab10b5a99dce9a0132e0 (diff)
block: move the partition_meta_info to struct block_device
Move the partition_meta_info to struct block_device in preparation for killing struct hd_struct. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 5879edf083b3..368ccb718501 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -79,8 +79,8 @@ static int match_dev_by_uuid(struct device *dev, const void *data)
const struct uuidcmp *cmp = data;
struct hd_struct *part = dev_to_part(dev);
- if (!part->info ||
- strncasecmp(cmp->uuid, part->info->uuid, cmp->len))
+ if (!part->bdev->bd_meta_info ||
+ strncasecmp(cmp->uuid, part->bdev->bd_meta_info->uuid, cmp->len))
return 0;
return 1;
}
@@ -169,7 +169,8 @@ static int match_dev_by_label(struct device *dev, const void *data)
const char *label = data;
struct hd_struct *part = dev_to_part(dev);
- if (!part->info || strcmp(label, part->info->volname))
+ if (!part->bdev->bd_meta_info ||
+ strcmp(label, part->bdev->bd_meta_info->volname))
return 0;
return 1;
}