Merge branch 'uc-logic' into for-linus

[karo-tx-linux.git] / fs / ocfs2 / dlm / dlmcommon.h

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 765298908f1d3905bbabf3c5e597a8bf72ebd4a9..b36d0bf77a5a4ca5fa1de836dca82037d4f0c491 100644 (file)
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -445,7 +445,9 @@ enum {
        DLM_LOCK_REQUEST_MSG,    /* 515 */
        DLM_RECO_DATA_DONE_MSG,  /* 516 */
        DLM_BEGIN_RECO_MSG,      /* 517 */
-       DLM_FINALIZE_RECO_MSG    /* 518 */
+       DLM_FINALIZE_RECO_MSG,   /* 518 */
+       DLM_QUERY_REGION,        /* 519 */
+       DLM_QUERY_NODEINFO,      /* 520 */
 };
 
 struct dlm_reco_node_data
@@ -727,6 +729,31 @@ struct dlm_cancel_join
        u8 domain[O2NM_MAX_NAME_LEN];
 };
 
+struct dlm_query_region {
+       u8 qr_node;
+       u8 qr_numregions;
+       u8 qr_namelen;
+       u8 pad1;
+       u8 qr_domain[O2NM_MAX_NAME_LEN];
+       u8 qr_regions[O2HB_MAX_REGION_NAME_LEN * O2NM_MAX_REGIONS];
+};
+
+struct dlm_node_info {
+       u8 ni_nodenum;
+       u8 pad1;
+       u16 ni_ipv4_port;
+       u32 ni_ipv4_address;
+};
+
+struct dlm_query_nodeinfo {
+       u8 qn_nodenum;
+       u8 qn_numnodes;
+       u8 qn_namelen;
+       u8 pad1;
+       u8 qn_domain[O2NM_MAX_NAME_LEN];
+       struct dlm_node_info qn_nodes[O2NM_MAX_NODES];
+};
+
 struct dlm_exit_domain
 {
        u8 node_idx;