LU-73 RHEL6 support.

[fs/lustre-release.git] / lustre / obdclass / llog_test.c

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index ce887c8..d03f0bd 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -517,11 +517,13 @@ static int llog_test_6(struct obd_device *obd, char *name)
 
         rc = obd_connect(NULL, &exp, mgc_obd, &uuid,
                          NULL /* obd_connect_data */, NULL);
-        if (rc) {
-                CERROR("6: failed to connect to MGC: %s\n", mgc_obd->obd_name);
-                GOTO(ctxt_release, rc);
+        if (rc != -EALREADY) {
+                CERROR("6: connect on connected MDC (%s) failed to return"
+                       " -EALREADY", mgc_obd->obd_name);
+                if (rc == 0)
+                        obd_disconnect(exp);
+                GOTO(ctxt_release, rc = -EINVAL);
         }
-        LASSERTF(exp->exp_obd == mgc_obd, "%p - %p - %p\n", exp, exp->exp_obd, mgc_obd);
 
         nctxt = llog_get_context(mgc_obd, LLOG_CONFIG_REPL_CTXT);
         rc = llog_create(nctxt, &llh, NULL, name);
@@ -551,9 +553,6 @@ parse_out:
         if (rc) {
                 CERROR("6: llog_close failed: rc = %d\n", rc);
         }
-       CDEBUG(D_INFO, "obd %p - %p - %p - %p\n",
-              mgc_obd, exp, exp->exp_obd, exp->exp_obd->obd_type);
-        rc = obd_disconnect(exp);
 ctxt_release:
         llog_ctxt_put(ctxt);
         RETURN(rc);
@@ -659,8 +658,7 @@ static int llog_run_tests(struct obd_device *obd)
 
 static int llog_test_llog_init(struct obd_device *obd,
                                struct obd_llog_group *olg,
-                               struct obd_device *tgt, int count,
-                               struct llog_catid *logid, struct obd_uuid *uuid)
+                               struct obd_device *tgt, int *index)
 {
         int rc;
         ENTRY;
@@ -716,6 +714,7 @@ static int llog_test_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                 RETURN(-EINVAL);
         }
 
+        /* disk obd */
         tgt = class_name2obd(lustre_cfg_string(lcfg, 1));
         if (!tgt || !tgt->obd_attached || !tgt->obd_set_up) {
                 CERROR("target device not attached or not set up (%s)\n",
@@ -723,11 +722,11 @@ static int llog_test_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                 RETURN(-EINVAL);
         }
 
-        rc = obd_llog_init(obd, NULL, tgt, 0, NULL, NULL);
+        rc = obd_llog_init(obd, NULL, tgt, NULL);
         if (rc)
                 RETURN(rc);
 
-        llog_test_rand = ll_rand();
+        llog_test_rand = cfs_rand();
 
         rc = llog_run_tests(obd);
         if (rc)