X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_obd.c;h=1c8eccf9f95ec4b513484406b5822046804af4de;hb=331efcd1f1d446fc3fcd71adfc8223df90b2ba4c;hp=7ff434a98bce408e0f52144488085b8abcc84ab6;hpb=0e660eab787c3b2857e4295f1ec554e016393885;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index 7ff434a..1c8eccf 100644 --- a/lustre/obdclass/llog_obd.c +++ b/lustre/obdclass/llog_obd.c @@ -26,7 +26,7 @@ * 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. */ /* @@ -59,22 +59,23 @@ static struct llog_ctxt* llog_new_ctxt(struct obd_device *obd) return NULL; ctxt->loc_obd = obd; - atomic_set(&ctxt->loc_refcount, 1); + cfs_atomic_set(&ctxt->loc_refcount, 1); return ctxt; } 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) @@ -83,17 +84,21 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt) struct obd_device *obd; int rc = 0; - spin_lock(&olg->olg_lock); - if (!atomic_dec_and_test(&ctxt->loc_refcount)) { - spin_unlock(&olg->olg_lock); + cfs_spin_lock(&olg->olg_lock); + if (!cfs_atomic_dec_and_test(&ctxt->loc_refcount)) { + cfs_spin_unlock(&olg->olg_lock); return rc; } olg->olg_ctxts[ctxt->loc_idx] = NULL; - spin_unlock(&olg->olg_lock); + cfs_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 */ + cfs_spin_lock(&obd->obd_dev_lock); + /* sync with llog ctxt user thread */ + cfs_spin_unlock(&obd->obd_dev_lock); /* obd->obd_starting is needed for the case of cleanup * in error case while obd is starting up. */ @@ -107,7 +112,7 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt) rc = CTXTP(ctxt, cleanup)(ctxt); llog_ctxt_destroy(ctxt); - wake_up(&olg->olg_waitq); + cfs_waitq_signal(&olg->olg_waitq); return rc; } EXPORT_SYMBOL(__llog_ctxt_put); @@ -119,19 +124,25 @@ int llog_cleanup(struct llog_ctxt *ctxt) 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 */ - LASSERT(atomic_read(&ctxt->loc_refcount) > 1); + /* + * Banlance the ctxt get when calling llog_cleanup() + */ + LASSERT(cfs_atomic_read(&ctxt->loc_refcount) < 0x5a5a5a); + LASSERT(cfs_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", @@ -149,58 +160,69 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, 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); + cfs_sema_init(&ctxt->loc_sem, 1); + ctxt->loc_exp = class_export_get(disk_obd->obd_self_export); + ctxt->loc_flags = LLOG_CTXT_FLAG_UNINITIALIZED; 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, - logname); - if (rc) { - CERROR("obd %s ctxt %d lop_setup=%p failed %d\n", - obd->obd_name, index, op->lop_setup, rc); - llog_ctxt_put(ctxt); - } + 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); } -out: + + if (rc) { + CERROR("obd %s ctxt %d lop_setup=%p failed %d\n", + obd->obd_name, index, op->lop_setup, rc); + llog_ctxt_put(ctxt); + } else { + CDEBUG(D_CONFIG, "obd %s ctxt %d is initialized\n", + obd->obd_name, index); + ctxt->loc_flags &= ~LLOG_CTXT_FLAG_UNINITIALIZED; + } + RETURN(rc); } EXPORT_SYMBOL(llog_setup_named); @@ -240,6 +262,10 @@ int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, RETURN(-ENODEV); } + if (ctxt->loc_flags & LLOG_CTXT_FLAG_UNINITIALIZED) + RETURN(-ENXIO); + + CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP); raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE); if (!raised) @@ -290,6 +316,10 @@ static int cat_cancel_cb(struct llog_handle *cathandle, if (rc) { CERROR("Cannot find handle for log "LPX64"\n", lir->lid_id.lgl_oid); + if (rc == -ENOENT) { + index = rec->lrh_index; + goto cat_cleanup; + } RETURN(rc); } @@ -303,6 +333,7 @@ static int cat_cancel_cb(struct llog_handle *cathandle, index = loghandle->u.phd.phd_cookie.lgc_index; llog_free_handle(loghandle); +cat_cleanup: LASSERT(index); llog_cat_set_first_idx(cathandle, index); rc = llog_cancel_rec(cathandle, index); @@ -335,9 +366,8 @@ int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, LASSERT(olg != NULL); ctxt = llog_group_get_ctxt(olg, index); - - LASSERT(ctxt); - llog_gen_init(ctxt); + if (!ctxt) + RETURN(-ENODEV); if (logid && logid->lgl_oid) { rc = llog_create(ctxt, &handle, logid, NULL); @@ -358,10 +388,11 @@ int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, 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); @@ -377,9 +408,9 @@ int llog_obd_origin_cleanup(struct llog_ctxt *ctxt) cathandle = ctxt->loc_handle; if (cathandle) { - list_for_each_entry_safe(loghandle, n, - &cathandle->u.chd.chd_head, - u.phd.phd_entry) { + cfs_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) && @@ -419,60 +450,21 @@ int llog_obd_origin_add(struct llog_ctxt *ctxt, cathandle = ctxt->loc_handle; LASSERT(cathandle != NULL); rc = llog_cat_add_rec(cathandle, rec, logcookies, NULL); - if ((rc < 0) || (!logcookies && rc)) + if (rc != 0 && rc != 1) CERROR("write one catalog record failed: %d\n", rc); RETURN(rc); } EXPORT_SYMBOL(llog_obd_origin_add); -int llog_cat_initialize(struct obd_device *obd, struct obd_llog_group *olg, - int idx, struct obd_uuid *uuid) -{ - char name[32] = CATLIST; - struct llog_catid idarray; - int rc; - ENTRY; - - mutex_down(&olg->olg_cat_processing); - rc = llog_get_cat_list(obd, obd, name, idx, 1, &idarray); - if (rc) { - CERROR("rc: %d\n", rc); - GOTO(out, rc); - } - - CDEBUG(D_INFO, "%s: Init llog for %s/%d - catid "LPX64"/"LPX64":%x\n", - obd->obd_name, uuid->uuid, idx, idarray.lci_logid.lgl_oid, - idarray.lci_logid.lgl_ogr, idarray.lci_logid.lgl_ogen); - - rc = obd_llog_init(obd, olg, obd, 1, &idarray, uuid); - if (rc) { - CERROR("rc: %d\n", rc); - GOTO(out, rc); - } - - rc = llog_put_cat_list(obd, obd, name, idx, 1, &idarray); - if (rc) { - CERROR("rc: %d\n", rc); - GOTO(out, rc); - } - - out: - mutex_up(&olg->olg_cat_processing); - - RETURN(rc); -} -EXPORT_SYMBOL(llog_cat_initialize); - int obd_llog_init(struct obd_device *obd, struct obd_llog_group *olg, - struct obd_device *disk_obd, int count, - struct llog_catid *logid, struct obd_uuid *uuid) + struct obd_device *disk_obd, int *index) { int rc; ENTRY; OBD_CHECK_DT_OP(obd, llog_init, 0); OBD_COUNTER_INCREMENT(obd, llog_init); - rc = OBP(obd, llog_init)(obd, olg, disk_obd, count, logid, uuid); + rc = OBP(obd, llog_init)(obd, olg, disk_obd, index); RETURN(rc); } EXPORT_SYMBOL(obd_llog_init);