diff options
| author | Jan Kara <jack@suse.cz> | 2021-06-14 23:28:30 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-07-06 19:55:09 -0400 |
| commit | 0af9a7e9dc0f0ff1b55058dfdad349db09c5d150 (patch) | |
| tree | 84afb5b955625f78a3db794f9bc9e713f6af4710 | |
| parent | 2c69c94217b6db083d601d4fd62d6ab6c1628fee (diff) | |
| download | e2fsprogs-0af9a7e9dc0f0ff1b55058dfdad349db09c5d150.tar.gz | |
tune2fs: update overhead when toggling journal feature
When adding or removing journal from a filesystem, we also need to add /
remove journal blocks from overhead stored in the superblock. Otherwise
total number of blocks in the filesystem as reported by statfs(2) need
not match reality and could lead to odd results like negative number of
used blocks reported by df(1).
Fixes: 9046b4dfd0ce ("mke2fs: set overhead in super block")
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | misc/tune2fs.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/misc/tune2fs.c b/misc/tune2fs.c index f739f16cd..4200104ee 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -393,6 +393,8 @@ static errcode_t remove_journal_inode(ext2_filsys fs) _("while clearing journal inode")); return retval; } + fs->super->s_overhead_clusters -= + EXT2FS_NUM_B2C(fs, EXT2_I_SIZE(&inode) / fs->blocksize); memset(&inode, 0, sizeof(inode)); ext2fs_mark_bb_dirty(fs); fs->flags &= ~EXT2_FLAG_SUPER_ONLY; @@ -1611,8 +1613,12 @@ static int add_journal(ext2_filsys fs) com_err(program_name, retval, "%s", _("\n\twhile trying to create journal file")); return retval; - } else - fputs(_("done\n"), stdout); + } + fs->super->s_overhead_clusters += EXT2FS_NUM_B2C(fs, + jparams.num_journal_blocks + jparams.num_fc_blocks); + ext2fs_mark_super_dirty(fs); + fputs(_("done\n"), stdout); + /* * If the filesystem wasn't mounted, we need to force * the block group descriptors out. |