dovecot: Changed nfs setting conflict error handling

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/3a19830ab7f6
changeset: 5976:3a19830ab7f6
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jul 13 00:15:56 2007 +0300
description:
Changed nfs setting conflict error handling

diffstat:

1 file changed, 4 insertions(+), 10 deletions(-)
src/lib-index/mail-index.c |   14 ++++----------

diffs (24 lines):

diff -r 78fe45cdc192 -r 3a19830ab7f6 src/lib-index/mail-index.c
--- a/src/lib-index/mail-index.c	Fri Jul 13 00:12:21 2007 +0300
+++ b/src/lib-index/mail-index.c	Fri Jul 13 00:15:56 2007 +0300
@@ -479,16 +479,10 @@ int mail_index_open(struct mail_index *i
 			(flags & MAIL_INDEX_OPEN_FLAG_NFS_FLUSH) != 0;
 		index->lock_method = lock_method;
 
-		if (index->nfs_flush && index->fsync_disable) {
-			i_warning("nfs_flush_cache=yes requires "
-				  "fsync_disable=no, changing it");
-			index->fsync_disable = FALSE;
-		}
-		if (index->nfs_flush && !index->mmap_disable) {
-			i_warning("nfs_flush_cache=yes requires "
-				  "mmap_disable=yes, changing it");
-			index->mmap_disable = TRUE;
-		}
+		if (index->nfs_flush && index->fsync_disable)
+			i_fatal("nfs flush requires fsync_disable=no");
+		if (index->nfs_flush && !index->mmap_disable)
+			i_fatal("nfs flush requires mmap_disable=yes");
 
 		i_assert(!index->opened);
 		if (!mail_index_open_files(index, flags)) {