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

ext4: make block group checksums use metadata_csum algorithm 



metadata_csum supersedes uninit_bg.  Convert the ROCOMPAT uninit_bg
flag check to a helper function that covers both, and make the
checksum calculation algorithm use either crc16 or the metadata_csum
chosen algorithm depending on which flag is set.  Print a warning if
we try to mount a filesystem with both feature flags set.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent cc8e94fd

fs/ext4/balloc.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 


	/* If checksum is bad mark all blocks used to prevent allocation

	 * essentially implementing a per-group read-only flag. */

	if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {

	if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {

		ext4_error(sb, "Checksum bad for group %u", block_group);

		ext4_free_group_clusters_set(sb, gdp, 0);

		ext4_free_inodes_set(sb, gdp, 0);
@@ -214,7 +214,7 @@ void ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
			     sb->s_blocksize * 8, bh->b_data);

	ext4_block_bitmap_csum_set(sb, block_group, gdp, bh,

				   EXT4_BLOCKS_PER_GROUP(sb) / 8);

	gdp->bg_checksum = ext4_group_desc_csum(sbi, block_group, gdp);

	ext4_group_desc_csum_set(sb, block_group, gdp);

}



/* Return the number of free blocks in a block group.  It is used when

fs/ext4/ext4.h

+3 −3
Original line number Diff line number Diff line
@@ -2114,9 +2114,9 @@ extern void ext4_used_dirs_set(struct super_block *sb, 
				struct ext4_group_desc *bg, __u32 count);

extern void ext4_itable_unused_set(struct super_block *sb,

				   struct ext4_group_desc *bg, __u32 count);

extern __le16 ext4_group_desc_csum(struct ext4_sb_info *sbi, __u32 group,

extern int ext4_group_desc_csum_verify(struct super_block *sb, __u32 group,

				       struct ext4_group_desc *gdp);

extern int ext4_group_desc_csum_verify(struct ext4_sb_info *sbi, __u32 group,

extern void ext4_group_desc_csum_set(struct super_block *sb, __u32 group,

				     struct ext4_group_desc *gdp);



static inline int ext4_has_group_desc_csum(struct super_block *sb)

fs/ext4/ialloc.c

+7 −10
Original line number Diff line number Diff line
@@ -70,13 +70,11 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, 
				       ext4_group_t block_group,

				       struct ext4_group_desc *gdp)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	J_ASSERT_BH(bh, buffer_locked(bh));



	/* If checksum is bad mark all blocks and inodes use to prevent

	 * allocation, essentially implementing a per-group read-only flag. */

	if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {

	if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {

		ext4_error(sb, "Checksum bad for group %u", block_group);

		ext4_free_group_clusters_set(sb, gdp, 0);

		ext4_free_inodes_set(sb, gdp, 0);
@@ -92,7 +90,7 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, 
			bh->b_data);

	ext4_inode_bitmap_csum_set(sb, block_group, gdp, bh,

				   EXT4_INODES_PER_GROUP(sb) / 8);

	gdp->bg_checksum = ext4_group_desc_csum(sbi, block_group, gdp);

	ext4_group_desc_csum_set(sb, block_group, gdp);



	return EXT4_INODES_PER_GROUP(sb);

}
@@ -298,7 +296,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode) 
	}

	ext4_inode_bitmap_csum_set(sb, block_group, gdp, bitmap_bh,

				   EXT4_INODES_PER_GROUP(sb) / 8);

	gdp->bg_checksum = ext4_group_desc_csum(sbi, block_group, gdp);

	ext4_group_desc_csum_set(sb, block_group, gdp);

	ext4_unlock_group(sb, block_group);



	percpu_counter_inc(&sbi->s_freeinodes_counter);
@@ -731,7 +729,7 @@ repeat_in_this_group: 


