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

[fs/lustre-release.git] / lustre / include / lustre_nodemap.h

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index d8553e9..e8e8e41 100644 (file)
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -21,13 +21,16 @@
  */
 /*
  * Copyright (C) 2013, Trustees of Indiana University
+ *
+ * Copyright (c) 2017, Intel Corporation.
+ *
  * Author: Joshua Walgenbach <jjw@iu.edu>
  */
 
 #ifndef _LUSTRE_NODEMAP_H
 #define _LUSTRE_NODEMAP_H
 
-#include <lustre/lustre_idl.h>
+#include <uapi/linux/lustre/lustre_idl.h>
 
 #define LUSTRE_NODEMAP_NAME "nodemap"
 
@@ -73,7 +76,9 @@ struct lu_nodemap {
                                 nmf_deny_unknown:1,
                                 nmf_allow_root_access:1,
                                 nmf_map_uid_only:1,
-                                nmf_map_gid_only:1;
+                                nmf_map_gid_only:1,
+                                nmf_enable_audit:1,
+                                nmf_forbid_encryption:1;
        /* unique ID set by MGS */
        unsigned int             nm_id;
        /* nodemap ref counter */
@@ -85,7 +90,7 @@ struct lu_nodemap {
        /* NID range list */
        struct list_head         nm_ranges;
        /* lock for idmap red/black trees */
-       rwlock_t                 nm_idmap_lock;
+       struct rw_semaphore      nm_idmap_lock;
        /* UID map keyed by local UID */
        struct rb_root           nm_fs_to_client_uidmap;
        /* UID map keyed by remote UID */
@@ -102,6 +107,8 @@ struct lu_nodemap {
        struct nodemap_pde      *nm_pde_data;
        /* fileset the nodes of this nodemap are restricted to */
        char                     nm_fileset[PATH_MAX+1];
+       /* information about the expected SELinux policy on the nodes */
+       char                     nm_sepol[LUSTRE_NODEMAP_SEPOL_LENGTH + 1];
 
        /* used when loading/unloading nodemaps */
        struct list_head         nm_list;
@@ -132,6 +139,8 @@ int nodemap_set_deny_unknown(const char *name, bool deny_unknown);
 int nodemap_set_mapping_mode(const char *name, enum nodemap_mapping_modes mode);
 int nodemap_set_squash_uid(const char *name, uid_t uid);
 int nodemap_set_squash_gid(const char *name, gid_t gid);
+int nodemap_set_audit_mode(const char *name, bool enable_audit);
+int nodemap_set_forbid_encryption(const char *name, bool forbid_encryption);
 bool nodemap_can_setquota(const struct lu_nodemap *nodemap);
 int nodemap_add_idmap(const char *name, enum nodemap_id_type id_type,
                      const __u32 map[2]);
@@ -139,6 +148,8 @@ int nodemap_del_idmap(const char *name, enum nodemap_id_type id_type,
                      const __u32 map[2]);
 int nodemap_set_fileset(const char *name, const char *fileset);
 char *nodemap_get_fileset(const struct lu_nodemap *nodemap);
+int nodemap_set_sepol(const char *name, const char *sepol);
+const char *nodemap_get_sepol(const struct lu_nodemap *nodemap);
 __u32 nodemap_map_id(struct lu_nodemap *nodemap,
                     enum nodemap_id_type id_type,
                     enum nodemap_tree_type tree_type, __u32 id);
@@ -167,8 +178,9 @@ struct lu_nodemap *nodemap_get_from_exp(struct obd_export *exp);
 void nodemap_putref(struct lu_nodemap *nodemap);
 
 #ifdef HAVE_SERVER_SUPPORT
+
 struct nodemap_range_tree {
-       struct interval_node *nmrt_range_interval_root;
+       struct interval_tree_root nmrt_range_interval_root;
        unsigned int nmrt_range_highest_id;
 };