b=19486 add server identifier into lu_seq_range.

[fs/lustre-release.git] / lustre / fid / fid_request.c

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 62d7349..ca60353 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -63,13 +63,13 @@
 #include <lustre_mdc.h>
 #include "fid_internal.h"
 
-static int seq_client_rpc(struct lu_client_seq *seq, struct lu_seq_range *input,
+static int seq_client_rpc(struct lu_client_seq *seq,
                           struct lu_seq_range *output, __u32 opc,
                           const char *opcname)
 {
         struct obd_export     *exp = seq->lcs_exp;
         struct ptlrpc_request *req;
-        struct lu_seq_range       *out, *in;
+        struct lu_seq_range   *out, *in;
         __u32                 *op;
         int                    rc;
         ENTRY;
@@ -85,24 +85,30 @@ static int seq_client_rpc(struct lu_client_seq *seq, struct lu_seq_range *input,
 
         /* Zero out input range, this is not recovery yet. */
         in = req_capsule_client_get(&req->rq_pill, &RMF_SEQ_RANGE);
-        if (input != NULL)
-                *in = *input;
-        else
-                range_init(in);
+        range_init(in);
 
         ptlrpc_request_set_replen(req);
 
-        if (seq->lcs_type == LUSTRE_SEQ_METADATA) {
-                req->rq_request_portal = (opc == SEQ_ALLOC_SUPER) ?
-                        SEQ_CONTROLLER_PORTAL : SEQ_METADATA_PORTAL;
-                /* update mdt field of *in, it is required for fld update
-                 * on super sequence allocator node. */
-                if (opc == SEQ_ALLOC_SUPER)
-                        in->lsr_mdt = seq->lcs_space.lsr_mdt;
+       if (seq->lcs_type == LUSTRE_SEQ_METADATA) {
+                req->rq_request_portal = SEQ_METADATA_PORTAL;
+                in->lsr_flags = LU_SEQ_RANGE_MDT;
         } else {
-                LASSERT(opc == SEQ_ALLOC_META);
+                LASSERTF(seq->lcs_type == LUSTRE_SEQ_DATA,
+                         "unknown lcs_type %u\n", seq->lcs_type);
                 req->rq_request_portal = SEQ_DATA_PORTAL;
+                in->lsr_flags = LU_SEQ_RANGE_OST;
         }
+
+        if (opc == SEQ_ALLOC_SUPER) {
+                /* Update index field of *in, it is required for
+                 * FLD update on super sequence allocator node. */
+                in->lsr_index = seq->lcs_space.lsr_index;
+                req->rq_request_portal = SEQ_CONTROLLER_PORTAL;
+        } else {
+                LASSERTF(opc == SEQ_ALLOC_META,
+                         "unknown opcode %u\n, opc", opc);
+        }
+
         ptlrpc_at_set_req_timeout(req);
 
         mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
@@ -126,7 +132,6 @@ static int seq_client_rpc(struct lu_client_seq *seq, struct lu_seq_range *input,
                        DRANGE"]\n", seq->lcs_name, PRANGE(output));
                 GOTO(out_req, rc = -EINVAL);
         }
-        *in = *out;
 
         CDEBUG(D_INFO, "%s: Allocated %s-sequence "DRANGE"]\n",
                seq->lcs_name, opcname, PRANGE(output));
@@ -138,9 +143,8 @@ out_req:
 }
 
 /* Request sequence-controller node to allocate new super-sequence. */
-int seq_client_replay_super(struct lu_client_seq *seq,
-                            struct lu_seq_range *range,
-                            const struct lu_env *env)
+int seq_client_alloc_super(struct lu_client_seq *seq,
+                           const struct lu_env *env)
 {
         int rc;
         ENTRY;
@@ -150,11 +154,11 @@ int seq_client_replay_super(struct lu_client_seq *seq,
 #ifdef __KERNEL__
         if (seq->lcs_srv) {
                 LASSERT(env != NULL);
-                rc = seq_server_alloc_super(seq->lcs_srv, range,
-                                            &seq->lcs_space, env);
+                rc = seq_server_alloc_super(seq->lcs_srv, &seq->lcs_space,
+                                            env);
         } else {
 #endif
-                rc = seq_client_rpc(seq, range, &seq->lcs_space,
+                rc = seq_client_rpc(seq, &seq->lcs_space,
                                     SEQ_ALLOC_SUPER, "super");
 #ifdef __KERNEL__
         }
@@ -163,14 +167,6 @@ int seq_client_replay_super(struct lu_client_seq *seq,
         RETURN(rc);
 }
 
-/* Request sequence-controller node to allocate new super-sequence. */
-int seq_client_alloc_super(struct lu_client_seq *seq,
-                           const struct lu_env *env)
-{
-        ENTRY;
-        RETURN(seq_client_replay_super(seq, NULL, env));
-}
-
 /* Request sequence-controller node to allocate new meta-sequence. */
 static int seq_client_alloc_meta(struct lu_client_seq *seq,
                                  const struct lu_env *env)
@@ -181,11 +177,10 @@ static int seq_client_alloc_meta(struct lu_client_seq *seq,
 #ifdef __KERNEL__
         if (seq->lcs_srv) {
                 LASSERT(env != NULL);
-                rc = seq_server_alloc_meta(seq->lcs_srv, NULL,
-                                           &seq->lcs_space, env);
+                rc = seq_server_alloc_meta(seq->lcs_srv, &seq->lcs_space, env);
         } else {
 #endif
-                rc = seq_client_rpc(seq, NULL, &seq->lcs_space,
+                rc = seq_client_rpc(seq, &seq->lcs_space,
                                     SEQ_ALLOC_META, "meta");
 #ifdef __KERNEL__
         }
@@ -289,7 +284,7 @@ void seq_client_flush(struct lu_client_seq *seq)
          * set to -1 for dgb check.
          */
 
-        seq->lcs_space.lsr_mdt = -1;
+        seq->lcs_space.lsr_index = -1;
 
         range_init(&seq->lcs_space);
         cfs_up(&seq->lcs_sem);