- trivial cleanup in arguments order;

- fixed bug in seq-mgr recovery code, @in should be taken from client, not from server.

diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c
index 47b463b..94506ea 100644 (file)
--- a/lustre/fid/fid_handler.c
+++ b/lustre/fid/fid_handler.c
@@ -348,11 +348,10 @@ static int seq_req_handle(struct ptlrpc_request *req,
                         RETURN(-EPROTO);
 
                 if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) {
-                        in = req_capsule_server_get(&info->sti_pill,
-                                                    &RMF_SEQ_RANGE);
-                        /* umka, FIXME: "in" has not been filled with anything
+                        in = req_client_server_get(&info->sti_pill,
+                                                   &RMF_SEQ_RANGE);
+
                         LASSERT(!range_is_zero(in) && range_is_sane(in));
-                        */
                 }
         
                 ctx = req->rq_svc_thread->t_ctx;

diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c
index 8ae70a7..ab26a2a 100644 (file)
--- a/lustre/fld/fld_handler.c
+++ b/lustre/fld/fld_handler.c
@@ -315,10 +315,8 @@ static void fld_server_proc_fini(struct lu_server_fld *fld)
 }
 #endif
 
-int fld_server_init(struct lu_server_fld *fld,
-                    const struct lu_context *ctx,
-                    struct dt_device *dt,
-                    const char *uuid)
+int fld_server_init(struct lu_server_fld *fld, struct dt_device *dt,
+                    const char *uuid, const struct lu_context *ctx)
 {
         int rc;
         ENTRY;

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index 7b21879..a1c00b6 100644 (file)
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -138,9 +138,9 @@ int fld_query(struct com_thread_info *info);
 
 /* Server methods */
 int fld_server_init(struct lu_server_fld *fld,
-                    const struct lu_context *ctx,
                     struct dt_device *dt,
-                    const char *uuid);
+                    const char *uuid,
+                    const struct lu_context *ctx);
 
 void fld_server_fini(struct lu_server_fld *fld,
                      const struct lu_context *ctx);

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index b11fd0f..4f8900f 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -2189,8 +2189,8 @@ static int mdt_fld_init(const struct lu_context *ctx,
         if (ls->ls_server_fld == NULL)
                 RETURN(rc = -ENOMEM);
 
-        rc = fld_server_init(ls->ls_server_fld, ctx,
-                             m->mdt_bottom, uuid);
+        rc = fld_server_init(ls->ls_server_fld,
+                             m->mdt_bottom, uuid, ctx);
         if (rc) {
                 OBD_FREE_PTR(ls->ls_server_fld);
                 ls->ls_server_fld = NULL;