summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/label.c
diff options
context:
space:
mode:
authorKarel Zak2014-09-17 15:25:02 +0200
committerKarel Zak2014-10-07 14:55:32 +0200
commitea50ba5bf188dc02812e062678479ded1e727d1c (patch)
treea398b059f48125fa47289759ac12c0a8aaf323ce /libfdisk/src/label.c
parentlibfdisk: (sgi) add set_part() API (diff)
downloadkernel-qcow2-util-linux-ea50ba5bf188dc02812e062678479ded1e727d1c.tar.gz
kernel-qcow2-util-linux-ea50ba5bf188dc02812e062678479ded1e727d1c.tar.xz
kernel-qcow2-util-linux-ea50ba5bf188dc02812e062678479ded1e727d1c.zip
libfdisk: remove old label drives' API for parttypes
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/label.c')
-rw-r--r--libfdisk/src/label.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c
index 5ae67856b..071657c57 100644
--- a/libfdisk/src/label.c
+++ b/libfdisk/src/label.c
@@ -404,17 +404,16 @@ int fdisk_set_partition_type(struct fdisk_context *cxt,
size_t partnum,
struct fdisk_parttype *t)
{
- if (!cxt || !cxt->label)
+ if (!cxt || !cxt->label || !t)
return -EINVAL;
- DBG(CXT, ul_debugobj(cxt, "partition: %zd: set type", partnum));
if (cxt->label->op->set_part) {
struct fdisk_partition pa = { .type = t };
- return cxt->label->op->set_part(cxt, partnum, &pa);
- } else if (cxt->label->op->part_set_type)
- return cxt->label->op->part_set_type(cxt, partnum, t);
+ DBG(CXT, ul_debugobj(cxt, "partition: %zd: set type", partnum));
+ return cxt->label->op->set_part(cxt, partnum, &pa);
+ }
return -ENOSYS;
}