[V2,08/10] btrfs-progs: pass @trans to functions touch dirty block groups

Message ID	20191218051849.2587-9-Damenly_Su@gmx.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=fY3M=2I=vger.kernel.org=linux-btrfs-owner@kernel.org> From: damenly.su@gmail.com To: linux-btrfs@vger.kernel.org Cc: Su Yue <Damenly_Su@gmx.com>, Qu Wenruo <wqu@suse.com> Subject: [PATCH V2 08/10] btrfs-progs: pass @trans to functions touch dirty block groups Date: Wed, 18 Dec 2019 13:18:47 +0800 Message-Id: <20191218051849.2587-9-Damenly_Su@gmx.com> In-Reply-To: <20191218051849.2587-1-Damenly_Su@gmx.com> References: <20191218051849.2587-1-Damenly_Su@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk
Series	unify origanization structure of block group cache \| expand [V2,00/10] unify origanization structure of block group cache [V2,01/10] btrfs-progs: handle error if btrfs_write_one_block_group() failed [V2,02/10] btrfs-progs: block_group: add rb tree related memebers [V2,03/10] btrfs-progs: port block group cache tree insertion and lookup functions [V2,04/10] btrfs-progs: reform the function block_group_cache_tree_search() [V2,05/10] btrfs-progs: adjust ported block group lookup functions in kernel version [V2,06/10] btrfs-progs: abstract function btrfs_add_block_group_cache() [V2,07/10] block-progs: block_group: add dirty_bgs list related memebers [V2,08/10] btrfs-progs: pass @trans to functions touch dirty block groups [V2,09/10] btrfs-progs: reform block groups caches structure [V2,10/10] btrfs-progs: cleanups after block group cache reform

