aboutsummaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorGravatar Josef Bacik <josef@toxicpanda.com> 2020-11-06 16:27:31 -0500
committerGravatar David Sterba <dsterba@suse.com> 2020-12-08 15:54:09 +0100
commit2f5239dcb26b5037dc21b58fe8bb0e80243f4f6f (patch)
treea5af11e9da5ddce3ad2279914164540da5ad4eee /fs/btrfs
parentbtrfs: unlock to current level in btrfs_next_old_leaf (diff)
downloadlinux-2f5239dcb26b5037dc21b58fe8bb0e80243f4f6f.tar.gz
linux-2f5239dcb26b5037dc21b58fe8bb0e80243f4f6f.tar.bz2
linux-2f5239dcb26b5037dc21b58fe8bb0e80243f4f6f.zip
btrfs: remove btrfs_path::recurse
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/ctree.c5
-rw-r--r--fs/btrfs/ctree.h1
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 7dc3e87828bd..2a53887a6db7 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -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;
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 228c5df4b17f..f974f3748816 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -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))