fixes for fcntl_locks_disable = yes

--HG--
branch : HEAD

diff --git a/src/lib-index/mail-index-lock.c b/src/lib-index/mail-index-lock.c
index e9f5283b2834afa157727b7c05c87958c2a61f70..6cf2d5019d9b3b5e309a0323700aadc3408c9371 100644 (file)
--- a/src/lib-index/mail-index-lock.c
+++ b/src/lib-index/mail-index-lock.c
@@ -368,6 +368,7 @@ static void mail_index_excl_unlock_finish(struct mail_index *index)
        if (index->map != NULL && index->map->write_to_disk) {
                i_assert(index->log_locked);
 
+                index->map->write_to_disk = FALSE;
                if (index->copy_lock_path != NULL) {
                        /* new mapping replaces the old */
                        (void)unlink(index->copy_lock_path);

diff --git a/src/lib-index/mail-index-sync-update.c b/src/lib-index/mail-index-sync-update.c
index 9f460acceb3907a216f3086864d35bfecee4c149..dc987920ad9669b9e20750fcf197849d300bf65b 100644 (file)
--- a/src/lib-index/mail-index-sync-update.c
+++ b/src/lib-index/mail-index-sync-update.c
@@ -171,7 +171,7 @@ int mail_index_sync_update_index(struct mail_index_sync_ctx *sync_ctx,
                                 uint32_t sync_stamp, uint64_t sync_size)
 {
        struct mail_index *index = sync_ctx->index;
-       struct mail_index_map *map = index->map;
+       struct mail_index_map *map;
         struct mail_index_update_ctx ctx;
        struct mail_index_sync_rec rec;
        const struct mail_index_record *appends;
@@ -217,6 +217,7 @@ int mail_index_sync_update_index(struct mail_index_sync_ctx *sync_ctx,
        if (mail_index_lock_exclusive(index, &lock_id) < 0)
                return -1;
 
+       map = index->map;
        if (MAIL_INDEX_MAP_IS_IN_MEMORY(map))
                map->write_to_disk = TRUE;