[v2,14/20] btrfs-progs: stop accessing ->free_space_root directly

Message ID	8262ff0e8d61e3fe112ea934f90849e2a4d2e282.1636399482.git.josef@toxicpanda.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-btrfs-owner@kernel.org> From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v2 14/20] btrfs-progs: stop accessing ->free_space_root directly Date: Mon, 8 Nov 2021 14:26:42 -0500 Message-Id: <8262ff0e8d61e3fe112ea934f90849e2a4d2e282.1636399482.git.josef@toxicpanda.com> In-Reply-To: <cover.1636399481.git.josef@toxicpanda.com> References: <cover.1636399481.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	btrfs-progs: extent tree v2 global root support prep work \| expand [v2,00/20] btrfs-progs: extent tree v2 global root support prep work [v2,01/20] btrfs-progs: simplify btrfs_make_block_group [v2,02/20] btrfs-progs: check: don't walk down non fs-trees for qgroup check [v2,03/20] btrfs-progs: filesystem-show: close ctree once we're done [v2,04/20] btrfs-progs: add a helper for setting up a root node [v2,05/20] btrfs-progs: btrfs-shared: stop passing root to csum related functions [v2,06/20] btrfs-progs: check: stop passing csum root around [v2,07/20] btrfs-progs: stop accessing ->csum_root directly [v2,08/20] btrfs-progs: image: keep track of seen blocks when walking trees [v2,09/20] btrfs-progs: common: move btrfs_fix_block_accounting to repair.c [v2,10/20] btrfs-progs: check: abstract out the used marking helpers [v2,11/20] btrfs-progs: check: move btrfs_mark_used_tree_blocks to common [v2,12/20] btrfs-progs: mark reloc roots as used [v2,13/20] btrfs-progs: stop accessing ->extent_root directly [v2,14/20] btrfs-progs: stop accessing ->free_space_root directly [v2,15/20] btrfs-progs: track csum, extent, and free space trees in a rb tree [v2,16/20] btrfs-progs: check: make reinit work per found root item [v2,17/20] btrfs-progs: check: check the global roots for uptodate root nodes [v2,18/20] btrfs-progs: check: check all of the csum roots [v2,19/20] btrfs-progs: check: fill csum root from all extent roots [v2,20/20] btrfs-progs: common: search all extent roots for marking used space

diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h index 23750156..c263a3bb 100644 --- a/kernel-shared/ctree.h +++ b/kernel-shared/ctree.h @@ -1163,7 +1163,7 @@ struct btrfs_fs_info { struct btrfs_root *dev_root; struct btrfs_root *_csum_root; struct btrfs_root *quota_root; - struct btrfs_root *free_space_root; + struct btrfs_root *_free_space_root; struct btrfs_root *uuid_root; struct rb_root fs_root_tree; diff --git a/kernel-shared/disk-io.c b/kernel-shared/disk-io.c index 76cf7567..4a43e102 100644 --- a/kernel-shared/disk-io.c +++ b/kernel-shared/disk-io.c @@ -791,7 +791,7 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info, return fs_info->quota_enabled ? fs_info->quota_root : ERR_PTR(-ENOENT); if (location->objectid == BTRFS_FREE_SPACE_TREE_OBJECTID) - return fs_info->free_space_root ? fs_info->free_space_root : + return fs_info->_free_space_root ? fs_info->_free_space_root : ERR_PTR(-ENOENT); BUG_ON(location->objectid == BTRFS_TREE_RELOC_OBJECTID); @@ -821,7 +821,7 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info) free(fs_info->chunk_root); free(fs_info->dev_root); free(fs_info->_csum_root); - free(fs_info->free_space_root); + free(fs_info->_free_space_root); free(fs_info->uuid_root); free(fs_info->super_copy); free(fs_info->log_root_tree); @@ -842,14 +842,14 @@ struct btrfs_fs_info *btrfs_new_fs_info(int writable, u64 sb_bytenr) fs_info->dev_root = calloc(1, sizeof(struct btrfs_root)); fs_info->_csum_root = calloc(1, sizeof(struct btrfs_root)); fs_info->quota_root = calloc(1, sizeof(struct btrfs_root)); - fs_info->free_space_root = calloc(1, sizeof(struct btrfs_root)); + fs_info->_free_space_root = calloc(1, sizeof(struct btrfs_root)); fs_info->uuid_root = calloc(1, sizeof(struct btrfs_root)); fs_info->super_copy = calloc(1, BTRFS_SUPER_INFO_SIZE); if (!fs_info->tree_root || !fs_info->_extent_root || !fs_info->chunk_root || !fs_info->dev_root || !fs_info->_csum_root || !fs_info->quota_root || - !fs_info->free_space_root || !fs_info->uuid_root || + !fs_info->_free_space_root || !fs_info->uuid_root || !fs_info->super_copy) goto free_all; @@ -1046,17 +1046,17 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr, if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) { ret = find_and_setup_root(root, fs_info, BTRFS_FREE_SPACE_TREE_OBJECTID, - fs_info->free_space_root); + fs_info->_free_space_root); if (ret) { - free(fs_info->free_space_root); - fs_info->free_space_root = NULL; + free(fs_info->_free_space_root); + fs_info->_free_space_root = NULL; printk("Couldn't read free space tree\n"); return -EIO; } - fs_info->free_space_root->track_dirty = 1; + fs_info->_free_space_root->track_dirty = 1; } else { - free(fs_info->free_space_root); - fs_info->free_space_root = NULL; + free(fs_info->_free_space_root); + fs_info->_free_space_root = NULL; } ret = find_and_setup_log_root(root, fs_info, sb); @@ -1095,8 +1095,8 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr, void btrfs_release_all_roots(struct btrfs_fs_info *fs_info) { - if (fs_info->free_space_root) - free_extent_buffer(fs_info->free_space_root->node); + if (fs_info->_free_space_root) + free_extent_buffer(fs_info->_free_space_root->node); if (fs_info->quota_root) free_extent_buffer(fs_info->quota_root->node); if (fs_info->_csum_root) diff --git a/kernel-shared/free-space-tree.c b/kernel-shared/free-space-tree.c index 0434733d..70b3d62a 100644 --- a/kernel-shared/free-space-tree.c +++ b/kernel-shared/free-space-tree.c @@ -25,13 +25,19 @@ #include "kernel-lib/bitops.h" #include "common/internal.h" +static struct btrfs_root *btrfs_free_space_root(struct btrfs_fs_info *fs_info, + struct btrfs_block_group *block_group) +{ + return fs_info->_free_space_root; +} + static struct btrfs_free_space_info * search_free_space_info(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, struct btrfs_block_group *block_group, struct btrfs_path *path, int cow) { - struct btrfs_root *root = fs_info->free_space_root; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_key key; int ret; @@ -103,7 +109,8 @@ static int add_new_free_space_info(struct btrfs_trans_handle *trans, struct btrfs_block_group *block_group, struct btrfs_path *path) { - struct btrfs_root *root = trans->fs_info->free_space_root; + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_free_space_info *info; struct btrfs_key key; struct extent_buffer *leaf; @@ -179,7 +186,7 @@ static int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans, struct btrfs_path *path) { struct btrfs_fs_info *fs_info = trans->fs_info; - struct btrfs_root *root = fs_info->free_space_root; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_free_space_info *info; struct btrfs_key key, found_key; struct extent_buffer *leaf; @@ -318,7 +325,7 @@ static int convert_free_space_to_extents(struct btrfs_trans_handle *trans, struct btrfs_path *path) { struct btrfs_fs_info *fs_info = trans->fs_info; - struct btrfs_root *root = fs_info->free_space_root; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_free_space_info *info; struct btrfs_key key, found_key; struct extent_buffer *leaf; @@ -558,7 +565,8 @@ static int modify_free_space_bitmap(struct btrfs_trans_handle *trans, struct btrfs_path *path, u64 start, u64 size, int remove) { - struct btrfs_root *root = trans->fs_info->free_space_root; + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_key key; u64 end = start + size; u64 cur_start, cur_size; @@ -671,7 +679,8 @@ static int remove_free_space_extent(struct btrfs_trans_handle *trans, struct btrfs_path *path, u64 start, u64 size) { - struct btrfs_root *root = trans->fs_info->free_space_root; + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_key key; u64 found_start, found_end; u64 end = start + size; @@ -811,7 +820,8 @@ static int add_free_space_extent(struct btrfs_trans_handle *trans, struct btrfs_path *path, u64 start, u64 size) { - struct btrfs_root *root = trans->fs_info->free_space_root; + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_key key, new_key; u64 found_start, found_end; u64 end = start + size; @@ -1107,7 +1117,8 @@ out: int remove_block_group_free_space(struct btrfs_trans_handle *trans, struct btrfs_block_group *block_group) { - struct btrfs_root *root = trans->fs_info->free_space_root; + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_path *path; struct btrfs_key key, found_key; struct extent_buffer *leaf; @@ -1215,7 +1226,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info) { struct btrfs_trans_handle *trans; struct btrfs_root *tree_root = fs_info->tree_root; - struct btrfs_root *free_space_root = fs_info->free_space_root; + struct btrfs_root *free_space_root = btrfs_free_space_root(fs_info, NULL); int ret; u64 features; @@ -1227,7 +1238,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info) features &= ~(BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID | BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE); btrfs_set_super_compat_ro_flags(fs_info->super_copy, features); - fs_info->free_space_root = NULL; + fs_info->_free_space_root = NULL; ret = clear_free_space_tree(trans, free_space_root); if (ret) @@ -1263,7 +1274,7 @@ static int load_free_space_bitmaps(struct btrfs_fs_info *fs_info, u32 expected_extent_count, int *errors) { - struct btrfs_root *root = fs_info->free_space_root; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_key key; int prev_bit = 0, bit; u64 extent_start = 0; @@ -1343,7 +1354,7 @@ static int load_free_space_extents(struct btrfs_fs_info *fs_info, u32 expected_extent_count, int *errors) { - struct btrfs_root *root = fs_info->free_space_root; + struct btrfs_root *root = btrfs_free_space_root(fs_info, block_group); struct btrfs_key key, prev_key; int have_prev = 0; u64 start, end; @@ -1463,7 +1474,7 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info) ret = PTR_ERR(free_space_root); goto abort; } - fs_info->free_space_root = free_space_root; + fs_info->_free_space_root = free_space_root; add_root_to_dirty_list(free_space_root); do { diff --git a/mkfs/main.c b/mkfs/main.c index 9647f12a..16f9ba19 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -289,8 +289,8 @@ static int recow_roots(struct btrfs_trans_handle *trans, ret = __recow_root(trans, csum_root); if (ret) return ret; - if (info->free_space_root) { - ret = __recow_root(trans, info->free_space_root); + if (info->_free_space_root) { + ret = __recow_root(trans, info->_free_space_root); if (ret) return ret; }

[v2,14/20] btrfs-progs: stop accessing ->free_space_root directly

Commit Message

Patch