Commit 8bead258 authored by David Sterba's avatar David Sterba
Browse files

btrfs: open code now trivial btrfs_set_lock_blocking 



btrfs_set_lock_blocking is now only a simple wrapper around
btrfs_set_lock_blocking_write. The name does not bring any semantic
value that could not be inferred from the new function so there's no
point keeping it.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 300aa896

fs/btrfs/ctree.c

+11 −11
Original line number Diff line number Diff line
@@ -1487,8 +1487,8 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans, 
	search_start = buf->start & ~((u64)SZ_1G - 1);



	if (parent)

		btrfs_set_lock_blocking(parent);

	btrfs_set_lock_blocking(buf);

		btrfs_set_lock_blocking_write(parent);

	btrfs_set_lock_blocking_write(buf);



	/*

	 * Before CoWing this block for later modification, check if it's
@@ -1590,7 +1590,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans, 
	if (parent_nritems <= 1)

		return 0;



	btrfs_set_lock_blocking(parent);

	btrfs_set_lock_blocking_write(parent);



	for (i = start_slot; i <= end_slot; i++) {

		struct btrfs_key first_key;
@@ -1649,7 +1649,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans, 
			search_start = last_block;



		btrfs_tree_lock(cur);

		btrfs_set_lock_blocking(cur);

		btrfs_set_lock_blocking_write(cur);

		err = __btrfs_cow_block(trans, root, cur, parent, i,

					&cur, search_start,

					min(16 * blocksize,
@@ -1864,7 +1864,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
		}



		btrfs_tree_lock(child);

		btrfs_set_lock_blocking(child);

		btrfs_set_lock_blocking_write(child);

		ret = btrfs_cow_block(trans, root, child, mid, 0, &child);

		if (ret) {

			btrfs_tree_unlock(child);
@@ -1902,7 +1902,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 


	if (left) {

		btrfs_tree_lock(left);

		btrfs_set_lock_blocking(left);

		btrfs_set_lock_blocking_write(left);

		wret = btrfs_cow_block(trans, root, left,

				       parent, pslot - 1, &left);

		if (wret) {
@@ -1917,7 +1917,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 


	if (right) {

		btrfs_tree_lock(right);

		btrfs_set_lock_blocking(right);

		btrfs_set_lock_blocking_write(right);

		wret = btrfs_cow_block(trans, root, right,

				       parent, pslot + 1, &right);

		if (wret) {
@@ -2080,7 +2080,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans, 
		u32 left_nr;



		btrfs_tree_lock(left);

		btrfs_set_lock_blocking(left);

		btrfs_set_lock_blocking_write(left);



		left_nr = btrfs_header_nritems(left);

		if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) {
@@ -2135,7 +2135,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans, 
		u32 right_nr;



		btrfs_tree_lock(right);

		btrfs_set_lock_blocking(right);

		btrfs_set_lock_blocking_write(right);



		right_nr = btrfs_header_nritems(right);

		if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) {
@@ -3779,7 +3779,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root 
		return 1;



	btrfs_tree_lock(right);

	btrfs_set_lock_blocking(right);

	btrfs_set_lock_blocking_write(right);



	free_space = btrfs_leaf_free_space(fs_info, right);

	if (free_space < data_size)
@@ -4013,7 +4013,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root 
		return 1;



	btrfs_tree_lock(left);

	btrfs_set_lock_blocking(left);

	btrfs_set_lock_blocking_write(left);



	free_space = btrfs_leaf_free_space(fs_info, left);

	if (free_space < data_size) {

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ void clean_tree_block(struct btrfs_fs_info *fs_info, 
						 -buf->len,

						 fs_info->dirty_metadata_batch);

			/* ugh, clear_extent_buffer_dirty needs to lock the page */

			btrfs_set_lock_blocking(buf);

			btrfs_set_lock_blocking_write(buf);

			clear_extent_buffer_dirty(buf);

		}

	}

fs/btrfs/extent-tree.c

