Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2746f7a1 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Theodore Ts'o
Browse files

ext4: don't count free clusters from a corrupt block group 



A bg that's been flagged "corrupt" by definition has no free blocks,
so that the allocator won't be tempted to use the damaged bg.
Therefore, we shouldn't count the clusters in the damaged group when
calculating free counts.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: default avatarZheng Liu <wenqing.lz@taobao.com>
parent 8f9ff189

fs/ext4/balloc.c

+11 −2
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb) 
	struct ext4_group_desc *gdp;

	ext4_group_t i;

	ext4_group_t ngroups = ext4_get_groups_count(sb);

	struct ext4_group_info *grp;

#ifdef EXT4FS_DEBUG

	struct ext4_super_block *es;

	ext4_fsblk_t bitmap_count;
@@ -655,6 +656,10 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb) 
		gdp = ext4_get_group_desc(sb, i, NULL);

		if (!gdp)

			continue;

		grp = NULL;

		if (EXT4_SB(sb)->s_group_info)

			grp = ext4_get_group_info(sb, i);

		if (!grp || !EXT4_MB_GRP_BBITMAP_CORRUPT(grp))

			desc_count += ext4_free_group_clusters(sb, gdp);

		brelse(bitmap_bh);

		bitmap_bh = ext4_read_block_bitmap(sb, i);
@@ -679,6 +684,10 @@ ext4_fsblk_t ext4_count_free_clusters(struct super_block *sb) 
		gdp = ext4_get_group_desc(sb, i, NULL);

		if (!gdp)

			continue;

		grp = NULL;

		if (EXT4_SB(sb)->s_group_info)

			grp = ext4_get_group_info(sb, i);

		if (!grp || !EXT4_MB_GRP_BBITMAP_CORRUPT(grp))

			desc_count += ext4_free_group_clusters(sb, gdp);

	}