LU-11398 ptlrpc: clean up rq_interpret_reply callbacks

[fs/lustre-release.git] / lustre / ldlm / ldlm_request.c

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 54a570f..8c4e555 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -1049,8 +1049,9 @@ EXPORT_SYMBOL(ldlm_cli_enqueue);
  */
 static int lock_convert_interpret(const struct lu_env *env,
                                  struct ptlrpc_request *req,
-                                 struct ldlm_async_args *aa, int rc)
+                                 void *args, int rc)
 {
+       struct ldlm_async_args *aa = args;
        struct ldlm_lock *lock;
        struct ldlm_reply *reply;
 
@@ -1232,7 +1233,7 @@ int ldlm_cli_convert(struct ldlm_lock *lock, __u32 *flags)
 
        aa = ptlrpc_req_async_args(req);
        ldlm_lock2handle(lock, &aa->lock_handle);
-       req->rq_interpret_reply = (ptlrpc_interpterer_t)lock_convert_interpret;
+       req->rq_interpret_reply = lock_convert_interpret;
 
        ptlrpcd_add_req(req);
        RETURN(0);
@@ -2359,9 +2360,9 @@ static int ldlm_chain_lock_for_replay(struct ldlm_lock *lock, void *closure)
 }
 
 static int replay_lock_interpret(const struct lu_env *env,
-                                struct ptlrpc_request *req,
-                                struct ldlm_async_args *aa, int rc)
+                                struct ptlrpc_request *req, void *args, int rc)
 {
+       struct ldlm_async_args *aa = args;
        struct ldlm_lock     *lock;
        struct ldlm_reply    *reply;
        struct obd_export    *exp;
@@ -2481,7 +2482,7 @@ static int replay_one_lock(struct obd_import *imp, struct ldlm_lock *lock)
        CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
        aa = ptlrpc_req_async_args(req);
        aa->lock_handle = body->lock_handle[0];
-       req->rq_interpret_reply = (ptlrpc_interpterer_t)replay_lock_interpret;
+       req->rq_interpret_reply = replay_lock_interpret;
        ptlrpcd_add_req(req);
 
        RETURN(0);