sparse-fix.patch

   1 ext4: Fix sparse warnings
   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/inode.c         |    6 ++++--
   9  include/linux/ext4_fs.h |   14 +++++++-------
  10  2 files changed, 11 insertions(+), 9 deletions(-)
  11
  12
  13 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
  14 index a4848e0..7806d03 100644
  15 --- a/fs/ext4/inode.c
  16 +++ b/fs/ext4/inode.c
  17 @@ -3177,12 +3177,14 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode)
  18                                                       iloc, handle);
  19                         if (ret) {
  20                                 EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND;
  21 -                               if (mnt_count != sbi->s_es->s_mnt_count) {
  22 +                               if (mnt_count !=
  23 +                                         le16_to_cpu(sbi->s_es->s_mnt_count)) {
  24                                         ext4_warning(inode->i_sb, __FUNCTION__,
  25                                         "Unable to expand inode %lu. Delete"
  26                                         " some EAs or run e2fsck.",
  27                                         inode->i_ino);
  28 -                                       mnt_count = sbi->s_es->s_mnt_count;
  29 +                                       mnt_count =
  30 +                                         le16_to_cpu(sbi->s_es->s_mnt_count);
  31                                 }
  32                         }
  33                 }
  34 diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
  35 index cdee7aa..abd70d9 100644
  36 --- a/include/linux/ext4_fs.h
  37 +++ b/include/linux/ext4_fs.h
  38 @@ -595,13 +595,13 @@ struct ext4_super_block {
  39  /*150*/        __le32  s_blocks_count_hi;      /* Blocks count */
  40         __le32  s_r_blocks_count_hi;    /* Reserved blocks count */
  41         __le32  s_free_blocks_count_hi; /* Free blocks count */
  42 -       __u16   s_min_extra_isize;      /* All inodes have at least # bytes */
  43 -       __u16   s_want_extra_isize;     /* New inodes should reserve # bytes */
  44 -       __u32   s_flags;                /* Miscellaneous flags */
  45 -       __u16   s_raid_stride;          /* RAID stride */
  46 -       __u16   s_mmp_interval;         /* # seconds to wait in MMP checking */
  47 -       __u64   s_mmp_block;            /* Block for multi-mount protection */
  48 -       __u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
  49 +       __le16  s_min_extra_isize;      /* All inodes have at least # bytes */
  50 +       __le16  s_want_extra_isize;     /* New inodes should reserve # bytes */
  51 +       __le32  s_flags;                /* Miscellaneous flags */
  52 +       __le16  s_raid_stride;          /* RAID stride */
  53 +       __le16  s_mmp_interval;         /* # seconds to wait in MMP checking */
  54 +       __le64  s_mmp_block;            /* Block for multi-mount protection */
  55 +       __le32  s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
  56         __u32   s_reserved[163];        /* Padding to the end of the block */
  57  };
  58