add reiser and reiser4

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

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index c5d64d028520febdd4f34d0beebeb7ef3332a4a8..0872a0eae71ea883c3568c70b3c798bbfc31fd70 100644 (file)
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -61,6 +61,8 @@ static const struct blkid_idinfo *idinfos[] =
        &ocfs_idinfo,
        &ocfs2_idinfo,
        &oracleasm_idinfo,
+       &reiser_idinfo,
+       &reiser4_idinfo,
        &jbd_idinfo
 };
 

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

diff --git a/libs/blkid/src/probers/probers.h b/libs/blkid/src/probers/probers.h
index 3aedf1f906678364b32b90cf6c3aa2f11e97b3fd..7acf33e2e073058202811fb7e091d54c28c0866c 100644 (file)
--- a/libs/blkid/src/probers/probers.h
+++ b/libs/blkid/src/probers/probers.h
@@ -41,5 +41,8 @@ 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;
+extern const struct blkid_idinfo reiser_idinfo;
+extern const struct blkid_idinfo reiser4_idinfo;
+
 
 #endif /* _BLKID_PROBE_H */

diff --git a/libs/blkid/src/probers/reiserfs.c b/libs/blkid/src/probers/reiserfs.c
new file mode 100644 (file)
index 0000000..2d27e11
--- /dev/null
+++ b/libs/blkid/src/probers/reiserfs.c
@@ -0,0 +1,128 @@
+/*
+ * 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 reiserfs_super_block {
+       uint32_t        rs_blocks_count;
+       uint32_t        rs_free_blocks;
+       uint32_t        rs_root_block;
+       uint32_t        rs_journal_block;
+       uint32_t        rs_journal_dev;
+       uint32_t        rs_orig_journal_size;
+       uint32_t        rs_dummy2[5];
+       uint16_t        rs_blocksize;
+       uint16_t        rs_dummy3[3];
+       unsigned char   rs_magic[12];
+       uint32_t        rs_dummy4[5];
+       unsigned char   rs_uuid[16];
+       char            rs_label[16];
+};
+
+struct reiser4_super_block {
+       unsigned char   rs4_magic[16];
+       uint16_t        rs4_dummy[2];
+       unsigned char   rs4_uuid[16];
+       unsigned char   rs4_label[16];
+       uint64_t        rs4_dummy2;
+};
+
+static int probe_reiser(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       struct reiserfs_super_block *rs;
+       unsigned int blocksize;
+
+       rs = blkid_probe_get_sb(pr, mag, struct reiserfs_super_block);
+       if (!rs)
+               return -1;
+
+       blocksize = le16_to_cpu(rs->rs_blocksize);
+
+       /* The blocksize must be at least 1k */
+       if ((blocksize >> 10) == 0)
+               return -BLKID_ERR_PARAM;
+
+       /* If the superblock is inside the journal, we have the wrong one */
+       if (mag->kboff / (blocksize >> 10) > le32_to_cpu(rs->rs_journal_block))
+               return -BLKID_ERR_BIG;
+
+       /* LABEL/UUID are only valid for later versions of Reiserfs v3.6. */
+       if (mag->magic[6] == '2' || mag->magic[6] == '3') {
+               if (strlen(rs->rs_label))
+                       blkid_probe_set_label(pr,
+                                       (unsigned char *) rs->rs_label,
+                                       sizeof(rs->rs_label));
+               blkid_probe_set_uuid(pr, rs->rs_uuid);
+       }
+
+       return 0;
+}
+
+static int probe_reiser4(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       struct reiser4_super_block *rs4;
+
+       rs4 = blkid_probe_get_sb(pr, mag, struct reiser4_super_block);
+       if (!rs4)
+               return -1;
+
+       if (strlen((char *) rs4->rs4_label))
+               blkid_probe_set_label(pr, rs4->rs4_label, sizeof(rs4->rs4_label));
+       blkid_probe_set_uuid(pr, rs4->rs4_uuid);
+
+       return 0;
+}
+
+
+const struct blkid_idinfo reiser_idinfo =
+{
+       .name           = "reiser",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .probefunc      = probe_reiser,
+       .magics         =
+       {
+               { .magic = "ReIsErFs",  .len = 8, .kboff = 8,  .sboff = 0x34 },
+               { .magic = "ReIsEr2Fs", .len = 9, .kboff = 64, .sboff = 0x34 },
+               { .magic = "ReIsEr3Fs", .len = 9, .kboff = 64, .sboff = 0x34 },
+               { .magic = "ReIsErFs",  .len = 8, .kboff = 64, .sboff = 0x34 },
+               { .magic = "ReIsErFs",  .len = 8, .kboff =  8, .sboff = 20   },
+               { NULL }
+       }
+};
+
+const struct blkid_idinfo reiser4_idinfo =
+{
+       .name           = "reiser4",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .probefunc      = probe_reiser4,
+       .magics         =
+       {
+               { .magic = "ReIsEr4", .len = 7, .kboff = 64 },
+               { NULL }
+       }
+};
+
+
+
+