- make HEAD from b_post_cmd3

[fs/lustre-release.git] / lustre / mgc / libmgc.c

diff --git a/lustre/mgc/libmgc.c b/lustre/mgc/libmgc.c
index 49a8260..88fe853 100644 (file)
--- a/lustre/mgc/libmgc.c
+++ b/lustre/mgc/libmgc.c
@@ -39,18 +39,19 @@
 #include <lustre_fsfilt.h>
 #include <lustre_disk.h>
 
-static int mgc_setup(struct obd_device *obd, obd_count len, void *buf)
+
+static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
         int rc;
         ENTRY;
 
         ptlrpcd_addref();
 
-        rc = client_obd_setup(obd, len, buf);
+        rc = client_obd_setup(obd, lcfg);
         if (rc)
                 GOTO(err_decref, rc);
 
-        rc = obd_llog_init(obd, obd, 0, NULL, NULL);
+        rc = obd_llog_init(obd, NULL, obd, 0, NULL, NULL);
         if (rc) {
                 CERROR("failed to setup llogging subsystems\n");
                 GOTO(err_cleanup, rc);
@@ -99,15 +100,15 @@ static int mgc_cleanup(struct obd_device *obd)
         RETURN(rc);
 }
 
-static int mgc_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                         int count, struct llog_catid *logid, 
-                         struct obd_uuid *uuid)
+static int mgc_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                         struct obd_device *tgt, int count, 
+                         struct llog_catid *logid, struct obd_uuid *uuid)
 {
         struct llog_ctxt *ctxt;
         int rc;
         ENTRY;
 
-        rc = llog_setup(obd, LLOG_CONFIG_REPL_CTXT, tgt, 0, NULL,
+        rc = llog_setup(obd, llogs, LLOG_CONFIG_REPL_CTXT, tgt, 0, NULL,
                         &llog_client_ops);
         if (rc == 0) {
                 ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
@@ -142,6 +143,7 @@ struct obd_ops mgc_obd_ops = {
 
 int __init mgc_init(void)
 {
-        return class_register_type(&mgc_obd_ops, NULL, LUSTRE_MGC_NAME);
+        return class_register_type(&mgc_obd_ops, NULL, 
+                                   NULL, LUSTRE_MGC_NAME, NULL);
 }