LU-11085 nodemap: switch interval tree to in-kernel impl.

[fs/lustre-release.git] / lustre / ptlrpc / nodemap_internal.h

diff --git a/lustre/ptlrpc/nodemap_internal.h b/lustre/ptlrpc/nodemap_internal.h
index d683d0d..96636ae 100644 (file)
--- a/lustre/ptlrpc/nodemap_internal.h
+++ b/lustre/ptlrpc/nodemap_internal.h
@@ -22,7 +22,7 @@
 /*
  * Copyright (C) 2013, Trustees of Indiana University
  *
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  *
  * Author: Joshua Walgenbach <jjw@iu.edu>
  */
@@ -31,16 +31,10 @@
 #define _NODEMAP_INTERNAL_H
 
 #include <lustre_nodemap.h>
-#include <interval_tree.h>
+#include <linux/rbtree.h>
 
 #define DEFAULT_NODEMAP "default"
 
-/* Turn on proc debug interface to allow OSS and
- * MDS nodes to configure nodemap independently of
- * MGS (since the nodemap distribution is not written
- * yet */
-#define NODEMAP_PROC_DEBUG 1
-
 /* Default nobody uid and gid values */
 
 #define NODEMAP_NOBODY_UID 99
@@ -64,7 +58,10 @@ struct lu_nid_range {
        /* list for nodemap */
        struct list_head         rn_list;
        /* nid interval tree */
-       struct interval_node     rn_node;
+       lnet_nid_t               rn_start,
+                                rn_end,
+                                rn_subtree_last;
+       struct rb_node           rn_rb;
 };
 
 struct lu_idmap {
@@ -78,34 +75,6 @@ struct lu_idmap {
        struct rb_node  id_fs_to_client;
 };
 
-struct nodemap_range_tree {
-       struct interval_node *nmrt_range_interval_root;
-       unsigned int nmrt_range_highest_id;
-};
-
-struct nodemap_config {
-       /* Highest numerical lu_nodemap.nm_id defined */
-       unsigned int nmc_nodemap_highest_id;
-
-       /* Simple flag to determine if nodemaps are active */
-       bool nmc_nodemap_is_active;
-
-       /* Pointer to default nodemap as it is needed more often */
-       struct lu_nodemap *nmc_default_nodemap;
-
-       /**
-        * Lock required to access the range tree.
-        */
-       struct rw_semaphore nmc_range_tree_lock;
-       struct nodemap_range_tree nmc_range_tree;
-
-       /**
-        * Hash keyed on nodemap name containing all
-        * nodemaps
-        */
-       struct cfs_hash *nmc_nodemap_hash;
-};
-
 /* first 4 bits of the nodemap_id is the index type */
 struct nodemap_key {
        __u32 nk_nodemap_id;
@@ -138,8 +107,6 @@ static inline __u32 nm_idx_set_type(unsigned int id, enum nodemap_idx_type t)
        return (id & NM_TYPE_MASK) | (t << NM_TYPE_SHIFT);
 }
 
-struct nodemap_config *nodemap_config_alloc(void);
-void nodemap_config_dealloc(struct nodemap_config *config);
 void nodemap_config_set_active(struct nodemap_config *config);
 struct lu_nodemap *nodemap_create(const char *name,
                                  struct nodemap_config *config,
@@ -171,8 +138,9 @@ int range_parse_nidstring(char *range_string, lnet_nid_t *start_nid,
                          lnet_nid_t *end_nid);
 void range_init_tree(void);
 struct lu_idmap *idmap_create(__u32 client_id, __u32 fs_id);
-void idmap_insert(enum nodemap_id_type id_type, struct lu_idmap *idmap,
-                struct lu_nodemap *nodemap);
+struct lu_idmap *idmap_insert(enum nodemap_id_type id_type,
+                             struct lu_idmap *idmap,
+                             struct lu_nodemap *nodemap);
 void idmap_delete(enum nodemap_id_type id_type,  struct lu_idmap *idmap,
                  struct lu_nodemap *nodemap);
 void idmap_delete_tree(struct lu_nodemap *nodemap);
@@ -186,6 +154,7 @@ void nm_member_delete_list(struct lu_nodemap *nodemap);
 struct lu_nodemap *nodemap_classify_nid(lnet_nid_t nid);
 void nm_member_reclassify_nodemap(struct lu_nodemap *nodemap);
 void nm_member_revoke_locks(struct lu_nodemap *nodemap);
+void nm_member_revoke_locks_always(struct lu_nodemap *nodemap);
 void nm_member_revoke_all(void);
 
 int nodemap_add_idmap_helper(struct lu_nodemap *nodemap,
@@ -200,6 +169,9 @@ struct rb_node *nm_rb_next_postorder(const struct rb_node *node);
 struct rb_node *nm_rb_first_postorder(const struct rb_root *root);
 void nodemap_getref(struct lu_nodemap *nodemap);
 void nodemap_putref(struct lu_nodemap *nodemap);
+int nm_hash_list_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+                   struct hlist_node *hnode,
+                   void *nodemap_list_head);
 
 #define nm_rbtree_postorder_for_each_entry_safe(pos, n,                        \
                                                root, field)            \