blkid: add ocfs and oracleasm

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

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index d4f966dd96f13c993ad37e323acaeae14ff53561..c5d64d028520febdd4f34d0beebeb7ef3332a4a8 100644 (file)
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -58,6 +58,9 @@ static const struct blkid_idinfo *idinfos[] =
        &gfs_idinfo,
        &gfs2_idinfo,
        &romfs_idinfo,
+       &ocfs_idinfo,
+       &ocfs2_idinfo,
+       &oracleasm_idinfo,
        &jbd_idinfo
 };
 

diff --git a/libs/blkid/src/probers/Makefile.am b/libs/blkid/src/probers/Makefile.am
index 9055d0d6318a1cf8f07320484e758fe47ab9889d..36ec82c75ceac02a4af2ed13547dfb0653a4e514 100644 (file)
--- a/libs/blkid/src/probers/Makefile.am
+++ b/libs/blkid/src/probers/Makefile.am
@@ -21,6 +21,7 @@ libprobers_a_SOURCES =        probers.h \
                        xfs.c \
                        ext.c \
                        gfs.c \
+                       ocfs.c \
                        romfs.c
 
 all-local: $(lib_LIBRARIES)

diff --git a/libs/blkid/src/probers/ocfs.c b/libs/blkid/src/probers/ocfs.c
new file mode 100644 (file)
index 0000000..6b74811
--- /dev/null
+++ b/libs/blkid/src/probers/ocfs.c
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 1999, 2001 by Andries Brouwer
+ * Copyright (C) 1999, 2000, 2003 by Theodore Ts'o
+ * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#include <stdint.h>
+
+#include "blkidP.h"
+
+struct ocfs_volume_header {
+       unsigned char   minor_version[4];
+       unsigned char   major_version[4];
+       unsigned char   signature[128];
+       char            mount[128];
+       unsigned char   mount_len[2];
+};
+
+struct ocfs_volume_label {
+       unsigned char   disk_lock[48];
+       char            label[64];
+       unsigned char   label_len[2];
+       unsigned char   vol_id[16];
+       unsigned char   vol_id_len[2];
+};
+
+#define ocfsmajor(o) ( (__u32) o.major_version[0] \
+                   + (((__u32) o.major_version[1]) << 8) \
+                   + (((__u32) o.major_version[2]) << 16) \
+                   + (((__u32) o.major_version[3]) << 24))
+
+#define ocfsminor(o) ( (__u32) o.minor_version[0] \
+                   + (((__u32) o.minor_version[1]) << 8) \
+                   + (((__u32) o.minor_version[2]) << 16) \
+                   + (((__u32) o.minor_version[3]) << 24))
+
+#define ocfslabellen(o)        ((__u32)o.label_len[0] + (((__u32) o.label_len[1]) << 8))
+#define ocfsmountlen(o)        ((__u32)o.mount_len[0] + (((__u32) o.mount_len[1]) << 8))
+
+#define OCFS_MAGIC "OracleCFS"
+
+struct ocfs2_super_block {
+       unsigned char  signature[8];
+       unsigned char  s_dummy1[184];
+       unsigned char  s_dummy2[80];
+       char           s_label[64];
+       unsigned char  s_uuid[16];
+};
+
+#define OCFS2_MIN_BLOCKSIZE             512
+#define OCFS2_MAX_BLOCKSIZE             4096
+
+#define OCFS2_SUPER_BLOCK_BLKNO         2
+
+#define OCFS2_SUPER_BLOCK_SIGNATURE     "OCFSV2"
+
+struct oracle_asm_disk_label {
+       char dummy[32];
+       char dl_tag[8];
+       char dl_id[24];
+};
+
+#define ORACLE_ASM_DISK_LABEL_MARKED    "ORCLDISK"
+#define ORACLE_ASM_DISK_LABEL_OFFSET    32
+
+static int probe_ocfs(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       unsigned char *buf;
+       struct ocfs_volume_header ovh;
+       struct ocfs_volume_label ovl;
+       uint32_t maj, min;
+
+       /* header */
+       buf = blkid_probe_get_buffer(pr, mag->kboff << 10,
+                       sizeof(struct ocfs_volume_header));
+       if (!buf)
+               return -1;
+       memcpy(&ovh, buf, sizeof(ovh));
+
+       /* label */
+       buf = blkid_probe_get_buffer(pr, (mag->kboff << 10) + 512,
+                       sizeof(struct ocfs_volume_label));
+       if (!buf)
+               return -1;
+       memcpy(&ovl, buf, sizeof(ovl));
+
+       maj = ocfsmajor(ovh);
+       min = ocfsminor(ovh);
+
+       if (maj == 1)
+               blkid_probe_set_value(pr, "SEC_TYPE",
+                               (unsigned char *) "ocfs1", sizeof("ocfs1"));
+       else if (maj >= 9)
+               blkid_probe_set_value(pr, "SEC_TYPE",
+                               (unsigned char *) "ntocfs", sizeof("ntocfs"));
+
+       blkid_probe_set_label(pr, (unsigned char *) ovl.label,
+                               ocfslabellen(ovl));
+       blkid_probe_set_value(pr, "MOUNT", (unsigned char *) ovh.mount,
+                               ocfsmountlen(ovh));
+       blkid_probe_set_uuid(pr, ovl.vol_id);
+       blkid_probe_sprintf_version(pr, "%u.%u", maj, min);
+       return 0;
+}
+
+static int probe_ocfs2(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       struct ocfs2_super_block *osb;
+
+       osb = blkid_probe_get_sb(pr, mag, struct ocfs2_super_block);
+       if (!osb)
+               return -1;
+
+       blkid_probe_set_label(pr, (unsigned char *) osb->s_label, sizeof(osb->s_label));
+       blkid_probe_set_uuid(pr, osb->s_uuid);
+       return 0;
+}
+
+static int probe_oracleasm(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       struct oracle_asm_disk_label *dl;
+
+       dl = blkid_probe_get_sb(pr, mag, struct oracle_asm_disk_label);
+       if (!dl)
+               return -1;
+
+       blkid_probe_set_label(pr, (unsigned char *) dl->dl_id, sizeof(dl->dl_id));
+       return 0;
+}
+
+
+const struct blkid_idinfo ocfs_idinfo =
+{
+       .name           = "ocfs",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .probefunc      = probe_ocfs,
+       .magics         =
+       {
+               { .magic = "OracleCFS", .len = 9, .kboff = 8 },
+               { NULL }
+       }
+};
+
+const struct blkid_idinfo ocfs2_idinfo =
+{
+       .name           = "ocfs2",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .probefunc      = probe_ocfs2,
+       .magics         =
+       {
+               { .magic = "OCFSV2", .len = 6, .kboff = 1 },
+               { .magic = "OCFSV2", .len = 6, .kboff = 2 },
+               { .magic = "OCFSV2", .len = 6, .kboff = 4 },
+               { .magic = "OCFSV2", .len = 6, .kboff = 8 },
+               { NULL }
+       }
+};
+
+const struct blkid_idinfo oracleasm_idinfo =
+{
+       .name           = "oracleasm",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .probefunc      = probe_oracleasm,
+       .magics         =
+       {
+               { .magic = "ORCLDISK", .len = 8, .sboff = 32 },
+               { NULL }
+       }
+};
+

diff --git a/libs/blkid/src/probers/probers.h b/libs/blkid/src/probers/probers.h
index 45a1e668b9d616ad96248795e41dd7386228d16a..3aedf1f906678364b32b90cf6c3aa2f11e97b3fd 100644 (file)
--- a/libs/blkid/src/probers/probers.h
+++ b/libs/blkid/src/probers/probers.h
@@ -38,5 +38,8 @@ extern const struct blkid_idinfo xfs_idinfo;
 extern const struct blkid_idinfo gfs_idinfo;
 extern const struct blkid_idinfo gfs2_idinfo;
 extern const struct blkid_idinfo romfs_idinfo;
+extern const struct blkid_idinfo ocfs_idinfo;
+extern const struct blkid_idinfo ocfs2_idinfo;
+extern const struct blkid_idinfo oracleasm_idinfo;
 
 #endif /* _BLKID_PROBE_H */