diff --git a/check/main.c b/check/main.c index 08dc9e66d013..7d797750e6d6 100644 --- a/check/main.c +++ b/check/main.c @@ -6651,8 +6651,8 @@ static int delete_extent_records(struct btrfs_trans_handle *trans, u64 bytes = (found_key.type == BTRFS_EXTENT_ITEM_KEY) ? found_key.offset : fs_info->nodesize; - ret = btrfs_update_block_group(fs_info->extent_root, - bytenr, bytes, 0, 0); + ret = btrfs_update_block_group(trans, bytenr, bytes, + 0, 0); if (ret) break; } @@ -6730,7 +6730,7 @@ static int record_extent(struct btrfs_trans_handle *trans, } btrfs_mark_buffer_dirty(leaf); - ret = btrfs_update_block_group(extent_root, rec->start, + ret = btrfs_update_block_group(trans, rec->start, rec->max_size, 1, 0); if (ret) goto fail; diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index f53a0c39e86e..74c60368ca01 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -735,7 +735,7 @@ static int repair_tree_block_ref(struct btrfs_root *root, } btrfs_mark_buffer_dirty(eb); printf("Added an extent item [%llu %u]\n", bytenr, node_size); - btrfs_update_block_group(extent_root, bytenr, node_size, 1, 0); + btrfs_update_block_group(trans, bytenr, node_size, 1, 0); nrefs->refs[level] = 0; nrefs->full_backref[level] = @@ -3292,8 +3292,8 @@ static int repair_extent_data_item(struct btrfs_root *root, btrfs_set_extent_flags(eb, ei, BTRFS_EXTENT_FLAG_DATA); btrfs_mark_buffer_dirty(eb); - ret = btrfs_update_block_group(extent_root, disk_bytenr, - num_bytes, 1, 0); + ret = btrfs_update_block_group(trans, disk_bytenr, num_bytes, + 1, 0); btrfs_release_path(&path); } diff --git a/cmds/rescue-chunk-recover.c b/cmds/rescue-chunk-recover.c index 171b4d07ecf9..461b66c6e13b 100644 --- a/cmds/rescue-chunk-recover.c +++ b/cmds/rescue-chunk-recover.c @@ -1084,7 +1084,7 @@ err: return ret; } -static int block_group_free_all_extent(struct btrfs_root *root, +static int block_group_free_all_extent(struct btrfs_trans_handle *trans, struct block_group_record *bg) { struct btrfs_block_group_cache *cache; @@ -1092,7 +1092,7 @@ static int block_group_free_all_extent(struct btrfs_root *root, u64 start; u64 end; - info = root->fs_info; + info = trans->fs_info; cache = btrfs_lookup_block_group(info, bg->objectid); if (!cache) return -ENOENT; @@ -1124,7 +1124,7 @@ static int remove_chunk_extent_item(struct btrfs_trans_handle *trans, if (ret) return ret; - ret = block_group_free_all_extent(root, chunk->bg_rec); + ret = block_group_free_all_extent(trans, chunk->bg_rec); if (ret) return ret; } diff --git a/ctree.h b/ctree.h index 61ce53c46302..53882d04ac03 100644 --- a/ctree.h +++ b/ctree.h @@ -2568,8 +2568,8 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 type, u64 chunk_offset, u64 size); int btrfs_make_block_groups(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info); -int btrfs_update_block_group(struct btrfs_root *root, u64 bytenr, u64 num, - int alloc, int mark_free); +int btrfs_update_block_group(struct btrfs_trans_handle *trans, u64 bytenr, + u64 num, int alloc, int mark_free); int btrfs_record_file_extent(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid, struct btrfs_inode_item *inode, diff --git a/extent-tree.c b/extent-tree.c index 615d823ec4de..f50d1c8b0a77 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1872,9 +1872,10 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, return 0; } -static int update_block_group(struct btrfs_fs_info *info, u64 bytenr, +static int update_block_group(struct btrfs_trans_handle *trans, u64 bytenr, u64 num_bytes, int alloc, int mark_free) { + struct btrfs_fs_info *info = trans->fs_info; struct btrfs_block_group_cache *cache; u64 total = num_bytes; u64 old_val; @@ -2237,8 +2238,7 @@ static int __free_extent(struct btrfs_trans_handle *trans, goto fail; } - update_block_group(trans->fs_info, bytenr, num_bytes, 0, - mark_free); + update_block_group(trans, bytenr, num_bytes, 0, mark_free); } fail: btrfs_free_path(path); @@ -2570,7 +2570,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, if (ret) return ret; - ret = update_block_group(fs_info, ins.objectid, fs_info->nodesize, 1, + ret = update_block_group(trans, ins.objectid, fs_info->nodesize, 1, 0); if (sinfo) { if (fs_info->nodesize > sinfo->bytes_reserved) { @@ -3026,11 +3026,11 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans, return 0; } -int btrfs_update_block_group(struct btrfs_root *root, +int btrfs_update_block_group(struct btrfs_trans_handle *trans, u64 bytenr, u64 num_bytes, int alloc, int mark_free) { - return update_block_group(root->fs_info, bytenr, num_bytes, + return update_block_group(trans, bytenr, num_bytes, alloc, mark_free); } @@ -3444,12 +3444,12 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans) btrfs_item_key_to_cpu(leaf, &key, slot); if (key.type == BTRFS_EXTENT_ITEM_KEY) { bytes_used += key.offset; - ret = btrfs_update_block_group(root, + ret = btrfs_update_block_group(trans, key.objectid, key.offset, 1, 0); BUG_ON(ret); } else if (key.type == BTRFS_METADATA_ITEM_KEY) { bytes_used += fs_info->nodesize; - ret = btrfs_update_block_group(root, + ret = btrfs_update_block_group(trans, key.objectid, fs_info->nodesize, 1, 0); if (ret) goto out; @@ -3604,7 +3604,7 @@ static int __btrfs_record_file_extent(struct btrfs_trans_handle *trans, BTRFS_EXTENT_FLAG_DATA); btrfs_mark_buffer_dirty(leaf); - ret = btrfs_update_block_group(root, disk_bytenr, + ret = btrfs_update_block_group(trans, disk_bytenr, num_bytes, 1, 0); if (ret) goto fail; diff --git a/image/main.c b/image/main.c index bddb49720f0a..f88ffb16bafe 100644 --- a/image/main.c +++ b/image/main.c @@ -2338,8 +2338,9 @@ again: return 0; } -static void fixup_block_groups(struct btrfs_fs_info *fs_info) +static void fixup_block_groups(struct btrfs_trans_handle *trans) { + struct btrfs_fs_info *fs_info = trans->fs_info; struct btrfs_block_group_cache *bg; struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree; struct cache_extent *ce; @@ -2499,7 +2500,7 @@ static int fixup_chunks_and_devices(struct btrfs_fs_info *fs_info, return PTR_ERR(trans); } - fixup_block_groups(fs_info); + fixup_block_groups(trans); ret = fixup_dev_extents(trans); if (ret < 0) goto error;

[V2,08/10] btrfs-progs: pass @trans to functions touch dirty block groups

Commit Message

Patch