Whamcloud - gitweb
LU-17705 ptlrpc: replace synchronize_rcu() with rcu_barrier()
[fs/lustre-release.git] / lustre / obdclass / llog_cat.c
index 97d09c6..3d9cceb 100644 (file)
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/obdclass/llog_cat.c
  *
@@ -77,9 +76,7 @@ static int llog_cat_new_log(const struct lu_env *env,
 
        ENTRY;
 
-       index = (cathandle->lgh_last_idx + 1) %
-               (OBD_FAIL_PRECHECK(OBD_FAIL_CAT_RECORDS) ? (cfs_fail_val + 1) :
-                                               LLOG_HDR_BITMAP_SIZE(llh));
+       index = (cathandle->lgh_last_idx + 1) % (llog_max_idx(llh) + 1);
 
        /* check that new llog index will not overlap with the first one.
         * - llh_cat_idx is the index just before the first/oldest still in-use
@@ -95,20 +92,17 @@ static int llog_cat_new_log(const struct lu_env *env,
        if ((index == llh->llh_cat_idx + 1 && llh->llh_count > 1) ||
            (index == 0 && llh->llh_cat_idx == 0)) {
                if (cathandle->lgh_name == NULL) {
-                       CWARN("%s: there are no more free slots in catalog "
-                             DFID":%x\n",
+                       CWARN("%s: there are no more free slots in catalog "DFID"\n",
                              loghandle2name(loghandle),
-                             PFID(&cathandle->lgh_id.lgl_oi.oi_fid),
-                             cathandle->lgh_id.lgl_ogen);
+                             PLOGID(&cathandle->lgh_id));
                } else {
-                       CWARN("%s: there are no more free slots in "
-                             "catalog %s\n", loghandle2name(loghandle),
-                             cathandle->lgh_name);
+                       CWARN("%s: there are no more free slots in catalog %s\n",
+                             loghandle2name(loghandle), cathandle->lgh_name);
                }
                RETURN(-ENOSPC);
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED))
+       if (CFS_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED))
                RETURN(-ENOSPC);
 
        if (loghandle->lgh_hdr != NULL) {
@@ -184,8 +178,8 @@ static int llog_cat_new_log(const struct lu_env *env,
                GOTO(out_destroy, rc);
 
        CDEBUG(D_OTHER, "new plain log "DFID".%u of catalog "DFID"\n",
-              PFID(&loghandle->lgh_id.lgl_oi.oi_fid), rec->lid_hdr.lrh_index,
-              PFID(&cathandle->lgh_id.lgl_oi.oi_fid));
+              PLOGID(&loghandle->lgh_id), rec->lid_hdr.lrh_index,
+              PLOGID(&cathandle->lgh_id));
 
        loghandle->lgh_hdr->llh_cat_idx = rec->lid_hdr.lrh_index;
 
@@ -205,8 +199,8 @@ static int llog_cat_new_log(const struct lu_env *env,
                if (freespace > (128 << 20))
                        loghandle->lgh_max_size = 128 << 20;
        }
-       if (unlikely(OBD_FAIL_PRECHECK(OBD_FAIL_PLAIN_RECORDS) ||
-                    OBD_FAIL_PRECHECK(OBD_FAIL_CATALOG_FULL_CHECK))) {
+       if (unlikely(CFS_FAIL_PRECHECK(OBD_FAIL_PLAIN_RECORDS) ||
+                    CFS_FAIL_PRECHECK(OBD_FAIL_CATALOG_FULL_CHECK))) {
                // limit the numer of plain records for test
                loghandle->lgh_max_size = loghandle->lgh_hdr_size +
                       cfs_fail_val * 64;
@@ -228,7 +222,7 @@ out_destroy:
        loghandle->lgh_hdr->llh_flags &= ~LLOG_F_ZAP_WHEN_EMPTY;
        /* this is to mimic full log, so another llog_cat_current_log()
         * can skip it and ask for another onet */
-       loghandle->lgh_last_idx = LLOG_HDR_BITMAP_SIZE(loghandle->lgh_hdr) + 1;
+       loghandle->lgh_last_idx = llog_max_idx(loghandle->lgh_hdr) + 1;
        llog_trans_destroy(env, loghandle, th);
        if (handle != NULL)
                dt_trans_stop(env, dt, handle);
@@ -247,14 +241,16 @@ static int llog_cat_refresh(const struct lu_env *env,
                if (!llog_exist(loghandle))
                        continue;
 
+               down_write(&loghandle->lgh_lock);
                rc = llog_read_header(env, loghandle, NULL);
+               up_write(&loghandle->lgh_lock);
                if (rc)
                        goto unlock;
        }
 
        rc = llog_read_header(env, cathandle, NULL);
 unlock:
-       up_write(&loghandle->lgh_lock);
+       up_write(&cathandle->lgh_lock);
 
        return rc;
 }
