ocfs2/dlm: Remove struct dlm_lock_name in struct dlm_master_list_entry

[mv-sheeva.git] / fs / ocfs2 / dlm / dlmcommon.h

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 266fde9354bd32144bd2668fc4ba34490042b918..0102be35980c03ae0d3bcfe561282e5f9781626f 100644 (file)
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -56,12 +56,6 @@ enum dlm_mle_type {
        DLM_MLE_NUM_TYPES
 };
 
-struct dlm_lock_name {
-       unsigned int hash;
-       unsigned int len;
-       unsigned char name[DLM_LOCKID_NAME_MAX];
-};
-
 struct dlm_master_list_entry {
        struct hlist_node master_hash_node;
        struct list_head hb_events;
@@ -80,10 +74,10 @@ struct dlm_master_list_entry {
        enum dlm_mle_type type;
        struct o2hb_callback_func mle_hb_up;
        struct o2hb_callback_func mle_hb_down;
-       union {
-               struct dlm_lock_resource *mleres;
-               struct dlm_lock_name mlename;
-       } u;
+       struct dlm_lock_resource *mleres;
+       unsigned char mname[DLM_LOCKID_NAME_MAX];
+       unsigned int mnamelen;
+       unsigned int mnamehash;
 };
 
 enum dlm_ast_type {