partitions/ldm: switch to use uuid_t

And the uuid helpers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

2 files changed, 7 insertions, 9 deletions

diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c
index edcea70674c9..2a365c756648 100644
--- a/block/partitions/ldm.c
+++ b/block/partitions/ldm.c
@@ -115,7 +115,7 @@ static bool ldm_parse_privhead(const u8 *data, struct privhead *ph)
                 ldm_error("PRIVHEAD disk size doesn't match real disk size");
                 return false;
         }
-        if (uuid_be_to_bin(data + 0x0030, (uuid_be *)ph->disk_id)) {
+        if (uuid_parse(data + 0x0030, &ph->disk_id)) {
                 ldm_error("PRIVHEAD contains an invalid GUID.");
                 return false;
         }
@@ -234,7 +234,7 @@ static bool ldm_compare_privheads (const struct privhead *ph1,
                 (ph1->logical_disk_size  == ph2->logical_disk_size)     &&
                 (ph1->config_start       == ph2->config_start)          &&
                 (ph1->config_size        == ph2->config_size)           &&
-                !memcmp (ph1->disk_id, ph2->disk_id, GUID_SIZE));
+                uuid_equal(&ph1->disk_id, &ph2->disk_id));
 }
 
 /**
@@ -557,7 +557,7 @@ static struct vblk * ldm_get_disk_objid (const struct ldmdb *ldb)
 
         list_for_each (item, &ldb->v_disk) {
                 struct vblk *v = list_entry (item, struct vblk, list);
-                if (!memcmp (v->vblk.disk.disk_id, ldb->ph.disk_id, GUID_SIZE))
+                if (uuid_equal(&v->vblk.disk.disk_id, &ldb->ph.disk_id))
                         return v;
         }
 
@@ -892,7 +892,7 @@ static bool ldm_parse_dsk3 (const u8 *buffer, int buflen, struct vblk *vb)
         disk = &vb->vblk.disk;
         ldm_get_vstr (buffer + 0x18 + r_diskid, disk->alt_name,
                 sizeof (disk->alt_name));
-        if (uuid_be_to_bin(buffer + 0x19 + r_name, (uuid_be *)disk->disk_id))
+        if (uuid_parse(buffer + 0x19 + r_name, &disk->disk_id))
                 return false;
 
         return true;
@@ -927,7 +927,7 @@ static bool ldm_parse_dsk4 (const u8 *buffer, int buflen, struct vblk *vb)
                 return false;
 
         disk = &vb->vblk.disk;
-        memcpy (disk->disk_id, buffer + 0x18 + r_name, GUID_SIZE);
+        uuid_copy(&disk->disk_id, (uuid_t *)(buffer + 0x18 + r_name));
         return true;
 }
 
diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h
index 374242c0971a..f4c6055df956 100644
--- a/block/partitions/ldm.h
+++ b/block/partitions/ldm.h
@@ -112,8 +112,6 @@ struct frag {				/* VBLK Fragment handling */
 
 /* In memory LDM database structures. */
 
-#define GUID_SIZE               16
-
 struct privhead {                       /* Offsets and sizes are in sectors. */
         u16     ver_major;
         u16     ver_minor;
@@ -121,7 +119,7 @@ struct privhead {			/* Offsets and sizes are in sectors. */
         u64     logical_disk_size;
         u64     config_start;
         u64     config_size;
-        u8      disk_id[GUID_SIZE];
+        uuid_t  disk_id;
 };
 
 struct tocblock {                       /* We have exactly two bitmaps. */
@@ -154,7 +152,7 @@ struct vblk_dgrp {			/* VBLK Disk Group */
 };
 
 struct vblk_disk {                      /* VBLK Disk */
-        u8      disk_id[GUID_SIZE];
+        uuid_t  disk_id;
         u8      alt_name[128];
 };