X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_obd.c;h=b84e9dc3232bdd3c666674ace8ccf2b534dbb361;hp=8c7196f0a59bb1803e9c02a71589bad759736f33;hb=801469af8c31afad1bd8aaa23b01bfc42abe45eb;hpb=20464f9e398cac397df4fc62a634e6d7841b9b85 diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index 8c7196f..b84e9dc 100644 --- a/lustre/obdclass/llog_obd.c +++ b/lustre/obdclass/llog_obd.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * 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. + * + * Copyright (c) 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,10 +36,6 @@ #define DEBUG_SUBSYSTEM S_LOG -#ifndef EXPORT_SYMTAB -#define EXPORT_SYMTAB -#endif - #ifndef __KERNEL__ #include #endif @@ -59,7 +55,7 @@ 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; } @@ -84,20 +80,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. */ @@ -108,11 +105,11 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt) /* cleanup the llog ctxt here */ if (CTXTP(ctxt, cleanup)) - rc = CTXTP(ctxt, cleanup)(ctxt); + rc = CTXTP(ctxt, cleanup)(NULL, ctxt); - llog_ctxt_destroy(ctxt); - wake_up(&olg->olg_waitq); - return rc; + llog_ctxt_destroy(ctxt); + cfs_waitq_signal(&olg->olg_waitq); + return rc; } EXPORT_SYMBOL(__llog_ctxt_put); @@ -135,8 +132,8 @@ int llog_cleanup(struct llog_ctxt *ctxt) /* * Banlance the ctxt get when calling llog_cleanup() */ - LASSERT(atomic_read(&ctxt->loc_refcount) < 0x5a5a5a); - LASSERT(atomic_read(&ctxt->loc_refcount) > 1); + LASSERT(cfs_atomic_read(&ctxt->loc_refcount) < LI_POISON); + LASSERT(cfs_atomic_read(&ctxt->loc_refcount) > 1); llog_ctxt_put(ctxt); /* @@ -176,7 +173,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; - sema_init(&ctxt->loc_sem, 1); + cfs_mutex_init(&ctxt->loc_mutex); ctxt->loc_exp = class_export_get(disk_obd->obd_self_export); ctxt->loc_flags = LLOG_CTXT_FLAG_UNINITIALIZED; @@ -208,8 +205,8 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, rc = -ENOTSUPP; } else { if (op->lop_setup) - rc = op->lop_setup(obd, olg, index, disk_obd, count, - logid, logname); + rc = op->lop_setup(NULL, obd, olg, index, disk_obd, + count, logid, logname); } if (rc) { @@ -234,7 +231,7 @@ int llog_setup(struct obd_device *obd, struct obd_llog_group *olg, } EXPORT_SYMBOL(llog_setup); -int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp) +int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags) { int rc = 0; ENTRY; @@ -243,15 +240,15 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp) RETURN(0); if (CTXTP(ctxt, sync)) - rc = CTXTP(ctxt, sync)(ctxt, exp); + rc = CTXTP(ctxt, sync)(ctxt, exp, flags); 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 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 raised, rc; ENTRY; @@ -269,15 +266,17 @@ int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE); if (!raised) cfs_cap_raise(CFS_CAP_SYS_RESOURCE); - rc = CTXTP(ctxt, add)(ctxt, rec, lsm, logcookies, numcookies); + rc = CTXTP(ctxt, add)(env, ctxt, rec, lsm, logcookies, + numcookies); if (!raised) cfs_cap_lower(CFS_CAP_SYS_RESOURCE); 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 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; ENTRY; @@ -288,64 +287,17 @@ int llog_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm, } CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP); - rc = CTXTP(ctxt, cancel)(ctxt, lsm, count, cookies, flags); + rc = CTXTP(ctxt, cancel)(env, ctxt, lsm, count, cookies, flags); RETURN(rc); } EXPORT_SYMBOL(llog_cancel); -/* callback func for llog_process in llog_obd_origin_setup */ -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; - struct llog_handle *loghandle; - struct llog_log_hdr *llh; - int rc, index; - ENTRY; - - if (rec->lrh_type != LLOG_LOGID_MAGIC) { - CERROR("invalid record in catalog\n"); - RETURN(-EINVAL); - } - 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); - - rc = llog_cat_id2handle(cathandle, &loghandle, &lir->lid_id); - if (rc) { - CERROR("Cannot find handle for log "LPX64"\n", - lir->lid_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); - - 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) - CDEBUG(D_HA, "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); -} - /* lop_setup method for filter/osc */ // XXX how to set exports -int llog_obd_origin_setup(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) +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; @@ -364,9 +316,10 @@ int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, RETURN(-ENODEV); if (logid && logid->lgl_oid) { - rc = llog_create(ctxt, &handle, logid, NULL); - } else { - rc = llog_create(ctxt, &handle, NULL, (char *)name); + 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; } @@ -375,12 +328,12 @@ int llog_obd_origin_setup(struct obd_device *obd, struct obd_llog_group *olg, ctxt->loc_handle = handle; push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL); - rc = llog_init_handle(handle, LLOG_F_IS_CAT, 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(handle, (llog_cb_t)cat_cancel_cb, NULL, NULL); + 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); @@ -390,52 +343,23 @@ out: } EXPORT_SYMBOL(llog_obd_origin_setup); -int llog_obd_origin_cleanup(struct llog_ctxt *ctxt) +int llog_obd_origin_cleanup(const struct lu_env *env, struct llog_ctxt *ctxt) { - struct llog_handle *cathandle, *n, *loghandle; - struct llog_log_hdr *llh; - int rc, index; - ENTRY; + ENTRY; - if (!ctxt) - RETURN(0); + 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) { - 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 during " - "cleanup: %d\n", rc); - - 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) - CDEBUG(D_RPCTRACE, "cancel plain log at" - "index %u of catalog "LPX64"\n", - index,cathandle->lgh_id.lgl_oid); - } - } - llog_cat_put(ctxt->loc_handle); - } + 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(struct llog_ctxt *ctxt, - struct llog_rec_hdr *rec, struct lov_stripe_md *lsm, - struct llog_cookie *logcookies, int numcookies) +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; @@ -443,8 +367,8 @@ 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 != 1) + 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); } @@ -474,3 +398,22 @@ int obd_llog_finish(struct obd_device *obd, int 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 */ +LU_CONTEXT_KEY_DEFINE(llog, LCT_MD_THREAD | LCT_MG_THREAD | LCT_LOCAL); +LU_KEY_INIT_GENERIC(llog); +EXPORT_SYMBOL(llog_thread_key); + +int llog_info_init(void) +{ + llog_key_init_generic(&llog_thread_key, NULL); + lu_context_key_register(&llog_thread_key); + return 0; +} + +void llog_info_fini(void) +{ + lu_context_key_degister(&llog_thread_key); +}