OSDN Git Service

btrfs: remove btrfs_path::recurse
authorJosef Bacik <josef@toxicpanda.com>
Fri, 6 Nov 2020 21:27:31 +0000 (16:27 -0500)
committerDavid Sterba <dsterba@suse.com>
Tue, 8 Dec 2020 14:54:09 +0000 (15:54 +0100)
With my async free space cache loading patches ("btrfs: load free space
cache asynchronously") we no longer have a user of path->recurse and can
remove it.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.c
fs/btrfs/ctree.h

index 7dc3e87..2a53887 100644 (file)
@@ -2533,7 +2533,7 @@ static struct extent_buffer *btrfs_search_slot_get_root(struct btrfs_root *root,
                 * We don't know the level of the root node until we actually
                 * have it read locked
                 */
-               b = __btrfs_read_lock_root_node(root, p->recurse);
+               b = __btrfs_read_lock_root_node(root, 0);
                level = btrfs_header_level(b);
                if (level > write_lock_level)
                        goto out;
@@ -2802,8 +2802,7 @@ cow_done:
                                btrfs_tree_lock(b);
                                p->locks[level] = BTRFS_WRITE_LOCK;
                        } else {
-                               __btrfs_tree_read_lock(b, BTRFS_NESTING_NORMAL,
-                                                      p->recurse);
+                               __btrfs_tree_read_lock(b, BTRFS_NESTING_NORMAL, 0);
                                p->locks[level] = BTRFS_READ_LOCK;
                        }
                        p->nodes[level] = b;
index 228c5df..f974f37 100644 (file)
@@ -374,7 +374,6 @@ struct btrfs_path {
        unsigned int search_commit_root:1;
        unsigned int need_commit_sem:1;
        unsigned int skip_release_on_error:1;
-       unsigned int recurse:1;
 };
 #define BTRFS_MAX_EXTENT_ITEM_SIZE(r) ((BTRFS_LEAF_DATA_SIZE(r->fs_info) >> 4) - \
                                        sizeof(struct btrfs_item))