From: Karel Zak <kzak@redhat.com>
Date: Wed, 29 May 2013 13:08:12 +0000 (+0200)
Subject: libfdisk: (sun) remove duplicate code
X-Git-Tag: v2.24-rc1~222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8dd3d1532c692d7ab308cd44887750c846fad5c;p=thirdparty%2Futil-linux.git

libfdisk: (sun) remove duplicate code

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c
index baab28b7c6..a8d200fb28 100644
--- a/libfdisk/src/sun.c
+++ b/libfdisk/src/sun.c
@@ -132,10 +132,6 @@ static int sun_probe_label(struct fdisk_context *cxt)
 		return 1;
 	}
 
-	/* map first sector buffer to sun header */
-	sun = (struct fdisk_sun_label *) cxt->label;
-	sun->header = (struct sun_disklabel *) cxt->firstsector;
-
 	cxt->label->nparts_max = SUN_MAXPARTITIONS;
 	cxt->geom.heads = be16_to_cpu(sunlabel->nhead);
 	cxt->geom.cylinders = be16_to_cpu(sunlabel->ncyl);
@@ -216,7 +212,6 @@ static int sun_create_disklabel(struct fdisk_context *cxt)
 	sunlabel = sun->header;
 
 	cxt->label->nparts_max = SUN_MAXPARTITIONS;
-	fdisk_zeroize_firstsector(cxt);
 
 	sunlabel->magic = cpu_to_be16(SUN_LABEL_MAGIC);
 	sunlabel->vtoc.version = cpu_to_be32(SUN_VTOC_VERSION);