Commit 190a8339 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

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: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f88fd650

fs/btrfs/ctree.c

+8 −8
Original line number Diff line number Diff line
@@ -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 {

fs/btrfs/disk-io.c

+3 −3
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, 


}



void btrfs_clean_tree_block(struct btrfs_trans_handle *trans,

void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,

			      struct extent_buffer *buf)

{

	struct btrfs_fs_info *fs_info = buf->fs_info;
@@ -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);

fs/btrfs/disk-io.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 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,

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);

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -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) {

fs/btrfs/free-space-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -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);