LU-3196 tests: several test fixes about DNE tests

[fs/lustre-release.git] / lustre / lov / lov_log.c

diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
index a12cf2b..adec9a6 100644 (file)
--- a/lustre/lov/lov_log.c
+++ b/lustre/lov/lov_log.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -89,14 +91,13 @@ static int lov_llog_origin_add(const struct lu_env *env,
                 switch (rec->lrh_type) {
                 case MDS_UNLINK_REC: {
                         struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec;
-                        lur->lur_oid = loi->loi_id;
-                        lur->lur_oseq = loi->loi_seq;
+                        lur->lur_oid = ostid_id(&loi->loi_oi);
+                        lur->lur_oseq = (__u32)ostid_seq(&loi->loi_oi);
                         break;
                 }
                 case MDS_SETATTR64_REC: {
                         struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
-                        lsr->lsr_oid = loi->loi_id;
-                        lsr->lsr_oseq = loi->loi_seq;
+                        lsr->lsr_oi = loi->loi_oi;
                         break;
                 }
                 default:
@@ -186,17 +187,18 @@ static int lov_llog_repl_cancel(const struct lu_env *env,
                 int err;
 
                err = llog_cancel(env, cctxt, NULL, 1, cookies, flags);
-                llog_ctxt_put(cctxt);
-                if (err && lov->lov_tgts[loi->loi_ost_idx]->ltd_active) {
-                        CERROR("error: objid "LPX64" subobj "LPX64
-                               " on OST idx %d: rc = %d\n", lsm->lsm_object_id,
-                               loi->loi_id, loi->loi_ost_idx, err);
-                        if (!rc)
-                                rc = err;
-                }
-        }
-        obd_putref(obd);
-        RETURN(rc);
+               llog_ctxt_put(cctxt);
+               if (err && lov->lov_tgts[loi->loi_ost_idx]->ltd_active) {
+                       CERROR("%s: objid "DOSTID" subobj "DOSTID
+                              " on OST idx %d: rc = %d\n",
+                              obd->obd_name, POSTID(&lsm->lsm_oi),
+                              POSTID(&loi->loi_oi), loi->loi_ost_idx, err);
+                       if (!rc)
+                               rc = err;
+               }
+       }
+       obd_putref(obd);
+       RETURN(rc);
 }
 
 static struct llog_operations lov_mds_ost_orig_logops = {
@@ -217,13 +219,13 @@ int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
         ENTRY;
 
         LASSERT(olg == &obd->obd_olg);
-        rc = llog_setup(obd, olg, LLOG_MDS_OST_ORIG_CTXT, disk_obd, 0, NULL,
-                        &lov_mds_ost_orig_logops);
-        if (rc)
-                RETURN(rc);
+       rc = llog_setup(NULL, obd, olg, LLOG_MDS_OST_ORIG_CTXT, disk_obd,
+                       &lov_mds_ost_orig_logops);
+       if (rc)
+               RETURN(rc);
 
-        rc = llog_setup(obd, olg, LLOG_SIZE_REPL_CTXT, disk_obd, 0, NULL,
-                        &lov_size_repl_logops);
+       rc = llog_setup(NULL, obd, olg, LLOG_SIZE_REPL_CTXT, disk_obd,
+                       &lov_size_repl_logops);
         if (rc)
                 GOTO(err_cleanup, rc);
 
@@ -251,32 +253,30 @@ err_cleanup:
                 struct llog_ctxt *ctxt =
                         llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
                 if (ctxt)
-                        llog_cleanup(ctxt);
+                       llog_cleanup(NULL, ctxt);
                 ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT);
                 if (ctxt)
-                        llog_cleanup(ctxt);
+                       llog_cleanup(NULL, ctxt);
         }
         return rc;
 }
 
 int lov_llog_finish(struct obd_device *obd, int count)
 {
-        struct llog_ctxt *ctxt;
-        int rc = 0, rc2 = 0;
-        ENTRY;
+       struct llog_ctxt *ctxt;
+
+       ENTRY;
 
-        /* cleanup our llogs only if the ctxts have been setup
-         * (client lov doesn't setup, mds lov does). */
-        ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT);
-        if (ctxt)
-                rc = llog_cleanup(ctxt);
+       /* cleanup our llogs only if the ctxts have been setup
+        * (client lov doesn't setup, mds lov does). */
+       ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT);
+       if (ctxt)
+               llog_cleanup(NULL, ctxt);
 
-        ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
-        if (ctxt)
-                rc2 = llog_cleanup(ctxt);
-        if (!rc)
-                rc = rc2;
+       ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
+       if (ctxt)
+               llog_cleanup(NULL, ctxt);
 
-        /* lov->tgt llogs are cleaned during osc_cleanup. */
-        RETURN(rc);
+       /* lov->tgt llogs are cleaned during osc_cleanup. */
+       RETURN(0);
 }