korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: open code now trivial btrfs_set_lock_blocking

Browse Source 
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: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-04-04 02:03:48 +02:00
parent 300aa896e1
commit 8bead25820
8 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/btrfs/ctree.c
View File

@ -1487,8 +1487,8 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
search_start = buf->start & ~((u64)SZ_1G - 1); search_start = buf->start & ~((u64)SZ_1G - 1);
if (parent) if (parent)
btrfs_set_lock_blocking(parent); btrfs_set_lock_blocking_write(parent);
btrfs_set_lock_blocking(buf); btrfs_set_lock_blocking_write(buf);
/* /*
* Before CoWing this block for later modification, check if it's * 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) if (parent_nritems <= 1)
return 0; return 0;
btrfs_set_lock_blocking(parent); btrfs_set_lock_blocking_write(parent);
for (i = start_slot; i <= end_slot; i++) { for (i = start_slot; i <= end_slot; i++) {
struct btrfs_key first_key; struct btrfs_key first_key;
@ -1649,7 +1649,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
search_start = last_block; search_start = last_block;
btrfs_tree_lock(cur); btrfs_tree_lock(cur);
btrfs_set_lock_blocking(cur); btrfs_set_lock_blocking_write(cur);
err = __btrfs_cow_block(trans, root, cur, parent, i, err = __btrfs_cow_block(trans, root, cur, parent, i,
&cur, search_start, &cur, search_start,
min(16 * blocksize, min(16 * blocksize,
@ -1864,7 +1864,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
} }
btrfs_tree_lock(child); 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); ret = btrfs_cow_block(trans, root, child, mid, 0, &child);
if (ret) { if (ret) {
btrfs_tree_unlock(child); btrfs_tree_unlock(child);
@ -1902,7 +1902,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (left) { if (left) {
btrfs_tree_lock(left); btrfs_tree_lock(left);
btrfs_set_lock_blocking(left); btrfs_set_lock_blocking_write(left);
wret = btrfs_cow_block(trans, root, left, wret = btrfs_cow_block(trans, root, left,
parent, pslot - 1, &left); parent, pslot - 1, &left);
if (wret) { if (wret) {
@ -1917,7 +1917,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
if (right) { if (right) {
btrfs_tree_lock(right); btrfs_tree_lock(right);
btrfs_set_lock_blocking(right); btrfs_set_lock_blocking_write(right);
wret = btrfs_cow_block(trans, root, right, wret = btrfs_cow_block(trans, root, right,
parent, pslot + 1, &right); parent, pslot + 1, &right);
if (wret) { if (wret) {
@ -2080,7 +2080,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
u32 left_nr; u32 left_nr;
btrfs_tree_lock(left); btrfs_tree_lock(left);
btrfs_set_lock_blocking(left); btrfs_set_lock_blocking_write(left);
left_nr = btrfs_header_nritems(left); left_nr = btrfs_header_nritems(left);
if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) { 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; u32 right_nr;
btrfs_tree_lock(right); btrfs_tree_lock(right);
btrfs_set_lock_blocking(right); btrfs_set_lock_blocking_write(right);
right_nr = btrfs_header_nritems(right); right_nr = btrfs_header_nritems(right);
if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 1) { 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; return 1;
btrfs_tree_lock(right); btrfs_tree_lock(right);
btrfs_set_lock_blocking(right); btrfs_set_lock_blocking_write(right);
free_space = btrfs_leaf_free_space(fs_info, right); free_space = btrfs_leaf_free_space(fs_info, right);
if (free_space < data_size) if (free_space < data_size)
@ -4013,7 +4013,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
return 1; return 1;
btrfs_tree_lock(left); btrfs_tree_lock(left);
btrfs_set_lock_blocking(left); btrfs_set_lock_blocking_write(left);
free_space = btrfs_leaf_free_space(fs_info, left); free_space = btrfs_leaf_free_space(fs_info, left);
if (free_space < data_size) { if (free_space < data_size) {

2
fs/btrfs/disk-io.c
View File

@ -1121,7 +1121,7 @@ void clean_tree_block(struct btrfs_fs_info *fs_info,
-buf->len, -buf->len,
fs_info->dirty_metadata_batch); fs_info->dirty_metadata_batch);
/* ugh, clear_extent_buffer_dirty needs to lock the page */ /* 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); clear_extent_buffer_dirty(buf);
} }
} }

14
fs/btrfs/extent-tree.c
View File

@ -8502,7 +8502,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
clean_tree_block(fs_info, buf); clean_tree_block(fs_info, buf);
clear_bit(EXTENT_BUFFER_STALE, &buf->bflags); clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);
btrfs_set_lock_blocking(buf); btrfs_set_lock_blocking_write(buf);
set_extent_buffer_uptodate(buf); set_extent_buffer_uptodate(buf);
memzero_extent_buffer(buf, 0, sizeof(struct btrfs_header)); 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; reada = 1;
} }
btrfs_tree_lock(next); 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, ret = btrfs_lookup_extent_info(trans, fs_info, bytenr, level - 1, 1,
&wc->refs[level - 1], &wc->refs[level - 1],
@ -8987,7 +8987,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
return -EIO; return -EIO;
} }
btrfs_tree_lock(next); btrfs_tree_lock(next);
btrfs_set_lock_blocking(next); btrfs_set_lock_blocking_write(next);
} }
level--; level--;
@ -9099,7 +9099,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
if (!path->locks[level]) { if (!path->locks[level]) {
BUG_ON(level == 0); BUG_ON(level == 0);
btrfs_tree_lock(eb); btrfs_tree_lock(eb);
btrfs_set_lock_blocking(eb); btrfs_set_lock_blocking_write(eb);
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
ret = btrfs_lookup_extent_info(trans, fs_info, 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] && if (!path->locks[level] &&
btrfs_header_generation(eb) == trans->transid) { btrfs_header_generation(eb) == trans->transid) {
btrfs_tree_lock(eb); btrfs_tree_lock(eb);
btrfs_set_lock_blocking(eb); btrfs_set_lock_blocking_write(eb);
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
} }
clean_tree_block(fs_info, eb); 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) { if (btrfs_disk_key_objectid(&root_item->drop_progress) == 0) {
level = btrfs_header_level(root->node); level = btrfs_header_level(root->node);
path->nodes[level] = btrfs_lock_root_node(root); 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->slots[level] = 0;
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING; path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
memset(&wc->update_progress, 0, memset(&wc->update_progress, 0,
@ -9338,7 +9338,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
level = btrfs_header_level(root->node); level = btrfs_header_level(root->node);
while (1) { while (1) {
btrfs_tree_lock(path->nodes[level]); 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; path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
ret = btrfs_lookup_extent_info(trans, fs_info, ret = btrfs_lookup_extent_info(trans, fs_info,

5
fs/btrfs/locking.h
View File

@ -51,9 +51,4 @@ static inline void btrfs_set_lock_blocking_rw(struct extent_buffer *eb, int rw)
btrfs_set_lock_blocking_read(eb); btrfs_set_lock_blocking_read(eb);
} }
static inline void btrfs_set_lock_blocking(struct extent_buffer *eb)
{
btrfs_set_lock_blocking_write(eb);
}
#endif #endif

8
fs/btrfs/relocation.c
View File

@ -1777,7 +1777,7 @@ again:
btrfs_node_key_to_cpu(path->nodes[lowest_level], &key, slot); btrfs_node_key_to_cpu(path->nodes[lowest_level], &key, slot);
eb = btrfs_lock_root_node(dest); eb = btrfs_lock_root_node(dest);
btrfs_set_lock_blocking(eb); btrfs_set_lock_blocking_write(eb);
level = btrfs_header_level(eb); level = btrfs_header_level(eb);
if (level < lowest_level) { if (level < lowest_level) {
@ -1790,7 +1790,7 @@ again:
ret = btrfs_cow_block(trans, dest, eb, NULL, 0, &eb); ret = btrfs_cow_block(trans, dest, eb, NULL, 0, &eb);
BUG_ON(ret); BUG_ON(ret);
} }
btrfs_set_lock_blocking(eb); btrfs_set_lock_blocking_write(eb);
if (next_key) { if (next_key) {
next_key->objectid = (u64)-1; next_key->objectid = (u64)-1;
@ -1856,7 +1856,7 @@ again:
slot, &eb); slot, &eb);
BUG_ON(ret); BUG_ON(ret);
} }
btrfs_set_lock_blocking(eb); btrfs_set_lock_blocking_write(eb);
btrfs_tree_unlock(parent); btrfs_tree_unlock(parent);
free_extent_buffer(parent); free_extent_buffer(parent);
@ -2797,7 +2797,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,
goto next; goto next;
} }
btrfs_tree_lock(eb); btrfs_tree_lock(eb);
btrfs_set_lock_blocking(eb); btrfs_set_lock_blocking_write(eb);
if (!node->eb) { if (!node->eb) {
ret = btrfs_cow_block(trans, root, eb, upper->eb, ret = btrfs_cow_block(trans, root, eb, upper->eb,

2
fs/btrfs/transaction.c
View File

@ -1532,7 +1532,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
goto fail; goto fail;
} }
btrfs_set_lock_blocking(old); btrfs_set_lock_blocking_write(old);
ret = btrfs_copy_root(trans, root, old, &tmp, objectid); ret = btrfs_copy_root(trans, root, old, &tmp, objectid);
/* clean up in any case */ /* clean up in any case */

2
fs/btrfs/tree-defrag.c
View File

@ -52,7 +52,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
u32 nritems; u32 nritems;
root_node = btrfs_lock_root_node(root); root_node = btrfs_lock_root_node(root);
btrfs_set_lock_blocking(root_node); btrfs_set_lock_blocking_write(root_node);
nritems = btrfs_header_nritems(root_node); nritems = btrfs_header_nritems(root_node);
root->defrag_max.objectid = 0; root->defrag_max.objectid = 0;
/* from above we know this is not a leaf */ /* from above we know this is not a leaf */

6
fs/btrfs/tree-log.c
View File

@ -2663,7 +2663,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
if (trans) { if (trans) {
btrfs_tree_lock(next); btrfs_tree_lock(next);
btrfs_set_lock_blocking(next); btrfs_set_lock_blocking_write(next);
clean_tree_block(fs_info, next); clean_tree_block(fs_info, next);
btrfs_wait_tree_block_writeback(next); btrfs_wait_tree_block_writeback(next);
btrfs_tree_unlock(next); btrfs_tree_unlock(next);
@ -2747,7 +2747,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
if (trans) { if (trans) {
btrfs_tree_lock(next); btrfs_tree_lock(next);
btrfs_set_lock_blocking(next); btrfs_set_lock_blocking_write(next);
clean_tree_block(fs_info, next); clean_tree_block(fs_info, next);
btrfs_wait_tree_block_writeback(next); btrfs_wait_tree_block_writeback(next);
btrfs_tree_unlock(next); btrfs_tree_unlock(next);
@ -2829,7 +2829,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,
if (trans) { if (trans) {
btrfs_tree_lock(next); btrfs_tree_lock(next);
btrfs_set_lock_blocking(next); btrfs_set_lock_blocking_write(next);
clean_tree_block(fs_info, next); clean_tree_block(fs_info, next);
btrfs_wait_tree_block_writeback(next); btrfs_wait_tree_block_writeback(next);
btrfs_tree_unlock(next); btrfs_tree_unlock(next);