#include <linux/obd_class.h>
#include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <linux/lustre_mds.h>
+#include <libcfs/list.h>
/* 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;
+ int rc = 0;
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, OBD_MDS_DEVICENAME)) {
struct mds_obd *mds = &disk_obd->u.mds;
ctxt->loc_objects_dir = mds->mds_objects_dir;
ctxt->loc_logs_dir = mds->mds_logs_dir;
+ } else if (!strcmp(disk_obd->obd_type->typ_name, OBD_CONF_DEVICENAME)) {
+ struct conf_obd *confobd = &disk_obd->u.conf;
+ ctxt->loc_objects_dir = confobd->cfobd_objects_dir;
+ ctxt->loc_logs_dir = confobd->cfobd_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));
int rc = 0;
ENTRY;
- LASSERT(ctxt);
+ if (ctxt == NULL)
+ RETURN(0);
+ 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);
{
struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
struct llog_handle *loghandle;
- struct llog_log_hdr *llh;
- int rc, index;
+ int rc;
ENTRY;
if (rec->lrh_type != LLOG_LOGID_MAGIC) {
CERROR("invalid record in catalog\n");
RETURN(-EINVAL);
}
- CWARN("processing log "LPX64":%x at index %u of catalog "LPX64"\n",
+ CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog "LPX64"\n",
lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
rec->lrh_index, cathandle->lgh_id.lgl_oid);
RETURN(rc);
}
- 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 in postsetup: %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)
- CWARN("cancel log "LPX64":%x at index %u of catalog "
- LPX64"\n", lir->lid_id.lgl_oid,
- lir->lid_id.lgl_ogen, rec->lrh_index,
- cathandle->lgh_id.lgl_oid);
- }
+ if (cathandle->lgh_last_idx == loghandle->u.phd.phd_cookie.lgc_index)
+ cathandle->u.chd.chd_current_log = loghandle;
RETURN(rc);
}
/* 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);
- if (logid->lgl_oid)
- rc = llog_create(ctxt, &handle, logid, NULL);
- else {
- rc = llog_create(ctxt, &handle, NULL, NULL);
+ if (logid->lgl_oid) {
+ rc = llog_open(ctxt, &handle, logid, NULL, 0);
+ } else {
+ rc = llog_open(ctxt, &handle, NULL, NULL, 0);
if (!rc)
*logid = handle->lgh_id;
}
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 obd_llog_cat_initialize(struct obd_device *obd, struct obd_llogs *llogs,
+ int count, const 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