search for: jfs_superblock

...n package). diff -Nur klibc-1.5.7.orig/usr/kinit/fstype/fstype.c klibc-1.5.7/usr/kinit/fstype/fstype.c --- klibc-1.5.7.orig/usr/kinit/fstype/fstype.c 2007-09-04 09:17:12.000000000 +0100 +++ klibc-1.5.7/usr/kinit/fstype/fstype.c 2008-03-03 16:57:34.522813138 +0000 @@ -205,7 +205,7 @@ const struct jfs_superblock *sb = (const struct jfs_superblock *)buf; if (!memcmp(sb->s_magic, JFS_MAGIC, 4)) { - *bytes = __le32_to_cpu(sb->s_size); + *bytes = __le64_to_cpu(sb->s_size) << __le16_to_cpu(sb->s_l2pbsize); return 1; } return 0; HTH, Stephane

...s, xfs, luks, minix, ext3, ext2, reiserfs, jfs * * MINIX, ext3 and Reiserfs bits are currently untested. */ @@ -29,6 +29,7 @@ #include "ext2_fs.h" #include "ext3_fs.h" #include "xfs_sb.h" +#include "luks_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -168,6 +169,19 @@ return 0; } +static int luks_image(const unsigned char *buf, unsigned long long *blocks) +{ + const struct luks_partition_header *lph = + (const struct luks_partition_header *)buf; + + if (!memcmp(lph->magic, LUKS_MAGIC, LUKS_MAGIC_L)) { + /* FSSIZE is dictated by...

..., lvm2, minix, ext3, ext2, reiserfs, jfs, swap * * MINIX, ext3 and Reiserfs bits are currently untested. */ @@ -30,6 +30,7 @@ #include "ext3_fs.h" #include "xfs_sb.h" #include "luks_fs.h" +#include "lvm2_sb.h" /* * Slightly cleaned up version of jfs_superblock to @@ -202,6 +203,26 @@ return 0; } +static int lvm2_image(const void *buf, unsigned long long *blocks) +{ + const struct lvm2_super_block *lsb; + int i; + + /* We must check every 512 byte sector */ + for (i = 0; i < BLOCK_SIZE; i += 0x200) { + lsb = (const struct lvm2_super_block *)(buf...

...06-09-14 00:19:41.000000000 +0200 +++ klibc-hack/usr/kinit/fstype/fstype.c 2006-09-14 00:10:01.000000000 +0200 @@ -31,6 +31,7 @@ #include "xfs_sb.h" #include "luks_fs.h" #include "lvm2_sb.h" +#include "iso9660_sb.h" /* * Slightly cleaned up version of jfs_superblock to @@ -221,6 +222,21 @@ return 0; } +static int iso_image(const void *buf, unsigned long long *blocks) +{ + const struct iso_volume_descriptor *isovd = + (const struct iso_volume_descriptor *)buf; + const struct iso_hs_volume_descriptor *isohsvd = + (const struct iso_hs_volume_descript...

...stype/fstype.c index c5a1432..34d633a 100644 --- a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -37,6 +37,7 @@ #include "romfs_fs.h" #include "squashfs_fs.h" #include "xfs_sb.h" +#include "f2fs_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -472,6 +473,18 @@ static int btrfs_image(const void *buf, unsigned long long *bytes) return 0; } +static int f2fs_image(const void *buf, unsigned long long *bytes) +{ + const struct f2fs_super_block *sb = + (const struct f2fs_super_block *)buf; + + if (sb->magic == __cpu_to_le32(F...

...fstype/fstype.c index 69e0e30..c50bf01 100644 --- 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,...

...-04 09:17:12.000000000 +0100 +++ klibc-1.5.7/usr/kinit/fstype/fstype.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 == __cp...

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:

Various coding style fixes checkpatch warns about. The goal is not to be 100% checkpatch compliant, but to have more consistent coding style. As this is a trivial patch serie, will land in 24 hours in klibc git, unless of course ml review hits a bugger. Checked with size(3) that the generated kinit, fstype, ipconfig and nfsmount are the same. maximilian attems (4): [klibc] ipconfig: reduce

...pe/fstype.c index 3465676..197a259 100644 --- a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -31,6 +31,7 @@ #include "lvm2_sb.h" #include "iso9660_sb.h" #include "squashfs_fs.h" +#include "gfs2_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -297,6 +298,20 @@ static int squashfs_image(const void *buf, unsigned long long *blocks) return 0; } +static int gfs2_image(const void *buf, unsigned long long *bytes) +{ + const struct gfs2_sb *sb = + (const struct gfs2_sb *)buf; + + if (__be32_to_cpu(sb->sb_header.mh_magic) == GFS2...

...e/fstype.c index 197a259..2f219e6 100644 --- a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -32,6 +32,7 @@ #include "iso9660_sb.h" #include "squashfs_fs.h" #include "gfs2_fs.h" +#include "ocfs2_fs.h" /* * Slightly cleaned up version of jfs_superblock to @@ -312,6 +313,19 @@ static int gfs2_image(const void *buf, unsigned long long *bytes) return 0; } +static int ocfs2_image(const void *buf, unsigned long long *bytes) +{ + const struct ocfs2_dinode *sb = + (const struct ocfs2_dinode *)buf; + + if (!memcmp(sb->i_signature, OCFS2_SUPER_BL...

...nclude "ocfs2_fs.h" +#include "minix_fs.h" #include "nilfs_fs.h" -#include "btrfs.h" +#include "ocfs2_fs.h" +#include "romfs_fs.h" +#include "squashfs_fs.h" +#include "xfs_sb.h" /* * Slightly cleaned up version of jfs_superblock to commit 5d3b7024db283d2518eb60718768b05638de3698 Author: maximilian attems <max at stro.at> Date: Sat Apr 10 16:22:55 2010 +0200 [klibc] bootp_packet.h minor stylistic fix Signed-off-by: maximilian attems <max at stro.at> diff --git a/usr/kinit/ipconfig/bootp_packet....

...nclude "ocfs2_fs.h" +#include "minix_fs.h" #include "nilfs_fs.h" -#include "btrfs.h" +#include "ocfs2_fs.h" +#include "romfs_fs.h" +#include "squashfs_fs.h" +#include "xfs_sb.h" /* * Slightly cleaned up version of jfs_superblock to commit 6f57aca803ba81697099a8d38eb193459fecc894 Author: maximilian attems <max at stro.at> Date: Sat Apr 10 16:22:55 2010 +0200 [klibc] bootp_packet.h minor stylistic fix Signed-off-by: maximilian attems <max at stro.at> diff --git a/usr/kinit/ipconfig/bootp_packet....

I have updated the klibc patchset based on feedback received. In particular, the patchset has been reorganized so as not to break git-bisect. Additionally, this updates the patch base to 2.6.17-git12 (d38b69689c349f35502b92e20dafb30c62d49d63) and klibc 1.4.8; the main difference on the klibc side is removal of obsolete code. This is also available as a git tree at: