From: Timo Sirainen <tss@iki.fi>
Date: Wed, 16 Sep 2015 01:46:44 +0000 (+0900)
Subject: lib: file_wait_lock_error() assert-crashes now on EDEADLOCK
X-Git-Tag: 2.2.19.rc1~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caa1546576e3b813afc4769bd028629fb1dd2615;p=thirdparty%2Fdovecot%2Fcore.git

lib: file_wait_lock_error() assert-crashes now on EDEADLOCK
It's always a bug and a crash can help debug it.
---

diff --git a/src/lib/file-lock.c b/src/lib/file-lock.c
index 7cf474e477..1ccdbc692a 100644
--- a/src/lib/file-lock.c
+++ b/src/lib/file-lock.c
@@ -292,8 +292,10 @@ int file_wait_lock_error(int fd, const char *path, int lock_type,
 	int ret;
 
 	ret = file_lock_do(fd, path, lock_type, lock_method, timeout_secs, error_r);
-	if (ret <= 0)
+	if (ret <= 0) {
+		i_assert(errno != EDEADLOCK);
 		return ret;
+	}
 
 	lock = i_new(struct file_lock, 1);
 	lock->fd = fd;