"readonly sync" -> "forced sync"

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/maildir/maildir-storage.h b/src/lib-storage/index/maildir/maildir-storage.h
index 6dfe436476c678acf3468d81468a4b6d5fa96394..7502f45859094498387ff4b5ad47a999aca4a3fd 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.h
+++ b/src/lib-storage/index/maildir/maildir-storage.h
@@ -39,7 +39,7 @@ struct mailbox_list *
 maildir_mailbox_list_next(struct mailbox_list_context *ctx);
 
 int maildir_storage_sync(struct mailbox *box, enum mailbox_sync_flags flags);
-int maildir_storage_sync_readonly(struct index_mailbox *ibox);
+int maildir_storage_sync_force(struct index_mailbox *ibox);
 
 struct mailbox_transaction_context *
 maildir_transaction_begin(struct mailbox *box, int hide);

diff --git a/src/lib-storage/index/maildir/maildir-sync.c b/src/lib-storage/index/maildir/maildir-sync.c
index b71a2022db2564ac58e760d93d3e5568a4dd07c7..6af92a8c8fbc3f7e401d33f2ed41501b035c6cfa 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-sync.c
+++ b/src/lib-storage/index/maildir/maildir-sync.c
@@ -824,15 +824,19 @@ static int maildir_sync_index(struct maildir_sync_context *ctx)
        return ret;
 }
 
-static int maildir_sync_context(struct maildir_sync_context *ctx)
+static int maildir_sync_context(struct maildir_sync_context *ctx, int forced)
 {
        int ret, new_changed, cur_changed;
 
-       if (maildir_sync_quick_check(ctx, &new_changed, &cur_changed) < 0)
-               return -1;
+       if (!forced) {
+               if (maildir_sync_quick_check(ctx, &new_changed, &cur_changed) < 0)
+                       return -1;
 
-       if (!new_changed && !cur_changed)
-               return 0;
+               if (!new_changed && !cur_changed)
+                       return 0;
+       } else {
+               new_changed = cur_changed = TRUE;
+       }
 
        /* we have to lock uidlist immediately, otherwise there's race
           conditions with other processes who might write older maildir
@@ -840,8 +844,14 @@ static int maildir_sync_context(struct maildir_sync_context *ctx)
 
           alternative would be to lock it when new files are found, but
           the directory scans _must_ be restarted then */
-       if ((ret = maildir_uidlist_try_lock(ctx->ibox->uidlist)) <= 0)
+       if ((ret = maildir_uidlist_try_lock(ctx->ibox->uidlist)) < 0)
                return ret;
+       if (ret == 0 && !forced) {
+               /* we didn't get a lock, don't do syncing unless we really
+                  want to check for expunges or renames. new files won't
+                  be added. */
+               return 0;
+       }
 
        ctx->partial = !cur_changed;
        ctx->uidlist_sync_ctx =
@@ -865,32 +875,13 @@ static int maildir_sync_context(struct maildir_sync_context *ctx)
        return ret;
 }
 
-static int maildir_sync_context_readonly(struct maildir_sync_context *ctx)
-{
-       int ret;
-
-       ctx->uidlist_sync_ctx =
-               maildir_uidlist_sync_init(ctx->ibox->uidlist, FALSE);
-
-       if (maildir_scan_dir(ctx, TRUE) < 0)
-               return -1;
-       if (maildir_scan_dir(ctx, FALSE) < 0)
-               return -1;
-
-       maildir_uidlist_sync_finish(ctx->uidlist_sync_ctx);
-       ret = maildir_uidlist_sync_deinit(ctx->uidlist_sync_ctx);
-        ctx->uidlist_sync_ctx = NULL;
-
-       return ret;
-}
-
-int maildir_storage_sync_readonly(struct index_mailbox *ibox)
+int maildir_storage_sync_force(struct index_mailbox *ibox)
 {
         struct maildir_sync_context *ctx;
        int ret;
 
        ctx = maildir_sync_context_new(ibox);
-       ret = maildir_sync_context_readonly(ctx);
+       ret = maildir_sync_context(ctx, TRUE);
        maildir_sync_deinit(ctx);
        return ret;
 }
@@ -906,7 +897,7 @@ int maildir_storage_sync(struct mailbox *box, enum mailbox_sync_flags flags)
                ibox->sync_last_check = ioloop_time;
 
                ctx = maildir_sync_context_new(ibox);
-               ret = maildir_sync_context(ctx);
+               ret = maildir_sync_context(ctx, FALSE);
                maildir_sync_deinit(ctx);
 
                if (ret < 0)

diff --git a/src/lib-storage/index/maildir/maildir-util.c b/src/lib-storage/index/maildir/maildir-util.c
index 312d7ad0ba80b7597752d5421c7f079a25a7b600..aaa9ac5a08cf3f2a5f053ea52a8e87a3d52bf3f5 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-util.c
+++ b/src/lib-storage/index/maildir/maildir-util.c
@@ -49,7 +49,7 @@ int maildir_file_do(struct index_mailbox *ibox, uint32_t uid,
                /* file is either renamed or deleted. sync the maildir and
                   see which one. if file appears to be renamed constantly,
                   don't try to open it more than 10 times. */
-               if (maildir_storage_sync_readonly(ibox) < 0)
+               if (maildir_storage_sync_force(ibox) < 0)
                        return -1;
 
                ret = maildir_file_do_try(ibox, uid, func, context);