Commit 9f48eead authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: remove DLM_IFL_LOCAL_MS flag 



The DLM_IFL_LOCAL_MS flag is an internal non shared flag but used in
m_flags of dlm messages. It is not shared because it is only used for
local messaging. Instead using DLM_IFL_LOCAL_MS in dlm messages we pass a
parameter around to signal local messaging or not. This patch is adding
the local parameter to signal local messaging.

Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent a7e7ffac

fs/dlm/dlm_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ struct dlm_args { 
#define DLM_IFL_OVERLAP_CANCEL  0x00100000

#define DLM_IFL_ENDOFLIFE	0x00200000

#define DLM_IFL_DEADLOCK_CANCEL	0x01000000

#define DLM_IFL_LOCAL_MS	0x02000000 /* magic number for m_flags */



#define DLM_IFL_CB_PENDING_BIT	0

fs/dlm/lock.c

+33 −32
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int send_remove(struct dlm_rsb *r); 
static int _request_lock(struct dlm_rsb *r, struct dlm_lkb *lkb);

static int _cancel_lock(struct dlm_rsb *r, struct dlm_lkb *lkb);

static void __receive_convert_reply(struct dlm_rsb *r, struct dlm_lkb *lkb,

				    struct dlm_message *ms);

				    struct dlm_message *ms, bool local);

static int receive_extralen(struct dlm_message *ms);

static void do_purge(struct dlm_ls *ls, int nodeid, int pid);

static void toss_rsb(struct kref *kref);
@@ -1561,15 +1561,16 @@ static int remove_from_waiters(struct dlm_lkb *lkb, int mstype) 
/* Handles situations where we might be processing a "fake" or "local" reply in

   which we can't try to take waiters_mutex again. */



static int remove_from_waiters_ms(struct dlm_lkb *lkb, struct dlm_message *ms)

static int remove_from_waiters_ms(struct dlm_lkb *lkb, struct dlm_message *ms,

				  bool local)

{

	struct dlm_ls *ls = lkb->lkb_resource->res_ls;

	int error;



	if (ms->m_flags != cpu_to_le32(DLM_IFL_LOCAL_MS))

	if (!local)

		mutex_lock(&ls->ls_waiters_mutex);

	error = _remove_from_waiters(lkb, le32_to_cpu(ms->m_type), ms);

	if (ms->m_flags != cpu_to_le32(DLM_IFL_LOCAL_MS))

	if (!local)

		mutex_unlock(&ls->ls_waiters_mutex);

	return error;

}
@@ -3486,10 +3487,9 @@ static int send_convert(struct dlm_rsb *r, struct dlm_lkb *lkb) 
	/* down conversions go without a reply from the master */

	if (!error && down_conversion(lkb)) {

		remove_from_waiters(lkb, DLM_MSG_CONVERT_REPLY);

		r->res_ls->ls_local_ms.m_flags = cpu_to_le32(DLM_IFL_LOCAL_MS);

		r->res_ls->ls_local_ms.m_type = cpu_to_le32(DLM_MSG_CONVERT_REPLY);

		r->res_ls->ls_local_ms.m_result = 0;

		__receive_convert_reply(r, lkb, &r->res_ls->ls_local_ms);

		__receive_convert_reply(r, lkb, &r->res_ls->ls_local_ms, true);

	}



	return error;
@@ -3679,9 +3679,10 @@ static void receive_flags(struct dlm_lkb *lkb, struct dlm_message *ms) 
			  (le32_to_cpu(ms->m_flags) & 0x0000FFFF);

}



static void receive_flags_reply(struct dlm_lkb *lkb, struct dlm_message *ms)

static void receive_flags_reply(struct dlm_lkb *lkb, struct dlm_message *ms,

				bool local)

{

	if (ms->m_flags == cpu_to_le32(DLM_IFL_LOCAL_MS))

	if (local)

		return;



	lkb->lkb_sbflags = le32_to_cpu(ms->m_sbflags);
@@ -4074,7 +4075,7 @@ static int receive_grant(struct dlm_ls *ls, struct dlm_message *ms) 
	if (error)

		goto out;



	receive_flags_reply(lkb, ms);

	receive_flags_reply(lkb, ms, false);

	if (is_altmode(lkb))

		munge_altmode(lkb, ms);

	grant_lock_pc(r, lkb, ms);
@@ -4278,7 +4279,7 @@ static int receive_request_reply(struct dlm_ls *ls, struct dlm_message *ms) 
	case -EINPROGRESS:

	case 0:

		/* request was queued or granted on remote master */

		receive_flags_reply(lkb, ms);

		receive_flags_reply(lkb, ms, false);

		lkb->lkb_remid = le32_to_cpu(ms->m_lkid);

		if (is_altmode(lkb))

			munge_altmode(lkb, ms);
@@ -4348,7 +4349,7 @@ static int receive_request_reply(struct dlm_ls *ls, struct dlm_message *ms) 
}



