[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-lock.c, 1.16, 1.17

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv19647/mbox

Modified Files:
	mbox-lock.c 
Log Message:
added extra assert for checking deadlocks



Index: mbox-lock.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-lock.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mbox-lock.c	8 Apr 2005 14:32:52 -0000	1.16
+++ mbox-lock.c	22 Jul 2005 10:22:18 -0000	1.17
@@ -1,6 +1,7 @@
 /* Copyright (C) 2002 Timo Sirainen */
 
 #include "lib.h"
+#include "mail-index-private.h"
 #include "mbox-storage.h"
 #include "mbox-file.h"
 #include "mbox-lock.h"
@@ -517,6 +518,9 @@
 	i_assert(lock_type == F_RDLCK || lock_type == F_WRLCK);
 	i_assert(lock_type == F_RDLCK || mbox->mbox_lock_type != F_RDLCK);
 
+	/* mbox must be locked before index */
+	i_assert(mbox->ibox.index->lock_type != F_WRLCK);
+
 	if (mbox->mbox_lock_type == F_UNLCK) {
 		ret = mbox_update_locking(mbox, lock_type);
 		if (ret <= 0)