From owner-p4-projects@FreeBSD.ORG Fri Jul 23 11:52:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F8A610656AE; Fri, 23 Jul 2010 11:52:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F345C106568A for ; Fri, 23 Jul 2010 11:52:33 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5D848FC3D for ; Fri, 23 Jul 2010 11:52:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6NBqXKT041025 for ; Fri, 23 Jul 2010 11:52:33 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6NBqXiE041023 for perforce@freebsd.org; Fri, 23 Jul 2010 11:52:33 GMT (envelope-from lz@FreeBSD.org) Date: Fri, 23 Jul 2010 11:52:33 GMT Message-Id: <201007231152.o6NBqXiE041023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 11:52:34 -0000 http://p4web.freebsd.org/@@181362?ac=10 Change 181362 by lz@gnehzuil-freebsd on 2010/07/23 11:51:52 Make ext2fs support EXTRA_ISIZE feature. * support feautres: + HAS_JOURNAL (Not support this feautre. It just can read data when file system is with this feature.) + FILETYPE + SPARSE_SUPER + HUGE_FILE + EXTENTS (Now it just can read data from ext4 extents.) + DIR_NLINK + UNINIT_BG (It don't be required in read-only mode.) + FLEX_BG (It don't be required in read-only mode.) + EXTRA_ISIZE (It don't be required in read-only mode.) Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#9 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#5 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#9 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); static int ext2_mountfs(struct vnode *, struct mount *); @@ -404,6 +405,27 @@ fs->e2fs_maxfilesize = 0x7fffffff; else fs->e2fs_maxfilesize = 0x7fffffffffffffff; + + /* check inode size */ + if (fs->e2fs_isize > E2FS_REV0_INODE_SIZE) { + fs->e2fs_want_extra_isize = sizeof(struct ext2fs_dinode) - + E2FS_REV0_INODE_SIZE; + + if (es->e2fs_features_rocompat & EXT4F_ROCOMPAT_EXTRA_ISIZE) { + if (fs->e2fs_want_extra_isize < es->e2fs_want_extra_isize) + fs->e2fs_want_extra_isize = es->e2fs_want_extra_isize; + if (fs->e2fs_want_extra_isize < es->e2fs_min_extra_isize) + fs->e2fs_want_extra_isize = es->e2fs_min_extra_isize; + } + } + + if (E2FS_REV0_INODE_SIZE + fs->e2fs_want_extra_isize > + fs->e2fs_isize) { + printf("EXT2-fs: no space for extra inode.\n"); + return (EIO); + } + + return (0); } ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#5 (text+ko) ==== @@ -221,6 +221,9 @@ u_int8_t e2fs_log_gpf; /* FLEX_BG group size */ int e2fs_descpbbits; struct ext4_flex_groups *e2fs_fg; + + u_int16_t e2fs_min_extra_isize; /* all inodes have at least some bytes */ + u_int16_t e2fs_want_extra_isize; /* new inodes should reserve some bytes */ }; /*