Commit 5b787667 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland

fs: dlm: use packet in dlm_mhandle

To allow more than just dereferencing the inner header we directly point
to the inner dlm packet which allows us to dereference the header, rcom
or message structure.
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 57a5724e
...@@ -194,7 +194,7 @@ struct midcomms_node { ...@@ -194,7 +194,7 @@ struct midcomms_node {
}; };
struct dlm_mhandle { struct dlm_mhandle {
const struct dlm_header *inner_hd; const union dlm_packet *inner_p;
struct midcomms_node *node; struct midcomms_node *node;
struct dlm_opts *opts; struct dlm_opts *opts;
struct dlm_msg *msg; struct dlm_msg *msg;
...@@ -1055,7 +1055,7 @@ static struct dlm_msg *dlm_midcomms_get_msg_3_2(struct dlm_mhandle *mh, int node ...@@ -1055,7 +1055,7 @@ static struct dlm_msg *dlm_midcomms_get_msg_3_2(struct dlm_mhandle *mh, int node
dlm_fill_opts_header(opts, len, mh->seq); dlm_fill_opts_header(opts, len, mh->seq);
*ppc += sizeof(*opts); *ppc += sizeof(*opts);
mh->inner_hd = (const struct dlm_header *)*ppc; mh->inner_p = (const union dlm_packet *)*ppc;
return msg; return msg;
} }
...@@ -1133,7 +1133,7 @@ struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len, ...@@ -1133,7 +1133,7 @@ struct dlm_mhandle *dlm_midcomms_get_mhandle(int nodeid, int len,
static void dlm_midcomms_commit_msg_3_2(struct dlm_mhandle *mh) static void dlm_midcomms_commit_msg_3_2(struct dlm_mhandle *mh)
{ {
/* nexthdr chain for fast lookup */ /* nexthdr chain for fast lookup */
mh->opts->o_nextcmd = mh->inner_hd->h_cmd; mh->opts->o_nextcmd = mh->inner_p->header.h_cmd;
mh->committed = true; mh->committed = true;
dlm_lowcomms_commit_msg(mh->msg); dlm_lowcomms_commit_msg(mh->msg);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment