X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_device.c;h=90d8e379bffaea34c4d53dbec7f76788f8a49c3e;hp=a4273cd6065a573ae66b501e9bcf48b105d2a236;hb=86cb7e80f2a573bb23a10ee9eebe3c7f525bd2d0;hpb=d8cd83addf0020b971c50f6928badf885590742c

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index a4273cd..90d8e37 100644
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -254,7 +254,7 @@ static int llog_changelog_cancel_cb(const struct lu_env *env,
 
 static int llog_changelog_cancel(const struct lu_env *env,
 				 struct llog_ctxt *ctxt,
-				 struct llog_cookie *cookies, int flags)
+				 long long endrec)
 {
 	struct llog_handle	*cathandle = ctxt->loc_handle;
 	int			 rc;
@@ -265,7 +265,7 @@ static int llog_changelog_cancel(const struct lu_env *env,
 	LASSERT(cathandle->lgh_hdr->llh_flags & LLOG_F_IS_CAT);
 
 	rc = llog_cat_process(env, cathandle, llog_changelog_cancel_cb,
-			      (void *)cookies, 0, 0);
+			      &endrec, 0, 0);
 	if (rc >= 0)
 		/* 0 or 1 means we're done */
 		rc = 0;
@@ -508,7 +508,7 @@ mdd_changelog_llog_cancel(const struct lu_env *env, struct mdd_device *mdd,
            changed since the last purge) */
 	mdd->mdd_cl.mc_starttime = ktime_get();
 
-	rc = llog_cancel(env, ctxt, (struct llog_cookie *)&endrec, 0);
+	rc = llog_changelog_cancel(env, ctxt, endrec);
 out:
         llog_ctxt_put(ctxt);
         return rc;
@@ -1807,7 +1807,6 @@ static int __init mdd_init(void)
 		return rc;
 
 	changelog_orig_logops = llog_osd_ops;
-	changelog_orig_logops.lop_cancel = llog_changelog_cancel;
 	changelog_orig_logops.lop_add = llog_cat_add_rec;
 	changelog_orig_logops.lop_declare_add = llog_cat_declare_add_rec;