[dovecot-cvs] dovecot/src/master mail-process.c, 1.123, 1.124 master-settings-defs.c, 1.8, 1.9 master-settings.c, 1.160, 1.161 master-settings.h, 1.97, 1.98

[tss at dovecot.org]

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

Modified Files:
	mail-process.c master-settings-defs.c master-settings.c 
	master-settings.h 
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: mail-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- mail-process.c	3 Apr 2007 05:54:55 -0000	1.123
+++ mail-process.c	16 May 2007 15:25:31 -0000	1.124
@@ -235,8 +235,6 @@
 		env_put("MAIL_SAVE_CRLF=1");
 	if (set->mmap_disable)
 		env_put("MMAP_DISABLE=1");
-	if (set->mmap_no_write)
-		env_put("MMAP_NO_WRITE=1");
 	if (set->dotlock_use_excl)
 		env_put("DOTLOCK_USE_EXCL=1");
 	if (set->fsync_disable)

Index: master-settings-defs.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings-defs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- master-settings-defs.c	3 Apr 2007 05:54:55 -0000	1.8
+++ master-settings-defs.c	16 May 2007 15:25:31 -0000	1.9
@@ -74,7 +74,6 @@
 	DEF_INT(mail_max_keyword_length),
 	DEF_BOOL(mail_save_crlf),
 	DEF_BOOL(mmap_disable),
-	DEF_BOOL(mmap_no_write),
 	DEF_BOOL(dotlock_use_excl),
 	DEF_BOOL(fsync_disable),
 	DEF_BOOL(mailbox_list_index_disable),

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- master-settings.c	3 Apr 2007 05:54:55 -0000	1.160
+++ master-settings.c	16 May 2007 15:25:31 -0000	1.161
@@ -221,11 +221,10 @@
 	MEMBER(mail_full_filesystem_access) FALSE,
 	MEMBER(mail_max_keyword_length) 50,
 	MEMBER(mail_save_crlf) FALSE,
-	MEMBER(mmap_disable) FALSE,
 #ifdef MMAP_CONFLICTS_WRITE
-	MEMBER(mmap_no_write) TRUE,
+	MEMBER(mmap_disable) TRUE,
 #else
-	MEMBER(mmap_no_write) FALSE,
+	MEMBER(mmap_disable) FALSE,
 #endif
 	MEMBER(dotlock_use_excl) FALSE,
 	MEMBER(fsync_disable) FALSE,

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- master-settings.h	3 Apr 2007 05:54:55 -0000	1.97
+++ master-settings.h	16 May 2007 15:25:31 -0000	1.98
@@ -78,7 +78,6 @@
 	unsigned int mail_max_keyword_length;
 	bool mail_save_crlf;
 	bool mmap_disable;
-	bool mmap_no_write;
 	bool dotlock_use_excl;
 	bool fsync_disable;
 	bool mailbox_list_index_disable;