btrfs: Remove block_rsv parameter from btrfs_drop_snapshot
PATCH 1/1 btrfs: Remove block_rsv parameter from btrfs_drop_snapshot
It's no longer used following 30d40577e322 ("btrfs: reloc: Also queue orphan reloc tree for cleanup to avoid BUG_ON()"), so just remove it.
Signed-off-by Nikolay Borisov <[email protected]>
--- fs/btrfs/ctree.h | 5 ++--- fs/btrfs/extent-tree.c | 9 +-------- fs/btrfs/relocation.c | 4 ++-- fs/btrfs/transaction.c | 4 ++-- 4 files changed, 7 insertions(+), 15 deletions(-)
fs/btrfs/ctree.h +2 -3
@@ -2657,9 +2657,8 @@ static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p)return btrfs_next_old_item (root, p,0 ); }int btrfs_leaf_free_space (struct extent_buffer *leaf); -int __must_check btrfs_drop_snapshot (struct btrfs_root *root, -struct btrfs_block_rsv *block_rsv, -int update_ref,int for_reloc); +int __must_check btrfs_drop_snapshot (struct btrfs_root *root,int update_ref, +int for_reloc); int btrfs_drop_subtree(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct extent_buffer *node,
fs/btrfs/extent-tree.c +1 -8
@@ -5288,9 +5288,7 @@ static noinline int walk_up_tree(struct btrfs_trans_handle *trans,* * If called with for_reloc == 0, may exit early with -EAGAIN */ -int btrfs_drop_snapshot (struct btrfs_root *root, -struct btrfs_block_rsv *block_rsv,int update_ref, -int for_reloc) +int btrfs_drop_snapshot (struct btrfs_root *root,int update_ref,int for_reloc) {struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_path *path;
@@ -5329,9 +5327,6 @@ int btrfs_drop_snapshot(struct btrfs_root *root,if (err) goto out_end_trans; -if (block_rsv) - trans->block_rsv = block_rsv; -/* * This will help us catch people modifying the fs tree while we're * dropping it. It is unsafe to mess with the fs tree while it's being
@@ -5459,8 +5454,6 @@ int btrfs_drop_snapshot(struct btrfs_root *root, err =PTR_ERR (trans); goto out_free; } -if (block_rsv) - trans->block_rsv = block_rsv; } }btrfs_release_path (path);
fs/btrfs/relocation.c +2 -2
@@ -2276,7 +2276,7 @@ static int clean_dirty_subvols(struct reloc_control *rc) root->reloc_root =NULL ;if (reloc_root) { - ret2 =btrfs_drop_snapshot (reloc_root,NULL ,0 ,1 ); + ret2 =btrfs_drop_snapshot (reloc_root,0 ,1 );if (ret2 <0 && !ret) ret = ret2; }
@@ -2289,7 +2289,7 @@ static int clean_dirty_subvols(struct reloc_control *rc)btrfs_put_root (root); }else {/* Orphan reloc tree, just clean it up */ - ret2 =btrfs_drop_snapshot (root,NULL ,0 ,1 ); + ret2 =btrfs_drop_snapshot (root,0 ,1 );if (ret2 <0 && !ret) ret = ret2; }
fs/btrfs/transaction.c +2 -2
@@ -2427,9 +2427,9 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root)if (btrfs_header_backref_rev (root->node) <BTRFS_MIXED_BACKREF_REV ) - ret =btrfs_drop_snapshot (root,NULL ,0 ,0 ); + ret =btrfs_drop_snapshot (root,0 ,0 );else - ret =btrfs_drop_snapshot (root,NULL ,1 ,0 ); + ret =btrfs_drop_snapshot (root,1 ,0 );return (ret <0 ) ?0 :1 ; }
Signature · 1 line
2.17.1
Quoted 4 lines · Nikolay Borisov
It's no longer used following
30d40577e322("btrfs: reloc: Also queue orphan reloc tree for cleanup to avoidBUG_ON()"), so just remove it.Signed-off-by Nikolay Borisov <[email protected]>
Added to misc-next, thanks.