From: Anand Jain Date: Fri, 10 May 2024 07:17:23 +0000 (+0800) Subject: btrfs: rename ret to ret2 in btrfs_recover_relocation() X-Git-Tag: v6.11-rc1~157^2~97 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd0d9a619a870f8c6745d2b4f57508bc5106e282;p=thirdparty%2Flinux.git btrfs: rename ret to ret2 in btrfs_recover_relocation() A preparatory patch to rename 'err' to 'ret', but ret is already used as an intermediary return value, so first rename 'ret' to 'ret2'. Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index e0cb67a62d89f..db99d0f9f999a 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4220,7 +4220,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) struct extent_buffer *leaf; struct reloc_control *rc = NULL; struct btrfs_trans_handle *trans; - int ret; + int ret2; int err = 0; path = btrfs_alloc_path(); @@ -4355,9 +4355,9 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) } err = btrfs_commit_transaction(trans); out_clean: - ret = clean_dirty_subvols(rc); - if (ret < 0 && !err) - err = ret; + ret2 = clean_dirty_subvols(rc); + if (ret2 < 0 && !err) + err = ret2; out_unset: unset_reloc_control(rc); out_end: