mdbox: Replace mailbox_set_reason() with reason_code=mdbox:rebuild

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index ba7a0c228d06c47c0942e2e530b1fda1e2fe7e14..4277a1a0d22ae805ff10639d514ac87c6183c6a6 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -556,7 +556,6 @@ rebuild_mailbox(struct mdbox_storage_rebuild_context *ctx,
 
        box = mailbox_alloc(ns->list, vname, MAILBOX_FLAG_READONLY |
                            MAILBOX_FLAG_IGNORE_ACLS);
-       mailbox_set_reason(box, "mdbox rebuild");
        if (box->storage != &ctx->storage->storage.storage) {
                /* the namespace has multiple storages. */
                mailbox_free(&box);
@@ -709,7 +708,6 @@ static int rebuild_restore_msg(struct mdbox_storage_rebuild_context *ctx,
                box = mailbox_alloc(ctx->default_list, mailbox,
                                    MAILBOX_FLAG_READONLY |
                                    MAILBOX_FLAG_IGNORE_ACLS);
-               mailbox_set_reason(box, "mdbox rebuild restore");
                i_assert(box->storage == storage);
                if (mailbox_open(box) == 0)
                        break;
@@ -978,8 +976,11 @@ int mdbox_storage_rebuild_in_context(struct mdbox_storage *storage,
        }
 
        ctx = mdbox_storage_rebuild_init(storage, atomic);
-       if ((ret = mdbox_storage_rebuild_scan_prepare(ctx)) > 0)
+       if ((ret = mdbox_storage_rebuild_scan_prepare(ctx)) > 0) {
+               struct event_reason *reason = event_reason_begin("mdbox:rebuild");
                ret = mdbox_storage_rebuild_scan(ctx);
+               event_reason_end(&reason);
+       }
        mdbox_storage_rebuild_deinit(ctx);
 
        if (ret == 0) {