smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

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

diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
index 5931326..962fcd9 100644 (file)
--- a/lustre/lov/lov_log.c
+++ b/lustre/lov/lov_log.c
@@ -56,15 +56,14 @@
  * 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,
-                               void *buf, struct llog_cookie *logcookies, 
-                               int numcookies, void *data)
+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)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct lov_obd *lov = &obd->u.lov;
         struct lov_oinfo *loi;
         struct llog_unlink_rec *lur;
-        struct lov_stripe_md *lsm = (struct lov_stripe_md *)data;
         int i, rc = 0;
         ENTRY;
 
@@ -78,12 +77,13 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
 
         for (i = 0,loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++,loi++) {
                 struct obd_device *child = lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd; 
-                struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
-
+                struct llog_ctxt *cctxt;
+                cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
                 lur->lur_oid = loi->loi_id;
                 lur->lur_ogen = loi->loi_gr;
+                LASSERT(lsm->lsm_object_gr == loi->loi_gr);
                 rc += llog_add(cctxt, &lur->lur_hdr, NULL, logcookies + rc,
-                                numcookies - rc, NULL);
+                                numcookies - rc);
 
         }
         OBD_FREE(lur, sizeof(*lur));
@@ -104,8 +104,9 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int count,
         LASSERT(lov->desc.ld_tgt_count  == count);
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
-                struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
+                struct llog_ctxt *cctxt;
 
+                cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
                 if (uuid && !obd_uuid_equals(uuid, &lov->tgts[i].uuid))
                         continue;
 
@@ -120,11 +121,9 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int count,
 }
 
 /* the replicators commit callback */
-static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, int count, 
-                                struct llog_cookie *cookies, int flags,
-                                void *data)
+static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
+                          int count, struct llog_cookie *cookies, int flags)
 {
-        struct lov_stripe_md *lsm = (struct lov_stripe_md *)data;
         struct lov_obd *lov;
         struct obd_device *obd = ctxt->loc_obd;
         struct lov_oinfo *loi;
@@ -138,10 +137,11 @@ static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, int count,
         lov = &obd->u.lov;
         for (i = 0; i < count; i++, cookies++, loi++) {
                 struct obd_device *child = lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd; 
-                struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
+                struct llog_ctxt *cctxt;
                 int err;
 
-                err = llog_cancel(cctxt, 1, cookies, flags, NULL);
+                cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
+                err = llog_cancel(cctxt, NULL, 1, cookies, flags);
                 if (err && lov->tgts[loi->loi_ost_idx].active) {
                         CERROR("error: objid "LPX64" subobj "LPX64
                                " on OST idx %d: rc = %d\n", lsm->lsm_object_id,
@@ -162,27 +162,28 @@ static struct llog_operations lov_size_repl_logops = {
         lop_cancel: lov_llog_repl_cancel
 };
 
-int lov_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                  int count, struct llog_catid *logid)
+
+int lov_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                  struct obd_device *tgt, int count, struct llog_catid *logid)
 {
         struct lov_obd *lov = &obd->u.lov;
         int i, rc = 0;
         ENTRY;
-        
-        rc = obd_llog_setup(obd, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
-                            &lov_unlink_orig_logops);
+
+        rc = llog_setup(obd, llogs, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
+                        &lov_unlink_orig_logops);
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_setup(obd, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL, 
-                            &lov_size_repl_logops);
+        rc = llog_setup(obd, llogs, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL,
+                        &lov_size_repl_logops);
         if (rc)
                 RETURN(rc);
 
         LASSERT(lov->desc.ld_tgt_count  == count);
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
-                rc = obd_llog_init(child, tgt, 1, logid + i);
+                rc = obd_llog_init(child, &child->obd_llogs, tgt, 1, logid + i);
                 if (rc) {
                         CERROR("error osc_llog_init %d\n", i);
                         break;
@@ -191,24 +192,24 @@ int lov_llog_init(struct obd_device *obd, struct obd_device *tgt,
         RETURN(rc);
 }
 
-int lov_llog_finish(struct obd_device *obd, int count)
+int lov_llog_finish(struct obd_device *obd, struct obd_llogs *llogs, int count)
 {
         struct lov_obd *lov = &obd->u.lov;
         int i, rc = 0;
         ENTRY;
         
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_UNLINK_ORIG_CTXT));
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_SIZE_REPL_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_SIZE_REPL_CTXT));
         if (rc)
                 RETURN(rc);
 
         LASSERT(lov->desc.ld_tgt_count  == count);
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
-                rc = obd_llog_finish(child, 1);
+                rc = obd_llog_finish(child, &child->obd_llogs, 1);
                 if (rc) {
                         CERROR("error osc_llog_finish %d\n", i);
                         break;