From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Alexey Velichayshiy <a.velichayshiy@ispras.ru>,
Andreas Gruenbacher <agruenba@redhat.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 6.12.y] gfs2: fix freeze error handling
Date: Mon, 29 Dec 2025 17:33:32 -0500 [thread overview]
Message-ID: <20251229223332.1744624-1-sashal@kernel.org> (raw)
In-Reply-To: <2025122906-preshow-nearest-b359@gregkh>
From: Alexey Velichayshiy <a.velichayshiy@ispras.ru>
[ Upstream commit 4cfc7d5a4a01d2133b278cdbb1371fba1b419174 ]
After commit b77b4a4815a9 ("gfs2: Rework freeze / thaw logic"),
the freeze error handling is broken because gfs2_do_thaw()
overwrites the 'error' variable, causing incorrect processing
of the original freeze error.
Fix this by calling gfs2_do_thaw() when gfs2_lock_fs_check_clean()
fails but ignoring its return value to preserve the original
freeze error for proper reporting.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: b77b4a4815a9 ("gfs2: Rework freeze / thaw logic")
Cc: stable@vger.kernel.org # v6.5+
Signed-off-by: Alexey Velichayshiy <a.velichayshiy@ispras.ru>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
[ gfs2_do_thaw() only takes 2 params ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/gfs2/super.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 3b1303f97a3b..e6f8be03190c 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -759,9 +759,7 @@ static int gfs2_freeze_super(struct super_block *sb, enum freeze_holder who)
break;
}
- error = gfs2_do_thaw(sdp, who);
- if (error)
- goto out;
+ (void)gfs2_do_thaw(sdp, who);
if (error == -EBUSY)
fs_err(sdp, "waiting for recovery before freeze\n");
--
2.51.0
prev parent reply other threads:[~2025-12-29 22:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-29 11:40 FAILED: patch "[PATCH] gfs2: fix freeze error handling" failed to apply to 6.12-stable tree gregkh
2025-12-29 22:33 ` Sasha Levin [this message]
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=20251229223332.1744624-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=a.velichayshiy@ispras.ru \
--cc=agruenba@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox