dovecot-2.2: lib-index: Removed dovecot.index locking related co...
dovecot at dovecot.org
dovecot at dovecot.org
Thu Oct 9 17:47:04 UTC 2014
details: http://hg.dovecot.org/dovecot-2.2/rev/71c00e501179
changeset: 17931:71c00e501179
user: Timo Sirainen <tss at iki.fi>
date: Thu Oct 09 20:46:31 2014 +0300
description:
lib-index: Removed dovecot.index locking related code, which is no longer used.
diffstat:
src/lib-index/mail-index-private.h | 5 -----
src/lib-index/mail-index.c | 12 ------------
2 files changed, 0 insertions(+), 17 deletions(-)
diffs (59 lines):
diff -r af382aaad0e8 -r 71c00e501179 src/lib-index/mail-index-private.h
--- a/src/lib-index/mail-index-private.h Thu Oct 09 18:41:06 2014 +0300
+++ b/src/lib-index/mail-index-private.h Thu Oct 09 20:46:31 2014 +0300
@@ -202,14 +202,9 @@
/* 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 -r af382aaad0e8 -r 71c00e501179 src/lib-index/mail-index.c
--- a/src/lib-index/mail-index.c Thu Oct 09 18:41:06 2014 +0300
+++ b/src/lib-index/mail-index.c Thu Oct 09 20:46:31 2014 +0300
@@ -566,9 +566,6 @@
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 @@
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 @@
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()");
More information about the dovecot-cvs
mailing list