static void llog_ctxt_destroy(struct llog_ctxt *ctxt)
{
- if (ctxt->loc_exp)
+ if (ctxt->loc_exp) {
class_export_put(ctxt->loc_exp);
+ ctxt->loc_exp = NULL;
+ }
if (ctxt->loc_imp) {
class_import_put(ctxt->loc_imp);
ctxt->loc_imp = NULL;
}
-
+ LASSERT(ctxt->loc_llcd == NULL);
OBD_FREE_PTR(ctxt);
- return;
}
int __llog_ctxt_put(struct llog_ctxt *ctxt)
olg->olg_ctxts[ctxt->loc_idx] = NULL;
spin_unlock(&olg->olg_lock);
+ if (ctxt->loc_lcm)
+ lcm_put(ctxt->loc_lcm);
+
obd = ctxt->loc_obd;
spin_lock(&obd->obd_dev_lock);
spin_unlock(&obd->obd_dev_lock); /* sync with llog ctxt user thread */
/* obd->obd_starting is needed for the case of cleanup
* in error case while obd is starting up. */
- LASSERTF(obd->obd_starting == 1 ||
+ LASSERTF(obd->obd_starting == 1 ||
obd->obd_stopping == 1 || obd->obd_set_up == 0,
- "wrong obd state: %d/%d/%d\n", !!obd->obd_starting,
+ "wrong obd state: %d/%d/%d\n", !!obd->obd_starting,
!!obd->obd_stopping, !!obd->obd_set_up);
/* cleanup the llog ctxt here */
int rc, idx;
ENTRY;
- if (!ctxt) {
- CERROR("No ctxt\n");
- RETURN(-ENODEV);
- }
+ LASSERT(ctxt != NULL);
+ LASSERT(ctxt != LP_POISON);
olg = ctxt->loc_olg;
+ LASSERT(olg != NULL);
+ LASSERT(olg != LP_POISON);
+
idx = ctxt->loc_idx;
- /* banlance the ctxt get when calling llog_cleanup */
+ /*
+ * Banlance the ctxt get when calling llog_cleanup()
+ */
+ LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a);
LASSERT(atomic_read(&ctxt->loc_refcount) > 1);
llog_ctxt_put(ctxt);
- /* try to free the ctxt */
+ /*
+ * Try to free the ctxt.
+ */
rc = __llog_ctxt_put(ctxt);
if (rc)
- CERROR("Error %d while cleaning up ctxt %p\n",
+ CERROR("Error %d while cleaning up ctxt %p\n",
rc, ctxt);
l_wait_event(olg->olg_waitq,
}
EXPORT_SYMBOL(llog_cleanup);
-int llog_setup(struct obd_device *obd, struct obd_llog_group *olg, int index,
- struct obd_device *disk_obd, int count, struct llog_logid *logid,
- struct llog_operations *op)
+int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg,
+ int index, struct obd_device *disk_obd, int count,
+ struct llog_logid *logid, const char *logname,
+ struct llog_operations *op)
{
- int rc = 0;
struct llog_ctxt *ctxt;
+ int rc = 0;
ENTRY;
if (index < 0 || index >= LLOG_MAX_CTXTS)
- RETURN(-EFAULT);
+ RETURN(-EINVAL);
LASSERT(olg != NULL);
ctxt = llog_new_ctxt(obd);
if (!ctxt)
- GOTO(out, rc = -ENOMEM);
+ RETURN(-ENOMEM);
ctxt->loc_obd = obd;
- ctxt->loc_exp = class_export_get(disk_obd->obd_self_export);
ctxt->loc_olg = olg;
ctxt->loc_idx = index;
ctxt->loc_logops = op;
sema_init(&ctxt->loc_sem, 1);
+ ctxt->loc_exp = class_export_get(disk_obd->obd_self_export);
rc = llog_group_set_ctxt(olg, ctxt, index);
if (rc) {
llog_ctxt_destroy(ctxt);
if (rc == -EEXIST) {
- /* sanity check */
ctxt = llog_group_get_ctxt(olg, index);
-
- /* mds_lov_update_mds might call here multiple times.
- * So if the llog is already set up then don't to do
- * it again. */
- CDEBUG(D_CONFIG, "obd %s ctxt %d already set up\n",
- obd->obd_name, index);
- LASSERT(ctxt->loc_olg == olg);
- LASSERT(ctxt->loc_obd == obd);
- LASSERT(ctxt->loc_exp == disk_obd->obd_self_export);
- LASSERT(ctxt->loc_logops == op);
- llog_ctxt_put(ctxt);
+ if (ctxt) {
+ /*
+ * mds_lov_update_desc() might call here multiple
+ * times. So if the llog is already set up then
+ * don't to do it again.
+ */
+ CDEBUG(D_CONFIG, "obd %s ctxt %d already set up\n",
+ obd->obd_name, index);
+ LASSERT(ctxt->loc_olg == olg);
+ LASSERT(ctxt->loc_obd == obd);
+ LASSERT(ctxt->loc_exp == disk_obd->obd_self_export);
+ LASSERT(ctxt->loc_logops == op);
+ llog_ctxt_put(ctxt);
+ }
rc = 0;
}
- GOTO(out, rc);
+ RETURN(rc);
}
- if (op->lop_setup)
- rc = op->lop_setup(obd, olg, index, disk_obd, count, logid);
+ if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LLOG_SETUP)) {
+ rc = -ENOTSUPP;
+ } else {
+ if (op->lop_setup)
+ rc = op->lop_setup(obd, olg, index, disk_obd, count,
+ logid, logname);
+ }
if (rc) {
- llog_ctxt_destroy(ctxt);
+ CERROR("obd %s ctxt %d lop_setup=%p failed %d\n",
+ obd->obd_name, index, op->lop_setup, rc);
+ llog_ctxt_put(ctxt);
}
-out:
+
RETURN(rc);
}
+EXPORT_SYMBOL(llog_setup_named);
+
+int llog_setup(struct obd_device *obd, struct obd_llog_group *olg,
+ int index, struct obd_device *disk_obd, int count,
+ struct llog_logid *logid, struct llog_operations *op)
+{
+ return llog_setup_named(obd,olg,index,disk_obd,count,logid,NULL,op);
+}
EXPORT_SYMBOL(llog_setup);
int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp)
CERROR("No ctxt\n");
RETURN(-ENODEV);
}
-
+
CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP);
raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
if (!raised)
CERROR("No ctxt\n");
RETURN(-ENODEV);
}
-
+
CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
rc = CTXTP(ctxt, cancel)(ctxt, lsm, count, cookies, flags);
RETURN(rc);
// XXX how to set exports
int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg,
int index, struct obd_device *disk_obd, int count,
- struct llog_logid *logid)
+ struct llog_logid *logid, const char *name)
{
struct llog_ctxt *ctxt;
struct llog_handle *handle;
LASSERT(olg != NULL);
ctxt = llog_group_get_ctxt(olg, index);
+ if (!ctxt)
+ RETURN(-ENODEV);
- LASSERT(ctxt);
- llog_gen_init(ctxt);
-
- if (logid->lgl_oid)
+ if (logid && logid->lgl_oid) {
rc = llog_create(ctxt, &handle, logid, NULL);
- else {
- rc = llog_create(ctxt, &handle, NULL, NULL);
- if (!rc)
+ } else {
+ rc = llog_create(ctxt, &handle, NULL, (char *)name);
+ if (!rc && logid)
*logid = handle->lgh_id;
}
if (rc)
rc = llog_process(handle, (llog_cb_t)cat_cancel_cb, NULL, NULL);
if (rc)
- CERROR("llog_process with cat_cancel_cb failed: %d\n", rc);
+ CERROR("llog_process() with cat_cancel_cb failed: %d\n", rc);
+ GOTO(out, rc);
out:
llog_ctxt_put(ctxt);
- RETURN(rc);
+ return rc;
}
EXPORT_SYMBOL(llog_obd_origin_setup);
cathandle = ctxt->loc_handle;
LASSERT(cathandle != NULL);
rc = llog_cat_add_rec(cathandle, rec, logcookies, NULL);
- if (rc != 1)
+ if ((rc < 0) || (!logcookies && rc))
CERROR("write one catalog record failed: %d\n", rc);
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff