LU-1302 llog: introduce llog_open

[fs/lustre-release.git] / lustre / obdclass / llog_obd.c

diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index 77c28eb..b84e9dc 100644 (file)
--- 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.
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.


@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
  * 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.
  * Use is subject to license terms.

+ *
+ * Copyright (c) 2012, Whamcloud, Inc.

  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/


@@ -36,10 +36,6 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
 
 #define DEBUG_SUBSYSTEM S_LOG
 

-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-

 #ifndef __KERNEL__
 #include <liblustre.h>
 #endif
 #ifndef __KERNEL__
 #include <liblustre.h>
 #endif


@@ -59,22 +55,23 @@ static struct llog_ctxt* llog_new_ctxt(struct obd_device *obd)
                 return NULL;
 
         ctxt->loc_obd = 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)
 {
 
         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);
                 class_export_put(ctxt->loc_exp);

+                ctxt->loc_exp = NULL;
+        }

         if (ctxt->loc_imp) {
                 class_import_put(ctxt->loc_imp);
                 ctxt->loc_imp = NULL;
         }
         if (ctxt->loc_imp) {
                 class_import_put(ctxt->loc_imp);
                 ctxt->loc_imp = NULL;
         }

-
+        LASSERT(ctxt->loc_llcd == NULL);

         OBD_FREE_PTR(ctxt);
         OBD_FREE_PTR(ctxt);

-        return;

 }
 
 int __llog_ctxt_put(struct llog_ctxt *ctxt)
 }
 
 int __llog_ctxt_put(struct llog_ctxt *ctxt)


@@ -83,25 +80,36 @@ int __llog_ctxt_put(struct llog_ctxt *ctxt)
         struct obd_device *obd;
         int rc = 0;
 
         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;
                 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;
 
         obd = ctxt->loc_obd;

-        spin_lock(&obd->obd_dev_lock);
-        spin_unlock(&obd->obd_dev_lock); /* sync with llog ctxt user thread */
-        LASSERT(obd->obd_stopping == 1 || obd->obd_set_up == 0);
+        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. */
+        LASSERTF(obd->obd_starting == 1 ||
+                 obd->obd_stopping == 1 || obd->obd_set_up == 0,
+                 "wrong obd state: %d/%d/%d\n", !!obd->obd_starting,
+                 !!obd->obd_stopping, !!obd->obd_set_up);
+

         /* cleanup the llog ctxt here */
         if (CTXTP(ctxt, cleanup))
         /* 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);
 
 }
 EXPORT_SYMBOL(__llog_ctxt_put);
 


@@ -112,22 +120,28 @@ int llog_cleanup(struct llog_ctxt *ctxt)
         int rc, idx;
         ENTRY;
 
         int rc, idx;
         ENTRY;
 

-        if (!ctxt) {
-                CERROR("No ctxt\n");
-                RETURN(-ENODEV);
-        }
+        LASSERT(ctxt != NULL);
+        LASSERT(ctxt != LP_POISON);

 
         olg = ctxt->loc_olg;
 
         olg = ctxt->loc_olg;

+        LASSERT(olg != NULL);
+        LASSERT(olg != LP_POISON);
+

         idx = ctxt->loc_idx;
 
         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) < LI_POISON);
+        LASSERT(cfs_atomic_read(&ctxt->loc_refcount) > 1);

         llog_ctxt_put(ctxt);
 
         llog_ctxt_put(ctxt);
 

-        /* try to free the ctxt */
+        /* 
+         * Try to free the ctxt. 
+         */

         rc = __llog_ctxt_put(ctxt);
         if (rc)
         rc = __llog_ctxt_put(ctxt);
         if (rc)

-                CERROR("Error %d while cleaning up ctxt %p\n", 
+                CERROR("Error %d while cleaning up ctxt %p\n",

                        rc, ctxt);
 
         l_wait_event(olg->olg_waitq,
                        rc, ctxt);
 
         l_wait_event(olg->olg_waitq,


@@ -137,64 +151,87 @@ int llog_cleanup(struct llog_ctxt *ctxt)
 }
 EXPORT_SYMBOL(llog_cleanup);
 
 }
 EXPORT_SYMBOL(llog_cleanup);
 

