[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-file.c, 1.18, 1.19 mbox-lock.c, 1.27, 1.28

[tss at dovecot.org]

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

Modified Files:
	mbox-file.c mbox-lock.c 
Log Message:
Removed mail_read_mmaped setting. It's a pretty useless setting and
apparently it can also be buggy.



Index: mbox-file.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-file.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mbox-file.c	7 Aug 2006 12:42:38 -0000	1.18
+++ mbox-file.c	18 Jan 2007 16:57:44 -0000	1.19
@@ -87,11 +87,6 @@
 	if (mbox->mbox_writeonly) {
 		mbox->mbox_file_stream =
 			i_stream_create_from_data(default_pool, NULL, 0);
-	} else if (mbox->ibox.mail_read_mmaped) {
-		mbox->mbox_file_stream =
-			i_stream_create_mmap(mbox->mbox_fd, default_pool,
-					     MAIL_MMAP_BLOCK_SIZE,
-					     0, 0, FALSE);
 	} else {
 		mbox->mbox_file_stream =
 			i_stream_create_file(mbox->mbox_fd, default_pool,

Index: mbox-lock.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-lock.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mbox-lock.c	28 Dec 2006 16:51:17 -0000	1.27
+++ mbox-lock.c	18 Jan 2007 16:57:44 -0000	1.28
@@ -555,11 +555,6 @@
 	if (mbox_lock_list(ctx, F_UNLCK, 0, 0) < 0)
 		ret = -1;
 
-	if (ctx->mbox->ibox.mail_read_mmaped) {
-		/* make sure we don't keep mmap() between locks */
-		mbox_file_close_stream(ctx->mbox);
-	}
-
 	ctx->mbox->mbox_lock_id += 2;
 	ctx->mbox->mbox_lock_type = F_UNLCK;
 	return ret;