Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: add recovery callbacks
  dlm: add node slots and generation
  dlm: move recovery barrier calls
  dlm: convert rsb list to rb_tree

1 files changed, 50 insertions, 10 deletions

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index fe2860c02449..3a564d197e99 100644
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2010 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
 **
 **  This copyrighted material is made available to anyone wishing to use,
 **  modify, copy, or redistribute it subject to the terms and conditions
@@ -103,8 +103,8 @@ struct dlm_dirtable {
 };
 
 struct dlm_rsbtable {
-        struct list_head        list;
-        struct list_head        toss;
+        struct rb_root          keep;
+        struct rb_root          toss;
         spinlock_t              lock;
 };
 
@@ -117,6 +117,10 @@ struct dlm_member {
         struct list_head        list;
         int                     nodeid;
         int                     weight;
+        int                     slot;
+        int                     slot_prev;
+        int                     comm_seq;
+        uint32_t                generation;
 };
 
 /*
@@ -125,10 +129,8 @@ struct dlm_member {
 
 struct dlm_recover {
         struct list_head        list;
-        int                     *nodeids;   /* nodeids of all members */
-        int                     node_count;
-        int                     *new;       /* nodeids of new members */
-        int                     new_count;
+        struct dlm_config_node  *nodes;
+        int                     nodes_count;
         uint64_t                seq;
 };
 
@@ -285,7 +287,10 @@ struct dlm_rsb {
         unsigned long           res_toss_time;
         uint32_t                res_first_lkid;
         struct list_head        res_lookup;     /* lkbs waiting on first */
-        struct list_head        res_hashchain;  /* rsbtbl */
+        union {
+                struct list_head        res_hashchain;
+                struct rb_node          res_hashnode;   /* rsbtbl */
+        };
         struct list_head        res_grantqueue;
         struct list_head        res_convertqueue;
         struct list_head        res_waitqueue;
@@ -334,7 +339,9 @@ static inline int rsb_flag(struct dlm_rsb *r, enum rsb_flags flag)
 /* dlm_header is first element of all structs sent between nodes */
 
 #define DLM_HEADER_MAJOR        0x00030000
-#define DLM_HEADER_MINOR        0x00000000
+#define DLM_HEADER_MINOR        0x00000001
+
+#define DLM_HEADER_SLOTS        0x00000001
 
 #define DLM_MSG                 1
 #define DLM_RCOM                2
@@ -422,10 +429,34 @@ union dlm_packet {
         struct dlm_rcom         rcom;
 };
 
+#define DLM_RSF_NEED_SLOTS      0x00000001
+
+/* RCOM_STATUS data */
+struct rcom_status {
+        __le32                  rs_flags;
+        __le32                  rs_unused1;
+        __le64                  rs_unused2;
+};
+
+/* RCOM_STATUS_REPLY data */
 struct rcom_config {
         __le32                  rf_lvblen;
         __le32                  rf_lsflags;
-        __le64                  rf_unused;
+
+        /* DLM_HEADER_SLOTS adds: */
+        __le32                  rf_flags;
+        __le16                  rf_our_slot;
+        __le16                  rf_num_slots;
+        __le32                  rf_generation;
+        __le32                  rf_unused1;
+        __le64                  rf_unused2;
+};
+
+struct rcom_slot {
+        __le32                  ro_nodeid;
+        __le16                  ro_slot;
+        __le16                  ro_unused1;
+        __le64                  ro_unused2;
 };
 
 struct rcom_lock {
@@ -452,6 +483,7 @@ struct dlm_ls {
         struct list_head        ls_list;        /* list of lockspaces */
         dlm_lockspace_t         *ls_local_handle;
         uint32_t                ls_global_id;   /* global unique lockspace ID */
+        uint32_t                ls_generation;
         uint32_t                ls_exflags;
         int                     ls_lvblen;
         int                     ls_count;       /* refcount of processes in
@@ -490,6 +522,11 @@ struct dlm_ls {
         int                     ls_total_weight;
         int                     *ls_node_array;
 
+        int                     ls_slot;
+        int                     ls_num_slots;
+        int                     ls_slots_size;
+        struct dlm_slot         *ls_slots;
+
         struct dlm_rsb          ls_stub_rsb;    /* for returning errors */
         struct dlm_lkb          ls_stub_lkb;    /* for returning errors */
         struct dlm_message      ls_stub_ms;     /* for faking a reply */
@@ -537,6 +574,9 @@ struct dlm_ls {
         struct list_head        ls_root_list;   /* root resources */
         struct rw_semaphore     ls_root_sem;    /* protect root_list */
 
+        const struct dlm_lockspace_ops *ls_ops;
+        void                    *ls_ops_arg;
+
         int                     ls_namelen;
         char                    ls_name[1];
 };