X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nodemap.h;h=9a161c2a6918495b160093d3c93ac39442810180;hb=39eb431b2c7d5cb76c7001000869073d768f5baf;hp=db10bda5d7e8e08bfe5ef66a9b0cb74c60d419c6;hpb=ffe234a077576f0f66f6fe9c165be180133be89a;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index db10bda..9a161c2 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
  */
@@ -64,6 +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_deny_unknown:1,
 				 nmf_allow_root_access:1;
 	/* unique ID set by MGS */
 	unsigned int		 nm_id;
@@ -119,6 +120,7 @@ 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_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);
@@ -138,20 +140,20 @@ void nodemap_test_nid(lnet_nid_t nid, char *name_buf, size_t name_len);
 #else
 #define nodemap_test_nid(nid, name_buf, name_len) do {} while(0)
 #endif
-__u32 nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype,
-		      __u32 client_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);
+int nodemap_test_id(lnet_nid_t nid, enum nodemap_id_type idtype,
+		    __u32 client_id, __u32 *fs_id);
+
+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 +192,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,