- 3.4.86

- fixed vserver patch

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 01754b7e28814945971fbb8dee6c1f527ed5efbb..99dd2653796b374f2f599d471817ee8690cde9c9 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -3093,44 +3093,45 @@ diff -NurpP --minimal linux-3.4.83/fs/ext4/ialloc.c linux-3.4.83-vs2.3.3.9/fs/ex
 diff -NurpP --minimal linux-3.4.83/fs/ext4/inode.c linux-3.4.83-vs2.3.3.9/fs/ext4/inode.c
 --- linux-3.4.83/fs/ext4/inode.c       2014-03-12 09:48:13.000000000 +0000
 +++ linux-3.4.83-vs2.3.3.9/fs/ext4/inode.c     2014-03-12 09:55:28.000000000 +0000
-@@ -37,6 +37,7 @@
- #include <linux/printk.h>
+@@ -38,6 +38,7 @@
  #include <linux/slab.h>
  #include <linux/ratelimit.h>
+ #include <linux/bitops.h>
 +#include <linux/vs_tag.h>
  
  #include "ext4_jbd2.h"
  #include "xattr.h"
-@@ -3581,41 +3582,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -3582,43 +3583,65 @@
  {
        unsigned int flags = EXT4_I(inode)->i_flags;
- 
--      inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
-+      inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
-+              S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+       unsigned int new_fl = 0;
++      unsigned int new_vf = 0;
 +
 +      if (flags & EXT4_IMMUTABLE_FL)
-+              inode->i_flags |= S_IMMUTABLE;
++              new_fl |= S_IMMUTABLE;
 +      if (flags & EXT4_IXUNLINK_FL)
-+              inode->i_flags |= S_IXUNLINK;
-+
++              new_fl |= S_IXUNLINK;
+ 
        if (flags & EXT4_SYNC_FL)
-               inode->i_flags |= S_SYNC;
+               new_fl |= S_SYNC;
        if (flags & EXT4_APPEND_FL)
-               inode->i_flags |= S_APPEND;
+               new_fl |= S_APPEND;
 -      if (flags & EXT4_IMMUTABLE_FL)
--              inode->i_flags |= S_IMMUTABLE;
+-              new_fl |= S_IMMUTABLE;
        if (flags & EXT4_NOATIME_FL)
-               inode->i_flags |= S_NOATIME;
+               new_fl |= S_NOATIME;
        if (flags & EXT4_DIRSYNC_FL)
-               inode->i_flags |= S_DIRSYNC;
-+
-+      inode->i_vflags &= ~(V_BARRIER | V_COW);
+               new_fl |= S_DIRSYNC;
+       set_mask_bits(&inode->i_flags,
+-                    S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC, new_fl);
++                    S_IMMUTABLE|S_IXUNLINK|S_SYNC|S_APPEND|S_NOATIME|S_DIRSYNC,
++                    new_fl);
 +
 +      if (flags & EXT4_BARRIER_FL)
-+              inode->i_vflags |= V_BARRIER;
++              new_vf |= V_BARRIER;
 +      if (flags & EXT4_COW_FL)
-+              inode->i_vflags |= V_COW;
++              new_vf |= V_COW;
++      set_mask_bits(&inode->i_vflags, V_BARRIER|V_COW, new_vf);
  }
  
  /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */

diff --git a/kernel.spec b/kernel.spec
index d0820bab3da7df93521c8fac9390fb1dbaed0073..7850c899872d33191cfa6033633ab86f91fec043 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,7 +93,7 @@
 
 %define                rel             1
 %define                basever         3.4
-%define                postver         .85
+%define                postver         .86
 
 %define                versuffix       -%{basever}
 
@@ -142,7 +142,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 967f72983655e2479f951195953e8480
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  2cf0a14e1a620d6f4bc4231a4515f6ba
+# Patch0-md5:  225cfae7de60dd4a8290d605066f033f
 %endif
 Source1:       kernel.sysconfig