ext4: remove redundant mb_regenerate_buddy() (6bd97bf2) · Commits · 戴 / test

After this patch (), if an abnormal bitmap is detected, we will mark the group as corrupt, and we will not use this group in the future. Therefore, it should be meaningless to regenerate the buddy bitmap of this group, It might be better to delete it. Signed-off-by:

Chunguang Xu <brookxu@tencent.com> Reviewed-by:

Andreas Dilger <adilger@dilger.ca> Link: https://lore.kernel.org/r/1604764698-4269-2-git-send-email-brookxu@tencent.com Signed-off-by:

Theodore Ts'o <tytso@mit.edu>

fs/ext4/mballoc.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -822,24 +822,6 @@ void ext4_mb_generate_buddy(struct super_block *sb,
		spin_unlock(&sbi->s_bal_lock);
		}

		static void mb_regenerate_buddy(struct ext4_buddy *e4b)
		{
		int count;
		int order = 1;
		void *buddy;

		while ((buddy = mb_find_buddy(e4b, order++, &count))) {
		ext4_set_bits(buddy, 0, count);
		}
		e4b->bd_info->bb_fragments = 0;
		memset(e4b->bd_info->bb_counters, 0,
		sizeof(e4b->bd_info->bb_counters)
		(e4b->bd_sb->s_blocksize_bits + 2));

		ext4_mb_generate_buddy(e4b->bd_sb, e4b->bd_buddy,
		e4b->bd_bitmap, e4b->bd_group);
		}

		/* The buddy information is attached the buddy cache inode
		* for convenience. The information regarding each group
		* is loaded via ext4_mb_load_buddy. The information involve
		@@ -1512,7 +1494,6 @@ static void mb_free_blocks(struct inode inode, struct ext4_buddy e4b,
		sb, e4b->bd_group,
		EXT4_GROUP_INFO_BBITMAP_CORRUPT);
		}
		mb_regenerate_buddy(e4b);
		goto done;
		}

Admin message