Skip to contentSkip to conversation

btrfs: extent-tree.c: Remove redundant variable from btrfs_cross_ref_exist()

PATCH In review Misono Tomohiro 2 participants 4 messages Aug 30, 2018 – Sep 7, 2018 1 message not in the archive Btrfs file system

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 btrfs: extent-tree.c: Remove redundant variable from btrfs_cross_ref_exist()

Since commit d7df2c796d7e ("Btrfs attach delayed ref updates to delayed ref heads"), check_delaed_ref() won't return -ENOENT.

In btrfs_cross_ref_exist(), two variable 'ret' and 'ret2' is originally used to handle -ENOENT error case.

Since the code is not needed anymore, let's just remove 'ret2'.

---
 fs/btrfs/extent-tree.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
fs/btrfs/extent-tree.c +2 -10
index 2d9074295d7f..0c87472d5719 100644
@@ -3139,7 +3139,6 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset,
 {
 	struct btrfs_path *path;
 	int ret;
-	int ret2;
 
 	path = btrfs_alloc_path();
 	if (!path)
@@ -3151,17 +3150,10 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset,
 		if (ret && ret != -ENOENT)
 			goto out;
 
-		ret2 = check_delayed_ref(root, path, objectid,
+		ret = check_delayed_ref(root, path, objectid,
 					 offset, bytenr);
-	} while (ret2 == -EAGAIN);
+	} while (ret == -EAGAIN);
 
-	if (ret2 && ret2 != -ENOENT) {
-		ret = ret2;
-		goto out;
-	}
-
-	if (ret != -ENOENT || ret2 != -ENOENT)
-		ret = 0;
 out:
 	btrfs_free_path(path);
 	if (root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID)
Signature · 1 line
2.17.1
#2 lore raw
Quoted 7 lines · Misono Tomohiro

Since commit d7df2c796d7e ("Btrfs attach delayed ref updates to delayed ref heads"), check_delaed_ref() won't return -ENOENT.

In btrfs_cross_ref_exist(), two variable 'ret' and 'ret2' is originally used to handle -ENOENT error case.

Since the code is not needed anymore, let's just remove 'ret2'.

Good cleanup and the patch would be ok as-is. I've noticed that check_delayed_ref now returns only two values so it might make sense to turn it to bool and update the name of check_delayed_ref to make it clear what the return value means in the loop.

The concern here is that adding another error code in check_delayed_ref in the future will not be caught in btrfs_cross_ref_exist. Adding an assert filtering only EAGAIN would be sufficient as this might miss the extra value in case it'd be an uncommon case.

#3 lore raw
Quoted 7 lines · David Sterba
Quoted 6 lines · Misono Tomohiro

Since commit d7df2c796d7e ("Btrfs attach delayed ref updates to delayed ref heads"), check_delaed_ref() won't return -ENOENT.

In btrfs_cross_ref_exist(), two variable 'ret' and 'ret2' is originally used to handle -ENOENT error case.

Quoted 6 lines
Quoted 1 line

Since the code is not needed anymore, let's just remove 'ret2'.

Good cleanup and the patch would be ok as-is. I've noticed that check_delayed_ref now returns only two values so it might make sense to turn it to bool and update the name of check_delayed_ref to make it clear what the return value means in the loop.

check_delaed_ref()'s return value is:
0 ... no cross ref found in delayed ref
1 ... cross ref found in delayed ref
-EAGAIN ... cannot acquire lock and try again later

so I don't think we can convert it to bool directly or do you mean we should handle -EAGAIN in check_delayed_ref()?

Quoted 4 lines

The concern here is that adding another error code in check_delayed_ref in the future will not be caught in btrfs_cross_ref_exist. Adding an assert filtering only EAGAIN would be sufficient as this might miss the extra value in case it'd be an uncommon case.

#4 lore raw
Quoted 15 lines · Misono Tomohiro
Quoted 7 lines · David Sterba
Quoted 6 lines · Misono Tomohiro

Since commit d7df2c796d7e ("Btrfs attach delayed ref updates to delayed ref heads"), check_delaed_ref() won't return -ENOENT.

In btrfs_cross_ref_exist(), two variable 'ret' and 'ret2' is originally used to handle -ENOENT error case.

Quoted 6 lines
Quoted 1 line

Since the code is not needed anymore, let's just remove 'ret2'.

Good cleanup and the patch would be ok as-is. I've noticed that check_delayed_ref now returns only two values so it might make sense to turn it to bool and update the name of check_delayed_ref to make it clear what the return value means in the loop.

Quoted 7 lines

check_delaed_ref()'s return value is:
0 ... no cross ref found in delayed ref
1 ... cross ref found in delayed ref
-EAGAIN ... cannot acquire lock and try again later

so I don't think we can convert it to bool directly or do you mean we should handle -EAGAIN in check_delayed_ref()?

Oh right, I missed there's ret = 1 in one of the branches, that makes my point moot.