From: Alex Zhuravlev Date: Tue, 21 Sep 2021 12:23:56 +0000 (+0300) Subject: LU-14474 llog: don't destroy next llog X-Git-Tag: 2.14.56~177 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=4521f6af35d1dc20b531b87ff3633d89dbac86ec LU-14474 llog: don't destroy next llog do not destroy empty llog if it's referenced as the next one in a catalog. Signed-off-by: Alex Zhuravlev Change-Id: I78bfeb90435aaee2b8536b647aa3acec56642ea0 Reviewed-on: https://review.whamcloud.com/44998 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Reviewed-by: Oleg Drokin --- diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c index 27b9aad..97f15e4 100644 --- a/lustre/obdclass/llog_cat.c +++ b/lustre/obdclass/llog_cat.c @@ -834,7 +834,8 @@ 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",