diff options
| author | Karel Zak | 2014-02-04 20:50:02 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-03-11 11:35:14 +0100 |
| commit | bd5e829198a61b0c2a9ef990ea6d017a7e7c8aef (patch) | |
| tree | f0b0a0712f5195f4fd6edf07e5ec168ee8060ecb /libfdisk/src/partition.c | |
| parent | libfdisk: (dos) fix log.partition delete (diff) | |
| download | kernel-qcow2-util-linux-bd5e829198a61b0c2a9ef990ea6d017a7e7c8aef.tar.gz kernel-qcow2-util-linux-bd5e829198a61b0c2a9ef990ea6d017a7e7c8aef.tar.xz kernel-qcow2-util-linux-bd5e829198a61b0c2a9ef990ea6d017a7e7c8aef.zip | |
libfdisk: remove label specific get_freespace
- it seems we can use improved nested<->container relationship
rather than implement DOS specific function
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/partition.c')
| -rw-r--r-- | libfdisk/src/partition.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index 20993ba3a..81594842c 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -11,6 +11,7 @@ struct fdisk_partition *fdisk_new_partition(void) pa->refcount = 1; INIT_LIST_HEAD(&pa->parts); pa->partno = FDISK_EMPTY_PARTNO; + pa->parent_partno = FDISK_EMPTY_PARTNO; DBG(PART, dbgprint("new %p", pa)); return pa; } @@ -29,6 +30,7 @@ void fdisk_reset_partition(struct fdisk_partition *pa) free(pa->attrs); memset(pa, 0, sizeof(*pa)); pa->partno = FDISK_EMPTY_PARTNO; + pa->parent_partno = FDISK_EMPTY_PARTNO; pa->refcount = ref; INIT_LIST_HEAD(&pa->parts); } @@ -205,18 +207,14 @@ const char *fdisk_partition_get_attrs(struct fdisk_partition *pa) return pa ? pa->attrs : NULL; } -/* nested partition means logical (within extended partition) */ -int fdisk_partition_set_nested(struct fdisk_partition *pa, int nested) +int fdisk_partition_is_nested(struct fdisk_partition *pa) { - if (!pa) - return -EINVAL; - pa->nested = nested ? 1 : 0; - return 0; + return pa && pa->parent_partno != FDISK_EMPTY_PARTNO; } -int fdisk_partition_is_nested(struct fdisk_partition *pa) +int fdisk_partition_is_container(struct fdisk_partition *pa) { - return pa && pa->nested; + return pa && pa->container; } int fdisk_partition_get_parent(struct fdisk_partition *pa, size_t *parent) |