Commit e392edd5 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Rename gfs2_freeze_lock{ => _shared } 



Rename gfs2_freeze_lock to gfs2_freeze_lock_shared to make it a bit more
obvious that this function establishes the "thawed" state of the freeze
glock.

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

fs/gfs2/ops_fstype.c

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

	}



	error = gfs2_freeze_lock(sdp, &freeze_gh, 0);

	error = gfs2_freeze_lock_shared(sdp, &freeze_gh, 0);

	if (error)

		goto fail_per_node;
@@ -1592,7 +1592,7 @@ static int gfs2_reconfigure(struct fs_context *fc) 
	if ((sb->s_flags ^ fc->sb_flags) & SB_RDONLY) {

		struct gfs2_holder freeze_gh;



		error = gfs2_freeze_lock(sdp, &freeze_gh, 0);

		error = gfs2_freeze_lock_shared(sdp, &freeze_gh, 0);

		if (error)

			return -EINVAL;

fs/gfs2/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ void gfs2_recover_func(struct work_struct *work) 


		/* Acquire a shared hold on the freeze glock */



		error = gfs2_freeze_lock(sdp, &thaw_gh, LM_FLAG_PRIORITY);

		error = gfs2_freeze_lock_shared(sdp, &thaw_gh, LM_FLAG_PRIORITY);

		if (error)

			goto fail_gunlock_ji;

fs/gfs2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ void gfs2_freeze_func(struct work_struct *work) 
	struct super_block *sb = sdp->sd_vfs;



	atomic_inc(&sb->s_active);

	error = gfs2_freeze_lock(sdp, &freeze_gh, 0);

	error = gfs2_freeze_lock_shared(sdp, &freeze_gh, 0);

	if (error) {

		gfs2_assert_withdraw(sdp, 0);

	} else {

fs/gfs2/util.c

+5 −5
Original line number Diff line number Diff line
@@ -93,12 +93,12 @@ int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd, 
}



/**

 * gfs2_freeze_lock - hold the freeze glock

 * 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(struct gfs2_sbd *sdp, struct gfs2_holder *freeze_gh,

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

			    int caller_flags)

{

	int flags = LM_FLAG_NOEXP | GL_EXACT | caller_flags;
@@ -157,7 +157,7 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp) 
		gfs2_holder_mark_uninitialized(&freeze_gh);

		if (sdp->sd_freeze_gl &&

		    !gfs2_glock_is_locked_by_me(sdp->sd_freeze_gl)) {

			ret = gfs2_freeze_lock(sdp, &freeze_gh,

			ret = gfs2_freeze_lock_shared(sdp, &freeze_gh,

					log_write_allowed ? 0 : LM_FLAG_TRY);

			if (ret == GLR_TRYFAILED)

				ret = 0;

fs/gfs2/util.h

+3 −2
Original line number Diff line number Diff line
@@ -149,8 +149,9 @@ 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(struct gfs2_sbd *sdp,

			    struct gfs2_holder *freeze_gh, int caller_flags);

extern int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp,

				   struct gfs2_holder *freeze_gh,

				   int caller_flags);

extern void gfs2_freeze_unlock(struct gfs2_holder *freeze_gh);



#define gfs2_io_error(sdp) \