From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Convert bg_block_bitmap to bg_block_bitmap_lo

This helps in catching some BUGS due to direct

partial access of these split fields.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

---

 fs/ext4/super.c         |    6 +++---

 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 d8bb279..02a2418 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);

 ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,

 			       struct ext4_group_desc *bg)

 {

-	return le32_to_cpu(bg->bg_block_bitmap) |

+	return le32_to_cpu(bg->bg_block_bitmap_lo) |

 		(EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?

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

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

 }
 ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,

@@ -94,7 +94,7 @@ ext4_fsblk_t ext4_inode_table(struct super_block *sb,

 void ext4_block_bitmap_set(struct super_block *sb,

 			   struct ext4_group_desc *bg, ext4_fsblk_t blk)

 {

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

+	bg->bg_block_bitmap_lo = cpu_to_le32((u32)blk);

 	if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)

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

 }

diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h

index ab608e8..c26e30e 100644

--- a/include/linux/ext4_fs.h

+++ b/include/linux/ext4_fs.h

@@ -105,7 +105,7 @@

  */

 struct ext4_group_desc

 {

-	__le32	bg_block_bitmap;	/* Blocks bitmap block */

+	__le32	bg_block_bitmap_lo;	/* Blocks bitmap block */

 	__le32	bg_inode_bitmap;	/* Inodes bitmap block */

 	__le32	bg_inode_table;		/* Inodes table block */

 	__le16	bg_free_blocks_count;	/* Free blocks count */

--

1.5.3.2.81.g17ed
-

From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

---

 fs/ext4/balloc.c        |    2 +-

 fs/ext4/super.c         |   12 ++++++------

 include/linux/ext4_fs.h |    4 ++--

 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c

index d1a8882..7a24b3f 100644

--- a/fs/ext4/balloc.c

+++ b/fs/ext4/balloc.c

@@ -103,7 +103,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);

 	}

diff --git a/fs/ext4/super.c b/fs/ext4/super.c

index 02a2418..7548408 100644

--- a/fs/ext4/super.c

+++ b/fs/ext4/super.c

@@ -78,17 +78,17 @@ 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);

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

 }
 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_D...
[ message continues ]

From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
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>

---

 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_b...
[ message continues ]

From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Convert s_r_blocks_count and s_free_blocks_count to

s_r_blocks_count_lo and s_free_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>

---

 fs/ext4/super.c         |    2 +-

 include/linux/ext4_fs.h |   12 ++++++------

 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c

index dc7fe4c..dbd114c 100644

--- a/fs/ext4/super.c

+++ b/fs/ext4/super.c

@@ -2635,7 +2635,7 @@ static int ext4_statfs (struct dentry * dentry, struct kstatfs * buf)

 	buf->f_bsize = sb->s_blocksize;

 	buf->f_blocks = ext4_blocks_count(es) - sbi->s_overhead_last;

 	buf->f_bfree = percpu_counter_sum(&sbi->s_freeblocks_counter);

-	es->s_free_blocks_count = cpu_to_le32(buf->f_bfree);

+	ext4_free_blocks_count_set(es, buf->f_bfree);

 	buf->f_bavail = buf->f_bfree - ext4_r_blocks_count(es);

 	if (buf->f_bfree < ext4_r_blocks_count(es))

 		buf->f_bavail = 0;

diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h

index 339412d..fb31c1a 100644

--- a/include/linux/ext4_fs.h

+++ b/include/linux/ext4_fs.h

@@ -502,8 +502,8 @@ do {									       \

 struct ext4_super_block {

 /*00*/	__le32	s_inodes_count;		/* Inodes count */

 	__le32	s_blocks_count_lo;	/* Blocks count */

-	__le32	s_r_blocks_count;	/* Reserved blocks count */

-	__le32	s_free_blocks_count;	/* Free blocks count */

+	__le32	s_r_blocks_count_lo;	/* Reserved blocks count */

+	__le32	s_free_blocks_count_lo;	/* Free blocks count */

 /*10*/	__le32	s_free_inodes_count;	/* Free inodes count */

 	__le32	s_first_data_block;	/* First Data Block */

 	__le32	s_log_block_size;	/* Block size */

@@ -1007,13 +1007,13 @@ static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)

 static inline ext4_fsblk_t ext4_r_blocks_count(stru...
[ message continues ]

From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Convert ext4_extent.ee_start to ext4_extent.ee_start_lo

This helps in finding BUGs due to direct partial access of

these split 48 bit values
Also fix direct partial access in ext4 code
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

---

 fs/ext4/extents.c               |    8 +++-----

 include/linux/ext4_fs_extents.h |    2 +-

 2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c

index 2be404f..c03056a 100644

--- a/fs/ext4/extents.c

+++ b/fs/ext4/extents.c

@@ -52,7 +52,7 @@ static ext4_fsblk_t ext_pblock(struct ext4_extent *ex)

 {

 	ext4_fsblk_t block;
-	block = le32_to_cpu(ex->ee_start);

+	block = le32_to_cpu(ex->ee_start_lo);

 	block |= ((ext4_fsblk_t) le16_to_cpu(ex->ee_start_hi) << 31) << 1;

 	return block;

 }

@@ -77,7 +77,7 @@ static ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix)

  */

 static void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb)

 {

-	ex->ee_start = cpu_to_le32((unsigned long) (pb & 0xffffffff));

+	ex->ee_start_lo = cpu_to_le32((unsigned long) (pb & 0xffffffff));

 	ex->ee_start_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);

 }
@@ -1409,8 +1409,7 @@ has_space:

 	eh->eh_entries = cpu_to_le16(le16_to_cpu(eh->eh_entries)+1);

 	nearex = path[depth].p_ext;

 	nearex->ee_block = newext->ee_block;

-	nearex->ee_start = newext->ee_start;

-	nearex->ee_start_hi = newext->ee_start_hi;

+	ext4_ext_store_pblock(nearex, ext_pblock(newext));

 	nearex->ee_len = newext->ee_len;
 merge:

@@ -2177,7 +2176,6 @@ int ext4_ext_convert_to_initialized(handle_t *handle, struct inode *inode,

 	}

 	/* ex2: iblock to iblock + maxblocks-1 : initialised */

 	ex2->ee_block = cpu_to_le32(iblock);

-	ex2->ee_start = cpu_to_le32(newblock);

 	ext4_ext_store_pblock(ex2, newblock);

 	ex2->ee_len = cpu_to_le16(allocated...
[ message continues ]