kill-ext4_kvfree

   1 ext4: kill ext4_kvfree()
   2
   3 From: Al Viro <viro@ZenIV.linux.org.uk>
   4
   5 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
   6 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
   7 ---
   8  fs/ext4/ext4.h    |    1 -
   9  fs/ext4/mballoc.c |    6 +++---
  10  fs/ext4/resize.c  |    6 +++---
  11  fs/ext4/super.c   |   19 +++++--------------
  12  4 files changed, 11 insertions(+), 21 deletions(-)
  13
  14 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
  15 index c55a1fa..21a3b38 100644
  16 --- a/fs/ext4/ext4.h
  17 +++ b/fs/ext4/ext4.h
  18 @@ -2192,7 +2192,6 @@ extern int ext4_calculate_overhead(struct super_block *sb);
  19  extern void ext4_superblock_csum_set(struct super_block *sb);
  20  extern void *ext4_kvmalloc(size_t size, gfp_t flags);
  21  extern void *ext4_kvzalloc(size_t size, gfp_t flags);
  22 -extern void ext4_kvfree(void *ptr);
  23  extern int ext4_alloc_flex_bg_array(struct super_block *sb,
  24                                     ext4_group_t ngroup);
  25  extern const char *ext4_decode_error(struct super_block *sb, int errno,
  26 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
  27 index dbfe15c..004d0ff 100644
  28 --- a/fs/ext4/mballoc.c
  29 +++ b/fs/ext4/mballoc.c
  30 @@ -2358,7 +2358,7 @@ int ext4_mb_alloc_groupinfo(struct super_block *sb, ext4_group_t ngroups)
  31         if (sbi->s_group_info) {
  32                 memcpy(new_groupinfo, sbi->s_group_info,
  33                        sbi->s_group_info_size * sizeof(*sbi->s_group_info));
  34 -               ext4_kvfree(sbi->s_group_info);
  35 +               kvfree(sbi->s_group_info);
  36         }
  37         sbi->s_group_info = new_groupinfo;
  38         sbi->s_group_info_size = size / sizeof(*sbi->s_group_info);
  39 @@ -2495,7 +2495,7 @@ err_freebuddy:
  40                 kfree(sbi->s_group_info[i]);
  41         iput(sbi->s_buddy_cache);
  42  err_freesgi:
  43 -       ext4_kvfree(sbi->s_group_info);
  44 +       kvfree(sbi->s_group_info);
  45         return -ENOMEM;
  46  }
  47
  48 @@ -2708,7 +2708,7 @@ int ext4_mb_release(struct super_block *sb)
  49                         EXT4_DESC_PER_BLOCK_BITS(sb);
  50                 for (i = 0; i < num_meta_group_infos; i++)
  51                         kfree(sbi->s_group_info[i]);
  52 -               ext4_kvfree(sbi->s_group_info);
  53 +               kvfree(sbi->s_group_info);
  54         }
  55         kfree(sbi->s_mb_offsets);
  56         kfree(sbi->s_mb_maxs);
  57 diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
  58 index ca45883..bf76f40 100644
  59 --- a/fs/ext4/resize.c
  60 +++ b/fs/ext4/resize.c
  61 @@ -856,7 +856,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
  62         n_group_desc[gdb_num] = gdb_bh;
  63         EXT4_SB(sb)->s_group_desc = n_group_desc;
  64         EXT4_SB(sb)->s_gdb_count++;
  65 -       ext4_kvfree(o_group_desc);
  66 +       kvfree(o_group_desc);
  67
  68         le16_add_cpu(&es->s_reserved_gdt_blocks, -1);
  69         err = ext4_handle_dirty_super(handle, sb);
  70 @@ -866,7 +866,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
  71         return err;
  72
  73  exit_inode:
  74 -       ext4_kvfree(n_group_desc);
  75 +       kvfree(n_group_desc);
  76         brelse(iloc.bh);
  77  exit_dind:
  78         brelse(dind);
  79 @@ -909,7 +909,7 @@ static int add_new_gdb_meta_bg(struct super_block *sb,
  80         n_group_desc[gdb_num] = gdb_bh;
  81         EXT4_SB(sb)->s_group_desc = n_group_desc;
  82         EXT4_SB(sb)->s_gdb_count++;
  83 -       ext4_kvfree(o_group_desc);
  84 +       kvfree(o_group_desc);
  85         BUFFER_TRACE(gdb_bh, "get_write_access");
  86         err = ext4_journal_get_write_access(handle, gdb_bh);
  87         if (unlikely(err))
  88 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
  89 index 2c9e686..4b79f39 100644
  90 --- a/fs/ext4/super.c
  91 +++ b/fs/ext4/super.c
  92 @@ -176,15 +176,6 @@ void *ext4_kvzalloc(size_t size, gfp_t flags)
  93         return ret;
  94  }
  95
  96 -void ext4_kvfree(void *ptr)
  97 -{
  98 -       if (is_vmalloc_addr(ptr))
  99 -               vfree(ptr);
 100 -       else
 101 -               kfree(ptr);
 102 -
 103 -}
 104 -
 105  ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
 106                                struct ext4_group_desc *bg)
 107  {
 108 @@ -811,8 +802,8 @@ static void ext4_put_super(struct super_block *sb)
 109
 110         for (i = 0; i < sbi->s_gdb_count; i++)
 111                 brelse(sbi->s_group_desc[i]);
 112 -       ext4_kvfree(sbi->s_group_desc);
 113 -       ext4_kvfree(sbi->s_flex_groups);
 114 +       kvfree(sbi->s_group_desc);
 115 +       kvfree(sbi->s_flex_groups);
 116         percpu_counter_destroy(&sbi->s_freeclusters_counter);
 117         percpu_counter_destroy(&sbi->s_freeinodes_counter);
 118         percpu_counter_destroy(&sbi->s_dirs_counter);
 119 @@ -1939,7 +1930,7 @@ int ext4_alloc_flex_bg_array(struct super_block *sb, ext4_group_t ngroup)
 120                 memcpy(new_groups, sbi->s_flex_groups,
 121                        (sbi->s_flex_groups_allocated *
 122                         sizeof(struct flex_groups)));
 123 -               ext4_kvfree(sbi->s_flex_groups);
 124 +               kvfree(sbi->s_flex_groups);
 125         }
 126         sbi->s_flex_groups = new_groups;
 127         sbi->s_flex_groups_allocated = size / sizeof(struct flex_groups);
 128 @@ -4224,7 +4215,7 @@ failed_mount7:
 129  failed_mount6:
 130         ext4_mb_release(sb);
 131         if (sbi->s_flex_groups)
 132 -               ext4_kvfree(sbi->s_flex_groups);
 133 +               kvfree(sbi->s_flex_groups);
 134         percpu_counter_destroy(&sbi->s_freeclusters_counter);
 135         percpu_counter_destroy(&sbi->s_freeinodes_counter);
 136         percpu_counter_destroy(&sbi->s_dirs_counter);
 137 @@ -4253,7 +4244,7 @@ failed_mount3:
 138  failed_mount2:
 139         for (i = 0; i < db_count; i++)
 140                 brelse(sbi->s_group_desc[i]);
 141 -       ext4_kvfree(sbi->s_group_desc);
 142 +       kvfree(sbi->s_group_desc);
 143  failed_mount:
 144         if (sbi->s_chksum_driver)
 145                 crypto_free_shash(sbi->s_chksum_driver);
 146 --
 147 1.7.10.4
 148
 149 --
 150 To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
 151 the body of a message to majordomo@vger.kernel.org
 152 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 153 Please read the FAQ at  http://www.tux.org/lkml/
 154