/* helper functions for calling the llog obd methods */
-int obd_llog_setup(struct obd_device *obd, int index,
- struct obd_device *disk_obd, int count,
+int obd_llog_setup(struct obd_device *obd, struct obd_llogs *llogs,
+ int index, struct obd_device *disk_obd, int count,
struct llog_logid *logid, struct llog_operations *op)
{
int rc = 0;
struct llog_ctxt *ctxt;
ENTRY;
+ LASSERT(llogs);
+
if (index < 0 || index >= LLOG_MAX_CTXTS)
RETURN(-EFAULT);
if (!ctxt)
RETURN(-ENOMEM);
+ llogs->llog_ctxt[index] = ctxt;
obd->obd_llog_ctxt[index] = ctxt;
ctxt->loc_logops = op;
ctxt->loc_obd = obd;
+ ctxt->loc_llogs = llogs;
ctxt->loc_idx = index;
+ ctxt->loc_alone = 0;
ctxt->loc_exp = class_export_get(disk_obd->obd_self_export);
sema_init(&ctxt->loc_sem, 1);
if (op->lop_close == llog_lvfs_ops.lop_close) {
ctxt->loc_fsops = disk_obd->obd_fsops;
ctxt->loc_lvfs_ctxt = &disk_obd->obd_lvfs_ctxt;
- if (!strcmp(disk_obd->obd_type->typ_name, "mds")) {
+ if (!strcmp(disk_obd->obd_type->typ_name, LUSTRE_MDS_NAME)) {
struct mds_obd *mds = &disk_obd->u.mds;
ctxt->loc_objects_dir = mds->mds_objects_dir;
ctxt->loc_logs_dir = mds->mds_logs_dir;
}
if (op->lop_setup)
- rc = op->lop_setup(obd, index, disk_obd, count, logid);
+ rc = op->lop_setup(obd, llogs, index, disk_obd, count, logid);
if (ctxt && rc) {
obd->obd_llog_ctxt[index] = NULL;
OBD_FREE(ctxt, sizeof(*ctxt));
LASSERT(ctxt);
+ if (CTXTP(ctxt, cleanup))
+ rc = CTXTP(ctxt, cleanup)(ctxt);
+
ctxt->loc_obd->obd_llog_ctxt[ctxt->loc_idx] = NULL;
+ ctxt->loc_llogs->llog_ctxt[ctxt->loc_idx] = NULL;
class_export_put(ctxt->loc_exp);
ctxt->loc_exp = NULL;
-
- if (CTXTP(ctxt, cleanup))
- rc = CTXTP(ctxt, cleanup)(ctxt);
- else
- OBD_FREE(ctxt, sizeof(*ctxt));
-
+ OBD_FREE(ctxt, sizeof(*ctxt));
RETURN(rc);
}
EXPORT_SYMBOL(obd_llog_cleanup);
/* lop_setup method for filter/osc */
// XXX how to set exports
-int llog_obd_origin_setup(struct obd_device *obd, int index,
- struct obd_device *disk_obd, int count,
+int llog_obd_origin_setup(struct obd_device *obd, struct obd_llogs *llogs,
+ int index, struct obd_device *disk_obd, int count,
struct llog_logid *logid)
{
struct llog_ctxt *ctxt;
LASSERT(count == 1);
- ctxt = llog_get_context(obd, index);
+ ctxt = llog_get_context(llogs, index);
LASSERT(ctxt);
llog_gen_init(ctxt);
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);
+
+ if (ctxt && rc) {
+ llogs->llog_ctxt[index] = NULL;
+ OBD_FREE(ctxt, sizeof(*ctxt));
+ }
RETURN(rc);
}
EXPORT_SYMBOL(llog_obd_origin_setup);
-int obd_llog_cat_initialize(struct obd_device *obd, int count, char *name)
+int llog_obd_origin_cleanup(struct llog_ctxt *ctxt)
+{
+ struct llog_handle *cathandle, *n, *loghandle;
+ struct llog_log_hdr *llh;
+ int rc, index;
+ ENTRY;
+
+ if (!ctxt)
+ return 0;
+
+ cathandle = ctxt->loc_handle;
+ if (cathandle) {
+ list_for_each_entry_safe(loghandle, n,
+ &cathandle->u.chd.chd_head,
+ u.phd.phd_entry) {
+ llh = loghandle->lgh_hdr;
+ if ((llh->llh_flags &
+ LLOG_F_ZAP_WHEN_EMPTY) &&
+ (llh->llh_count == 1)) {
+ rc = llog_destroy(loghandle);
+ if (rc)
+ CERROR("failure destroying log during "
+ "cleanup: %d\n", rc);
+ LASSERT(rc == 0);
+
+ index = loghandle->u.phd.phd_cookie.lgc_index;
+ llog_free_handle(loghandle);
+
+ LASSERT(index);
+ llog_cat_set_first_idx(cathandle, index);
+ rc = llog_cancel_rec(cathandle, index);
+ if (rc == 0)
+ CDEBUG(D_HA, "cancel plain log at index"
+ " %u of catalog "LPX64"\n",
+ index,cathandle->lgh_id.lgl_oid);
+ }
+ }
+ llog_cat_put(ctxt->loc_handle);
+ }
+ return 0;
+}
+EXPORT_SYMBOL(llog_obd_origin_cleanup);
+
+/* add for obdfilter/sz and mds/unlink */
+int llog_obd_origin_add(struct llog_ctxt *ctxt,
+ struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
+ struct llog_cookie *logcookies, int numcookies)
+{
+ struct llog_handle *cathandle;
+ int rc;
+ ENTRY;
+
+ cathandle = ctxt->loc_handle;
+ LASSERT(cathandle != NULL);
+ rc = llog_cat_add_rec(cathandle, rec, logcookies, NULL);
+ if (rc != 1)
+ CERROR("write one catalog record failed: %d\n", rc);
+ RETURN(rc);
+}
+EXPORT_SYMBOL(llog_obd_origin_add);
+
+int obd_llog_cat_initialize(struct obd_device *obd, struct obd_llogs *llogs,
+ int count, char *name)
{
struct llog_catid *idarray;
int size = sizeof(*idarray) * count;
GOTO(out, rc);
}
- rc = obd_llog_init(obd, obd, count, idarray);
+ rc = obd_llog_init(obd, llogs, obd, count, idarray);
if (rc) {
CERROR("rc: %d\n", rc);
GOTO(out, rc);
}
EXPORT_SYMBOL(obd_llog_cat_initialize);
-int obd_llog_init(struct obd_device *obd, struct obd_device *disk_obd,
- int count, struct llog_catid *logid)
+int obd_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+ struct obd_device *disk_obd, int count,
+ struct llog_catid *logid)
{
int rc;
ENTRY;
OBD_CHECK_OP(obd, llog_init, 0);
OBD_COUNTER_INCREMENT(obd, llog_init);
- rc = OBP(obd, llog_init)(obd, disk_obd, count, logid);
+ rc = OBP(obd, llog_init)(obd, llogs, disk_obd, count, logid);
RETURN(rc);
}
EXPORT_SYMBOL(obd_llog_init);
-int obd_llog_finish(struct obd_device *obd, int count)
+int obd_llog_finish(struct obd_device *obd, struct obd_llogs *llogs, int count)
{
int rc;
ENTRY;
OBD_CHECK_OP(obd, llog_finish, 0);
OBD_COUNTER_INCREMENT(obd, llog_finish);
- rc = OBP(obd, llog_finish)(obd, count);
+ rc = OBP(obd, llog_finish)(obd, llogs, count);
RETURN(rc);
}
EXPORT_SYMBOL(obd_llog_finish);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff