X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_obd.c;h=add9ae486e5e56094f801919812cc89552fb21a1;hb=c85a039f9ddee1bf024b76d0a6c3d0885a19009b;hp=9c9abb735384cf9a1c864a39f16589b979bc1c08;hpb=c5050e412572b00cbe93d8517d2d1f767bebfa92;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index 9c9abb7..add9ae4 100644 --- a/lustre/obdclass/llog_obd.c +++ b/lustre/obdclass/llog_obd.c @@ -22,17 +22,19 @@ #include #include #include -#include "llog_internal.h" /* helper functions for calling the llog obd methods */ -int llog_setup(struct obd_device *obd, int index, struct obd_device *disk_obd, - int count, struct llog_logid *logid, struct llog_operations *op) +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); @@ -40,92 +42,58 @@ int llog_setup(struct obd_device *obd, int index, struct obd_device *disk_obd, 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_exp = class_export_get(disk_obd->obd_self_export); + ctxt->loc_llogs = llogs; ctxt->loc_idx = index; - ctxt->loc_logops = op; + 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")) { + 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); - if (ctxt && rc) + 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)); + } RETURN(rc); } -EXPORT_SYMBOL(llog_setup); +EXPORT_SYMBOL(obd_llog_setup); -int llog_cleanup(struct llog_ctxt *ctxt) +int obd_llog_cleanup(struct llog_ctxt *ctxt) { int rc = 0; ENTRY; - down(&ctxt->loc_sem); LASSERT(ctxt); - if (CTXTP(ctxt, cleanup)) + 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; - up(&ctxt->loc_sem); OBD_FREE(ctxt, sizeof(*ctxt)); - - RETURN(rc); -} -EXPORT_SYMBOL(llog_cleanup); - -int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp) -{ - int rc = 0; - ENTRY; - - if (!ctxt) - RETURN(0); - down(&ctxt->loc_sem); - if (ctxt->loc_llcd && CTXTP(ctxt, sync)) - rc = CTXTP(ctxt, sync)(ctxt, exp); - else - up(&ctxt->loc_sem); - - RETURN(rc); -} -EXPORT_SYMBOL(llog_sync); - -int llog_add(struct llog_ctxt *ctxt, - struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, - struct llog_cookie *logcookies, int numcookies) -{ - int rc; - ENTRY; - - LASSERT(ctxt); - down(&ctxt->loc_sem); - CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP); - - rc = CTXTP(ctxt, add)(ctxt, rec, lsm, logcookies, numcookies); - up(&ctxt->loc_sem); RETURN(rc); } -EXPORT_SYMBOL(llog_add); - -int llog_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, - int count, struct llog_cookie *cookies, int flags) -{ - int rc; - ENTRY; - - LASSERT(ctxt); - CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP); - rc = CTXTP(ctxt, cancel)(ctxt, lsm, count, cookies, flags); - RETURN(rc); -} -EXPORT_SYMBOL(llog_cancel); +EXPORT_SYMBOL(obd_llog_cleanup); /* callback func for llog_process in llog_obd_origin_setup */ -static int cat_cancel_cb(struct llog_handle *cathandle, +static int cat_cancel_cb(struct llog_handle *cathandle, struct llog_rec_hdr *rec, void *data) { struct llog_logid_rec *lir = (struct llog_logid_rec *)rec; @@ -134,39 +102,40 @@ static int cat_cancel_cb(struct llog_handle *cathandle, int rc, index; ENTRY; - if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) { + 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", + CWARN("processing log "LPX64":%x at index %u of catalog "LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen, - le32_to_cpu(rec->lrh_index), cathandle->lgh_id.lgl_oid); + rec->lrh_index, cathandle->lgh_id.lgl_oid); rc = llog_cat_id2handle(cathandle, &loghandle, &lir->lid_id); if (rc) { - CERROR("Cannot find handle for log "LPX64"\n", lir->lid_id.lgl_oid); + CERROR("Cannot find handle for log "LPX64"\n", + lir->lid_id.lgl_oid); RETURN(rc); - } - + } + llh = loghandle->lgh_hdr; - if ((le32_to_cpu(llh->llh_flags) & LLOG_F_ZAP_WHEN_EMPTY) && - (le32_to_cpu(llh->llh_count) == 1)) { + if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) && + (llh->llh_count == 1)) { rc = llog_destroy(loghandle); if (rc) - CERROR("failure destroying log during postsetup: %d\n", rc); + CERROR("failure destroying log in postsetup: %d\n", rc); LASSERT(rc == 0); index = loghandle->u.phd.phd_cookie.lgc_index; - if (cathandle->u.chd.chd_current_log == loghandle) - cathandle->u.chd.chd_current_log = NULL; 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, - le32_to_cpu(rec->lrh_index), cathandle->lgh_id.lgl_oid); + 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); } RETURN(rc); @@ -174,12 +143,13 @@ static int cat_cancel_cb(struct llog_handle *cathandle, /* 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, struct llog_logid *logid) +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; struct llog_handle *handle; - struct obd_run_ctxt saved; + struct lvfs_run_ctxt saved; int rc; ENTRY; @@ -187,36 +157,34 @@ int llog_obd_origin_setup(struct obd_device *obd, int index, struct obd_device * RETURN(0); LASSERT(count == 1); - - ctxt = llog_get_context(obd, index); + + ctxt = llog_get_context(llogs, index); LASSERT(ctxt); - log_gen_init(ctxt); + llog_gen_init(ctxt); - down(&ctxt->loc_sem); if (logid->lgl_oid) rc = llog_create(ctxt, &handle, logid, NULL); else { rc = llog_create(ctxt, &handle, NULL, NULL); - if (!rc) + if (!rc) *logid = handle->lgh_id; } - if (rc) - GOTO(out, rc); + if (rc) + RETURN(rc); ctxt->loc_handle = handle; - push_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); rc = llog_init_handle(handle, LLOG_F_IS_CAT, NULL); - pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL); + pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); if (rc) - GOTO(out, rc); + RETURN(rc); - rc = llog_process(handle, (llog_cb_t)cat_cancel_cb, NULL); - 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); - out: - up(&ctxt->loc_sem); + if (ctxt && rc) { - obd->obd_llog_ctxt[index] = NULL; + llogs->llog_ctxt[index] = NULL; OBD_FREE(ctxt, sizeof(*ctxt)); } RETURN(rc); @@ -229,33 +197,35 @@ int llog_obd_origin_cleanup(struct llog_ctxt *ctxt) 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) { + list_for_each_entry_safe(loghandle, n, + &cathandle->u.chd.chd_head, + u.phd.phd_entry) { llh = loghandle->lgh_hdr; - if ((le32_to_cpu(llh->llh_flags) & LLOG_F_ZAP_WHEN_EMPTY) && - (le32_to_cpu(llh->llh_count) == 1)) { + 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); + CERROR("failure destroying log during " + "cleanup: %d\n", rc); LASSERT(rc == 0); index = loghandle->u.phd.phd_cookie.lgc_index; - if (cathandle->u.chd.chd_current_log == loghandle) - cathandle->u.chd.chd_current_log = NULL; llog_free_handle(loghandle); - + LASSERT(index); + llog_cat_set_first_idx(cathandle, index); rc = llog_cancel_rec(cathandle, index); if (rc == 0) - CWARN("cancel plain log at index %u of catalog "LPX64"\n", - index, cathandle->lgh_id.lgl_oid); + 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); @@ -264,7 +234,6 @@ int llog_obd_origin_cleanup(struct llog_ctxt *ctxt) } 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, @@ -283,11 +252,11 @@ int llog_obd_origin_add(struct llog_ctxt *ctxt, } EXPORT_SYMBOL(llog_obd_origin_add); -int llog_cat_initialize(struct obd_device *obd, int count) +int obd_llog_cat_initialize(struct obd_device *obd, struct obd_llogs *llogs, + int count, char *name) { - struct llog_logid *idarray; + struct llog_catid *idarray; int size = sizeof(*idarray) * count; - char name[32] = "CATLIST"; int rc; ENTRY; @@ -295,53 +264,54 @@ int llog_cat_initialize(struct obd_device *obd, int count) if (!idarray) RETURN(-ENOMEM); - memset(idarray, 0, size); - - rc = llog_get_cat_list(obd, obd, name, count, idarray); + rc = llog_get_cat_list(&obd->obd_lvfs_ctxt, obd->obd_fsops, + name, count, idarray); if (rc) { CERROR("rc: %d\n", rc); 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); } - rc = llog_put_cat_list(obd, obd, name, count, idarray); + rc = llog_put_cat_list(&obd->obd_lvfs_ctxt, obd->obd_fsops, + name, count, idarray); if (rc) { CERROR("rc: %d\n", rc); GOTO(out, rc); } - + out: OBD_FREE(idarray, size); RETURN(rc); } -EXPORT_SYMBOL(llog_cat_initialize); +EXPORT_SYMBOL(obd_llog_cat_initialize); -int obd_llog_init(struct obd_device *obd, struct obd_device *disk_obd, - int count, struct llog_logid *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);