btrfs: rename btrfs_clean_tree_block to btrfs_clear_buffer_dirty

btrfs_clean_tree_block is a misnomer, it's just
clear_extent_buffer_dirty with some extra accounting around it.  Rename
this to btrfs_clear_buffer_dirty to make it more clear it belongs with
it's setter, btrfs_mark_buffer_dirty.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index cae2df92e3b0ecdeb141f75ac79c064eba41e244..118440857f3347b4e6ed86f2d0cb2327bffbeeb8 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -484,7 +484,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                        if (ret)
                                return ret;
                }
-               btrfs_clean_tree_block(trans, buf);
+               btrfs_clear_buffer_dirty(trans, buf);
                *last_ref = 1;
        }
        return 0;
@@ -1054,7 +1054,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
 
                path->locks[level] = 0;
                path->nodes[level] = NULL;
-               btrfs_clean_tree_block(trans, mid);
+               btrfs_clear_buffer_dirty(trans, mid);
                btrfs_tree_unlock(mid);
                /* once for the path */
                free_extent_buffer(mid);
@@ -1115,7 +1115,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                if (wret < 0 && wret != -ENOSPC)
                        ret = wret;
                if (btrfs_header_nritems(right) == 0) {
-                       btrfs_clean_tree_block(trans, right);
+                       btrfs_clear_buffer_dirty(trans, right);
                        btrfs_tree_unlock(right);
                        del_ptr(root, path, level + 1, pslot + 1);
                        root_sub_used(root, right->len);
@@ -1161,7 +1161,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
                BUG_ON(wret == 1);
        }
        if (btrfs_header_nritems(mid) == 0) {
-               btrfs_clean_tree_block(trans, mid);
+               btrfs_clear_buffer_dirty(trans, mid);
                btrfs_tree_unlock(mid);
                del_ptr(root, path, level + 1, pslot);
                root_sub_used(root, mid->len);
@@ -3140,7 +3140,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
        if (left_nritems)
                btrfs_mark_buffer_dirty(left);
        else
-               btrfs_clean_tree_block(trans, left);
+               btrfs_clear_buffer_dirty(trans, left);
 
        btrfs_mark_buffer_dirty(right);
 
@@ -3152,7 +3152,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
        if (path->slots[0] >= left_nritems) {
                path->slots[0] -= left_nritems;
                if (btrfs_header_nritems(path->nodes[0]) == 0)
-                       btrfs_clean_tree_block(trans, path->nodes[0]);
+                       btrfs_clear_buffer_dirty(trans, path->nodes[0]);
                btrfs_tree_unlock(path->nodes[0]);
                free_extent_buffer(path->nodes[0]);
                path->nodes[0] = right;
@@ -3365,7 +3365,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
        if (right_nritems)
                btrfs_mark_buffer_dirty(right);
        else
-               btrfs_clean_tree_block(trans, right);
+               btrfs_clear_buffer_dirty(trans, right);
 
        btrfs_item_key(right, &disk_key, 0);
        fixup_low_keys(path, &disk_key, 1);
@@ -4401,7 +4401,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                if (leaf == root->node) {
                        btrfs_set_header_level(leaf, 0);
                } else {
-                       btrfs_clean_tree_block(trans, leaf);
+                       btrfs_clear_buffer_dirty(trans, leaf);
                        btrfs_del_leaf(trans, root, path, leaf);
                }
        } else {

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index be9bb89723972df8ff4f16c6437cb7d85f38b940..2ef9e0b3a4258fd5870bba7b86ad0a0a2f74de2e 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -868,8 +868,8 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
 
 }
 
-void btrfs_clean_tree_block(struct btrfs_trans_handle *trans,
-                           struct extent_buffer *buf)
+void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,
+                             struct extent_buffer *buf)
 {
        struct btrfs_fs_info *fs_info = buf->fs_info;
        if (!trans || btrfs_header_generation(buf) == trans->transid) {
@@ -4998,7 +4998,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
 
                        btrfs_tree_lock(eb);
                        wait_on_extent_buffer_writeback(eb);
-                       btrfs_clean_tree_block(NULL, eb);
+                       btrfs_clear_buffer_dirty(NULL, eb);
                        btrfs_tree_unlock(eb);
 
                        free_extent_buffer_stale(eb);

diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index d5466f1846879a9dac3f2512f86199041786f838..4d5772330110233f7d6ac967cb3ba7c923d3e463 100644 (file)
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -39,8 +39,8 @@ struct extent_buffer *btrfs_find_create_tree_block(
                                                struct btrfs_fs_info *fs_info,
                                                u64 bytenr, u64 owner_root,
                                                int level);
-void btrfs_clean_tree_block(struct btrfs_trans_handle *trans,
-                           struct extent_buffer *buf);
+void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,
+                             struct extent_buffer *buf);
 void btrfs_clear_oneshot_options(struct btrfs_fs_info *fs_info);
 int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info);
 int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8465327f31c887cc29caf76220e5864b340ec580..824c657f59e8887b157e1c3672e6c1f3ae5b3373 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4838,7 +4838,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        btrfs_set_buffer_lockdep_class(lockdep_owner, buf, level);
 
        __btrfs_tree_lock(buf, nest);
