diff options
author | David Sterba <dsterba@suse.cz> | 2011-04-20 19:20:15 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2011-05-02 07:57:22 -0400 |
commit | b3b4aa74b58bded927f579fff787fb6fa1c0393c (patch) | |
tree | 30dab4ab26558992dd8b6b212bef805de11c4c29 /fs/btrfs/relocation.c | |
parent | ba14419264684b290f0d0b7f48d26eafb11fc0c6 (diff) |
btrfs: drop unused parameter from btrfs_release_path
parameter tree root it's not used since commit
5f39d397dfbe140a14edecd4e73c34ce23c4f9ee ("Btrfs: Create extent_buffer
interface for large blocksizes")
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/relocation.c')
-rw-r--r-- | fs/btrfs/relocation.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 2097a88f60aa..f7b799b151aa 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -961,7 +961,7 @@ again: | |||
961 | lower = upper; | 961 | lower = upper; |
962 | upper = NULL; | 962 | upper = NULL; |
963 | } | 963 | } |
964 | btrfs_release_path(root, path2); | 964 | btrfs_release_path(path2); |
965 | next: | 965 | next: |
966 | if (ptr < end) { | 966 | if (ptr < end) { |
967 | ptr += btrfs_extent_inline_ref_size(key.type); | 967 | ptr += btrfs_extent_inline_ref_size(key.type); |
@@ -974,7 +974,7 @@ next: | |||
974 | if (ptr >= end) | 974 | if (ptr >= end) |
975 | path1->slots[0]++; | 975 | path1->slots[0]++; |
976 | } | 976 | } |
977 | btrfs_release_path(rc->extent_root, path1); | 977 | btrfs_release_path(path1); |
978 | 978 | ||
979 | cur->checked = 1; | 979 | cur->checked = 1; |
980 | WARN_ON(exist); | 980 | WARN_ON(exist); |
@@ -1749,7 +1749,7 @@ again: | |||
1749 | 1749 | ||
1750 | btrfs_node_key_to_cpu(path->nodes[level], &key, | 1750 | btrfs_node_key_to_cpu(path->nodes[level], &key, |
1751 | path->slots[level]); | 1751 | path->slots[level]); |
1752 | btrfs_release_path(src, path); | 1752 | btrfs_release_path(path); |
1753 | 1753 | ||
1754 | path->lowest_level = level; | 1754 | path->lowest_level = level; |
1755 | ret = btrfs_search_slot(trans, src, &key, path, 0, 1); | 1755 | ret = btrfs_search_slot(trans, src, &key, path, 0, 1); |
@@ -2496,7 +2496,7 @@ static int do_relocation(struct btrfs_trans_handle *trans, | |||
2496 | path->locks[upper->level] = 0; | 2496 | path->locks[upper->level] = 0; |
2497 | 2497 | ||
2498 | slot = path->slots[upper->level]; | 2498 | slot = path->slots[upper->level]; |
2499 | btrfs_release_path(NULL, path); | 2499 | btrfs_release_path(path); |
2500 | } else { | 2500 | } else { |
2501 | ret = btrfs_bin_search(upper->eb, key, upper->level, | 2501 | ret = btrfs_bin_search(upper->eb, key, upper->level, |
2502 | &slot); | 2502 | &slot); |
@@ -2737,7 +2737,7 @@ static int relocate_tree_block(struct btrfs_trans_handle *trans, | |||
2737 | } else { | 2737 | } else { |
2738 | path->lowest_level = node->level; | 2738 | path->lowest_level = node->level; |
2739 | ret = btrfs_search_slot(trans, root, key, path, 0, 1); | 2739 | ret = btrfs_search_slot(trans, root, key, path, 0, 1); |
2740 | btrfs_release_path(root, path); | 2740 | btrfs_release_path(path); |
2741 | if (ret > 0) | 2741 | if (ret > 0) |
2742 | ret = 0; | 2742 | ret = 0; |
2743 | } | 2743 | } |
@@ -3119,7 +3119,7 @@ static int add_tree_block(struct reloc_control *rc, | |||
3119 | #endif | 3119 | #endif |
3120 | } | 3120 | } |
3121 | 3121 | ||
3122 | btrfs_release_path(rc->extent_root, path); | 3122 | btrfs_release_path(path); |
3123 | 3123 | ||
3124 | BUG_ON(level == -1); | 3124 | BUG_ON(level == -1); |
3125 | 3125 | ||
@@ -3505,7 +3505,7 @@ int add_data_references(struct reloc_control *rc, | |||
3505 | } | 3505 | } |
3506 | path->slots[0]++; | 3506 | path->slots[0]++; |
3507 | } | 3507 | } |
3508 | btrfs_release_path(rc->extent_root, path); | 3508 | btrfs_release_path(path); |
3509 | if (err) | 3509 | if (err) |
3510 | free_block_list(blocks); | 3510 | free_block_list(blocks); |
3511 | return err; | 3511 | return err; |
@@ -3568,7 +3568,7 @@ next: | |||
3568 | EXTENT_DIRTY); | 3568 | EXTENT_DIRTY); |
3569 | 3569 | ||
3570 | if (ret == 0 && start <= key.objectid) { | 3570 | if (ret == 0 && start <= key.objectid) { |
3571 | btrfs_release_path(rc->extent_root, path); | 3571 | btrfs_release_path(path); |
3572 | rc->search_start = end + 1; | 3572 | rc->search_start = end + 1; |
3573 | } else { | 3573 | } else { |
3574 | rc->search_start = key.objectid + key.offset; | 3574 | rc->search_start = key.objectid + key.offset; |
@@ -3576,7 +3576,7 @@ next: | |||
3576 | return 0; | 3576 | return 0; |
3577 | } | 3577 | } |
3578 | } | 3578 | } |
3579 | btrfs_release_path(rc->extent_root, path); | 3579 | btrfs_release_path(path); |
3580 | return ret; | 3580 | return ret; |
3581 | } | 3581 | } |
3582 | 3582 | ||
@@ -3713,7 +3713,7 @@ restart: | |||
3713 | flags = BTRFS_EXTENT_FLAG_DATA; | 3713 | flags = BTRFS_EXTENT_FLAG_DATA; |
3714 | 3714 | ||
3715 | if (path_change) { | 3715 | if (path_change) { |
3716 | btrfs_release_path(rc->extent_root, path); | 3716 | btrfs_release_path(path); |
3717 | 3717 | ||
3718 | path->search_commit_root = 1; | 3718 | path->search_commit_root = 1; |
3719 | path->skip_locking = 1; | 3719 | path->skip_locking = 1; |
@@ -3736,7 +3736,7 @@ restart: | |||
3736 | (flags & BTRFS_EXTENT_FLAG_DATA)) { | 3736 | (flags & BTRFS_EXTENT_FLAG_DATA)) { |
3737 | ret = add_data_references(rc, &key, path, &blocks); | 3737 | ret = add_data_references(rc, &key, path, &blocks); |
3738 | } else { | 3738 | } else { |
3739 | btrfs_release_path(rc->extent_root, path); | 3739 | btrfs_release_path(path); |
3740 | ret = 0; | 3740 | ret = 0; |
3741 | } | 3741 | } |
3742 | if (ret < 0) { | 3742 | if (ret < 0) { |
@@ -3799,7 +3799,7 @@ restart: | |||
3799 | } | 3799 | } |
3800 | } | 3800 | } |
3801 | 3801 | ||
3802 | btrfs_release_path(rc->extent_root, path); | 3802 | btrfs_release_path(path); |
3803 | clear_extent_bits(&rc->processed_blocks, 0, (u64)-1, EXTENT_DIRTY, | 3803 | clear_extent_bits(&rc->processed_blocks, 0, (u64)-1, EXTENT_DIRTY, |
3804 | GFP_NOFS); | 3804 | GFP_NOFS); |
3805 | 3805 | ||
@@ -3867,7 +3867,7 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans, | |||
3867 | btrfs_set_inode_flags(leaf, item, BTRFS_INODE_NOCOMPRESS | | 3867 | btrfs_set_inode_flags(leaf, item, BTRFS_INODE_NOCOMPRESS | |
3868 | BTRFS_INODE_PREALLOC); | 3868 | BTRFS_INODE_PREALLOC); |
3869 | btrfs_mark_buffer_dirty(leaf); | 3869 | btrfs_mark_buffer_dirty(leaf); |
3870 | btrfs_release_path(root, path); | 3870 | btrfs_release_path(path); |
3871 | out: | 3871 | out: |
3872 | btrfs_free_path(path); | 3872 | btrfs_free_path(path); |
3873 | return ret; | 3873 | return ret; |
@@ -4109,7 +4109,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) | |||
4109 | } | 4109 | } |
4110 | leaf = path->nodes[0]; | 4110 | leaf = path->nodes[0]; |
4111 | btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); | 4111 | btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); |
4112 | btrfs_release_path(root->fs_info->tree_root, path); | 4112 | btrfs_release_path(path); |
4113 | 4113 | ||
4114 | if (key.objectid != BTRFS_TREE_RELOC_OBJECTID || | 4114 | if (key.objectid != BTRFS_TREE_RELOC_OBJECTID || |
4115 | key.type != BTRFS_ROOT_ITEM_KEY) | 4115 | key.type != BTRFS_ROOT_ITEM_KEY) |
@@ -4141,7 +4141,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) | |||
4141 | 4141 | ||
4142 | key.offset--; | 4142 | key.offset--; |
4143 | } | 4143 | } |
4144 | btrfs_release_path(root->fs_info->tree_root, path); | 4144 | btrfs_release_path(path); |
4145 | 4145 | ||
4146 | if (list_empty(&reloc_roots)) | 4146 | if (list_empty(&reloc_roots)) |
4147 | goto out; | 4147 | goto out; |