btrfs: relocation: Remove is_cowonly_root()
PATCH 1/1 btrfs: relocation: Remove is_cowonly_root()
This function is only used in read_fs_root(), which is just a wrapper of btrfs_get_fs_root().
For all the mentioned essential roots except log root tree, btrfs_get_fs_root() has its own quick path to grab them from fs_info directly, thus no need for key.offset modification.
For subvolume trees, btrfs_get_fs_root() with key.offset == -1 is completely fine.
For log trees and log root tree, it's impossible to hit them, as for relocation all backrefs are fetched from commit root, which never records log tree blocks.
Log tree blocks either get freed in regular transaction commit, or replayed at mount time. At runtime we should never hit an backref for log tree in extent tree.
--- fs/btrfs/relocation.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
fs/btrfs/relocation.c +1 -19
@@ -505,21 +505,6 @@ static struct btrfs_root *find_reloc_root(struct reloc_control *rc,return root; } -static int is_cowonly_root (u64 root_objectid) -{ -if (root_objectid ==BTRFS_ROOT_TREE_OBJECTID || - root_objectid ==BTRFS_EXTENT_TREE_OBJECTID || - root_objectid ==BTRFS_CHUNK_TREE_OBJECTID || - root_objectid ==BTRFS_DEV_TREE_OBJECTID || - root_objectid ==BTRFS_TREE_LOG_OBJECTID || - root_objectid ==BTRFS_CSUM_TREE_OBJECTID || - root_objectid ==BTRFS_UUID_TREE_OBJECTID || - root_objectid ==BTRFS_QUOTA_TREE_OBJECTID || - root_objectid ==BTRFS_FREE_SPACE_TREE_OBJECTID ) -return 1 ; -return 0 ; -} -static struct btrfs_root *read_fs_root (struct btrfs_fs_info *fs_info,u64 root_objectid) {
@@ -527,10 +512,7 @@ static struct btrfs_root *read_fs_root(struct btrfs_fs_info *fs_info, key.objectid = root_objectid; key.type =BTRFS_ROOT_ITEM_KEY ; -if (is_cowonly_root (root_objectid)) - key.offset =0 ; -else - key.offset = (u64)-1 ; + key.offset = (u64)-1 ;return btrfs_get_fs_root (fs_info, &key, false); }
Signature · 1 line
2.25.0
Quoted 14 lines · Qu Wenruo
This function is only used in
read_fs_root(), which is just a wrapper ofbtrfs_get_fs_root().For all the mentioned essential roots except log root tree,
btrfs_get_fs_root()has its own quick path to grab them fromfs_infodirectly, thus no need for key.offset modification.For subvolume trees,
btrfs_get_fs_root()with key.offset == -1 is completely fine.For log trees and log root tree, it's impossible to hit them, as for relocation all backrefs are fetched from commit root, which never records log tree blocks.
Quoted 5 lines
Log tree blocks either get freed in regular transaction commit, or replayed at mount time. At runtime we should never hit an backref for log tree in extent tree.
Signed-off-by Qu Wenruo <[email protected]>
Thanks,
Josef
Quoted 14 lines · Qu Wenruo
This function is only used in
read_fs_root(), which is just a wrapper ofbtrfs_get_fs_root().For all the mentioned essential roots except log root tree,
btrfs_get_fs_root()has its own quick path to grab them fromfs_infodirectly, thus no need for key.offset modification.For subvolume trees,
btrfs_get_fs_root()with key.offset == -1 is completely fine.For log trees and log root tree, it's impossible to hit them, as for relocation all backrefs are fetched from commit root, which never records log tree blocks.
Quoted 5 lines
Log tree blocks either get freed in regular transaction commit, or replayed at mount time. At runtime we should never hit an backref for log tree in extent tree.
Signed-off-by Qu Wenruo <[email protected]>
Added to misc-next, thanks.