Apply STABLE14-memcache-write-on-laststore-20090512

* Apply upstream CVS deltas:
  - STABLE14-memcache-write-on-laststore-20090512: write back dirty
    pages on last store with memcache to avoid losing changes.

diff --git a/debian/changelog b/debian/changelog
index dfa8fa8a08f8b4d80357ae31338653c14870c514..700633d5763a3b0acd9176997e2a4a5918ea12f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ openafs (1.4.10+dfsg1-2) UNRELEASED; urgency=low
       (Closes: #528785)
     - STABLE14-linux-mmap-antirecursion-fix-20090512: improvements in
       flag setting and locking around recursive mmap protection.
+    - STABLE14-memcache-write-on-laststore-20090512: write back dirty
+      pages on last store with memcache to avoid losing changes.
   * Provide an openafs-modules-dkms package that uses DKMS to dynamically
     build kernel modules for the local kernel and document this option in
     README.modules.  This is an alternative to installing

diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c
index 951bed0091179cade3623a4a3a8461ec78b9f06f..be79c1bcb45fb2495fbd0c7a21a5c172551d3ad4 100644 (file)
--- a/src/afs/afs_segments.c
+++ b/src/afs/afs_segments.c
@@ -14,7 +14,7 @@
 #include "afs/param.h"
 
 RCSID
-    ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.16.2.6 2007/12/04 21:12:16 shadow Exp $");
+    ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.16.2.7 2009/05/12 16:42:48 shadow Exp $");
 
 #include "afs/sysincludes.h"   /*Standard vendor system headers */
 #include "afsincludes.h"       /*AFS-based standard headers */
@@ -195,7 +195,7 @@ afs_StoreAllSegments(register struct vcache *avc, struct vrequest *areq,
      * on the memcache case since that's we adjust the file's size
      * and finish flushing partial vm pages.
      */
-    if (cacheDiskType != AFS_FCACHE_TYPE_MEM)
+    if ((cacheDiskType != AFS_FCACHE_TYPE_MEM) || (sync & AFS_LASTSTORE))
 #endif /* !AFS_AIX32_ENV && !AFS_SGI65_ENV */
     {
        /* If we're not diskless, reading a file may stress the VM