INN commit: trunk (doc/pod/news.pod storage/cnfs/cnfs.c)

INN Commit rra at isc.org
Fri May 8 14:34:47 UTC 2015


    Date: Friday, May 8, 2015 @ 07:34:46
  Author: iulius
Revision: 9853

Correctly flush CNFS buffers when nfswriter is true in inn.conf

Modified:
  trunk/doc/pod/news.pod
  trunk/storage/cnfs/cnfs.c

---------------------+
 doc/pod/news.pod    |    4 ++++
 storage/cnfs/cnfs.c |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2015-05-05 18:51:27 UTC (rev 9852)
+++ doc/pod/news.pod	2015-05-08 14:34:46 UTC (rev 9853)
@@ -280,6 +280,10 @@
 
 =item *
 
+Fixed flushing of CNFS buffers when using NFS storage.
+
+=item *
+
 Fixed how B<innupgrade> is executed during an update of an INN
 installation; on a few systems like AIX, it fails to run because its
 taint mode was unproperly declared.

Modified: storage/cnfs/cnfs.c
===================================================================
--- storage/cnfs/cnfs.c	2015-05-05 18:51:27 UTC (rev 9852)
+++ storage/cnfs/cnfs.c	2015-05-08 14:34:46 UTC (rev 9853)
@@ -926,15 +926,15 @@
 
 	/* Don't thrash the system with msync()s - keep the last value
 	 * and check each time, only if the pages which we should
-	 * flush change actually flush the previous ones. Calling
+	 * flush change actually flush the previous ones.  Calling
 	 * cnfs_mapcntl(NULL, 0, MS_ASYNC) then flushes the final
-	 * piece */
+	 * piece. */
 	if (start != sstart || end != send) {
 	    if (sstart != NULL && send != NULL) {
 		msync(sstart, send - sstart, flags);
 	    }
 	    sstart = start;
-	    send = send;
+	    send = end;
 	}
     }
 }



More information about the inn-committers mailing list