aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-02-10 12:47:57 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-17 06:03:51 -0500
commit7c302b49dd757b03d12bec772e1d1f462684c991 (patch)
tree1d07f0cb882a878005e1ea6771b1756267a0bae2
parente27f62652b89d0701d87112339f286ebf24ffc8c (diff)
btrfs: remove unused parameter from clean_tree_block
Added but never needed. Reviewed-by: Liu Bo <bo.li.liu@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/ctree.c16
-rw-r--r--fs/btrfs/disk-io.c3
-rw-r--r--fs/btrfs/disk-io.h3
-rw-r--r--fs/btrfs/extent-tree.c4
-rw-r--r--fs/btrfs/free-space-tree.c2
-rw-r--r--fs/btrfs/qgroup.c2
-rw-r--r--fs/btrfs/tree-log.c6
7 files changed, 17 insertions, 19 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 35e22349c139..d509dafdb20c 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1074,7 +1074,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
1074 ret = btrfs_dec_ref(trans, root, buf, 1); 1074 ret = btrfs_dec_ref(trans, root, buf, 1);
1075 BUG_ON(ret); /* -ENOMEM */ 1075 BUG_ON(ret); /* -ENOMEM */
1076 } 1076 }
1077 clean_tree_block(trans, fs_info, buf); 1077 clean_tree_block(fs_info, buf);
1078 *last_ref = 1; 1078 *last_ref = 1;
1079 } 1079 }
1080 return 0; 1080 return 0;
@@ -1938,7 +1938,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
1938 1938
1939 path->locks[level] = 0; 1939 path->locks[level] = 0;
1940 path->nodes[level] = NULL; 1940 path->nodes[level] = NULL;
1941 clean_tree_block(trans, fs_info, mid); 1941 clean_tree_block(fs_info, mid);
1942 btrfs_tree_unlock(mid); 1942 btrfs_tree_unlock(mid);
1943 /* once for the path */ 1943 /* once for the path */
1944 free_extent_buffer(mid); 1944 free_extent_buffer(mid);
@@ -1999,7 +1999,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
1999 if (wret < 0 && wret != -ENOSPC) 1999 if (wret < 0 && wret != -ENOSPC)
2000 ret = wret; 2000 ret = wret;
2001 if (btrfs_header_nritems(right) == 0) { 2001 if (btrfs_header_nritems(right) == 0) {
2002 clean_tree_block(trans, fs_info, right); 2002 clean_tree_block(fs_info, right);
2003 btrfs_tree_unlock(right); 2003 btrfs_tree_unlock(right);
2004 del_ptr(root, path, level + 1, pslot + 1); 2004 del_ptr(root, path, level + 1, pslot + 1);
2005 root_sub_used(root, right->len); 2005 root_sub_used(root, right->len);
@@ -2043,7 +2043,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
2043 BUG_ON(wret == 1); 2043 BUG_ON(wret == 1);
2044 } 2044 }
2045 if (btrfs_header_nritems(mid) == 0) { 2045 if (btrfs_header_nritems(mid) == 0) {
2046 clean_tree_block(trans, fs_info, mid); 2046 clean_tree_block(fs_info, mid);
2047 btrfs_tree_unlock(mid); 2047 btrfs_tree_unlock(mid);
2048 del_ptr(root, path, level + 1, pslot); 2048 del_ptr(root, path, level + 1, pslot);
2049 root_sub_used(root, mid->len); 2049 root_sub_used(root, mid->len);
@@ -3705,7 +3705,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
3705 if (left_nritems) 3705 if (left_nritems)
3706 btrfs_mark_buffer_dirty(left); 3706 btrfs_mark_buffer_dirty(left);
3707 else 3707 else
3708 clean_tree_block(trans, fs_info, left); 3708 clean_tree_block(fs_info, left);
3709 3709
3710 btrfs_mark_buffer_dirty(right); 3710 btrfs_mark_buffer_dirty(right);
3711 3711
@@ -3717,7 +3717,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
3717 if (path->slots[0] >= left_nritems) { 3717 if (path->slots[0] >= left_nritems) {
3718 path->slots[0] -= left_nritems; 3718 path->slots[0] -= left_nritems;
3719 if (btrfs_header_nritems(path->nodes[0]) == 0) 3719 if (btrfs_header_nritems(path->nodes[0]) == 0)
3720 clean_tree_block(trans, fs_info, path->nodes[0]); 3720 clean_tree_block(fs_info, path->nodes[0]);
3721 btrfs_tree_unlock(path->nodes[0]); 3721 btrfs_tree_unlock(path->nodes[0]);
3722 free_extent_buffer(path->nodes[0]); 3722 free_extent_buffer(path->nodes[0]);
3723 path->nodes[0] = right; 3723 path->nodes[0] = right;
@@ -3946,7 +3946,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
3946 if (right_nritems) 3946 if (right_nritems)
3947 btrfs_mark_buffer_dirty(right); 3947 btrfs_mark_buffer_dirty(right);
3948 else 3948 else
3949 clean_tree_block(trans, fs_info, right); 3949 clean_tree_block(fs_info, right);
3950 3950
3951 btrfs_item_key(right, &disk_key, 0); 3951 btrfs_item_key(right, &disk_key, 0);
3952 fixup_low_keys(fs_info, path, &disk_key, 1); 3952 fixup_low_keys(fs_info, path, &disk_key, 1);
@@ -5009,7 +5009,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
5009 btrfs_set_header_level(leaf, 0); 5009 btrfs_set_header_level(leaf, 0);
5010 } else { 5010 } else {
5011 btrfs_set_path_blocking(path); 5011 btrfs_set_path_blocking(path);
5012 clean_tree_block(trans, fs_info, leaf); 5012 clean_tree_block(fs_info, leaf);
5013 btrfs_del_leaf(trans, root, path, leaf); 5013 btrfs_del_leaf(trans, root, path, leaf);
5014 } 5014 }
5015 } else { 5015 } else {
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 89cd597883fd..48846d215e97 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1248,8 +1248,7 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
1248 1248
1249} 1249}
1250 1250
1251void clean_tree_block(struct btrfs_trans_handle *trans, 1251void clean_tree_block(struct btrfs_fs_info *fs_info,
1252 struct btrfs_fs_info *fs_info,
1253 struct extent_buffer *buf) 1252 struct extent_buffer *buf)
1254{ 1253{
1255 if (btrfs_header_generation(buf) == 1254 if (btrfs_header_generation(buf) ==
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 44dcd9af6b7c..1864e7ce9c70 100644
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -52,8 +52,7 @@ int reada_tree_block_flagged(struct btrfs_fs_info *fs_info, u64 bytenr,
52struct extent_buffer *btrfs_find_create_tree_block( 52struct extent_buffer *btrfs_find_create_tree_block(
53 struct btrfs_fs_info *fs_info, 53 struct btrfs_fs_info *fs_info,
54 u64 bytenr); 54 u64 bytenr);
55void clean_tree_block(struct btrfs_trans_handle *trans, 55void clean_tree_block(struct btrfs_fs_info *fs_info, struct extent_buffer *buf);
56 struct btrfs_fs_info *fs_info, struct extent_buffer *buf);
57int open_ctree(struct super_block *sb, 56int open_ctree(struct super_block *sb,
58 struct btrfs_fs_devices *fs_devices, 57 struct btrfs_fs_devices *fs_devices,
59 char *options); 58 char *options);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 6a7f991e7ae7..fcb134f46fdb 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8254,7 +8254,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
8254 btrfs_set_header_generation(buf, trans->transid); 8254 btrfs_set_header_generation(buf, trans->transid);
8255 btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level); 8255 btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level);
8256 btrfs_tree_lock(buf); 8256 btrfs_tree_lock(buf);
8257 clean_tree_block(trans, fs_info, buf); 8257 clean_tree_block(fs_info, buf);
8258 clear_bit(EXTENT_BUFFER_STALE, &buf->bflags); 8258 clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);
8259 8259
8260 btrfs_set_lock_blocking(buf); 8260 btrfs_set_lock_blocking(buf);
@@ -8875,7 +8875,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
8875 btrfs_set_lock_blocking(eb); 8875 btrfs_set_lock_blocking(eb);
8876 path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; 8876 path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
8877 } 8877 }
8878 clean_tree_block(trans, fs_info, eb); 8878 clean_tree_block(fs_info, eb);
8879 } 8879 }
8880 8880
8881 if (eb == root->node) { 8881 if (eb == root->node) {
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index ff0c55337c2e..dd7fb22a955a 100644
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1269,7 +1269,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
1269 list_del(&free_space_root->dirty_list); 1269 list_del(&free_space_root->dirty_list);
1270 1270
1271 btrfs_tree_lock(free_space_root->node); 1271 btrfs_tree_lock(free_space_root->node);
1272 clean_tree_block(trans, fs_info, free_space_root->node); 1272 clean_tree_block(fs_info, free_space_root->node);
1273 btrfs_tree_unlock(free_space_root->node); 1273 btrfs_tree_unlock(free_space_root->node);
1274 btrfs_free_tree_block(trans, free_space_root, free_space_root->node, 1274 btrfs_free_tree_block(trans, free_space_root, free_space_root->node,
1275 0, 1); 1275 0, 1);
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 366a21ae2249..043c6c92c798 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1019,7 +1019,7 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans,
1019 list_del(&quota_root->dirty_list); 1019 list_del(&quota_root->dirty_list);
1020 1020
1021 btrfs_tree_lock(quota_root->node); 1021 btrfs_tree_lock(quota_root->node);
1022 clean_tree_block(trans, fs_info, quota_root->node); 1022 clean_tree_block(fs_info, quota_root->node);
1023 btrfs_tree_unlock(quota_root->node); 1023 btrfs_tree_unlock(quota_root->node);
1024 btrfs_free_tree_block(trans, quota_root, quota_root->node, 0, 1); 1024 btrfs_free_tree_block(trans, quota_root, quota_root->node, 0, 1);
1025 1025
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 010cf7685677..cea93ba1f099 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2472,7 +2472,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
2472 if (trans) { 2472 if (trans) {
2473 btrfs_tree_lock(next); 2473 btrfs_tree_lock(next);
2474 btrfs_set_lock_blocking(next); 2474 btrfs_set_lock_blocking(next);
2475 clean_tree_block(trans, fs_info, next); 2475 clean_tree_block(fs_info, next);
2476 btrfs_wait_tree_block_writeback(next); 2476 btrfs_wait_tree_block_writeback(next);
2477 btrfs_tree_unlock(next); 2477 btrfs_tree_unlock(next);
2478 } 2478 }
@@ -2552,7 +2552,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
2552 if (trans) { 2552 if (trans) {
2553 btrfs_tree_lock(next); 2553 btrfs_tree_lock(next);
2554 btrfs_set_lock_blocking(next); 2554 btrfs_set_lock_blocking(next);
2555 clean_tree_block(trans, fs_info, next); 2555 clean_tree_block(fs_info, next);
2556 btrfs_wait_tree_block_writeback(next); 2556 btrfs_wait_tree_block_writeback(next);
2557 btrfs_tree_unlock(next); 2557 btrfs_tree_unlock(next);
2558 } 2558 }
@@ -2630,7 +2630,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,
2630 if (trans) { 2630 if (trans) {
2631 btrfs_tree_lock(next); 2631 btrfs_tree_lock(next);
2632 btrfs_set_lock_blocking(next); 2632 btrfs_set_lock_blocking(next);
2633 clean_tree_block(trans, fs_info, next); 2633 clean_tree_block(fs_info, next);
2634 btrfs_wait_tree_block_writeback(next); 2634 btrfs_wait_tree_block_writeback(next);
2635 btrfs_tree_unlock(next); 2635 btrfs_tree_unlock(next);
2636 } 2636 }