X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nodemap.h;h=e5b26f7d026786941babc4b56698ba85d418ab76;hb=e14246641c04c9e3004043f58f469532223d06d6;hp=221f8d78a81d3ea980fa220e1f18c45ee37a1612;hpb=1c7f9caa99df3082a3e506673721d359147843d3;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index 221f8d7..e5b26f7 100644
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -27,8 +27,9 @@
 #ifndef _LUSTRE_NODEMAP_H
 #define _LUSTRE_NODEMAP_H
 
+#include <lustre/lustre_idl.h>
+
 #define LUSTRE_NODEMAP_NAME "nodemap"
-#define LUSTRE_NODEMAP_NAME_LENGTH 16
 
 #define LUSTRE_NODEMAP_DEFAULT_ID 0
 
@@ -47,6 +48,12 @@ enum nodemap_tree_type {
 	NODEMAP_CLIENT_TO_FS,
 };
 
+struct nodemap_pde {
+	char			 npe_name[LUSTRE_NODEMAP_NAME_LENGTH + 1];
+	struct proc_dir_entry	*npe_proc_entry;
+	struct list_head	 npe_list_member;
+};
+
 /** The nodemap id 0 will be the default nodemap. It will have a configuration
  * set by the MGS, but no ranges will be allowed as all NIDs that do not map
  * will be added to the default nodemap
@@ -57,10 +64,7 @@ struct lu_nodemap {
 	char			 nm_name[LUSTRE_NODEMAP_NAME_LENGTH + 1];
 	/* flags to govern nodemap behavior */
 	bool			 nmf_trust_client_ids:1,
-				 nmf_allow_root_access:1,
-				 nmf_block_lookups:1,
-				 nmf_hmac_required:1,
-				 nmf_encryption_required:1;
+				 nmf_allow_root_access:1;
 	/* unique ID set by MGS */
 	unsigned int		 nm_id;
 	/* nodemap ref counter */
@@ -81,16 +85,24 @@ struct lu_nodemap {
 	struct rb_root		 nm_fs_to_client_gidmap;
 	/* GID map keyed by remote UID */
 	struct rb_root		 nm_client_to_fs_gidmap;
-	/* proc directory entry */
-	struct proc_dir_entry	*nm_proc_entry;
 	/* attached client members of this nodemap */
 	struct mutex		 nm_member_list_lock;
 	struct list_head	 nm_member_list;
 	/* access by nodemap name */
 	struct hlist_node	 nm_hash;
+	struct nodemap_pde	*nm_pde_data;
 
-	/* used when unloading nodemaps */
-	struct list_head         nm_list;
+	/* used when loading/unloading nodemaps */
+	struct list_head	 nm_list;
+};
+
+/* Store handles to local MGC storage to save config locally. In future
+ * versions of nodemap, mgc will receive the config directly and so this might
+ * not be needed.
+ */
+struct nm_config_file {
+	struct dt_object	*ncf_obj;
+	struct list_head	ncf_list;
 };
 
 void nodemap_activate(const bool value);
@@ -119,4 +131,8 @@ ssize_t nodemap_map_acl(struct lu_nodemap *nodemap, void *buf, size_t size,
 void nodemap_test_nid(lnet_nid_t nid, char *name_buf, size_t name_len);
 __u32 nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype,
 		      __u32 client_id);
+struct nm_config_file *nm_config_file_register(const struct lu_env *env,
+					       struct dt_object *obj);
+void nm_config_file_deregister(const struct lu_env *env,
+			       struct nm_config_file *ncf);
 #endif	/* _LUSTRE_NODEMAP_H */