Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e4dac33 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] split create_message function 



This splits the current create_message() function into two parts so that
later patches can call the new lower-level _create_message() function when
they don't have an rsb struct.  No functional change in this patch.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent f01963f2

fs/dlm/lock.c

+32 −22
Original line number Diff line number Diff line
@@ -2301,7 +2301,7 @@ int dlm_unlock(dlm_lockspace_t *lockspace, 
 * receive_lookup_reply		send_lookup_reply

 */



static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb,

static int _create_message(struct dlm_ls *ls, int mb_len,

			   int to_nodeid, int mstype,

			   struct dlm_message **ms_ret,

			   struct dlm_mhandle **mh_ret)
@@ -2309,23 +2309,6 @@ static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb, 
	struct dlm_message *ms;

	struct dlm_mhandle *mh;

	char *mb;

	int mb_len = sizeof(struct dlm_message);



	switch (mstype) {

	case DLM_MSG_REQUEST:

	case DLM_MSG_LOOKUP:

	case DLM_MSG_REMOVE:

		mb_len += r->res_length;

		break;

	case DLM_MSG_CONVERT:

	case DLM_MSG_UNLOCK:

	case DLM_MSG_REQUEST_REPLY:

	case DLM_MSG_CONVERT_REPLY:

	case DLM_MSG_GRANT:

		if (lkb && lkb->lkb_lvbptr)

			mb_len += r->res_ls->ls_lvblen;

		break;

	}



	/* get_buffer gives us a message handle (mh) that we need to

	   pass into lowcomms_commit and a message buffer (mb) that we
@@ -2340,7 +2323,7 @@ static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb, 
	ms = (struct dlm_message *) mb;



	ms->m_header.h_version = (DLM_HEADER_MAJOR | DLM_HEADER_MINOR);

	ms->m_header.h_lockspace = r->res_ls->ls_global_id;

	ms->m_header.h_lockspace = ls->ls_global_id;

	ms->m_header.h_nodeid = dlm_our_nodeid();

	ms->m_header.h_length = mb_len;

	ms->m_header.h_cmd = DLM_MSG;
@@ -2352,6 +2335,33 @@ static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb, 
	return 0;

}



static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb,

			  int to_nodeid, int mstype,

			  struct dlm_message **ms_ret,

			  struct dlm_mhandle **mh_ret)

{

	int mb_len = sizeof(struct dlm_message);



	switch (mstype) {

	case DLM_MSG_REQUEST:

	case DLM_MSG_LOOKUP:

	case DLM_MSG_REMOVE:

		mb_len += r->res_length;

		break;

	case DLM_MSG_CONVERT:

	case DLM_MSG_UNLOCK:

	case DLM_MSG_REQUEST_REPLY:

	case DLM_MSG_CONVERT_REPLY:

	case DLM_MSG_GRANT:

		if (lkb && lkb->lkb_lvbptr)

			mb_len += r->res_ls->ls_lvblen;

		break;

	}



	return _create_message(r->res_ls, mb_len, to_nodeid, mstype,

			       ms_ret, mh_ret);

}



/* further lowcomms enhancements or alternate implementations may make

   the return value from this function useful at some point */