diff options
-rw-r--r-- | fs/ext4/super.c | 6 | ||||
-rw-r--r-- | include/linux/ext4_fs.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 54450fa1af39..1e8eaaf2d4a5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -70,9 +70,9 @@ static void ext4_write_super_lockfs(struct super_block *sb); | |||
70 | ext4_fsblk_t ext4_block_bitmap(struct super_block *sb, | 70 | ext4_fsblk_t ext4_block_bitmap(struct super_block *sb, |
71 | struct ext4_group_desc *bg) | 71 | struct ext4_group_desc *bg) |
72 | { | 72 | { |
73 | return le32_to_cpu(bg->bg_block_bitmap) | | 73 | return le32_to_cpu(bg->bg_block_bitmap_lo) | |
74 | (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? | 74 | (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? |
75 | (ext4_fsblk_t)le32_to_cpu(bg->bg_block_bitmap_hi) << 32 : 0); | 75 | (ext4_fsblk_t)le32_to_cpu(bg->bg_block_bitmap_hi) << 32 : 0); |
76 | } | 76 | } |
77 | 77 | ||
78 | ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb, | 78 | ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb, |
@@ -94,7 +94,7 @@ ext4_fsblk_t ext4_inode_table(struct super_block *sb, | |||
94 | void ext4_block_bitmap_set(struct super_block *sb, | 94 | void ext4_block_bitmap_set(struct super_block *sb, |
95 | struct ext4_group_desc *bg, ext4_fsblk_t blk) | 95 | struct ext4_group_desc *bg, ext4_fsblk_t blk) |
96 | { | 96 | { |
97 | bg->bg_block_bitmap = cpu_to_le32((u32)blk); | 97 | bg->bg_block_bitmap_lo = cpu_to_le32((u32)blk); |
98 | if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT) | 98 | if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT) |
99 | bg->bg_block_bitmap_hi = cpu_to_le32(blk >> 32); | 99 | bg->bg_block_bitmap_hi = cpu_to_le32(blk >> 32); |
100 | } | 100 | } |
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h index 46b304d18345..1dab9847a206 100644 --- a/include/linux/ext4_fs.h +++ b/include/linux/ext4_fs.h | |||
@@ -105,7 +105,7 @@ | |||
105 | */ | 105 | */ |
106 | struct ext4_group_desc | 106 | struct ext4_group_desc |
107 | { | 107 | { |
108 | __le32 bg_block_bitmap; /* Blocks bitmap block */ | 108 | __le32 bg_block_bitmap_lo; /* Blocks bitmap block */ |
109 | __le32 bg_inode_bitmap; /* Inodes bitmap block */ | 109 | __le32 bg_inode_bitmap; /* Inodes bitmap block */ |
110 | __le32 bg_inode_table; /* Inodes table block */ | 110 | __le32 bg_inode_table; /* Inodes table block */ |
111 | __le16 bg_free_blocks_count; /* Free blocks count */ | 111 | __le16 bg_free_blocks_count; /* Free blocks count */ |