summaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
authorTheodore Ts'o2013-08-17 03:22:41 +0200
committerTheodore Ts'o2013-08-17 03:22:41 +0200
commit3be78c73179c9347bdc0a92b2898063bd2300ff7 (patch)
treeeb4147818a58e3dd80300fd09fc94ad344480231 /fs/ext4/inode.c
parentext4: print the block number of invalid extent tree blocks (diff)
downloadkernel-qcow2-linux-3be78c73179c9347bdc0a92b2898063bd2300ff7.tar.gz
kernel-qcow2-linux-3be78c73179c9347bdc0a92b2898063bd2300ff7.tar.xz
kernel-qcow2-linux-3be78c73179c9347bdc0a92b2898063bd2300ff7.zip
ext4: use unsigned int for es_status values
Don't use an unsigned long long for the es_status flags; this requires that we pass 64-bit values around which is painful on 32-bit systems. Instead pass the extent status flags around using the low 4 bits of an unsigned int, and shift them into place when we are reading or writing es_pblk. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c2ca04e67a4f..0569c745475c 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -553,7 +553,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
}
if (retval > 0) {
int ret;
- unsigned long long status;
+ unsigned int status;
if (unlikely(retval != map->m_len)) {
ext4_warning(inode->i_sb,
@@ -653,7 +653,7 @@ found:
if (retval > 0) {
int ret;
- unsigned long long status;
+ unsigned int status;
if (unlikely(retval != map->m_len)) {
ext4_warning(inode->i_sb,
@@ -1633,7 +1633,7 @@ add_delayed:
set_buffer_delay(bh);
} else if (retval > 0) {
int ret;
- unsigned long long status;
+ unsigned int status;
if (unlikely(retval != map->m_len)) {
ext4_warning(inode->i_sb,