Skip to content

Commit 8bead25

Browse files
kdavekdave
committed
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: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 300aa89 commit 8bead25

File tree

8 files changed

+28
-33
lines changed

8 files changed

+28
-33
lines changed

‎fs/btrfs/ctree.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,8 +1487,8 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
14871487
search_start = buf->start & ~((u64)SZ_1G - 1);
14881488

14891489
if (parent)
1490-
btrfs_set_lock_blocking(parent);
1491-
btrfs_set_lock_blocking(buf);
1490+
btrfs_set_lock_blocking_write(parent);
1491+
btrfs_set_lock_blocking_write(buf);
14921492

14931493
/*
14941494
* Before CoWing this block for later modification, check if it's
@@ -1590,7 +1590,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
15901590
if (parent_nritems <= 1)
15911591
return 0;
15921592

1593-
btrfs_set_lock_blocking(parent);
1593+
btrfs_set_lock_blocking_write(parent);
15941594

15951595
for (i = start_slot; i <= end_slot; i++) {
15961596
struct btrfs_key first_key;
@@ -1649,7 +1649,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
16491649
search_start = last_block;
16501650

16511651
btrfs_tree_lock(cur);
1652-
btrfs_set_lock_blocking(cur);
1652+
btrfs_set_lock_blocking_write(cur);
16531653
err = __btrfs_cow_block(trans, root, cur, parent, i,
16541654
&cur, search_start,
16551655
min(16 * blocksize,
@@ -1864,7 +1864,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
18641864
}
18651865

18661866
btrfs_tree_lock(child);
1867-
btrfs_set_lock_blocking(child);
1867+
btrfs_set_lock_blocking_write(child);
18681868
ret = btrfs_cow_block(trans, root, child, mid, 0, &child);
18691869
if (ret) {
18701870
btrfs_tree_unlock(child);
@@ -1902,7 +1902,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
19021902

19031903
if (left) {
19041904
btrfs_tree_lock(left);
1905-
btrfs_set_lock_blocking(left);
1905+
btrfs_set_lock_blocking_write(left);
19061906
wret = btrfs_cow_block(trans, root, left,
19071907
parent, pslot - 1, &left);
19081908
if (wret) {
@@ -1917,7 +1917,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans,
19171917

19181918
if (right) {
19191919
btrfs_tree_lock(right);
1920-
btrfs_set_lock_blocking(right);
1920+
btrfs_set_lock_blocking_write(right);
19211921
wret = btrfs_cow_block(trans, root, right,
19221922
parent, pslot + 1, &right);
19231923
if (wret) {
@@ -2080,7 +2080,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,
20802080
u32 left_nr;
20812081

20822082
btrfs_tree_lock(left);
2083-
btrfs_set_lock_blocking(left);
2083+
btrfs_set_lock_blocking_write(left);
20842084

20852085
left_nr = btrfs_header_nritems(left);
20862086
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,
21352135
u32 right_nr;
21362136

21372137
btrfs_tree_lock(right);
2138-
btrfs_set_lock_blocking(right);
2138+
btrfs_set_lock_blocking_write(right);
21392139

21402140
right_nr = btrfs_header_nritems(right);
21412141
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
37793779
return 1;
37803780

37813781
btrfs_tree_lock(right);
3782-
btrfs_set_lock_blocking(right);
3782+
btrfs_set_lock_blocking_write(right);
37833783

37843784
free_space = btrfs_leaf_free_space(fs_info, right);
37853785
if (free_space < data_size)
@@ -4013,7 +4013,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
40134013
return 1;
40144014

40154015
btrfs_tree_lock(left);
4016-
btrfs_set_lock_blocking(left);
4016+
btrfs_set_lock_blocking_write(left);
40174017

40184018
free_space = btrfs_leaf_free_space(fs_info, left);
40194019
if (free_space < data_size) {

‎fs/btrfs/disk-io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ void clean_tree_block(struct btrfs_fs_info *fs_info,
11211121
-buf->len,
11221122
fs_info->dirty_metadata_batch);
11231123
/* ugh, clear_extent_buffer_dirty needs to lock the page */
1124-
btrfs_set_lock_blocking(buf);
1124+
btrfs_set_lock_blocking_write(buf);
11251125
clear_extent_buffer_dirty(buf);
11261126
}
11271127
}

‎fs/btrfs/extent-tree.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8502,7 +8502,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
85028502
clean_tree_block(fs_info, buf);
85038503
clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);
85048504

8505-
btrfs_set_lock_blocking(buf);
8505+
btrfs_set_lock_blocking_write(buf);
85068506
set_extent_buffer_uptodate(buf);
85078507

85088508
memzero_extent_buffer(buf, 0, sizeof(struct btrfs_header));
@@ -8927,7 +8927,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
89278927
reada = 1;
89288928
}
89298929
btrfs_tree_lock(next);
8930-
btrfs_set_lock_blocking(next);
8930+
btrfs_set_lock_blocking_write(next);
89318931

89328932
ret = btrfs_lookup_extent_info(trans, fs_info, bytenr, level - 1, 1,
89338933
&wc->refs[level - 1],
@@ -8987,7 +8987,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
89878987
return -EIO;
89888988
}
89898989
btrfs_tree_lock(next);
8990-
btrfs_set_lock_blocking(next);
8990+
btrfs_set_lock_blocking_write(next);
89918991
}
89928992

89938993
level--;
@@ -9099,7 +9099,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
90999099
if (!path->locks[level]) {
91009100
BUG_ON(level == 0);
91019101
btrfs_tree_lock(eb);
9102-
btrfs_set_lock_blocking(eb);
9102+
btrfs_set_lock_blocking_write(eb);
91039103
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
91049104

91059105
ret = btrfs_lookup_extent_info(trans, fs_info,
@@ -9141,7 +9141,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
91419141
if (!path->locks[level] &&
91429142
btrfs_header_generation(eb) == trans->transid) {
91439143
btrfs_tree_lock(eb);
9144-
btrfs_set_lock_blocking(eb);
9144+
btrfs_set_lock_blocking_write(eb);
91459145
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
91469146
}
91479147
clean_tree_block(fs_info, eb);
@@ -9308,7 +9308,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
93089308
if (btrfs_disk_key_objectid(&root_item->drop_progress) == 0) {
93099309
level = btrfs_header_level(root->node);
93109310
path->nodes[level] = btrfs_lock_root_node(root);
9311-
btrfs_set_lock_blocking(path->nodes[level]);
9311+
btrfs_set_lock_blocking_write(path->nodes[level]);
93129312
path->slots[level] = 0;
93139313
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
93149314
memset(&wc->update_progress, 0,
@@ -9338,7 +9338,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
93389338
level = btrfs_header_level(root->node);
93399339
while (1) {
93409340
btrfs_tree_lock(path->nodes[level]);
9341-
btrfs_set_lock_blocking(path->nodes[level]);
9341+
btrfs_set_lock_blocking_write(path->nodes[level]);
93429342
path->locks[level] = BTRFS_WRITE_LOCK_BLOCKING;
93439343

93449344
ret = btrfs_lookup_extent_info(trans, fs_info,

‎fs/btrfs/locking.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,4 @@ static inline void btrfs_set_lock_blocking_rw(struct extent_buffer *eb, int rw)
5151
btrfs_set_lock_blocking_read(eb);
5252
}
5353

54-
static inline void btrfs_set_lock_blocking(struct extent_buffer *eb)
55-
{
56-
btrfs_set_lock_blocking_write(eb);
57-
}
58-
5954
#endif

‎fs/btrfs/relocation.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
17771777
btrfs_node_key_to_cpu(path->nodes[lowest_level], &key, slot);
17781778

17791779
eb = btrfs_lock_root_node(dest);
1780-
btrfs_set_lock_blocking(eb);
1780+
btrfs_set_lock_blocking_write(eb);
17811781
level = btrfs_header_level(eb);
17821782

17831783
if (level < lowest_level) {
@@ -1790,7 +1790,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
17901790
ret = btrfs_cow_block(trans, dest, eb, NULL, 0, &eb);
17911791
BUG_ON(ret);
17921792
}
1793-
btrfs_set_lock_blocking(eb);
1793+
btrfs_set_lock_blocking_write(eb);
17941794

17951795
if (next_key) {
17961796
next_key->objectid = (u64)-1;
@@ -1856,7 +1856,7 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,
18561856
slot, &eb);
18571857
BUG_ON(ret);
18581858
}
1859-
btrfs_set_lock_blocking(eb);
1859+
btrfs_set_lock_blocking_write(eb);
18601860

18611861
btrfs_tree_unlock(parent);
18621862
free_extent_buffer(parent);
@@ -2797,7 +2797,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,
27972797
goto next;
27982798
}
27992799
btrfs_tree_lock(eb);
2800-
btrfs_set_lock_blocking(eb);
2800+
btrfs_set_lock_blocking_write(eb);
28012801

28022802
if (!node->eb) {
28032803
ret = btrfs_cow_block(trans, root, eb, upper->eb,

‎fs/btrfs/transaction.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
15321532
goto fail;
15331533
}
15341534

1535-
btrfs_set_lock_blocking(old);
1535+
btrfs_set_lock_blocking_write(old);
15361536

15371537
ret = btrfs_copy_root(trans, root, old, &tmp, objectid);
15381538
/* clean up in any case */

‎fs/btrfs/tree-defrag.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
5252
u32 nritems;
5353

5454
root_node = btrfs_lock_root_node(root);
55-
btrfs_set_lock_blocking(root_node);
55+
btrfs_set_lock_blocking_write(root_node);
5656
nritems = btrfs_header_nritems(root_node);
5757
root->defrag_max.objectid = 0;
5858
/* from above we know this is not a leaf */

‎fs/btrfs/tree-log.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2663,7 +2663,7 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
26632663

26642664
if (trans) {
26652665
btrfs_tree_lock(next);
2666-
btrfs_set_lock_blocking(next);
2666+
btrfs_set_lock_blocking_write(next);
26672667
clean_tree_block(fs_info, next);
26682668
btrfs_wait_tree_block_writeback(next);
26692669
btrfs_tree_unlock(next);
@@ -2747,7 +2747,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
27472747

27482748
if (trans) {
27492749
btrfs_tree_lock(next);
2750-
btrfs_set_lock_blocking(next);
2750+
btrfs_set_lock_blocking_write(next);
27512751
clean_tree_block(fs_info, next);
27522752
btrfs_wait_tree_block_writeback(next);
27532753
btrfs_tree_unlock(next);
@@ -2829,7 +2829,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,
28292829

28302830
if (trans) {
28312831
btrfs_tree_lock(next);
2832-
btrfs_set_lock_blocking(next);
2832+
btrfs_set_lock_blocking_write(next);
28332833
clean_tree_block(fs_info, next);
28342834
btrfs_wait_tree_block_writeback(next);
28352835
btrfs_tree_unlock(next);

0 commit comments

Comments
 (0)