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

Commit 5272f837 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext4: Convert bg_inode_bitmap and bg_inode_table 



Convert bg_inode_bitmap and bg_inode_table to bg_inode_bitmap_lo
and bg_inode_table_lo.  This helps in finding BUGs due to
direct partial access of these split 64 bit values

Also fix one direct partial access

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 3a14589c

fs/ext4/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
		/* Set bits for block and inode bitmaps, and inode table */

		ext4_set_bit(ext4_block_bitmap(sb, gdp) - start, bh->b_data);

		ext4_set_bit(ext4_inode_bitmap(sb, gdp) - start, bh->b_data);

		for (bit = le32_to_cpu(gdp->bg_inode_table) - start,

		for (bit = (ext4_inode_table(sb, gdp) - start),

		     bit_max = bit + sbi->s_itb_per_group; bit < bit_max; bit++)

			ext4_set_bit(bit, bh->b_data);

fs/ext4/super.c

+6 −6
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ ext4_fsblk_t ext4_block_bitmap(struct super_block *sb, 
ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,

			       struct ext4_group_desc *bg)

{

	return le32_to_cpu(bg->bg_inode_bitmap) |

	return le32_to_cpu(bg->bg_inode_bitmap_lo) |

		(EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?

		(ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0);

}
@@ -86,7 +86,7 @@ ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb, 
ext4_fsblk_t ext4_inode_table(struct super_block *sb,

			      struct ext4_group_desc *bg)

{

	return le32_to_cpu(bg->bg_inode_table) |

	return le32_to_cpu(bg->bg_inode_table_lo) |

		(EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?

		(ext4_fsblk_t)le32_to_cpu(bg->bg_inode_table_hi) << 32 : 0);

}
@@ -102,7 +102,7 @@ void ext4_block_bitmap_set(struct super_block *sb, 
void ext4_inode_bitmap_set(struct super_block *sb,

			   struct ext4_group_desc *bg, ext4_fsblk_t blk)

{

	bg->bg_inode_bitmap  = cpu_to_le32((u32)blk);

	bg->bg_inode_bitmap_lo  = cpu_to_le32((u32)blk);

	if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)

		bg->bg_inode_bitmap_hi = cpu_to_le32(blk >> 32);

}
@@ -110,7 +110,7 @@ void ext4_inode_bitmap_set(struct super_block *sb, 
void ext4_inode_table_set(struct super_block *sb,

			  struct ext4_group_desc *bg, ext4_fsblk_t blk)

{

	bg->bg_inode_table = cpu_to_le32((u32)blk);

	bg->bg_inode_table_lo = cpu_to_le32((u32)blk);

	if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)

		bg->bg_inode_table_hi = cpu_to_le32(blk >> 32);

}

include/linux/ext4_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ 
struct ext4_group_desc

{

	__le32	bg_block_bitmap_lo;	/* Blocks bitmap block */

	__le32	bg_inode_bitmap;	/* Inodes bitmap block */

	__le32	bg_inode_table;		/* Inodes table block */

	__le32	bg_inode_bitmap_lo;	/* Inodes bitmap block */

	__le32	bg_inode_table_lo;	/* Inodes table block */

	__le16	bg_free_blocks_count;	/* Free blocks count */

	__le16	bg_free_inodes_count;	/* Free inodes count */

	__le16	bg_used_dirs_count;	/* Directories count */