Commit 6a884d7d authored by David Sterba's avatar David Sterba
Browse files

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: default avatarDavid Sterba <dsterba@suse.com>
parent ed874f0d

fs/btrfs/ctree.c

+8 −8
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
			if (ret)

				return ret;

		}

		clean_tree_block(fs_info, buf);

		btrfs_clean_tree_block(buf);

		*last_ref = 1;

	}

	return 0;
@@ -1888,7 +1888,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 


		path->locks[level] = 0;

		path->nodes[level] = NULL;

		clean_tree_block(fs_info, mid);

		btrfs_clean_tree_block(mid);

		btrfs_tree_unlock(mid);

		/* once for the path */

		free_extent_buffer(mid);
@@ -1949,7 +1949,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
		if (wret < 0 && wret != -ENOSPC)

			ret = wret;

		if (btrfs_header_nritems(right) == 0) {

			clean_tree_block(fs_info, right);

			btrfs_clean_tree_block(right);

			btrfs_tree_unlock(right);

			del_ptr(root, path, level + 1, pslot + 1);

			root_sub_used(root, right->len);
@@ -1994,7 +1994,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
		BUG_ON(wret == 1);

	}

	if (btrfs_header_nritems(mid) == 0) {

		clean_tree_block(fs_info, mid);

		btrfs_clean_tree_block(mid);

		btrfs_tree_unlock(mid);

		del_ptr(root, path, level + 1, pslot);

		root_sub_used(root, mid->len);
@@ -3704,7 +3704,7 @@ static noinline int __push_leaf_right(struct btrfs_fs_info *fs_info, 
	if (left_nritems)

		btrfs_mark_buffer_dirty(left);

	else

		clean_tree_block(fs_info, left);

		btrfs_clean_tree_block(left);



	btrfs_mark_buffer_dirty(right);
@@ -3716,7 +3716,7 @@ static noinline int __push_leaf_right(struct btrfs_fs_info *fs_info, 
	if (path->slots[0] >= left_nritems) {

		path->slots[0] -= left_nritems;

		if (btrfs_header_nritems(path->nodes[0]) == 0)

			clean_tree_block(fs_info, path->nodes[0]);

			btrfs_clean_tree_block(path->nodes[0]);

		btrfs_tree_unlock(path->nodes[0]);

		free_extent_buffer(path->nodes[0]);

		path->nodes[0] = right;
@@ -3944,7 +3944,7 @@ static noinline int __push_leaf_left(struct btrfs_fs_info *fs_info, 
	if (right_nritems)

		btrfs_mark_buffer_dirty(right);

	else

		clean_tree_block(fs_info, right);

		btrfs_clean_tree_block(right);



	btrfs_item_key(right, &disk_key, 0);

	fixup_low_keys(path, &disk_key, 1);
@@ -5005,7 +5005,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
			btrfs_set_header_level(leaf, 0);

		} else {

			btrfs_set_path_blocking(path);

			clean_tree_block(fs_info, leaf);

			btrfs_clean_tree_block(leaf);

			btrfs_del_leaf(trans, root, path, leaf);

		}

	} else {

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -1107,9 +1107,9 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, 


}



void clean_tree_block(struct btrfs_fs_info *fs_info,

		      struct extent_buffer *buf)

void btrfs_clean_tree_block(struct extent_buffer *buf)

{

	struct btrfs_fs_info *fs_info = buf->fs_info;

	if (btrfs_header_generation(buf) ==

	    fs_info->running_transaction->transid) {

		btrfs_assert_tree_locked(buf);

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ int reada_tree_block_flagged(struct btrfs_fs_info *fs_info, u64 bytenr, 
struct extent_buffer *btrfs_find_create_tree_block(

						struct btrfs_fs_info *fs_info,

						u64 bytenr);

void clean_tree_block(struct btrfs_fs_info *fs_info, struct extent_buffer *buf);

void btrfs_clean_tree_block(struct extent_buffer *buf);

int open_ctree(struct super_block *sb,

	       struct btrfs_fs_devices *fs_devices,

	       char *options);

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -8557,7 +8557,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, 


	btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level);

	btrfs_tree_lock(buf);

	clean_tree_block(fs_info, buf);

	btrfs_clean_tree_block(buf);

	clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);



	btrfs_set_lock_blocking_write(buf);
@@ -9252,14 +9252,14 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, 
					     ret);

			}

		}

		/* make block locked assertion in clean_tree_block happy */

		/* make block locked assertion in btrfs_clean_tree_block happy */

		if (!path->locks[level] &&

		    btrfs_header_generation(eb) == trans->transid) {

			btrfs_tree_lock(eb);

			btrfs_set_lock_blocking_write(eb);

			path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;

		}

		clean_tree_block(fs_info, eb);

		btrfs_clean_tree_block(eb);

	}



	if (eb == root->node) {

fs/btrfs/free-space-tree.c

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

	clean_tree_block(fs_info, free_space_root->node);

	btrfs_clean_tree_block(free_space_root->node);

	btrfs_tree_unlock(free_space_root->node);

	btrfs_free_tree_block(trans, free_space_root, free_space_root->node,

			      0, 1);