diff options
author | David Sterba <dsterba@suse.com> | 2019-03-20 09:30:02 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2019-04-29 13:02:30 -0400 |
commit | 6a884d7d527f32b5ea80dc472968a5430ffee9f5 (patch) | |
tree | 145c56829a20df24567a7d85ef51597ef31deadc | |
parent | ed874f0db89724d0af1b4793fb518f640f333b0b (diff) |
btrfs: get fs_info from eb in clean_tree_block
We can read fs_info from extent buffer and can drop it from the
parameters.
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/ctree.c | 16 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 4 | ||||
-rw-r--r-- | fs/btrfs/disk-io.h | 2 | ||||
-rw-r--r-- | fs/btrfs/extent-tree.c | 6 | ||||
-rw-r--r-- | fs/btrfs/free-space-tree.c | 2 | ||||
-rw-r--r-- | fs/btrfs/qgroup.c | 2 | ||||
-rw-r--r-- | fs/btrfs/tree-log.c | 6 |
7 files changed, 19 insertions, 19 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index b83627a372b1..76e57a8c98df 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -970,7 +970,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, | |||
970 | if (ret) | 970 | if (ret) |
971 | return ret; | 971 | return ret; |
972 | } | 972 | } |
973 | clean_tree_block(fs_info, buf); | 973 | btrfs_clean_tree_block(buf); |
974 | *last_ref = 1; | 974 | *last_ref = 1; |
975 | } | 975 | } |
976 | return 0; | 976 | return 0; |
@@ -1888,7 +1888,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, | |||
1888 | 1888 | ||
1889 | path->locks[level] = 0; | 1889 | path->locks[level] = 0; |
1890 | path->nodes[level] = NULL; | 1890 | path->nodes[level] = NULL; |
1891 | clean_tree_block(fs_info, mid); | 1891 | btrfs_clean_tree_block(mid); |
1892 | btrfs_tree_unlock(mid); | 1892 | btrfs_tree_unlock(mid); |
1893 | /* once for the path */ | 1893 | /* once for the path */ |
1894 | free_extent_buffer(mid); | 1894 | free_extent_buffer(mid); |
@@ -1949,7 +1949,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, | |||
1949 | if (wret < 0 && wret != -ENOSPC) | 1949 | if (wret < 0 && wret != -ENOSPC) |
1950 | ret = wret; | 1950 | ret = wret; |
1951 | if (btrfs_header_nritems(right) == 0) { | 1951 | if (btrfs_header_nritems(right) == 0) { |
1952 | clean_tree_block(fs_info, right); | 1952 | btrfs_clean_tree_block(right); |
1953 | btrfs_tree_unlock(right); | 1953 | btrfs_tree_unlock(right); |
1954 | del_ptr(root, path, level + 1, pslot + 1); | 1954 | del_ptr(root, path, level + 1, pslot + 1); |
1955 | root_sub_used(root, right->len); | 1955 | root_sub_used(root, right->len); |
@@ -1994,7 +1994,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, | |||
1994 | BUG_ON(wret == 1); | 1994 | BUG_ON(wret == 1); |
1995 | } | 1995 | } |
1996 | if (btrfs_header_nritems(mid) == 0) { | 1996 | if (btrfs_header_nritems(mid) == 0) { |
1997 | clean_tree_block(fs_info, mid); | 1997 | btrfs_clean_tree_block(mid); |
1998 | btrfs_tree_unlock(mid); | 1998 | btrfs_tree_unlock(mid); |
1999 | del_ptr(root, path, level + 1, pslot); | 1999 | del_ptr(root, path, level + 1, pslot); |
2000 | root_sub_used(root, mid->len); | 2000 | root_sub_used(root, mid->len); |
@@ -3704,7 +3704,7 @@ static noinline int __push_leaf_right(struct btrfs_fs_info *fs_info, | |||
3704 | if (left_nritems) | 3704 | if (left_nritems) |
3705 | btrfs_mark_buffer_dirty(left); | 3705 | btrfs_mark_buffer_dirty(left); |
3706 | else | 3706 | else |
3707 | clean_tree_block(fs_info, left); | 3707 | btrfs_clean_tree_block(left); |
3708 | 3708 | ||
3709 | btrfs_mark_buffer_dirty(right); | 3709 | btrfs_mark_buffer_dirty(right); |
3710 | 3710 | ||
@@ -3716,7 +3716,7 @@ static noinline int __push_leaf_right(struct btrfs_fs_info *fs_info, | |||
3716 | if (path->slots[0] >= left_nritems) { | 3716 | if (path->slots[0] >= left_nritems) { |
3717 | path->slots[0] -= left_nritems; | 3717 | path->slots[0] -= left_nritems; |
3718 | if (btrfs_header_nritems(path->nodes[0]) == 0) | 3718 | if (btrfs_header_nritems(path->nodes[0]) == 0) |
3719 | clean_tree_block(fs_info, path->nodes[0]); | 3719 | btrfs_clean_tree_block(path->nodes[0]); |
3720 | btrfs_tree_unlock(path->nodes[0]); | 3720 | btrfs_tree_unlock(path->nodes[0]); |
3721 | free_extent_buffer(path->nodes[0]); | 3721 | free_extent_buffer(path->nodes[0]); |
3722 | path->nodes[0] = right; | 3722 | path->nodes[0] = right; |
@@ -3944,7 +3944,7 @@ static noinline int __push_leaf_left(struct btrfs_fs_info *fs_info, | |||
3944 | if (right_nritems) | 3944 | if (right_nritems) |
3945 | btrfs_mark_buffer_dirty(right); | 3945 | btrfs_mark_buffer_dirty(right); |
3946 | else | 3946 | else |
3947 | clean_tree_block(fs_info, right); | 3947 | btrfs_clean_tree_block(right); |
3948 | 3948 | ||
3949 | btrfs_item_key(right, &disk_key, 0); | 3949 | btrfs_item_key(right, &disk_key, 0); |
3950 | fixup_low_keys(path, &disk_key, 1); | 3950 | fixup_low_keys(path, &disk_key, 1); |
@@ -5005,7 +5005,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, | |||
5005 | btrfs_set_header_level(leaf, 0); | 5005 | btrfs_set_header_level(leaf, 0); |
5006 | } else { | 5006 | } else { |
5007 | btrfs_set_path_blocking(path); | 5007 | btrfs_set_path_blocking(path); |
5008 | clean_tree_block(fs_info, leaf); | 5008 | btrfs_clean_tree_block(leaf); |
5009 | btrfs_del_leaf(trans, root, path, leaf); | 5009 | btrfs_del_leaf(trans, root, path, leaf); |
5010 | } | 5010 | } |
5011 | } else { | 5011 | } else { |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index ab7e2c5ba556..64978fc36745 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1107,9 +1107,9 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, | |||
1107 | 1107 | ||
1108 | } | 1108 | } |
1109 | 1109 | ||
1110 | void clean_tree_block(struct btrfs_fs_info *fs_info, | 1110 | void btrfs_clean_tree_block(struct extent_buffer *buf) |
1111 | struct extent_buffer *buf) | ||
1112 | { | 1111 | { |
1112 | struct btrfs_fs_info *fs_info = buf->fs_info; | ||
1113 | if (btrfs_header_generation(buf) == | 1113 | if (btrfs_header_generation(buf) == |
1114 | fs_info->running_transaction->transid) { | 1114 | fs_info->running_transaction->transid) { |
1115 | btrfs_assert_tree_locked(buf); | 1115 | btrfs_assert_tree_locked(buf); |
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index a94ce82a2be0..917634f2bae9 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h | |||
@@ -51,7 +51,7 @@ int reada_tree_block_flagged(struct btrfs_fs_info *fs_info, u64 bytenr, | |||
51 | struct extent_buffer *btrfs_find_create_tree_block( | 51 | struct extent_buffer *btrfs_find_create_tree_block( |
52 | struct btrfs_fs_info *fs_info, | 52 | struct btrfs_fs_info *fs_info, |
53 | u64 bytenr); | 53 | u64 bytenr); |
54 | void clean_tree_block(struct btrfs_fs_info *fs_info, struct extent_buffer *buf); | 54 | void btrfs_clean_tree_block(struct extent_buffer *buf); |
55 | int open_ctree(struct super_block *sb, | 55 | int open_ctree(struct super_block *sb, |
56 | struct btrfs_fs_devices *fs_devices, | 56 | struct btrfs_fs_devices *fs_devices, |
57 | char *options); | 57 | char *options); |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 44fd4553004b..aa52b0995fba 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -8557,7 +8557,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, | |||
8557 | 8557 | ||
8558 | btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level); | 8558 | btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level); |
8559 | btrfs_tree_lock(buf); | 8559 | btrfs_tree_lock(buf); |
8560 | clean_tree_block(fs_info, buf); | 8560 | btrfs_clean_tree_block(buf); |
8561 | clear_bit(EXTENT_BUFFER_STALE, &buf->bflags); | 8561 | clear_bit(EXTENT_BUFFER_STALE, &buf->bflags); |
8562 | 8562 | ||
8563 | btrfs_set_lock_blocking_write(buf); | 8563 | btrfs_set_lock_blocking_write(buf); |
@@ -9252,14 +9252,14 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, | |||
9252 | ret); | 9252 | ret); |
9253 | } | 9253 | } |
9254 | } | 9254 | } |
9255 | /* make block locked assertion in clean_tree_block happy */ | 9255 | /* make block locked assertion in btrfs_clean_tree_block happy */ |
9256 | if (!path->locks[level] && | 9256 | if (!path->locks[level] && |
9257 | btrfs_header_generation(eb) == trans->transid) { | 9257 | btrfs_header_generation(eb) == trans->transid) { |
9258 | btrfs_tree_lock(eb); | 9258 | btrfs_tree_lock(eb); |
9259 | btrfs_set_lock_blocking_write(eb); | 9259 | btrfs_set_lock_blocking_write(eb); |
9260 | path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; | 9260 | path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; |
9261 | } | 9261 | } |
9262 | clean_tree_block(fs_info, eb); | 9262 | btrfs_clean_tree_block(eb); |
9263 | } | 9263 | } |
9264 | 9264 | ||
9265 | if (eb == root->node) { | 9265 | if (eb == root->node) { |
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c index e5089087eaa6..4859e09d2af0 100644 --- a/fs/btrfs/free-space-tree.c +++ b/fs/btrfs/free-space-tree.c | |||
@@ -1248,7 +1248,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info) | |||
1248 | list_del(&free_space_root->dirty_list); | 1248 | list_del(&free_space_root->dirty_list); |
1249 | 1249 | ||
1250 | btrfs_tree_lock(free_space_root->node); | 1250 | btrfs_tree_lock(free_space_root->node); |
1251 | clean_tree_block(fs_info, free_space_root->node); | 1251 | btrfs_clean_tree_block(free_space_root->node); |
1252 | btrfs_tree_unlock(free_space_root->node); | 1252 | btrfs_tree_unlock(free_space_root->node); |
1253 | btrfs_free_tree_block(trans, free_space_root, free_space_root->node, | 1253 | btrfs_free_tree_block(trans, free_space_root, free_space_root->node, |
1254 | 0, 1); | 1254 | 0, 1); |
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index e659d9d61107..95361ccaa488 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
@@ -1101,7 +1101,7 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info) | |||
1101 | list_del("a_root->dirty_list); | 1101 | list_del("a_root->dirty_list); |
1102 | 1102 | ||
1103 | btrfs_tree_lock(quota_root->node); | 1103 | btrfs_tree_lock(quota_root->node); |
1104 | clean_tree_block(fs_info, quota_root->node); | 1104 | btrfs_clean_tree_block(quota_root->node); |
1105 | btrfs_tree_unlock(quota_root->node); | 1105 | btrfs_tree_unlock(quota_root->node); |
1106 | btrfs_free_tree_block(trans, quota_root, quota_root->node, 0, 1); | 1106 | btrfs_free_tree_block(trans, quota_root, quota_root->node, 0, 1); |
1107 | 1107 | ||
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 4cb61cb72c4e..79f75bec9f40 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -2736,7 +2736,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans, | |||
2736 | if (trans) { | 2736 | if (trans) { |
2737 | btrfs_tree_lock(next); | 2737 | btrfs_tree_lock(next); |
2738 | btrfs_set_lock_blocking_write(next); | 2738 | btrfs_set_lock_blocking_write(next); |
2739 | clean_tree_block(fs_info, next); | 2739 | btrfs_clean_tree_block(next); |
2740 | btrfs_wait_tree_block_writeback(next); | 2740 | btrfs_wait_tree_block_writeback(next); |
2741 | btrfs_tree_unlock(next); | 2741 | btrfs_tree_unlock(next); |
2742 | } else { | 2742 | } else { |
@@ -2820,7 +2820,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans, | |||
2820 | if (trans) { | 2820 | if (trans) { |
2821 | btrfs_tree_lock(next); | 2821 | btrfs_tree_lock(next); |
2822 | btrfs_set_lock_blocking_write(next); | 2822 | btrfs_set_lock_blocking_write(next); |
2823 | clean_tree_block(fs_info, next); | 2823 | btrfs_clean_tree_block(next); |
2824 | btrfs_wait_tree_block_writeback(next); | 2824 | btrfs_wait_tree_block_writeback(next); |
2825 | btrfs_tree_unlock(next); | 2825 | btrfs_tree_unlock(next); |
2826 | } else { | 2826 | } else { |
@@ -2902,7 +2902,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans, | |||
2902 | if (trans) { | 2902 | if (trans) { |
2903 | btrfs_tree_lock(next); | 2903 | btrfs_tree_lock(next); |
2904 | btrfs_set_lock_blocking_write(next); | 2904 | btrfs_set_lock_blocking_write(next); |
2905 | clean_tree_block(fs_info, next); | 2905 | btrfs_clean_tree_block(next); |
2906 | btrfs_wait_tree_block_writeback(next); | 2906 | btrfs_wait_tree_block_writeback(next); |
2907 | btrfs_tree_unlock(next); | 2907 | btrfs_tree_unlock(next); |
2908 | } else { | 2908 | } else { |