Skip to content

Commit 65e99c4

Browse files
lorddoskiaskdave
authored andcommitted
btrfs: Don't assign retval of btrfs_try_tree_write_lock/btrfs_tree_read_lock_atomic
Those function are simple boolean predicates there is no need to assign their return values to interim variables. Use them directly as predicates. No functional changes. Signed-off-by: Nikolay Borisov <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent af024ed commit 65e99c4

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

fs/btrfs/ctree.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2913,15 +2913,13 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,
29132913
if (!p->skip_locking) {
29142914
level = btrfs_header_level(b);
29152915
if (level <= write_lock_level) {
2916-
err = btrfs_try_tree_write_lock(b);
2917-
if (!err) {
2916+
if (!btrfs_try_tree_write_lock(b)) {
29182917
btrfs_set_path_blocking(p);
29192918
btrfs_tree_lock(b);
29202919
}
29212920
p->locks[level] = BTRFS_WRITE_LOCK;
29222921
} else {
2923-
err = btrfs_tree_read_lock_atomic(b);
2924-
if (!err) {
2922+
if (!btrfs_tree_read_lock_atomic(b)) {
29252923
btrfs_set_path_blocking(p);
29262924
btrfs_tree_read_lock(b);
29272925
}
@@ -3055,8 +3053,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,
30553053
}
30563054

30573055
level = btrfs_header_level(b);
3058-
err = btrfs_tree_read_lock_atomic(b);
3059-
if (!err) {
3056+
if (!btrfs_tree_read_lock_atomic(b)) {
30603057
btrfs_set_path_blocking(p);
30613058
btrfs_tree_read_lock(b);
30623059
}

0 commit comments

Comments
 (0)