[PATCH] ext4: Convert s_blocks_count to s_blocks_count_lo

From: Aneesh Kumar K.V <[email protected]>

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 <[email protected]>
---
 fs/ext4/super.c         |    4 ++--
 include/linux/ext4_fs.h |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 7548408..dc7fe4c 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2593,7 +2593,7 @@ static int ext4_statfs (struct dentry * dentry, struct kstatfs * buf)
 
 	if (test_opt(sb, MINIX_DF)) {
 		sbi->s_overhead_last = 0;
-	} else if (sbi->s_blocks_last != le32_to_cpu(es->s_blocks_count)) {
+	} else if (sbi->s_blocks_last != ext4_blocks_count(es)) {
 		unsigned long ngroups = sbi->s_groups_count, i;
 		ext4_fsblk_t overhead = 0;
 		smp_rmb();
@@ -2628,7 +2628,7 @@ static int ext4_statfs (struct dentry * dentry, struct kstatfs * buf)
 		overhead += ngroups * (2 + sbi->s_itb_per_group);
 		sbi->s_overhead_last = overhead;
 		smp_wmb();
-		sbi->s_blocks_last = le32_to_cpu(es->s_blocks_count);
+		sbi->s_blocks_last = ext4_blocks_count(es);
 	}
 
 	buf->f_type = EXT4_SUPER_MAGIC;
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
index 5eb4953..339412d 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 */
@@ -1001,7 +1001,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)
@@ -1019,7 +1019,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);
 }
 
-- 
1.5.3.2.81.g17ed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH] ext4: Convert s_r_blocks_count and s_free_blocks_count
    • From: "Theodore Ts'o" <[email protected]>

• References:
  • [PATCH, RFC] Ext4 patches planned for submission upstream
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] jbd/jbd2: JBD memory allocation cleanups
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] jbd/jbd2: Journal initialization doesn't need __GFP_NOFAIL
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] jbd2: fix commit code to properly abort journal
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] JBD2: debug code cleanup.
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] Once ext4 will not implement fragment, it is believed it will never be
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] ext4: remove #ifdef CONFIG_EXT4_INDEX
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] Ext4: Uninitialized Block Groups
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] ext4: Fix sparse warnings
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] This feature relaxes check restrictions on where each block groups meta
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] Support large blocksize up to PAGESIZE (max 64KB) for ext4
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] ext4: Avoid rec_len overflow with 64KB block size
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] Support large blocksize up to PAGESIZE (max 64KB) for ext2
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] Support large blocksize up to PAGESIZE (max 64KB) for ext3
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] ext2: Avoid rec_len overflow with 64KB block size
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] ext3: Avoid rec_len overflow with 64KB block size
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] ext4: Convert bg_block_bitmap to bg_block_bitmap_lo
    • From: "Theodore Ts'o" <[email protected]>
  • [PATCH] ext4: Convert bg_inode_bitmap and bg_inode_table
    • From: "Theodore Ts'o" <[email protected]>

• Prev by Date: [PATCH] ext4: Fix sparse warnings
• Next by Date: [PATCH] ext4: Convert s_r_blocks_count and s_free_blocks_count
• Previous by thread: [PATCH] ext4: Convert bg_inode_bitmap and bg_inode_table
• Next by thread: [PATCH] ext4: Convert s_r_blocks_count and s_free_blocks_count
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]