LU-1770 ptlrpc: introducing OBD_CONNECT_FLOCK_OWNER flag

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

diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
index 3f1dc8d..1148243 100644 (file)
--- a/lustre/lov/lov_log.c
+++ b/lustre/lov/lov_log.c
@@ -55,6 +55,7 @@
 #include <obd_lov.h>
 #include <obd_ost.h>
 #include <lprocfs_status.h>
+#include <lustre_log.h>
 
 #include "lov_internal.h"
 
@@ -63,9 +64,11 @@
  * we need to keep cookies in stripe order, even if some are NULL, so that
  * the right cookies are passed back to the right OSTs at the client side.
  * Unset cookies should be all-zero (which will never occur naturally). */
-static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
-                               struct lov_stripe_md *lsm,
-                               struct llog_cookie *logcookies, int numcookies)
+static int lov_llog_origin_add(const struct lu_env *env,
+                              struct llog_ctxt *ctxt,
+                              struct llog_rec_hdr *rec,
+                              struct lov_stripe_md *lsm,
+                              struct llog_cookie *logcookies, int numcookies)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct lov_obd *lov = &obd->u.lov;
@@ -90,12 +93,6 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
                         lur->lur_oseq = loi->loi_seq;
                         break;
                 }
-                case MDS_SETATTR_REC: {
-                        struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec;
-                        lsr->lsr_oid = loi->loi_id;
-                        lsr->lsr_oseq = loi->loi_seq;
-                        break;
-                }
                 case MDS_SETATTR64_REC: {
                         struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
                         lsr->lsr_oid = loi->loi_id;
@@ -105,13 +102,14 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
                 default:
                         break;
                 }
-                /* inject error in llog_add() below */
-                if (OBD_FAIL_CHECK(OBD_FAIL_MDS_FAIL_LOV_LOG_ADD)) {
-                        llog_ctxt_put(cctxt);
-                        cctxt = NULL;
-                }
-                rc = llog_add(cctxt, rec, NULL, logcookies + cookies,
-                               numcookies - cookies);
+
+               /* inject error in llog_obd_add() below */
+               if (OBD_FAIL_CHECK(OBD_FAIL_MDS_FAIL_LOV_LOG_ADD)) {
+                       llog_ctxt_put(cctxt);
+                       cctxt = NULL;
+               }
+               rc = llog_obd_add(env, cctxt, rec, NULL, logcookies + cookies,
+                                 numcookies - cookies);
                 llog_ctxt_put(cctxt);
                 if (rc < 0) {
                         CERROR("Can't add llog (rc = %d) for stripe %d\n",
@@ -120,7 +118,7 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
                                sizeof(struct llog_cookie));
                         rc = 1; /* skip this cookie */
                 }
-                /* Note that rc is always 1 if llog_add was successful */
+               /* Note that rc is always 1 if llog_obd_add was successful */
                 cookies += rc;
         }
         RETURN(cookies);
@@ -163,8 +161,11 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt,
 }
 
 /* the replicators commit callback */
-static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
-                          int count, struct llog_cookie *cookies, int flags)
+static int lov_llog_repl_cancel(const struct lu_env *env,
+                               struct llog_ctxt *ctxt,
+                               struct lov_stripe_md *lsm,
+                               int count, struct llog_cookie *cookies,
+                               int flags)
 {
         struct lov_obd *lov;
         struct obd_device *obd = ctxt->loc_obd;
@@ -184,7 +185,7 @@ static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *ls
                         llog_get_context(child, ctxt->loc_idx);
                 int err;
 
-                err = llog_cancel(cctxt, NULL, 1, cookies, flags);
+               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
@@ -199,12 +200,12 @@ static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *ls
 }
 
 static struct llog_operations lov_mds_ost_orig_logops = {
-        lop_add: lov_llog_origin_add,
-        lop_connect: lov_llog_origin_connect
+       .lop_obd_add    = lov_llog_origin_add,
+       .lop_connect    = lov_llog_origin_connect,
 };
 
 static struct llog_operations lov_size_repl_logops = {
-        lop_cancel: lov_llog_repl_cancel
+       .lop_cancel     = lov_llog_repl_cancel,
 };
 
 int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
@@ -216,13 +217,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);
 
@@ -250,32 +251,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;
 
-        /* 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);
+       ENTRY;
 
-        ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
-        if (ctxt)
-                rc2 = llog_cleanup(ctxt);
-        if (!rc)
-                rc = rc2;
+       /* 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);
 
-        /* lov->tgt llogs are cleaned during osc_cleanup. */
-        RETURN(rc);
+       ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
+       if (ctxt)
+               llog_cleanup(NULL, ctxt);
+
+       /* lov->tgt llogs are cleaned during osc_cleanup. */
+       RETURN(0);
 }