X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_log.c;h=9e4fc79a41edc6623d7f5384b17698227885c259;hb=b918d20c1073fbb29de95dccec018b1b992cf81d;hp=1c47d999162c27364c1cac33398a4157173fb2a5;hpb=837eab06232794ccf5dd523f778debc9253dad1c;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
index 1c47d99..9e4fc79 100644
--- a/lustre/lov/lov_log.c
+++ b/lustre/lov/lov_log.c
@@ -69,7 +69,7 @@
  * 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 lov_stripe_md *lsm,
                                struct llog_cookie *logcookies, int numcookies)
 {
         struct obd_device *obd = ctxt->loc_obd;
@@ -77,14 +77,14 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
         int i, rc = 0, rc1;
         ENTRY;
 
-        LASSERTF(logcookies && numcookies >= lsm->lsm_stripe_count, 
+        LASSERTF(logcookies && numcookies >= lsm->lsm_stripe_count,
                  "logcookies %p, numcookies %d lsm->lsm_stripe_count %d \n",
                  logcookies, numcookies, lsm->lsm_stripe_count);
 
         for (i = 0; i < lsm->lsm_stripe_count; i++) {
                 struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-                struct obd_device *child = 
-                        lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd; 
+                struct obd_device *child =
+                        lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd;
                 struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
 
                 /* fill mds unlink/setattr log record */
@@ -101,6 +101,12 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
                         lsr->lsr_ogen = loi->loi_gr;
                         break;
                 }
+                case MDS_SETATTR64_REC: {
+                        struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
+                        lsr->lsr_oid = loi->loi_id;
+                        lsr->lsr_ogen = loi->loi_gr;
+                        break;
+                }
                 default:
                         break;
                 }
@@ -116,7 +122,7 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
         RETURN(rc);
 }
 
-static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int count,
+static int lov_llog_origin_connect(struct llog_ctxt *ctxt,
                                    struct llog_logid *logid,
                                    struct llog_gen *gen,
                                    struct obd_uuid *uuid)
@@ -127,23 +133,23 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int count,
         ENTRY;
 
         lov_getref(obd);
-        for (i = 0; i < count; i++) {
+        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct obd_device *child;
                 struct llog_ctxt *cctxt;
-                
+
                 if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_active)
                         continue;
                 if (uuid && !obd_uuid_equals(uuid, &lov->lov_tgts[i]->ltd_uuid))
                         continue;
-                CDEBUG(D_CONFIG, "connect %d/%d\n", i, count);
+                CDEBUG(D_CONFIG, "connect %d/%d\n", i, lov->desc.ld_tgt_count);
                 child = lov->lov_tgts[i]->ltd_exp->exp_obd;
                 cctxt = llog_get_context(child, ctxt->loc_idx);
-                rc = llog_connect(cctxt, 1, logid, gen, uuid);
+                rc = llog_connect(cctxt, logid, gen, uuid);
                 llog_ctxt_put(cctxt);
- 
+
                 if (rc) {
                         CERROR("error osc_llog_connect tgt %d (%d)\n", i, rc);
-                        if (!err) 
+                        if (!err)
                                 err = rc;
                 }
         }
@@ -168,9 +174,9 @@ static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *ls
         lov_getref(obd);
         for (i = 0; i < count; i++, cookies++) {
                 struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-                struct obd_device *child = 
+                struct obd_device *child =
                         lov->lov_tgts[loi->loi_ost_idx]->ltd_exp->exp_obd;
-                struct llog_ctxt *cctxt = 
+                struct llog_ctxt *cctxt =
                         llog_get_context(child, ctxt->loc_idx);
                 int err;
 
@@ -218,7 +224,7 @@ int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
         rc = llog_setup(obd, olg, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL,
                         &lov_size_repl_logops);
         if (rc)
-                RETURN(rc);
+                GOTO(err_cleanup, rc);
 
         lov_getref(obd);
         /* count may not match lov->desc.ld_tgt_count during dynamic ost add */
@@ -238,7 +244,18 @@ int lov_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
                 break;
         }
         lov_putref(obd);
-        RETURN(rc);
+        GOTO(err_cleanup, rc);
+err_cleanup:
+        if (rc) {
+                struct llog_ctxt *ctxt =
+                        llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
+                if (ctxt)
+                        llog_cleanup(ctxt);
+                ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT);
+                if (ctxt)
+                        llog_cleanup(ctxt);
+        }
+        return rc;
 }
 
 int lov_llog_finish(struct obd_device *obd, int count)