-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)
+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 rc = 0;

         struct llog_ctxt *ctxt;
         struct llog_ctxt *ctxt;

+        int rc = 0;

         ENTRY;
 
         if (index < 0 || index >= LLOG_MAX_CTXTS)
         ENTRY;
 
         if (index < 0 || index >= LLOG_MAX_CTXTS)

-                RETURN(-EFAULT);
+                RETURN(-EINVAL);

 
         LASSERT(olg != NULL);
 
         ctxt = llog_new_ctxt(obd);
         if (!ctxt)
 
         LASSERT(olg != NULL);
 
         ctxt = llog_new_ctxt(obd);
         if (!ctxt)

-                GOTO(out, rc = -ENOMEM);
+                RETURN(-ENOMEM);

 
         ctxt->loc_obd = obd;
 
         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;
         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) {
                 llog_ctxt_destroy(ctxt);
                 if (rc == -EEXIST) {
 
         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);
                         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;
                 }
                         rc = 0;
                 }

-                GOTO(out, rc);
+                RETURN(rc);

         }
 
         }
 

-        if (op->lop_setup)
-                rc = op->lop_setup(obd, olg, index, disk_obd, count, logid);
+        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) {
 
         if (rc) {

-                llog_ctxt_destroy(ctxt);
+                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;

         }
         }

-out:
+

         RETURN(rc);
 }
         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);
 
 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;
 {
         int rc = 0;
         ENTRY;


@@ -203,15 +240,15 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp)
                 RETURN(0);
 
         if (CTXTP(ctxt, sync))
                 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);
 
 
         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;
 {
         int raised, rc;
         ENTRY;


@@ -220,20 +257,26 @@ int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
                 CERROR("No ctxt\n");
                 RETURN(-ENODEV);
         }
                 CERROR("No ctxt\n");
                 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)
                 cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
         CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP);
         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);
 
         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;
 {
         int rc;
         ENTRY;


@@ -242,66 +285,19 @@ int llog_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
                 CERROR("No ctxt\n");
                 RETURN(-ENODEV);
         }
                 CERROR("No ctxt\n");
                 RETURN(-ENODEV);
         }

-        
+

         CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
         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);
 
         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
 /* 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)
+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 llog_ctxt *ctxt;
         struct llog_handle *handle;


@@ -316,15 +312,15 @@ 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(olg != NULL);
         ctxt = llog_group_get_ctxt(olg, index);

+        if (!ctxt)
+                RETURN(-ENODEV);

 
 

-        LASSERT(ctxt);
-        llog_gen_init(ctxt);
-
-        if (logid->lgl_oid)
-                rc = llog_create(ctxt, &handle, logid, NULL);
-        else {
-                rc = llog_create(ctxt, &handle, NULL, NULL);
-                if (!rc)
+        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)
                         *logid = handle->lgh_id;
         }
         if (rc)


@@ -332,66 +328,38 @@ 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);
 
         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);
 
         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)
         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);
 out:
         llog_ctxt_put(ctxt);

-        RETURN(rc);
+        return rc;

 }
 EXPORT_SYMBOL(llog_obd_origin_setup);
 
 }
 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 */
         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;
 {
         struct llog_handle *cathandle;
         int rc;


@@ -399,61 +367,22 @@ int llog_obd_origin_add(struct llog_ctxt *ctxt,
 
         cathandle = ctxt->loc_handle;
         LASSERT(cathandle != NULL);
 
         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);
 }
 EXPORT_SYMBOL(llog_obd_origin_add);
 
                 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,
 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);
 
 {
         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);
         RETURN(rc);
 }
 EXPORT_SYMBOL(obd_llog_init);


@@ -469,3 +398,22 @@ int obd_llog_finish(struct obd_device *obd, int count)
         RETURN(rc);
 }
 EXPORT_SYMBOL(obd_llog_finish);
         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);
+}