ext4-sparse-warning-fix.patch

   1 ext4:  Fix sparse warnings.
   2
   3 From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
   4
   5 Fix sparse warnings related to static functions
   6 and local variables.
   7
   8 Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
   9 ---
  10
  11  fs/ext4/extents.c       |    6 +++---
  12  fs/ext4/inode.c         |   18 +++++++++++-------
  13  fs/ext4/super.c         |    3 +++
  14  include/linux/ext4_fs.h |    2 ++
  15  4 files changed, 19 insertions(+), 10 deletions(-)
  16
  17
  18 Index: linux-2.6.24-rc7/fs/ext4/extents.c
  19 ===================================================================
  20 --- linux-2.6.24-rc7.orig/fs/ext4/extents.c     2008-01-16 13:48:46.000000000 -0800
  21 +++ linux-2.6.24-rc7/fs/ext4/extents.c  2008-01-16 13:48:53.000000000 -0800
  22 @@ -1088,7 +1088,7 @@ static ext4_lblk_t ext4_ext_next_leaf_bl
  23   * then we have to correct all indexes above.
  24   * TODO: do we need to correct tree in all cases?
  25   */
  26 -int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode,
  27 +static int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode,
  28                                 struct ext4_ext_path *path)
  29  {
  30         struct ext4_extent_header *eh;
  31 @@ -1535,7 +1535,7 @@ ext4_ext_in_cache(struct inode *inode, e
  32   * It's used in truncate case only, thus all requests are for
  33   * last index in the block only.
  34   */
  35 -int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
  36 +static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
  37                         struct ext4_ext_path *path)
  38  {
  39         struct buffer_head *bh;
  40 @@ -1806,7 +1806,7 @@ ext4_ext_more_to_rm(struct ext4_ext_path
  41         return 1;
  42  }
  43
  44 -int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start)
  45 +static int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start)
  46  {
  47         struct super_block *sb = inode->i_sb;
  48         int depth = ext_depth(inode);
  49 Index: linux-2.6.24-rc7/fs/ext4/inode.c
  50 ===================================================================
  51 --- linux-2.6.24-rc7.orig/fs/ext4/inode.c       2008-01-16 13:48:50.000000000 -0800
  52 +++ linux-2.6.24-rc7/fs/ext4/inode.c    2008-01-16 13:48:53.000000000 -0800
  53 @@ -2052,11 +2052,11 @@ static void ext4_clear_blocks(handle_t *
  54         for (p = first; p < last; p++) {
  55                 u32 nr = le32_to_cpu(*p);
  56                 if (nr) {
  57 -                       struct buffer_head *bh;
  58 +                       struct buffer_head *tbh;
  59
  60                         *p = 0;
  61 -                       bh = sb_find_get_block(inode->i_sb, nr);
  62 -                       ext4_forget(handle, 0, inode, bh, nr);
  63 +                       tbh = sb_find_get_block(inode->i_sb, nr);
  64 +                       ext4_forget(handle, 0, inode, tbh, nr);
  65                 }
  66         }
  67
  68 @@ -2324,8 +2324,10 @@ void ext4_truncate(struct inode *inode)
  69                         return;
  70         }
  71
  72 -       if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)
  73 -               return ext4_ext_truncate(inode, page);
  74 +       if (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL) {
  75 +               ext4_ext_truncate(inode, page);
  76 +               return;
  77 +       }
  78
  79         handle = start_transaction(inode);
  80         if (IS_ERR(handle)) {
  81 @@ -3163,8 +3165,10 @@ ext4_reserve_inode_write(handle_t *handl
  82   * Expand an inode by new_extra_isize bytes.
  83   * Returns 0 on success or negative error number on failure.
  84   */
  85 -int ext4_expand_extra_isize(struct inode *inode, unsigned int new_extra_isize,
  86 -                       struct ext4_iloc iloc, handle_t *handle)
  87 +static int ext4_expand_extra_isize(struct inode *inode,
  88 +                                  unsigned int new_extra_isize,
  89 +                                  struct ext4_iloc iloc,
  90 +                                  handle_t *handle)
  91  {
  92         struct ext4_inode *raw_inode;
  93         struct ext4_xattr_ibody_header *header;
  94 Index: linux-2.6.24-rc7/fs/ext4/super.c
  95 ===================================================================
  96 --- linux-2.6.24-rc7.orig/fs/ext4/super.c       2008-01-16 13:48:52.000000000 -0800
  97 +++ linux-2.6.24-rc7/fs/ext4/super.c    2008-01-16 13:48:53.000000000 -0800
  98 @@ -1644,6 +1644,9 @@ static ext4_fsblk_t descriptor_loc(struc
  99
 100
 101  static int ext4_fill_super (struct super_block *sb, void *data, int silent)
 102 +                               __releases(kernel_sem)
 103 +                               __acquires(kernel_sem)
 104 +
 105  {
 106         struct buffer_head * bh;
 107         struct ext4_super_block *es = NULL;
 108 Index: linux-2.6.24-rc7/include/linux/ext4_fs.h
 109 ===================================================================
 110 --- linux-2.6.24-rc7.orig/include/linux/ext4_fs.h       2008-01-16 13:48:52.000000000 -0800
 111 +++ linux-2.6.24-rc7/include/linux/ext4_fs.h    2008-01-16 13:48:53.000000000 -0800
 112 @@ -893,6 +893,8 @@ extern ext4_fsblk_t ext4_new_block (hand
 113                         ext4_fsblk_t goal, int *errp);
 114  extern ext4_fsblk_t ext4_new_blocks (handle_t *handle, struct inode *inode,
 115                         ext4_fsblk_t goal, unsigned long *count, int *errp);
 116 +extern ext4_fsblk_t ext4_new_blocks_old(handle_t *handle, struct inode *inode,
 117 +                       ext4_fsblk_t goal, unsigned long *count, int *errp);
 118  extern void ext4_free_blocks (handle_t *handle, struct inode *inode,
 119                         ext4_fsblk_t block, unsigned long count);
 120  extern void ext4_free_blocks_sb (handle_t *handle, struct super_block *sb,