Mercurial > dovecot > core-2.2

changeset 10509:50364f04cf13 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Changed mailbox_sync() and mailbox_sync_deinit() APIs. Although we're already in beta stage, this is simple enough of a change that it shouldn't matter much. Having syncing also return status information made the API ugly and the status information wasn't even wanted all that often.
author Timo Sirainen <tss@iki.fi>
date Wed, 16 Dec 2009 19:27:57 -0500
parents c17386a4e594
children 6ee8264b0284
files src/doveadm/doveadm-mail.c src/dsync/dsync-worker-local.c src/imap/cmd-close.c src/imap/cmd-select.c src/imap/imap-status.c src/imap/imap-sync.c src/lda/main.c src/lib-lda/mail-deliver.c src/lib-storage/index/index-storage.h src/lib-storage/index/index-sync.c src/lib-storage/list/index-mailbox-list-sync.c src/lib-storage/mail-storage-private.h src/lib-storage/mail-storage.c src/lib-storage/mail-storage.h src/lib-storage/test-mailbox.c src/lmtp/commands.c src/plugins/expire/expire-tool.c src/plugins/lazy-expunge/lazy-expunge-plugin.c src/plugins/mbox-snarf/mbox-snarf-plugin.c src/plugins/quota/quota-count.c src/plugins/quota/quota-storage.c src/plugins/trash/trash-plugin.c src/plugins/virtual/virtual-sync.c src/pop3/pop3-client.c src/pop3/pop3-commands.c
diffstat 25 files changed, 77 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/doveadm/doveadm-mail.c	Wed Dec 16 19:27:57 2009 -0500
@@ -68,7 +68,7 @@
 	box = mailbox_find_and_open(user, mailbox);
 	storage = mailbox_get_storage(box);
 	if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FORCE_RESYNC |
-			 MAILBOX_SYNC_FLAG_FIX_INCONSISTENT, 0, NULL) < 0) {
+			 MAILBOX_SYNC_FLAG_FIX_INCONSISTENT) < 0) {
 		i_fatal("Forcing a resync on mailbox %s failed: %s", mailbox,
 			mail_storage_get_last_error(storage, NULL));
 	}
--- a/src/dsync/dsync-worker-local.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/dsync/dsync-worker-local.c	Wed Dec 16 19:27:57 2009 -0500
@@ -459,7 +459,7 @@
 	}
 
 	box = mailbox_alloc(info->ns->list, storage_name, NULL, flags);
