btrfs: replace btrfs_set_lock_blocking_rw with appropriate helpers
authorDavid Sterba <dsterba@suse.com>
Wed, 4 Apr 2018 00:00:17 +0000 (02:00 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 25 Feb 2019 13:13:27 +0000 (14:13 +0100)
We can use the right helper where the lock type is a fixed parameter.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/backref.c
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/locking.h
fs/btrfs/qgroup.c
fs/btrfs/ref-verify.c

index 78556447e1d5a203a2f087c3342d51cd61cc1134..136454dbb4afdde1330f07eae441392be18c0973 100644 (file)
@@ -1289,7 +1289,7 @@ again:
                                        goto out;
                                }
                                btrfs_tree_read_lock(eb);
                                        goto out;
                                }
                                btrfs_tree_read_lock(eb);
-                               btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+                               btrfs_set_lock_blocking_read(eb);
                                ret = find_extent_in_eb(eb, bytenr,
                                                        *extent_item_pos, &eie, ignore_offset);
                                btrfs_tree_read_unlock_blocking(eb);
                                ret = find_extent_in_eb(eb, bytenr,
                                                        *extent_item_pos, &eie, ignore_offset);
                                btrfs_tree_read_unlock_blocking(eb);
@@ -1650,7 +1650,7 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,
                /* make sure we can use eb after releasing the path */
                if (eb != eb_in) {
                        if (!path->skip_locking)
                /* make sure we can use eb after releasing the path */
                if (eb != eb_in) {
                        if (!path->skip_locking)
-                               btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+                               btrfs_set_lock_blocking_read(eb);
                        path->nodes[0] = NULL;
                        path->locks[0] = 0;
                }
                        path->nodes[0] = NULL;
                        path->locks[0] = 0;
                }
index 0f2c20e0b108937a464077cf7e4e23cd18f71bdb..75e0f737d7d2bf2b03aa82efaa09b20f1c5b0297 100644 (file)
@@ -1289,7 +1289,7 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
                return eb;
 
        btrfs_set_path_blocking(path);
                return eb;
 
        btrfs_set_path_blocking(path);
-       btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+       btrfs_set_lock_blocking_read(eb);
 
        if (tm->op == MOD_LOG_KEY_REMOVE_WHILE_FREEING) {
                BUG_ON(tm->slot != 0);
 
        if (tm->op == MOD_LOG_KEY_REMOVE_WHILE_FREEING) {
                BUG_ON(tm->slot != 0);
@@ -1379,7 +1379,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
                free_extent_buffer(eb_root);
                eb = alloc_dummy_extent_buffer(fs_info, logical);
        } else {
                free_extent_buffer(eb_root);
                eb = alloc_dummy_extent_buffer(fs_info, logical);
        } else {
-               btrfs_set_lock_blocking_rw(eb_root, BTRFS_READ_LOCK);
+               btrfs_set_lock_blocking_read(eb_root);
                eb = btrfs_clone_extent_buffer(eb_root);
                btrfs_tree_read_unlock_blocking(eb_root);
                free_extent_buffer(eb_root);
                eb = btrfs_clone_extent_buffer(eb_root);
                btrfs_tree_read_unlock_blocking(eb_root);
                free_extent_buffer(eb_root);
index 3d233608fa0f74ac09646761f6135f1bd7cf8079..74a696d9cd683fd47ca77fb5176a000e19e223e4 100644 (file)
@@ -342,7 +342,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
 
        if (need_lock) {
                btrfs_tree_read_lock(eb);
 
        if (need_lock) {
                btrfs_tree_read_lock(eb);
-               btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+               btrfs_set_lock_blocking_read(eb);
        }
 
        lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1,
        }
 
        lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1,
index 3f81d6900c71ec81d03b5ca6dc8bf52cafad607d..9d9f649e35ccf75714b0b1c83fa9e44ee86a3197 100644 (file)
@@ -53,7 +53,7 @@ static inline void btrfs_set_lock_blocking_rw(struct extent_buffer *eb, int rw)
 
 static inline void btrfs_set_lock_blocking(struct extent_buffer *eb)
 {
 
 static inline void btrfs_set_lock_blocking(struct extent_buffer *eb)
 {
-       btrfs_set_lock_blocking_rw(eb, BTRFS_WRITE_LOCK);
+       btrfs_set_lock_blocking_write(eb);
 }
 
 #endif
 }
 
 #endif
index ad041668ee3fd8e8ee595d06f17c0f2ba4938263..d316df95bec4e11d0230cdbd828b522a601c8aa9 100644 (file)
@@ -1832,7 +1832,7 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,
                        src_path->nodes[cur_level] = eb;
 
                        btrfs_tree_read_lock(eb);
                        src_path->nodes[cur_level] = eb;
 
                        btrfs_tree_read_lock(eb);
-                       btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+                       btrfs_set_lock_blocking_read(eb);
                        src_path->locks[cur_level] = BTRFS_READ_LOCK_BLOCKING;
                }
 
                        src_path->locks[cur_level] = BTRFS_READ_LOCK_BLOCKING;
                }
 
@@ -1973,7 +1973,7 @@ static int qgroup_trace_new_subtree_blocks(struct btrfs_trans_handle* trans,
                dst_path->slots[cur_level] = 0;
 
                btrfs_tree_read_lock(eb);
                dst_path->slots[cur_level] = 0;
 
                btrfs_tree_read_lock(eb);
-               btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+               btrfs_set_lock_blocking_read(eb);
                dst_path->locks[cur_level] = BTRFS_READ_LOCK_BLOCKING;
                need_cleanup = true;
        }
                dst_path->locks[cur_level] = BTRFS_READ_LOCK_BLOCKING;
                need_cleanup = true;
        }
@@ -2148,7 +2148,7 @@ walk_down:
                        path->slots[level] = 0;
 
                        btrfs_tree_read_lock(eb);
                        path->slots[level] = 0;
 
                        btrfs_tree_read_lock(eb);
-                       btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+                       btrfs_set_lock_blocking_read(eb);
                        path->locks[level] = BTRFS_READ_LOCK_BLOCKING;
 
                        ret = btrfs_qgroup_trace_extent(trans, child_bytenr,
                        path->locks[level] = BTRFS_READ_LOCK_BLOCKING;
 
                        ret = btrfs_qgroup_trace_extent(trans, child_bytenr,
index c3557c12656b1f5f7403ad50222c4741fe83d52f..d09b6cdb785a0a979a91d471e34844549d102df5 100644 (file)
@@ -583,7 +583,7 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path,
                                return -EIO;
                        }
                        btrfs_tree_read_lock(eb);
                                return -EIO;
                        }
                        btrfs_tree_read_lock(eb);
-                       btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+                       btrfs_set_lock_blocking_read(eb);
                        path->nodes[level-1] = eb;
                        path->slots[level-1] = 0;
                        path->locks[level-1] = BTRFS_READ_LOCK_BLOCKING;
                        path->nodes[level-1] = eb;
                        path->slots[level-1] = 0;
                        path->locks[level-1] = BTRFS_READ_LOCK_BLOCKING;
@@ -987,7 +987,7 @@ int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info)
                return -ENOMEM;
 
        eb = btrfs_read_lock_root_node(fs_info->extent_root);
                return -ENOMEM;
 
        eb = btrfs_read_lock_root_node(fs_info->extent_root);
-       btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+       btrfs_set_lock_blocking_read(eb);
        level = btrfs_header_level(eb);
        path->nodes[level] = eb;
        path->slots[level] = 0;
        level = btrfs_header_level(eb);
        path->nodes[level] = eb;
        path->slots[level] = 0;