X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nodemap.h;h=375154d11faedaedb03a4b164a1d18eed826f6a5;hb=9ea40a338c6e58a59792df56f963e58afced4e26;hp=2e0cf6b85f18ef29cb35b27b3f1e7c3175e95744;hpb=83f04354ff68a14d7492e35a9576c91492a1206c;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index 2e0cf6b..375154d 100644
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -47,6 +47,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
@@ -54,45 +60,47 @@ enum nodemap_tree_type {
 
 struct lu_nodemap {
 	/* human readable ID */
-	char			nm_name[LUSTRE_NODEMAP_NAME_LENGTH + 1];
+	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;
+	bool			 nmf_trust_client_ids:1,
+				 nmf_allow_root_access:1,
+				 nmf_block_lookups:1,
+				 nmf_hmac_required:1,
+				 nmf_encryption_required:1;
 	/* unique ID set by MGS */
-	int			nm_id;
+	unsigned int		 nm_id;
 	/* nodemap ref counter */
-	atomic_t		nm_refcount;
+	atomic_t		 nm_refcount;
 	/* UID to squash unmapped UIDs */
-	uid_t			nm_squash_uid;
+	uid_t			 nm_squash_uid;
 	/* GID to squash unmapped GIDs */
-	gid_t			nm_squash_gid;
+	gid_t			 nm_squash_gid;
 	/* NID range list */
-	struct list_head	nm_ranges;
+	struct list_head	 nm_ranges;
 	/* lock for idmap red/black trees */
-	rwlock_t		nm_idmap_lock;
+	rwlock_t		 nm_idmap_lock;
 	/* UID map keyed by local UID */
-	struct rb_root		nm_fs_to_client_uidmap;
+	struct rb_root		 nm_fs_to_client_uidmap;
 	/* UID map keyed by remote UID */
-	struct rb_root		nm_client_to_fs_uidmap;
+	struct rb_root		 nm_client_to_fs_uidmap;
 	/* GID map keyed by local UID */
-	struct rb_root		nm_fs_to_client_gidmap;
+	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;
+	struct rb_root		 nm_client_to_fs_gidmap;
 	/* attached client members of this nodemap */
-	cfs_hash_t		*nm_member_hash;
+	struct mutex		 nm_member_list_lock;
+	struct list_head	 nm_member_list;
 	/* access by nodemap name */
-	struct hlist_node	nm_hash;
+	struct hlist_node	 nm_hash;
+	struct nodemap_pde	*nm_pde_data;
+
+	/* used when unloading nodemaps */
+	struct list_head	 nm_list;
 };
 
 void nodemap_activate(const bool value);
 int nodemap_add(const char *nodemap_name);
 int nodemap_del(const char *nodemap_name);
-struct lu_nodemap *nodemap_classify_nid(lnet_nid_t nid);
 int nodemap_add_member(lnet_nid_t nid, struct obd_export *exp);
 void nodemap_del_member(struct obd_export *exp);
 int nodemap_parse_range(const char *range_string, lnet_nid_t range[2]);
@@ -113,4 +121,7 @@ __u32 nodemap_map_id(struct lu_nodemap *nodemap,
 		     enum nodemap_tree_type tree_type, __u32 id);
 ssize_t nodemap_map_acl(struct lu_nodemap *nodemap, void *buf, size_t size,
 			enum nodemap_tree_type tree_type);
+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);
 #endif	/* _LUSTRE_NODEMAP_H */