-	if (mailbox_sync(box, 0, 0, NULL) < 0) {
+	if (mailbox_sync(box, 0) < 0) {
 		struct mail_storage *storage = mailbox_get_storage(box);
 
 		i_error("Failed to sync mailbox %s: %s", info->name,
@@ -653,7 +653,7 @@
 	}
 
 	box = mailbox_alloc(lbox->ns->list, lbox->storage_name, NULL, flags);
-	if (mailbox_sync(box, 0, 0, NULL) < 0) {
+	if (mailbox_sync(box, 0) < 0) {
 		struct mail_storage *storage = mailbox_get_storage(box);
 
 		i_error("Failed to sync mailbox %s: %s", lbox->storage_name,
@@ -1148,8 +1148,7 @@
 	array_clear(&worker->saved_uids);
 
 	if (mailbox_transaction_commit(&trans) < 0 ||
-	    mailbox_sync(worker->selected_box,
-			 MAILBOX_SYNC_FLAG_FULL_WRITE, 0, NULL) < 0)
+	    mailbox_sync(worker->selected_box, MAILBOX_SYNC_FLAG_FULL_WRITE) < 0)
 		dsync_worker_set_failure(&worker->worker);
 
 	mailbox_close(&worker->selected_box);
--- a/src/imap/cmd-close.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/imap/cmd-close.c	Wed Dec 16 19:27:57 2009 -0500
@@ -20,7 +20,7 @@
 	storage = mailbox_get_storage(mailbox);
 	if ((ret = imap_expunge(mailbox, NULL)) < 0)
 		client_send_untagged_storage_error(client, storage);
-	if (mailbox_sync(mailbox, 0, 0, NULL) < 0)
+	if (mailbox_sync(mailbox, 0) < 0)
 		client_send_untagged_storage_error(client, storage);
 
 	mailbox_close(&mailbox);
--- a/src/imap/cmd-select.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/imap/cmd-select.c	Wed Dec 16 19:27:57 2009 -0500
@@ -277,15 +277,15 @@
 
 	if (client->enabled_features != 0)
 		mailbox_enable(ctx->box, client->enabled_features);
-	if (mailbox_sync(ctx->box, MAILBOX_SYNC_FLAG_FULL_READ,
-			 STATUS_MESSAGES | STATUS_RECENT |
-			 STATUS_FIRST_UNSEEN_SEQ | STATUS_UIDVALIDITY |
-			 STATUS_UIDNEXT | STATUS_KEYWORDS |
-			 STATUS_HIGHESTMODSEQ, &status) < 0) {
+	if (mailbox_sync(ctx->box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
 		client_send_storage_error(ctx->cmd,
 					  mailbox_get_storage(ctx->box));
 		return -1;
 	}
+	mailbox_get_status(ctx->box, STATUS_MESSAGES | STATUS_RECENT |
+			   STATUS_FIRST_UNSEEN_SEQ | STATUS_UIDVALIDITY |
+			   STATUS_UIDNEXT | STATUS_KEYWORDS |
+			   STATUS_HIGHESTMODSEQ, &status);
 
 	client->mailbox = ctx->box;
 	client->select_counter++;
--- a/src/imap/imap-status.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/imap/imap-status.c	Wed Dec 16 19:27:57 2009 -0500
@@ -75,9 +75,12 @@
 	if (client->enabled_features != 0)
 		mailbox_enable(box, client->enabled_features);
 
-	ret = mailbox_sync(box, 0, items, status_r);
-	if (ret < 0) {
+	ret = mailbox_sync(box, 0);
+	if (ret == 0)
+		mailbox_get_status(box, items, status_r);
+	else {
 		struct mail_storage *storage = mailbox_get_storage(box);
+
 		*error_r = mail_storage_get_last_error(storage, &error);
 		*error_r = imap_get_error_string(cmd, *error_r, error);
 	}
--- a/src/imap/imap-sync.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/imap/imap-sync.c	Wed Dec 16 19:27:57 2009 -0500
@@ -162,18 +162,19 @@
 static void
 imap_sync_send_highestmodseq(struct imap_sync_context *ctx,
 			     const struct mailbox_status *status,
+			     const struct mailbox_sync_status *sync_status,
 			     struct client_command_context *sync_cmd)
 {
 	struct client *client = ctx->client;
 	uint64_t send_modseq = 0;
 
-	if (status->sync_delayed_expunges &&
+	if (sync_status->sync_delayed_expunges &&
 	    client->highest_fetch_modseq > client->sync_last_full_modseq) {
 		/* if client updates highest-modseq using returned MODSEQs
 		   it loses expunges. try to avoid this by sending it a lower
 		   pre-expunge HIGHESTMODSEQ reply. */
 		send_modseq = client->sync_last_full_modseq;
-	} else if (!status->sync_delayed_expunges &&
+	} else if (!sync_status->sync_delayed_expunges &&
 		   status->highest_modseq > client->sync_last_full_modseq &&
 		   status->highest_modseq > client->highest_fetch_modseq) {
 		/* we've probably sent some VANISHED or EXISTS replies which
@@ -199,7 +200,7 @@
 			(unsigned long long)send_modseq));
 	}
 
-	if (!status->sync_delayed_expunges) {
+	if (!sync_status->sync_delayed_expunges) {
 		/* no delayed expunges, remember this for future */
 		client->sync_last_full_modseq = status->highest_modseq;
 	}
@@ -211,21 +212,23 @@
 {
 	struct client *client = ctx->client;
 	struct mailbox_status status;
+	struct mailbox_sync_status sync_status;
 	int ret;
 
 	mail_free(&ctx->mail);
 	if (array_is_created(&ctx->expunges))
 		array_free(&ctx->expunges);
 
-	if (mailbox_sync_deinit(&ctx->sync_ctx, STATUS_UIDVALIDITY |
-				STATUS_MESSAGES | STATUS_RECENT |
-				STATUS_HIGHESTMODSEQ, &status) < 0 ||
+	if (mailbox_sync_deinit(&ctx->sync_ctx, &sync_status) < 0 ||
 	    ctx->failed) {
 		mailbox_transaction_rollback(&ctx->t);
 		array_free(&ctx->tmp_keywords);
 		i_free(ctx);
 		return -1;
 	}
+	mailbox_get_status(ctx->box, STATUS_UIDVALIDITY |
+			   STATUS_MESSAGES | STATUS_RECENT |
+			   STATUS_HIGHESTMODSEQ, &status);
 
 	ret = mailbox_transaction_commit(&ctx->t);
 
@@ -253,8 +256,10 @@
 	   now it contains added/removed messages. */
 	imap_sync_send_search_updates(ctx);
 
-	if ((client->enabled_features & MAILBOX_FEATURE_QRESYNC) != 0)
-		imap_sync_send_highestmodseq(ctx, &status, sync_cmd);
+	if ((client->enabled_features & MAILBOX_FEATURE_QRESYNC) != 0) {
+		imap_sync_send_highestmodseq(ctx, &status, &sync_status,
+					     sync_cmd);
+	}
 
 	if (array_is_created(&ctx->search_removes)) {
 		array_free(&ctx->search_removes);
--- a/src/lda/main.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lda/main.c	Wed Dec 16 19:27:57 2009 -0500
@@ -416,7 +416,7 @@
 		i_fatal("Can't open delivery mail as raw: %s",
 			mail_storage_get_last_error(box->storage, &error));
 	}
-	if (mailbox_sync(box, 0, 0, NULL) < 0) {
+	if (mailbox_sync(box, 0) < 0) {
 		i_fatal("Can't sync delivery mail: %s",
 			mail_storage_get_last_error(box->storage, &error));
 	}
--- a/src/lib-lda/mail-deliver.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-lda/mail-deliver.c	Wed Dec 16 19:27:57 2009 -0500
@@ -129,8 +129,7 @@
 	}
 
 	/* and try opening again */
-	if (mailbox_open(box) < 0 ||
-	    mailbox_sync(box, 0, 0, NULL) < 0) {
+	if (mailbox_sync(box, 0) < 0) {
 		*error_r = mail_storage_get_last_error(storage, &error);
 		mailbox_close(&box);
 		return NULL;
@@ -212,7 +211,7 @@
 		ctx->saved_mail = TRUE;
 		mail_deliver_log(ctx, "saved mail to %s", mailbox_name);
 
-		if (ctx->save_dest_mail && mailbox_sync(box, 0, 0, NULL) == 0) {
+		if (ctx->save_dest_mail && mailbox_sync(box, 0) == 0) {
 			range = array_idx(&changes.saved_uids, 0);
 			i_assert(range[0].seq1 == range[0].seq2);
 
--- a/src/lib-storage/index/index-storage.h	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-storage/index/index-storage.h	Wed Dec 16 19:27:57 2009 -0500
@@ -122,8 +122,7 @@
 bool index_mailbox_sync_next(struct mailbox_sync_context *ctx,
 			     struct mailbox_sync_rec *sync_rec_r);
 int index_mailbox_sync_deinit(struct mailbox_sync_context *ctx,
-			      enum mailbox_status_items status_items,
-			      struct mailbox_status *status_r);
+			      struct mailbox_sync_status *status_r);
 
 int index_storage_sync(struct mailbox *box, enum mailbox_sync_flags flags);
 enum mailbox_sync_type index_sync_type_convert(enum mail_index_sync_type type);
--- a/src/lib-storage/index/index-sync.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-storage/index/index-sync.c	Wed Dec 16 19:27:57 2009 -0500
@@ -298,8 +298,7 @@
 }
 
 int index_mailbox_sync_deinit(struct mailbox_sync_context *_ctx,
-			      enum mailbox_status_items status_items,
-			      struct mailbox_status *status_r)
+			      struct mailbox_sync_status *status_r)
 {
 	struct index_mailbox_sync_context *ctx =
 		(struct index_mailbox_sync_context *)_ctx;
@@ -342,10 +341,8 @@
 		}
 	}
 
-	if (ret == 0 && status_items != 0) {
-		mailbox_get_status(_ctx->box, status_items, status_r);
+	if (status_r != NULL)
 		status_r->sync_delayed_expunges = delayed_expunges;
-	}
 
 	index_sync_search_results_update(ctx);
 
--- a/src/lib-storage/list/index-mailbox-list-sync.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-storage/list/index-mailbox-list-sync.c	Wed Dec 16 19:27:57 2009 -0500
@@ -306,22 +306,18 @@
 }
 
 static int index_list_sync_deinit(struct mailbox_sync_context *ctx,
-				  enum mailbox_status_items status_items,
-				  struct mailbox_status *status_r)
+				  struct mailbox_sync_status *status_r)
 {
 	struct mailbox *box = ctx->box;
 	struct index_list_mailbox *ibox = INDEX_LIST_STORAGE_CONTEXT(box);
 	struct index_mailbox_list *ilist;
 	struct mail_index_view *view;
-	struct mailbox_status tmp_status, *status;
+	struct mailbox_status status;
 	uint32_t uid, seq;
 
 	if (!box->opened) {
 		/* nothing synced. just return the status. */
 		i_free(ctx);
-
-		if (status_items != 0)
-			index_list_get_status(box, status_items, status_r);
 		return 0;
 	}
 
@@ -329,16 +325,10 @@
 
 	if (ilist == NULL) {
 		/* indexing disabled */
-		return ibox->module_ctx.super.
-			sync_deinit(ctx, status_items, status_r);
+		return ibox->module_ctx.super.sync_deinit(ctx, status_r);
 	}
 
-	/* if status_items == 0, the status_r may be NULL. we really want to
-	   know the status anyway, so save it elsewhere then */
-	status = status_items == 0 ? &tmp_status : status_r;
-	status_items |= CACHED_STATUS_ITEMS;
-
-	if (ibox->module_ctx.super.sync_deinit(ctx, status_items, status) < 0)
+	if (ibox->module_ctx.super.sync_deinit(ctx, status_r) < 0)
 		return -1;
 	ctx = NULL;
 
@@ -349,8 +339,10 @@
 	}
 
 	view = mail_index_view_open(ilist->mail_index);
-	if (mail_index_lookup_seq(view, uid, &seq))
-		(void)index_list_update(ilist, box, view, seq, status);
+	if (mail_index_lookup_seq(view, uid, &seq)) {
+		mailbox_get_status(box, CACHED_STATUS_ITEMS, &status);
+		(void)index_list_update(ilist, box, view, seq, &status);
+	}
 	mail_index_view_close(&view);
 	return 0;
 }
--- a/src/lib-storage/mail-storage-private.h	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-storage/mail-storage-private.h	Wed Dec 16 19:27:57 2009 -0500
@@ -116,8 +116,7 @@
 	bool (*sync_next)(struct mailbox_sync_context *ctx,
 			  struct mailbox_sync_rec *sync_rec_r);
 	int (*sync_deinit)(struct mailbox_sync_context *ctx,
-			   enum mailbox_status_items status_items,
-			   struct mailbox_status *status_r);
+			   struct mailbox_sync_status *status_r);
 
 	/* Called once for each expunge. Called one or more times for
 	   flag/keyword changes. Once the sync is finished, called with
--- a/src/lib-storage/mail-storage.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-storage/mail-storage.c	Wed Dec 16 19:27:57 2009 -0500
@@ -616,20 +616,20 @@
 }
 
 int mailbox_sync_deinit(struct mailbox_sync_context **_ctx,
-			enum mailbox_status_items status_items,
-			struct mailbox_status *status_r)
+			struct mailbox_sync_status *status_r)
 {
 	struct mailbox_sync_context *ctx = *_ctx;
 
 	*_ctx = NULL;
-	return ctx->box->v.sync_deinit(ctx, status_items, status_r);
+
+	memset(status_r, 0, sizeof(*status_r));
+	return ctx->box->v.sync_deinit(ctx, status_r);
 }
 
-int mailbox_sync(struct mailbox *box, enum mailbox_sync_flags flags,
-		 enum mailbox_status_items status_items,
-		 struct mailbox_status *status_r)
+int mailbox_sync(struct mailbox *box, enum mailbox_sync_flags flags)
 {
 	struct mailbox_sync_context *ctx;
+	struct mailbox_sync_status status;
 
 	if (array_count(&box->search_results) == 0) {
 		/* we don't care about mailbox's current state, so we might
@@ -638,7 +638,7 @@
 	}
 
 	ctx = mailbox_sync_init(box, flags);
-	return mailbox_sync_deinit(&ctx, status_items, status_r);
+	return mailbox_sync_deinit(&ctx, &status);
 }
 
 #undef mailbox_notify_changes
--- a/src/lib-storage/mail-storage.h	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-storage/mail-storage.h	Wed Dec 16 19:27:57 2009 -0500
@@ -187,8 +187,6 @@
 	/* Fields that have "temp" or "yes" caching decision. */
 	const ARRAY_TYPE(const_string) *cache_fields;
 
-	/* There are expunges that haven't been synced yet */
-	unsigned int sync_delayed_expunges:1;
 	/* Modseqs aren't permanent (index is in memory) */
 	unsigned int nonpermanent_modseqs:1;
 };
@@ -221,6 +219,10 @@
 	uint32_t seq1, seq2;
 	enum mailbox_sync_type type;
 };
+struct mailbox_sync_status {
+	/* There are expunges that haven't been synced yet */
+	unsigned int sync_delayed_expunges:1;
+};
 
 struct mailbox_expunge_rec {
 	/* IMAP UID */
@@ -381,13 +383,10 @@
 bool mailbox_sync_next(struct mailbox_sync_context *ctx,
 		       struct mailbox_sync_rec *sync_rec_r);
 int mailbox_sync_deinit(struct mailbox_sync_context **ctx,
-			enum mailbox_status_items status_items,
-			struct mailbox_status *status_r);
+			struct mailbox_sync_status *status_r);
 /* One-step mailbox synchronization. Use this if you don't care about
    changes. */
-int mailbox_sync(struct mailbox *box, enum mailbox_sync_flags flags,
-		 enum mailbox_status_items status_items,
-		 struct mailbox_status *status_r);
+int mailbox_sync(struct mailbox *box, enum mailbox_sync_flags flags);
 
 /* Call given callback function when something changes in the mailbox. */
 void mailbox_notify_changes(struct mailbox *box, unsigned int min_interval,
--- a/src/lib-storage/test-mailbox.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lib-storage/test-mailbox.c	Wed Dec 16 19:27:57 2009 -0500
@@ -81,10 +81,10 @@
 
 static int
 test_mailbox_sync_deinit(struct mailbox_sync_context *ctx,
-			 enum mailbox_status_items status_items,
-			 struct mailbox_status *status_r)
+			 struct mailbox_sync_status *status_r)
 {
-	test_mailbox_get_status(ctx->box, status_items, status_r);
+	if (status_r != NULL)
+		memset(status_r, 0, sizeof(*status_r));
 	i_free(ctx);
 	return 0;
 }
--- a/src/lmtp/commands.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/lmtp/commands.c	Wed Dec 16 19:27:57 2009 -0500
@@ -572,8 +572,7 @@
 		mailbox_alloc(client->raw_mail_user->namespaces->list,
 			      "Dovecot Delivery Mail", input,
 			      MAILBOX_FLAG_NO_INDEX_FILES);
-	if (mailbox_open(box) < 0 ||
-	    mailbox_sync(box, 0, 0, NULL) < 0) {
+	if (mailbox_sync(box, 0) < 0) {
 		i_error("Can't open delivery mail as raw: %s",
 			mail_storage_get_last_error(box->storage, &error));
 		mailbox_close(&box);
--- a/src/plugins/expire/expire-tool.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/plugins/expire/expire-tool.c	Wed Dec 16 19:27:57 2009 -0500
@@ -182,7 +182,7 @@
 		mailbox_transaction_rollback(&t);
 	}
 
-	if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FAST, 0, NULL) < 0)
+	if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FAST) < 0)
 		ret = -1;
 
 	mailbox_close(&box);
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Wed Dec 16 19:27:57 2009 -0500
@@ -133,7 +133,7 @@
 			lt->failed = TRUE;
 			return;
 		}
-		if (mailbox_sync(lt->dest_box, 0, 0, NULL) < 0) {
+		if (mailbox_sync(lt->dest_box, 0) < 0) {
 			mail_storage_set_critical(_mail->box->storage,
 				"lazy_expunge: Couldn't sync expunge mailbox");
 			mailbox_close(&lt->dest_box);
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Wed Dec 16 19:27:57 2009 -0500
@@ -41,7 +41,7 @@
 	enum mail_error error;
 	int ret;
 
-	if (mailbox_sync(srcbox, MAILBOX_SYNC_FLAG_FULL_READ, 0, NULL) < 0)
+	if (mailbox_sync(srcbox, MAILBOX_SYNC_FLAG_FULL_READ) < 0)
 		return -1;
 
 	src_trans = mailbox_transaction_begin(srcbox, 0);
@@ -92,7 +92,7 @@
 			ret = -1;
 	}
 	if (ret == 0) {
-		if (mailbox_sync(srcbox, 0, 0, NULL) < 0)
+		if (mailbox_sync(srcbox, 0) < 0)
 			ret = -1;
 	}
 	return ret;
--- a/src/plugins/quota/quota-count.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/plugins/quota/quota-count.c	Wed Dec 16 19:27:57 2009 -0500
@@ -38,7 +38,7 @@
 		return 0;
 	}
 
-	if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ, 0, NULL) < 0) {
+	if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
 		mailbox_close(&box);
 		return -1;
 	}
