3 files changed, 4 insertions, 4 deletions

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 2a167d7131fa..8d50879d1c2c 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -47,7 +47,7 @@ int ext4_sync_file(struct file * file, struct dentry *dentry, int datasync)
         struct inode *inode = dentry->d_inode;
         int ret = 0;
 
-        J_ASSERT(ext4_journal_current_handle() == 0);
+        J_ASSERT(ext4_journal_current_handle() == NULL);
 
         /*
          * data=writeback:
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 89dd87634a2f..5489703d9573 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1027,7 +1027,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,
                 }
                 if (buffer_new(&dummy)) {
                         J_ASSERT(create != 0);
-                        J_ASSERT(handle != 0);
+                        J_ASSERT(handle != NULL);
 
                         /*
                          * Now that we do not always journal data, we should
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 12c7d65fb0ca..86387302c2a9 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1120,7 +1120,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
         int total_ino, total_blk;
         void *base, *start, *end;
         int extra_isize = 0, error = 0, tried_min_extra_isize = 0;
-        int s_min_extra_isize = EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize;
+        int s_min_extra_isize = le16_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize);
 
         down_write(&EXT4_I(inode)->xattr_sem);
 retry:
@@ -1292,7 +1292,7 @@ retry:
 
                 i.name = b_entry_name;
                 i.value = buffer;
-                i.value_len = cpu_to_le32(size);
+                i.value_len = size;
                 error = ext4_xattr_block_find(inode, &i, bs);
                 if (error)
                         goto cleanup;