diff options
| -rw-r--r-- | include/pt-mbr.h | 2 | ||||
| -rw-r--r-- | libblkid/src/partitions/dos.c | 14 | ||||
| -rw-r--r-- | libblkid/src/partitions/gpt.c | 2 | ||||
| -rw-r--r-- | libblkid/src/partitions/minix.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/pt-mbr.h b/include/pt-mbr.h index 6a6510af4..283ec7fac 100644 --- a/include/pt-mbr.h +++ b/include/pt-mbr.h @@ -4,7 +4,7 @@ struct dos_partition { unsigned char boot_ind; /* 0x80 - active */ unsigned char bh, bs, bc; /* begin CHS */ - unsigned char sys_type; + unsigned char sys_ind; unsigned char eh, es, ec; /* end CHS */ unsigned char start_sect[4]; unsigned char nr_sects[4]; diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c index 0e0413e64..c45e06ebd 100644 --- a/libblkid/src/partitions/dos.c +++ b/libblkid/src/partitions/dos.c @@ -33,9 +33,9 @@ static const struct dos_subtypes { static inline int is_extended(struct dos_partition *p) { - return (p->sys_type == MBR_DOS_EXTENDED_PARTITION || - p->sys_type == MBR_W95_EXTENDED_PARTITION || - p->sys_type == MBR_LINUX_EXTENDED_PARTITION); + return (p->sys_ind == MBR_DOS_EXTENDED_PARTITION || + p->sys_ind == MBR_W95_EXTENDED_PARTITION || + p->sys_ind == MBR_LINUX_EXTENDED_PARTITION); } static int parse_dos_extended(blkid_probe pr, blkid_parttable tab, @@ -100,7 +100,7 @@ static int parse_dos_extended(blkid_probe pr, blkid_parttable tab, if (!par) goto err; - blkid_partition_set_type(par, p->sys_type); + blkid_partition_set_type(par, p->sys_ind); blkid_partition_set_flags(par, p->boot_ind); blkid_partition_gen_uuid(par); ct_nodata = 0; @@ -174,7 +174,7 @@ static int probe_dos_pt(blkid_probe pr, * GPT uses valid MBR */ for (p = p0, i = 0; i < 4; i++, p++) { - if (p->sys_type == MBR_GPT_PARTITION) { + if (p->sys_ind == MBR_GPT_PARTITION) { DBG(LOWPROBE, blkid_debug("probably GPT -- ignore")); goto nothing; } @@ -230,7 +230,7 @@ static int probe_dos_pt(blkid_probe pr, if (!par) goto err; - blkid_partition_set_type(par, p->sys_type); + blkid_partition_set_type(par, p->sys_ind); blkid_partition_set_flags(par, p->boot_ind); blkid_partition_gen_uuid(par); } @@ -261,7 +261,7 @@ static int probe_dos_pt(blkid_probe pr, continue; for (n = 0; n < ARRAY_SIZE(dos_nested); n++) { - if (dos_nested[n].type != p->sys_type) + if (dos_nested[n].type != p->sys_ind) continue; if (blkid_partitions_do_subprobe(pr, diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c index 39a41815c..dc057d358 100644 --- a/libblkid/src/partitions/gpt.c +++ b/libblkid/src/partitions/gpt.c @@ -175,7 +175,7 @@ static int is_pmbr_valid(blkid_probe pr) p = (struct dos_partition *) (data + MBR_PT_OFFSET); for (i = 0; i < 4; i++, p++) { - if (p->sys_type == MBR_GPT_PARTITION) + if (p->sys_ind == MBR_GPT_PARTITION) goto ok; } failed: diff --git a/libblkid/src/partitions/minix.c b/libblkid/src/partitions/minix.c index 5730f44c5..64df4d867 100644 --- a/libblkid/src/partitions/minix.c +++ b/libblkid/src/partitions/minix.c @@ -56,7 +56,7 @@ static int probe_minix_pt(blkid_probe pr, uint32_t start, size; blkid_partition par; - if (p->sys_type != MBR_MINIX_PARTITION) + if (p->sys_ind != MBR_MINIX_PARTITION) continue; start = dos_partition_start(p); @@ -73,7 +73,7 @@ static int probe_minix_pt(blkid_probe pr, if (!par) goto err; - blkid_partition_set_type(par, p->sys_type); + blkid_partition_set_type(par, p->sys_ind); blkid_partition_set_flags(par, p->boot_ind); } |