]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: Don't assign retval of btrfs_try_tree_write_lock/btrfs_tree_read_lock_atomic
authorNikolay Borisov <nborisov@suse.com>
Wed, 4 Sep 2019 17:22:39 +0000 (20:22 +0300)
committerDavid Sterba <dsterba@suse.com>
Mon, 9 Sep 2019 12:59:20 +0000 (14:59 +0200)
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 <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.c

index 98f741c8590558e070f6bfd53b562bb7db4915c7..e59cde204b2fe8322bee2ee07599083e6f210147 100644 (file)
@@ -2913,15 +2913,13 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                        if (!p->skip_locking) {
                                level = btrfs_header_level(b);
                                if (level <= write_lock_level) {
-                                       err = btrfs_try_tree_write_lock(b);
-                                       if (!err) {
+                                       if (!btrfs_try_tree_write_lock(b)) {
                                                btrfs_set_path_blocking(p);
                                                btrfs_tree_lock(b);
                                        }
                                        p->locks[level] = BTRFS_WRITE_LOCK;
                                } else {
-                                       err = btrfs_tree_read_lock_atomic(b);
-                                       if (!err) {
+                                       if (!btrfs_tree_read_lock_atomic(b)) {
                                                btrfs_set_path_blocking(p);
                                                btrfs_tree_read_lock(b);
                                        }
@@ -3055,8 +3053,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,
                        }
 
                        level = btrfs_header_level(b);
-                       err = btrfs_tree_read_lock_atomic(b);
-                       if (!err) {
+                       if (!btrfs_tree_read_lock_atomic(b)) {
                                btrfs_set_path_blocking(p);
                                btrfs_tree_read_lock(b);
                        }