* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
struct llog_cookie *logcookies, int numcookies)
{
struct obd_device *obd = ctxt->loc_obd;
- struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
+ struct obd_device *lov_obd = obd->u.mds.mds_lov_obd;
struct llog_ctxt *lctxt;
int rc;
ENTRY;
struct obd_uuid *uuid)
{
struct obd_device *obd = ctxt->loc_obd;
- struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
+ struct obd_device *lov_obd = obd->u.mds.mds_lov_obd;
struct llog_ctxt *lctxt;
int rc;
ENTRY;
int count, struct llog_cookie *cookies, int flags)
{
struct obd_device *obd = ctxt->loc_obd;
- struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
+ struct obd_device *lov_obd = obd->u.mds.mds_lov_obd;
struct llog_ctxt *lctxt;
int rc;
ENTRY;
struct llog_changelog_rec *rec = (struct llog_changelog_rec *)hdr;
struct llog_cookie cookie;
long long endrec = *(long long *)data;
- int rc;
+ int rc, err;
+ struct obd_device *obd;
+ void *trans_h;
+ struct inode *inode;
ENTRY;
/* This is always a (sub)log, not the catalog */
LASSERT(llh->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN);
- if (rec->cr_index > endrec)
+ if (rec->cr.cr_index > endrec)
/* records are in order, so we're done */
RETURN(LLOG_PROC_BREAK);
cookie.lgc_lgl = llh->lgh_id;
cookie.lgc_index = hdr->lrh_index;
+ obd = llh->lgh_ctxt->loc_exp->exp_obd;
+ inode = llh->lgh_file->f_dentry->d_inode;
+
+ /* XXX This is a workaround for the deadlock of changelog adding vs.
+ * changelog cancelling. Changelog adding always start transaction
+ * before acquiring the catlog lock (lgh_lock), whereas, changelog
+ * cancelling do start transaction after holding catlog lock.
+ *
+ * We start the transaction earlier here to keep the locking ordering:
+ * 'start transaction -> catlog lock'. LU-81. */
+ trans_h = fsfilt_start_log(obd, inode, FSFILT_OP_CANCEL_UNLINK,
+ NULL, 1);
+ if (IS_ERR(trans_h)) {
+ CERROR("fsfilt_start_log failed: %ld\n", PTR_ERR(trans_h));
+ RETURN(PTR_ERR(trans_h));
+ }
/* cancel them one at a time. I suppose we could store up the cookies
and cancel them all at once; probably more efficient, but this is
done as a user call, so who cares... */
rc = llog_cat_cancel_records(llh->u.phd.phd_cat_handle, 1, &cookie);
+
+ err = fsfilt_commit(obd, inode, trans_h, 0);
+ if (err) {
+ CERROR("fsfilt_commit failed: %d\n", err);
+ rc = (rc >= 0) ? err : rc;
+ }
+
RETURN(rc < 0 ? rc : 0);
}
int mds_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
struct obd_device *disk_obd, int *index)
{
- struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
+ struct obd_device *lov_obd = obd->u.mds.mds_lov_obd;
struct llog_ctxt *ctxt;
int rc;
ENTRY;
RETURN(rc);
}
+
+static int mds_llog_add_unlink(struct obd_device *obd,
+ struct lov_stripe_md *lsm, obd_count count,
+ struct llog_cookie *logcookie, int cookies)
+{
+ struct llog_unlink_rec *lur;
+ struct llog_ctxt *ctxt;
+ int rc;
+
+ /* first prepare unlink log record */
+ OBD_ALLOC_PTR(lur);
+ if (!lur)
+ RETURN(rc = -ENOMEM);
+ lur->lur_hdr.lrh_len = lur->lur_tail.lrt_len = sizeof(*lur);
+ lur->lur_hdr.lrh_type = MDS_UNLINK_REC;
+ lur->lur_count = count;
+
+ ctxt = llog_get_context(obd, LLOG_MDS_OST_ORIG_CTXT);
+ rc = llog_add(ctxt, &lur->lur_hdr, lsm, logcookie, cookies);
+ llog_ctxt_put(ctxt);
+
+ OBD_FREE_PTR(lur);
+ RETURN(rc);
+}
+
+int mds_log_op_unlink(struct obd_device *obd,
+ 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;
+ int rc;
+ ENTRY;
+
+ if (IS_ERR(mds->mds_lov_obd))
+ RETURN(PTR_ERR(mds->mds_lov_obd));
+
+ rc = obd_unpackmd(mds->mds_lov_exp, &lsm, lmm, lmm_size);
+ if (rc < 0)
+ RETURN(rc);
+ rc = mds_llog_add_unlink(obd, lsm, 0, logcookies,
+ cookies_size / sizeof(struct llog_cookie));
+ obd_free_memmd(mds->mds_lov_exp, &lsm);
+ RETURN(rc);
+}
+EXPORT_SYMBOL(mds_log_op_unlink);
+
+int mds_log_op_orphan(struct obd_device *obd, struct lov_stripe_md *lsm,
+ obd_count count)
+{
+ struct mds_obd *mds = &obd->u.mds;
+ struct llog_cookie logcookie;
+ int rc;
+ ENTRY;
+
+ if (IS_ERR(mds->mds_lov_obd))
+ RETURN(PTR_ERR(mds->mds_lov_obd));
+
+ rc = mds_llog_add_unlink(obd, lsm, count - 1, &logcookie, 1);
+ RETURN(rc);
+}
+