From: Aki Tuomi Date: Wed, 24 Jan 2018 12:48:36 +0000 (+0200) Subject: lib-storage: Rename .vsize.lock file to dovecot-vsize.lock X-Git-Tag: 2.3.1~143 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbc6de355f6d8f8b3a8d6fbf27131004443d5e32;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: Rename .vsize.lock file to dovecot-vsize.lock .vsize.lock can break maildir++ because it looks like a maildir folder, so rename it to dovecot-vsize.lock. Introduced in 9963bef6 --- diff --git a/src/lib-storage/index/index-mailbox-size.c b/src/lib-storage/index/index-mailbox-size.c index 272dd531ec..b0400c9e13 100644 --- a/src/lib-storage/index/index-mailbox-size.c +++ b/src/lib-storage/index/index-mailbox-size.c @@ -33,7 +33,7 @@ need to lock vsize updates before sync. */ -#define VSIZE_LOCK_SUFFIX ".vsize.lock" +#define VSIZE_LOCK_SUFFIX "dovecot-vsize.lock" #define VSIZE_UPDATE_MAX_LOCK_SECS 10 #define INDEXER_SOCKET_NAME "indexer" diff --git a/src/plugins/quota/quota-storage.c b/src/plugins/quota/quota-storage.c index cd0c9c5b80..74666f555c 100644 --- a/src/plugins/quota/quota-storage.c +++ b/src/plugins/quota/quota-storage.c @@ -288,7 +288,7 @@ quota_copy(struct mail_save_context *ctx, struct mail *mail) /* we always want to know the mail size */ mail_add_temp_wanted_fields(ctx->dest_mail, MAIL_FETCH_PHYSICAL_SIZE, NULL); - /* get quota before copying any mails. this avoids .vsize.lock + /* get quota before copying any mails. this avoids dovecot-vsize.lock deadlocks with backends that lock mails for expunging/copying. */ enum quota_get_result error_res; const char *error; @@ -355,7 +355,7 @@ quota_save_begin(struct mail_save_context *ctx, struct istream *input) /* we always want to know the mail size */ mail_add_temp_wanted_fields(ctx->dest_mail, MAIL_FETCH_PHYSICAL_SIZE, NULL); - /* get quota before copying any mails. this avoids .vsize.lock + /* get quota before copying any mails. this avoids dovecot-vsize.lock deadlocks with backends that lock mails for expunging/copying. */ enum quota_get_result error_res; if (quota_transaction_set_limits(qt, &error_res, &error) < 0) {