ldiskfs/kernel_patches/patches/sles11sp2/ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch

   1 From f18a5f21c25707b4fe64b326e2b4d150565e7300 Mon Sep 17 00:00:00 2001
   2 From: Theodore Ts'o <tytso@mit.edu>
   3 Date: Mon, 1 Aug 2011 08:45:38 -0400
   4 Subject: ext4: use ext4_kvzalloc()/ext4_kvmalloc() for s_group_desc and s_group_info
   5 Git-commit: f18a5f21
   6 Patch-mainline: v3.1-rc1
   7
   8 Upstream-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
   9 Signed-off-by: Jeff Mahoney <jeffm@suse.com>
  10 ---
  11  fs/ext4/mballoc.c |    6 +++---
  12  fs/ext4/resize.c  |   13 +++++++------
  13  fs/ext4/super.c   |    9 +++++----
  14  3 files changed, 15 insertions(+), 13 deletions(-)
  15
  16 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
  17 index fa716c9..d5021e8 100644
  18 --- a/fs/ext4/mballoc.c
  19 +++ b/fs/ext4/mballoc.c
  20 @@ -2331,7 +2331,7 @@ static int ext4_mb_init_backend(struct super_block *sb)
  21         /* An 8TB filesystem with 64-bit pointers requires a 4096 byte
  22          * kmalloc. A 128kb malloc should suffice for a 256TB filesystem.
  23          * So a two level scheme suffices for now. */
  24 -       sbi->s_group_info = kzalloc(array_size, GFP_KERNEL);
  25 +       sbi->s_group_info = ext4_kvzalloc(array_size, GFP_KERNEL);
  26         if (sbi->s_group_info == NULL) {
  27                 printk(KERN_ERR "EXT4-fs: can't allocate buddy meta group\n");
  28                 return -ENOMEM;
  29 @@ -2365,7 +2365,7 @@ err_freebuddy:
  30                 kfree(sbi->s_group_info[i]);
  31         iput(sbi->s_buddy_cache);
  32  err_freesgi:
  33 -       kfree(sbi->s_group_info);
  34 +       ext4_kvfree(sbi->s_group_info);
  35         return -ENOMEM;
  36  }
  37
  38 @@ -2559,7 +2559,7 @@ int ext4_mb_release(struct super_block *sb)
  39                         EXT4_DESC_PER_BLOCK_BITS(sb);
  40                 for (i = 0; i < num_meta_group_infos; i++)
  41                         kfree(sbi->s_group_info[i]);
  42 -               kfree(sbi->s_group_info);
  43 +               ext4_kvfree(sbi->s_group_info);
  44         }
  45         kfree(sbi->s_mb_offsets);
  46         kfree(sbi->s_mb_maxs);
  47 diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
  48 index 71085df..707d3f1 100644
  49 --- a/fs/ext4/resize.c
  50 +++ b/fs/ext4/resize.c
  51 @@ -467,12 +467,13 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
  52         if (unlikely(err))
  53                 goto exit_dindj;
  54
  55 -       n_group_desc = kmalloc((gdb_num + 1) * sizeof(struct buffer_head *),
  56 -                       GFP_NOFS);
  57 +       n_group_desc = ext4_kvmalloc((gdb_num + 1) *
  58 +                                    sizeof(struct buffer_head *),
  59 +                                    GFP_NOFS);
  60         if (!n_group_desc) {
  61                 err = -ENOMEM;
  62 -               ext4_warning(sb,
  63 -                             "not enough memory for %lu groups", gdb_num + 1);
  64 +               ext4_warning(sb, "not enough memory for %lu groups",
  65 +                            gdb_num + 1);
  66                 goto exit_inode;
  67         }
  68
  69 @@ -507,7 +508,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
  70         n_group_desc[gdb_num] = *primary;
  71         EXT4_SB(sb)->s_group_desc = n_group_desc;
  72         EXT4_SB(sb)->s_gdb_count++;
  73 -       kfree(o_group_desc);
  74 +       ext4_kvfree(o_group_desc);
  75
  76         le16_add_cpu(&es->s_reserved_gdt_blocks, -1);
  77         err = ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh);
  78 @@ -517,7 +518,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
  79         return err;
  80
  81  exit_inode:
  82 -       kfree(n_group_desc);
  83 +       ext4_kvfree(n_group_desc);
  84         /* ext4_handle_release_buffer(handle, iloc.bh); */
  85         brelse(iloc.bh);
  86  exit_dindj:
  87 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
  88 index 658f586..e2d88ba 100644
  89 --- a/fs/ext4/super.c
  90 +++ b/fs/ext4/super.c
  91 @@ -819,7 +819,7 @@ static void ext4_put_super(struct super_block *sb)
  92
  93         for (i = 0; i < sbi->s_gdb_count; i++)
  94                 brelse(sbi->s_group_desc[i]);
  95 -       kfree(sbi->s_group_desc);
  96 +       ext4_kvfree(sbi->s_group_desc);
  97         ext4_kvfree(sbi->s_flex_groups);
  98         percpu_counter_destroy(&sbi->s_freeblocks_counter);
  99         percpu_counter_destroy(&sbi->s_freeinodes_counter);
 100 @@ -3439,8 +3439,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 101                         (EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb)));
 102         db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) /
 103                    EXT4_DESC_PER_BLOCK(sb);
 104 -       sbi->s_group_desc = kmalloc(db_count * sizeof(struct buffer_head *),
 105 -                                   GFP_KERNEL);
 106 +       sbi->s_group_desc = ext4_kvmalloc(db_count *
 107 +                                         sizeof(struct buffer_head *),
 108 +                                         GFP_KERNEL);
 109         if (sbi->s_group_desc == NULL) {
 110                 ext4_msg(sb, KERN_ERR, "not enough memory");
 111                 goto failed_mount;
 112 @@ -3783,7 +3784,7 @@ failed_mount3:
 113  failed_mount2:
 114         for (i = 0; i < db_count; i++)
 115                 brelse(sbi->s_group_desc[i]);
 116 -       kfree(sbi->s_group_desc);
 117 +       ext4_kvfree(sbi->s_group_desc);
 118  failed_mount:
 119         if (sbi->s_proc) {
 120                 remove_proc_entry(sb->s_id, ext4_proc_root);
 121