Commit 6c7410f4 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: gfs2_freeze_lock_shared cleanup 



All the remaining users of gfs2_freeze_lock_shared() set freeze_gh to
&sdp->sd_freeze_gh and flags to 0, so remove those two parameters.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 5432af15

fs/gfs2/ops_fstype.c

+1 −1
Original line number Diff line number Diff line
@@ -1267,7 +1267,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) 
		}

	}



	error = gfs2_freeze_lock_shared(sdp, &sdp->sd_freeze_gh, 0);

	error = gfs2_freeze_lock_shared(sdp);

	if (error)

		goto fail_per_node;

fs/gfs2/super.c

+2 −2
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp) 
	gfs2_freeze_unlock(&sdp->sd_freeze_gh);



relock_shared:

	error2 = gfs2_freeze_lock_shared(sdp, &sdp->sd_freeze_gh, 0);

	error2 = gfs2_freeze_lock_shared(sdp);

	gfs2_assert_withdraw(sdp, !error2);



out:
@@ -709,7 +709,7 @@ static int gfs2_do_thaw(struct gfs2_sbd *sdp) 
	struct super_block *sb = sdp->sd_vfs;

	int error;



	error = gfs2_freeze_lock_shared(sdp, &sdp->sd_freeze_gh, 0);

	error = gfs2_freeze_lock_shared(sdp);

	if (error)

		goto fail;

	error = thaw_super(sb);

fs/gfs2/util.c

+3 −6
Original line number Diff line number Diff line
@@ -95,17 +95,14 @@ int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd, 
/**

 * gfs2_freeze_lock_shared - hold the freeze glock

 * @sdp: the superblock

 * @freeze_gh: pointer to the requested holder

 * @caller_flags: any additional flags needed by the caller

 */

int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp, struct gfs2_holder *freeze_gh,

			    int caller_flags)

int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp)

{

	int flags = LM_FLAG_NOEXP | GL_EXACT | caller_flags;

	int flags = LM_FLAG_NOEXP | GL_EXACT;

	int error;



	error = gfs2_glock_nq_init(sdp->sd_freeze_gl, LM_ST_SHARED, flags,

				   freeze_gh);

				   &sdp->sd_freeze_gh);

	if (error && error != GLR_TRYFAILED)

		fs_err(sdp, "can't lock the freeze glock: %d\n", error);

	return error;

fs/gfs2/util.h

+1 −3
Original line number Diff line number Diff line
@@ -149,9 +149,7 @@ int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function, 


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

			       bool verbose);

extern int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp,

				   struct gfs2_holder *freeze_gh,

				   int caller_flags);

extern int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp);

extern void gfs2_freeze_unlock(struct gfs2_holder *freeze_gh);



#define gfs2_io_error(sdp) \