Add code for Ext2FS and ReiserFS labels recognition.

Submitted by:	Stanislav Sedov <stas@310.ru>
PR:		kern/84638
MFC after:	1 week

7 files changed, 216 insertions, 0 deletions

diff --git a/sbin/geom/class/label/glabel.8 b/sbin/geom/class/label/glabel.8
index 707919f..f607c7b 100644
--- a/sbin/geom/class/label/glabel.8
+++ b/sbin/geom/class/label/glabel.8
@@ -102,6 +102,12 @@ MSDOSFS (FAT12, FAT16, FAT32) (directory
 .It
 CD ISO9660 (directory
 .Pa /dev/iso9660/ ) .
+.It
+EXT2FS (directory
+.Pa /dev/ext2fs/ ) .
+.It
+REISERFS (directory
+.Pa /dev/reiserfs/ ) .
 .El
 .Pp
 Non file-system labels are created in the directory
diff --git a/sys/conf/files b/sys/conf/files
index f73ccd8..2ff8095 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1060,8 +1060,10 @@ geom/geom_sunlabel_enc.c	optional geom_sunlabel
 geom/geom_vfs.c			standard
 geom/geom_vol_ffs.c		optional geom_vol
 geom/label/g_label.c		optional geom_label
+geom/label/g_label_ext2fs.c	optional geom_label
 geom/label/g_label_iso9660.c	optional geom_label
 geom/label/g_label_msdosfs.c	optional geom_label
+geom/label/g_label_reiserfs.c	optional geom_label
 geom/label/g_label_ufs.c	optional geom_label
 geom/mirror/g_mirror.c		optional geom_mirror
 geom/mirror/g_mirror_ctl.c	optional geom_mirror
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index 30b5b02..d3f9815 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -75,6 +75,8 @@ const struct g_label_desc *g_labels[] = {
 	&g_label_ufs,
 	&g_label_iso9660,
 	&g_label_msdosfs,
+	&g_label_ext2fs,
+	&g_label_reiserfs,
 	NULL
 };
 
diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h
index 2d17bbc..8144838 100644
--- a/sys/geom/label/g_label.h
+++ b/sys/geom/label/g_label.h
@@ -67,6 +67,8 @@ struct g_label_desc {
 extern const struct g_label_desc g_label_ufs;
 extern const struct g_label_desc g_label_iso9660;
 extern const struct g_label_desc g_label_msdosfs;
+extern const struct g_label_desc g_label_ext2fs;
+extern const struct g_label_desc g_label_reiserfs;
 #endif	/* _KERNEL */
 
 struct g_label_metadata {
diff --git a/sys/geom/label/g_label_ext2fs.c b/sys/geom/label/g_label_ext2fs.c
new file mode 100644
index 0000000..1825237
--- /dev/null
+++ b/sys/geom/label/g_label_ext2fs.c
@@ -0,0 +1,89 @@
+/*-
+ * Copyright (c) 2005 Stanislav Sedov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <geom/geom.h>
+#include <geom/label/g_label.h>
+
+#define EXT2FS_SB_OFFSET	1024
+#define EXT2_SUPER_MAGIC	0xef53
+#define EXT2_DYNAMIC_REV	1
+
+typedef struct e2sb {
+	uint8_t		fake1[56];
+	uint16_t	s_magic;
+	uint8_t		fake2[18];
+	uint32_t	s_rev_level;
+	uint8_t		fake3[40];
+	char		s_volume_name[16];
+} e2sb_t;
+
+static void
+g_label_ext2fs_taste(struct g_consumer *cp, char *label, size_t size)
+{
+	struct g_provider *pp;
+	e2sb_t *fs;
+
+	g_topology_assert_not();
+	pp = cp->provider;
+	label[0] = '\0';
+
+	fs = (e2sb_t *)g_read_data(cp, EXT2FS_SB_OFFSET, pp->sectorsize, NULL);
+	if (fs == NULL)
+		return;
+
+	/* Check for magic and versio n*/
+	if (fs->s_magic == EXT2_SUPER_MAGIC &&
+	    fs->s_rev_level == EXT2_DYNAMIC_REV) {
+		G_LABEL_DEBUG(1, "ext2fs file system detected on %s.",
+		    pp->name);
+	} else {
+		goto exit_free;
+	}
+
+	/* Check for volume label */
+	if (fs->s_volume_name[0] == '\0')
+		goto exit_free;
+
+	/* Terminate label */
+	fs->s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
+	strlcpy(label, fs->s_volume_name, size);
+
+exit_free:
+	g_free(fs);
+}
+
+const struct g_label_desc g_label_ext2fs = {
+	.ld_taste = g_label_ext2fs_taste,
+	.ld_dir = "ext2fs"
+};
diff --git a/sys/geom/label/g_label_reiserfs.c b/sys/geom/label/g_label_reiserfs.c
new file mode 100644
index 0000000..8ef1ec8
--- /dev/null
+++ b/sys/geom/label/g_label_reiserfs.c
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (c) 2005 Stanislav Sedov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <geom/geom.h>
+#include <geom/label/g_label.h>
+
+#define REISERFS_NEW_DISK_OFFSET 64 * 1024
+#define REISERFS_OLD_DISK_OFFSET 8 * 1024
+#define REISERFS_SUPER_MAGIC	"ReIsEr"
+
+typedef struct resiserfs_sb {
+	uint8_t		fake1[52];
+	char		s_magic[10];
+	uint8_t		fake2[10];
+	uint16_t	s_version;
+	uint8_t		fake3[26];
+	char		s_volume_name[16];
+} reiserfs_sb_t;
+
+static reiserfs_sb_t *
+g_label_reiserfs_read_super(struct g_consumer *cp, off_t offset, off_t len) 
+{
+	reiserfs_sb_t *fs;
+
+	fs = (reiserfs_sb_t *)g_read_data(cp, offset, len, NULL);
+	if (fs == NULL)
+		return (NULL);
+
+	if (strncmp(fs->s_magic, REISERFS_SUPER_MAGIC,
+	    strlen(REISERFS_SUPER_MAGIC)) != 0) {
+		g_free(fs);
+		return (NULL);
+	}
+
+	return (fs);
+}
+
+static void
+g_label_reiserfs_taste(struct g_consumer *cp, char *label, size_t size)
+{
+	struct g_provider *pp;
+	reiserfs_sb_t *fs;
+
+	g_topology_assert_not();
+	pp = cp->provider;
+	label[0] = '\0';
+
+	/* Try old format */
+	fs = g_label_reiserfs_read_super(cp, REISERFS_OLD_DISK_OFFSET,
+	    pp->sectorsize);
+	if (fs == NULL) {
+		/* Try new format */
+		fs = g_label_reiserfs_read_super(cp, REISERFS_NEW_DISK_OFFSET,
+		    pp->sectorsize);
+	}
+	if (fs == NULL)
+		return;
+
+	/* Check version */
+	if (fs->s_version == 2) {
+		G_LABEL_DEBUG(1, "reiserfs file system detected on %s.",
+		    pp->name);
+	} else {
+		goto exit_free;
+	}
+
+	/* Check for volume label */
+	if (fs->s_volume_name[0] == '\0')
+		goto exit_free;
+
+	/* Terminate label */
+	fs->s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
+	strlcpy(label, fs->s_volume_name, size);
+
+exit_free:
+	g_free(fs);
+}
+
+const struct g_label_desc g_label_reiserfs = {
+	.ld_taste = g_label_reiserfs_taste,
+	.ld_dir = "reiserfs"
+};
diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile
index 839a48e..435dc11 100644
--- a/sys/modules/geom/geom_label/Makefile
+++ b/sys/modules/geom/geom_label/Makefile
@@ -4,8 +4,10 @@
 
 KMOD=	geom_label
 SRCS=	g_label.c
+SRCS+=	g_label_ext2fs.c
 SRCS+=	g_label_iso9660.c
 SRCS+=	g_label_msdosfs.c
+SRCS+=	g_label_reiserfs.c
 SRCS+=	g_label_ufs.c
 
 .include <bsd.kmod.mk>