1 files changed, 71 insertions, 11 deletions

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index ae9411773397..b7a0641ead77 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -23,6 +23,10 @@
 #include "delayed-ref.h"
 #include "transaction.h"
 
+struct kmem_cache *btrfs_delayed_ref_head_cachep;
+struct kmem_cache *btrfs_delayed_tree_ref_cachep;
+struct kmem_cache *btrfs_delayed_data_ref_cachep;
+struct kmem_cache *btrfs_delayed_extent_op_cachep;
 /*
  * delayed back reference update tracking.  For subvolume trees
  * we queue up extent allocations and backref maintenance for
@@ -422,6 +426,14 @@ again:
         return 1;
 }
 
+void btrfs_release_ref_cluster(struct list_head *cluster)
+{
+        struct list_head *pos, *q;
+
+        list_for_each_safe(pos, q, cluster)
+                list_del_init(pos);
+}
+
 /*
  * helper function to update an extent delayed ref in the
  * rbtree.  existing and update must both have the same
@@ -511,7 +523,7 @@ update_existing_head_ref(struct btrfs_delayed_ref_node *existing,
                                         ref->extent_op->flags_to_set;
                                 existing_ref->extent_op->update_flags = 1;
                         }
-                        kfree(ref->extent_op);
+                        btrfs_free_delayed_extent_op(ref->extent_op);
                 }
         }
         /*
@@ -592,7 +604,7 @@ static noinline void add_delayed_ref_head(struct btrfs_fs_info *fs_info,
                  * we've updated the existing ref, free the newly
                  * allocated ref
                  */
-                kfree(head_ref);
+                kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);
         } else {
                 delayed_refs->num_heads++;
                 delayed_refs->num_heads_ready++;
@@ -653,7 +665,7 @@ static noinline void add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
                  * we've updated the existing ref, free the newly
                  * allocated ref
                  */
-                kfree(full_ref);
+                kmem_cache_free(btrfs_delayed_tree_ref_cachep, full_ref);
         } else {
                 delayed_refs->num_entries++;
                 trans->delayed_ref_updates++;
@@ -714,7 +726,7 @@ static noinline void add_delayed_data_ref(struct btrfs_fs_info *fs_info,
                  * we've updated the existing ref, free the newly
                  * allocated ref
                  */
-                kfree(full_ref);
+                kmem_cache_free(btrfs_delayed_data_ref_cachep, full_ref);
         } else {
                 delayed_refs->num_entries++;
                 trans->delayed_ref_updates++;
@@ -738,13 +750,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
         struct btrfs_delayed_ref_root *delayed_refs;
 
         BUG_ON(extent_op && extent_op->is_data);
-        ref = kmalloc(sizeof(*ref), GFP_NOFS);
+        ref = kmem_cache_alloc(btrfs_delayed_tree_ref_cachep, GFP_NOFS);
         if (!ref)
                 return -ENOMEM;
 
-        head_ref = kmalloc(sizeof(*head_ref), GFP_NOFS);
+        head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);
         if (!head_ref) {
-                kfree(ref);
+                kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
                 return -ENOMEM;
         }
 
@@ -786,13 +798,13 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info,
         struct btrfs_delayed_ref_root *delayed_refs;
 
         BUG_ON(extent_op && !extent_op->is_data);
-        ref = kmalloc(sizeof(*ref), GFP_NOFS);
+        ref = kmem_cache_alloc(btrfs_delayed_data_ref_cachep, GFP_NOFS);
         if (!ref)
                 return -ENOMEM;
 
-        head_ref = kmalloc(sizeof(*head_ref), GFP_NOFS);
+        head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);
         if (!head_ref) {
-                kfree(ref);
+                kmem_cache_free(btrfs_delayed_data_ref_cachep, ref);
                 return -ENOMEM;
         }
 
@@ -826,7 +838,7 @@ int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info,
         struct btrfs_delayed_ref_head *head_ref;
         struct btrfs_delayed_ref_root *delayed_refs;
 
-        head_ref = kmalloc(sizeof(*head_ref), GFP_NOFS);
+        head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);
         if (!head_ref)
                 return -ENOMEM;
 
@@ -860,3 +872,51 @@ btrfs_find_delayed_ref_head(struct btrfs_trans_handle *trans, u64 bytenr)
                 return btrfs_delayed_node_to_head(ref);
         return NULL;
 }
+
+void btrfs_delayed_ref_exit(void)
+{
+        if (btrfs_delayed_ref_head_cachep)
+                kmem_cache_destroy(btrfs_delayed_ref_head_cachep);
+        if (btrfs_delayed_tree_ref_cachep)
+                kmem_cache_destroy(btrfs_delayed_tree_ref_cachep);
+        if (btrfs_delayed_data_ref_cachep)
+                kmem_cache_destroy(btrfs_delayed_data_ref_cachep);
+        if (btrfs_delayed_extent_op_cachep)
+                kmem_cache_destroy(btrfs_delayed_extent_op_cachep);
+}
+
+int btrfs_delayed_ref_init(void)
+{
+        btrfs_delayed_ref_head_cachep = kmem_cache_create(
+                                "btrfs_delayed_ref_head",
+                                sizeof(struct btrfs_delayed_ref_head), 0,
+                                SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);
+        if (!btrfs_delayed_ref_head_cachep)
+                goto fail;
+
+        btrfs_delayed_tree_ref_cachep = kmem_cache_create(
+                                "btrfs_delayed_tree_ref",
+                                sizeof(struct btrfs_delayed_tree_ref), 0,
+                                SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);
+        if (!btrfs_delayed_tree_ref_cachep)
+                goto fail;
+
+        btrfs_delayed_data_ref_cachep = kmem_cache_create(
+                                "btrfs_delayed_data_ref",
+                                sizeof(struct btrfs_delayed_data_ref), 0,
+                                SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);
+        if (!btrfs_delayed_data_ref_cachep)
+                goto fail;
+
+        btrfs_delayed_extent_op_cachep = kmem_cache_create(
+                                "btrfs_delayed_extent_op",
+                                sizeof(struct btrfs_delayed_extent_op), 0,
+                                SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);
+        if (!btrfs_delayed_extent_op_cachep)
+                goto fail;
+
+        return 0;
+fail:
+        btrfs_delayed_ref_exit();
+        return -ENOMEM;
+}