| Message ID | 20111214011410.20947.96920.stgit@elm3c44.beaverton.ibm.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Mon, Dec 19, 2011 at 11:28:44AM +0100, Andreas Dilger wrote: > On 2011-12-14, at 2:14 AM, Darrick J. Wong wrote: > > Write out checksummed inodes even when writing out a zeroed table. > > Looking at the code, this is only writing out checksummed inodes > for the reserved inodes, not all of them, right? Otherwise, going > back to writing out the whole inode table would be really slowing > down mke2fs compared to lazy_itable_init. Assuming that the inodes numbered less than EXT2_FIRST_INO are reserved, then yes it should be only writing reserved inodes (unless the user forces mkfs to write all inodes). --D > > > diff --git a/misc/mke2fs.c b/misc/mke2fs.c > > index 0ef2531..98af8b0 100644 > > --- a/misc/mke2fs.c > > +++ b/misc/mke2fs.c > > @@ -305,6 +305,27 @@ _("Warning: the backup superblock/group descriptors at block %u contain\n" > > ext2fs_badblocks_list_iterate_end(bb_iter); > > } > > > > +static void write_reserved_inodes(ext2_filsys fs) > > +{ > > + errcode_t retval; > > + ext2_ino_t ino; > > + struct ext2_inode *inode; > > + > > + retval = ext2fs_get_mem(EXT2_INODE_SIZE(fs->super), &inode); > > + if (retval) { > > + com_err("inode_init", retval, > > + "while allocating memory"); > > + exit(1); > > + } > > + bzero(inode, EXT2_INODE_SIZE(fs->super)); > > + > > + for (ino = 1; ino < EXT2_FIRST_INO(fs->super); ino++) > > + ext2fs_write_inode_full(fs, ino, inode, > > + EXT2_INODE_SIZE(fs->super)); > > + > > + ext2fs_free_mem(&inode); > > +} > > + > > static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed) > > { > > errcode_t retval; > > @@ -350,6 +371,12 @@ static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed) > > ext2fs_zero_blocks2(0, 0, 0, 0, 0); > > ext2fs_numeric_progress_close(fs, &progress, > > _("done \n")); > > + > > + /* Reserved inodes must always have correct checksums */ > > + if (fs->super->s_creator_os == EXT2_OS_LINUX && > > + fs->super->s_feature_ro_compat & > > + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) > > + write_reserved_inodes(fs); > > > } > > > Cheers, Andreas > > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 0ef2531..98af8b0 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -305,6 +305,27 @@ _("Warning: the backup superblock/group descriptors at block %u contain\n" ext2fs_badblocks_list_iterate_end(bb_iter); } +static void write_reserved_inodes(ext2_filsys fs) +{ + errcode_t retval; + ext2_ino_t ino; + struct ext2_inode *inode; + + retval = ext2fs_get_mem(EXT2_INODE_SIZE(fs->super), &inode); + if (retval) { + com_err("inode_init", retval, + "while allocating memory"); + exit(1); + } + bzero(inode, EXT2_INODE_SIZE(fs->super)); + + for (ino = 1; ino < EXT2_FIRST_INO(fs->super); ino++) + ext2fs_write_inode_full(fs, ino, inode, + EXT2_INODE_SIZE(fs->super)); + + ext2fs_free_mem(&inode); +} + static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed) { errcode_t retval; @@ -350,6 +371,12 @@ static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed) ext2fs_zero_blocks2(0, 0, 0, 0, 0); ext2fs_numeric_progress_close(fs, &progress, _("done \n")); + + /* Reserved inodes must always have correct checksums */ + if (fs->super->s_creator_os == EXT2_OS_LINUX && + fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) + write_reserved_inodes(fs); } static void create_root_dir(ext2_filsys fs) @@ -869,7 +896,7 @@ static __u32 ok_features[3] = { #ifdef CONFIG_QUOTA EXT4_FEATURE_RO_COMPAT_QUOTA| #endif - 0 + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM };
Write out checksummed inodes even when writing out a zeroed table. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> --- misc/mke2fs.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html