got:

	/* We may have to initialize the block bitmap if it isn't already */

	if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_GDT_CSUM) &&

	if (ext4_has_group_desc_csum(sb) &&

	    gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {

		struct buffer_head *block_bitmap_bh;
@@ -757,8 +755,7 @@ got: 
						   block_bitmap_bh,

						   EXT4_BLOCKS_PER_GROUP(sb) /

						   8);

			gdp->bg_checksum = ext4_group_desc_csum(sbi, group,

								gdp);

			ext4_group_desc_csum_set(sb, group, gdp);

		}

		ext4_unlock_group(sb, group);
@@ -811,7 +808,7 @@ got: 
	if (ext4_has_group_desc_csum(sb)) {

		ext4_inode_bitmap_csum_set(sb, group, gdp, inode_bitmap_bh,

					   EXT4_INODES_PER_GROUP(sb) / 8);

		gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);

		ext4_group_desc_csum_set(sb, group, gdp);

		ext4_unlock_group(sb, group);

	}
@@ -1181,7 +1178,7 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group, 
skip_zeroout:

	ext4_lock_group(sb, group);

	gdp->bg_flags |= cpu_to_le16(EXT4_BG_INODE_ZEROED);

	gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);

	ext4_group_desc_csum_set(sb, group, gdp);

	ext4_unlock_group(sb, group);



	BUFFER_TRACE(group_desc_bh,

fs/ext4/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -3584,8 +3584,7 @@ make_io: 
				b = table;

			end = b + EXT4_SB(sb)->s_inode_readahead_blks;

			num = EXT4_INODES_PER_GROUP(sb);

			if (EXT4_HAS_RO_COMPAT_FEATURE(sb,

				       EXT4_FEATURE_RO_COMPAT_GDT_CSUM))

			if (ext4_has_group_desc_csum(sb))

				num -= ext4_itable_unused_count(sb, gdp);

			table += num / inodes_per_block;

			if (end > table)

fs/ext4/mballoc.c

+3 −3
Original line number Diff line number Diff line
@@ -2799,7 +2799,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, 
	ext4_free_group_clusters_set(sb, gdp, len);

	ext4_block_bitmap_csum_set(sb, ac->ac_b_ex.fe_group, gdp, bitmap_bh,

				   EXT4_BLOCKS_PER_GROUP(sb) / 8);

	gdp->bg_checksum = ext4_group_desc_csum(sbi, ac->ac_b_ex.fe_group, gdp);

	ext4_group_desc_csum_set(sb, ac->ac_b_ex.fe_group, gdp);



	ext4_unlock_group(sb, ac->ac_b_ex.fe_group);

	percpu_counter_sub(&sbi->s_freeclusters_counter, ac->ac_b_ex.fe_len);
@@ -4663,7 +4663,7 @@ do_more: 
	ext4_free_group_clusters_set(sb, gdp, ret);

	ext4_block_bitmap_csum_set(sb, block_group, gdp, bitmap_bh,

				   EXT4_BLOCKS_PER_GROUP(sb) / 8);

	gdp->bg_checksum = ext4_group_desc_csum(sbi, block_group, gdp);

	ext4_group_desc_csum_set(sb, block_group, gdp);

	ext4_unlock_group(sb, block_group);

	percpu_counter_add(&sbi->s_freeclusters_counter, count_clusters);
@@ -4809,7 +4809,7 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb, 
	ext4_free_group_clusters_set(sb, desc, blk_free_count);

	ext4_block_bitmap_csum_set(sb, block_group, desc, bitmap_bh,

				   EXT4_BLOCKS_PER_GROUP(sb) / 8);

	desc->bg_checksum = ext4_group_desc_csum(sbi, block_group, desc);

	ext4_group_desc_csum_set(sb, block_group, desc);

	ext4_unlock_group(sb, block_group);

	percpu_counter_add(&sbi->s_freeclusters_counter,

			   EXT4_B2C(sbi, blocks_freed));

CRA Git | Maintained and supported by SUSTech CRA and CCSE