Attachment 936134 Details for Bug 1140187 – Proposed patch to solve the problem

[patch] Proposed patch to solve the problem

4k.patch (text/plain), 1.29 KB, created by parmeshwr on 2014-09-10 12:54:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: parmeshwr

Created: 2014-09-10 12:54:56 UTC

Size: 1.29 KB

patch

obsolete

>--- util-linux-2.23.2/libblkid/src/partitions/gpt.c	2014-09-10 06:15:40.542906276 -0400
>+++ util-linux-2.23.2.new/libblkid/src/partitions/gpt.c	2014-09-10 06:20:16.037920410 -0400
>@@ -306,7 +306,7 @@
> 	blkid_parttable tab = NULL;
> 	blkid_partlist ls;
> 	uint64_t fu, lu;
>-	uint32_t ssf, i;
>+	uint32_t ssz, ssf, i;
> 	efi_guid_t guid;
> 	int ret;
> 
>@@ -331,10 +331,11 @@
> 	}
> 
> 	blkid_probe_use_wiper(pr, lba * blkid_probe_get_size(pr), 8);
>+	ssz = blkid_probe_get_sectorsize(pr);
> 
>-	if (blkid_probe_set_magic(pr, lba << 9,
>-			      sizeof(GPT_HEADER_SIGNATURE_STR) - 1,
>-			      (unsigned char *) GPT_HEADER_SIGNATURE_STR))
>+	if (blkid_probe_set_magic(pr, ssz * lba,
>+ 			      sizeof(GPT_HEADER_SIGNATURE_STR) - 1,
>+ 			      (unsigned char *) GPT_HEADER_SIGNATURE_STR))
> 		goto err;
> 
> 	if (blkid_partitions_need_typeonly(pr))
>@@ -344,8 +345,7 @@
> 	ls = blkid_probe_get_partlist(pr);
> 	if (!ls)
> 		goto err;
>-
>-	tab = blkid_partlist_new_parttable(ls, "gpt", lba << 9);
>+	tab = blkid_partlist_new_parttable(ls, "gpt", ssz * lba);
> 	if (!tab)
> 		goto err;
> 
>@@ -353,8 +353,7 @@
> 	swap_efi_guid(&guid);
> 	blkid_parttable_set_id(tab, (const unsigned char *) &guid);
> 
>-	ssf = blkid_probe_get_sectorsize(pr) / 512;
>-
>+	ssf = ssz / 512;
> 	fu = le64_to_cpu(h->first_usable_lba);
> 	lu = le64_to_cpu(h->last_usable_lba);
>

Actions: View | Diff

Attachments on bug 1140187: 936132 | 936133 | 936134