X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_obd.c;h=aa9c3c006f88b3c09b759529b2288ce4397f4749;hp=4453be15ecde64bb72bb61cff5adb0e9d096b7c8;hb=6fb209991e80cf71d97ad566d1a757e4a31466e0;hpb=6fe18330660980fc4ec4fd4e960f5415e571a54e diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c index 4453be1..aa9c3c0 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. */ @@ -111,7 +108,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); @@ -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,8 +173,9 @@ 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; rc = llog_group_set_ctxt(olg, ctxt, index); if (rc) { @@ -185,7 +183,7 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, if (rc == -EEXIST) { ctxt = llog_group_get_ctxt(olg, index); 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. @@ -215,6 +213,10 @@ int llog_setup_named(struct obd_device *obd, struct obd_llog_group *olg, 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); @@ -229,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; @@ -238,7 +240,7 @@ 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); } @@ -256,6 +258,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) @@ -306,6 +312,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); } @@ -319,6 +329,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); @@ -393,9 +404,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) && @@ -435,60 +446,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); @@ -504,3 +476,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); +}