X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_obd.c;h=606c22ad16f4c448a37f54977ded506de176d5a3;hp=b84e9dc3232bdd3c666674ace8ccf2b534dbb361;hb=6fe7c32906f67f43d815c884ed8a902bb2333992;hpb=801469af8c31afad1bd8aaa23b01bfc42abe45eb diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index b84e9dc..606c22a 100644 --- a/lustre/obdclass/llog_obd.c +++ b/lustre/obdclass/llog_obd.c @@ -27,7 +27,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Whamcloud, Inc. + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,7 +42,6 @@ #include #include -#include #include "llog_internal.h" /* helper functions for calling the llog obd methods */ @@ -70,31 +69,27 @@ static void llog_ctxt_destroy(struct llog_ctxt *ctxt) class_import_put(ctxt->loc_imp); ctxt->loc_imp = NULL; } - LASSERT(ctxt->loc_llcd == NULL); OBD_FREE_PTR(ctxt); } -int __llog_ctxt_put(struct llog_ctxt *ctxt) +int __llog_ctxt_put(const struct lu_env *env, struct llog_ctxt *ctxt) { struct obd_llog_group *olg = ctxt->loc_olg; struct obd_device *obd; int rc = 0; - 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; - cfs_spin_unlock(&olg->olg_lock); - - if (ctxt->loc_lcm) - lcm_put(ctxt->loc_lcm); + spin_lock(&olg->olg_lock); + if (!cfs_atomic_dec_and_test(&ctxt->loc_refcount)) { + spin_unlock(&olg->olg_lock); + return rc; + } + olg->olg_ctxts[ctxt->loc_idx] = NULL; + spin_unlock(&olg->olg_lock); - obd = ctxt->loc_obd; - cfs_spin_lock(&obd->obd_dev_lock); - /* sync with llog ctxt user thread */ - cfs_spin_unlock(&obd->obd_dev_lock); + obd = ctxt->loc_obd; + spin_lock(&obd->obd_dev_lock); + /* sync with llog ctxt user thread */ + spin_unlock(&obd->obd_dev_lock); /* obd->obd_starting is needed for the case of cleanup * in error case while obd is starting up. */ @@ -105,7 +100,7 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt) /* cleanup the llog ctxt here */ if (CTXTP(ctxt, cleanup)) - rc = CTXTP(ctxt, cleanup)(NULL, ctxt); + rc = CTXTP(ctxt, cleanup)(env, ctxt); llog_ctxt_destroy(ctxt); cfs_waitq_signal(&olg->olg_waitq); @@ -113,7 +108,7 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt) } EXPORT_SYMBOL(__llog_ctxt_put); -int llog_cleanup(struct llog_ctxt *ctxt) +int llog_cleanup(const struct lu_env *env, struct llog_ctxt *ctxt) { struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL); struct obd_llog_group *olg; @@ -129,17 +124,17 @@ int llog_cleanup(struct llog_ctxt *ctxt) idx = ctxt->loc_idx; - /* + /* * Banlance the ctxt get when calling llog_cleanup() */ LASSERT(cfs_atomic_read(&ctxt->loc_refcount) < LI_POISON); LASSERT(cfs_atomic_read(&ctxt->loc_refcount) > 1); llog_ctxt_put(ctxt); - /* - * Try to free the ctxt. - */ - rc = __llog_ctxt_put(ctxt); + /* + * Try to free the ctxt. + */ + rc = __llog_ctxt_put(env, ctxt); if (rc) CERROR("Error %d while cleaning up ctxt %p\n", rc, ctxt); @@ -151,10 +146,9 @@ int llog_cleanup(struct llog_ctxt *ctxt) } EXPORT_SYMBOL(llog_cleanup); -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 llog_setup(const struct lu_env *env, struct obd_device *obd, + struct obd_llog_group *olg, int index, + struct obd_device *disk_obd, struct llog_operations *op) { struct llog_ctxt *ctxt; int rc = 0; @@ -173,7 +167,7 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, ctxt->loc_olg = olg; ctxt->loc_idx = index; ctxt->loc_logops = op; - cfs_mutex_init(&ctxt->loc_mutex); + mutex_init(&ctxt->loc_mutex); ctxt->loc_exp = class_export_get(disk_obd->obd_self_export); ctxt->loc_flags = LLOG_CTXT_FLAG_UNINITIALIZED; @@ -201,18 +195,18 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, RETURN(rc); } - if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LLOG_SETUP)) { - rc = -ENOTSUPP; - } else { - if (op->lop_setup) - rc = op->lop_setup(NULL, 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 (op->lop_setup) { + if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LLOG_SETUP)) + rc = -EOPNOTSUPP; + else + rc = op->lop_setup(env, obd, olg, index, disk_obd); + } + + if (rc) { + CERROR("%s: ctxt %d lop_setup=%p failed: rc = %d\n", + obd->obd_name, index, op->lop_setup, rc); + llog_group_clear_ctxt(olg, index); + llog_ctxt_destroy(ctxt); } else { CDEBUG(D_CONFIG, "obd %s ctxt %d is initialized\n", obd->obd_name, index); @@ -221,14 +215,6 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, 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, int flags) @@ -246,9 +232,9 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags) } EXPORT_SYMBOL(llog_sync); -int llog_add(const struct lu_env *env, struct llog_ctxt *ctxt, - struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, - struct llog_cookie *logcookies, int numcookies) +int llog_obd_add(const struct lu_env *env, struct llog_ctxt *ctxt, + struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, + struct llog_cookie *logcookies, int numcookies) { int raised, rc; ENTRY; @@ -261,18 +247,17 @@ int llog_add(const struct lu_env *env, struct llog_ctxt *ctxt, if (ctxt->loc_flags & LLOG_CTXT_FLAG_UNINITIALIZED) RETURN(-ENXIO); - - CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP); + CTXT_CHECK_OP(ctxt, obd_add, -EOPNOTSUPP); raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE); if (!raised) cfs_cap_raise(CFS_CAP_SYS_RESOURCE); - rc = CTXTP(ctxt, add)(env, ctxt, rec, lsm, logcookies, - numcookies); + rc = CTXTP(ctxt, obd_add)(env, ctxt, rec, lsm, logcookies, + numcookies); if (!raised) cfs_cap_lower(CFS_CAP_SYS_RESOURCE); RETURN(rc); } -EXPORT_SYMBOL(llog_add); +EXPORT_SYMBOL(llog_obd_add); int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, int count, @@ -292,88 +277,6 @@ int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt, } EXPORT_SYMBOL(llog_cancel); -/* lop_setup method for filter/osc */ -// XXX how to set exports -int llog_obd_origin_setup(const struct lu_env *env, struct obd_device *obd, - struct obd_llog_group *olg, int index, - struct obd_device *disk_obd, int count, - struct llog_logid *logid, const char *name) -{ - struct llog_ctxt *ctxt; - struct llog_handle *handle; - struct lvfs_run_ctxt saved; - int rc; - ENTRY; - - if (count == 0) - RETURN(0); - - LASSERT(count == 1); - - LASSERT(olg != NULL); - ctxt = llog_group_get_ctxt(olg, index); - if (!ctxt) - RETURN(-ENODEV); - - if (logid && logid->lgl_oid) { - rc = llog_open(env, ctxt, &handle, logid, NULL, - LLOG_OPEN_EXISTS); - } else { - rc = llog_open_create(env, ctxt, &handle, NULL, (char *)name); - if (!rc && logid) - *logid = handle->lgh_id; - } - if (rc) - GOTO(out, rc); - - ctxt->loc_handle = handle; - push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - rc = llog_init_handle(env, handle, LLOG_F_IS_CAT, NULL); - pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - if (rc) - GOTO(out, rc); - - rc = llog_process(env, handle, (llog_cb_t)cat_cancel_cb, NULL, NULL); - if (rc) - CERROR("llog_process() with cat_cancel_cb failed: %d\n", rc); - GOTO(out, rc); -out: - llog_ctxt_put(ctxt); - return rc; -} -EXPORT_SYMBOL(llog_obd_origin_setup); - -int llog_obd_origin_cleanup(const struct lu_env *env, struct llog_ctxt *ctxt) -{ - ENTRY; - - if (!ctxt) - RETURN(0); - - if (ctxt->loc_handle) - llog_cat_close(env, ctxt->loc_handle); - RETURN(0); -} -EXPORT_SYMBOL(llog_obd_origin_cleanup); - -/* add for obdfilter/sz and mds/unlink */ -int llog_obd_origin_add(const struct lu_env *env, 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(env, cathandle, rec, logcookies, NULL); - if (rc != 0 && rc != 1) - CERROR("write one catalog record failed: %d\n", rc); - RETURN(rc); -} -EXPORT_SYMBOL(llog_obd_origin_add); - int obd_llog_init(struct obd_device *obd, struct obd_llog_group *olg, struct obd_device *disk_obd, int *index) {