LU-7836 ptlrpc: remove duplicate final ping req

[fs/lustre-release.git] / lustre / include / lustre_nodemap.h

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index 82931c0..3729253 100644 (file)
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -103,8 +103,9 @@ struct lu_nodemap {
  * not be needed.
  */
 struct nm_config_file {
-       struct dt_object        *ncf_obj;
-       struct list_head        ncf_list;
+       struct local_oid_storage        *ncf_los;
+       struct dt_object                *ncf_obj;
+       struct list_head                 ncf_list;
 };
 
 void nodemap_activate(const bool value);
@@ -132,13 +133,25 @@ __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);
+#ifdef HAVE_SERVER_SUPPORT
 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);
+#else
+#define nodemap_test_nid(nid, name_buf, name_len) do {} while(0)
+#endif
+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 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);
+                              struct nm_config_file *ncf,
+                              enum nm_config_file_type ncf_type);
 struct lu_nodemap *nodemap_get_from_exp(struct obd_export *exp);
 void nodemap_putref(struct lu_nodemap *nodemap);
 
@@ -173,7 +186,7 @@ struct nodemap_config {
 
 struct nodemap_config *nodemap_config_alloc(void);
 void nodemap_config_dealloc(struct nodemap_config *config);
-void nodemap_config_set_active(struct nodemap_config *config);
+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);