ext4-sparse-fix.patch

   1 ext4: sparse fixes
   2
   3 From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
   4
   5 Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
   6 ---
   7
   8  fs/ext4/fsync.c |    2 +-
   9  fs/ext4/inode.c |    2 +-
  10  fs/ext4/xattr.c |    4 ++--
  11  3 files changed, 4 insertions(+), 4 deletions(-)
  12
  13
  14 diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
  15 index 2a167d7..8d50879 100644
  16 --- a/fs/ext4/fsync.c
  17 +++ b/fs/ext4/fsync.c
  18 @@ -47,7 +47,7 @@ int ext4_sync_file(struct file * file, struct dentry *dentry, int datasync)
  19         struct inode *inode = dentry->d_inode;
  20         int ret = 0;
  21
  22 -       J_ASSERT(ext4_journal_current_handle() == 0);
  23 +       J_ASSERT(ext4_journal_current_handle() == NULL);
  24
  25         /*
  26          * data=writeback:
  27 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
  28 index a2e1ea4..07afd4a 100644
  29 --- a/fs/ext4/inode.c
  30 +++ b/fs/ext4/inode.c
  31 @@ -1027,7 +1027,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,
  32                 }
  33                 if (buffer_new(&dummy)) {
  34                         J_ASSERT(create != 0);
  35 -                       J_ASSERT(handle != 0);
  36 +                       J_ASSERT(handle != NULL);
  37
  38                         /*
  39                          * Now that we do not always journal data, we should
  40 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
  41 index 12c7d65..8638730 100644
  42 --- a/fs/ext4/xattr.c
  43 +++ b/fs/ext4/xattr.c
  44 @@ -1120,7 +1120,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
  45         int total_ino, total_blk;
  46         void *base, *start, *end;
  47         int extra_isize = 0, error = 0, tried_min_extra_isize = 0;
  48 -       int s_min_extra_isize = EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize;
  49 +       int s_min_extra_isize = le16_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_min_extra_isize);
  50
  51         down_write(&EXT4_I(inode)->xattr_sem);
  52  retry:
  53 @@ -1292,7 +1292,7 @@ retry:
  54
  55                 i.name = b_entry_name;
  56                 i.value = buffer;
  57 -               i.value_len = cpu_to_le32(size);
  58 +               i.value_len = size;
  59                 error = ext4_xattr_block_find(inode, &i, bs);
  60                 if (error)
  61                         goto cleanup;