Recognise Oracle Automatic Storage Management (ASM)
volumes in vol_id. This matches blkid(8) behaviour.
---
extras/volume_id/README | 1 +
extras/volume_id/lib/Makefile | 1 +
extras/volume_id/lib/libvolume_id.h | 1 +
extras/volume_id/lib/oracleasm.c | 65 +++++++++++++++++++++++++++++++++++
extras/volume_id/lib/volume_id.c | 1 +
5 files changed, 69 insertions(+), 0 deletions(-)
create mode 100644 extras/volume_id/lib/oracleasm.c
diff --git a/extras/volume_id/README b/extras/volume_id/README
index 01b4c44..0c5e37f 100644
--- a/extras/volume_id/README
+++ b/extras/volume_id/README
@@ -41,6 +41,7 @@ ocfs (1, 2) * * * *
vxfs * - - *
nss (netware) * * *
gfs, gfs2 * * - -
+oracleasm * * - -
Raid members are detected to prevent the probing for a filesystem
-----------------------------------------------------------------
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index 0b6c727..67006dc 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -52,6 +52,7 @@ OBJS= \
vxfs.o \
squashfs.o \
netware.o \
+ oracleasm.o \
volume_id.o \
util.o
diff --git a/extras/volume_id/lib/libvolume_id.h b/extras/volume_id/lib/libvolume_id.h
index 19aee68..6cce6e3 100644
--- a/extras/volume_id/lib/libvolume_id.h
+++ b/extras/volume_id/lib/libvolume_id.h
@@ -119,6 +119,7 @@ extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64
extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size);
extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size);
extern int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_oracleasm(struct volume_id *id, uint64_t off, uint64_t size);
/* bios raid */
extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
diff --git a/extras/volume_id/lib/oracleasm.c b/extras/volume_id/lib/oracleasm.c
new file mode 100644
index 0000000..0f5ff80
--- /dev/null
+++ b/extras/volume_id/lib/oracleasm.c
@@ -0,0 +1,65 @@
+/*
+ * volume_id - reads filesystem label and uuid
+ *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@xxxxxxxx>
+ *
+ * This program 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 version 2 of the License.
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "libvolume_id.h"
+#include "util.h"
+
+struct oracleasm_super_block {
+ uint8_t tag[8];
+ uint8_t id[24];
+} PACKED;
+
+#define ASM_SB_OFF 0x20
+#define ASM_MAGIC "ORCLDISK"
+
+/*
+ * Detect Oracle Automatic Storage Management (ASM).
+ * It can do mirroring, but don't consider it RAID in the sense
+ * that an ext3 filesystem could live inside. Thus, mark it 'other'.
+ * There also is a magic word 'ORCLCLRD'; like blkid(8), we ignore that.
+ */
+int volume_id_probe_oracleasm(struct volume_id *id, uint64_t off, uint64_t size)
+{
+ const uint8_t *buf;
+ struct oracleasm_super_block *oracleasm;
+
+ info("probing at offset 0x%llx\n", (unsigned long long) off);
+
+ buf = volume_id_get_buffer(id, off + ASM_SB_OFF, 0x800);
+ if (buf == NULL)
+ return -1;
+
+ oracleasm = (struct oracleasm_super_block *) buf;
+
+ if (memcmp(oracleasm->tag, ASM_MAGIC, 8) != 0)
+ return -1;
+
+ volume_id_set_usage(id, VOLUME_ID_OTHER);
+ volume_id_set_label_raw(id, oracleasm->id, 24);
+ volume_id_set_label_string(id, oracleasm->id, 24);
+ id->type = "oracleasm";
+
+ return 0;
+}
diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index baeaa9f..b247fe2 100644
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -77,6 +77,7 @@ static const struct prober prober_filesystem[] = {
{ volume_id_probe_vxfs, { "vxfs", } },
{ volume_id_probe_squashfs, { "squashfs", } },
{ volume_id_probe_netware, { "netware", } },
+ { volume_id_probe_oracleasm, { "oracleasm", } },
};
/* the user can overwrite this log function */
--
1.5.5.1.g1fbb5
--
To unsubscribe from this list: send the line "unsubscribe linux-hotplug" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
