diff mbox series

[5.10,06/25] gfs2: report "already frozen/thawed" errors

Message ID	20210415144413.368809955@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Bob Peterson <rpeterso@redhat.com>, Andreas Gruenbacher <agruenba@redhat.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.10 06/25] gfs2: report "already frozen/thawed" errors Date: Thu, 15 Apr 2021 16:48:00 +0200 Message-Id: <20210415144413.368809955@linuxfoundation.org> In-Reply-To: <20210415144413.165663182@linuxfoundation.org> References: <20210415144413.165663182@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,02/25] gfs2: Flag a withdraw if init_threads() fails [5.10,03/25] KVM: arm64: Hide system instruction access to Trace registers [5.10,04/25] KVM: arm64: Disable guest access to trace filter controls [5.10,05/25] drm/imx: imx-ldb: fix out of bounds array access warning [5.10,06/25] gfs2: report "already frozen/thawed" errors [5.10,07/25] ftrace: Check if pages were allocated before calling free_pages() [5.10,08/25] tools/kvm_stat: Add restart delay [5.10,09/25] drm/tegra: dc: Dont set PLL clock to 0Hz [5.10,10/25] gpu: host1x: Use different lock classes for each client [5.10,11/25] XArray: Fix splitting to non-zero orders [5.10,13/25] block: only update parent bi_status when bio fail [5.10,14/25] radix tree test suite: Register the main thread with the RCU library [5.10,15/25] idr test suite: Take RCU read lock in idr_find_test_1 [5.10,16/25] idr test suite: Create anchor before launching throbber [5.10,17/25] null_blk: fix command timeout completion handling [5.10,18/25] io_uring: dont mark S_ISBLK async work as unbounded [5.10,19/25] riscv,entry: fix misaligned base for excp_vect_table [5.10,20/25] block: dont ignore REQ_NOWAIT for direct IO [5.10,21/25] netfilter: x_tables: fix compat match/target pad out-of-bound write [5.10,22/25] perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches [5.10,23/25] net: sfp: relax bitrate-derived mode check [5.10,24/25] net: sfp: cope with SFPs that set both LOS normal and LOS inverted [5.10,25/25] xen/events: fix setting irq affinity

Commit Message

Greg Kroah-Hartman April 15, 2021, 2:48 p.m. UTC

From: Bob Peterson <rpeterso@redhat.com>

[ Upstream commit ff132c5f93c06bd4432bbab5c369e468653bdec4 ]

Before this patch, gfs2's freeze function failed to report an error
when the target file system was already frozen as it should (and as
generic vfs function freeze_super does. Similarly, gfs2's thaw function
failed to report an error when trying to thaw a file system that is not
frozen, as vfs function thaw_super does. The errors were checked, but
it always returned a 0 return code.

This patch adds the missing error return codes to gfs2 freeze and thaw.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/gfs2/super.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 0581612dd91e..077dc8c035a8 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -769,11 +769,13 @@  void gfs2_freeze_func(struct work_struct *work)
 static int gfs2_freeze(struct super_block *sb)
 {
 	struct gfs2_sbd *sdp = sb->s_fs_info;
-	int error = 0;
+	int error;
 
 	mutex_lock(&sdp->sd_freeze_mutex);
-	if (atomic_read(&sdp->sd_freeze_state) != SFS_UNFROZEN)
+	if (atomic_read(&sdp->sd_freeze_state) != SFS_UNFROZEN) {
+		error = -EBUSY;
 		goto out;
+	}
 
 	for (;;) {
 		if (gfs2_withdrawn(sdp)) {
@@ -814,10 +816,10 @@  static int gfs2_unfreeze(struct super_block *sb)
 	struct gfs2_sbd *sdp = sb->s_fs_info;
 
 	mutex_lock(&sdp->sd_freeze_mutex);
-        if (atomic_read(&sdp->sd_freeze_state) != SFS_FROZEN ||
+	if (atomic_read(&sdp->sd_freeze_state) != SFS_FROZEN ||
 	    !gfs2_holder_initialized(&sdp->sd_freeze_gh)) {
 		mutex_unlock(&sdp->sd_freeze_mutex);
-                return 0;
+		return -EINVAL;
 	}
 
 	gfs2_freeze_unlock(&sdp->sd_freeze_gh);