libblkid: Add support for Micron mpool formatted drives

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

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 8dfe892ff6aca4315caea4488e8e0891cb590844..c126b656c66adf767d9bf57ecffc22620735069c 100644 (file)
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -70,6 +70,7 @@ libblkid_la_SOURCES = \
        libblkid/src/superblocks/luks.c \
        libblkid/src/superblocks/lvm.c \
        libblkid/src/superblocks/minix.c \
+       libblkid/src/superblocks/mpool.c \
        libblkid/src/superblocks/netware.c \
        libblkid/src/superblocks/nilfs.c \
        libblkid/src/superblocks/ntfs.c \

diff --git a/libblkid/src/superblocks/mpool.c b/libblkid/src/superblocks/mpool.c
new file mode 100644 (file)
index 0000000..5f30fd4
--- /dev/null
+++ b/libblkid/src/superblocks/mpool.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2016 Micron Technology, Inc.
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdint.h>
+#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 */
+       uint16_t        osb_vers;
+       uint32_t        osb_gen;
+       uint32_t        osb_cksum1; /* crc32c of the preceding fields */
+} __attribute__((packed));
+
+static int probe_mpool(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       struct omf_sb_descriptor *osd;
+       uint32_t sb_crc;
+
+       osd = blkid_probe_get_sb(pr, mag, struct omf_sb_descriptor);
+       if (!osd)
+               return errno ? -errno : 1;
+
+       sb_crc = crc32c(~0L, (const void *)osd,
+                       offsetof(struct omf_sb_descriptor, osb_cksum1));
+       sb_crc ^= ~0L;
+
+       if (!blkid_probe_verify_csum(pr, sb_crc, osd->osb_cksum1))
+               return 1;
+
+       blkid_probe_set_label(pr, osd->osb_name, sizeof(osd->osb_name));
+       blkid_probe_set_uuid(pr, osd->osb_poolid);
+
+       return 0;
+}
+
+/**
+ * Superblock (sb) -- magic = ASCII "mpoolDev"
+ */
+#define MPOOL_SB_MAGIC "\x6D\x70\x6f\x6f\x6c\x44\x65\x76"
+
+const struct blkid_idinfo mpool_idinfo =
+{
+       .name           = "mpool",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .probefunc      = probe_mpool,
+       .magics         =
+       {
+               { .magic = MPOOL_SB_MAGIC, .len = 8},
+               { NULL }
+       }
+};

diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c
index 6b025ee1fc398d5956888984e93dc00980e0b55b..6bd9efe7dff2cee287f2d10be8d793bf4108d924 100644 (file)
--- a/libblkid/src/superblocks/superblocks.c
+++ b/libblkid/src/superblocks/superblocks.c
@@ -159,7 +159,8 @@ static const struct blkid_idinfo *idinfos[] =
        &befs_idinfo,
        &nilfs2_idinfo,
        &exfat_idinfo,
-       &f2fs_idinfo
+       &f2fs_idinfo,
+       &mpool_idinfo
 };
 
 /*

diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 695c3b783d59b7a8fa5f2fdecbaebc12928a586a..1a64ba6ec082256caaca07611dfd87bc2fc0c6d1 100644 (file)
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -78,6 +78,7 @@ extern const struct blkid_idinfo nilfs2_idinfo;
 extern const struct blkid_idinfo exfat_idinfo;
 extern const struct blkid_idinfo f2fs_idinfo;
 extern const struct blkid_idinfo bcache_idinfo;
+extern const struct blkid_idinfo mpool_idinfo;
 
 /*
  * superblock functions