static void __receive_convert_reply(struct dlm_rsb *r, struct dlm_lkb *lkb,

				    struct dlm_message *ms)

				    struct dlm_message *ms, bool local)

{

	/* this is the value returned from do_convert() on the master */

	switch (from_dlm_errno(le32_to_cpu(ms->m_result))) {
@@ -4358,14 +4359,14 @@ static void __receive_convert_reply(struct dlm_rsb *r, struct dlm_lkb *lkb, 
		break;



	case -EDEADLK:

		receive_flags_reply(lkb, ms);

		receive_flags_reply(lkb, ms, local);

		revert_lock_pc(r, lkb);

		queue_cast(r, lkb, -EDEADLK);

		break;



	case -EINPROGRESS:

		/* convert was queued on remote master */

		receive_flags_reply(lkb, ms);

		receive_flags_reply(lkb, ms, local);

		if (is_demoted(lkb))

			munge_demoted(lkb);

		del_lkb(r, lkb);
@@ -4374,7 +4375,7 @@ static void __receive_convert_reply(struct dlm_rsb *r, struct dlm_lkb *lkb, 


	case 0:

		/* convert was granted on remote master */

		receive_flags_reply(lkb, ms);

		receive_flags_reply(lkb, ms, local);

		if (is_demoted(lkb))

			munge_demoted(lkb);

		grant_lock_pc(r, lkb, ms);
@@ -4391,7 +4392,8 @@ static void __receive_convert_reply(struct dlm_rsb *r, struct dlm_lkb *lkb, 
	}

}



static void _receive_convert_reply(struct dlm_lkb *lkb, struct dlm_message *ms)

static void _receive_convert_reply(struct dlm_lkb *lkb, struct dlm_message *ms,

				   bool local)

{

	struct dlm_rsb *r = lkb->lkb_resource;

	int error;
@@ -4404,11 +4406,11 @@ static void _receive_convert_reply(struct dlm_lkb *lkb, struct dlm_message *ms) 
		goto out;



	/* local reply can happen with waiters_mutex held */

	error = remove_from_waiters_ms(lkb, ms);

	error = remove_from_waiters_ms(lkb, ms, local);

	if (error)

		goto out;



	__receive_convert_reply(r, lkb, ms);

	__receive_convert_reply(r, lkb, ms, local);

 out:

	unlock_rsb(r);

	put_rsb(r);
@@ -4423,12 +4425,13 @@ static int receive_convert_reply(struct dlm_ls *ls, struct dlm_message *ms) 
	if (error)

		return error;



	_receive_convert_reply(lkb, ms);

	_receive_convert_reply(lkb, ms, false);

	dlm_put_lkb(lkb);

	return 0;

}



static void _receive_unlock_reply(struct dlm_lkb *lkb, struct dlm_message *ms)

static void _receive_unlock_reply(struct dlm_lkb *lkb, struct dlm_message *ms,

				  bool local)

{

	struct dlm_rsb *r = lkb->lkb_resource;

	int error;
@@ -4441,7 +4444,7 @@ static void _receive_unlock_reply(struct dlm_lkb *lkb, struct dlm_message *ms) 
		goto out;



	/* local reply can happen with waiters_mutex held */

	error = remove_from_waiters_ms(lkb, ms);

	error = remove_from_waiters_ms(lkb, ms, local);

	if (error)

		goto out;
@@ -4449,7 +4452,7 @@ static void _receive_unlock_reply(struct dlm_lkb *lkb, struct dlm_message *ms) 


	switch (from_dlm_errno(le32_to_cpu(ms->m_result))) {

	case -DLM_EUNLOCK:

		receive_flags_reply(lkb, ms);

		receive_flags_reply(lkb, ms, local);

		remove_lock_pc(r, lkb);

		queue_cast(r, lkb, -DLM_EUNLOCK);

		break;
@@ -4473,12 +4476,13 @@ static int receive_unlock_reply(struct dlm_ls *ls, struct dlm_message *ms) 
	if (error)

		return error;



	_receive_unlock_reply(lkb, ms);

	_receive_unlock_reply(lkb, ms, false);

	dlm_put_lkb(lkb);

	return 0;

}



static void _receive_cancel_reply(struct dlm_lkb *lkb, struct dlm_message *ms)

static void _receive_cancel_reply(struct dlm_lkb *lkb, struct dlm_message *ms,

				  bool local)

{

	struct dlm_rsb *r = lkb->lkb_resource;

	int error;
@@ -4491,7 +4495,7 @@ static void _receive_cancel_reply(struct dlm_lkb *lkb, struct dlm_message *ms) 
		goto out;



	/* local reply can happen with waiters_mutex held */

	error = remove_from_waiters_ms(lkb, ms);

	error = remove_from_waiters_ms(lkb, ms, local);

	if (error)

		goto out;
@@ -4499,7 +4503,7 @@ static void _receive_cancel_reply(struct dlm_lkb *lkb, struct dlm_message *ms) 


	switch (from_dlm_errno(le32_to_cpu(ms->m_result))) {

	case -DLM_ECANCEL:

		receive_flags_reply(lkb, ms);

		receive_flags_reply(lkb, ms, local);

		revert_lock_pc(r, lkb);

		queue_cast(r, lkb, -DLM_ECANCEL);

		break;
@@ -4524,7 +4528,7 @@ static int receive_cancel_reply(struct dlm_ls *ls, struct dlm_message *ms) 
	if (error)

		return error;



	_receive_cancel_reply(lkb, ms);

	_receive_cancel_reply(lkb, ms, false);

	dlm_put_lkb(lkb);

	return 0;

}
@@ -4839,11 +4843,10 @@ static void recover_convert_waiter(struct dlm_ls *ls, struct dlm_lkb *lkb, 
	if (middle_conversion(lkb)) {

		hold_lkb(lkb);

		memset(ms_local, 0, sizeof(struct dlm_message));

		ms_local->m_flags = cpu_to_le32(DLM_IFL_LOCAL_MS);

		ms_local->m_type = cpu_to_le32(DLM_MSG_CONVERT_REPLY);

		ms_local->m_result = cpu_to_le32(to_dlm_errno(-EINPROGRESS));

		ms_local->m_header.h_nodeid = cpu_to_le32(lkb->lkb_nodeid);

		_receive_convert_reply(lkb, ms_local);

		_receive_convert_reply(lkb, ms_local, true);



		/* Same special case as in receive_rcom_lock_args() */

		lkb->lkb_grmode = DLM_LOCK_IV;
@@ -4961,22 +4964,20 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls) 
		case DLM_MSG_UNLOCK:

			hold_lkb(lkb);

			memset(ms_local, 0, sizeof(struct dlm_message));

			ms_local->m_flags = cpu_to_le32(DLM_IFL_LOCAL_MS);

			ms_local->m_type = cpu_to_le32(DLM_MSG_UNLOCK_REPLY);

			ms_local->m_result = cpu_to_le32(to_dlm_errno(local_unlock_result));

			ms_local->m_header.h_nodeid = cpu_to_le32(lkb->lkb_nodeid);

			_receive_unlock_reply(lkb, ms_local);

			_receive_unlock_reply(lkb, ms_local, true);

			dlm_put_lkb(lkb);

			break;



		case DLM_MSG_CANCEL:

			hold_lkb(lkb);

			memset(ms_local, 0, sizeof(struct dlm_message));

			ms_local->m_flags = cpu_to_le32(DLM_IFL_LOCAL_MS);

			ms_local->m_type = cpu_to_le32(DLM_MSG_CANCEL_REPLY);

			ms_local->m_result = cpu_to_le32(to_dlm_errno(local_cancel_result));

			ms_local->m_header.h_nodeid = cpu_to_le32(lkb->lkb_nodeid);

			_receive_cancel_reply(lkb, ms_local);

			_receive_cancel_reply(lkb, ms_local, true);

			dlm_put_lkb(lkb);

			break;

include/trace/events/dlm.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
	{ DLM_IFL_OVERLAP_CANCEL, "OVERLAP_CANCEL" },		\

	{ DLM_IFL_ENDOFLIFE,	"ENDOFLIFE" },			\

	{ DLM_IFL_DEADLOCK_CANCEL, "DEADLOCK_CANCEL" },		\

	{ DLM_IFL_LOCAL_MS,	"LOCAL_MS" },			\

	{ DLM_IFL_USER,		"USER" },			\

	{ DLM_IFL_ORPHAN,	"ORPHAN" })