From 47d7ee47baf2c92dad390251e6c1306afa7eea29 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 23 Aug 2017 16:01:32 +0200 Subject: [PATCH] part: efi: make gpt_fill_pte take the device descriptor The gpt_fill_pte will need to access the device block size. Let's pass the device descriptor as an argument. Signed-off-by: Maxime Ripard Reviewed-by: Tom Rini --- disk/part_efi.c | 7 ++++--- include/part.h | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index fa95ce1..807d01d 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -428,8 +428,9 @@ int write_gpt_table(struct blk_desc *dev_desc, return -1; } -int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, - disk_partition_t *partitions, int parts) +int gpt_fill_pte(struct blk_desc *dev_desc, + gpt_header *gpt_h, gpt_entry *gpt_e, + disk_partition_t *partitions, int parts) { lbaint_t offset = (lbaint_t)le64_to_cpu(gpt_h->first_usable_lba); lbaint_t last_usable_lba = (lbaint_t) @@ -633,7 +634,7 @@ int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid, goto err; /* Generate partition entries */ - ret = gpt_fill_pte(gpt_h, gpt_e, partitions, parts_count); + ret = gpt_fill_pte(dev_desc, gpt_h, gpt_e, partitions, parts_count); if (ret) goto err; diff --git a/include/part.h b/include/part.h index 0cd803a..0d5c998 100644 --- a/include/part.h +++ b/include/part.h @@ -289,6 +289,7 @@ int write_gpt_table(struct blk_desc *dev_desc, /** * gpt_fill_pte(): Fill the GPT partition table entry * + * @param dev_desc - block device descriptor * @param gpt_h - GPT header representation * @param gpt_e - GPT partition table entries * @param partitions - list of partitions @@ -296,8 +297,9 @@ int write_gpt_table(struct blk_desc *dev_desc, * * @return zero on success */ -int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, - disk_partition_t *partitions, int parts); +int gpt_fill_pte(struct blk_desc *dev_desc, + gpt_header *gpt_h, gpt_entry *gpt_e, + disk_partition_t *partitions, int parts); /** * gpt_fill_header(): Fill the GPT header