X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nodemap.h;h=e8e8e41c3e303fe58efefeb18673c07ec5c5f769;hb=cc27201a76574b51dc3ffb37f039b3364cab386d;hp=9d200bf651b64cf4b8d261f17f577bdbcf26513c;hpb=1f6cb3534e74f0c9462008c8088b5734b64ed41c;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index 9d200bf..e8e8e41 100644
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -77,7 +77,8 @@ struct lu_nodemap {
 				 nmf_allow_root_access:1,
 				 nmf_map_uid_only:1,
 				 nmf_map_gid_only:1,
-				 nmf_enable_audit:1;
+				 nmf_enable_audit:1,
+				 nmf_forbid_encryption:1;
 	/* unique ID set by MGS */
 	unsigned int		 nm_id;
 	/* nodemap ref counter */
@@ -139,6 +140,7 @@ 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]);
@@ -176,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;
 };