diff options
| author | Karel Zak | 2013-06-18 15:11:57 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:47:02 +0200 |
| commit | 71ade4da581ccb122d7c6c8d6bcfaaabbf4012e4 (patch) | |
| tree | 9cad6418a448e9b25cae97341d568cec408319f3 /libblkid/src/partitions/dos.c | |
| parent | include/pt-mbr: add functio to store le (diff) | |
| download | kernel-qcow2-util-linux-71ade4da581ccb122d7c6c8d6bcfaaabbf4012e4.tar.gz kernel-qcow2-util-linux-71ade4da581ccb122d7c6c8d6bcfaaabbf4012e4.tar.xz kernel-qcow2-util-linux-71ade4da581ccb122d7c6c8d6bcfaaabbf4012e4.zip | |
libblkid: rename sys_type to sys_ind
This makes struct dos_partition more compatible with the current fdisk
code.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/partitions/dos.c')
| -rw-r--r-- | libblkid/src/partitions/dos.c | 14 |
1 files changed, 7 insertions, 7 deletions
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, |