search for: nilfs2_image

....c 2008-03-03 16:57:34.522813138 +0000 @@ -33,6 +33,7 @@ #include "squashfs_fs.h" #include "gfs2_fs.h" #include "ocfs2_fs.h" +#include "nilfs_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -326,6 +327,19 @@ return 0; } +static int nilfs2_image(const void *buf, unsigned long long *bytes) +{ + const struct nilfs_super_block *sb = + (const struct nilfs_super_block *)buf; + + if (sb->s_magic == __cpu_to_le16(NILFS_SUPER_MAGIC) && + sb->s_rev_level == __cpu_to_le32(2)) { + *bytes = (unsigned long long)__le64_to_cpu(sb-&...

..._cpu_to_le32(F2FS_SUPER_MAGIC)) { + *bytes = 0; + return 1; + } + return 0; +} + struct imagetype { off_t block; const char name[12]; @@ -502,6 +515,7 @@ static struct imagetype images[] = { {1, "ext2", ext2_image}, {1, "minix", minix_image}, {1, "nilfs2", nilfs2_image}, + {1, "f2fs", f2fs_image}, {2, "ocfs2", ocfs2_image}, {8, "reiserfs", reiserfs_image}, {64, "reiserfs", reiserfs_image}, -- 1.8.5.2

...a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -36,6 +36,7 @@ #include "gfs2_fs.h" #include "ocfs2_fs.h" #include "nilfs_fs.h" +#include "btrfs_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -461,6 +462,18 @@ static int nilfs2_image(const void *buf, unsigned long long *bytes) return 0; } +static int btrfs_image(const void *buf, unsigned long long *bytes) +{ + const struct btrfs_super_block *sb = + (const struct btrfs_super_block *)buf; + + if (!memcmp(&sb->magic, BTRFS_MAGIC, sizeof(BTRFS_MAGIC)-1)) { + *bytes...

hello hpa, nothing particular stands out, just syncing with latest Debian upload and subsequent patch emails. please review merge or nack. thanks :) maks git pull git://git.debian.org/~maks/klibc.git maks for the changes: Aaron Griffin (1): [klibc] kinit: skip md assembly if mdX exists Colin Watson (1): [klibc] mount/umount FUSE support Harald Jenny (1): [klibc] fstype: