X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nodemap.h;h=35115172742dc19b895698f00974a5b6f4745825;hb=06be2b427fbca4f8a9a2be37b951a47ef3315925;hp=37292530b2b2bbeba0c625ba99cf2ff0c369ea22;hpb=d61ab8df9ab9bf452626e73136b3a3b6fbdc2bf6;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index 3729253..3511517 100644
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +27,7 @@
 #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"
 
@@ -48,6 +48,12 @@ enum nodemap_tree_type {
 	NODEMAP_CLIENT_TO_FS,
 };
 
+enum nodemap_mapping_modes {
+	NODEMAP_MAP_BOTH,
+	NODEMAP_MAP_UID_ONLY,
+	NODEMAP_MAP_GID_ONLY,
+};
+
 struct nodemap_pde {
 	char			 npe_name[LUSTRE_NODEMAP_NAME_LENGTH + 1];
 	struct proc_dir_entry	*npe_proc_entry;
@@ -64,7 +70,10 @@ 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_deny_unknown:1,
+				 nmf_allow_root_access:1,
+				 nmf_map_uid_only:1,
+				 nmf_map_gid_only:1;
 	/* unique ID set by MGS */
 	unsigned int		 nm_id;
 	/* nodemap ref counter */
@@ -76,7 +85,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 */
@@ -119,6 +128,8 @@ int nodemap_add_range(const char *name, const lnet_nid_t nid[2]);
 int nodemap_del_range(const char *name, const lnet_nid_t nid[2]);
 int nodemap_set_allow_root(const char *name, bool allow_root);
 int nodemap_set_trust_client_ids(const char *name, bool trust_client_ids);
+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);
 bool nodemap_can_setquota(const struct lu_nodemap *nodemap);
@@ -141,17 +152,17 @@ void nodemap_test_nid(lnet_nid_t nid, char *name_buf, size_t name_len);
 int nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype,
 		    __u32 client_id, __u32 *fs_id);
 
-enum nm_config_file_type {
-	NCFT_MGS,
-	NCFT_TGT,
-};
-struct nm_config_file *nm_config_file_register(const struct lu_env *env,
-					       struct dt_object *obj,
-					       struct local_oid_storage *los,
-					       enum nm_config_file_type ncf_type);
-void nm_config_file_deregister(const struct lu_env *env,
-			       struct nm_config_file *ncf,
-			       enum nm_config_file_type ncf_type);
+struct nm_config_file *nm_config_file_register_mgs(const struct lu_env *env,
+						   struct dt_object *obj,
+						   struct local_oid_storage *los);
+struct dt_device;
+struct nm_config_file *nm_config_file_register_tgt(const struct lu_env *env,
+						   struct dt_device *dev,
+						   struct local_oid_storage *los);
+void nm_config_file_deregister_mgs(const struct lu_env *env,
+				   struct nm_config_file *ncf);
+void nm_config_file_deregister_tgt(const struct lu_env *env,
+				   struct nm_config_file *ncf);
 struct lu_nodemap *nodemap_get_from_exp(struct obd_export *exp);
 void nodemap_putref(struct lu_nodemap *nodemap);
 
@@ -190,6 +201,7 @@ void nodemap_config_set_active_mgc(struct nodemap_config *config);
 
 int nodemap_process_idx_pages(struct nodemap_config *config, union lu_page *lip,
 			      struct lu_nodemap **recent_nodemap);
+
 #else /* disable nodemap processing in MGC of non-servers */
 static inline int nodemap_process_idx_pages(void *config,
 					    union lu_page *lip,