LU-12561 ldiskfs: Remove unused 2.6.x patches

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / rhel6.3 / ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch

diff --git a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch
deleted file mode 100644 (file)
index 8a68794..0000000
--- a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From f18a5f21c25707b4fe64b326e2b4d150565e7300 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Mon, 1 Aug 2011 08:45:38 -0400
-Subject: ext4: use ext4_kvzalloc()/ext4_kvmalloc() for s_group_desc and s_group_info
-Git-commit: f18a5f21
-Patch-mainline: v3.1-rc1
-
-Upstream-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-Signed-off-by: Jeff Mahoney <jeffm@suse.com>
----
- fs/ext4/mballoc.c |    6 +++---
- fs/ext4/resize.c  |   13 +++++++------
- fs/ext4/super.c   |    9 +++++----
- 3 files changed, 15 insertions(+), 13 deletions(-)
-
---- a/fs/ext4/mballoc.c
-+++ b/fs/ext4/mballoc.c
-@@ -2307,7 +2307,7 @@ static int ext4_mb_init_backend(struct s
-       /* An 8TB filesystem with 64-bit pointers requires a 4096 byte
-        * kmalloc. A 128kb malloc should suffice for a 256TB filesystem.
-        * So a two level scheme suffices for now. */
--      sbi->s_group_info = kmalloc(array_size, GFP_KERNEL);
-+      sbi->s_group_info = ext4_kvzalloc(array_size, GFP_KERNEL);
-       if (sbi->s_group_info == NULL) {
-               printk(KERN_ERR "EXT4-fs: can't allocate buddy meta group\n");
-               return -ENOMEM;
-@@ -2339,7 +2339,7 @@ err_freebuddy:
-               kfree(sbi->s_group_info[i]);
-       iput(sbi->s_buddy_cache);
- err_freesgi:
--      kfree(sbi->s_group_info);
-+      ext4_kvfree(sbi->s_group_info);
-       return -ENOMEM;
- }
-
-@@ -2464,7 +2464,7 @@ int ext4_mb_release(struct super_block *
-                       EXT4_DESC_PER_BLOCK_BITS(sb);
-               for (i = 0; i < num_meta_group_infos; i++)
-                       kfree(sbi->s_group_info[i]);
--              kfree(sbi->s_group_info);
-+              ext4_kvfree(sbi->s_group_info);
-       }
-       kfree(sbi->s_mb_offsets);
-       kfree(sbi->s_mb_maxs);
---- a/fs/ext4/resize.c
-+++ b/fs/ext4/resize.c
-@@ -435,12 +435,13 @@ static int add_new_gdb(handle_t *handle,
-       if ((err = ext4_reserve_inode_write(handle, inode, &iloc)))
-               goto exit_dindj;
-
--      n_group_desc = kmalloc((gdb_num + 1) * sizeof(struct buffer_head *),
--                      GFP_NOFS);
-+      n_group_desc = ext4_kvmalloc((gdb_num + 1) *
-+                                   sizeof(struct buffer_head *),
-+                                   GFP_NOFS);
-       if (!n_group_desc) {
-               err = -ENOMEM;
--              ext4_warning(sb,
--                            "not enough memory for %lu groups", gdb_num + 1);
-+              ext4_warning(sb, "not enough memory for %lu groups",
-+                           gdb_num + 1);
-               goto exit_inode;
-       }
-
-@@ -467,7 +468,7 @@ static int add_new_gdb(handle_t *handle,
-       n_group_desc[gdb_num] = *primary;
-       EXT4_SB(sb)->s_group_desc = n_group_desc;
-       EXT4_SB(sb)->s_gdb_count++;
--      kfree(o_group_desc);
-+      ext4_kvfree(o_group_desc);
-
-       le16_add_cpu(&es->s_reserved_gdt_blocks, -1);
-       ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh);
-@@ -475,7 +476,7 @@ static int add_new_gdb(handle_t *handle,
-       return 0;
-
- exit_inode:
--      kfree(n_group_desc);
-+      ext4_kvfree(n_group_desc);
-       /* ext4_journal_release_buffer(handle, iloc.bh); */
-       brelse(iloc.bh);
- exit_dindj:
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -705,7 +705,7 @@ static void ext4_put_super(struct super_
-
-       for (i = 0; i < sbi->s_gdb_count; i++)
-               brelse(sbi->s_group_desc[i]);
--      kfree(sbi->s_group_desc);
-+      ext4_kvfree(sbi->s_group_desc);
-       ext4_kvfree(sbi->s_flex_groups);
-       percpu_counter_destroy(&sbi->s_freeblocks_counter);
-       percpu_counter_destroy(&sbi->s_freeinodes_counter);
-@@ -3169,8 +3169,9 @@ static int ext4_fill_super(struct super_
-                       (EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb)));
-       db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) /
-                  EXT4_DESC_PER_BLOCK(sb);
--      sbi->s_group_desc = kmalloc(db_count * sizeof(struct buffer_head *),
--                                  GFP_KERNEL);
-+      sbi->s_group_desc = ext4_kvmalloc(db_count *
-+                                        sizeof(struct buffer_head *),
-+                                        GFP_KERNEL);
-       if (sbi->s_group_desc == NULL) {
-               ext4_msg(sb, KERN_ERR, "not enough memory");
-               goto failed_mount;
-@@ -3495,7 +3496,7 @@ failed_mount3:
- failed_mount2:
-       for (i = 0; i < db_count; i++)
-               brelse(sbi->s_group_desc[i]);
--      kfree(sbi->s_group_desc);
-+      ext4_kvfree(sbi->s_group_desc);
- failed_mount:
-       if (sbi->s_proc) {
-               remove_proc_entry(sb->s_id, ext4_proc_root);