LU-12616 obclass: fix MDS start/stop race

[fs/lustre-release.git] / lustre / osp / osp_trans.c

diff --git a/lustre/osp/osp_trans.c b/lustre/osp/osp_trans.c
index c7eb681..a69a9cb 100644 (file)
--- a/lustre/osp/osp_trans.c
+++ b/lustre/osp/osp_trans.c
@@ -376,8 +376,8 @@ int osp_prep_update_req(const struct lu_env *env, struct obd_import *imp,
                buf_count++;
        }
        repsize += sizeof(*reply);
-       repsize = (repsize + OUT_UPDATE_REPLY_SIZE - 1) &
-                       ~(OUT_UPDATE_REPLY_SIZE - 1);
+       if (repsize < OUT_UPDATE_REPLY_SIZE)
+               repsize = OUT_UPDATE_REPLY_SIZE;
        LASSERT(buf_count > 0);
 
        req = ptlrpc_request_alloc(imp, &RQF_OUT_UPDATE);
@@ -602,17 +602,17 @@ static void osp_update_callback_fini(const struct lu_env *env,
  * \retval             negative error number on failure
  */
 static int osp_update_interpret(const struct lu_env *env,
-                               struct ptlrpc_request *req, void *arg, int rc)
+                               struct ptlrpc_request *req, void *args, int rc)
 {
-       struct object_update_reply      *reply  = NULL;
-       struct osp_update_args          *oaua   = arg;
-       struct osp_update_request       *our = oaua->oaua_update;
-       struct osp_thandle              *oth;
-       struct osp_update_callback      *ouc;
-       struct osp_update_callback      *next;
-       int                              count  = 0;
-       int                              index  = 0;
-       int                              rc1    = 0;
+       struct object_update_reply *reply = NULL;
+       struct osp_update_args *oaua = args;
+       struct osp_update_request *our = oaua->oaua_update;
+       struct osp_thandle *oth;
+       struct osp_update_callback *ouc;
+       struct osp_update_callback *next;
+       int count = 0;
+       int index = 0;
+       int rc1 = 0;
 
        ENTRY;