Commit 7d9f9249 authored by Bob Peterson's avatar Bob Peterson
Browse files

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: default avatarBob Peterson <rpeterso@redhat.com>
Reviewed-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 33dbd1e4

fs/gfs2/ops_fstype.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo) 
			struct gfs2_jdesc *jd = gfs2_jdesc_find(sdp, x);



			if (sdp->sd_args.ar_spectator) {

				error = check_journal_clean(sdp, jd);

				error = check_journal_clean(sdp, jd, true);

				if (error)

					goto fail_jinode_gh;

				continue;

fs/gfs2/util.c

+16 −7
Original line number Diff line number Diff line
@@ -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);

fs/gfs2/util.h

+3 −1
Original line number Diff line number Diff line
@@ -136,7 +136,9 @@ static inline void gfs2_metatype_set(struct buffer_head *bh, u16 type, 


int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function,

		    char *file, unsigned int line);

int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd);



extern int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,

			       bool verbose);



#define gfs2_io_error(sdp) \

gfs2_io_error_i((sdp), __func__, __FILE__, __LINE__);