From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v2 09/11] btrfs: abstract out loading the tree root
Date: Wed, 15 Dec 2021 15:40:06 -0500 [thread overview]
Message-ID: <fc9f1e2aa167dfe0d1b9b806246eb55e098092c9.1639600719.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1639600719.git.josef@toxicpanda.com>
We're going to be adding more roots that need to be loaded from the
super block, so abstract out the code to read the tree_root from the
super block, and use this helper for the chunk root as well. This will
make it simpler to load the new trees in the future.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/disk-io.c | 82 ++++++++++++++++++++++++++--------------------
1 file changed, 47 insertions(+), 35 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 5c598e124c25..ddc3b9fcbabc 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2934,6 +2934,46 @@ static int btrfs_validate_write_super(struct btrfs_fs_info *fs_info,
return ret;
}
+static int load_super_root(struct btrfs_root *root, u64 bytenr, u64 gen,
+ int level)
+{
+ int ret = 0;
+
+ root->node = read_tree_block(root->fs_info, bytenr,
+ root->root_key.objectid, gen, level, NULL);
+ if (IS_ERR(root->node)) {
+ ret = PTR_ERR(root->node);
+ root->node = NULL;
+ } else if (!extent_buffer_uptodate(root->node)) {
+ free_extent_buffer(root->node);
+ root->node = NULL;
+ ret = -EIO;
+ }
+
+ if (ret)
+ return ret;
+
+ btrfs_set_root_node(&root->root_item, root->node);
+ root->commit_root = btrfs_root_node(root);
+ btrfs_set_root_refs(&root->root_item, 1);
+ return ret;
+}
+
+static int load_important_roots(struct btrfs_fs_info *fs_info)
+{
+ struct btrfs_super_block *sb = fs_info->super_copy;
+ u64 gen, bytenr;
+ int level, ret;
+
+ bytenr = btrfs_super_root(sb);
+ gen = btrfs_super_generation(sb);
+ level = btrfs_super_root_level(sb);
+ ret = load_super_root(fs_info->tree_root, bytenr, gen, level);
+ if (ret)
+ btrfs_warn(fs_info, "couldn't read tree root");
+ return ret;
+}
+
static int __cold init_tree_roots(struct btrfs_fs_info *fs_info)
{
int backup_index = find_newest_super_backup(fs_info);
@@ -2944,9 +2984,6 @@ static int __cold init_tree_roots(struct btrfs_fs_info *fs_info)
int i;
for (i = 0; i < BTRFS_NUM_BACKUP_ROOTS; i++) {
- u64 generation;
- int level;
-
if (handle_error) {
if (!IS_ERR(tree_root->node))
free_extent_buffer(tree_root->node);
@@ -2971,29 +3008,13 @@ static int __cold init_tree_roots(struct btrfs_fs_info *fs_info)
if (ret < 0)
return ret;
}
- generation = btrfs_super_generation(sb);
- level = btrfs_super_root_level(sb);
- tree_root->node = read_tree_block(fs_info, btrfs_super_root(sb),
- BTRFS_ROOT_TREE_OBJECTID,
- generation, level, NULL);
- if (IS_ERR(tree_root->node)) {
- handle_error = true;
- ret = PTR_ERR(tree_root->node);
- tree_root->node = NULL;
- btrfs_warn(fs_info, "couldn't read tree root");
- continue;
- } else if (!extent_buffer_uptodate(tree_root->node)) {
+ ret = load_important_roots(fs_info);
+ if (ret) {
handle_error = true;
- ret = -EIO;
- btrfs_warn(fs_info, "error while reading tree root");
continue;
}
- btrfs_set_root_node(&tree_root->root_item, tree_root->node);
- tree_root->commit_root = btrfs_root_node(tree_root);
- btrfs_set_root_refs(&tree_root->root_item, 1);
-
/*
* No need to hold btrfs_root::objectid_mutex since the fs
* hasn't been fully initialised and we are the only user
@@ -3013,8 +3034,8 @@ static int __cold init_tree_roots(struct btrfs_fs_info *fs_info)
}
/* All successful */
- fs_info->generation = generation;
- fs_info->last_trans_committed = generation;
+ fs_info->generation = btrfs_header_generation(tree_root->node);
+ fs_info->last_trans_committed = fs_info->generation;
fs_info->last_reloc_trans = 0;
/* Always begin writing backup roots after the one being used */
@@ -3602,21 +3623,12 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
generation = btrfs_super_chunk_root_generation(disk_super);
level = btrfs_super_chunk_root_level(disk_super);
-
- chunk_root->node = read_tree_block(fs_info,
- btrfs_super_chunk_root(disk_super),
- BTRFS_CHUNK_TREE_OBJECTID,
- generation, level, NULL);
- if (IS_ERR(chunk_root->node) ||
- !extent_buffer_uptodate(chunk_root->node)) {
+ ret = load_super_root(chunk_root, btrfs_super_chunk_root(disk_super),
+ generation, level);
+ if (ret) {
btrfs_err(fs_info, "failed to read chunk root");
- if (!IS_ERR(chunk_root->node))
- free_extent_buffer(chunk_root->node);
- chunk_root->node = NULL;
goto fail_tree_roots;
}
- btrfs_set_root_node(&chunk_root->root_item, chunk_root->node);
- chunk_root->commit_root = btrfs_root_node(chunk_root);
read_extent_buffer(chunk_root->node, fs_info->chunk_tree_uuid,
offsetof(struct btrfs_header, chunk_tree_uuid),
--
2.26.3
next prev parent reply other threads:[~2021-12-15 20:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 20:39 [PATCH v2 00/11] btrfs: extent tree v2, support for global roots Josef Bacik
2021-12-15 20:39 ` [PATCH v2 01/11] btrfs: add definition for EXTENT_TREE_V2 Josef Bacik
2021-12-15 20:39 ` [PATCH v2 02/11] btrfs: disable balance for extent tree v2 for now Josef Bacik
2021-12-15 20:40 ` [PATCH v2 03/11] btrfs: disable device manipulation ioctl's EXTENT_TREE_V2 Josef Bacik
2021-12-15 20:40 ` [PATCH v2 04/11] btrfs: disable qgroups in extent tree v2 Josef Bacik
2021-12-15 20:40 ` [PATCH v2 05/11] btrfs: disable scrub for extent-tree-v2 Josef Bacik
2021-12-15 20:40 ` [PATCH v2 06/11] btrfs: disable snapshot creation/deletion for extent tree v2 Josef Bacik
2021-12-15 20:40 ` [PATCH v2 07/11] btrfs: disable space cache related mount options " Josef Bacik
2021-12-15 20:40 ` [PATCH v2 08/11] btrfs: tree-checker: don't fail on empty extent roots " Josef Bacik
2021-12-15 20:40 ` Josef Bacik [this message]
2022-01-13 9:20 ` [PATCH v2 09/11] btrfs: abstract out loading the tree root Nikolay Borisov
2022-01-26 15:32 ` David Sterba
2021-12-15 20:40 ` [PATCH v2 10/11] btrfs: add code to support the block group root Josef Bacik
2022-01-12 15:16 ` Nikolay Borisov
2022-01-26 15:34 ` David Sterba
2022-01-26 15:58 ` Nikolay Borisov
2021-12-15 20:40 ` [PATCH v2 11/11] btrfs: add support for multiple global roots Josef Bacik
2022-01-12 15:09 ` [PATCH v2 00/11] btrfs: extent tree v2, support for " Nikolay Borisov
2022-01-26 15:52 ` David Sterba
2022-01-26 15:54 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fc9f1e2aa167dfe0d1b9b806246eb55e098092c9.1639600719.git.josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).