b=3550

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

diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c
index fc1da22..6c34f12 100644 (file)
--- a/lustre/mds/mds_log.c
+++ b/lustre/mds/mds_log.c
@@ -39,7 +39,8 @@
 
 static int mds_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
                                void *buf, struct llog_cookie *logcookies,
-                               int numcookies, void *data)
+                               int numcookies, void *data,
+                               struct rw_semaphore **lock, int *lock_count)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
@@ -48,7 +49,8 @@ static int mds_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
         ENTRY;
 
         lctxt = llog_get_context(&lov_obd->obd_llogs, ctxt->loc_idx);
-        rc = llog_add(lctxt, rec, buf, logcookies, numcookies, data);
+        rc = llog_add(lctxt, rec, buf, logcookies, numcookies, data,
+                      lock, lock_count);
         RETURN(rc);
 }
 
@@ -84,12 +86,15 @@ static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, int count,
 
 int mds_log_op_unlink(struct obd_device *obd, struct inode *inode,
                       struct lov_mds_md *lmm, int lmm_size,
-                      struct llog_cookie *logcookies, int cookies_size)
+                      struct llog_cookie *logcookies, int cookies_size,
+                      struct llog_create_locks **res)
 {
         struct mds_obd *mds = &obd->u.mds;
         struct lov_stripe_md *lsm = NULL;
         struct llog_ctxt *ctxt;
-        int rc;
+        struct llog_create_locks *lcl; 
+        int rc, size, offset = offsetof(struct llog_create_locks, lcl_locks);
+        int lock_count = 0;
         ENTRY;
 
         if (IS_ERR(mds->mds_osc_obd))
@@ -100,12 +105,29 @@ int mds_log_op_unlink(struct obd_device *obd, struct inode *inode,
         if (rc < 0)
                 RETURN(rc);
 
+        if (res != NULL) {
+                size = offset +
+                       sizeof(struct rw_semaphore *) * lsm->lsm_stripe_count;
+                OBD_ALLOC(lcl, size);
+                if (lcl == NULL)
+                        RETURN(-ENOMEM);
+
+                lcl->lcl_count = lsm->lsm_stripe_count;
+                *res = lcl;
+        }
+
         ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT);
         rc = llog_add(ctxt, NULL, lsm, logcookies,
-                      cookies_size / sizeof(struct llog_cookie), NULL);
+                      cookies_size / sizeof(struct llog_cookie), NULL,
+                      res ? &lcl->lcl_locks[0] : NULL, &lock_count);
 
         obd_free_memmd(mds->mds_osc_exp, &lsm);
 
+        if (res && (rc <= 0 || lock_count == 0)) {
+                OBD_FREE(lcl, size);
+                *res = NULL;
+        }
+
         RETURN(rc);
 }