lib-index: Removed dovecot.index locking related code, which is no longer used.

diff --git a/src/lib-index/mail-index-private.h b/src/lib-index/mail-index-private.h
index 6360791397128bf86a1b28044ff414972dbf0701..7e47c456f8fb9cc7cef96c687149a8e5a81079fe 100644 (file)
--- a/src/lib-index/mail-index-private.h
+++ b/src/lib-index/mail-index-private.h
@@ -202,14 +202,9 @@ struct mail_index {
        /* syncing will update this if non-NULL */
        struct mail_index_transaction_commit_result *sync_commit_result;
 
-       int lock_type;
-       unsigned int lock_id_counter;
        enum file_lock_method lock_method;
        unsigned int max_lock_timeout_secs;
 
-       struct file_lock *file_lock;
-       struct dotlock *dotlock;
-
        pool_t keywords_pool;
        ARRAY_TYPE(keywords) keywords;
        HASH_TABLE(char *, void *) keywords_hash; /* name -> unsigned int idx */

diff --git a/src/lib-index/mail-index.c b/src/lib-index/mail-index.c
index 16b56d2197f2895346e42bcf061b41a833b367b1..bde48b1c0bc43e5f955bd58c71a87d663799dafc 100644 (file)
--- a/src/lib-index/mail-index.c
+++ b/src/lib-index/mail-index.c
@@ -566,9 +566,6 @@ int mail_index_open(struct mail_index *index, enum mail_index_open_flags flags)
                i_strdup("(in-memory index)") :
                i_strconcat(index->dir, "/", index->prefix, NULL);
 
-       index->lock_type = F_UNLCK;
-       index->lock_id_counter = 2;
-
        index->readonly = FALSE;
        index->nodiskspace = FALSE;
        index->index_lock_timeout = FALSE;
@@ -611,17 +608,11 @@ int mail_index_open_or_create(struct mail_index *index,
 
 void mail_index_close_file(struct mail_index *index)
 {
-       if (index->file_lock != NULL)
-               file_lock_free(&index->file_lock);
-
        if (index->fd != -1) {
                if (close(index->fd) < 0)
                        mail_index_set_syscall_error(index, "close()");
                index->fd = -1;
        }
-
-       index->lock_id_counter += 2;
-       index->lock_type = F_UNLCK;
 }
 
 static void mail_index_close_nonopened(struct mail_index *index)
@@ -794,9 +785,6 @@ int mail_index_move_to_memory(struct mail_index *index)
                mail_transaction_log_move_to_memory(index->log);
        }
 
-       if (index->file_lock != NULL)
-               file_lock_free(&index->file_lock);
-
        if (index->fd != -1) {
                if (close(index->fd) < 0)
                        mail_index_set_syscall_error(index, "close()");