-       btrfs_clean_tree_block(trans, buf);
+       btrfs_clear_buffer_dirty(trans, buf);
        clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);
        clear_bit(EXTENT_BUFFER_NO_CHECK, &buf->bflags);
 
@@ -5468,12 +5468,12 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
                                }
                        }
                }
-               /* make block locked assertion in btrfs_clean_tree_block happy */
+               /* Make block locked assertion in btrfs_clear_buffer_dirty happy. */
                if (!path->locks[level]) {
                        btrfs_tree_lock(eb);
                        path->locks[level] = BTRFS_WRITE_LOCK;
                }
-               btrfs_clean_tree_block(trans, eb);
+               btrfs_clear_buffer_dirty(trans, eb);
        }
 
        if (eb == root->node) {

diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index ab206af5b2f528b1f4ac5aa62c18ef9132f24450..4d155a48ec59d333bc97eac224398e5d1a7ac388 100644 (file)
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1283,7 +1283,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
        list_del(&free_space_root->dirty_list);
 
        btrfs_tree_lock(free_space_root->node);
-       btrfs_clean_tree_block(trans, free_space_root->node);
+       btrfs_clear_buffer_dirty(trans, free_space_root->node);
        btrfs_tree_unlock(free_space_root->node);
        btrfs_free_tree_block(trans, btrfs_root_id(free_space_root),
                              free_space_root->node, 0, 1);

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 5fdc09f7f1cb2864347599c8d6762e5302e8a229..8ea557e2225275cc5320f916d8efa93d46246bb4 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -707,7 +707,7 @@ static noinline int create_subvol(struct user_namespace *mnt_userns,
                 * exists).
                 */
                btrfs_tree_lock(leaf);
-               btrfs_clean_tree_block(trans, leaf);
+               btrfs_clear_buffer_dirty(trans, leaf);
                btrfs_tree_unlock(leaf);
                btrfs_free_tree_block(trans, objectid, leaf, 0, 1);
                free_extent_buffer(leaf);

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 450d8dd858b29c6beafc752ce05d2a82edd562c3..52a7d2fa2284f89ae063ee436578337abdae2ee8 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1304,7 +1304,7 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)
        list_del(&quota_root->dirty_list);
 
        btrfs_tree_lock(quota_root->node);
-       btrfs_clean_tree_block(trans, quota_root->node);
+       btrfs_clear_buffer_dirty(trans, quota_root->node);
        btrfs_tree_unlock(quota_root->node);
        btrfs_free_tree_block(trans, btrfs_root_id(quota_root),
                              quota_root->node, 0, 1);

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index a74acb341ef2625329130fa477e935438ff635de..0297379f1a703729372abc446f8c5989db8c4035 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2624,7 +2624,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
                                }
 
                                btrfs_tree_lock(next);
-                               btrfs_clean_tree_block(trans, next);
+                               btrfs_clear_buffer_dirty(trans, next);
                                btrfs_wait_tree_block_writeback(next);
                                btrfs_tree_unlock(next);
 
@@ -2693,7 +2693,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
                                next = path->nodes[*level];
 
                                btrfs_tree_lock(next);
-                               btrfs_clean_tree_block(trans, next);
+                               btrfs_clear_buffer_dirty(trans, next);
                                btrfs_wait_tree_block_writeback(next);
                                btrfs_tree_unlock(next);
 
@@ -2774,7 +2774,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,
                        next = path->nodes[orig_level];
 
                        btrfs_tree_lock(next);
-                       btrfs_clean_tree_block(trans, next);
+                       btrfs_clear_buffer_dirty(trans, next);
                        btrfs_wait_tree_block_writeback(next);
                        btrfs_tree_unlock(next);