[dovecot-cvs] dovecot/src/lib-index mail-index-lock.c, 1.58, 1.59 mail-index.c, 1.251, 1.252

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-index
In directory talvi:/tmp/cvs-serv9460

Modified Files:
	mail-index-lock.c mail-index.c 
Log Message:
Minor locking fix/cleanups.


Index: mail-index-lock.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-index-lock.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- mail-index-lock.c	17 Dec 2006 16:35:32 -0000	1.58
+++ mail-index-lock.c	31 Dec 2006 16:09:42 -0000	1.59
@@ -224,7 +224,6 @@
 	index->lock_type = F_WRLCK;
 
 	if (mail_index_reopen(index, fd) < 0) {
-		i_assert(index->excl_lock_count == 1);
 		(void)close(fd);
 		if (unlink(index->copy_lock_path) < 0) {
 			mail_index_file_set_syscall_error(index,
@@ -235,7 +234,6 @@
 		index->copy_lock_path = NULL;
 
 		index->lock_type = old_lock_type;
-		index->excl_lock_count = 0;
 		return -1;
 	}
 

Index: mail-index.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-index.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- mail-index.c	28 Dec 2006 16:28:29 -0000	1.251
+++ mail-index.c	31 Dec 2006 16:09:42 -0000	1.252
@@ -1664,7 +1664,6 @@
 		index->fd = fd;
 		ret = 0;
 	} else {
-		i_assert(index->excl_lock_count == 0);
 		ret = mail_index_try_open_only(index);
 		if (ret > 0)
 			ret = mail_index_lock_shared(index, FALSE, &lock_id);