From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 24 Aug 2013 08:07:35 +0000 (+0200)
Subject: - adjust aufs internals for compatibility with vserver
X-Git-Tag: auto/th/kernel-3.10.9-1~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=ff3e50f15d21ecd8e2fa947eec7b4ebba73001ff;p=packages%2Fkernel.git

- adjust aufs internals for compatibility with vserver
---

diff --git a/kernel-aufs3+vserver.patch b/kernel-aufs3+vserver.patch
new file mode 100644
index 00000000..4aa67b00
--- /dev/null
+++ b/kernel-aufs3+vserver.patch
@@ -0,0 +1,34 @@
+--- linux.aufs/fs/aufs/cpup.c	1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/cpup.c	2013-08-23 23:59:39.631583456 +0200
+@@ -24,9 +24,9 @@
+ #include <linux/mm.h>
+ #include "aufs.h"
+ 
+-void au_cpup_attr_flags(struct inode *dst, unsigned int iflags)
++void au_cpup_attr_flags(struct inode *dst, unsigned short iflags)
+ {
+-	const unsigned int mask = S_DEAD | S_SWAPFILE | S_PRIVATE
++	const unsigned short mask = S_DEAD | S_SWAPFILE | S_PRIVATE
+ 		| S_NOATIME | S_NOCMTIME | S_AUTOMOUNT;
+ 
+ 	BUILD_BUG_ON(sizeof(iflags) != sizeof(dst->i_flags));
+@@ -155,7 +155,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
+ struct au_cpup_reg_attr {
+ 	int		valid;
+ 	struct kstat	st;
+-	unsigned int	iflags; /* inode->i_flags */
++	unsigned short	iflags; /* inode->i_flags */
+ };
+ 
+ static noinline_for_stack
+--- linux.aufs/fs/aufs/cpup.h	1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/cpup.h	2013-08-23 23:59:39.634916914 +0200
+@@ -31,7 +31,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+ struct file;
+ struct au_pin;
+ 
+-void au_cpup_attr_flags(struct inode *dst, unsigned int iflags);
++void au_cpup_attr_flags(struct inode *dst, unsigned short iflags);
+ void au_cpup_attr_timesizes(struct inode *inode);
+ void au_cpup_attr_nlink(struct inode *inode, int force);
+ void au_cpup_attr_changeable(struct inode *inode);
diff --git a/kernel.spec b/kernel.spec
index f3eabbdd..62f370bc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -219,6 +219,7 @@ Patch118:	ovl09-fs-limit-filesystem-stacking-depth.patch
 # drop hunk at the end of patch (hunk is patching include/linux/Kbuild with single line change)
 #
 Patch145:	kernel-aufs3.patch
+Patch146:	kernel-aufs3+vserver.patch
 
 # Show normal colors in menuconfig with ncurses ABI 6
 Patch250:	kernel-fix_256colors_menuconfig.patch
@@ -699,6 +700,9 @@ cd linux-%{basever}
 
 # aufs3
 %patch145 -p1
+%if %{with vserver}
+%patch146 -p1
+%endif
 
 %if %{with rescuecd}
 %patch7000 -p1