Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b8f1f01 authored by Mingming Cao's avatar Mingming Cao Committed by Linus Torvalds
Browse files

[PATCH] ext4: removesector_t bits check 



Previously when in-kernel ext4 block type is sector_t, it's only 4 bits long
under some 32bit arch (when CONFIG_LBD is not on).  So we need to check the
size of sector_t before we read 48bit long on-disk blocks to in-kernel blocks.

These checks are unnecessary now as we changed the in-kernel blocks to
unsigned longlong.

Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatarDave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2ae02107

fs/ext4/extents.c

+4 −8
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ static inline ext4_fsblk_t ext_pblock(struct ext4_extent *ex) 
	ext4_fsblk_t block;



	block = le32_to_cpu(ex->ee_start);

	if (sizeof(ext4_fsblk_t) > 4)

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

	return block;

}
@@ -67,7 +66,6 @@ static inline ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix) 
	ext4_fsblk_t block;



	block = le32_to_cpu(ix->ei_leaf);

	if (sizeof(ext4_fsblk_t) > 4)

	block |= ((ext4_fsblk_t) le16_to_cpu(ix->ei_leaf_hi) << 31) << 1;

	return block;

}
@@ -80,7 +78,6 @@ static inline ext4_fsblk_t idx_pblock(struct ext4_extent_idx *ix) 
static inline void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb)

{

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

	if (sizeof(ext4_fsblk_t) > 4)

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

}
@@ -92,7 +89,6 @@ static inline void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb 
static inline void ext4_idx_store_pblock(struct ext4_extent_idx *ix, ext4_fsblk_t pb)

{

	ix->ei_leaf = cpu_to_le32((unsigned long) (pb & 0xffffffff));

	if (sizeof(ext4_fsblk_t) > 4)

	ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);

}

fs/ext4/inode.c

+4 −6
Original line number Diff line number Diff line
@@ -2643,9 +2643,8 @@ void ext4_read_inode(struct inode * inode) 
	ei->i_frag_size = raw_inode->i_fsize;

#endif

	ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl);

	if ((sizeof(sector_t) > 4) &&

	    (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=

	     cpu_to_le32(EXT4_OS_HURD)))

	if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=

	    cpu_to_le32(EXT4_OS_HURD))

		ei->i_file_acl |=

			((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32;

	if (!S_ISREG(inode->i_mode)) {
@@ -2781,9 +2780,8 @@ static int ext4_do_update_inode(handle_t *handle, 
	raw_inode->i_frag = ei->i_frag_no;

	raw_inode->i_fsize = ei->i_frag_size;

#endif

	if ((sizeof(sector_t) > 4) &&

	    (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=

	     cpu_to_le32(EXT4_OS_HURD)))

	if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=

	    cpu_to_le32(EXT4_OS_HURD))

		raw_inode->i_file_acl_high =

			cpu_to_le16(ei->i_file_acl >> 32);

	raw_inode->i_file_acl = cpu_to_le32(ei->i_file_acl);