b=1414

[fs/lustre-release.git] / lustre / mds / mds_log.c

diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c
index a9b02ee..b8ce8b5 100644 (file)
--- a/lustre/mds/mds_log.c
+++ b/lustre/mds/mds_log.c
@@ -54,7 +54,8 @@ static int mds_llog_origin_add(struct llog_ctxt *ctxt,
 
 static int mds_llog_origin_connect(struct llog_ctxt *ctxt, int count,
                                    struct llog_logid *logid,
-                                   struct llog_ctxt_gen *gen) 
+                                   struct llog_gen *gen,
+                                   struct obd_uuid *uuid)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
@@ -63,7 +64,7 @@ static int mds_llog_origin_connect(struct llog_ctxt *ctxt, int count,
         ENTRY;
 
         lctxt = llog_get_context(lov_obd, ctxt->loc_idx);
-        rc = llog_connect(lctxt, count, logid, gen);
+        rc = llog_connect(lctxt, count, logid, gen, uuid);
         RETURN(rc);
 }
 
@@ -82,13 +83,12 @@ static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *ls
 }
 
 int mds_log_op_unlink(struct obd_device *obd, struct inode *inode,
-                      struct lustre_msg *repmsg, int offset)
+                      struct lov_mds_md *lmm, int lmm_size,
+                      struct llog_cookie *logcookies, int cookies_size)
 {
         struct mds_obd *mds = &obd->u.mds;
         struct lov_stripe_md *lsm = NULL;
-#ifdef ENABLE_ORPHANS
         struct llog_ctxt *ctxt;
-#endif
         int rc;
         ENTRY;
 
@@ -96,16 +96,13 @@ int mds_log_op_unlink(struct obd_device *obd, struct inode *inode,
                 RETURN(PTR_ERR(mds->mds_osc_obd));
 
         rc = obd_unpackmd(mds->mds_osc_exp, &lsm,
-                          lustre_msg_buf(repmsg, offset, 0),
-                          repmsg->buflens[offset]);
+                          lmm, lmm_size);
         if (rc < 0)
                 RETURN(rc);
 
-#ifdef ENABLE_ORPHANS
         ctxt = llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT);
-        rc = llog_add(ctxt, NULL, lsm, lustre_msg_buf(repmsg, offset + 1, 0),
-                      repmsg->buflens[offset + 1] / sizeof(struct llog_cookie));
-#endif
+        rc = llog_add(ctxt, NULL, lsm, logcookies,
+                      cookies_size / sizeof(struct llog_cookie));
 
         obd_free_memmd(mds->mds_osc_exp, &lsm);
 
@@ -122,12 +119,12 @@ static struct llog_operations mds_size_repl_logops = {
 };
 
 int mds_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                  int count, struct llog_logid *logid)
+                  int count, struct llog_catid *logid)
 {
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
         int rc;
         ENTRY;
-        
+
         rc = llog_setup(obd, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
                         &mds_unlink_orig_logops);
         if (rc)
@@ -138,9 +135,9 @@ int mds_llog_init(struct obd_device *obd, struct obd_device *tgt,
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_init(lov_obd, tgt, count, logid);        
-        if (rc) 
-                CERROR("error lov_llog_init\n"); 
+        rc = obd_llog_init(lov_obd, tgt, count, logid);
+        if (rc)
+                CERROR("error lov_llog_init\n");
 
         RETURN(rc);
 }
@@ -150,7 +147,7 @@ int mds_llog_finish(struct obd_device *obd, int count)
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
         int rc;
         ENTRY;
-        
+
         rc = llog_cleanup(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT));
         if (rc)
                 RETURN(rc);
@@ -159,9 +156,9 @@ int mds_llog_finish(struct obd_device *obd, int count)
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_finish(lov_obd, count);        
-        if (rc) 
-                CERROR("error lov_llog_finish\n"); 
+        rc = obd_llog_finish(lov_obd, count);
+        if (rc)
+                CERROR("error lov_llog_finish\n");
 
         RETURN(rc);
 }