cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Bob Peterson <rpeterso@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [GFS2 v4 PATCH 06/25] gfs2: simplify gfs2_freeze by removing case
Date: Wed, 15 May 2019 14:37:59 -0500	[thread overview]
Message-ID: <20190515193818.7642-7-rpeterso@redhat.com> (raw)
In-Reply-To: <20190515193818.7642-1-rpeterso@redhat.com>

Function gfs2_freeze had a case statement that simply checked the
error code, but the break statements just made the logic hard to
read. This patch simplifies the logic in favor of a simple if.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
---
 fs/gfs2/super.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 01137635fb44..6e3a318edccd 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1026,20 +1026,14 @@ static int gfs2_freeze(struct super_block *sb)
 		if (!error)
 			break;
 
-		switch (error) {
-		case -EBUSY:
+		if (error == -EBUSY)
 			fs_err(sdp, "waiting for recovery before freeze\n");
-			break;
-
-		default:
+		else
 			fs_err(sdp, "error freezing FS: %d\n", error);
-			break;
-		}
 
 		fs_err(sdp, "retrying...\n");
 		msleep(1000);
 	}
-	error = 0;
 	set_bit(SDF_FS_FROZEN, &sdp->sd_flags);
 out:
 	mutex_unlock(&sdp->sd_freeze_mutex);
-- 
2.20.1



  parent reply	other threads:[~2019-05-15 19:37 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-15 19:37 [Cluster-devel] [GFS2 v4 PATCH 00/25] gfs2: misc recovery patch collection Bob Peterson
2019-05-15 19:37 ` [Cluster-devel] [GFS2 v4 PATCH 01/25] gfs2: kthread and remount improvements Bob Peterson
2019-05-15 19:37 ` [Cluster-devel] [GFS2 v4 PATCH 02/25] gfs2: eliminate tr_num_revoke_rm Bob Peterson
2019-05-15 19:37 ` [Cluster-devel] [GFS2 v4 PATCH 03/25] gfs2: log which portion of the journal is replayed Bob Peterson
2019-05-15 19:37 ` [Cluster-devel] [GFS2 v4 PATCH 04/25] gfs2: Warn when a journal replay overwrites a rgrp with buffers Bob Peterson
2019-05-15 19:37 ` [Cluster-devel] [GFS2 v4 PATCH 05/25] gfs2: Change SDF_SHUTDOWN to SDF_WITHDRAWN Bob Peterson
2019-05-15 19:37 ` Bob Peterson [this message]
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 07/25] gfs2: dump fsid when dumping glock problems Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 08/25] gfs2: replace more printk with calls to fs_info and friends Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 09/25] gfs2: Introduce concept of a pending withdraw Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 10/25] gfs2: log error reform Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 11/25] gfs2: Only complain the first time an io error occurs in quota or log Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 12/25] gfs2: Stop ail1 wait loop when withdrawn Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 13/25] gfs2: Ignore dlm recovery requests if gfs2 is withdrawn Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 14/25] gfs2: move check_journal_clean to util.c for future use Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 15/25] gfs2: Allow some glocks to be used during withdraw Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 16/25] gfs2: Don't loop forever in gfs2_freeze if withdrawn Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 17/25] gfs2: Make secondary withdrawers wait for first withdrawer Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 18/25] gfs2: Don't write log headers after file system withdraw Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 19/25] gfs2: Force withdraw to replay journals and wait for it to finish Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 20/25] gfs2: Add verbose option to check_journal_clean Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 21/25] gfs2: Abort gfs2_freeze if io error is seen Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 22/25] gfs2: Check if holding freeze glock when making fs ro Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 23/25] gfs2: Issue revokes more intelligently Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 24/25] gfs2: Prepare to withdraw as soon as an IO error occurs in log write Bob Peterson
2019-05-15 19:38 ` [Cluster-devel] [GFS2 v4 PATCH 25/25] gfs2: Check for log write errors before telling dlm to unlock Bob Peterson

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=20190515193818.7642-7-rpeterso@redhat.com \
    --to=rpeterso@redhat.com \
    /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;
as well as URLs for NNTP newsgroup(s).