Whamcloud - gitweb
LU-1302 llog: pass lu_env as parametr in llog functions
[fs/lustre-release.git] / lustre / obdclass / llog_cat.c
index d4fa370..3bbb801 100644 (file)
@@ -1,53 +1,65 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2001-2003 Cluster File Systems, Inc.
- *   Author: Andreas Dilger <adilger@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/obdclass/llog_cat.c
  *
  * OST<->MDS recovery logging infrastructure.
  *
  * Invariants in implementation:
  * - we do not share logs among different OST<->MDS connections, so that
  *   if an OST or MDS fails it need only look at log(s) relevant to itself
+ *
+ * Author: Andreas Dilger <adilger@clusterfs.com>
  */
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
-#ifdef __KERNEL__
-#include <linux/fs.h>
-#else
+#ifndef __KERNEL__
 #include <liblustre.h>
 #endif
 
-#include <linux/obd_class.h>
-#include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <obd_class.h>
+#include <lustre_log.h>
+
+#include "llog_internal.h"
 
 /* Create a new log handle and add it to the open list.
  * This log handle will be closed when all of the records in it are removed.
  *
  * Assumes caller has already pushed us into the kernel context and is locking.
  */
-static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
+static struct llog_handle *llog_cat_new_log(const struct lu_env *env,
+                                           struct llog_handle *cathandle)
 {
         struct llog_handle *loghandle;
         struct llog_log_hdr *llh;
@@ -56,7 +68,7 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
         ENTRY;
 
         llh = cathandle->lgh_hdr;
-        bitmap_size = sizeof(llh->llh_bitmap) * 8;
+        bitmap_size = LLOG_BITMAP_SIZE(llh);
 
         index = (cathandle->lgh_last_idx + 1) % bitmap_size;
 
@@ -64,30 +76,38 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
         if (llh->llh_cat_idx == index) {
                 CERROR("no free catalog slots for log...\n");
                 RETURN(ERR_PTR(-ENOSPC));
-        } else {
-                if (index == 0)
-                        index = 1;
-                if (ext2_set_bit(index, llh->llh_bitmap)) {
-                        CERROR("argh, index %u already set in log bitmap?\n",
-                               index);
-                        LBUG(); /* should never happen */
-                }
-                cathandle->lgh_last_idx = index;
-                llh->llh_count++;
-                llh->llh_tail.lrt_index = index;
         }
 
-        rc = llog_create(cathandle->lgh_ctxt, &loghandle, NULL, NULL);
-        if (rc)
-                RETURN(ERR_PTR(rc));
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED))
+                RETURN(ERR_PTR(-ENOSPC));
+
+       rc = llog_create(env, cathandle->lgh_ctxt, &loghandle, NULL, NULL);
+       if (rc)
+               RETURN(ERR_PTR(rc));
 
-        rc = llog_init_handle(loghandle,
+       rc = llog_init_handle(env, loghandle,
                               LLOG_F_IS_PLAIN | LLOG_F_ZAP_WHEN_EMPTY,
                               &cathandle->lgh_hdr->llh_tgtuuid);
         if (rc)
                 GOTO(out_destroy, rc);
 
-        CDEBUG(D_HA, "new recovery log "LPX64":%x for index %u of catalog "
+        if (index == 0)
+                index = 1;
+
+       cfs_spin_lock(&loghandle->lgh_hdr_lock);
+       llh->llh_count++;
+        if (ext2_set_bit(index, llh->llh_bitmap)) {
+                CERROR("argh, index %u already set in log bitmap?\n",
+                       index);
+               cfs_spin_unlock(&loghandle->lgh_hdr_lock);
+                LBUG(); /* should never happen */
+        }
+       cfs_spin_unlock(&loghandle->lgh_hdr_lock);
+
+        cathandle->lgh_last_idx = index;
+        llh->llh_tail.lrt_index = index;
+
+        CDEBUG(D_RPCTRACE,"new recovery log "LPX64":%x for index %u of catalog "
                LPX64"\n", loghandle->lgh_id.lgl_oid, loghandle->lgh_id.lgl_ogen,
                index, cathandle->lgh_id.lgl_oid);
         /* build the record for this log in the catalog */
@@ -99,7 +119,7 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
         rec.lid_tail.lrt_index = index;
 
         /* update the catalog: header and record */
-        rc = llog_write_rec(cathandle, &rec.lid_hdr,
+       rc = llog_write_rec(env, cathandle, &rec.lid_hdr,
                             &loghandle->u.phd.phd_cookie, 1, NULL, index);
         if (rc < 0) {
                 GOTO(out_destroy, rc);
@@ -107,16 +127,16 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
 
         loghandle->lgh_hdr->llh_cat_idx = index;
         cathandle->u.chd.chd_current_log = loghandle;
-        LASSERT(list_empty(&loghandle->u.phd.phd_entry));
-        list_add_tail(&loghandle->u.phd.phd_entry, &cathandle->u.chd.chd_head);
+        LASSERT(cfs_list_empty(&loghandle->u.phd.phd_entry));
+        cfs_list_add_tail(&loghandle->u.phd.phd_entry,
+                          &cathandle->u.chd.chd_head);
 
- out_destroy:
-        if (rc < 0)
-                llog_destroy(loghandle);
+out_destroy:
+       if (rc < 0)
+               llog_destroy(env, loghandle);
 
-        RETURN(loghandle);
+       RETURN(loghandle);
 }
-EXPORT_SYMBOL(llog_cat_new_log);
 
 /* Open an existent log handle and add it to the open list.
  * This log handle will be closed when all of the records in it are removed.
@@ -124,8 +144,8 @@ EXPORT_SYMBOL(llog_cat_new_log);
  * Assumes caller has already pushed us into the kernel context and is locking.
  * We return a lock on the handle to ensure nobody yanks it from us.
  */
-int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
-                       struct llog_logid *logid)
+int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
+                      struct llog_handle **res, struct llog_logid *logid)
 {
         struct llog_handle *loghandle;
         int rc = 0;
@@ -134,9 +154,10 @@ int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
         if (cathandle == NULL)
                 RETURN(-EBADF);
 
-        list_for_each_entry(loghandle, &cathandle->u.chd.chd_head,
-                            u.phd.phd_entry) {
+        cfs_list_for_each_entry(loghandle, &cathandle->u.chd.chd_head,
+                                u.phd.phd_entry) {
                 struct llog_logid *cgl = &loghandle->lgh_id;
+
                 if (cgl->lgl_oid == logid->lgl_oid) {
                         if (cgl->lgl_ogen != logid->lgl_ogen) {
                                 CERROR("log "LPX64" generation %x != %x\n",
@@ -149,21 +170,21 @@ int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
                 }
         }
 
-        rc = llog_create(cathandle->lgh_ctxt, &loghandle, logid, NULL);
-        if (rc) {
-                CERROR("error opening log id "LPX64":%x: rc %d\n",
-                       logid->lgl_oid, logid->lgl_ogen, rc);
-        } else {
-                rc = llog_init_handle(loghandle, LLOG_F_IS_PLAIN, NULL);
+       rc = llog_create(env, cathandle->lgh_ctxt, &loghandle, logid, NULL);
+       if (rc) {
+               CERROR("error opening log id "LPX64":%x: rc %d\n",
+                      logid->lgl_oid, logid->lgl_ogen, rc);
+       } else {
+               rc = llog_init_handle(env, loghandle, LLOG_F_IS_PLAIN, NULL);
                 if (!rc) {
-                        list_add(&loghandle->u.phd.phd_entry,
-                                 &cathandle->u.chd.chd_head);
+                        cfs_list_add(&loghandle->u.phd.phd_entry,
+                                     &cathandle->u.chd.chd_head);
                 }
         }
         if (!rc) {
                 loghandle->u.phd.phd_cat_handle = cathandle;
                 loghandle->u.phd.phd_cookie.lgc_lgl = cathandle->lgh_id;
-                loghandle->u.phd.phd_cookie.lgc_index = 
+                loghandle->u.phd.phd_cookie.lgc_index =
                         loghandle->lgh_hdr->llh_cat_idx;
         }
 
@@ -172,24 +193,33 @@ out:
         RETURN(rc);
 }
 
-int llog_cat_put(struct llog_handle *cathandle)
+int llog_cat_put(const struct lu_env *env, struct llog_handle *cathandle)
 {
-        struct llog_handle *loghandle, *n;
-        int rc;
-        ENTRY;
-
-        list_for_each_entry_safe(loghandle, n, &cathandle->u.chd.chd_head,
-                                 u.phd.phd_entry) {
-                int err = llog_close(loghandle);
-                if (err)
-                        CERROR("error closing loghandle\n");
-        }
-        rc = llog_close(cathandle);
-        RETURN(rc);
+       struct llog_handle      *loghandle, *n;
+       int                      rc;
+
+       ENTRY;
+
+       cfs_list_for_each_entry_safe(loghandle, n, &cathandle->u.chd.chd_head,
+                                    u.phd.phd_entry) {
+               int err = llog_close(env, loghandle);
+               if (err)
+                       CERROR("error closing loghandle\n");
+       }
+       rc = llog_close(env, cathandle);
+       RETURN(rc);
 }
 EXPORT_SYMBOL(llog_cat_put);
 
-/* Return the currently active log handle.  If the current log handle doesn't
+/**
+ * lockdep markers for nested struct llog_handle::lgh_lock locking.
+ */
+enum {
+        LLOGH_CAT,
+        LLOGH_LOG
+};
+
+/** Return the currently active log handle.  If the current log handle doesn't
  * have enough space left for the current record, start a new one.
  *
  * If reclen is 0, we only want to know what the currently active log is,
@@ -199,49 +229,56 @@ EXPORT_SYMBOL(llog_cat_put);
  *
  * NOTE: loghandle is write-locked upon successful return
  */
-static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
-                                                int create)
+static struct llog_handle *llog_cat_current_log(const struct lu_env *env,
+                                               struct llog_handle *cathandle,
+                                               int create)
 {
         struct llog_handle *loghandle = NULL;
         ENTRY;
 
-        down_read(&cathandle->lgh_lock);
+        cfs_down_read_nested(&cathandle->lgh_lock, LLOGH_CAT);
         loghandle = cathandle->u.chd.chd_current_log;
         if (loghandle) {
                 struct llog_log_hdr *llh = loghandle->lgh_hdr;
-                if (loghandle->lgh_last_idx < (sizeof(llh->llh_bitmap)*8) - 1) {
-                        down_write(&loghandle->lgh_lock);
-                        up_read(&cathandle->lgh_lock);
+
+                cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+                if (loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
+                        cfs_up_read(&cathandle->lgh_lock);
                         RETURN(loghandle);
+                } else {
+                        cfs_up_write(&loghandle->lgh_lock);
                 }
         }
         if (!create) {
                 if (loghandle)
-                        down_write(&loghandle->lgh_lock);
-                up_read(&cathandle->lgh_lock);
+                        cfs_down_write(&loghandle->lgh_lock);
+                cfs_up_read(&cathandle->lgh_lock);
                 RETURN(loghandle);
         }
-        up_read(&cathandle->lgh_lock);
+        cfs_up_read(&cathandle->lgh_lock);
 
         /* time to create new log */
 
         /* first, we have to make sure the state hasn't changed */
-        down_write(&cathandle->lgh_lock);
+        cfs_down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
         loghandle = cathandle->u.chd.chd_current_log;
         if (loghandle) {
                 struct llog_log_hdr *llh = loghandle->lgh_hdr;
-                if (loghandle->lgh_last_idx < (sizeof(llh->llh_bitmap)*8) - 1) {
-                        down_write(&loghandle->lgh_lock);
-                        up_write(&cathandle->lgh_lock);
+
+                cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+                if (loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
+                        cfs_up_write(&cathandle->lgh_lock);
                         RETURN(loghandle);
+                } else {
+                        cfs_up_write(&loghandle->lgh_lock);
                 }
         }
 
         CDEBUG(D_INODE, "creating new log\n");
-        loghandle = llog_cat_new_log(cathandle);
+       loghandle = llog_cat_new_log(env, cathandle);
         if (!IS_ERR(loghandle))
-                down_write(&loghandle->lgh_lock);
-        up_write(&cathandle->lgh_lock);
+                cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+        cfs_up_write(&cathandle->lgh_lock);
         RETURN(loghandle);
 }
 
@@ -250,27 +287,31 @@ static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
  *
  * Assumes caller has already pushed us into the kernel context.
  */
-int llog_cat_add_rec(struct llog_handle *cathandle, struct llog_rec_hdr *rec,
-                     struct llog_cookie *reccookie, void *buf)
+int llog_cat_add_rec(const struct lu_env *env, struct llog_handle *cathandle,
+                    struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
+                    void *buf)
 {
         struct llog_handle *loghandle;
         int rc;
         ENTRY;
 
         LASSERT(rec->lrh_len <= LLOG_CHUNK_SIZE);
-        loghandle = llog_cat_current_log(cathandle, 1);
-        if (IS_ERR(loghandle))
-                RETURN(PTR_ERR(loghandle));
-        /* loghandle is already locked by llog_cat_current_log() for us */
-        rc = llog_write_rec(loghandle, rec, reccookie, 1, buf, -1);
-        up_write(&loghandle->lgh_lock);
+       loghandle = llog_cat_current_log(env, cathandle, 1);
+       if (IS_ERR(loghandle))
+               RETURN(PTR_ERR(loghandle));
+       /* loghandle is already locked by llog_cat_current_log() for us */
+       rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf, -1);
+        if (rc < 0)
+                CERROR("llog_write_rec %d: lh=%p\n", rc, loghandle);
+        cfs_up_write(&loghandle->lgh_lock);
         if (rc == -ENOSPC) {
                 /* to create a new plain log */
-                loghandle = llog_cat_current_log(cathandle, 1);
-                if (IS_ERR(loghandle))
-                        RETURN(PTR_ERR(loghandle));
-                rc = llog_write_rec(loghandle, rec, reccookie, 1, buf, -1);
-                up_write(&loghandle->lgh_lock);
+               loghandle = llog_cat_current_log(env, cathandle, 1);
+               if (IS_ERR(loghandle))
+                       RETURN(PTR_ERR(loghandle));
+               rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf,
+                                   -1);
+                cfs_up_write(&loghandle->lgh_lock);
         }
 
         RETURN(rc);
@@ -286,26 +327,27 @@ EXPORT_SYMBOL(llog_cat_add_rec);
  *
  * Assumes caller has already pushed us into the kernel context.
  */
-int llog_cat_cancel_records(struct llog_handle *cathandle, int count,
-                        struct llog_cookie *cookies)
+int llog_cat_cancel_records(const struct lu_env *env,
+                           struct llog_handle *cathandle, int count,
+                           struct llog_cookie *cookies)
 {
         int i, index, rc = 0;
         ENTRY;
 
-        down_write(&cathandle->lgh_lock);
+        cfs_down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
         for (i = 0; i < count; i++, cookies++) {
                 struct llog_handle *loghandle;
                 struct llog_logid *lgl = &cookies->lgc_lgl;
 
-                rc = llog_cat_id2handle(cathandle, &loghandle, lgl);
-                if (rc) {
-                        CERROR("Cannot find log "LPX64"\n", lgl->lgl_oid);
-                        break;
-                }
+               rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
+               if (rc) {
+                       CERROR("Cannot find log "LPX64"\n", lgl->lgl_oid);
+                       break;
+               }
 
-                down_write(&loghandle->lgh_lock);
-                rc = llog_cancel_rec(loghandle, cookies->lgc_index);
-                up_write(&loghandle->lgh_lock);
+                cfs_down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
+               rc = llog_cancel_rec(env, loghandle, cookies->lgc_index);
+                cfs_up_write(&loghandle->lgh_lock);
 
                 if (rc == 1) {          /* log has been destroyed */
                         index = loghandle->u.phd.phd_cookie.lgc_index;
@@ -315,50 +357,68 @@ int llog_cat_cancel_records(struct llog_handle *cathandle, int count,
 
                         LASSERT(index);
                         llog_cat_set_first_idx(cathandle, index);
-                        rc = llog_cancel_rec(cathandle, index);
+                       rc = llog_cancel_rec(env, cathandle, index);
                         if (rc == 0)
-                                CDEBUG(D_HA, "cancel plain log at index %u "
-                                       "of catalog "LPX64"\n",
+                                CDEBUG(D_RPCTRACE,"cancel plain log at index %u"
+                                       " of catalog "LPX64"\n",
                                        index, cathandle->lgh_id.lgl_oid);
                 }
         }
-        up_write(&cathandle->lgh_lock);
+        cfs_up_write(&cathandle->lgh_lock);
 
         RETURN(rc);
 }
 EXPORT_SYMBOL(llog_cat_cancel_records);
 
-int llog_cat_process_cb(struct llog_handle *cat_llh, struct llog_rec_hdr *rec,
-                        void *data)
+int llog_cat_process_cb(const struct lu_env *env, struct llog_handle *cat_llh,
+                       struct llog_rec_hdr *rec, void *data)
 {
         struct llog_process_data *d = data;
         struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
         struct llog_handle *llh;
         int rc;
 
+        ENTRY;
         if (rec->lrh_type != LLOG_LOGID_MAGIC) {
                 CERROR("invalid record in catalog\n");
                 RETURN(-EINVAL);
         }
-        CWARN("processing log "LPX64":%x at index %u of catalog "LPX64"\n",
-               lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
+        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, cat_llh->lgh_id.lgl_oid);
 
-        rc = llog_cat_id2handle(cat_llh, &llh, &lir->lid_id);
+       rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
         if (rc) {
                 CERROR("Cannot find handle for log "LPX64"\n",
                        lir->lid_id.lgl_oid);
                 RETURN(rc);
         }
 
-        rc = llog_process(llh, d->lpd_cb, d->lpd_data, NULL);
+        if (rec->lrh_index < d->lpd_startcat)
+                /* Skip processing of the logs until startcat */
+                RETURN(0);
+
+        if (d->lpd_startidx > 0) {
+                struct llog_process_cat_data cd;
+
+                cd.lpcd_first_idx = d->lpd_startidx;
+                cd.lpcd_last_idx = 0;
+               rc = llog_process(env, llh, d->lpd_cb, d->lpd_data, &cd);
+                /* Continue processing the next log from idx 0 */
+                d->lpd_startidx = 0;
+        } else {
+               rc = llog_process(env, llh, d->lpd_cb, d->lpd_data, NULL);
+        }
+
         RETURN(rc);
 }
 
-int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data)
+int llog_cat_process_or_fork(const struct lu_env *env,
+                            struct llog_handle *cat_llh,
+                            llog_cb_t cb, void *data, int startcat,
+                            int startidx, bool fork)
 {
         struct llog_process_data d;
-        struct llog_process_cat_data cd;
         struct llog_log_hdr *llh = cat_llh->lgh_hdr;
         int rc;
         ENTRY;
@@ -366,35 +426,179 @@ int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data)
         LASSERT(llh->llh_flags & LLOG_F_IS_CAT);
         d.lpd_data = data;
         d.lpd_cb = cb;
+        d.lpd_startcat = startcat;
+        d.lpd_startidx = startidx;
 
         if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
+                struct llog_process_cat_data cd;
+
                 CWARN("catlog "LPX64" crosses index zero\n",
                       cat_llh->lgh_id.lgl_oid);
 
-                cd.first_idx = llh->llh_cat_idx;
-                cd.last_idx = 0;
-                rc = llog_process(cat_llh, llog_cat_process_cb, &d, &cd);
+                cd.lpcd_first_idx = llh->llh_cat_idx;
+                cd.lpcd_last_idx = 0;
+               rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
+                                         &d, &cd, fork);
                 if (rc != 0)
                         RETURN(rc);
 
-                cd.first_idx = 0;
-                cd.last_idx = cat_llh->lgh_last_idx;
-                rc = llog_process(cat_llh, llog_cat_process_cb, &d, &cd);
+                cd.lpcd_first_idx = 0;
+                cd.lpcd_last_idx = cat_llh->lgh_last_idx;
+               rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
+                                         &d, &cd, fork);
         } else {
-                rc = llog_process(cat_llh, llog_cat_process_cb, &d, NULL);
+               rc = llog_process_or_fork(env, cat_llh, llog_cat_process_cb,
+                                         &d, NULL, fork);
         }
 
         RETURN(rc);
 }
+EXPORT_SYMBOL(llog_cat_process_or_fork);
+
+int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh,
+                    llog_cb_t cb, void *data, int startcat, int startidx)
+{
+       return llog_cat_process_or_fork(env, cat_llh, cb, data, startcat,
+                                       startidx, 0);
+}
 EXPORT_SYMBOL(llog_cat_process);
 
+#ifdef __KERNEL__
+int llog_cat_process_thread(void *data)
+{
+        struct llog_process_cat_args *args = data;
+        struct llog_ctxt *ctxt = args->lpca_ctxt;
+        struct llog_handle *llh = NULL;
+        llog_cb_t cb = args->lpca_cb;
+       struct llog_thread_info *lgi;
+       struct lu_env            env;
+        int rc;
+        ENTRY;
+
+        cfs_daemonize_ctxt("ll_log_process");
+
+       rc = lu_env_init(&env, LCT_LOCAL);
+       if (rc)
+               GOTO(out, rc);
+       lgi = llog_info(&env);
+       LASSERT(lgi);
+
+       lgi->lgi_logid = *(struct llog_logid *)(args->lpca_arg);
+       rc = llog_create(&env, ctxt, &llh, &lgi->lgi_logid, NULL);
+        if (rc) {
+                CERROR("llog_create() failed %d\n", rc);
+               GOTO(out_env, rc);
+        }
+       rc = llog_init_handle(&env, llh, LLOG_F_IS_CAT, NULL);
+        if (rc) {
+                CERROR("llog_init_handle failed %d\n", rc);
+                GOTO(release_llh, rc);
+        }
+
+        if (cb) {
+               rc = llog_cat_process(&env, llh, cb, NULL, 0, 0);
+               if (rc != LLOG_PROC_BREAK && rc != 0)
+                       CERROR("llog_cat_process() failed %d\n", rc);
+               cb(&env, llh, NULL, NULL);
+        } else {
+                CWARN("No callback function for recovery\n");
+        }
+
+        /*
+         * Make sure that all cached data is sent.
+         */
+       llog_sync(ctxt, NULL, 0);
+        GOTO(release_llh, rc);
+release_llh:
+       rc = llog_cat_put(&env, llh);
+        if (rc)
+                CERROR("llog_cat_put() failed %d\n", rc);
+out_env:
+       lu_env_fini(&env);
+out:
+        llog_ctxt_put(ctxt);
+        OBD_FREE_PTR(args);
+        return rc;
+}
+EXPORT_SYMBOL(llog_cat_process_thread);
+#endif
+
+static int llog_cat_reverse_process_cb(const struct lu_env *env,
+                                      struct llog_handle *cat_llh,
+                                      struct llog_rec_hdr *rec, void *data)
+{
+        struct llog_process_data *d = data;
+        struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
+        struct llog_handle *llh;
+        int rc;
+
+        if (le32_to_cpu(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,
+               le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
+
+       rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
+        if (rc) {
+                CERROR("Cannot find handle for log "LPX64"\n",
+                       lir->lid_id.lgl_oid);
+                RETURN(rc);
+        }
+
+       rc = llog_reverse_process(env, llh, d->lpd_cb, d->lpd_data, NULL);
+        RETURN(rc);
+}
+
+int llog_cat_reverse_process(const struct lu_env *env,
+                            struct llog_handle *cat_llh,
+                            llog_cb_t cb, void *data)
+{
+        struct llog_process_data d;
+        struct llog_process_cat_data cd;
+        struct llog_log_hdr *llh = cat_llh->lgh_hdr;
+        int rc;
+        ENTRY;
+
+        LASSERT(llh->llh_flags & LLOG_F_IS_CAT);
+        d.lpd_data = data;
+        d.lpd_cb = cb;
+
+        if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
+                CWARN("catalog "LPX64" crosses index zero\n",
+                      cat_llh->lgh_id.lgl_oid);
+
+                cd.lpcd_first_idx = 0;
+                cd.lpcd_last_idx = cat_llh->lgh_last_idx;
+               rc = llog_reverse_process(env, cat_llh,
+                                         llog_cat_reverse_process_cb,
+                                         &d, &cd);
+                if (rc != 0)
+                        RETURN(rc);
+
+                cd.lpcd_first_idx = le32_to_cpu(llh->llh_cat_idx);
+                cd.lpcd_last_idx = 0;
+               rc = llog_reverse_process(env, cat_llh,
+                                         llog_cat_reverse_process_cb,
+                                         &d, &cd);
+        } else {
+               rc = llog_reverse_process(env, cat_llh,
+                                         llog_cat_reverse_process_cb,
+                                         &d, NULL);
+        }
+
+        RETURN(rc);
+}
+EXPORT_SYMBOL(llog_cat_reverse_process);
+
 int llog_cat_set_first_idx(struct llog_handle *cathandle, int index)
 {
         struct llog_log_hdr *llh = cathandle->lgh_hdr;
         int i, bitmap_size, idx;
         ENTRY;
 
-        bitmap_size = sizeof(llh->llh_bitmap) * 8;
+        bitmap_size = LLOG_BITMAP_SIZE(llh);
         if (llh->llh_cat_idx == (index - 1)) {
                 idx = llh->llh_cat_idx + 1;
                 llh->llh_cat_idx = idx;
@@ -413,55 +617,67 @@ int llog_cat_set_first_idx(struct llog_handle *cathandle, int index)
                         }
                 }
 out:
-                CDEBUG(D_HA, "set catlog "LPX64" first idx %u\n",
+                CDEBUG(D_RPCTRACE, "set catlog "LPX64" first idx %u\n",
                        cathandle->lgh_id.lgl_oid, llh->llh_cat_idx);
         }
 
         RETURN(0);
 }
 
-#if 0
-/* Assumes caller has already pushed us into the kernel context. */
-int llog_cat_init(struct llog_handle *cathandle, struct obd_uuid *tgtuuid)
+/* callback func for llog_process in llog_obd_origin_setup */
+int cat_cancel_cb(const struct lu_env *env, struct llog_handle *cathandle,
+                 struct llog_rec_hdr *rec, void *data)
 {
-        struct llog_log_hdr *llh;
-        loff_t offset = 0;
-        int rc = 0;
-        ENTRY;
-
-        LASSERT(sizeof(*llh) == LLOG_CHUNK_SIZE);
-
-        down(&cathandle->lgh_lock);
-        llh = cathandle->lgh_hdr;
-
-        if (cathandle->lgh_file->f_dentry->d_inode->i_size == 0) {
-                llog_write_rec(cathandle, &llh->llh_hdr, NULL, 0, NULL, 0);
-
-write_hdr:
-                rc = lustre_fwrite(cathandle->lgh_file, llh, LLOG_CHUNK_SIZE,
-                                   &offset);
-                if (rc != LLOG_CHUNK_SIZE) {
-                        CERROR("error writing catalog header: rc %d\n", rc);
-                        OBD_FREE(llh, sizeof(*llh));
-                        if (rc >= 0)
-                                rc = -ENOSPC;
-                } else
-                        rc = 0;
-        } else {
-                rc = lustre_fread(cathandle->lgh_file, llh, LLOG_CHUNK_SIZE,
-                                  &offset);
-                if (rc != LLOG_CHUNK_SIZE) {
-                        CERROR("error reading catalog header: rc %d\n", rc);
-                        /* Can we do much else if the header is bad? */
-                        goto write_hdr;
-                } else
-                        rc = 0;
-        }
-
-        cathandle->lgh_tgtuuid = &llh->llh_tgtuuid;
-        up(&cathandle->lgh_lock);
-        RETURN(rc);
+       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("%s: invalid record in catalog\n",
+                      loghandle->lgh_ctxt->loc_obd->obd_name);
+               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(env, cathandle, &loghandle, &lir->lid_id);
+       if (rc) {
+               CERROR("%s: cannot find handle for llog "LPX64"\n",
+                      loghandle->lgh_ctxt->loc_obd->obd_name,
+                      lir->lid_id.lgl_oid);
+               if (rc == -ENOENT) {
+                       index = rec->lrh_index;
+                       goto cat_cleanup;
+               }
+               RETURN(rc);
+       }
+
+       llh = loghandle->lgh_hdr;
+       if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
+           (llh->llh_count == 1)) {
+               rc = llog_destroy(env, loghandle);
+               if (rc)
+                       CERROR("%s: fail to destroy empty log: rc = %d\n",
+                              loghandle->lgh_ctxt->loc_obd->obd_name, rc);
+
+               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(env, 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);
 }
-EXPORT_SYMBOL(llog_cat_init);
-
-#endif