These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / obdclass / llog_cat.c
index c8f6ab0..c442cae 100644 (file)
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-
 #include "../include/obd_class.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 int llog_cat_new_log(const struct lu_env *env,
-                           struct llog_handle *cathandle,
-                           struct llog_handle *loghandle,
-                           struct thandle *th)
-{
-
-       struct llog_log_hdr *llh;
-       struct llog_logid_rec rec = { { 0 }, };
-       int rc, index, bitmap_size;
-
-       llh = cathandle->lgh_hdr;
-       bitmap_size = LLOG_BITMAP_SIZE(llh);
-
-       index = (cathandle->lgh_last_idx + 1) % bitmap_size;
-
-       /* maximum number of available slots in catlog is bitmap_size - 2 */
-       if (llh->llh_cat_idx == index) {
-               CERROR("no free catalog slots for log...\n");
-               return -ENOSPC;
-       }
-
-       if (OBD_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED))
-               return -ENOSPC;
-
-       rc = llog_create(env, loghandle, th);
-       /* if llog is already created, no need to initialize it */
-       if (rc == -EEXIST) {
-               return 0;
-       } else if (rc != 0) {
-               CERROR("%s: can't create new plain llog in catalog: rc = %d\n",
-                      loghandle->lgh_ctxt->loc_obd->obd_name, rc);
-               return rc;
-       }
-
-       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;
-
-       if (index == 0)
-               index = 1;
-
-       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);
-               spin_unlock(&loghandle->lgh_hdr_lock);
-               LBUG(); /* should never happen */
-       }
-       spin_unlock(&loghandle->lgh_hdr_lock);
-
-       cathandle->lgh_last_idx = index;
-       llh->llh_tail.lrt_index = index;
-
-       CDEBUG(D_RPCTRACE,
-              "new recovery log "DOSTID":%x for index %u of catalog"
-              DOSTID"\n", POSTID(&loghandle->lgh_id.lgl_oi),
-              loghandle->lgh_id.lgl_ogen, index,
-              POSTID(&cathandle->lgh_id.lgl_oi));
-       /* build the record for this log in the catalog */
-       rec.lid_hdr.lrh_len = sizeof(rec);
-       rec.lid_hdr.lrh_index = index;
-       rec.lid_hdr.lrh_type = LLOG_LOGID_MAGIC;
-       rec.lid_id = loghandle->lgh_id;
-       rec.lid_tail.lrt_len = sizeof(rec);
-       rec.lid_tail.lrt_index = index;
-
-       /* update the catalog: header and record */
-       rc = llog_write_rec(env, cathandle, &rec.lid_hdr,
-                           &loghandle->u.phd.phd_cookie, 1, NULL, index, th);
-       if (rc < 0)
-               goto out_destroy;
-
-       loghandle->lgh_hdr->llh_cat_idx = index;
-       return 0;
-out_destroy:
-       llog_destroy(env, loghandle);
-       return rc;
-}
-
 /* 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.
  *
@@ -149,8 +61,10 @@ out_destroy:
  * This takes extra reference on llog_handle via llog_handle_get() and require
  * this reference to be put by caller using llog_handle_put()
  */
-int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
-                      struct llog_handle **res, struct llog_logid *logid)
+static 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;
@@ -217,24 +131,8 @@ int llog_cat_close(const struct lu_env *env, struct llog_handle *cathandle)
 
        list_for_each_entry_safe(loghandle, n, &cathandle->u.chd.chd_head,
                                     u.phd.phd_entry) {
-               struct llog_log_hdr     *llh = loghandle->lgh_hdr;
-               int                      index;
-
                /* unlink open-not-created llogs */
                list_del_init(&loghandle->u.phd.phd_entry);
-               llh = loghandle->lgh_hdr;
-               if (loghandle->lgh_obj != NULL && llh != NULL &&
-                   (llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
-                   (llh->llh_count == 1)) {
-                       rc = llog_destroy(env, loghandle);
-                       if (rc)
-                               CERROR("%s: failure destroying log during cleanup: rc = %d\n",
-                                      loghandle->lgh_ctxt->loc_obd->obd_name,
-                                      rc);
-
-                       index = loghandle->u.phd.phd_cookie.lgc_index;
-                       llog_cat_cleanup(env, cathandle, NULL, index);
-               }
                llog_close(env, loghandle);
        }
        /* if handle was stored in ctxt, remove it too */
@@ -245,287 +143,6 @@ int llog_cat_close(const struct lu_env *env, struct llog_handle *cathandle)
 }
 EXPORT_SYMBOL(llog_cat_close);
 
-/**
- * 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,
- * otherwise we get a lock on this log so nobody can steal our space.
- *
- * Assumes caller has already pushed us into the kernel context and is locking.
- *
- * NOTE: loghandle is write-locked upon successful return
- */
-static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
-                                               struct thandle *th)
-{
-       struct llog_handle *loghandle = NULL;
-
-       down_read_nested(&cathandle->lgh_lock, LLOGH_CAT);
-       loghandle = cathandle->u.chd.chd_current_log;
-       if (loghandle) {
-               struct llog_log_hdr *llh;
-
-               down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
-               llh = loghandle->lgh_hdr;
-               if (llh == NULL ||
-                   loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
-                       up_read(&cathandle->lgh_lock);
-                       return loghandle;
-               } else {
-                       up_write(&loghandle->lgh_lock);
-               }
-       }
-       up_read(&cathandle->lgh_lock);
-
-       /* time to use next log */
-
-       /* first, we have to make sure the state hasn't changed */
-       down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
-       loghandle = cathandle->u.chd.chd_current_log;
-       if (loghandle) {
-               struct llog_log_hdr *llh;
-
-               down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
-               llh = loghandle->lgh_hdr;
-               LASSERT(llh);
-               if (loghandle->lgh_last_idx < LLOG_BITMAP_SIZE(llh) - 1) {
-                       up_write(&cathandle->lgh_lock);
-                       return loghandle;
-               } else {
-                       up_write(&loghandle->lgh_lock);
-               }
-       }
-
-       CDEBUG(D_INODE, "use next log\n");
-
-       loghandle = cathandle->u.chd.chd_next_log;
-       cathandle->u.chd.chd_current_log = loghandle;
-       cathandle->u.chd.chd_next_log = NULL;
-       down_write_nested(&loghandle->lgh_lock, LLOGH_LOG);
-       up_write(&cathandle->lgh_lock);
-       LASSERT(loghandle);
-       return loghandle;
-}
-
-/* Add a single record to the recovery log(s) using a catalog
- * Returns as llog_write_record
- *
- * Assumes caller has already pushed us into the kernel context.
- */
-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 thandle *th)
-{
-       struct llog_handle *loghandle;
-       int rc;
-
-       LASSERT(rec->lrh_len <= LLOG_CHUNK_SIZE);
-       loghandle = llog_cat_current_log(cathandle, th);
-       LASSERT(!IS_ERR(loghandle));
-
-       /* loghandle is already locked by llog_cat_current_log() for us */
-       if (!llog_exist(loghandle)) {
-               rc = llog_cat_new_log(env, cathandle, loghandle, th);
-               if (rc < 0) {
-                       up_write(&loghandle->lgh_lock);
-                       return rc;
-               }
-       }
-       /* now let's try to add the record */
-       rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf, -1, th);
-       if (rc < 0)
-               CDEBUG_LIMIT(rc == -ENOSPC ? D_HA : D_ERROR,
-                            "llog_write_rec %d: lh=%p\n", rc, loghandle);
-       up_write(&loghandle->lgh_lock);
-       if (rc == -ENOSPC) {
-               /* try to use next log */
-               loghandle = llog_cat_current_log(cathandle, th);
-               LASSERT(!IS_ERR(loghandle));
-               /* new llog can be created concurrently */
-               if (!llog_exist(loghandle)) {
-                       rc = llog_cat_new_log(env, cathandle, loghandle, th);
-                       if (rc < 0) {
-                               up_write(&loghandle->lgh_lock);
-                               return rc;
-                       }
-               }
-               /* now let's try to add the record */
-               rc = llog_write_rec(env, loghandle, rec, reccookie, 1, buf,
-                                   -1, th);
-               if (rc < 0)
-                       CERROR("llog_write_rec %d: lh=%p\n", rc, loghandle);
-               up_write(&loghandle->lgh_lock);
-       }
-
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_add_rec);
-
-int llog_cat_declare_add_rec(const struct lu_env *env,
-                            struct llog_handle *cathandle,
-                            struct llog_rec_hdr *rec, struct thandle *th)
-{
-       struct llog_handle      *loghandle, *next;
-       int                      rc = 0;
-
-       if (cathandle->u.chd.chd_current_log == NULL) {
-               /* declare new plain llog */
-               down_write(&cathandle->lgh_lock);
-               if (cathandle->u.chd.chd_current_log == NULL) {
-                       rc = llog_open(env, cathandle->lgh_ctxt, &loghandle,
-                                      NULL, NULL, LLOG_OPEN_NEW);
-                       if (rc == 0) {
-                               cathandle->u.chd.chd_current_log = loghandle;
-                               list_add_tail(&loghandle->u.phd.phd_entry,
-                                                 &cathandle->u.chd.chd_head);
-                       }
-               }
-               up_write(&cathandle->lgh_lock);
-       } else if (cathandle->u.chd.chd_next_log == NULL) {
-               /* declare next plain llog */
-               down_write(&cathandle->lgh_lock);
-               if (cathandle->u.chd.chd_next_log == NULL) {
-                       rc = llog_open(env, cathandle->lgh_ctxt, &loghandle,
-                                      NULL, NULL, LLOG_OPEN_NEW);
-                       if (rc == 0) {
-                               cathandle->u.chd.chd_next_log = loghandle;
-                               list_add_tail(&loghandle->u.phd.phd_entry,
-                                                 &cathandle->u.chd.chd_head);
-                       }
-               }
-               up_write(&cathandle->lgh_lock);
-       }
-       if (rc)
-               goto out;
-
-       if (!llog_exist(cathandle->u.chd.chd_current_log)) {
-               rc = llog_declare_create(env, cathandle->u.chd.chd_current_log,
-                                        th);
-               if (rc)
-                       goto out;
-               llog_declare_write_rec(env, cathandle, NULL, -1, th);
-       }
-       /* declare records in the llogs */
-       rc = llog_declare_write_rec(env, cathandle->u.chd.chd_current_log,
-                                   rec, -1, th);
-       if (rc)
-               goto out;
-
-       next = cathandle->u.chd.chd_next_log;
-       if (next) {
-               if (!llog_exist(next)) {
-                       rc = llog_declare_create(env, next, th);
-                       llog_declare_write_rec(env, cathandle, NULL, -1, th);
-               }
-               llog_declare_write_rec(env, next, rec, -1, th);
-       }
-out:
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_declare_add_rec);
-
-int llog_cat_add(const struct lu_env *env, struct llog_handle *cathandle,
-                struct llog_rec_hdr *rec, struct llog_cookie *reccookie,
-                void *buf)
-{
-       struct llog_ctxt        *ctxt;
-       struct dt_device        *dt;
-       struct thandle          *th = NULL;
-       int                      rc;
-
-       ctxt = cathandle->lgh_ctxt;
-       LASSERT(ctxt);
-       LASSERT(ctxt->loc_exp);
-
-       if (cathandle->lgh_obj != NULL) {
-               dt = ctxt->loc_exp->exp_obd->obd_lvfs_ctxt.dt;
-               LASSERT(dt);
-
-               th = dt_trans_create(env, dt);
-               if (IS_ERR(th))
-                       return PTR_ERR(th);
-
-               rc = llog_cat_declare_add_rec(env, cathandle, rec, th);
-               if (rc)
-                       goto out_trans;
-
-               rc = dt_trans_start_local(env, dt, th);
-               if (rc)
-                       goto out_trans;
-               rc = llog_cat_add_rec(env, cathandle, rec, reccookie, buf, th);
-out_trans:
-               dt_trans_stop(env, dt, th);
-       } else { /* lvfs compat code */
-               LASSERT(cathandle->lgh_file != NULL);
-               rc = llog_cat_declare_add_rec(env, cathandle, rec, th);
-               if (rc == 0)
-                       rc = llog_cat_add_rec(env, cathandle, rec, reccookie,
-                                             buf, th);
-       }
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_add);
-
-/* For each cookie in the cookie array, we clear the log in-use bit and either:
- * - the log is empty, so mark it free in the catalog header and delete it
- * - the log is not empty, just write out the log header
- *
- * The cookies may be in different log files, so we need to get new logs
- * each time.
- *
- * Assumes caller has already pushed us into the kernel context.
- */
-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, failed = 0;
-
-       for (i = 0; i < count; i++, cookies++) {
-               struct llog_handle      *loghandle;
-               struct llog_logid       *lgl = &cookies->lgc_lgl;
-               int                      lrc;
-
-               rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
-               if (rc) {
-                       CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
-                              cathandle->lgh_ctxt->loc_obd->obd_name,
-                              POSTID(&lgl->lgl_oi), rc);
-                       failed++;
-                       continue;
-               }
-
-               lrc = llog_cancel_rec(env, loghandle, cookies->lgc_index);
-               if (lrc == 1) {   /* log has been destroyed */
-                       index = loghandle->u.phd.phd_cookie.lgc_index;
-                       rc = llog_cat_cleanup(env, cathandle, loghandle,
-                                             index);
-               } else if (lrc == -ENOENT) {
-                       if (rc == 0) /* ENOENT shouldn't rewrite any error */
-                               rc = lrc;
-               } else if (lrc < 0) {
-                       failed++;
-                       rc = lrc;
-               }
-               llog_handle_put(loghandle);
-       }
-       if (rc)
-               CERROR("%s: fail to cancel %d of %d llog-records: rc = %d\n",
-                      cathandle->lgh_ctxt->loc_obd->obd_name, failed, count,
-                      rc);
-
-       return rc;
-}
-EXPORT_SYMBOL(llog_cat_cancel_records);
-
 static int llog_cat_process_cb(const struct lu_env *env,
                               struct llog_handle *cat_llh,
                               struct llog_rec_hdr *rec, void *data)
@@ -573,10 +190,10 @@ static int llog_cat_process_cb(const struct lu_env *env,
        return rc;
 }
 
-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)
+static 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_log_hdr *llh = cat_llh->lgh_hdr;
@@ -612,7 +229,6 @@ int llog_cat_process_or_fork(const struct lu_env *env,
 
        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)
@@ -621,195 +237,3 @@ int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh,
                                        startidx, false);
 }
 EXPORT_SYMBOL(llog_cat_process);
-
-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 "DOSTID":%x at index %u of catalog "
-              DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
-              le32_to_cpu(rec->lrh_index), POSTID(&cat_llh->lgh_id.lgl_oi));
-
-       rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
-       if (rc) {
-               CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
-                      cat_llh->lgh_ctxt->loc_obd->obd_name,
-                      POSTID(&lir->lid_id.lgl_oi), rc);
-               return rc;
-       }
-
-       rc = llog_reverse_process(env, llh, d->lpd_cb, d->lpd_data, NULL);
-       llog_handle_put(llh);
-       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;
-
-       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 "DOSTID" crosses index zero\n",
-                     POSTID(&cat_llh->lgh_id.lgl_oi));
-
-               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);
-
-static 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;
-
-       bitmap_size = LLOG_BITMAP_SIZE(llh);
-       if (llh->llh_cat_idx == (index - 1)) {
-               idx = llh->llh_cat_idx + 1;
-               llh->llh_cat_idx = idx;
-               if (idx == cathandle->lgh_last_idx)
-                       goto out;
-               for (i = (index + 1) % bitmap_size;
-                    i != cathandle->lgh_last_idx;
-                    i = (i + 1) % bitmap_size) {
-                       if (!ext2_test_bit(i, llh->llh_bitmap)) {
-                               idx = llh->llh_cat_idx + 1;
-                               llh->llh_cat_idx = idx;
-                       } else if (i == 0) {
-                               llh->llh_cat_idx = 0;
-                       } else {
-                               break;
-                       }
-               }
-out:
-               CDEBUG(D_RPCTRACE, "set catlog "DOSTID" first idx %u\n",
-                      POSTID(&cathandle->lgh_id.lgl_oi), llh->llh_cat_idx);
-       }
-
-       return 0;
-}
-
-/* Cleanup deleted plain llog traces from catalog */
-int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle,
-                    struct llog_handle *loghandle, int index)
-{
-       int rc;
-
-       LASSERT(index);
-       if (loghandle != NULL) {
-               /* remove destroyed llog from catalog list and
-                * chd_current_log variable */
-               down_write(&cathandle->lgh_lock);
-               if (cathandle->u.chd.chd_current_log == loghandle)
-                       cathandle->u.chd.chd_current_log = NULL;
-               list_del_init(&loghandle->u.phd.phd_entry);
-               up_write(&cathandle->lgh_lock);
-               LASSERT(index == loghandle->u.phd.phd_cookie.lgc_index);
-               /* llog was opened and keep in a list, close it now */
-               llog_close(env, loghandle);
-       }
-       /* remove plain llog entry from catalog by index */
-       llog_cat_set_first_idx(cathandle, index);
-       rc = llog_cancel_rec(env, cathandle, index);
-       if (rc == 0)
-               CDEBUG(D_HA, "cancel plain log at index %u of catalog " DOSTID "\n",
-                      index, POSTID(&cathandle->lgh_id.lgl_oi));
-       return rc;
-}
-
-static int cat_cancel_cb(const struct lu_env *env, 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;
-
-       if (rec->lrh_type != LLOG_LOGID_MAGIC) {
-               CERROR("invalid record in catalog\n");
-               return -EINVAL;
-       }
-
-       CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
-              DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
-              rec->lrh_index, POSTID(&cathandle->lgh_id.lgl_oi));
-
-       rc = llog_cat_id2handle(env, cathandle, &loghandle, &lir->lid_id);
-       if (rc) {
-               CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
-                      cathandle->lgh_ctxt->loc_obd->obd_name,
-                      POSTID(&lir->lid_id.lgl_oi), rc);
-               if (rc == -ENOENT || rc == -ESTALE) {
-                       /* remove index from catalog */
-                       llog_cat_cleanup(env, cathandle, NULL, rec->lrh_index);
-               }
-               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);
-
-               llog_cat_cleanup(env, cathandle, loghandle,
-                                loghandle->u.phd.phd_cookie.lgc_index);
-       }
-       llog_handle_put(loghandle);
-
-       return rc;
-}
-
-/* helper to initialize catalog llog and process it to cancel */
-int llog_cat_init_and_process(const struct lu_env *env,
-                             struct llog_handle *llh)
-{
-       int rc;
-
-       rc = llog_init_handle(env, llh, LLOG_F_IS_CAT, NULL);
-       if (rc)
-               return rc;
-
-       rc = llog_process_or_fork(env, llh, cat_cancel_cb, NULL, NULL, false);
-       if (rc)
-               CERROR("%s: llog_process() with cat_cancel_cb failed: rc = %d\n",
-                      llh->lgh_ctxt->loc_obd->obd_name, rc);
-       return 0;
-}
-EXPORT_SYMBOL(llog_cat_init_and_process);