From: Timo Sirainen Date: Tue, 2 Feb 2021 14:02:58 +0000 (+0200) Subject: lib-index: Rename mail_transaction_log_file.lock_created to lock_create_time X-Git-Tag: 2.3.16~274 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f309a14f3da0eab8a60e1453979a8bbf5b23bdf8;p=thirdparty%2Fdovecot%2Fcore.git lib-index: Rename mail_transaction_log_file.lock_created to lock_create_time --- diff --git a/src/lib-index/mail-transaction-log-file.c b/src/lib-index/mail-transaction-log-file.c index 1ac8e9c1a0..3e66d7e00a 100644 --- a/src/lib-index/mail-transaction-log-file.c +++ b/src/lib-index/mail-transaction-log-file.c @@ -319,7 +319,7 @@ mail_transaction_log_file_dotlock(struct mail_transaction_log_file *file) if (ret > 0) { file->log->dotlock_refcount++; file->locked = TRUE; - file->lock_created = time(NULL); + file->lock_create_time = time(NULL); return 0; } if (ret < 0) { @@ -389,7 +389,7 @@ int mail_transaction_log_file_lock(struct mail_transaction_log_file *file) &file->file_lock); if (ret > 0) { file->locked = TRUE; - file->lock_created = time(NULL); + file->lock_create_time = time(NULL); return 0; } if (ret < 0) { @@ -419,7 +419,7 @@ void mail_transaction_log_file_unlock(struct mail_transaction_log_file *file, if (MAIL_TRANSACTION_LOG_FILE_IN_MEMORY(file)) return; - lock_time = time(NULL) - file->lock_created; + lock_time = time(NULL) - file->lock_create_time; if (lock_time >= MAIL_TRANSACTION_LOG_LOCK_WARN_SECS && lock_reason != NULL) { i_warning("Transaction log file %s was locked for %u seconds (%s)", file->filepath, lock_time, lock_reason); diff --git a/src/lib-index/mail-transaction-log-private.h b/src/lib-index/mail-transaction-log-private.h index 0803dc471c..bc803bda12 100644 --- a/src/lib-index/mail-transaction-log-private.h +++ b/src/lib-index/mail-transaction-log-private.h @@ -64,7 +64,7 @@ struct mail_transaction_log_file { struct modseq_cache modseq_cache[LOG_FILE_MODSEQ_CACHE_SIZE]; struct file_lock *file_lock; - time_t lock_created; + time_t lock_create_time; bool locked:1; bool locked_sync_offset_updated:1; diff --git a/src/lib-index/mail-transaction-log.c b/src/lib-index/mail-transaction-log.c index b48953c73e..587c3672d9 100644 --- a/src/lib-index/mail-transaction-log.c +++ b/src/lib-index/mail-transaction-log.c @@ -541,7 +541,7 @@ int mail_transaction_log_lock_head(struct mail_transaction_log *log, if (ret == 0 && log->head == file) { /* success */ i_assert(file != NULL); - lock_secs = file->lock_created - lock_wait_started; + lock_secs = file->lock_create_time - lock_wait_started; break; }