--- a/src/plugins/quota/quota-storage.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/plugins/quota/quota-storage.c	Wed Dec 16 19:27:57 2009 -0500
@@ -318,13 +318,12 @@
 }
 
 static int quota_mailbox_sync_deinit(struct mailbox_sync_context *ctx,
-				     enum mailbox_status_items status_items,
-				     struct mailbox_status *status_r)
+				     struct mailbox_sync_status *status_r)
 {
 	struct quota_mailbox *qbox = QUOTA_CONTEXT(ctx->box);
 	int ret;
 
-	ret = qbox->module_ctx.super.sync_deinit(ctx, status_items, status_r);
+	ret = qbox->module_ctx.super.sync_deinit(ctx, status_r);
 	/* update quota only after syncing is finished. the quota commit may
 	   recalculate the quota and cause all mailboxes to be synced,
 	   including the one we're already syncing. */
@@ -386,7 +385,7 @@
 	struct mail_search_args *search_args;
 	int ret;
 
-	if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ, 0, NULL) < 0)
+	if (mailbox_sync(box, MAILBOX_SYNC_FLAG_FULL_READ) < 0)
 		return -1;
 
 	t = mailbox_transaction_begin(box, 0);
--- a/src/plugins/trash/trash-plugin.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/plugins/trash/trash-plugin.c	Wed Dec 16 19:27:57 2009 -0500
@@ -59,7 +59,7 @@
 		return 0;
 	}
 
-	if (mailbox_sync(trash->box, MAILBOX_SYNC_FLAG_FULL_READ, 0, NULL) < 0)
+	if (mailbox_sync(trash->box, MAILBOX_SYNC_FLAG_FULL_READ) < 0)
 		return -1;
 
 	trash->trans = mailbox_transaction_begin(trash->box, 0);
--- a/src/plugins/virtual/virtual-sync.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/plugins/virtual/virtual-sync.c	Wed Dec 16 19:27:57 2009 -0500
@@ -935,6 +935,7 @@
 	struct mailbox_sync_context *sync_ctx;
 	const struct virtual_backend_uidmap *uidmap;
 	struct mailbox_sync_rec sync_rec;
+	struct mailbox_sync_status sync_status;
 	unsigned int idx1, idx2;
 	uint32_t vseq, vuid;
 
@@ -971,7 +972,7 @@
 			break;
 		}
 	}
-	return mailbox_sync_deinit(&sync_ctx, 0, NULL);
+	return mailbox_sync_deinit(&sync_ctx, &sync_status);
 }
 
 static void virtual_sync_backend_ext_header(struct virtual_sync_context *ctx,
@@ -1043,10 +1044,10 @@
 		/* first sync in this process */
 		i_assert(ctx->expunge_removed);
 
-		if (mailbox_sync(bbox->box, sync_flags, STATUS_UIDVALIDITY,
-				 &status) < 0)
+		if (mailbox_sync(bbox->box, sync_flags) < 0)
 			return -1;
 
+		mailbox_get_status(bbox->box, STATUS_UIDVALIDITY, &status);
 		virtual_backend_box_sync_mail_set(bbox);
 		if (status.uidvalidity != bbox->sync_uid_validity) {
 			/* UID validity changed since last sync (or this is
--- a/src/pop3/pop3-client.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/pop3/pop3-client.c	Wed Dec 16 19:27:57 2009 -0500
@@ -84,11 +84,12 @@
 
 	for (i = 0; i < 2; i++) {
 		expunged = FALSE;
-		if (mailbox_sync(client->mailbox, MAILBOX_SYNC_FLAG_FULL_READ,
-				 STATUS_UIDVALIDITY, &status) < 0) {
+		if (mailbox_sync(client->mailbox,
+				 MAILBOX_SYNC_FLAG_FULL_READ) < 0) {
 			client_send_storage_error(client);
 			break;
 		}
+		mailbox_get_status(client->mailbox, STATUS_UIDVALIDITY, &status);
 		client->uid_validity = status.uidvalidity;
 
 		t = mailbox_transaction_begin(client->mailbox, 0);
--- a/src/pop3/pop3-commands.c	Wed Dec 16 18:18:02 2009 -0500
+++ b/src/pop3/pop3-commands.c	Wed Dec 16 19:27:57 2009 -0500
@@ -243,8 +243,7 @@
 	}
 
 	if (mailbox_transaction_commit(&client->trans) < 0 ||
-	    mailbox_sync(client->mailbox, MAILBOX_SYNC_FLAG_FULL_WRITE,
-			 0, NULL) < 0) {
+	    mailbox_sync(client->mailbox, MAILBOX_SYNC_FLAG_FULL_WRITE) < 0) {
 		client_send_storage_error(client);
 		client_disconnect(client, "Storage error during logout.");
 		return 1;