@@ -388,18 +384,11 @@ int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
 
                if (ostid_id(&cgl->lgl_oi) == ostid_id(&logid->lgl_oi) &&
                    ostid_seq(&cgl->lgl_oi) == ostid_seq(&logid->lgl_oi)) {
-                       if (cgl->lgl_ogen != logid->lgl_ogen) {
-                               CWARN("%s: log "DFID" generation %x != %x\n",
-                                     loghandle2name(loghandle),
-                                     PFID(&logid->lgl_oi.oi_fid),
-                                     cgl->lgl_ogen, logid->lgl_ogen);
-                               continue;
-                       }
                        *res = llog_handle_get(loghandle);
                        if (!*res) {
                                CERROR("%s: log "DFID" refcount is zero!\n",
                                       loghandle2name(loghandle),
-                                      PFID(&logid->lgl_oi.oi_fid));
+                                      PLOGID(logid));
                                continue;
                        }
                        loghandle->u.phd.phd_cat_handle = cathandle;
@@ -412,9 +401,8 @@ int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
        rc = llog_open(env, cathandle->lgh_ctxt, &loghandle, logid, NULL,
                       LLOG_OPEN_EXISTS);
        if (rc < 0) {
-               CERROR("%s: error opening log id "DFID":%x: rc = %d\n",
-                      loghandle2name(cathandle), PFID(&logid->lgl_oi.oi_fid),
-                      logid->lgl_ogen, rc);
+               CERROR("%s: error opening log id "DFID": rc = %d\n",
+                      loghandle2name(cathandle), PLOGID(logid), rc);
                RETURN(rc);
        }
 
@@ -493,7 +481,7 @@ static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
         ENTRY;
 
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED2)) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_MDS_LLOG_CREATE_FAILED2)) {
                down_write_nested(&cathandle->lgh_lock, LLOGH_CAT);
                GOTO(next, loghandle);
        }
