new mgc, mgs codes

[fs/lustre-release.git] / lustre / ptlrpc / llog_client.c

diff --git a/lustre/ptlrpc/llog_client.c b/lustre/ptlrpc/llog_client.c
index 5ea8bca..d85da42 100644 (file)
--- a/lustre/ptlrpc/llog_client.c
+++ b/lustre/ptlrpc/llog_client.c
@@ -4,20 +4,23 @@
  *  Copyright (C) 2001-2004 Cluster File Systems, Inc.
  *   Author: Andreas Dilger <adilger@clusterfs.com>
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ *   This file is part of the Lustre file system, http://www.lustre.org
+ *   Lustre is a trademark of Cluster File Systems, Inc.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ *   You may have signed or agreed to another license before downloading
+ *   this software.  If so, you are bound by the terms and conditions
+ *   of that agreement, and the following does not apply to you.  See the
+ *   LICENSE file included with this distribution for more information.
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ *   If you did not agree to a different license, then this copy of Lustre
+ *   is open source software; you can redistribute it and/or modify it
+ *   under the terms of version 2 of the GNU General Public License as
+ *   published by the Free Software Foundation.
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   In either case, Lustre is distributed in the hope that it will be
+ *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   license text for more details.
  *
  *  remote api for llog - client side
  *
@@ -38,17 +41,20 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
 #include <linux/lustre_net.h>
+#include <linux/lustre_mgs.h>
 #include <libcfs/list.h>
 
 /* This is a callback from the llog_* functions.
  * Assumes caller has already pushed us into the kernel context. */
 static int llog_client_create(struct llog_ctxt *ctxt, struct llog_handle **res,
-                            struct llog_logid *logid, char *name)
+                              struct llog_logid *logid, char *name)
 {
         struct obd_import *imp;
         struct llogd_body req_body;
         struct llogd_body *body;
         struct llog_handle *handle;
+        struct obd_device *obd = ctxt->loc_obd;
+        struct mgc_open_llog *mol;
         struct ptlrpc_request *req = NULL;
         int size[2] = {sizeof(req_body)};
         char *tmp[2] = {(char*) &req_body};
@@ -77,12 +83,20 @@ static int llog_client_create(struct llog_ctxt *ctxt, struct llog_handle **res,
         req_body.lgd_ctxt_idx = ctxt->loc_idx - 1;
 
         if (name) {
+                mol = mgc_find_open_llog(obd, name);
+                if (!mol) {
+                        CERROR("The llog have not registered "
+                               "in mgc obd when mount.\n");
+                        GOTO(err_free, rc = -EINVAL);
+                }
+                handle->lgh_mol = mol;
                 size[bufcount] = strlen(name) + 1;
                 tmp[bufcount] = name;
                 bufcount++;
         }
 
-        req = ptlrpc_prep_req(imp, LLOG_ORIGIN_HANDLE_CREATE,bufcount,size,tmp);
+        req = ptlrpc_prep_req(imp, LLOG_ORIGIN_HANDLE_CREATE, 
+                              bufcount, size, tmp);
         if (!req)
                 GOTO(err_free, rc = -ENOMEM);
 
@@ -172,17 +186,20 @@ out:
 
 static int llog_client_read_header(struct llog_handle *handle)
 {
+
         struct obd_import *imp = handle->lgh_ctxt->loc_imp;
         struct ptlrpc_request *req = NULL;
         struct llogd_body *body;
         struct llog_log_hdr *hdr;
         struct llog_rec_hdr *llh_hdr;
+        struct mgc_open_llog *mol = handle->lgh_mol;
         int size = sizeof(*body);
         int repsize = sizeof (*hdr);
         int rc;
         ENTRY;
 
-        req = ptlrpc_prep_req(imp, LLOG_ORIGIN_HANDLE_READ_HEADER,1,&size,NULL);
+        req = ptlrpc_prep_req(imp, LLOG_ORIGIN_HANDLE_READ_HEADER,
+                              1, &size, NULL);
         if (!req)
                 GOTO(out, rc = -ENOMEM);
 
@@ -190,6 +207,8 @@ static int llog_client_read_header(struct llog_handle *handle)
         body->lgd_logid = handle->lgh_id;
         body->lgd_ctxt_idx = handle->lgh_ctxt->loc_idx - 1;
         body->lgd_llh_flags = handle->lgh_hdr->llh_flags;
+        if (mol)
+                body->lgd_local_version = mol->mol_version;
 
         req->rq_replen = lustre_msg_size(1, &repsize);
         rc = ptlrpc_queue_wait(req);