Skip to content

Commit a3f3b9d

Browse files
taoma-tmpanos
authored andcommitted
ext4: protect group inode free counting with group lock
Now when we set the group inode free count, we don't have a proper group lock so that multiple threads may decrease the inode free count at the same time. And e2fsck will complain something like: Free inodes count wrong for group #1 (1, counted=0). Fix? no Free inodes count wrong for group #2 (3, counted=0). Fix? no Directories count wrong for group #2 (780, counted=779). Fix? no Free inodes count wrong for group Quarx2k#3 (2272, counted=2273). Fix? no So this patch try to protect it with the ext4_lock_group. btw, it is found by xfstests test case 269 and the volume is mkfsed with the parameter "-O ^resize_inode,^uninit_bg,extent,meta_bg,flex_bg,ext_attr" and I have run it 100 times and the error in e2fsck doesn't show up again. Change-Id: Icfa95256688b50734e9152cbdc84a851a39b8ed5 Signed-off-by: Tao Ma <boyu.mt@taobao.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
1 parent be590d7 commit a3f3b9d

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

fs/ext4/ialloc.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,10 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, umode_t mode,
774774
ext4_itable_unused_set(sb, gdp,
775775
(EXT4_INODES_PER_GROUP(sb) - ino));
776776
up_read(&grp->alloc_sem);
777+
} else {
778+
ext4_lock_group(sb, group);
777779
}
780+
778781
ext4_free_inodes_set(sb, gdp, ext4_free_inodes_count(sb, gdp) - 1);
779782
if (S_ISDIR(mode)) {
780783
ext4_used_dirs_set(sb, gdp, ext4_used_dirs_count(sb, gdp) + 1);
@@ -786,8 +789,8 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, umode_t mode,
786789
}
787790
if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
788791
gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);
789-
ext4_unlock_group(sb, group);
790792
}
793+
ext4_unlock_group(sb, group);
791794

792795
BUFFER_TRACE(inode_bitmap_bh, "call ext4_handle_dirty_metadata");
793796
err = ext4_handle_dirty_metadata(handle, NULL, inode_bitmap_bh);

0 commit comments

Comments
 (0)