Commit 0d91061a authored by Bob Peterson's avatar Bob Peterson
Browse files

gfs2: move check_journal_clean to util.c for future use 



Before this patch function check_journal_clean was in ops_fstype.c.
This patch moves it to util.c so we can make use of it elsewhere
in a future patch.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Reviewed-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 03678a99

fs/gfs2/ops_fstype.c

+0 −42
Original line number Diff line number Diff line
@@ -600,48 +600,6 @@ static int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh) 
	return error;

}



/**

 * check_journal_clean - Make sure a journal is clean for a spectator mount

 * @sdp: The GFS2 superblock

 * @jd: The journal descriptor

 *

 * Returns: 0 if the journal is clean or locked, else an error

 */

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

{

	int error;

	struct gfs2_holder j_gh;

	struct gfs2_log_header_host head;

	struct gfs2_inode *ip;



	ip = GFS2_I(jd->jd_inode);

	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");

		return -EPERM;

	}

	error = gfs2_jdesc_check(jd);

	if (error) {

		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");

		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);

	}



out_unlock:

	gfs2_glock_dq_uninit(&j_gh);

	return error;

}



static int init_journal(struct gfs2_sbd *sdp, int undo)

{

	struct inode *master = d_inode(sdp->sd_master_dir);

fs/gfs2/util.c

+45 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 
#include "gfs2.h"

#include "incore.h"

#include "glock.h"

#include "lops.h"

#include "recovery.h"

#include "rgrp.h"

#include "super.h"

#include "util.h"



struct kmem_cache *gfs2_glock_cachep __read_mostly;
@@ -33,6 +36,48 @@ void gfs2_assert_i(struct gfs2_sbd *sdp) 
	fs_emerg(sdp, "fatal assertion failed\n");

}



/**

 * check_journal_clean - Make sure a journal is clean for a spectator mount

 * @sdp: The GFS2 superblock

 * @jd: The journal descriptor

 *

 * 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 error;

	struct gfs2_holder j_gh;

	struct gfs2_log_header_host head;

	struct gfs2_inode *ip;



	ip = GFS2_I(jd->jd_inode);

	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");

		return -EPERM;

	}

	error = gfs2_jdesc_check(jd);

	if (error) {

		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");

		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);

	}



out_unlock:

	gfs2_glock_dq_uninit(&j_gh);

	return error;

}



void gfs2_lm(struct gfs2_sbd *sdp, const char *fmt, ...)

{

	struct va_format vaf;

fs/gfs2/util.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 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);



#define gfs2_io_error(sdp) \

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