From eba4f454dafff5aaec4205de3eeebe6868a0a671 Mon Sep 17 00:00:00 2001
From: tianying <tianying>
Date: Fri, 28 Nov 2003 17:52:39 +0000
Subject: [PATCH] rename lop_precleanup to lop_sync and do related changes

---
 lustre/mds/mds_unlink_open.c |  9 +++++----
 lustre/obdclass/llog_obd.c   | 12 +++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lustre/mds/mds_unlink_open.c b/lustre/mds/mds_unlink_open.c
index 5b9d31c..1e6984a 100644
--- a/lustre/mds/mds_unlink_open.c
+++ b/lustre/mds/mds_unlink_open.c
@@ -101,7 +101,8 @@ out_lock:
         RETURN(rc);
 }
 
-static int mds_osc_destroy(struct mds_obd *mds, struct ptlrpc_request *request)
+static int mds_osc_destroy_orphan(struct mds_obd *mds, 
+                                  struct ptlrpc_request *request)
 {
         struct mds_body *body;
         struct lov_mds_md *lmm = NULL;
@@ -161,7 +162,7 @@ out_free_memmd:
         RETURN(rc);
 }
 
-static int mds_unlink(struct obd_device *obd, struct dentry *dchild,
+static int mds_unlink_orphan(struct obd_device *obd, struct dentry *dchild,
                       struct inode *inode, struct inode *pending_dir)
 {
         struct mds_obd *mds = &obd->u.mds;
@@ -218,7 +219,7 @@ static int mds_unlink(struct obd_device *obd, struct dentry *dchild,
                         GOTO(out_free_msg, rc);
                 }
         }
-        rc = mds_osc_destroy(mds, req);
+        rc = mds_osc_destroy_orphan(mds, req);
 out_free_msg:
         OBD_FREE(req->rq_repmsg, req->rq_replen);
         req->rq_repmsg = NULL;
@@ -286,7 +287,7 @@ int mds_cleanup_orphans(struct obd_device *obd)
                         GOTO(next, rc2 = 0);
                 }
 
-                rc2 = mds_unlink(obd, dchild, child_inode, pending_dir);
+                rc2 = mds_unlink_orphan(obd, dchild, child_inode, pending_dir);
                 if (rc2 == 0) {
                         item ++;
                         CWARN("removed orphan %s from MDS and OST\n",
diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index e7c61d6..9c9abb7 100644
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -77,20 +77,22 @@ int llog_cleanup(struct llog_ctxt *ctxt)
 }
 EXPORT_SYMBOL(llog_cleanup);
 
-int llog_precleanup(struct llog_ctxt *ctxt, struct obd_export *exp)
+int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp)
 {
         int rc = 0;
         ENTRY;
 
         if (!ctxt)
                 RETURN(0);
-
-        if (ctxt->loc_llcd && CTXTP(ctxt, precleanup))
-                rc = CTXTP(ctxt, precleanup)(ctxt, exp);
+        down(&ctxt->loc_sem);
+        if (ctxt->loc_llcd && CTXTP(ctxt, sync))
+                rc = CTXTP(ctxt, sync)(ctxt, exp);
+        else
+                up(&ctxt->loc_sem);
 
         RETURN(rc);
 }
-EXPORT_SYMBOL(llog_precleanup);
+EXPORT_SYMBOL(llog_sync);
 
 int llog_add(struct llog_ctxt *ctxt,
                  struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
-- 
1.8.3.1