+7 −7
Original line number Diff line number Diff line
@@ -8502,7 +8502,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
	clean_tree_block(fs_info, buf);

	clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);



	btrfs_set_lock_blocking(buf);

	btrfs_set_lock_blocking_write(buf);

	set_extent_buffer_uptodate(buf);



	memzero_extent_buffer(buf, 0, sizeof(struct btrfs_header));
@@ -8927,7 +8927,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
		reada = 1;

	}

	btrfs_tree_lock(next);

	btrfs_set_lock_blocking(next);

	btrfs_set_lock_blocking_write(next);



	ret = btrfs_lookup_extent_info(trans, fs_info, bytenr, level - 1, 1,

				       &wc->refs[level - 1],
@@ -8987,7 +8987,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
			return -EIO;

		}

		btrfs_tree_lock(next);

		btrfs_set_lock_blocking(next);

		btrfs_set_lock_blocking_write(next);

	}



	level--;
@@ -9099,7 +9099,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, 
		if (!path->locks[level]) {

			BUG_ON(level == 0);

			btrfs_tree_lock(eb);

			btrfs_set_lock_blocking(eb);

			btrfs_set_lock_blocking_write(eb);

			path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;



			ret = btrfs_lookup_extent_info(trans, fs_info,
@@ -9141,7 +9141,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, 
		if (!path->locks[level] &&

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

			btrfs_tree_lock(eb);

			btrfs_set_lock_blocking(eb);

			btrfs_set_lock_blocking_write(eb);

			path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;

		}

		clean_tree_block(fs_info, eb);
@@ -9308,7 +9308,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, 
	if (btrfs_disk_key_objectid(&root_item->drop_progress) == 0) {

		level = btrfs_header_level(root->node);

		path->nodes[level] = btrfs_lock_root_node(root);

		btrfs_set_lock_blocking(path->nodes[level]);

		btrfs_set_lock_blocking_write(path->nodes[level]);

		path->slots[level] = 0;

		path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;

		memset(&wc->update_progress, 0,
@@ -9338,7 +9338,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, 
		level = btrfs_header_level(root->node);

		while (1) {

			btrfs_tree_lock(path->nodes[level]);

			btrfs_set_lock_blocking(path->nodes[level]);

			btrfs_set_lock_blocking_write(path->nodes[level]);

			path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;



			ret = btrfs_lookup_extent_info(trans, fs_info,

fs/btrfs/locking.h

+0 −5
Original line number Diff line number Diff line
@@ -51,9 +51,4 @@ static inline void btrfs_set_lock_blocking_rw(struct extent_buffer *eb, int rw) 
		btrfs_set_lock_blocking_read(eb);

}



static inline void btrfs_set_lock_blocking(struct extent_buffer *eb)

{

	btrfs_set_lock_blocking_write(eb);

}



#endif

fs/btrfs/relocation.c

+4 −4
Original line number Diff line number Diff line
@@ -1777,7 +1777,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, 
	btrfs_node_key_to_cpu(path->nodes[lowest_level], &key, slot);



	eb = btrfs_lock_root_node(dest);

	btrfs_set_lock_blocking(eb);

	btrfs_set_lock_blocking_write(eb);

	level = btrfs_header_level(eb);



	if (level < lowest_level) {
@@ -1790,7 +1790,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, 
		ret = btrfs_cow_block(trans, dest, eb, NULL, 0, &eb);

		BUG_ON(ret);

	}

	btrfs_set_lock_blocking(eb);

	btrfs_set_lock_blocking_write(eb);



	if (next_key) {

		next_key->objectid = (u64)-1;
@@ -1856,7 +1856,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc, 
						      slot, &eb);

				BUG_ON(ret);

			}

			btrfs_set_lock_blocking(eb);

			btrfs_set_lock_blocking_write(eb);



			btrfs_tree_unlock(parent);

			free_extent_buffer(parent);
@@ -2797,7 +2797,7 @@ static int do_relocation(struct btrfs_trans_handle *trans, 
			goto next;

		}

		btrfs_tree_lock(eb);

		btrfs_set_lock_blocking(eb);

		btrfs_set_lock_blocking_write(eb);



		if (!node->eb) {

			ret = btrfs_cow_block(trans, root, eb, upper->eb,