fs: dlm: add union in dlm header for lockspace id

[linux-2.6-microblaze.git] / fs / dlm / rcom.c

diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
index 6f653a3..7c1a06b 100644 (file)
--- a/fs/dlm/rcom.c
+++ b/fs/dlm/rcom.c
@@ -35,7 +35,7 @@ static void _create_rcom(struct dlm_ls *ls, int to_nodeid, int type, int len,
        rc = (struct dlm_rcom *) mb;
 
        rc->rc_header.h_version = (DLM_HEADER_MAJOR | DLM_HEADER_MINOR);
-       rc->rc_header.h_lockspace = ls->ls_global_id;
+       rc->rc_header.u.h_lockspace = ls->ls_global_id;
        rc->rc_header.h_nodeid = dlm_our_nodeid();
        rc->rc_header.h_length = mb_len;
        rc->rc_header.h_cmd = DLM_RCOM;
@@ -508,7 +508,7 @@ int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in)
        rc = (struct dlm_rcom *) mb;
 
        rc->rc_header.h_version = (DLM_HEADER_MAJOR | DLM_HEADER_MINOR);
-       rc->rc_header.h_lockspace = rc_in->rc_header.h_lockspace;
+       rc->rc_header.u.h_lockspace = rc_in->rc_header.u.h_lockspace;
        rc->rc_header.h_nodeid = dlm_our_nodeid();
        rc->rc_header.h_length = mb_len;
        rc->rc_header.h_cmd = DLM_RCOM;