@@ -711,9 +699,8 @@ int llog_cat_cancel_arr_rec(const struct lu_env *env,
        ENTRY;
        rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
        if (rc) {
-               CDEBUG(D_HA, "%s: cannot find llog for handle "DFID":%x"
-                      ": rc = %d\n", loghandle2name(cathandle),
-                      PFID(&lgl->lgl_oi.oi_fid), lgl->lgl_ogen, rc);
+               CDEBUG(D_HA, "%s: can't find llog handle for "DFID": rc = %d\n",
+                      loghandle2name(cathandle), PLOGID(lgl), rc);
                RETURN(rc);
        }
 
@@ -725,10 +712,8 @@ int llog_cat_cancel_arr_rec(const struct lu_env *env,
                 * for these non-exist llogs.
                 */
                rc = -ENOENT;
-               CDEBUG(D_HA, "%s: llog "DFID":%x does not exist"
-                      ": rc = %d\n", loghandle2name(cathandle),
-                      PFID(&lgl->lgl_oi.oi_fid), lgl->lgl_ogen, rc);
-
+               CDEBUG(D_HA, "%s: llog "DFID" does not exist: rc = %d\n",
+                      loghandle2name(cathandle), PLOGID(lgl), rc);
                llog_handle_put(env, loghandle);
                RETURN(rc);
        }
@@ -802,16 +787,13 @@ static int llog_cat_process_common(const struct lu_env *env,
        ENTRY;
        if (rec->lrh_type != le32_to_cpu(LLOG_LOGID_MAGIC)) {
                rc = -EINVAL;
-               CWARN("%s: invalid record in catalog "DFID":%x: rc = %d\n",
-                     loghandle2name(cat_llh),
-                     PFID(&cat_llh->lgh_id.lgl_oi.oi_fid),
-                     cat_llh->lgh_id.lgl_ogen, rc);
+               CWARN("%s: invalid record in catalog "DFID": rc = %d\n",
+                     loghandle2name(cat_llh), PLOGID(&cat_llh->lgh_id), rc);
                RETURN(rc);
        }
-       CDEBUG(D_HA, "processing log "DFID":%x at index %u of catalog "DFID"\n",
-              PFID(&lir->lid_id.lgl_oi.oi_fid), lir->lid_id.lgl_ogen,
-              le32_to_cpu(rec->lrh_index),
-              PFID(&cat_llh->lgh_id.lgl_oi.oi_fid));
+       CDEBUG(D_HA, "processing log "DFID" at index %u of catalog "DFID"\n",
+              PLOGID(&lir->lid_id), le32_to_cpu(rec->lrh_index),
+              PLOGID(&cat_llh->lgh_id));
 
        rc = llog_cat_id2handle(env, cat_llh, llhp, &lir->lid_id);
        if (rc) {
@@ -822,10 +804,9 @@ static int llog_cat_process_common(const struct lu_env *env,
                if (rc == -ENOENT || rc == -ESTALE)
                        rc = LLOG_DEL_RECORD;
                else if (rc)
-                       CWARN("%s: can't find llog handle "DFID":%x: rc = %d\n",
-                             loghandle2name(cat_llh),
-                             PFID(&lir->lid_id.lgl_oi.oi_fid),
-                             lir->lid_id.lgl_ogen, rc);
+                       CWARN("%s: can't find llog handle "DFID": rc = %d\n",
+                             loghandle2name(cat_llh), PLOGID(&lir->lid_id),
+                             rc);
 
                RETURN(rc);
        }
@@ -835,12 +816,13 @@ static int llog_cat_process_common(const struct lu_env *env,
        hdr = (*llhp)->lgh_hdr;
        if ((hdr->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
            hdr->llh_count == 1 && cat_llh->lgh_obj != NULL &&
-           *llhp != cat_llh->u.chd.chd_current_log) {
+           *llhp != cat_llh->u.chd.chd_current_log &&
+           *llhp != cat_llh->u.chd.chd_next_log) {
                rc = llog_destroy(env, *llhp);
                if (rc)
                        CWARN("%s: can't destroy empty log "DFID": rc = %d\n",
-                             loghandle2name((*llhp)),
-                             PFID(&lir->lid_id.lgl_oi.oi_fid), rc);
+                             loghandle2name((*llhp)), PLOGID(&lir->lid_id),
+                             rc);
                rc = LLOG_DEL_PLAIN;
        }
 
@@ -856,18 +838,26 @@ static int llog_cat_process_cb(const struct lu_env *env,
        int rc;
 
        ENTRY;
+
+       /* Skip processing of the logs until startcat */
+       if (rec->lrh_index < d->lpd_startcat)
+               RETURN(0);
+
        rc = llog_cat_process_common(env, cat_llh, rec, &llh);
        if (rc)
                GOTO(out, rc);
 
-       if (rec->lrh_index < d->lpd_startcat) {
-               /* Skip processing of the logs until startcat */
-               rc = 0;
-       } else if (d->lpd_startidx > 0) {
-                struct llog_process_cat_data cd;
+       if (d->lpd_startidx > 0) {
+               struct llog_process_cat_data cd = {
+                       .lpcd_first_idx = 0,
+                       .lpcd_last_idx = 0,
+                       .lpcd_read_mode = LLOG_READ_MODE_NORMAL,
+               };
+
+               /* startidx is always associated with a catalog index */
+               if (d->lpd_startcat == rec->lrh_index)
+                       cd.lpcd_first_idx = d->lpd_startidx;
 
-                cd.lpcd_first_idx = d->lpd_startidx;
-                cd.lpcd_last_idx = 0;
                rc = llog_process_or_fork(env, llh, d->lpd_cb, d->lpd_data,
                                          &cd, false);
                /* Continue processing the next log from idx 0 */
@@ -882,8 +872,7 @@ static int llog_cat_process_cb(const struct lu_env *env,
                 * it if the caller is fine with that.
                 */
                CERROR("%s: remove corrupted/missing llog "DFID"\n",
-                      loghandle2name(cat_llh),
-                      PFID(&llh->lgh_id.lgl_oi.oi_fid));
+                      loghandle2name(cat_llh), PLOGID(&llh->lgh_id));
                rc = LLOG_DEL_PLAIN;
        }
 
@@ -892,6 +881,9 @@ out:
        if (rc == LLOG_DEL_PLAIN || rc == LLOG_DEL_RECORD)
                /* clear wrong catalog entry */
                rc = llog_cat_cleanup(env, cat_llh, llh, rec->lrh_index);
+       else if (rc == LLOG_SKIP_PLAIN)
+               /* processing callback ask to skip the llog -> continue */
+               rc = 0;
 
        if (llh)
                llog_handle_put(env, llh);
@@ -904,8 +896,9 @@ int llog_cat_process_or_fork(const struct lu_env *env,
                             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;
+       struct llog_process_data d;
+       struct llog_process_cat_data cd;
        int rc;
 
        ENTRY;
@@ -913,55 +906,86 @@ int llog_cat_process_or_fork(const struct lu_env *env,
        LASSERT(llh->llh_flags & LLOG_F_IS_CAT);
        d.lpd_data = data;
        d.lpd_cb = cb;
-       d.lpd_startcat = (startcat == LLOG_CAT_FIRST ? 0 : startcat);
-       d.lpd_startidx = startidx;
 
-       if (llh->llh_cat_idx >= cat_llh->lgh_last_idx &&
-           llh->llh_count > 1) {
-               struct llog_process_cat_data cd;
+       /* default: start from the oldest record */
+       d.lpd_startidx = 0;
+       d.lpd_startcat = llh->llh_cat_idx + 1;
+       cd.lpcd_first_idx = llh->llh_cat_idx;
+       cd.lpcd_last_idx = 0;
+       cd.lpcd_read_mode = LLOG_READ_MODE_NORMAL;
+
+       if (startcat > 0 && startcat <= llog_max_idx(llh)) {
+               /* start from a custom catalog/llog plain indexes*/
+               d.lpd_startidx = startidx;
+               d.lpd_startcat = startcat;
+               cd.lpcd_first_idx = startcat - 1;
+       } else if (startcat != 0) {
+               CWARN("%s: startcat %d out of range for catlog "DFID"\n",
+                     loghandle2name(cat_llh), startcat,
+                     PLOGID(&cat_llh->lgh_id));
+               RETURN(-EINVAL);
+       }
+
+       startcat = d.lpd_startcat;
+
+       /* if startcat <= lgh_last_idx, we only need to process the first part
+        * of the catalog (from startcat).
+        */
+       if (llog_cat_is_wrapped(cat_llh) && startcat > cat_llh->lgh_last_idx) {
+               int cat_idx_origin = llh->llh_cat_idx;
 
                CWARN("%s: catlog "DFID" crosses index zero\n",
                      loghandle2name(cat_llh),
-                     PFID(&cat_llh->lgh_id.lgl_oi.oi_fid));
-               /*startcat = 0 is default value for general processing */
-               if ((startcat != LLOG_CAT_FIRST &&
-                   startcat >= llh->llh_cat_idx) || !startcat) {
-                       /* processing the catalog part at the end */
-                       cd.lpcd_first_idx = (startcat ? startcat :
-                                            llh->llh_cat_idx);
-                       if (OBD_FAIL_PRECHECK(OBD_FAIL_CAT_RECORDS))
-                               cd.lpcd_last_idx = cfs_fail_val;
-                       else
-                               cd.lpcd_last_idx = 0;
-                       rc = llog_process_or_fork(env, cat_llh, cat_cb,
-                                                 &d, &cd, fork);
-                       /* Reset the startcat becasue it has already reached
-                        * catalog bottom.
-                        */
-                       startcat = 0;
-                       d.lpd_startcat = 0;
-                       if (rc != 0)
-                               RETURN(rc);
-               }
-               /* processing the catalog part at the begining */
-               cd.lpcd_first_idx = (startcat == LLOG_CAT_FIRST) ? 0 : startcat;
-               /* Note, the processing will stop at the lgh_last_idx value,
-                * and it could be increased during processing. So records
-                * between current lgh_last_idx and lgh_last_idx in future
-                * would left unprocessed.
+                     PLOGID(&cat_llh->lgh_id));
+
+               /* processing the catalog part at the end */
+               rc = llog_process_or_fork(env, cat_llh, cat_cb, &d, &cd, fork);
+               if (rc)
+                       RETURN(rc);
+
+               /* Reset the startcat because it has already reached catalog
+                * bottom.
+                * lgh_last_idx value could be increased during processing. So
+                * we process the remaining of catalog entries to be sure.
                 */
-               cd.lpcd_last_idx = cat_llh->lgh_last_idx;
-               rc = llog_process_or_fork(env, cat_llh, cat_cb,
-                                         &d, &cd, fork);
-       } else {
-               rc = llog_process_or_fork(env, cat_llh, cat_cb,
-                                         &d, NULL, fork);
+               d.lpd_startcat = 1;
+               d.lpd_startidx = 0;
+               cd.lpcd_first_idx = 0;
+               cd.lpcd_last_idx = max(cat_idx_origin, cat_llh->lgh_last_idx);
+       } else if (llog_cat_is_wrapped(cat_llh)) {
+               /* only process 1st part -> stop before reaching 2sd part */
+               cd.lpcd_last_idx = llh->llh_cat_idx;
        }
 
+       /* processing the catalog part at the begining */
+       rc = llog_process_or_fork(env, cat_llh, cat_cb, &d, &cd, fork);
+
        RETURN(rc);
 }
 EXPORT_SYMBOL(llog_cat_process_or_fork);
 
+/**
+ * Process catalog records with a callback
+ *
+ * \note
+ * If "starcat = 0", this is the default processing. "startidx" argument is
+ * ignored and processing begin from the oldest record.
+ * If "startcat > 0", this is a custom starting point. Processing begin with
+ * the llog plain defined in the catalog record at index "startcat". The first
+ * llog plain record to process is at index "startidx + 1".
+ *
+ * \param env          Lustre environnement
+ * \param cat_llh      Catalog llog handler
+ * \param cb           Callback executed for each records (in llog plain files)
+ * \param data         Callback data argument
+ * \param startcat     Catalog index of the llog plain to start with.
+ * \param startidx     Index of the llog plain to start processing. The first
+ *                     record to process is at startidx + 1.
+ *
+ * \retval 0 processing successfully completed
+ * \retval LLOG_PROC_BREAK processing was stopped by the callback.
+ * \retval -errno on error.
+ */
 int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh,
                     llog_cb_t cb, void *data, int startcat, int startidx)
 {
@@ -995,7 +1019,7 @@ static int llog_cat_size_cb(const struct lu_env *env,
                *cum_size += size;
 
                CDEBUG(D_INFO, "Add llog entry "DFID" size=%llu, tot=%llu\n",
-                      PFID(&llh->lgh_id.lgl_oi.oi_fid), size, *cum_size);
+                      PLOGID(&llh->lgh_id), size, *cum_size);
        }
 
        if (llh != NULL)
@@ -1022,14 +1046,14 @@ EXPORT_SYMBOL(llog_cat_size);
 __u32 llog_cat_free_space(struct llog_handle *cat_llh)
 {
        /* simulate almost full Catalog */
-       if (OBD_FAIL_CHECK(OBD_FAIL_CAT_FREE_RECORDS))
+       if (CFS_FAIL_CHECK(OBD_FAIL_CAT_FREE_RECORDS))
                return cfs_fail_val;
 
        if (cat_llh->lgh_hdr->llh_count == 1)
-               return LLOG_HDR_BITMAP_SIZE(cat_llh->lgh_hdr) - 1;
+               return llog_max_idx(cat_llh->lgh_hdr);
 
        if (cat_llh->lgh_last_idx > cat_llh->lgh_hdr->llh_cat_idx)
-               return LLOG_HDR_BITMAP_SIZE(cat_llh->lgh_hdr) - 1 +
+               return llog_max_idx(cat_llh->lgh_hdr) +
                       cat_llh->lgh_hdr->llh_cat_idx - cat_llh->lgh_last_idx;
 
        /* catalog is presently wrapped */
@@ -1055,6 +1079,9 @@ static int llog_cat_reverse_process_cb(const struct lu_env *env,
        } else if (rc == LLOG_DEL_RECORD) {
                /* clear wrong catalog entry */
                rc = llog_cat_cleanup(env, cat_llh, NULL, rec->lrh_index);
+       } else if (rc == LLOG_SKIP_PLAIN) {
+               /* processing callback ask to skip the llog -> continue */
+               rc = 0;
        }
        if (rc)
                RETURN(rc);
@@ -1081,6 +1108,7 @@ int llog_cat_reverse_process(const struct lu_env *env,
         ENTRY;
 
         LASSERT(llh->llh_flags & LLOG_F_IS_CAT);
+       cd.lpcd_read_mode = LLOG_READ_MODE_NORMAL;
         d.lpd_data = data;
         d.lpd_cb = cb;
 
@@ -1088,7 +1116,7 @@ int llog_cat_reverse_process(const struct lu_env *env,
            llh->llh_count > 1) {
                CWARN("%s: catalog "DFID" crosses index zero\n",
                      loghandle2name(cat_llh),
-                     PFID(&cat_llh->lgh_id.lgl_oi.oi_fid));
+                     PLOGID(&cat_llh->lgh_id));
 
                cd.lpcd_first_idx = 0;
                cd.lpcd_last_idx = cat_llh->lgh_last_idx;
@@ -1116,11 +1144,11 @@ EXPORT_SYMBOL(llog_cat_reverse_process);
 static int llog_cat_set_first_idx(struct llog_handle *cathandle, int idx)
 {
        struct llog_log_hdr *llh = cathandle->lgh_hdr;
-       int bitmap_size;
+       int idx_nbr;
 
        ENTRY;
 
-       bitmap_size = LLOG_HDR_BITMAP_SIZE(llh);
+       idx_nbr = llog_max_idx(llh) + 1;
        /*
         * The llh_cat_idx equals to the first used index minus 1
         * so if we canceled the first index then llh_cat_idx
@@ -1130,7 +1158,7 @@ static int llog_cat_set_first_idx(struct llog_handle *cathandle, int idx)
                llh->llh_cat_idx = idx;
 
                while (idx != cathandle->lgh_last_idx) {
-                       idx = (idx + 1) % bitmap_size;
+                       idx = (idx + 1) % idx_nbr;
                        if (!test_bit_le(idx, LLOG_HDR_BITMAP(llh))) {
                                /* update llh_cat_idx for each unset bit,
                                 * expecting the next one is set */
@@ -1146,8 +1174,8 @@ static int llog_cat_set_first_idx(struct llog_handle *cathandle, int idx)
                }
 
                CDEBUG(D_HA, "catlog "DFID" first idx %u, last_idx %u\n",
-                      PFID(&cathandle->lgh_id.lgl_oi.oi_fid),
-                      llh->llh_cat_idx, cathandle->lgh_last_idx);
+                      PLOGID(&cathandle->lgh_id), llh->llh_cat_idx,
+                      cathandle->lgh_last_idx);
        }
 
        RETURN(0);
@@ -1158,13 +1186,11 @@ int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle,
                     struct llog_handle *loghandle, int index)
 {
        int rc;
-       struct lu_fid fid = {.f_seq = 0, .f_oid = 0, .f_ver = 0};
 
        LASSERT(index);
        if (loghandle != NULL) {
                /* remove destroyed llog from catalog list and
                 * chd_current_log variable */
-               fid = loghandle->lgh_id.lgl_oi.oi_fid;
                down_write(&cathandle->lgh_lock);
                if (cathandle->u.chd.chd_current_log == loghandle)
                        cathandle->u.chd.chd_current_log = NULL;
@@ -1183,10 +1209,35 @@ int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle,
        /* 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)
+       if (!rc && loghandle)
                CDEBUG(D_HA,
                       "cancel plain log "DFID" at index %u of catalog "DFID"\n",
-                      PFID(&fid), index,
-                      PFID(&cathandle->lgh_id.lgl_oi.oi_fid));
+                      PLOGID(&loghandle->lgh_id), index,
+                      PLOGID(&cathandle->lgh_id));
+       return rc;
+}
+
+/* retain log in catalog, and zap it if log is empty */
+int llog_cat_retain_cb(const struct lu_env *env, struct llog_handle *cat,
+                      struct llog_rec_hdr *rec, void *data)
+{
+       struct llog_handle *log = NULL;
+       int rc;
+
+       rc = llog_cat_process_common(env, cat, rec, &log);
+
+       /* The empty plain log was destroyed while processing */
+       if (rc == LLOG_DEL_PLAIN || rc == LLOG_DEL_RECORD)
+               /* clear wrong catalog entry */
+               rc = llog_cat_cleanup(env, cat, log, rec->lrh_index);
+       else if (!rc)
+               llog_retain(env, log);
+
+       if (log)
+               llog_handle_put(env, log);
+
        return rc;
 }
+EXPORT_SYMBOL(llog_cat_retain_cb);
+
+