* 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/
#define DEBUG_SUBSYSTEM S_LOG
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
#include <obd_class.h>
#include <lustre_log.h>
-#include <libcfs/list.h>
#include "llog_internal.h"
/* helper functions for calling the llog obd methods */
return NULL;
ctxt->loc_obd = obd;
- cfs_atomic_set(&ctxt->loc_refcount, 1);
+ atomic_set(&ctxt->loc_refcount, 1);
return 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 (!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. */
/* 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);
+ wake_up(&olg->olg_waitq);
return rc;
}
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;
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);
+ LASSERT(atomic_read(&ctxt->loc_refcount) < LI_POISON);
+ LASSERT(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);
}
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;
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;
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);
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)
}
EXPORT_SYMBOL(llog_sync);
-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;
-
- if (!ctxt) {
- CERROR("No ctxt\n");
- RETURN(-ENODEV);
- }
-
- if (ctxt->loc_flags & LLOG_CTXT_FLAG_UNINITIALIZED)
- RETURN(-ENXIO);
-
- 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, obd_add)(env, ctxt, rec, lsm, logcookies,
- numcookies);
- if (!raised)
- cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
- RETURN(rc);
-}
-EXPORT_SYMBOL(llog_obd_add);
-
int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt,
- struct lov_stripe_md *lsm, int count,
struct llog_cookie *cookies, int flags)
{
int rc;
}
CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
- rc = CTXTP(ctxt, cancel)(env, ctxt, lsm, count, cookies, flags);
+ rc = CTXTP(ctxt, cancel)(env, ctxt, cookies, flags);
RETURN(rc);
}
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(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)
-{
- 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, index);
- RETURN(rc);
-}
-EXPORT_SYMBOL(obd_llog_init);
-
-int obd_llog_finish(struct obd_device *obd, int count)
-{
- int rc;
- ENTRY;
- OBD_CHECK_DT_OP(obd, llog_finish, 0);
- OBD_COUNTER_INCREMENT(obd, llog_finish);
-
- rc = OBP(obd, llog_finish)(obd, count);
- RETURN(rc);
-}
-EXPORT_SYMBOL(obd_llog_finish);
-
/* context key constructor/destructor: llog_key_init, llog_key_fini */
LU_KEY_INIT_FINI(llog, struct llog_thread_info);
/* context key: llog_thread_key */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff