From fa3be6b0d9d9fc0264a8434e17e26ad26c739dae Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 30 Jul 2009 19:42:41 -0400 Subject: [PATCH] mbox: Removed unused MBOX_SYNC_LAST_COMMIT and related code. --HG-- branch : HEAD --- src/lib-storage/index/index-storage.c | 1 - src/lib-storage/index/index-storage.h | 3 --- src/lib-storage/index/index-transaction.c | 6 ------ .../index/maildir/maildir-sync-index.c | 3 --- src/lib-storage/index/mbox/mbox-sync-private.h | 1 - src/lib-storage/index/mbox/mbox-sync.c | 15 ++------------- 6 files changed, 2 insertions(+), 27 deletions(-) diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c index 39ae081222..546918d422 100644 --- a/src/lib-storage/index/index-storage.c +++ b/src/lib-storage/index/index-storage.c @@ -485,7 +485,6 @@ void index_storage_mailbox_alloc(struct index_mailbox *ibox, const char *name, mail_storage_settings_to_index_flags(box->storage->set); ibox->next_lock_notify = time(NULL) + LOCK_NOTIFY_INTERVAL; - ibox->commit_log_file_seq = 0; ibox->index = index_storage_alloc(box->list, name, flags, index_prefix); if (box->file_create_mode == 0) { diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h index 1941f97a88..f075e43dac 100644 --- a/src/lib-storage/index/index-storage.h +++ b/src/lib-storage/index/index-storage.h @@ -34,9 +34,6 @@ struct index_mailbox { time_t next_lock_notify; /* temporary */ enum mailbox_lock_notify_type last_notify_type; - uint32_t commit_log_file_seq; - uoff_t commit_log_file_offset; - const ARRAY_TYPE(keywords) *keyword_names; struct mail_cache_field *cache_fields; diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c index 5c0ec0e332..45ef9f9e4b 100644 --- a/src/lib-storage/index/index-transaction.c +++ b/src/lib-storage/index/index-transaction.c @@ -41,12 +41,6 @@ int index_transaction_finish_commit(struct index_transaction_context *t, ret = t->super.commit(t->trans, log_file_seq_r, log_file_offset_r); if (ret < 0) mail_storage_set_index_error(t->ibox); - else { - if (*log_file_seq_r != 0) { - t->ibox->commit_log_file_seq = *log_file_seq_r; - t->ibox->commit_log_file_offset = *log_file_offset_r; - } - } index_transaction_free(t); return ret; diff --git a/src/lib-storage/index/maildir/maildir-sync-index.c b/src/lib-storage/index/maildir/maildir-sync-index.c index 8ec6741423..d91ada9601 100644 --- a/src/lib-storage/index/maildir/maildir-sync-index.c +++ b/src/lib-storage/index/maildir/maildir-sync-index.c @@ -311,9 +311,6 @@ static int maildir_sync_index_finish(struct maildir_index_sync_context *ctx, if (mail_index_sync_commit(&ctx->sync_ctx) < 0) { mail_storage_set_index_error(&mbox->ibox); ret = -1; - } else { - mbox->ibox.commit_log_file_seq = 0; - mbox->ibox.commit_log_file_offset = 0; } mbox->syncing_commit = FALSE; } diff --git a/src/lib-storage/index/mbox/mbox-sync-private.h b/src/lib-storage/index/mbox/mbox-sync-private.h index ad8dc51656..2cc13bc45f 100644 --- a/src/lib-storage/index/mbox/mbox-sync-private.h +++ b/src/lib-storage/index/mbox/mbox-sync-private.h @@ -7,7 +7,6 @@ #include enum mbox_sync_flags { - MBOX_SYNC_LAST_COMMIT = 0x01, MBOX_SYNC_HEADER = 0x02, MBOX_SYNC_LOCK_READING = 0x04, MBOX_SYNC_UNDIRTY = 0x08, diff --git a/src/lib-storage/index/mbox/mbox-sync.c b/src/lib-storage/index/mbox/mbox-sync.c index c842d89ac7..4988fbc32f 100644 --- a/src/lib-storage/index/mbox/mbox-sync.c +++ b/src/lib-storage/index/mbox/mbox-sync.c @@ -1775,16 +1775,8 @@ again: if ((flags & MBOX_SYNC_REWRITE) != 0) sync_flags |= MAIL_INDEX_SYNC_FLAG_FLUSH_DIRTY; - if ((flags & MBOX_SYNC_LAST_COMMIT) != 0) { - ret = mail_index_sync_begin_to(mbox->ibox.index, - &index_sync_ctx, &sync_view, &trans, - mbox->ibox.commit_log_file_seq, - mbox->ibox.commit_log_file_offset, sync_flags); - } else { - ret = mail_index_sync_begin(mbox->ibox.index, &index_sync_ctx, - &sync_view, &trans, sync_flags); - } - + ret = mail_index_sync_begin(mbox->ibox.index, &index_sync_ctx, + &sync_view, &trans, sync_flags); if (ret <= 0) { if (ret < 0) mail_storage_set_index_error(&mbox->ibox); @@ -1882,9 +1874,6 @@ again: else if (mail_index_sync_commit(&index_sync_ctx) < 0) { mail_storage_set_index_error(&mbox->ibox); ret = -1; - } else { - mbox->ibox.commit_log_file_seq = 0; - mbox->ibox.commit_log_file_offset = 0; } sync_ctx.t = NULL; sync_ctx.index_sync_ctx = NULL; -- 2.47.3