[dovecot-cvs] dovecot/src/lib-index/mbox mbox-rebuild.c,1.18,1.19 mbox-rewrite.c,1.35,1.36 mbox-sync.c,1.17,1.18

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index/mbox
In directory danu:/tmp/cvs-serv709/lib-index/mbox

Modified Files:
	mbox-rebuild.c mbox-rewrite.c mbox-sync.c 
Log Message:
mbox locking fixes



Index: mbox-rebuild.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-rebuild.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mbox-rebuild.c	27 Oct 2002 06:37:18 -0000	1.18
+++ mbox-rebuild.c	2 Nov 2002 22:47:33 -0000	1.19
@@ -49,7 +49,6 @@
 
 	mbox_skip_empty_lines(inbuf);
 	failed = !mbox_index_append(index, inbuf);
-	(void)mbox_unlock(index);
 
 	i_buffer_unref(inbuf);
 

Index: mbox-rewrite.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-rewrite.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- mbox-rewrite.c	2 Nov 2002 20:10:20 -0000	1.35
+++ mbox-rewrite.c	2 Nov 2002 22:47:33 -0000	1.36
@@ -448,8 +448,7 @@
 	} while (0);
 
 	if (!rewrite) {
-		(void)mbox_unlock(index);
-		if (!index->set_lock(index, MAIL_LOCK_EXCLUSIVE))
+		if (!index->set_lock(index, MAIL_LOCK_UNLOCK))
 			failed = TRUE;
 		if (inbuf != NULL)
 			i_buffer_unref(inbuf);
@@ -575,7 +574,6 @@
 	if (!index->set_lock(index, MAIL_LOCK_UNLOCK))
 		failed = TRUE;
 
-	(void)mbox_unlock(index);
 	(void)unlink(path);
 
 	if (close(tmp_fd) < 0)

Index: mbox-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-sync.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mbox-sync.c	2 Nov 2002 20:10:21 -0000	1.17
+++ mbox-sync.c	2 Nov 2002 22:47:33 -0000	1.18
@@ -125,9 +125,6 @@
 	if (lock_type != MAIL_LOCK_UNLOCK) {
 		if (!mbox_lock(index, lock_type))
 			return FALSE;
-	} else {
-		if (!mbox_unlock(index))
-			return FALSE;
 	}
 
 	return TRUE;