From: Aneesh Kumar K.V <[email protected]> Convert ext4_extent_idx.ei_leaf ext4_extent_idx.ei_leaf_lo This helps in finding BUGs due to direct partial access of these split 48 bit values. Signed-off-by: Aneesh Kumar K.V <[email protected]> --- fs/ext4/extents.c | 4 ++-- include/linux/ext4_fs_extents.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index c03056a..8528774 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -65,7 +65,7 @@ static ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix) { ext4_fsblk_t block; - block = le32_to_cpu(ix->ei_leaf); + block = le32_to_cpu(ix->ei_leaf_lo); block |= ((ext4_fsblk_t) le16_to_cpu(ix->ei_leaf_hi) << 31) << 1; return block; } @@ -88,7 +88,7 @@ static void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb) */ static void ext4_idx_store_pblock(struct ext4_extent_idx *ix, ext4_fsblk_t pb) { - ix->ei_leaf = cpu_to_le32((unsigned long) (pb & 0xffffffff)); + ix->ei_leaf_lo = cpu_to_le32((unsigned long) (pb & 0xffffffff)); ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff); } diff --git a/include/linux/ext4_fs_extents.h b/include/linux/ext4_fs_extents.h index cb2dfbb..d2045a2 100644 --- a/include/linux/ext4_fs_extents.h +++ b/include/linux/ext4_fs_extents.h @@ -83,7 +83,7 @@ struct ext4_extent { */ struct ext4_extent_idx { __le32 ei_block; /* index covers logical blocks from 'block' */ - __le32 ei_leaf; /* pointer to the physical block of the next * + __le32 ei_leaf_lo; /* pointer to the physical block of the next * * level. leaf or next index could be there */ __le16 ei_leaf_hi; /* high 16 bits of physical block */ __u16 ei_unused; -- 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: sparse fixes
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: sparse fixes
- 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]>
- [PATCH] ext4: Convert s_blocks_count to s_blocks_count_lo
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert s_r_blocks_count and s_free_blocks_count
- From: "Theodore Ts'o" <[email protected]>
- [PATCH] ext4: Convert ext4_extent.ee_start to ext4_extent.ee_start_lo
- From: "Theodore Ts'o" <[email protected]>
- [PATCH, RFC] Ext4 patches planned for submission upstream
- Prev by Date: [PATCH] jbd2: fix commit code to properly abort journal
- Next by Date: [PATCH, RFC] Ext4 patches planned for submission upstream
- Previous by thread: [PATCH] ext4: Convert ext4_extent.ee_start to ext4_extent.ee_start_lo
- Next by thread: [PATCH] ext4: sparse fixes
- Index(es):
 |