X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nodemap.h;h=9fa9d1c2a073d807c6941c61f871eeb47e43fd3a;hb=634a9beb8cde7bc3677d213ce841aa6c5d67feaa;hp=c8bf411eb6fad854f1d6b2dec6dbc30f078ccab3;hpb=45cb603b4352a73077dcc45ec2cdea403837a7ba;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index c8bf411..9fa9d1c 100644
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -15,19 +15,22 @@
  *
  * 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
  */
 /*
  * 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"
 
@@ -48,6 +51,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;
@@ -65,7 +74,10 @@ struct lu_nodemap {
 	/* flags to govern nodemap behavior */
 	bool			 nmf_trust_client_ids:1,
 				 nmf_deny_unknown:1,
-				 nmf_allow_root_access:1;
+				 nmf_allow_root_access:1,
+				 nmf_map_uid_only:1,
+				 nmf_map_gid_only:1,
+				 nmf_enable_audit:1;
 	/* unique ID set by MGS */
 	unsigned int		 nm_id;
 	/* nodemap ref counter */
@@ -77,7 +89,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 */
@@ -121,8 +133,10 @@ 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);
+int nodemap_set_audit_mode(const char *name, bool enable_audit);
 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]);