INN commit: branches/2.5 (doc/pod/news.pod storage/cnfs/cnfs.c)
INN Commit
rra at isc.org
Thu May 14 13:43:28 UTC 2015
Date: Thursday, May 14, 2015 @ 06:43:28
Author: iulius
Revision: 9866
Correctly flush CNFS buffers when nfswriter is true in inn.conf
Modified:
branches/2.5/doc/pod/news.pod
branches/2.5/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-14 13:42:55 UTC (rev 9865)
+++ doc/pod/news.pod 2015-05-14 13:43:28 UTC (rev 9866)
@@ -55,6 +55,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-14 13:42:55 UTC (rev 9865)
+++ storage/cnfs/cnfs.c 2015-05-14 13:43:28 UTC (rev 9866)
@@ -921,15 +921,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