ext4: Convert s_blocks_count to s_blocks_count_lo

Convert s_blocks_count to s_blocks_count_lo
This helps in finding BUGs due to direct partial access of
these split 64 bit values

Also fix direct partial access in ext4 code

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
index f5d57c7c0dd7..d30d079a53e2 100644
--- a/include/linux/ext4_fs.h
+++ b/include/linux/ext4_fs.h
@@ -501,7 +501,7 @@ do {									       \
  */
 struct ext4_super_block {
 /*00*/  __le32  s_inodes_count;         /* Inodes count */
-        __le32  s_blocks_count;         /* Blocks count */
+        __le32  s_blocks_count_lo;      /* Blocks count */
         __le32  s_r_blocks_count;       /* Reserved blocks count */
         __le32  s_free_blocks_count;    /* Free blocks count */
 /*10*/  __le32  s_free_inodes_count;    /* Free inodes count */
@@ -981,7 +981,7 @@ extern void ext4_inode_table_set(struct super_block *sb,
 static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)
 {
         return ((ext4_fsblk_t)le32_to_cpu(es->s_blocks_count_hi) << 32) |
-                le32_to_cpu(es->s_blocks_count);
+                le32_to_cpu(es->s_blocks_count_lo);
 }
 
 static inline ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es)
@@ -999,7 +999,7 @@ static inline ext4_fsblk_t ext4_free_blocks_count(struct ext4_super_block *es)
 static inline void ext4_blocks_count_set(struct ext4_super_block *es,
                                          ext4_fsblk_t blk)
 {
-        es->s_blocks_count = cpu_to_le32((u32)blk);
+        es->s_blocks_count_lo = cpu_to_le32((u32)blk);
         es->s_blocks_count_hi = cpu_to_le32(blk >> 32);
 }