diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmcommon.h')
-rw-r--r-- | fs/ocfs2/dlm/dlmcommon.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index 9843ee17ea27..1f939631ab74 100644 --- a/fs/ocfs2/dlm/dlmcommon.h +++ b/fs/ocfs2/dlm/dlmcommon.h | |||
@@ -602,17 +602,19 @@ enum dlm_query_join_response_code { | |||
602 | JOIN_PROTOCOL_MISMATCH, | 602 | JOIN_PROTOCOL_MISMATCH, |
603 | }; | 603 | }; |
604 | 604 | ||
605 | struct dlm_query_join_packet { | ||
606 | u8 code; /* Response code. dlm_minor and fs_minor | ||
607 | are only valid if this is JOIN_OK */ | ||
608 | u8 dlm_minor; /* The minor version of the protocol the | ||
609 | dlm is speaking. */ | ||
610 | u8 fs_minor; /* The minor version of the protocol the | ||
611 | filesystem is speaking. */ | ||
612 | u8 reserved; | ||
613 | }; | ||
614 | |||
605 | union dlm_query_join_response { | 615 | union dlm_query_join_response { |
606 | u32 intval; | 616 | u32 intval; |
607 | struct { | 617 | struct dlm_query_join_packet packet; |
608 | u8 code; /* Response code. dlm_minor and fs_minor | ||
609 | are only valid if this is JOIN_OK */ | ||
610 | u8 dlm_minor; /* The minor version of the protocol the | ||
611 | dlm is speaking. */ | ||
612 | u8 fs_minor; /* The minor version of the protocol the | ||
613 | filesystem is speaking. */ | ||
614 | u8 reserved; | ||
615 | } packet; | ||
616 | }; | 618 | }; |
617 | 619 | ||
618 | struct dlm_lock_request | 620 | struct dlm_lock_request |