ocfs2/dlm: Activate dlm->master_hash for master list entries

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

diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 425653f88e98840fffebaa064c582cc87b1f5555..aa55271a7aca9a1b012aed83cc52e7200515b68b 100644 (file)
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -56,12 +56,13 @@ enum dlm_mle_type {
 };
 
 struct dlm_lock_name {
+       unsigned int hash;
        unsigned int len;
        unsigned char name[DLM_LOCKID_NAME_MAX];
 };
 
 struct dlm_master_list_entry {
-       struct list_head list;
+       struct hlist_node master_hash_node;
        struct list_head hb_events;
        struct dlm_ctxt *dlm;
        spinlock_t spinlock;
@@ -152,7 +153,6 @@ struct dlm_ctxt
        struct dlm_recovery_ctxt reco;
        spinlock_t master_lock;
        struct hlist_head **master_hash;
-       struct list_head master_list;
        struct list_head mle_hb_events;
 
        /* these give a really vague idea of the system load */