[dovecot-cvs] dovecot/src/lib-storage/index index-storage.c, 1.85.2.9, 1.85.2.10

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	index-storage.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-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-storage.c,v
retrieving revision 1.85.2.9
retrieving revision 1.85.2.10
diff -u -d -r1.85.2.9 -r1.85.2.10
--- index-storage.c	15 Mar 2007 14:31:14 -0000	1.85.2.9
+++ index-storage.c	16 May 2007 15:14:14 -0000	1.85.2.10
@@ -334,12 +334,10 @@
 
 	if (!move_to_memory)
 		index_flags |= MAIL_INDEX_OPEN_FLAG_CREATE;
-	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 ((storage->flags & MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL) != 0)
 		index_flags |= MAIL_INDEX_OPEN_FLAG_DOTLOCK_USE_EXCL;