diff options
| author |   Theodore Ts'o <tytso@mit.edu> | 2019-11-19 12:25:42 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-19 12:25:42 -0500 |
| commit | dfdeeb41fb08fbe11d3cfefba9c0fcd00c95a36d (patch) | |
| tree | 58b5bb270d3b3574e2a0828455f6fdd7ac7eae40 /fs/ext4/super.c | |
| parent | jbd2: make jbd2_handle_buffer_credits() handle reserved handles (diff) | |
| parent | ext4: work around deleting a file with i_nlink == 0 safely (diff) | |
| download | linux-dev-dfdeeb41fb08fbe11d3cfefba9c0fcd00c95a36d.tar.xz linux-dev-dfdeeb41fb08fbe11d3cfefba9c0fcd00c95a36d.zip | |
Merge branch 'tt/misc' into dev
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e199850fe6f8..b205112ca051 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3544,12 +3544,15 @@ static void ext4_clamp_want_extra_isize(struct super_block *sb) { struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_super_block *es = sbi->s_es; + unsigned def_extra_isize = sizeof(struct ext4_inode) - + EXT4_GOOD_OLD_INODE_SIZE; - /* determine the minimum size of new large inodes, if present */ - if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE && - sbi->s_want_extra_isize == 0) { - sbi->s_want_extra_isize = sizeof(struct ext4_inode) - - EXT4_GOOD_OLD_INODE_SIZE; + if (sbi->s_inode_size == EXT4_GOOD_OLD_INODE_SIZE) { + sbi->s_want_extra_isize = 0; + return; + } + if (sbi->s_want_extra_isize < 4) { + sbi->s_want_extra_isize = def_extra_isize; if (ext4_has_feature_extra_isize(sb)) { if (sbi->s_want_extra_isize < le16_to_cpu(es->s_want_extra_isize)) @@ -3562,10 +3565,10 @@ static void ext4_clamp_want_extra_isize(struct super_block *sb) } } /* Check if enough inode space is available */ - if (EXT4_GOOD_OLD_INODE_SIZE + sbi->s_want_extra_isize > - sbi->s_inode_size) { - sbi->s_want_extra_isize = sizeof(struct ext4_inode) - - EXT4_GOOD_OLD_INODE_SIZE; + if ((sbi->s_want_extra_isize > sbi->s_inode_size) || + (EXT4_GOOD_OLD_INODE_SIZE + sbi->s_want_extra_isize > + sbi->s_inode_size)) { + sbi->s_want_extra_isize = def_extra_isize; ext4_msg(sb, KERN_INFO, "required extra inode space not available"); } |