X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fptlrpc%2Fptlrpc_internal.h;h=53f14dc52158cdd8f87d773c237e86bf38ba2b0c;hb=cd8dc58c76b43c5dfa9ec238cc3f4264e9f5f89f;hp=5a2b2d9457d5d576af333a797f6c6ef2e787bcf4;hpb=fee90a75e11d68f348decd00f698849d085069f2;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/ptlrpc_internal.h b/lustre/ptlrpc/ptlrpc_internal.h
index 5a2b2d9..53f14dc 100644
--- a/lustre/ptlrpc/ptlrpc_internal.h
+++ b/lustre/ptlrpc/ptlrpc_internal.h
@@ -46,6 +46,7 @@ struct obd_import;
 struct ldlm_res_id;
 struct ptlrpc_request_set;
 extern int test_req_buffer_pressure;
+extern struct list_head ptlrpc_all_services;
 extern struct mutex ptlrpc_all_services_mutex;
 
 int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait);
@@ -53,11 +54,13 @@ int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait);
 int ptlrpcd_start(int index, int max, const char *name, struct ptlrpcd_ctl *pc);
 
 /* client.c */
+void ptlrpc_at_adj_net_latency(struct ptlrpc_request *req,
+			       unsigned int service_time);
 struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned npages, unsigned max_brw,
 					 unsigned type, unsigned portal);
 int ptlrpc_request_cache_init(void);
 void ptlrpc_request_cache_fini(void);
-struct ptlrpc_request *ptlrpc_request_cache_alloc(int flags);
+struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags);
 void ptlrpc_request_cache_free(struct ptlrpc_request *req);
 void ptlrpc_init_xid(void);
 
@@ -139,6 +142,8 @@ ptlrpc_nrs_req_peek_nolock(struct ptlrpc_service_part *svcpt, bool hp)
 
 void ptlrpc_nrs_req_del_nolock(struct ptlrpc_request *req);
 bool ptlrpc_nrs_req_pending_nolock(struct ptlrpc_service_part *svcpt, bool hp);
+bool ptlrpc_nrs_req_throttling_nolock(struct ptlrpc_service_part *svcpt,
+				      bool hp);
 
 int ptlrpc_nrs_policy_control(const struct ptlrpc_service *svc,
 			      enum ptlrpc_nrs_queue_type queue, char *name,
@@ -244,11 +249,7 @@ void ptlrpc_pinger_sending_on_import(struct obd_import *imp);
 void ptlrpc_pinger_commit_expected(struct obd_import *imp);
 void ptlrpc_pinger_wake_up(void);
 void ptlrpc_ping_import_soon(struct obd_import *imp);
-#ifdef __KERNEL__
 int ping_evictor_wake(struct obd_export *exp);
-#else
-#define ping_evictor_wake(exp)     1
-#endif
 
 /* sec_null.c */
 int  sptlrpc_null_init(void);
@@ -280,19 +281,26 @@ void sptlrpc_conf_choose_flavor(enum lustre_sec_part from,
 int  sptlrpc_conf_init(void);
 void sptlrpc_conf_fini(void);
 
+struct dentry;
+struct vfsmount;
+int lustre_rename(struct dentry *dir, struct vfsmount *mnt, char *old_name,
+		  char *new_name);
+
 /* sec.c */
 int  sptlrpc_init(void);
 void sptlrpc_fini(void);
 
 static inline int ll_rpc_recoverable_error(int rc)
 {
-        return (rc == -ENOTCONN || rc == -ENODEV);
+	return (rc == -ENOTCONN || rc == -ENODEV);
 }
 
 #ifdef HAVE_SERVER_SUPPORT
 int tgt_mod_init(void);
 void tgt_mod_exit(void);
-#else
+int nodemap_mod_init(void);
+void nodemap_mod_exit(void);
+#else /* HAVE_SERVER_SUPPORT */
 static inline int tgt_mod_init(void)
 {
 	return 0;
@@ -302,11 +310,21 @@ static inline void tgt_mod_exit(void)
 {
 	return;
 }
-#endif
+
+static inline int nodemap_mod_init(void)
+{
+	return 0;
+}
+
+static inline void nodemap_mod_exit(void)
+{
+	return;
+}
+#endif /* !HAVE_SERVER_SUPPORT */
 
 static inline void ptlrpc_reqset_put(struct ptlrpc_request_set *set)
 {
-        if (cfs_atomic_dec_and_test(&set->set_refcount))
-                OBD_FREE_PTR(set);
+	if (atomic_dec_and_test(&set->set_refcount))
+		OBD_FREE_PTR(set);
 }
 #endif /* PTLRPC_INTERNAL_H */