diff options
| author | Mingming Cao <cmm@us.ibm.com> | 2006-10-11 01:21:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:14:18 -0700 |
| commit | 9b8f1f0106ab39ad58765d4e7c57189835f51127 (patch) | |
| tree | 7f853ec30e4edc57f8b0c82db52b20a5beb75c38 | |
| parent | 2ae0210760aed9d626eaede5b63db95e198f7c8e (diff) | |
| download | linux-3.10-9b8f1f0106ab39ad58765d4e7c57189835f51127.tar.gz linux-3.10-9b8f1f0106ab39ad58765d4e7c57189835f51127.tar.bz2 linux-3.10-9b8f1f0106ab39ad58765d4e7c57189835f51127.zip | |
[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: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/ext4/extents.c | 12 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 10 |
2 files changed, 8 insertions, 14 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index f72b7567bfa..926186a787a 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -53,8 +53,7 @@ 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; + block |= ((ext4_fsblk_t) le16_to_cpu(ex->ee_start_hi) << 31) << 1; return block; } @@ -67,8 +66,7 @@ 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; + block |= ((ext4_fsblk_t) le16_to_cpu(ix->ei_leaf_hi) << 31) << 1; return block; } @@ -80,8 +78,7 @@ 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); + ex->ee_start_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff); } /* @@ -92,8 +89,7 @@ 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); + ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff); } static int ext4_ext_check_header(const char *function, struct inode *inode, diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 99b82b52b5f..c05dc57148b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -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); |