diff options
| author | Miao Xie | 2013-05-15 09:48:19 +0200 |
|---|---|---|
| committer | Josef Bacik | 2013-06-14 17:29:37 +0200 |
| commit | cb517eabba4f109810dba2e5f37b0dcf22103065 (patch) | |
| tree | 5c553813bf6fdc41df3912a1146828cba64d3b17 /fs/btrfs/extent-tree.c | |
| parent | Btrfs: make the snap/subv deletion end more early when the fs is R/O (diff) | |
| download | kernel-qcow2-linux-cb517eabba4f109810dba2e5f37b0dcf22103065.tar.gz kernel-qcow2-linux-cb517eabba4f109810dba2e5f37b0dcf22103065.tar.xz kernel-qcow2-linux-cb517eabba4f109810dba2e5f37b0dcf22103065.zip | |
Btrfs: cleanup the similar code of the fs root read
There are several functions whose code is similar, such as
btrfs_find_last_root()
btrfs_read_fs_root_no_radix()
Besides that, some functions are invoked twice, it is unnecessary,
for example, we are sure that all roots which is found in
btrfs_find_orphan_roots()
have their orphan items, so it is unnecessary to check the orphan
item again.
So cleanup it.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index b55b5fb0eb29..c989fe602faf 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7447,8 +7447,8 @@ int btrfs_drop_snapshot(struct btrfs_root *root, } if (root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID) { - ret = btrfs_find_last_root(tree_root, root->root_key.objectid, - NULL, NULL); + ret = btrfs_find_root(tree_root, &root->root_key, path, + NULL, NULL); if (ret < 0) { btrfs_abort_transaction(trans, tree_root, ret); err = ret; @@ -7465,7 +7465,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, } if (root->in_radix) { - btrfs_free_fs_root(tree_root->fs_info, root); + btrfs_drop_and_free_fs_root(tree_root->fs_info, root); } else { free_extent_buffer(root->node); free_extent_buffer(root->commit_root); |