[dovecot-cvs] dovecot/src/lib-storage/list index-mailbox-list.c, 1.13, 1.14

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/list
In directory talvi:/tmp/cvs-serv28795/src/lib-storage/list

Modified Files:
	index-mailbox-list.c 
Log Message:
Removed mmap_no_write setting. The only OS requiring it is OpenBSD, so we're
now forcing mmap_disable=yes with it instead. dovecot.index.cache file is
the most important file to mmap(), but since this didn't work with
mmap_no_write, there's not much point in keeping special code paths for
minimal gains.



Index: index-mailbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/list/index-mailbox-list.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- index-mailbox-list.c	13 May 2007 18:07:05 -0000	1.13
+++ index-mailbox-list.c	16 May 2007 15:25:30 -0000	1.14
@@ -414,12 +414,10 @@
 	/* FIXME: a bit ugly way to get the flags, but this will do for now.. */
 	index_flags = MAIL_INDEX_OPEN_FLAG_CREATE;
 	storage_flags = *list->set.mail_storage_flags;
-	if ((storage_flags & MAIL_STORAGE_FLAG_MMAP_DISABLE) != 0)
-		index_flags |= MAIL_INDEX_OPEN_FLAG_MMAP_DISABLE;
 #ifndef MMAP_CONFLICTS_WRITE
-	if ((storage_flags & MAIL_STORAGE_FLAG_MMAP_NO_WRITE) != 0)
+	if ((storage_flags & MAIL_STORAGE_FLAG_MMAP_DISABLE) != 0)
 #endif
-		index_flags |= MAIL_INDEX_OPEN_FLAG_MMAP_NO_WRITE;
+		index_flags |= MAIL_INDEX_OPEN_FLAG_MMAP_DISABLE;
 
 	if (mail_index_open(ilist->mail_index, index_flags,
 			    *list->set.lock_method) < 0) {