summaryrefslogtreecommitdiffstats
path: root/fdisks/fdisksgilabel.c
diff options
context:
space:
mode:
authorKarel Zak2012-12-11 18:30:03 +0100
committerKarel Zak2013-03-11 12:47:29 +0100
commit53b422ab169dc3be8e8eee4ccb5f8e67bff1a122 (patch)
tree09dbb4e6826cb2b8470fc9165fd5373f242885fd /fdisks/fdisksgilabel.c
parentlibfdisk: add fdisk_label to driver API (diff)
downloadkernel-qcow2-util-linux-53b422ab169dc3be8e8eee4ccb5f8e67bff1a122.tar.gz
kernel-qcow2-util-linux-53b422ab169dc3be8e8eee4ccb5f8e67bff1a122.tar.xz
kernel-qcow2-util-linux-53b422ab169dc3be8e8eee4ccb5f8e67bff1a122.zip
libfdisk: move label identifier to label struct
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisksgilabel.c')
-rw-r--r--fdisks/fdisksgilabel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fdisks/fdisksgilabel.c b/fdisks/fdisksgilabel.c
index fa9e592ff..4b330bdb9 100644
--- a/fdisks/fdisksgilabel.c
+++ b/fdisks/fdisksgilabel.c
@@ -165,7 +165,6 @@ sgi_probe_label(struct fdisk_context *cxt,
fprintf(stderr,
_("Detected sgi disklabel with wrong checksum.\n"));
}
- cxt->disklabel = FDISK_DISKLABEL_SGI;
partitions= 16;
volumes = 15;
return 1;
@@ -838,7 +837,6 @@ static int sgi_create_disklabel(struct fdisk_context *cxt,
sgilabel->devparam.xylogics_writecont = SSWAP16(0);
memset(&(sgilabel->directory), 0, sizeof(struct volume_directory)*15);
memset(&(sgilabel->partitions), 0, sizeof(struct sgi_partition)*16);
- cxt->disklabel = FDISK_DISKLABEL_SGI;
partitions = 16;
volumes = 15;
sgi_set_entire(cxt);
@@ -980,6 +978,7 @@ struct fdisk_label *fdisk_new_sgi_label(struct fdisk_context *cxt)
/* initialize generic part of the driver */
lb = (struct fdisk_label *) sgi;
lb->name = "sgi";
+ lb->id = FDISK_DISKLABEL_SGI;
lb->op = &sgi_operations;
lb->parttypes = sgi_parttypes;
lb->nparttypes = ARRAY_SIZE(sgi_parttypes);