b=3031

[fs/lustre-release.git] / lustre / ptlrpc / ptlrpc_internal.h

diff --git a/lustre/ptlrpc/ptlrpc_internal.h b/lustre/ptlrpc/ptlrpc_internal.h
index f8adbd1..12a3c20 100644 (file)
--- a/lustre/ptlrpc/ptlrpc_internal.h
+++ b/lustre/ptlrpc/ptlrpc_internal.h
@@ -32,15 +32,13 @@ struct obd_import;
 struct ldlm_res_id;
 struct ptlrpc_request_set;
 
-void ptlrpc_daemonize(void);
-
 void ptlrpc_request_handle_notconn(struct ptlrpc_request *);
 void lustre_assert_wire_constants(void);
 int ptlrpc_import_in_recovery(struct obd_import *imp);
 int ptlrpc_set_import_discon(struct obd_import *imp);
 void ptlrpc_handle_failed_import(struct obd_import *imp);
-int ptlrpc_import_recovery_state_machine(struct obd_import *imp);
-int ptlrpc_replay_next(struct obd_import *imp);
+int ptlrpc_replay_next(struct obd_import *imp, int *inflight);
+void ptlrpc_initiate_recovery(struct obd_import *imp);
 
 
 #ifdef __KERNEL__
@@ -87,6 +85,14 @@ static inline int opcode_offset(__u32 opc) {
                         (LDLM_LAST_OPC - LDLM_FIRST_OPC) +
                         (MDS_LAST_OPC - MDS_FIRST_OPC) +
                         (OST_LAST_OPC - OST_FIRST_OPC));
+        } else if (opc < SEC_LAST_OPC) {
+                /* Security negotiate */
+                return (opc - SEC_FIRST_OPC +
+                        (PTLBD_LAST_OPC - PTLBD_FIRST_OPC) +
+                        (LDLM_LAST_OPC - LDLM_FIRST_OPC) +
+                        (MDS_LAST_OPC - MDS_FIRST_OPC) +
+                        (OST_LAST_OPC - OST_FIRST_OPC) +
+                        (OBD_LAST_OPC - OBD_FIRST_OPC));
         } else {
                 /* Unknown Opcode */
                 return -1;
@@ -97,20 +103,28 @@ static inline int opcode_offset(__u32 opc) {
                             (LDLM_LAST_OPC - LDLM_FIRST_OPC)   + \
                             (MDS_LAST_OPC - MDS_FIRST_OPC)     + \
                             (OST_LAST_OPC - OST_FIRST_OPC)     + \
-                            (OBD_LAST_OPC - OBD_FIRST_OPC))
+                            (OBD_LAST_OPC - OBD_FIRST_OPC)     + \
+                            (SEC_LAST_OPC - SEC_FIRST_OPC))
 
 enum {
-        PTLRPC_REQWAIT_CNTR     = 0,
-        PTLRPC_SVCIDLETIME_CNTR = 1,
-        //PTLRPC_SVCEQDEPTH_CNTR,
+        PTLRPC_REQWAIT_CNTR = 0,
+        PTLRPC_REQQDEPTH_CNTR,
+        PTLRPC_REQACTIVE_CNTR,
+        PTLRPC_REQBUF_AVAIL_CNTR,
         PTLRPC_LAST_CNTR
 };
 
 int ptlrpc_expire_one_request(struct ptlrpc_request *req);
 
+/* pers.c */
+void ptlrpc_fill_bulk_md(ptl_md_t *md, struct ptlrpc_bulk_desc *desc);
+void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page, 
+                          int pageoffset, int len);
+
 /* pinger.c */
 int ptlrpc_start_pinger(void);
 int ptlrpc_stop_pinger(void);
 void ptlrpc_pinger_sending_on_import(struct obd_import *imp);
+void ptlrpc_pinger_wake_up(void);
 
 #endif /* PTLRPC_INTERNAL_H */