1 files changed, 13 insertions, 53 deletions

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 14fce27b4780..f26f38ccd194 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -202,7 +202,7 @@ static void btrfs_dequeue_delayed_node(struct btrfs_delayed_root *root,
         spin_unlock(&root->lock);
 }
 
-struct btrfs_delayed_node *btrfs_first_delayed_node(
+static struct btrfs_delayed_node *btrfs_first_delayed_node(
                         struct btrfs_delayed_root *delayed_root)
 {
         struct list_head *p;
@@ -221,7 +221,7 @@ out:
         return node;
 }
 
-struct btrfs_delayed_node *btrfs_next_delayed_node(
+static struct btrfs_delayed_node *btrfs_next_delayed_node(
                                                 struct btrfs_delayed_node *node)
 {
         struct btrfs_delayed_root *delayed_root;
@@ -282,7 +282,7 @@ static inline void btrfs_release_delayed_node(struct btrfs_delayed_node *node)
         __btrfs_release_delayed_node(node, 0);
 }
 
-struct btrfs_delayed_node *btrfs_first_prepared_delayed_node(
+static struct btrfs_delayed_node *btrfs_first_prepared_delayed_node(
                                         struct btrfs_delayed_root *delayed_root)
 {
         struct list_head *p;
@@ -308,7 +308,7 @@ static inline void btrfs_release_prepared_delayed_node(
         __btrfs_release_delayed_node(node, 1);
 }
 
-struct btrfs_delayed_item *btrfs_alloc_delayed_item(u32 data_len)
+static struct btrfs_delayed_item *btrfs_alloc_delayed_item(u32 data_len)
 {
         struct btrfs_delayed_item *item;
         item = kmalloc(sizeof(*item) + data_len, GFP_NOFS);
@@ -383,7 +383,7 @@ static struct btrfs_delayed_item *__btrfs_lookup_delayed_item(
         return NULL;
 }
 
-struct btrfs_delayed_item *__btrfs_lookup_delayed_insertion_item(
+static struct btrfs_delayed_item *__btrfs_lookup_delayed_insertion_item(
                                         struct btrfs_delayed_node *delayed_node,
                                         struct btrfs_key *key)
 {
@@ -394,45 +394,6 @@ struct btrfs_delayed_item *__btrfs_lookup_delayed_insertion_item(
         return item;
 }
 
-struct btrfs_delayed_item *__btrfs_lookup_delayed_deletion_item(
-                                        struct btrfs_delayed_node *delayed_node,
-                                        struct btrfs_key *key)
-{
-        struct btrfs_delayed_item *item;
-
-        item = __btrfs_lookup_delayed_item(&delayed_node->del_root, key,
-                                           NULL, NULL);
-        return item;
-}
-
-struct btrfs_delayed_item *__btrfs_search_delayed_insertion_item(
-                                        struct btrfs_delayed_node *delayed_node,
-                                        struct btrfs_key *key)
-{
-        struct btrfs_delayed_item *item, *next;
-
-        item = __btrfs_lookup_delayed_item(&delayed_node->ins_root, key,
-                                           NULL, &next);
-        if (!item)
-                item = next;
-
-        return item;
-}
-
-struct btrfs_delayed_item *__btrfs_search_delayed_deletion_item(
-                                        struct btrfs_delayed_node *delayed_node,
-                                        struct btrfs_key *key)
-{
-        struct btrfs_delayed_item *item, *next;
-
-        item = __btrfs_lookup_delayed_item(&delayed_node->del_root, key,
-                                           NULL, &next);
-        if (!item)
-                item = next;
-
-        return item;
-}
-
 static int __btrfs_add_delayed_item(struct btrfs_delayed_node *delayed_node,
                                     struct btrfs_delayed_item *ins,
                                     int action)
@@ -535,7 +496,7 @@ static void btrfs_release_delayed_item(struct btrfs_delayed_item *item)
         }
 }
 
-struct btrfs_delayed_item *__btrfs_first_delayed_insertion_item(
+static struct btrfs_delayed_item *__btrfs_first_delayed_insertion_item(
                                         struct btrfs_delayed_node *delayed_node)
 {
         struct rb_node *p;
@@ -548,7 +509,7 @@ struct btrfs_delayed_item *__btrfs_first_delayed_insertion_item(
         return item;
 }
 
-struct btrfs_delayed_item *__btrfs_first_delayed_deletion_item(
+static struct btrfs_delayed_item *__btrfs_first_delayed_deletion_item(
                                         struct btrfs_delayed_node *delayed_node)
 {
         struct rb_node *p;
@@ -561,7 +522,7 @@ struct btrfs_delayed_item *__btrfs_first_delayed_deletion_item(
         return item;
 }
 
-struct btrfs_delayed_item *__btrfs_next_delayed_item(
+static struct btrfs_delayed_item *__btrfs_next_delayed_item(
                                                 struct btrfs_delayed_item *item)
 {
         struct rb_node *p;
@@ -766,10 +727,9 @@ static void btrfs_delayed_inode_release_metadata(struct btrfs_root *root,
  * This helper will insert some continuous items into the same leaf according
  * to the free space of the leaf.
  */
-static int btrfs_batch_insert_items(struct btrfs_trans_handle *trans,
-                                struct btrfs_root *root,
-                                struct btrfs_path *path,
-                                struct btrfs_delayed_item *item)
+static int btrfs_batch_insert_items(struct btrfs_root *root,
+                                    struct btrfs_path *path,
+                                    struct btrfs_delayed_item *item)
 {
         struct btrfs_delayed_item *curr, *next;
         int free_space;
@@ -848,7 +808,7 @@ static int btrfs_batch_insert_items(struct btrfs_trans_handle *trans,
         btrfs_clear_path_blocking(path, NULL, 0);
 
         /* insert the keys of the items */
-        setup_items_for_insert(trans, root, path, keys, data_size,
+        setup_items_for_insert(root, path, keys, data_size,
                                total_data_size, total_size, nitems);
 
         /* insert the dir index items */
@@ -932,7 +892,7 @@ do_again:
         if (curr && btrfs_is_continuous_delayed_item(prev, curr)) {
                 /* insert the continuous items into the same leaf */
                 path->slots[0]++;
-                btrfs_batch_insert_items(trans, root, path, curr);
+                btrfs_batch_insert_items(root, path, curr);
         }
         btrfs_release_delayed_item(prev);
         btrfs_mark_buffer_dirty(path->nodes[0]);