btrfs-progs: check: introduce traversal function for fsck

[platform/upstream/btrfs-progs.git] / file-item.c

diff --git a/file-item.c b/file-item.c
index 82bf99e..7a3bbf3 100644 (file)
--- a/file-item.c
+++ b/file-item.c
@@ -25,16 +25,11 @@
 #include "transaction.h"
 #include "print-tree.h"
 #include "crc32c.h"
+#include "internal.h"
 
 #define MAX_CSUM_ITEMS(r,size) ((((BTRFS_LEAF_DATA_SIZE(r) - \
                               sizeof(struct btrfs_item) * 2) / \
                               size) - 1))
-int btrfs_create_file(struct btrfs_trans_handle *trans,
-                     struct btrfs_root *root, u64 dirid, u64 *objectid)
-{
-       return 0;
-}
-
 int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root,
                             u64 objectid, u64 pos, u64 offset,
@@ -122,10 +117,11 @@ fail:
        return err;
 }
 
-struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
-                                         struct btrfs_root *root,
-                                         struct btrfs_path *path,
-                                         u64 bytenr, int cow)
+static struct btrfs_csum_item *
+btrfs_lookup_csum(struct btrfs_trans_handle *trans,
+                 struct btrfs_root *root,
+                 struct btrfs_path *path,
+                 u64 bytenr, int cow)
 {
        int ret;
        struct btrfs_key file_key;
@@ -172,23 +168,6 @@ fail:
        return ERR_PTR(ret);
 }
 
-int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
-                            struct btrfs_root *root,
-                            struct btrfs_path *path, u64 objectid,
-                            u64 offset, int mod)
-{
-       int ret;
-       struct btrfs_key file_key;
-       int ins_len = mod < 0 ? -1 : 0;
-       int cow = mod != 0;
-
-       file_key.objectid = objectid;
-       file_key.offset = offset;
-       btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);
-       ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);
-       return ret;
-}
-
 int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
                          struct btrfs_root *root, u64 alloc_end,
                          u64 bytenr, char *data, size_t len)
@@ -258,7 +237,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
         * at this point, we know the tree has an item, but it isn't big
         * enough yet to put our csum in.  Grow it
         */
-       btrfs_release_path(root, path);
+       btrfs_release_path(path);
        ret = btrfs_search_slot(trans, root, &file_key, path,
                                csum_size, 1);
        if (ret < 0)
@@ -290,7 +269,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
        }
 
 insert:
-       btrfs_release_path(root, path);
+       btrfs_release_path(path);
        csum_offset = 0;
        if (found_next) {
                u64 tmp = min(alloc_end, next_offset);
@@ -328,7 +307,6 @@ found:
                            csum_size);
        btrfs_mark_buffer_dirty(path->nodes[0]);
 fail:
-       btrfs_release_path(root, path);
        btrfs_free_path(path);
        return ret;
 }
@@ -389,7 +367,7 @@ static noinline int truncate_one_csum(struct btrfs_trans_handle *trans,
                BUG_ON(ret);
 
                key->offset = end_byte;
-               ret = btrfs_set_item_key_safe(trans, root, path, key);
+               ret = btrfs_set_item_key_safe(root, path, key);
                BUG_ON(ret);
        } else {
                BUG();
@@ -501,7 +479,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
                                                &key, bytenr, len);
                        BUG_ON(ret);
                }
-               btrfs_release_path(root, path);
+               btrfs_release_path(path);
        }
 out:
        btrfs_free_path(path);