dovecot-2.2: maildir: Reverted most of changeset c92ebbedc6f9.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/422d165d4b8e
changeset: 16374:422d165d4b8e
user:      Timo Sirainen <tss at iki.fi>
date:      Mon May 20 01:39:52 2013 +0300
description:
maildir: Reverted most of changeset c92ebbedc6f9.
If dovecot-uidlist file is recreated, it gets a new inode number, and we
should recognize by that alone that it has changed. More importantly this
forced re-reading of dovecot-uidlist clears out the RACING flag, making it
impossible to handle reappearing maildir files.

diffstat:

 src/lib-storage/index/maildir/maildir-uidlist.c |  9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diffs (33 lines):

diff -r 35871cb142df -r 422d165d4b8e src/lib-storage/index/maildir/maildir-uidlist.c
--- a/src/lib-storage/index/maildir/maildir-uidlist.c	Sun May 19 23:42:29 2013 +0300
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c	Mon May 20 01:39:52 2013 +0300
@@ -100,7 +100,6 @@
 	unsigned int unsorted:1;
 	unsigned int have_mailbox_guid:1;
 	unsigned int opened_readonly:1;
-	unsigned int reread:1;
 };
 
 struct maildir_uidlist_sync_ctx {
@@ -878,11 +877,6 @@
 		*recreated_r = TRUE;
 		return 1;
 	}
-	if (uidlist->reread) {
-		uidlist->reread = FALSE;
-		*recreated_r = TRUE;
-		return 1;
-	}
 
 	if (st.st_ino != uidlist->fd_ino ||
 	    !CMP_DEV_T(st.st_dev, uidlist->fd_dev)) {
@@ -2075,9 +2069,6 @@
 	rec = hash_table_lookup(uidlist->files, filename);
 	i_assert(rec != NULL);
 
-	if ((flags & MAILDIR_UIDLIST_REC_FLAG_RACING) != 0)
-		uidlist->reread = TRUE;
-
 	rec->flags |= flags;
 }