LU-5569 ptlrpc: change reverse import life cycle

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

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 64419d0..a7f37c2 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -697,12 +697,12 @@ struct ptlrpc_reply_state {
          */
         struct lustre_msg     *rs_msg;          /* reply message */
 
-        /** Number of locks awaiting client ACK */
-        int                    rs_nlocks;
-        /** Handles of locks awaiting client reply ACK */
-        struct lustre_handle   rs_locks[RS_MAX_LOCKS];
-        /** Lock modes of locks in \a rs_locks */
-        ldlm_mode_t            rs_modes[RS_MAX_LOCKS];
+       /** Number of locks awaiting client ACK */
+       int                     rs_nlocks;
+       /** Handles of locks awaiting client reply ACK */
+       struct lustre_handle    rs_locks[RS_MAX_LOCKS];
+       /** Lock modes of locks in \a rs_locks */
+       enum ldlm_mode          rs_modes[RS_MAX_LOCKS];
 };
 
 struct ptlrpc_thread;
@@ -740,7 +740,7 @@ struct ptlrpc_request_pool {
        /** Maximum message size that would fit into a rquest from this pool */
        int                     prp_rq_size;
        /** Function to allocate more requests for this pool */
-       void (*prp_populate)(struct ptlrpc_request_pool *, int);
+       int (*prp_populate)(struct ptlrpc_request_pool *, int);
 };
 
 struct lu_context;
@@ -1081,7 +1081,6 @@ struct ptlrpc_request {
 
        /** early replies go to offset 0, regular replies go after that */
        unsigned int                     rq_reply_off;
-
        /** @} */
 
        /** Fields that help to see if request and reply were swabbed or not */
@@ -1512,7 +1511,7 @@ struct ptlrpc_thread {
         /**
          * service thread pid
          */
-        pid_t t_pid;
+       pid_t t_pid;
         /**
          * put watchdog in the structure per thread b=14840
          */
@@ -2097,11 +2096,11 @@ void ptlrpc_set_destroy(struct ptlrpc_request_set *);
 void ptlrpc_set_add_req(struct ptlrpc_request_set *, struct ptlrpc_request *);
 
 void ptlrpc_free_rq_pool(struct ptlrpc_request_pool *pool);
-void ptlrpc_add_rqs_to_pool(struct ptlrpc_request_pool *pool, int num_rq);
+int ptlrpc_add_rqs_to_pool(struct ptlrpc_request_pool *pool, int num_rq);
 
 struct ptlrpc_request_pool *
 ptlrpc_init_rq_pool(int, int,
-                    void (*populate_pool)(struct ptlrpc_request_pool *, int));
+                   int (*populate_pool)(struct ptlrpc_request_pool *, int));
 
 void ptlrpc_at_set_req_timeout(struct ptlrpc_request *req);
 struct ptlrpc_request *ptlrpc_request_alloc(struct obd_import *imp,
@@ -2285,8 +2284,8 @@ int ptlrpc_init_import(struct obd_import *imp);
 int ptlrpc_disconnect_import(struct obd_import *imp, int noclose);
 int ptlrpc_import_recovery_state_machine(struct obd_import *imp);
 void deuuidify(char *uuid, const char *prefix, char **uuid_start,
-               int *uuid_len);
-
+              int *uuid_len);
+void ptlrpc_import_enter_resend(struct obd_import *imp);
 /* ptlrpc/pack_generic.c */
 int ptlrpc_reconnect_import(struct obd_import *imp);
 /** @} */
@@ -2360,11 +2359,7 @@ __u32 lustre_msg_get_service_time(struct lustre_msg *msg);
 char *lustre_msg_get_jobid(struct lustre_msg *msg);
 __u32 lustre_msg_get_cksum(struct lustre_msg *msg);
 __u64 lustre_msg_get_mbits(struct lustre_msg *msg);
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
-__u32 lustre_msg_calc_cksum(struct lustre_msg *msg, int compat18);
-#else
 __u32 lustre_msg_calc_cksum(struct lustre_msg *msg);
-#endif
 void lustre_msg_set_handle(struct lustre_msg *msg,struct lustre_handle *handle);
 void lustre_msg_set_type(struct lustre_msg *msg, __u32 type);
 void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc);
@@ -2676,7 +2671,6 @@ int llog_origin_handle_close(struct ptlrpc_request *req);
 
 /* ptlrpc/llog_client.c */
 extern struct llog_operations llog_client_ops;
-
 /** @} net */
 
 #endif