[dovecot-cvs] dovecot/src/master mail-process.c, 1.96.2.23, 1.96.2.24 master-settings-defs.c, 1.1.2.5, 1.1.2.6 master-settings.c, 1.125.2.29, 1.125.2.30 master-settings.h, 1.83.2.11, 1.83.2.12

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	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.96.2.23
retrieving revision 1.96.2.24
diff -u -d -r1.96.2.23 -r1.96.2.24
--- mail-process.c	28 Mar 2007 20:06:35 -0000	1.96.2.23
+++ mail-process.c	16 May 2007 15:14:17 -0000	1.96.2.24
@@ -237,8 +237,6 @@
 		env_put("MAIL_READ_MMAPED=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.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- master-settings-defs.c	10 Mar 2007 20:58:45 -0000	1.1.2.5
+++ master-settings-defs.c	16 May 2007 15:14:17 -0000	1.1.2.6
@@ -71,7 +71,6 @@
 	DEF(SET_BOOL, mail_save_crlf),
 	DEF(SET_BOOL, mail_read_mmaped),
 	DEF(SET_BOOL, mmap_disable),
-	DEF(SET_BOOL, mmap_no_write),
 	DEF(SET_BOOL, dotlock_use_excl),
 	DEF(SET_BOOL, fsync_disable),
 	DEF(SET_STR, lock_method),

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125.2.29
retrieving revision 1.125.2.30
diff -u -d -r1.125.2.29 -r1.125.2.30
--- master-settings.c	27 Mar 2007 21:41:36 -0000	1.125.2.29
+++ master-settings.c	16 May 2007 15:14:17 -0000	1.125.2.30
@@ -218,11 +218,10 @@
 	MEMBER(mail_max_keyword_length) 50,
 	MEMBER(mail_save_crlf) FALSE,
 	MEMBER(mail_read_mmaped) 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.83.2.11
retrieving revision 1.83.2.12
diff -u -d -r1.83.2.11 -r1.83.2.12
--- master-settings.h	27 Mar 2007 21:41:36 -0000	1.83.2.11
+++ master-settings.h	16 May 2007 15:14:17 -0000	1.83.2.12
@@ -79,7 +79,6 @@
 	bool mail_save_crlf;
 	bool mail_read_mmaped;
 	bool mmap_disable;
-	bool mmap_no_write;
 	bool dotlock_use_excl;
 	bool fsync_disable;
 	const char *lock_method;