Date: Sun, 7 Aug 2005 09:32:31 +0400 (MSD) From: Stanislav Sedov <stas@310.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: kern/84638: [PATCH] ext2fs & reiserfs labels handling code Message-ID: <200508070532.j775WVd1054110@dracon.310.ru> Resent-Message-ID: <200508070540.j775eCrG074722@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84638
>Category: kern
>Synopsis: [PATCH] ext2fs & reiserfs labels handling code
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 07 05:40:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
310.ru [Tridesyatoe]
>Environment:
System: FreeBSD stalingrad.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Mon Jul 25 12:55:16 UTC 2005 root@stalingrad.realnet:/work/src/fbsd-cur/src/sys/i386/compile/DESKTOP i386
>Description:
g_label ext2fs & reiserfs labels support.
>How-To-Repeat:
>Fix:
--- g_label_ext2fs.c begins here ---
/*-
* 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>
#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;
register char *p;
int error;
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, \
&error);
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[15] = '\0';
/* Correct unusable labels */
p = fs->s_volume_name;
while (*p != '\0')
if (*p++ == '/')
*(p-1) = '\\';
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"
};
--- g_label_ext2fs.c ends here ---
--- g_label_reiserfs.c begins here ---
/*-
* 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>
#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;
int error;
fs = (reiserfs_sb_t *)g_read_data(cp, offset, len, &error);
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;
register char *p;
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[15] = '\0';
/* Correct unusable labels */
p = fs->s_volume_name;
while (*p != '\0')
if (*p++ == '/')
*(p-1) = '\\';
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"
};
--- g_label_reiserfs.c ends here ---
--- files.diff begins here ---
--- /sys/conf/files.orig Mon Jul 25 15:53:10 2005
+++ /sys/conf/files Mon Jul 25 12:08:56 2005
@@ -1051,6 +1051,8 @@
geom/label/g_label_iso9660.c optional geom_label
geom/label/g_label_msdosfs.c optional geom_label
geom/label/g_label_ufs.c optional geom_label
+geom/label/g_label_ext2fs.c optional geom_label
+geom/label/g_label_reiserfs.c optional geom_label
geom/mirror/g_mirror.c optional geom_mirror
geom/mirror/g_mirror_ctl.c optional geom_mirror
geom/nop/g_nop.c optional geom_nop
--- files.diff ends here ---
--- g_label.c.diff begins here ---
--- /sys/geom/label/g_label.c.orig Mon Jul 25 15:54:07 2005
+++ /sys/geom/label/g_label.c Mon Jul 25 10:19:36 2005
@@ -75,6 +75,8 @@
&g_label_ufs,
&g_label_iso9660,
&g_label_msdosfs,
+ &g_label_ext2fs,
+ &g_label_reiserfs,
NULL
};
--- g_label.c.diff ends here ---
--- g_label.h.diff begins here ---
--- /sys/geom/label/g_label.h.orig Mon Jul 25 15:54:18 2005
+++ /sys/geom/label/g_label.h Mon Jul 25 10:19:22 2005
@@ -67,6 +67,8 @@
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 {
--- g_label.h.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508070532.j775WVd1054110>