From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Anand Jain <anand.jain@oracle.com>,
David Sterba <dsterba@suse.com>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.15.y 2/4] btrfs: rename ret to ret2 in btrfs_recover_relocation()
Date: Sun, 6 Sep 2026 12:18:19 -0400 [thread overview]
Message-ID: <20260906161821.1555270-2-sashal@kernel.org> (raw)
In-Reply-To: <20260906161821.1555270-1-sashal@kernel.org>
From: Anand Jain <anand.jain@oracle.com>
[ Upstream commit bd0d9a619a870f8c6745d2b4f57508bc5106e282 ]
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 <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Stable-dep-of: 6d8ba4572922 ("btrfs: drop recovered reloc root refs on recovery failure")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/btrfs/relocation.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 8e465849c26c3..7aeb3ece89bc8 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4207,7 +4207,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
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();
@@ -4342,9 +4342,9 @@ int btrfs_recover_relocation(struct btrfs_root *root)
}
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);
reloc_chunk_end(fs_info);
--
2.53.0
next prev parent reply other threads:[~2026-09-06 16:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-03 13:23 FAILED: patch "[PATCH] btrfs: drop recovered reloc root refs on recovery failure" failed to apply to 5.15-stable tree gregkh
2026-09-06 16:18 ` [PATCH 5.15.y 1/4] btrfs: rename ret to err in btrfs_recover_relocation() Sasha Levin
2026-09-06 16:18 ` Sasha Levin [this message]
2026-09-06 16:18 ` [PATCH 5.15.y 3/4] btrfs: rename err to ret " Sasha Levin
2026-09-06 16:18 ` [PATCH 5.15.y 4/4] btrfs: drop recovered reloc root refs on recovery failure Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260906161821.1555270-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=anand.jain@oracle.com \
--cc=dsterba@suse.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.