1 files changed, 27 insertions, 19 deletions

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index bc342f7ac3af..3093207a7684 100644
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -55,8 +55,6 @@ struct dlm_lkb;
 struct dlm_rsb;
 struct dlm_member;
 struct dlm_rsbtable;
-struct dlm_dirtable;
-struct dlm_direntry;
 struct dlm_recover;
 struct dlm_header;
 struct dlm_message;
@@ -98,18 +96,6 @@ do { \
 }
 
 
-struct dlm_direntry {
-        struct list_head        list;
-        uint32_t                master_nodeid;
-        uint16_t                length;
-        char                    name[1];
-};
-
-struct dlm_dirtable {
-        struct list_head        list;
-        spinlock_t              lock;
-};
-
 struct dlm_rsbtable {
         struct rb_root          keep;
         struct rb_root          toss;
@@ -283,6 +269,15 @@ struct dlm_lkb {
         };
 };
 
+/*
+ * res_master_nodeid is "normal": 0 is unset/invalid, non-zero is the real
+ * nodeid, even when nodeid is our_nodeid.
+ *
+ * res_nodeid is "odd": -1 is unset/invalid, zero means our_nodeid,
+ * greater than zero when another nodeid.
+ *
+ * (TODO: remove res_nodeid and only use res_master_nodeid)
+ */
 
 struct dlm_rsb {
         struct dlm_ls           *res_ls;        /* the lockspace */
@@ -291,6 +286,8 @@ struct dlm_rsb {
         unsigned long           res_flags;
         int                     res_length;     /* length of rsb name */
         int                     res_nodeid;
+        int                     res_master_nodeid;
+        int                     res_dir_nodeid;
         uint32_t                res_lvbseq;
         uint32_t                res_hash;
         uint32_t                res_bucket;     /* rsbtbl */
@@ -313,10 +310,21 @@ struct dlm_rsb {
         char                    res_name[DLM_RESNAME_MAXLEN+1];
 };
 
+/* dlm_master_lookup() flags */
+
+#define DLM_LU_RECOVER_DIR      1
+#define DLM_LU_RECOVER_MASTER   2
+
+/* dlm_master_lookup() results */
+
+#define DLM_LU_MATCH            1
+#define DLM_LU_ADD              2
+
 /* find_rsb() flags */
 
-#define R_MASTER                1       /* only return rsb if it's a master */
-#define R_CREATE                2       /* create/add rsb if not found */
+#define R_REQUEST               0x00000001
+#define R_RECEIVE_REQUEST       0x00000002
+#define R_RECEIVE_RECOVER       0x00000004
 
 /* rsb_flags */
 
@@ -509,9 +517,6 @@ struct dlm_ls {
         struct dlm_rsbtable     *ls_rsbtbl;
         uint32_t                ls_rsbtbl_size;
 
-        struct dlm_dirtable     *ls_dirtbl;
-        uint32_t                ls_dirtbl_size;
-
         struct mutex            ls_waiters_mutex;
         struct list_head        ls_waiters;     /* lkbs needing a reply */
 
@@ -545,6 +550,7 @@ struct dlm_ls {
         struct dentry           *ls_debug_waiters_dentry; /* debugfs */
         struct dentry           *ls_debug_locks_dentry; /* debugfs */
         struct dentry           *ls_debug_all_dentry; /* debugfs */
+        struct dentry           *ls_debug_toss_dentry; /* debugfs */
 
         wait_queue_head_t       ls_uevent_wait; /* user part of join/leave */
         int                     ls_uevent_result;
@@ -573,6 +579,8 @@ struct dlm_ls {
         struct mutex            ls_requestqueue_mutex;
         struct dlm_rcom         *ls_recover_buf;
         int                     ls_recover_nodeid; /* for debugging */
+        unsigned int            ls_recover_dir_sent_res; /* for log info */
+        unsigned int            ls_recover_dir_sent_msg; /* for log info */
         unsigned int            ls_recover_locks_in; /* for log info */
         uint64_t                ls_rcom_seq;
         spinlock_t              ls_rcom_spin;