The 'out' label in __del_qgroup_relation only contains a direct return,
with no actual cleanup operations. Replace all 'goto out' statements
with direct return statements to improve readability.
Signed-off-by: Gladyshev Ilya <foxido@foxido.dev>
---
fs/btrfs/qgroup.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 31ad8580322a..9904bcfd3a60 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1600,10 +1600,8 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
int ret = 0;
int ret2;
- if (!fs_info->quota_root) {
- ret = -ENOTCONN;
- goto out;
- }
+ if (!fs_info->quota_root)
+ return -ENOTCONN;
member = find_qgroup_rb(fs_info, src);
parent = find_qgroup_rb(fs_info, dst);
@@ -1625,10 +1623,10 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
delete_item:
ret = del_qgroup_relation_item(trans, src, dst);
if (ret < 0 && ret != -ENOENT)
- goto out;
+ return ret;
ret2 = del_qgroup_relation_item(trans, dst, src);
if (ret2 < 0 && ret2 != -ENOENT)
- goto out;
+ return ret;
/* At least one deletion succeeded, return 0 */
if (!ret || !ret2)
@@ -1640,7 +1638,6 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
ret = quick_update_accounting(fs_info, src, dst, -1);
spin_unlock(&fs_info->qgroup_lock);
}
-out:
return ret;
}
--
2.51.1.dirty