Skip to contentSkip to conversation

btrfs: Don't assign retval of btrfs_try_tree_write_lock/btrfs_tree_read_lock_atomic

PATCH Superseded Nikolay Borisov 2 participants 3 messages Sep 4, 2019 – Sep 5, 2019 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 fs/btrfs/ctree.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
fs/btrfs/ctree.c +2 -4
index 98f741c85905..b0d1151f62e1 100644
@@ -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);
 					}
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 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.

---
V2:
* Missed one call site in btrfs_search_old_slot.

 fs/btrfs/ctree.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
fs/btrfs/ctree.c +3 -6
index 98f741c85905..e59cde204b2f 100644
@@ -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);
 			}
Signature · 1 line
2.17.1
#2 lore raw
Quoted 5 lines · Nikolay Borisov

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.

Added to misc-next, thanks.