X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2Fllite_lib.c;h=7baec8c65702b79302bdb1b4c8490fff7700e43b;hb=2d673ba8fa43267bc51b754ade41684d30256bc1;hp=31ee23bb9aa22f2b18a2a7563deb2efd57e40cdd;hpb=86c7aebfe47426ac96dc97712d64cbc6a85ba863;p=fs%2Flustre-release.git

diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index 31ee23b..7baec8c 100644
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -67,6 +67,8 @@
 #include "lutil.h"
 #include "llite_lib.h"
 
+int slp_global_init(void);
+
 static int lllib_init(void)
 {
         if (liblustre_init_current("liblustre") ||
@@ -77,7 +79,8 @@ static int lllib_init(void)
             lmv_init() ||
             mdc_init() ||
             lov_init() ||
-            osc_init())
+            osc_init() ||
+            slp_global_init())
                 return -1;
 
         return _sysio_fssw_register("lustre", &llu_fssw_ops);
@@ -91,7 +94,6 @@ int liblustre_process_log(struct config_llog_instance *cfg,
         struct lustre_cfg *lcfg;
         char  *peer = "MGS_UUID";
         struct obd_device *obd;
-        struct lustre_handle mgc_conn = {0, };
         struct obd_export *exp;
         char  *name = "mgc_dev";
         class_uuid_t uuid;
@@ -175,21 +177,19 @@ int liblustre_process_log(struct config_llog_instance *cfg,
                 GOTO(out_cleanup, rc = -ENOMEM);
 
         ocd->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_FID |
-                                 OBD_CONNECT_AT;
+                                 OBD_CONNECT_AT | OBD_CONNECT_VBR;
 #ifdef LIBLUSTRE_POSIX_ACL
         ocd->ocd_connect_flags |= OBD_CONNECT_ACL;
 #endif
         ocd->ocd_version = LUSTRE_VERSION_CODE;
 
-        rc = obd_connect(NULL, &mgc_conn, obd, &mgc_uuid, ocd, NULL);
+        rc = obd_connect(NULL, &exp, obd, &mgc_uuid, ocd, NULL);
         if (rc) {
                 CERROR("cannot connect to %s at %s: rc = %d\n",
                        LUSTRE_MGS_OBDNAME, mgsnid, rc);
                 GOTO(out_cleanup, rc);
         }
 
-        exp = class_conn2export(&mgc_conn);
-
         ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT);
         cfg->cfg_flags |= CFG_F_COMPAT146;
         rc = class_config_parse_llog(ctxt, profile, cfg);