From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Feb 2018 09:30:39 +0000 (+0100)
Subject: libblkid: make mpool independent on libuuid
X-Git-Tag: v2.32-rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcca7846c0f353780332882d2b94b7936e447850;p=thirdparty%2Futil-linux.git

libblkid: make mpool independent on libuuid

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

diff --git a/libblkid/src/superblocks/mpool.c b/libblkid/src/superblocks/mpool.c
index 5f30fd496f..da5229b964 100644
--- a/libblkid/src/superblocks/mpool.c
+++ b/libblkid/src/superblocks/mpool.c
@@ -13,14 +13,12 @@
 #include "crc32c.h"
 #include "superblocks.h"
 
-#include <uuid.h>
-
 #define MAX_MPOOL_NAME_LEN 32
 
 struct omf_sb_descriptor {
 	uint64_t        osb_magic;
 	uint8_t         osb_name[MAX_MPOOL_NAME_LEN];
-	uuid_t          osb_poolid; /* UUID of pool this drive belongs to */
+	unsigned char   osb_poolid[16]; /* UUID of pool this drive belongs to */
 	uint16_t        osb_vers;
 	uint32_t        osb_gen;
 	uint32_t        osb_cksum1; /* crc32c of the preceding fields */