From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Wed, 13 Sep 2023 15:23:27 +0000 (+0000)
Subject: fts: struct fts_transaction_context - Assert not indexing rather than do it conditionally
X-Git-Tag: 2.4.0~2522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ba753c3979d6903f4395ad36732f0a70ba2e4ef;p=thirdparty%2Fdovecot%2Fcore.git

fts: struct fts_transaction_context - Assert not indexing rather than do it conditionally
---

diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index 9bc0a36a4d..b7b1b2b6f2 100644
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -554,12 +554,13 @@ static int fts_mail_precache(struct mail *_mail)
 	struct mail_private *mail = (struct mail_private *)_mail;
 	struct fts_mail *fmail = FTS_MAIL_CONTEXT(mail);
 	struct fts_transaction_context *ft = FTS_CONTEXT_REQUIRE(_mail->transaction);
-	int ret = 0;
+	int ret;
 
 	i_assert(!fmail->virtual_mail);
 	fmail->module_ctx.super.precache(_mail);
-	if (!ft->indexing) T_BEGIN {
-		/* avoid recursing here from fts_mail_precache_range() */
+
+	i_assert(!ft->indexing);
+	T_BEGIN {
 		struct event_reason *reason =
 			event_reason_begin("fts:index");
 		ft->indexing = TRUE;