summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/util.c
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2019-02-18 13:04:13 -0700
committerBob Peterson <rpeterso@redhat.com>2020-02-27 07:53:17 -0600
commit7d9f9249580e05a9af823cdbb7a91f2758d1c63b (patch)
tree590f31982a2f3b7596b5d2ddee5b98394fe462da /fs/gfs2/util.c
parent33dbd1e41a1dd549eb19a29477119d4e29766210 (diff)
downloadlinux-7d9f9249580e05a9af823cdbb7a91f2758d1c63b.tar.bz2
gfs2: Add verbose option to check_journal_clean
Before this patch, function check_journal_clean would give messages related to journal recovery. That's fine for mount time, but when a node withdraws and forces replay that way, we don't want all those distracting and misleading messages. This patch adds a new parameter to make those messages optional. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/util.c')
-rw-r--r--fs/gfs2/util.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index 155a2249a32b..20a5860841e2 100644
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -46,7 +46,8 @@ void gfs2_assert_i(struct gfs2_sbd *sdp)
*
* Returns: 0 if the journal is clean or locked, else an error
*/
-int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd)
+int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
+ bool verbose)
{
int error;
struct gfs2_holder j_gh;
@@ -57,23 +58,31 @@ int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd)
error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_NOEXP |
GL_EXACT | GL_NOCACHE, &j_gh);
if (error) {
- fs_err(sdp, "Error locking journal for spectator mount.\n");
+ if (verbose)
+ fs_err(sdp, "Error %d locking journal for spectator "
+ "mount.\n", error);
return -EPERM;
}
error = gfs2_jdesc_check(jd);
if (error) {
- fs_err(sdp, "Error checking journal for spectator mount.\n");
+ if (verbose)
+ fs_err(sdp, "Error checking journal for spectator "
+ "mount.\n");
goto out_unlock;
}
error = gfs2_find_jhead(jd, &head, false);
if (error) {
- fs_err(sdp, "Error parsing journal for spectator mount.\n");
+ if (verbose)
+ fs_err(sdp, "Error parsing journal for spectator "
+ "mount.\n");
goto out_unlock;
}
if (!(head.lh_flags & GFS2_LOG_HEAD_UNMOUNT)) {
error = -EPERM;
- fs_err(sdp, "jid=%u: Journal is dirty, so the first mounter "
- "must not be a spectator.\n", jd->jd_jid);
+ if (verbose)
+ fs_err(sdp, "jid=%u: Journal is dirty, so the first "
+ "mounter must not be a spectator.\n",
+ jd->jd_jid);
}
out_unlock:
@@ -223,7 +232,7 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp)
* Now wait until recovery is complete.
*/
for (tries = 0; tries < 10; tries++) {
- ret = check_journal_clean(sdp, sdp->sd_jdesc);
+ ret = check_journal_clean(sdp, sdp->sd_jdesc, false);
if (!ret)
break;
msleep(HZ);