Apply upstream STABLE14-linux-truncate-cleanup-20090113

Further truncation race condition fix.

diff --git a/debian/changelog b/debian/changelog
index 7d84cafe76b021d4a67d7111f2a712a1989bd8d2..d1fc5db782ed3bfe5399818d5db5edbb826f7f4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ openafs (1.4.8.dfsg1-1) UNRELEASED; urgency=low
     - STABLE14-linux-truncate-race-20090109: avoid race condition during
       truncation.
     - STABLE14-linux-i-size-20090112: further fix for truncation race.
+    - STABLE14-linux-truncate-cleanup-20090113: further truncation fix.
   * Make dynroot the default for new installations.  It works much better
     with systems that don't bring up their network until late in the boot
     process, such as wireless laptops.  (LP: #249240, #318605)

diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c
index 0825f88ba248686075626b6f97e8eae3ddbc8141..74f8ca3dbe8a3bcf28e4a481971593f6307a6b0c 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_attrs.c
+++ b/src/afs/VNOPS/afs_vnop_attrs.c
@@ -24,7 +24,7 @@
 #include "afs/param.h"
 
 RCSID
-    ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.27.2.13 2009/01/09 14:58:03 shadow Exp $");
+    ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.27.2.14 2009/01/13 19:37:28 shadow Exp $");
 
 #include "afs/sysincludes.h"   /* Standard vendor system headers */
 #include "afsincludes.h"       /* Afs-based standard headers */
@@ -530,7 +530,7 @@ afs_setattr(OSI_VC_DECL(avc), register struct vattr *attrs,
        ObtainWriteLock(&avc->lock, 128);
        avc->states |= CDirty;
        code = afs_TruncateAllSegments(avc, tsize, &treq, acred);
-#ifdef AFS_LINUX_26_ENV
+#ifdef AFS_LINUX26_ENV
        /* We must update the Linux kernel's idea of file size as soon as
         * possible, to avoid racing with delayed writepages delivered by
         * pdflush */