提交 1233f546 编写于 作者: A Al Viro

btrfs: sanitizing ->fs_info, part 2

lift assignment to callers of find_and_setup_root()
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 2eb34cd3
...@@ -1192,7 +1192,6 @@ static int find_and_setup_root(struct btrfs_root *tree_root, ...@@ -1192,7 +1192,6 @@ static int find_and_setup_root(struct btrfs_root *tree_root,
u32 blocksize; u32 blocksize;
u64 generation; u64 generation;
root->fs_info = fs_info;
__setup_root(tree_root->nodesize, tree_root->leafsize, __setup_root(tree_root->nodesize, tree_root->leafsize,
tree_root->sectorsize, tree_root->stripesize, tree_root->sectorsize, tree_root->stripesize,
root, fs_info, objectid); root, fs_info, objectid);
...@@ -1322,6 +1321,7 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root, ...@@ -1322,6 +1321,7 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root,
if (!root) if (!root)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (location->offset == (u64)-1) { if (location->offset == (u64)-1) {
root->fs_info = fs_info;
ret = find_and_setup_root(tree_root, fs_info, ret = find_and_setup_root(tree_root, fs_info,
location->objectid, root); location->objectid, root);
if (ret) { if (ret) {
...@@ -2300,18 +2300,21 @@ struct btrfs_root *open_ctree(struct super_block *sb, ...@@ -2300,18 +2300,21 @@ struct btrfs_root *open_ctree(struct super_block *sb,
btrfs_set_root_node(&tree_root->root_item, tree_root->node); btrfs_set_root_node(&tree_root->root_item, tree_root->node);
tree_root->commit_root = btrfs_root_node(tree_root); tree_root->commit_root = btrfs_root_node(tree_root);
extent_root->fs_info = fs_info;
ret = find_and_setup_root(tree_root, fs_info, ret = find_and_setup_root(tree_root, fs_info,
BTRFS_EXTENT_TREE_OBJECTID, extent_root); BTRFS_EXTENT_TREE_OBJECTID, extent_root);
if (ret) if (ret)
goto recovery_tree_root; goto recovery_tree_root;
extent_root->track_dirty = 1; extent_root->track_dirty = 1;
dev_root->fs_info = fs_info;
ret = find_and_setup_root(tree_root, fs_info, ret = find_and_setup_root(tree_root, fs_info,
BTRFS_DEV_TREE_OBJECTID, dev_root); BTRFS_DEV_TREE_OBJECTID, dev_root);
if (ret) if (ret)
goto recovery_tree_root; goto recovery_tree_root;
dev_root->track_dirty = 1; dev_root->track_dirty = 1;
csum_root->fs_info = fs_info;
ret = find_and_setup_root(tree_root, fs_info, ret = find_and_setup_root(tree_root, fs_info,
BTRFS_CSUM_TREE_OBJECTID, csum_root); BTRFS_CSUM_TREE_OBJECTID, csum_root);
if (ret) if (ret)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册