libblkid: add nilfs2 filesystem superblock probe

This patch implements nilfs2_idinfo to proble nilfs2 partition.
The patch probes uuid, label, version and verify crc check sum of
superblock.

Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am
index 39b074bad0d02aafdb4eb32942e1298afe395333..1501fab11848149dd210b6a5d7a9505352d1e5ad 100644 (file)
--- a/shlibs/blkid/src/superblocks/Makefile.am
+++ b/shlibs/blkid/src/superblocks/Makefile.am
@@ -47,4 +47,5 @@ libblkid_superblocks_la_SOURCES = \
                        drbd.c \
                        vmfs.c \
                        befs.c \
+                       nilfs.c \
                        exfat.c

diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c
new file mode 100644 (file)
index 0000000..c7aba35
--- /dev/null
+++ b/shlibs/blkid/src/superblocks/nilfs.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2010 by Jiro SEKIBA <jir@unicus.jp>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License
+ */
+#include <stddef.h>
+#include <string.h>
+
+#include "superblocks.h"
+#include "crc32.h"
+
+struct nilfs_super_block {
+       uint32_t        s_rev_level;
+       uint16_t        s_minor_rev_level;
+       uint16_t        s_magic;
+
+       uint16_t        s_bytes;
+
+       uint16_t        s_flags;
+       uint32_t        s_crc_seed;
+       uint32_t        s_sum;
+
+       uint32_t        s_log_block_size;
+
+       uint64_t        s_nsegments;
+       uint64_t        s_dev_size;
+       uint64_t        s_first_data_block;
+       uint32_t        s_blocks_per_segment;
+       uint32_t        s_r_segments_percentage;
+
+       uint64_t        s_last_cno;
+       uint64_t        s_last_pseg;
+       uint64_t        s_last_seq;
+       uint64_t        s_free_blocks_count;
+
+       uint64_t        s_ctime;
+
+       uint64_t        s_mtime;
+       uint64_t        s_wtime;
+       uint16_t        s_mnt_count;
+       uint16_t        s_max_mnt_count;
+       uint16_t        s_state;
+       uint16_t        s_errors;
+       uint64_t        s_lastcheck;
+
+       uint32_t        s_checkinterval;
+       uint32_t        s_creator_os;
+       uint16_t        s_def_resuid;
+       uint16_t        s_def_resgid;
+       uint32_t        s_first_ino;
+
+       uint16_t        s_inode_size;
+       uint16_t        s_dat_entry_size;
+       uint16_t        s_checkpoint_size;
+       uint16_t        s_segment_usage_size;
+
+       uint8_t         s_uuid[16];
+       char            s_volume_name[80];
+
+       uint32_t        s_c_interval;
+       uint32_t        s_c_block_max;
+       uint32_t        s_reserved[192];
+};
+
+/* nilfs2 magic string */
+#define NILFS_SB_MAGIC         "\x34\x34"
+/* nilfs2 super block offset */
+#define NILFS_SB_OFF           0x400
+/* nilfs2 super block offset in kB */
+#define NILFS_SB_KBOFF         (NILFS_SB_OFF >> 10)
+/* nilfs2 magic string offset within super block */
+#define NILFS_MAG_OFF          6
+
+static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       struct nilfs_super_block *sb;
+       static unsigned char sum[4];
+       const int sumoff = offsetof(struct nilfs_super_block, s_sum);
+       size_t bytes;
+       uint32_t crc;
+
+       sb = blkid_probe_get_sb(pr, mag, struct nilfs_super_block);
+       if (!sb)
+               return -1;
+
+       bytes = le32_to_cpu(sb->s_bytes);
+       crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff);
+       crc = crc32(crc, sum, 4);
+       crc = crc32(crc, (unsigned char *)sb + sumoff + 4, bytes - sumoff - 4);
+
+       if (crc != le32_to_cpu(sb->s_sum))
+               return -1;
+
+       if (strlen(sb->s_volume_name))
+               blkid_probe_set_label(pr, (unsigned char *) sb->s_volume_name,
+                                     sizeof(sb->s_volume_name));
+
+       blkid_probe_set_uuid(pr, sb->s_uuid);
+       blkid_probe_sprintf_version(pr, "%u", le32_to_cpu(sb->s_rev_level));
+
+       return 0;
+}
+
+const struct blkid_idinfo nilfs2_idinfo =
+{
+       .name           = "nilfs",
+       .usage          = BLKID_USAGE_FILESYSTEM,
+       .probefunc      = probe_nilfs2,
+       .magics         =
+       {
+               {
+                       .magic = NILFS_SB_MAGIC,
+                       .len = 2,
+                       .kboff = NILFS_SB_KBOFF,
+                       .sboff = NILFS_MAG_OFF
+               },
+               { NULL }
+       }
+};

diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/shlibs/blkid/src/superblocks/superblocks.c
index b80c10b795141a6b441f3ca4190f2c98dbc4e457..3d66d98c5f829fbd2c62b3e6c8ed680e42ddac8c 100644 (file)
--- a/shlibs/blkid/src/superblocks/superblocks.c
+++ b/shlibs/blkid/src/superblocks/superblocks.c
@@ -140,6 +140,7 @@ static const struct blkid_idinfo *idinfos[] =
        &bfs_idinfo,
        &vmfs_fs_idinfo,
        &befs_idinfo,
+       &nilfs2_idinfo,
        &exfat_idinfo
 };
 

diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/shlibs/blkid/src/superblocks/superblocks.h
index 74cb974321d59b61305f982f2307bc03bb2b4510..a79d7cb6cbbfd7c79c7e007b5d42ce0c4fa9fbbc 100644 (file)
--- a/shlibs/blkid/src/superblocks/superblocks.h
+++ b/shlibs/blkid/src/superblocks/superblocks.h
@@ -65,6 +65,7 @@ extern const struct blkid_idinfo vmfs_volume_idinfo;
 extern const struct blkid_idinfo vmfs_fs_idinfo;
 extern const struct blkid_idinfo drbd_idinfo;
 extern const struct blkid_idinfo befs_idinfo;
+extern const struct blkid_idinfo nilfs2_idinfo;
 extern const struct blkid_idinfo exfat_idinfo;
 
 /*