- resolved conflict with tuxonice

Changed files:
    kernel-vserver-2.3.patch -> 1.7

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 956aa19627243ecee5286b9e8a74c993bf718739..bba07abc54c40533979d08c94c1f37f3b739e712 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -8749,10 +8749,10 @@ diff -NurpP --minimal linux-2.6.29.1/include/linux/fs.h linux-2.6.29.1-vs2.3.0.3
  #define MS_NOUSER     (1<<31)
  
 @@ -167,6 +170,14 @@ struct inodes_stat_t {
- #define S_NOCMTIME    128     /* Do not update file c/mtime */
- #define S_SWAPFILE    256     /* Do not truncate: swapon got its bmaps */
  #define S_PRIVATE     512     /* Inode is fs-internal */
-+#define S_IXUNLINK    1024    /* Immutable Invert on unlink */
+ #define S_ATOMIC_COPY 1024    /* Pages mapped with this inode need to be
+                                  atomically copied (gem) */
++#define S_IXUNLINK    2048    /* Immutable Invert on unlink */
 +
 +/* Linux-VServer related Inode flags */
 +