From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 5 Oct 2022 12:15:17 +0000 (+0300)
Subject: lib-storage: LAYOUT=index rebuild - Remove useless check for LAYOUT=index
X-Git-Tag: 2.3.20~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5b41c5410a6c576ef01b87c3574d22b7186afb8;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: LAYOUT=index rebuild - Remove useless check for LAYOUT=index

This is already done when collecting namespaces.

Simplifies next change.
---

diff --git a/src/lib-storage/list/mail-storage-list-index-rebuild.c b/src/lib-storage/list/mail-storage-list-index-rebuild.c
index 0c8f59fba2..05c5d672a2 100644
--- a/src/lib-storage/list/mail-storage-list-index-rebuild.c
+++ b/src/lib-storage/list/mail-storage-list-index-rebuild.c
@@ -436,20 +436,16 @@ static int mail_storage_list_index_rebuild_int(struct mail_storage *storage)
 		return 0;
 	}
 
-	/* Only perform this for INDEX layout */
-	if (strcmp(ctx.first_list->name, MAILBOX_LIST_NAME_INDEX) == 0) {
-		/* do this operation while keeping mailbox list index locked.
-		   this avoids race conditions between other list rebuilds and also
-		   makes sure that other processes creating/deleting mailboxes can't
-		   cause confusion with race conditions. */
-		struct event_reason *reason =
-			event_reason_begin("storage:mailbox_list_rebuild");
-		if ((ret = mail_storage_list_index_rebuild_lock_lists(&ctx)) == 0)
-			ret = mail_storage_list_index_rebuild_ctx(&ctx);
-		mail_storage_list_index_rebuild_unlock_lists(&ctx);
-		event_reason_end(&reason);
-	} else
-		ret = 0;
+	/* do this operation while keeping mailbox list index locked.
+	   this avoids race conditions between other list rebuilds and also
+	   makes sure that other processes creating/deleting mailboxes can't
+	   cause confusion with race conditions. */
+	struct event_reason *reason =
+		event_reason_begin("storage:mailbox_list_rebuild");
+	if ((ret = mail_storage_list_index_rebuild_lock_lists(&ctx)) == 0)
+		ret = mail_storage_list_index_rebuild_ctx(&ctx);
+	mail_storage_list_index_rebuild_unlock_lists(&ctx);
+	event_reason_end(&reason);
 
 	hash_table_destroy(&ctx.mailboxes);
 	pool_unref(&ctx.pool);