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

gfs2: Rename SDF_{FS_FROZEN => FREEZE_INITIATOR} 



Rename the SDF_FS_FROZEN flag to SDF_FREEZE_INITIATOR to indicate more
clearly that the node that has this flag set is the initiator of the
freeze.

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

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ enum { 
	SDF_RORECOVERY		= 7, /* read only recovery */

	SDF_SKIP_DLM_UNLOCK	= 8,

	SDF_FORCE_AIL_FLUSH     = 9,

	SDF_FS_FROZEN           = 10,

	SDF_FREEZE_INITIATOR	= 10,

	SDF_WITHDRAWING		= 11, /* Will withdraw eventually */

	SDF_WITHDRAW_IN_PROG	= 12, /* Withdraw is in progress */

	SDF_REMOTE_WITHDRAW	= 13, /* Performing remote recovery */

fs/gfs2/super.c

+4 −4
Original line number Diff line number Diff line
@@ -691,8 +691,8 @@ void gfs2_freeze_func(struct work_struct *work) 
		gfs2_freeze_unlock(&freeze_gh);

	}

	deactivate_super(sb);

	clear_bit_unlock(SDF_FS_FROZEN, &sdp->sd_flags);

	wake_up_bit(&sdp->sd_flags, SDF_FS_FROZEN);

	clear_bit_unlock(SDF_FREEZE_INITIATOR, &sdp->sd_flags);

	wake_up_bit(&sdp->sd_flags, SDF_FREEZE_INITIATOR);

	return;

}
@@ -735,7 +735,7 @@ static int gfs2_freeze_super(struct super_block *sb) 
		fs_err(sdp, "retrying...\n");

		msleep(1000);

	}

	set_bit(SDF_FS_FROZEN, &sdp->sd_flags);

	set_bit(SDF_FREEZE_INITIATOR, &sdp->sd_flags);

out:

	mutex_unlock(&sdp->sd_freeze_mutex);

	return error;
@@ -760,7 +760,7 @@ static int gfs2_thaw_super(struct super_block *sb) 


	gfs2_freeze_unlock(&sdp->sd_freeze_gh);

	mutex_unlock(&sdp->sd_freeze_mutex);

	return wait_on_bit(&sdp->sd_flags, SDF_FS_FROZEN, TASK_INTERRUPTIBLE);

	return wait_on_bit(&sdp->sd_flags, SDF_FREEZE_INITIATOR, TASK_INTERRUPTIBLE);

}



/**

fs/gfs2/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf) 
		     test_bit(SDF_RORECOVERY, &f),

		     test_bit(SDF_SKIP_DLM_UNLOCK, &f),

		     test_bit(SDF_FORCE_AIL_FLUSH, &f),

		     test_bit(SDF_FS_FROZEN, &f),

		     test_bit(SDF_FREEZE_INITIATOR, &f),

		     test_bit(SDF_WITHDRAWING, &f),

		     test_bit(SDF_WITHDRAW_IN_PROG, &f),

		     test_bit(SDF_REMOTE_WITHDRAW, &f),

fs/gfs2/util.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp) 
	}

	sdp->sd_jinode_gh.gh_flags |= GL_NOCACHE;

	gfs2_glock_dq(&sdp->sd_jinode_gh);

	if (test_bit(SDF_FS_FROZEN, &sdp->sd_flags)) {

	if (test_bit(SDF_FREEZE_INITIATOR, &sdp->sd_flags)) {

		/* Make sure gfs2_thaw_super works if partially-frozen */

		flush_work(&sdp->sd_freeze_work);

		atomic_set(&sdp->sd_freeze_state, SFS_FROZEN);