[dovecot-cvs] dovecot/src/lib file-dotlock.c,1.35.2.2,1.35.2.3

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	file-dotlock.c 
Log Message:
Using file_dotlock_touch() caused Dovecot to think the dotlock had been
modified by someone else.



Index: file-dotlock.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib/file-dotlock.c,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -d -r1.35.2.2 -r1.35.2.3
--- file-dotlock.c	11 May 2006 11:47:53 -0000	1.35.2.2
+++ file-dotlock.c	8 Jun 2006 16:13:46 -0000	1.35.2.3
@@ -31,7 +31,7 @@
 	char *lock_path;
 	int fd;
 
-	time_t lock_time, lock_update_mtime;
+	time_t lock_time;
 };
 
 struct file_change_info {
@@ -448,7 +448,6 @@
 			dotlock->path = i_strdup(path);
 			dotlock->fd = lock_info.fd;
                         dotlock->lock_time = now;
-                        dotlock->lock_update_mtime = now;
 			lock_info.fd = -1;
 		}
 	}
@@ -681,10 +680,10 @@
 	const char *lock_path;
 	int ret = 0;
 
-	if (dotlock->lock_update_mtime == now)
+	if (dotlock->mtime == now)
 		return 0;
 
-	dotlock->lock_update_mtime = now;
+	dotlock->mtime = now;
 	buf.actime = buf.modtime = now;
 
 	t_push();