aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-08-07 10:03:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-08-07 11:36:06 +0000
commiteb25980bc3ad0ec2aa8fe40d5c08ce3ef63f9d5e (patch)
tree8b2ba56771f5315c5e7574abfa90c5d8081184e6
parent5210056c56cc445d5fe2cda52195c5f875b1f637 (diff)
downloadalpine_aports-eb25980bc3ad0ec2aa8fe40d5c08ce3ef63f9d5e.tar.bz2
alpine_aports-eb25980bc3ad0ec2aa8fe40d5c08ce3ef63f9d5e.tar.xz
alpine_aports-eb25980bc3ad0ec2aa8fe40d5c08ce3ef63f9d5e.zip
main/linux-vserver: upgrade to 3.4.56
(cherry picked from commit a167e9942a598a338f1c4daae7fdf2e26ce865d6)
Diffstat
-rw-r--r--main/linux-vserver/APKBUILD14
-rw-r--r--main/linux-vserver/patch-3.4.56-vs2.3.3.9.diff (renamed from main/linux-vserver/patch-3.4.51-vs2.3.3.9.diff)4022
2 files changed, 2259 insertions, 1777 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 3865e54bde..d2b0be217d 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
2 2
3_flavor=vserver 3_flavor=vserver
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=3.4.51 5pkgver=3.4.56
6pkgrel=0 6pkgrel=0
7_vsver=vs2.3.3.9 7_vsver=vs2.3.3.9
8 8
@@ -136,17 +136,17 @@ dev() {
136} 136}
137 137
138md5sums="967f72983655e2479f951195953e8480 linux-3.4.tar.xz 138md5sums="967f72983655e2479f951195953e8480 linux-3.4.tar.xz
139c74052b5a413496d9182bcf8f9087403 patch-3.4.51.xz 139d13507089f1c81a5f00c510144ae4f2d patch-3.4.56.xz
14057bf6e2df90c55df27cb345232f75a59 patch-3.4.51-vs2.3.3.9.diff 14028aca79d0c947ca90d80d96f24a020f5 patch-3.4.56-vs2.3.3.9.diff
1411fce2ef2e47d19c150ab0b2df3373a57 kernelconfig.x86 1411fce2ef2e47d19c150ab0b2df3373a57 kernelconfig.x86
142b6a18f4cb2523bbd2500809e61172f8f kernelconfig.x86_64" 142b6a18f4cb2523bbd2500809e61172f8f kernelconfig.x86_64"
143sha256sums="ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 linux-3.4.tar.xz 143sha256sums="ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 linux-3.4.tar.xz
144693b3370e84f9612357b5ecf5272930a4dfbfb7674b4f257ece42c9d122c39f5 patch-3.4.51.xz 14471980cb04968fe5141be9f370d542deb767c8c2de8b68073c25035790900cd56 patch-3.4.56.xz
14515866fe9338fc9069ab1646149a5fb48ea1eada0d7616bd16ae5c77566ee94bc patch-3.4.51-vs2.3.3.9.diff 1459c44202e615937d338ed5be1dc2f517f3a48b9c100788a1d840aae2f98d196cd patch-3.4.56-vs2.3.3.9.diff
146e97b45a117671c5a87a9ba4a1f946125053eac078d297f61f9c8d4594acbf830 kernelconfig.x86 146e97b45a117671c5a87a9ba4a1f946125053eac078d297f61f9c8d4594acbf830 kernelconfig.x86
147d44d1a1be3402847f540cc0cfb201deec7084b4c516e592b92e115ab3f71d4b5 kernelconfig.x86_64" 147d44d1a1be3402847f540cc0cfb201deec7084b4c516e592b92e115ab3f71d4b5 kernelconfig.x86_64"
148sha512sums="1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c linux-3.4.tar.xz 148sha512sums="1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c linux-3.4.tar.xz
1496daa4976c680a66f9d1c0f8b8be855057cad9744353b999ea51331db7056eb6705231cdfa7075c8cbcc4439aac6ff5de9c6ca336569026029560955a5fc70b06 patch-3.4.51.xz 149608e165b38e6fff0341369e3793edf8675cb5d0d4b123338f446424b4fe4c52050fce2a281a3ebb7d04f45e9fc5f5c9ec9d01c407261194385f60fc35a705726 patch-3.4.56.xz
15016bd974160323f49fe8590d3a99102f6d0f4bc34942cae6a3b0f239f96d52e51ba64435ef1e9c3ff118abc903f2e2b42ca126e29c97df9261c2623898bb955a1 patch-3.4.51-vs2.3.3.9.diff 15002a9cd3c7f7dd131e26a8d4512530b054d2b5c61e07995fd1fca5b1b76cbd96c4e12252866f52077626179e40040be5e8ede0af910a1915d2f64679e05e8c7e0 patch-3.4.56-vs2.3.3.9.diff
151f12f999c84f724a4ac20a736c7f56671e23b2a9ddce4b0576dc17d0b3e8f319f5c4bc40b58992eba75ace44148018d85de24b2516d0a83240cd0ca3803606eae kernelconfig.x86 151f12f999c84f724a4ac20a736c7f56671e23b2a9ddce4b0576dc17d0b3e8f319f5c4bc40b58992eba75ace44148018d85de24b2516d0a83240cd0ca3803606eae kernelconfig.x86
1524cf43a7fc609e9822919e5706f38c03ef72deae2eae6b7d4c4ca7f9f29bccd1f01c0d65660a0c5234df6c2123a1d0c797dbdcb57ca5559e39644704426657f3e kernelconfig.x86_64" 1524cf43a7fc609e9822919e5706f38c03ef72deae2eae6b7d4c4ca7f9f29bccd1f01c0d65660a0c5234df6c2123a1d0c797dbdcb57ca5559e39644704426657f3e kernelconfig.x86_64"
diff --git a/main/linux-vserver/patch-3.4.51-vs2.3.3.9.diff b/main/linux-vserver/patch-3.4.56-vs2.3.3.9.diff
index 3d00861f87..dead370876 100644
--- a/main/linux-vserver/patch-3.4.51-vs2.3.3.9.diff
+++ b/main/linux-vserver/patch-3.4.56-vs2.3.3.9.diff
@@ -1,6 +1,8 @@
1diff -NurpP --minimal linux-3.4.48/Documentation/vserver/debug.txt linux-3.4.48-vs2.3.3.9/Documentation/vserver/debug.txt 1diff --git a/Documentation/vserver/debug.txt b/Documentation/vserver/debug.txt
2--- linux-3.4.48/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 2new file mode 100644
3+++ linux-3.4.48-vs2.3.3.9/Documentation/vserver/debug.txt 2012-05-21 16:15:04.000000000 +0000 3index 0000000..4464a0f
4--- /dev/null
5+++ b/Documentation/vserver/debug.txt
4@@ -0,0 +1,154 @@ 6@@ -0,0 +1,154 @@
5+ 7+
6+debug_cvirt: 8+debug_cvirt:
@@ -156,22 +158,23 @@ diff -NurpP --minimal linux-3.4.48/Documentation/vserver/debug.txt linux-3.4.48-
156+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" 158+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
157+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" 159+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
158+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" 160+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
159diff -NurpP --minimal linux-3.4.48/Makefile linux-3.4.48-vs2.3.3.9/Makefile 161diff --git a/Makefile b/Makefile
160--- linux-3.4.48/Makefile 2013-06-13 08:59:13.000000000 +0000 162index 2fe1f6d..a34c518 100644
161+++ linux-3.4.48-vs2.3.3.9/Makefile 2013-06-13 13:08:07.000000000 +0000 163--- a/Makefile
164+++ b/Makefile
162@@ -1,7 +1,7 @@ 165@@ -1,7 +1,7 @@
163 VERSION = 3 166 VERSION = 3
164 PATCHLEVEL = 4 167 PATCHLEVEL = 4
165-SUBLEVEL = 51 168 SUBLEVEL = 56
166-EXTRAVERSION = 169-EXTRAVERSION =
167+SUBLEVEL = 51
168+EXTRAVERSION = -vs2.3.3.9 170+EXTRAVERSION = -vs2.3.3.9
169 NAME = Saber-toothed Squirrel 171 NAME = Saber-toothed Squirrel
170 172
171 # *DOCUMENTATION* 173 # *DOCUMENTATION*
172diff -NurpP --minimal linux-3.4.48/arch/alpha/Kconfig linux-3.4.48-vs2.3.3.9/arch/alpha/Kconfig 174diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
173--- linux-3.4.48/arch/alpha/Kconfig 2012-05-21 16:06:12.000000000 +0000 175index 22e58a9..743b861 100644
174+++ linux-3.4.48-vs2.3.3.9/arch/alpha/Kconfig 2012-05-21 16:15:04.000000000 +0000 176--- a/arch/alpha/Kconfig
177+++ b/arch/alpha/Kconfig
175@@ -662,6 +662,8 @@ config DUMMY_CONSOLE 178@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
176 depends on VGA_HOSE 179 depends on VGA_HOSE
177 default y 180 default y
@@ -181,9 +184,10 @@ diff -NurpP --minimal linux-3.4.48/arch/alpha/Kconfig linux-3.4.48-vs2.3.3.9/arc
181 source "security/Kconfig" 184 source "security/Kconfig"
182 185
183 source "crypto/Kconfig" 186 source "crypto/Kconfig"
184diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/entry.S linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/entry.S 187diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
185--- linux-3.4.48/arch/alpha/kernel/entry.S 2010-10-21 11:06:45.000000000 +0000 188index 6d159ce..eecae79 100644
186+++ linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 189--- a/arch/alpha/kernel/entry.S
190+++ b/arch/alpha/kernel/entry.S
187@@ -860,24 +860,15 @@ sys_getxgid: 191@@ -860,24 +860,15 @@ sys_getxgid:
188 .globl sys_getxpid 192 .globl sys_getxpid
189 .ent sys_getxpid 193 .ent sys_getxpid
@@ -216,9 +220,10 @@ diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/entry.S linux-3.4.48-vs2.3.
216 ret 220 ret
217 .end sys_getxpid 221 .end sys_getxpid
218 222
219diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/ptrace.c 223diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
220--- linux-3.4.48/arch/alpha/kernel/ptrace.c 2012-05-21 16:06:12.000000000 +0000 224index 54616f4..539720c 100644
221+++ linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 225--- a/arch/alpha/kernel/ptrace.c
226+++ b/arch/alpha/kernel/ptrace.c
222@@ -13,6 +13,7 @@ 227@@ -13,6 +13,7 @@
223 #include <linux/user.h> 228 #include <linux/user.h>
224 #include <linux/security.h> 229 #include <linux/security.h>
@@ -227,9 +232,10 @@ diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/ptrace.c linux-3.4.48-vs2.3
227 232
228 #include <asm/uaccess.h> 233 #include <asm/uaccess.h>
229 #include <asm/pgtable.h> 234 #include <asm/pgtable.h>
230diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/systbls.S linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/systbls.S 235diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S
231--- linux-3.4.48/arch/alpha/kernel/systbls.S 2012-01-09 15:13:54.000000000 +0000 236index e534e1c..df045e4 100644
232+++ linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/systbls.S 2012-05-21 16:15:04.000000000 +0000 237--- a/arch/alpha/kernel/systbls.S
238+++ b/arch/alpha/kernel/systbls.S
233@@ -446,7 +446,7 @@ sys_call_table: 239@@ -446,7 +446,7 @@ sys_call_table:
234 .quad sys_stat64 /* 425 */ 240 .quad sys_stat64 /* 425 */
235 .quad sys_lstat64 241 .quad sys_lstat64
@@ -239,10 +245,11 @@ diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/systbls.S linux-3.4.48-vs2.
239 .quad sys_ni_syscall /* sys_mbind */ 245 .quad sys_ni_syscall /* sys_mbind */
240 .quad sys_ni_syscall /* sys_get_mempolicy */ 246 .quad sys_ni_syscall /* sys_get_mempolicy */
241 .quad sys_ni_syscall /* sys_set_mempolicy */ 247 .quad sys_ni_syscall /* sys_set_mempolicy */
242diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/traps.c 248diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
243--- linux-3.4.48/arch/alpha/kernel/traps.c 2012-05-21 16:06:12.000000000 +0000 249index 80d987c..83c8bbb 100644
244+++ linux-3.4.48-vs2.3.3.9/arch/alpha/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 250--- a/arch/alpha/kernel/traps.c
245@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs 251+++ b/arch/alpha/kernel/traps.c
252@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
246 #ifdef CONFIG_SMP 253 #ifdef CONFIG_SMP
247 printk("CPU %d ", hard_smp_processor_id()); 254 printk("CPU %d ", hard_smp_processor_id());
248 #endif 255 #endif
@@ -252,9 +259,10 @@ diff -NurpP --minimal linux-3.4.48/arch/alpha/kernel/traps.c linux-3.4.48-vs2.3.
252 dik_show_regs(regs, r9_15); 259 dik_show_regs(regs, r9_15);
253 add_taint(TAINT_DIE); 260 add_taint(TAINT_DIE);
254 dik_show_trace((unsigned long *)(regs+1)); 261 dik_show_trace((unsigned long *)(regs+1));
255diff -NurpP --minimal linux-3.4.48/arch/arm/Kconfig linux-3.4.48-vs2.3.3.9/arch/arm/Kconfig 262diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
256--- linux-3.4.48/arch/arm/Kconfig 2013-06-13 08:59:13.000000000 +0000 263index 7fe19a3..58612a8 100644
257+++ linux-3.4.48-vs2.3.3.9/arch/arm/Kconfig 2012-12-11 11:42:38.000000000 +0000 264--- a/arch/arm/Kconfig
265+++ b/arch/arm/Kconfig
258@@ -2311,6 +2311,8 @@ source "fs/Kconfig" 266@@ -2311,6 +2311,8 @@ source "fs/Kconfig"
259 267
260 source "arch/arm/Kconfig.debug" 268 source "arch/arm/Kconfig.debug"
@@ -264,9 +272,10 @@ diff -NurpP --minimal linux-3.4.48/arch/arm/Kconfig linux-3.4.48-vs2.3.3.9/arch/
264 source "security/Kconfig" 272 source "security/Kconfig"
265 273
266 source "crypto/Kconfig" 274 source "crypto/Kconfig"
267diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/calls.S linux-3.4.48-vs2.3.3.9/arch/arm/kernel/calls.S 275diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
268--- linux-3.4.48/arch/arm/kernel/calls.S 2012-01-09 15:13:54.000000000 +0000 276index 463ff4a..8913128 100644
269+++ linux-3.4.48-vs2.3.3.9/arch/arm/kernel/calls.S 2012-05-21 16:15:04.000000000 +0000 277--- a/arch/arm/kernel/calls.S
278+++ b/arch/arm/kernel/calls.S
270@@ -322,7 +322,7 @@ 279@@ -322,7 +322,7 @@
271 /* 310 */ CALL(sys_request_key) 280 /* 310 */ CALL(sys_request_key)
272 CALL(sys_keyctl) 281 CALL(sys_keyctl)
@@ -276,9 +285,10 @@ diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/calls.S linux-3.4.48-vs2.3.3.
276 CALL(sys_ioprio_set) 285 CALL(sys_ioprio_set)
277 /* 315 */ CALL(sys_ioprio_get) 286 /* 315 */ CALL(sys_ioprio_get)
278 CALL(sys_inotify_init) 287 CALL(sys_inotify_init)
279diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/process.c linux-3.4.48-vs2.3.3.9/arch/arm/kernel/process.c 288diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
280--- linux-3.4.48/arch/arm/kernel/process.c 2013-06-13 08:59:13.000000000 +0000 289index 48f3624..a2ca40e 100644
281+++ linux-3.4.48-vs2.3.3.9/arch/arm/kernel/process.c 2012-09-01 08:50:48.000000000 +0000 290--- a/arch/arm/kernel/process.c
291+++ b/arch/arm/kernel/process.c
282@@ -357,7 +357,8 @@ void __show_regs(struct pt_regs *regs) 292@@ -357,7 +357,8 @@ void __show_regs(struct pt_regs *regs)
283 void show_regs(struct pt_regs * regs) 293 void show_regs(struct pt_regs * regs)
284 { 294 {
@@ -289,10 +299,11 @@ diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/process.c linux-3.4.48-vs2.3.
289 __show_regs(regs); 299 __show_regs(regs);
290 dump_stack(); 300 dump_stack();
291 } 301 }
292diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/arm/kernel/traps.c 302diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
293--- linux-3.4.48/arch/arm/kernel/traps.c 2013-06-13 08:59:13.000000000 +0000 303index a53a5a3..37938db 100644
294+++ linux-3.4.48-vs2.3.3.9/arch/arm/kernel/traps.c 2012-10-22 13:09:53.000000000 +0000 304--- a/arch/arm/kernel/traps.c
295@@ -249,8 +249,8 @@ static int __die(const char *str, int er 305+++ b/arch/arm/kernel/traps.c
306@@ -249,8 +249,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
296 307
297 print_modules(); 308 print_modules();
298 __show_regs(regs); 309 __show_regs(regs);
@@ -303,9 +314,10 @@ diff -NurpP --minimal linux-3.4.48/arch/arm/kernel/traps.c linux-3.4.48-vs2.3.3.
303 314
304 if (!user_mode(regs) || in_interrupt()) { 315 if (!user_mode(regs) || in_interrupt()) {
305 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, 316 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
306diff -NurpP --minimal linux-3.4.48/arch/cris/Kconfig linux-3.4.48-vs2.3.3.9/arch/cris/Kconfig 317diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
307--- linux-3.4.48/arch/cris/Kconfig 2012-03-19 18:46:39.000000000 +0000 318index b3abfb0..397b82e 100644
308+++ linux-3.4.48-vs2.3.3.9/arch/cris/Kconfig 2012-05-21 16:15:04.000000000 +0000 319--- a/arch/cris/Kconfig
320+++ b/arch/cris/Kconfig
309@@ -675,6 +675,8 @@ source "drivers/staging/Kconfig" 321@@ -675,6 +675,8 @@ source "drivers/staging/Kconfig"
310 322
311 source "arch/cris/Kconfig.debug" 323 source "arch/cris/Kconfig.debug"
@@ -315,9 +327,10 @@ diff -NurpP --minimal linux-3.4.48/arch/cris/Kconfig linux-3.4.48-vs2.3.3.9/arch
315 source "security/Kconfig" 327 source "security/Kconfig"
316 328
317 source "crypto/Kconfig" 329 source "crypto/Kconfig"
318diff -NurpP --minimal linux-3.4.48/arch/frv/kernel/kernel_thread.S linux-3.4.48-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 330diff --git a/arch/frv/kernel/kernel_thread.S b/arch/frv/kernel/kernel_thread.S
319--- linux-3.4.48/arch/frv/kernel/kernel_thread.S 2008-12-24 23:26:37.000000000 +0000 331index 4531c83..fab3b42 100644
320+++ linux-3.4.48-vs2.3.3.9/arch/frv/kernel/kernel_thread.S 2012-05-21 16:15:04.000000000 +0000 332--- a/arch/frv/kernel/kernel_thread.S
333+++ b/arch/frv/kernel/kernel_thread.S
321@@ -37,7 +37,7 @@ kernel_thread: 334@@ -37,7 +37,7 @@ kernel_thread:
322 335
323 # start by forking the current process, but with shared VM 336 # start by forking the current process, but with shared VM
@@ -327,9 +340,10 @@ diff -NurpP --minimal linux-3.4.48/arch/frv/kernel/kernel_thread.S linux-3.4.48-
327 sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] 340 sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
328 setlo #0xe4e4,gr9 341 setlo #0xe4e4,gr9
329 setlos.p #0,gr10 ; third syscall arg [parent_tidptr] 342 setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
330diff -NurpP --minimal linux-3.4.48/arch/h8300/Kconfig linux-3.4.48-vs2.3.3.9/arch/h8300/Kconfig 343diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
331--- linux-3.4.48/arch/h8300/Kconfig 2012-03-19 18:46:39.000000000 +0000 344index 56e890d..694dfb0 100644
332+++ linux-3.4.48-vs2.3.3.9/arch/h8300/Kconfig 2012-05-21 16:15:04.000000000 +0000 345--- a/arch/h8300/Kconfig
346+++ b/arch/h8300/Kconfig
333@@ -214,6 +214,8 @@ source "fs/Kconfig" 347@@ -214,6 +214,8 @@ source "fs/Kconfig"
334 348
335 source "arch/h8300/Kconfig.debug" 349 source "arch/h8300/Kconfig.debug"
@@ -339,9 +353,10 @@ diff -NurpP --minimal linux-3.4.48/arch/h8300/Kconfig linux-3.4.48-vs2.3.3.9/arc
339 source "security/Kconfig" 353 source "security/Kconfig"
340 354
341 source "crypto/Kconfig" 355 source "crypto/Kconfig"
342diff -NurpP --minimal linux-3.4.48/arch/ia64/Kconfig linux-3.4.48-vs2.3.3.9/arch/ia64/Kconfig 356diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
343--- linux-3.4.48/arch/ia64/Kconfig 2012-03-19 18:46:39.000000000 +0000 357index bd72669..bd9cfe2 100644
344+++ linux-3.4.48-vs2.3.3.9/arch/ia64/Kconfig 2012-05-21 16:15:04.000000000 +0000 358--- a/arch/ia64/Kconfig
359+++ b/arch/ia64/Kconfig
345@@ -654,6 +654,8 @@ source "fs/Kconfig" 360@@ -654,6 +654,8 @@ source "fs/Kconfig"
346 361
347 source "arch/ia64/Kconfig.debug" 362 source "arch/ia64/Kconfig.debug"
@@ -351,9 +366,10 @@ diff -NurpP --minimal linux-3.4.48/arch/ia64/Kconfig linux-3.4.48-vs2.3.3.9/arch
351 source "security/Kconfig" 366 source "security/Kconfig"
352 367
353 source "crypto/Kconfig" 368 source "crypto/Kconfig"
354diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/entry.S linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/entry.S 369diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
355--- linux-3.4.48/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000 370index 1ccbe12..8d2c517 100644
356+++ linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/entry.S 2012-05-21 16:15:04.000000000 +0000 371--- a/arch/ia64/kernel/entry.S
372+++ b/arch/ia64/kernel/entry.S
357@@ -1714,7 +1714,7 @@ sys_call_table: 373@@ -1714,7 +1714,7 @@ sys_call_table:
358 data8 sys_mq_notify 374 data8 sys_mq_notify
359 data8 sys_mq_getsetattr 375 data8 sys_mq_getsetattr
@@ -363,9 +379,10 @@ diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/entry.S linux-3.4.48-vs2.3.3
363 data8 sys_waitid // 1270 379 data8 sys_waitid // 1270
364 data8 sys_add_key 380 data8 sys_add_key
365 data8 sys_request_key 381 data8 sys_request_key
366diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/process.c linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/process.c 382diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
367--- linux-3.4.48/arch/ia64/kernel/process.c 2013-06-13 08:59:14.000000000 +0000 383index 86d74ab..3c74e03 100644
368+++ linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/process.c 2012-10-22 13:09:53.000000000 +0000 384--- a/arch/ia64/kernel/process.c
385+++ b/arch/ia64/kernel/process.c
369@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs) 386@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs)
370 unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; 387 unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
371 388
@@ -377,9 +394,10 @@ diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/process.c linux-3.4.48-vs2.3
377 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", 394 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
378 regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), 395 regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
379 init_utsname()->release); 396 init_utsname()->release);
380diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/ptrace.c 397diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
381--- linux-3.4.48/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000 398index 4265ff6..e58cc71 100644
382+++ linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 399--- a/arch/ia64/kernel/ptrace.c
400+++ b/arch/ia64/kernel/ptrace.c
383@@ -21,6 +21,7 @@ 401@@ -21,6 +21,7 @@
384 #include <linux/regset.h> 402 #include <linux/regset.h>
385 #include <linux/elf.h> 403 #include <linux/elf.h>
@@ -388,10 +406,11 @@ diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/ptrace.c linux-3.4.48-vs2.3.
388 406
389 #include <asm/pgtable.h> 407 #include <asm/pgtable.h>
390 #include <asm/processor.h> 408 #include <asm/processor.h>
391diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/traps.c 409diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
392--- linux-3.4.48/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 410index bd42b76..1039099 100644
393+++ linux-3.4.48-vs2.3.3.9/arch/ia64/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 411--- a/arch/ia64/kernel/traps.c
394@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re 412+++ b/arch/ia64/kernel/traps.c
413@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *regs, long err)
395 put_cpu(); 414 put_cpu();
396 415
397 if (++die.lock_owner_depth < 3) { 416 if (++die.lock_owner_depth < 3) {
@@ -403,7 +422,7 @@ diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/traps.c linux-3.4.48-vs2.3.3
403 if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) 422 if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
404 != NOTIFY_STOP) 423 != NOTIFY_STOP)
405 show_regs(regs); 424 show_regs(regs);
406@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_ 425@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
407 if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) { 426 if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
408 last.time = current_jiffies + 5 * HZ; 427 last.time = current_jiffies + 5 * HZ;
409 printk(KERN_WARNING 428 printk(KERN_WARNING
@@ -415,10 +434,11 @@ diff -NurpP --minimal linux-3.4.48/arch/ia64/kernel/traps.c linux-3.4.48-vs2.3.3
415 } 434 }
416 } 435 }
417 } 436 }
418diff -NurpP --minimal linux-3.4.48/arch/m32r/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/m32r/kernel/traps.c 437diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
419--- linux-3.4.48/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 438index 3bcb207..f962486 100644
420+++ linux-3.4.48-vs2.3.3.9/arch/m32r/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 439--- a/arch/m32r/kernel/traps.c
421@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg 440+++ b/arch/m32r/kernel/traps.c
441@@ -195,8 +195,9 @@ static void show_registers(struct pt_regs *regs)
422 } else { 442 } else {
423 printk("SPI: %08lx\n", sp); 443 printk("SPI: %08lx\n", sp);
424 } 444 }
@@ -430,9 +450,10 @@ diff -NurpP --minimal linux-3.4.48/arch/m32r/kernel/traps.c linux-3.4.48-vs2.3.3
430 450
431 /* 451 /*
432 * When in-kernel, we also print out the stack and code at the 452 * When in-kernel, we also print out the stack and code at the
433diff -NurpP --minimal linux-3.4.48/arch/m68k/Kconfig linux-3.4.48-vs2.3.3.9/arch/m68k/Kconfig 453diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
434--- linux-3.4.48/arch/m68k/Kconfig 2012-05-21 16:06:26.000000000 +0000 454index d318c60..44485f6 100644
435+++ linux-3.4.48-vs2.3.3.9/arch/m68k/Kconfig 2012-05-21 16:15:04.000000000 +0000 455--- a/arch/m68k/Kconfig
456+++ b/arch/m68k/Kconfig
436@@ -146,6 +146,8 @@ source "fs/Kconfig" 457@@ -146,6 +146,8 @@ source "fs/Kconfig"
437 458
438 source "arch/m68k/Kconfig.debug" 459 source "arch/m68k/Kconfig.debug"
@@ -442,9 +463,10 @@ diff -NurpP --minimal linux-3.4.48/arch/m68k/Kconfig linux-3.4.48-vs2.3.3.9/arch
442 source "security/Kconfig" 463 source "security/Kconfig"
443 464
444 source "crypto/Kconfig" 465 source "crypto/Kconfig"
445diff -NurpP --minimal linux-3.4.48/arch/mips/Kconfig linux-3.4.48-vs2.3.3.9/arch/mips/Kconfig 466diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
446--- linux-3.4.48/arch/mips/Kconfig 2012-05-21 16:06:27.000000000 +0000 467index ce30e2f..a8b4dab 100644
447+++ linux-3.4.48-vs2.3.3.9/arch/mips/Kconfig 2012-05-21 16:15:04.000000000 +0000 468--- a/arch/mips/Kconfig
469+++ b/arch/mips/Kconfig
448@@ -2516,6 +2516,8 @@ source "fs/Kconfig" 470@@ -2516,6 +2516,8 @@ source "fs/Kconfig"
449 471
450 source "arch/mips/Kconfig.debug" 472 source "arch/mips/Kconfig.debug"
@@ -454,9 +476,10 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/Kconfig linux-3.4.48-vs2.3.3.9/arch
454 source "security/Kconfig" 476 source "security/Kconfig"
455 477
456 source "crypto/Kconfig" 478 source "crypto/Kconfig"
457diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/mips/kernel/ptrace.c 479diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
458--- linux-3.4.48/arch/mips/kernel/ptrace.c 2012-05-21 16:06:27.000000000 +0000 480index 7c24c29..794a5b0 100644
459+++ linux-3.4.48-vs2.3.3.9/arch/mips/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 481--- a/arch/mips/kernel/ptrace.c
482+++ b/arch/mips/kernel/ptrace.c
460@@ -25,6 +25,7 @@ 483@@ -25,6 +25,7 @@
461 #include <linux/security.h> 484 #include <linux/security.h>
462 #include <linux/audit.h> 485 #include <linux/audit.h>
@@ -465,7 +488,7 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/ptrace.c linux-3.4.48-vs2.3.
465 488
466 #include <asm/byteorder.h> 489 #include <asm/byteorder.h>
467 #include <asm/cpu.h> 490 #include <asm/cpu.h>
468@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi 491@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *child, long request,
469 void __user *datavp = (void __user *) data; 492 void __user *datavp = (void __user *) data;
470 unsigned long __user *datalp = (void __user *) data; 493 unsigned long __user *datalp = (void __user *) data;
471 494
@@ -475,9 +498,10 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/ptrace.c linux-3.4.48-vs2.3.
475 switch (request) { 498 switch (request) {
476 /* when I and D space are separate, these will need to be fixed. */ 499 /* when I and D space are separate, these will need to be fixed. */
477 case PTRACE_PEEKTEXT: /* read word at location addr. */ 500 case PTRACE_PEEKTEXT: /* read word at location addr. */
478diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall32-o32.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 501diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
479--- linux-3.4.48/arch/mips/kernel/scall32-o32.S 2012-01-09 15:14:05.000000000 +0000 502index a632bc1..b05626a 100644
480+++ linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall32-o32.S 2012-05-21 16:15:04.000000000 +0000 503--- a/arch/mips/kernel/scall32-o32.S
504+++ b/arch/mips/kernel/scall32-o32.S
481@@ -523,7 +523,7 @@ einval: li v0, -ENOSYS 505@@ -523,7 +523,7 @@ einval: li v0, -ENOSYS
482 sys sys_mq_timedreceive 5 506 sys sys_mq_timedreceive 5
483 sys sys_mq_notify 2 /* 4275 */ 507 sys sys_mq_notify 2 /* 4275 */
@@ -487,9 +511,10 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall32-o32.S linux-3.4.48-v
487 sys sys_waitid 5 511 sys sys_waitid 5
488 sys sys_ni_syscall 0 /* available, was setaltroot */ 512 sys sys_ni_syscall 0 /* available, was setaltroot */
489 sys sys_add_key 5 /* 4280 */ 513 sys sys_add_key 5 /* 4280 */
490diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-64.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-64.S 514diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
491--- linux-3.4.48/arch/mips/kernel/scall64-64.S 2012-01-09 15:14:05.000000000 +0000 515index 3b5a5e9..150ff87f 100644
492+++ linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-64.S 2012-05-21 16:15:04.000000000 +0000 516--- a/arch/mips/kernel/scall64-64.S
517+++ b/arch/mips/kernel/scall64-64.S
493@@ -362,7 +362,7 @@ sys_call_table: 518@@ -362,7 +362,7 @@ sys_call_table:
494 PTR sys_mq_timedreceive 519 PTR sys_mq_timedreceive
495 PTR sys_mq_notify 520 PTR sys_mq_notify
@@ -499,9 +524,10 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-64.S linux-3.4.48-vs
499 PTR sys_waitid 524 PTR sys_waitid
500 PTR sys_ni_syscall /* available, was setaltroot */ 525 PTR sys_ni_syscall /* available, was setaltroot */
501 PTR sys_add_key 526 PTR sys_add_key
502diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-n32.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 527diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
503--- linux-3.4.48/arch/mips/kernel/scall64-n32.S 2012-01-09 15:14:05.000000000 +0000 528index 6be6f70..e241470 100644
504+++ linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-n32.S 2012-05-21 16:15:04.000000000 +0000 529--- a/arch/mips/kernel/scall64-n32.S
530+++ b/arch/mips/kernel/scall64-n32.S
505@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table) 531@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
506 PTR compat_sys_mq_timedreceive 532 PTR compat_sys_mq_timedreceive
507 PTR compat_sys_mq_notify 533 PTR compat_sys_mq_notify
@@ -511,9 +537,10 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-n32.S linux-3.4.48-v
511 PTR compat_sys_waitid 537 PTR compat_sys_waitid
512 PTR sys_ni_syscall /* available, was setaltroot */ 538 PTR sys_ni_syscall /* available, was setaltroot */
513 PTR sys_add_key 539 PTR sys_add_key
514diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-o32.S linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 540diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
515--- linux-3.4.48/arch/mips/kernel/scall64-o32.S 2012-01-09 15:14:05.000000000 +0000 541index 5422855..316be5e 100644
516+++ linux-3.4.48-vs2.3.3.9/arch/mips/kernel/scall64-o32.S 2012-05-21 16:15:04.000000000 +0000 542--- a/arch/mips/kernel/scall64-o32.S
543+++ b/arch/mips/kernel/scall64-o32.S
517@@ -480,7 +480,7 @@ sys_call_table: 544@@ -480,7 +480,7 @@ sys_call_table:
518 PTR compat_sys_mq_timedreceive 545 PTR compat_sys_mq_timedreceive
519 PTR compat_sys_mq_notify /* 4275 */ 546 PTR compat_sys_mq_notify /* 4275 */
@@ -523,10 +550,11 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/scall64-o32.S linux-3.4.48-v
523 PTR sys_32_waitid 550 PTR sys_32_waitid
524 PTR sys_ni_syscall /* available, was setaltroot */ 551 PTR sys_ni_syscall /* available, was setaltroot */
525 PTR sys_add_key /* 4280 */ 552 PTR sys_add_key /* 4280 */
526diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/mips/kernel/traps.c 553diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
527--- linux-3.4.48/arch/mips/kernel/traps.c 2012-05-21 16:06:27.000000000 +0000 554index cfdaaa4..6de6d34 100644
528+++ linux-3.4.48-vs2.3.3.9/arch/mips/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 555--- a/arch/mips/kernel/traps.c
529@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs 556+++ b/arch/mips/kernel/traps.c
557@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs)
530 558
531 __show_regs(regs); 559 __show_regs(regs);
532 print_modules(); 560 print_modules();
@@ -540,9 +568,10 @@ diff -NurpP --minimal linux-3.4.48/arch/mips/kernel/traps.c linux-3.4.48-vs2.3.3
540 if (cpu_has_userlocal) { 568 if (cpu_has_userlocal) {
541 unsigned long tls; 569 unsigned long tls;
542 570
543diff -NurpP --minimal linux-3.4.48/arch/parisc/Kconfig linux-3.4.48-vs2.3.3.9/arch/parisc/Kconfig 571diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
544--- linux-3.4.48/arch/parisc/Kconfig 2012-03-19 18:46:44.000000000 +0000 572index 242a1b7..8c2c34e 100644
545+++ linux-3.4.48-vs2.3.3.9/arch/parisc/Kconfig 2012-05-21 16:15:04.000000000 +0000 573--- a/arch/parisc/Kconfig
574+++ b/arch/parisc/Kconfig
546@@ -279,6 +279,8 @@ source "fs/Kconfig" 575@@ -279,6 +279,8 @@ source "fs/Kconfig"
547 576
548 source "arch/parisc/Kconfig.debug" 577 source "arch/parisc/Kconfig.debug"
@@ -552,9 +581,10 @@ diff -NurpP --minimal linux-3.4.48/arch/parisc/Kconfig linux-3.4.48-vs2.3.3.9/ar
552 source "security/Kconfig" 581 source "security/Kconfig"
553 582
554 source "crypto/Kconfig" 583 source "crypto/Kconfig"
555diff -NurpP --minimal linux-3.4.48/arch/parisc/kernel/syscall_table.S linux-3.4.48-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 584diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
556--- linux-3.4.48/arch/parisc/kernel/syscall_table.S 2011-10-24 16:45:00.000000000 +0000 585index 3735abd..3f4faa3 100644
557+++ linux-3.4.48-vs2.3.3.9/arch/parisc/kernel/syscall_table.S 2012-05-21 16:15:04.000000000 +0000 586--- a/arch/parisc/kernel/syscall_table.S
587+++ b/arch/parisc/kernel/syscall_table.S
558@@ -361,7 +361,7 @@ 588@@ -361,7 +361,7 @@
559 ENTRY_COMP(mbind) /* 260 */ 589 ENTRY_COMP(mbind) /* 260 */
560 ENTRY_COMP(get_mempolicy) 590 ENTRY_COMP(get_mempolicy)
@@ -564,10 +594,11 @@ diff -NurpP --minimal linux-3.4.48/arch/parisc/kernel/syscall_table.S linux-3.4.
564 ENTRY_SAME(add_key) 594 ENTRY_SAME(add_key)
565 ENTRY_SAME(request_key) /* 265 */ 595 ENTRY_SAME(request_key) /* 265 */
566 ENTRY_SAME(keyctl) 596 ENTRY_SAME(keyctl)
567diff -NurpP --minimal linux-3.4.48/arch/parisc/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/parisc/kernel/traps.c 597diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
568--- linux-3.4.48/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000 598index 45ba99f..f380ca3 100644
569+++ linux-3.4.48-vs2.3.3.9/arch/parisc/kernel/traps.c 2012-05-21 16:15:04.000000000 +0000 599--- a/arch/parisc/kernel/traps.c
570@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ 600+++ b/arch/parisc/kernel/traps.c
601@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
571 if (err == 0) 602 if (err == 0)
572 return; /* STFU */ 603 return; /* STFU */
573 604
@@ -579,7 +610,7 @@ diff -NurpP --minimal linux-3.4.48/arch/parisc/kernel/traps.c linux-3.4.48-vs2.3
579 #ifdef PRINT_USER_FAULTS 610 #ifdef PRINT_USER_FAULTS
580 /* XXX for debugging only */ 611 /* XXX for debugging only */
581 show_regs(regs); 612 show_regs(regs);
582@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_ 613@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
583 pdc_console_restart(); 614 pdc_console_restart();
584 615
585 if (err) 616 if (err)
@@ -590,9 +621,10 @@ diff -NurpP --minimal linux-3.4.48/arch/parisc/kernel/traps.c linux-3.4.48-vs2.3
590 621
591 /* Wot's wrong wif bein' racy? */ 622 /* Wot's wrong wif bein' racy? */
592 if (current->thread.flags & PARISC_KERNEL_DEATH) { 623 if (current->thread.flags & PARISC_KERNEL_DEATH) {
593diff -NurpP --minimal linux-3.4.48/arch/parisc/mm/fault.c linux-3.4.48-vs2.3.3.9/arch/parisc/mm/fault.c 624diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
594--- linux-3.4.48/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000 625index 18162ce..41370f2 100644
595+++ linux-3.4.48-vs2.3.3.9/arch/parisc/mm/fault.c 2012-05-21 16:15:04.000000000 +0000 626--- a/arch/parisc/mm/fault.c
627+++ b/arch/parisc/mm/fault.c
596@@ -237,8 +237,9 @@ bad_area: 628@@ -237,8 +237,9 @@ bad_area:
597 629
598 #ifdef PRINT_USER_FAULTS 630 #ifdef PRINT_USER_FAULTS
@@ -605,9 +637,10 @@ diff -NurpP --minimal linux-3.4.48/arch/parisc/mm/fault.c linux-3.4.48-vs2.3.3.9
605 if (vma) { 637 if (vma) {
606 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", 638 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
607 vma->vm_start, vma->vm_end); 639 vma->vm_start, vma->vm_end);
608diff -NurpP --minimal linux-3.4.48/arch/powerpc/Kconfig linux-3.4.48-vs2.3.3.9/arch/powerpc/Kconfig 640diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
609--- linux-3.4.48/arch/powerpc/Kconfig 2012-05-21 16:06:28.000000000 +0000 641index feab3ba..48c1e14 100644
610+++ linux-3.4.48-vs2.3.3.9/arch/powerpc/Kconfig 2012-05-21 16:15:04.000000000 +0000 642--- a/arch/powerpc/Kconfig
643+++ b/arch/powerpc/Kconfig
611@@ -1002,6 +1002,8 @@ source "lib/Kconfig" 644@@ -1002,6 +1002,8 @@ source "lib/Kconfig"
612 645
613 source "arch/powerpc/Kconfig.debug" 646 source "arch/powerpc/Kconfig.debug"
@@ -617,9 +650,10 @@ diff -NurpP --minimal linux-3.4.48/arch/powerpc/Kconfig linux-3.4.48-vs2.3.3.9/a
617 source "security/Kconfig" 650 source "security/Kconfig"
618 651
619 config KEYS_COMPAT 652 config KEYS_COMPAT
620diff -NurpP --minimal linux-3.4.48/arch/powerpc/include/asm/unistd.h linux-3.4.48-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 653diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
621--- linux-3.4.48/arch/powerpc/include/asm/unistd.h 2012-01-09 15:14:05.000000000 +0000 654index d3d1b5e..c43e77b 100644
622+++ linux-3.4.48-vs2.3.3.9/arch/powerpc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 655--- a/arch/powerpc/include/asm/unistd.h
656+++ b/arch/powerpc/include/asm/unistd.h
623@@ -275,7 +275,7 @@ 657@@ -275,7 +275,7 @@
624 #endif 658 #endif
625 #define __NR_rtas 255 659 #define __NR_rtas 255
@@ -629,9 +663,10 @@ diff -NurpP --minimal linux-3.4.48/arch/powerpc/include/asm/unistd.h linux-3.4.4
629 #define __NR_migrate_pages 258 663 #define __NR_migrate_pages 258
630 #define __NR_mbind 259 664 #define __NR_mbind 259
631 #define __NR_get_mempolicy 260 665 #define __NR_get_mempolicy 260
632diff -NurpP --minimal linux-3.4.48/arch/powerpc/kernel/process.c linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/process.c 666diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
633--- linux-3.4.48/arch/powerpc/kernel/process.c 2013-06-13 08:59:15.000000000 +0000 667index c1aef40..f3784c8 100644
634+++ linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/process.c 2012-09-16 18:49:11.000000000 +0000 668--- a/arch/powerpc/kernel/process.c
669+++ b/arch/powerpc/kernel/process.c
635@@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs) 670@@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs)
636 #else 671 #else
637 printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); 672 printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -644,10 +679,11 @@ diff -NurpP --minimal linux-3.4.48/arch/powerpc/kernel/process.c linux-3.4.48-vs
644 679
645 #ifdef CONFIG_SMP 680 #ifdef CONFIG_SMP
646 printk(" CPU: %d", raw_smp_processor_id()); 681 printk(" CPU: %d", raw_smp_processor_id());
647diff -NurpP --minimal linux-3.4.48/arch/powerpc/kernel/traps.c linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/traps.c 682diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
648--- linux-3.4.48/arch/powerpc/kernel/traps.c 2013-06-13 08:59:15.000000000 +0000 683index 3bb7197..cef967d 100644
649+++ linux-3.4.48-vs2.3.3.9/arch/powerpc/kernel/traps.c 2013-06-13 09:46:37.000000000 +0000 684--- a/arch/powerpc/kernel/traps.c
650@@ -1119,8 +1119,9 @@ void nonrecoverable_exception(struct pt_ 685+++ b/arch/powerpc/kernel/traps.c
686@@ -1125,8 +1125,9 @@ void nonrecoverable_exception(struct pt_regs *regs)
651 687
652 void trace_syscall(struct pt_regs *regs) 688 void trace_syscall(struct pt_regs *regs)
653 { 689 {
@@ -659,9 +695,10 @@ diff -NurpP --minimal linux-3.4.48/arch/powerpc/kernel/traps.c linux-3.4.48-vs2.
659 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); 695 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
660 } 696 }
661 697
662diff -NurpP --minimal linux-3.4.48/arch/s390/Kconfig linux-3.4.48-vs2.3.3.9/arch/s390/Kconfig 698diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
663--- linux-3.4.48/arch/s390/Kconfig 2012-05-21 16:06:32.000000000 +0000 699index 9015060..4cf4f43 100644
664+++ linux-3.4.48-vs2.3.3.9/arch/s390/Kconfig 2012-05-21 16:15:04.000000000 +0000 700--- a/arch/s390/Kconfig
701+++ b/arch/s390/Kconfig
665@@ -639,6 +639,8 @@ source "fs/Kconfig" 702@@ -639,6 +639,8 @@ source "fs/Kconfig"
666 703
667 source "arch/s390/Kconfig.debug" 704 source "arch/s390/Kconfig.debug"
@@ -671,9 +708,10 @@ diff -NurpP --minimal linux-3.4.48/arch/s390/Kconfig linux-3.4.48-vs2.3.3.9/arch
671 source "security/Kconfig" 708 source "security/Kconfig"
672 709
673 source "crypto/Kconfig" 710 source "crypto/Kconfig"
674diff -NurpP --minimal linux-3.4.48/arch/s390/include/asm/tlb.h linux-3.4.48-vs2.3.3.9/arch/s390/include/asm/tlb.h 711diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h
675--- linux-3.4.48/arch/s390/include/asm/tlb.h 2012-05-21 16:06:32.000000000 +0000 712index 775a5ee..451d100 100644
676+++ linux-3.4.48-vs2.3.3.9/arch/s390/include/asm/tlb.h 2012-05-21 16:15:04.000000000 +0000 713--- a/arch/s390/include/asm/tlb.h
714+++ b/arch/s390/include/asm/tlb.h
677@@ -24,6 +24,7 @@ 715@@ -24,6 +24,7 @@
678 #include <linux/mm.h> 716 #include <linux/mm.h>
679 #include <linux/pagemap.h> 717 #include <linux/pagemap.h>
@@ -682,9 +720,10 @@ diff -NurpP --minimal linux-3.4.48/arch/s390/include/asm/tlb.h linux-3.4.48-vs2.
682 #include <asm/processor.h> 720 #include <asm/processor.h>
683 #include <asm/pgalloc.h> 721 #include <asm/pgalloc.h>
684 #include <asm/tlbflush.h> 722 #include <asm/tlbflush.h>
685diff -NurpP --minimal linux-3.4.48/arch/s390/include/asm/unistd.h linux-3.4.48-vs2.3.3.9/arch/s390/include/asm/unistd.h 723diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
686--- linux-3.4.48/arch/s390/include/asm/unistd.h 2012-03-19 18:46:48.000000000 +0000 724index 8a8008f..7e960e3 100644
687+++ linux-3.4.48-vs2.3.3.9/arch/s390/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 725--- a/arch/s390/include/asm/unistd.h
726+++ b/arch/s390/include/asm/unistd.h
688@@ -202,7 +202,7 @@ 727@@ -202,7 +202,7 @@
689 #define __NR_clock_gettime (__NR_timer_create+6) 728 #define __NR_clock_gettime (__NR_timer_create+6)
690 #define __NR_clock_getres (__NR_timer_create+7) 729 #define __NR_clock_getres (__NR_timer_create+7)
@@ -694,9 +733,10 @@ diff -NurpP --minimal linux-3.4.48/arch/s390/include/asm/unistd.h linux-3.4.48-v
694 #define __NR_statfs64 265 733 #define __NR_statfs64 265
695 #define __NR_fstatfs64 266 734 #define __NR_fstatfs64 266
696 #define __NR_remap_file_pages 267 735 #define __NR_remap_file_pages 267
697diff -NurpP --minimal linux-3.4.48/arch/s390/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/arch/s390/kernel/ptrace.c 736diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
698--- linux-3.4.48/arch/s390/kernel/ptrace.c 2012-05-21 16:06:32.000000000 +0000 737index 02f300f..cd5677e 100644
699+++ linux-3.4.48-vs2.3.3.9/arch/s390/kernel/ptrace.c 2012-05-21 16:15:04.000000000 +0000 738--- a/arch/s390/kernel/ptrace.c
739+++ b/arch/s390/kernel/ptrace.c
700@@ -21,6 +21,7 @@ 740@@ -21,6 +21,7 @@
701 #include <linux/tracehook.h> 741 #include <linux/tracehook.h>
702 #include <linux/seccomp.h> 742 #include <linux/seccomp.h>
@@ -705,10 +745,11 @@ diff -NurpP --minimal linux-3.4.48/arch/s390/kernel/ptrace.c linux-3.4.48-vs2.3.
705 #include <trace/syscall.h> 745 #include <trace/syscall.h>
706 #include <asm/segment.h> 746 #include <asm/segment.h>
707 #include <asm/page.h> 747 #include <asm/page.h>
708diff -NurpP --minimal linux-3.4.48/arch/s390/kernel/syscalls.S linux-3.4.48-vs2.3.3.9/arch/s390/kernel/syscalls.S 748diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
709--- linux-3.4.48/arch/s390/kernel/syscalls.S 2012-01-09 15:14:06.000000000 +0000 749index bcab2f0..6aa93ca 100644
710+++ linux-3.4.48-vs2.3.3.9/arch/s390/kernel/syscalls.S 2012-05-21 16:15:04.000000000 +0000 750--- a/arch/s390/kernel/syscalls.S
711@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett 751+++ b/arch/s390/kernel/syscalls.S
752@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_settime,sys32_clock_settime_wrapper)
712 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ 753 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
713 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) 754 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
714 SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper) 755 SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
@@ -717,9 +758,10 @@ diff -NurpP --minimal linux-3.4.48/arch/s390/kernel/syscalls.S linux-3.4.48-vs2.
717 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) 758 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
718 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) 759 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
719 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) 760 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
720diff -NurpP --minimal linux-3.4.48/arch/sh/Kconfig linux-3.4.48-vs2.3.3.9/arch/sh/Kconfig 761diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
721--- linux-3.4.48/arch/sh/Kconfig 2012-05-21 16:06:33.000000000 +0000 762index ff9e033..620d659 100644
722+++ linux-3.4.48-vs2.3.3.9/arch/sh/Kconfig 2012-05-21 16:15:04.000000000 +0000 763--- a/arch/sh/Kconfig
764+++ b/arch/sh/Kconfig
723@@ -905,6 +905,8 @@ source "fs/Kconfig" 765@@ -905,6 +905,8 @@ source "fs/Kconfig"
724 766
725 source "arch/sh/Kconfig.debug" 767 source "arch/sh/Kconfig.debug"
@@ -729,9 +771,10 @@ diff -NurpP --minimal linux-3.4.48/arch/sh/Kconfig linux-3.4.48-vs2.3.3.9/arch/s
729 source "security/Kconfig" 771 source "security/Kconfig"
730 772
731 source "crypto/Kconfig" 773 source "crypto/Kconfig"
732diff -NurpP --minimal linux-3.4.48/arch/sh/kernel/irq.c linux-3.4.48-vs2.3.3.9/arch/sh/kernel/irq.c 774diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
733--- linux-3.4.48/arch/sh/kernel/irq.c 2011-07-22 09:17:41.000000000 +0000 775index a3ee919..370c557 100644
734+++ linux-3.4.48-vs2.3.3.9/arch/sh/kernel/irq.c 2012-05-21 16:15:04.000000000 +0000 776--- a/arch/sh/kernel/irq.c
777+++ b/arch/sh/kernel/irq.c
735@@ -14,6 +14,7 @@ 778@@ -14,6 +14,7 @@
736 #include <linux/ftrace.h> 779 #include <linux/ftrace.h>
737 #include <linux/delay.h> 780 #include <linux/delay.h>
@@ -740,9 +783,10 @@ diff -NurpP --minimal linux-3.4.48/arch/sh/kernel/irq.c linux-3.4.48-vs2.3.3.9/a
740 #include <asm/processor.h> 783 #include <asm/processor.h>
741 #include <asm/machvec.h> 784 #include <asm/machvec.h>
742 #include <asm/uaccess.h> 785 #include <asm/uaccess.h>
743diff -NurpP --minimal linux-3.4.48/arch/sparc/Kconfig linux-3.4.48-vs2.3.3.9/arch/sparc/Kconfig 786diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
744--- linux-3.4.48/arch/sparc/Kconfig 2013-06-13 08:59:15.000000000 +0000 787index 76c7ccf..123bfcf 100644
745+++ linux-3.4.48-vs2.3.3.9/arch/sparc/Kconfig 2012-06-08 13:57:24.000000000 +0000 788--- a/arch/sparc/Kconfig
789+++ b/arch/sparc/Kconfig
746@@ -599,6 +599,8 @@ source "fs/Kconfig" 790@@ -599,6 +599,8 @@ source "fs/Kconfig"
747 791
748 source "arch/sparc/Kconfig.debug" 792 source "arch/sparc/Kconfig.debug"
@@ -752,9 +796,10 @@ diff -NurpP --minimal linux-3.4.48/arch/sparc/Kconfig linux-3.4.48-vs2.3.3.9/arc
752 source "security/Kconfig" 796 source "security/Kconfig"
753 797
754 source "crypto/Kconfig" 798 source "crypto/Kconfig"
755diff -NurpP --minimal linux-3.4.48/arch/sparc/include/asm/unistd.h linux-3.4.48-vs2.3.3.9/arch/sparc/include/asm/unistd.h 799diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
756--- linux-3.4.48/arch/sparc/include/asm/unistd.h 2012-01-09 15:14:07.000000000 +0000 800index c7cb0af..1f5c6d7 100644
757+++ linux-3.4.48-vs2.3.3.9/arch/sparc/include/asm/unistd.h 2012-05-21 16:15:04.000000000 +0000 801--- a/arch/sparc/include/asm/unistd.h
802+++ b/arch/sparc/include/asm/unistd.h
758@@ -335,7 +335,7 @@ 803@@ -335,7 +335,7 @@
759 #define __NR_timer_getoverrun 264 804 #define __NR_timer_getoverrun 264
760 #define __NR_timer_delete 265 805 #define __NR_timer_delete 265
@@ -764,9 +809,10 @@ diff -NurpP --minimal linux-3.4.48/arch/sparc/include/asm/unistd.h linux-3.4.48-
764 #define __NR_io_setup 268 809 #define __NR_io_setup 268
765 #define __NR_io_destroy 269 810 #define __NR_io_destroy 269
766 #define __NR_io_submit 270 811 #define __NR_io_submit 270
767diff -NurpP --minimal linux-3.4.48/arch/sparc/kernel/systbls_32.S linux-3.4.48-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 812diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
768--- linux-3.4.48/arch/sparc/kernel/systbls_32.S 2012-01-09 15:14:09.000000000 +0000 813index 63402f9..317e23c 100644
769+++ linux-3.4.48-vs2.3.3.9/arch/sparc/kernel/systbls_32.S 2012-05-21 16:15:04.000000000 +0000 814--- a/arch/sparc/kernel/systbls_32.S
815+++ b/arch/sparc/kernel/systbls_32.S
770@@ -70,7 +70,7 @@ sys_call_table: 816@@ -70,7 +70,7 @@ sys_call_table:
771 /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall 817 /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
772 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep 818 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -776,9 +822,10 @@ diff -NurpP --minimal linux-3.4.48/arch/sparc/kernel/systbls_32.S linux-3.4.48-v
776 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink 822 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
777 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid 823 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
778 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat 824 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
779diff -NurpP --minimal linux-3.4.48/arch/sparc/kernel/systbls_64.S linux-3.4.48-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 825diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
780--- linux-3.4.48/arch/sparc/kernel/systbls_64.S 2013-06-13 08:59:15.000000000 +0000 826index 3a58e0d..a782653 100644
781+++ linux-3.4.48-vs2.3.3.9/arch/sparc/kernel/systbls_64.S 2012-06-08 13:57:24.000000000 +0000 827--- a/arch/sparc/kernel/systbls_64.S
828+++ b/arch/sparc/kernel/systbls_64.S
782@@ -71,7 +71,7 @@ sys_call_table32: 829@@ -71,7 +71,7 @@ sys_call_table32:
783 /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall 830 /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
784 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep 831 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -797,9 +844,10 @@ diff -NurpP --minimal linux-3.4.48/arch/sparc/kernel/systbls_64.S linux-3.4.48-v
797 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink 844 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
798 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid 845 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
799 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat 846 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
800diff -NurpP --minimal linux-3.4.48/arch/um/Kconfig.rest linux-3.4.48-vs2.3.3.9/arch/um/Kconfig.rest 847diff --git a/arch/um/Kconfig.rest b/arch/um/Kconfig.rest
801--- linux-3.4.48/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000 848index 567eb5f..93eb92f 100644
802+++ linux-3.4.48-vs2.3.3.9/arch/um/Kconfig.rest 2012-05-21 16:15:04.000000000 +0000 849--- a/arch/um/Kconfig.rest
850+++ b/arch/um/Kconfig.rest
803@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" 851@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
804 852
805 source "fs/Kconfig" 853 source "fs/Kconfig"
@@ -809,9 +857,10 @@ diff -NurpP --minimal linux-3.4.48/arch/um/Kconfig.rest linux-3.4.48-vs2.3.3.9/a
809 source "security/Kconfig" 857 source "security/Kconfig"
810 858
811 source "crypto/Kconfig" 859 source "crypto/Kconfig"
812diff -NurpP --minimal linux-3.4.48/arch/x86/Kconfig linux-3.4.48-vs2.3.3.9/arch/x86/Kconfig 860diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
813--- linux-3.4.48/arch/x86/Kconfig 2013-06-13 08:59:16.000000000 +0000 861index b1478f4..0784cf7 100644
814+++ linux-3.4.48-vs2.3.3.9/arch/x86/Kconfig 2013-03-02 15:26:44.000000000 +0000 862--- a/arch/x86/Kconfig
863+++ b/arch/x86/Kconfig
815@@ -2221,6 +2221,8 @@ source "fs/Kconfig" 864@@ -2221,6 +2221,8 @@ source "fs/Kconfig"
816 865
817 source "arch/x86/Kconfig.debug" 866 source "arch/x86/Kconfig.debug"
@@ -821,9 +870,10 @@ diff -NurpP --minimal linux-3.4.48/arch/x86/Kconfig linux-3.4.48-vs2.3.3.9/arch/
821 source "security/Kconfig" 870 source "security/Kconfig"
822 871
823 source "crypto/Kconfig" 872 source "crypto/Kconfig"
824diff -NurpP --minimal linux-3.4.48/arch/x86/syscalls/syscall_32.tbl linux-3.4.48-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 873diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
825--- linux-3.4.48/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:06:42.000000000 +0000 874index 29f9f05..60f2ef1 100644
826+++ linux-3.4.48-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl 2012-05-21 16:15:04.000000000 +0000 875--- a/arch/x86/syscalls/syscall_32.tbl
876+++ b/arch/x86/syscalls/syscall_32.tbl
827@@ -279,7 +279,7 @@ 877@@ -279,7 +279,7 @@
828 270 i386 tgkill sys_tgkill 878 270 i386 tgkill sys_tgkill
829 271 i386 utimes sys_utimes compat_sys_utimes 879 271 i386 utimes sys_utimes compat_sys_utimes
@@ -833,9 +883,10 @@ diff -NurpP --minimal linux-3.4.48/arch/x86/syscalls/syscall_32.tbl linux-3.4.48
833 274 i386 mbind sys_mbind 883 274 i386 mbind sys_mbind
834 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 884 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
835 276 i386 set_mempolicy sys_set_mempolicy 885 276 i386 set_mempolicy sys_set_mempolicy
836diff -NurpP --minimal linux-3.4.48/arch/x86/syscalls/syscall_64.tbl linux-3.4.48-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 886diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl
837--- linux-3.4.48/arch/x86/syscalls/syscall_64.tbl 2013-06-13 08:59:16.000000000 +0000 887index fd1f103..cd47b1e 100644
838+++ linux-3.4.48-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl 2012-09-16 18:49:11.000000000 +0000 888--- a/arch/x86/syscalls/syscall_64.tbl
889+++ b/arch/x86/syscalls/syscall_64.tbl
839@@ -242,7 +242,7 @@ 890@@ -242,7 +242,7 @@
840 233 common epoll_ctl sys_epoll_ctl 891 233 common epoll_ctl sys_epoll_ctl
841 234 common tgkill sys_tgkill 892 234 common tgkill sys_tgkill
@@ -845,9 +896,10 @@ diff -NurpP --minimal linux-3.4.48/arch/x86/syscalls/syscall_64.tbl linux-3.4.48
845 237 common mbind sys_mbind 896 237 common mbind sys_mbind
846 238 common set_mempolicy sys_set_mempolicy 897 238 common set_mempolicy sys_set_mempolicy
847 239 common get_mempolicy sys_get_mempolicy 898 239 common get_mempolicy sys_get_mempolicy
848diff -NurpP --minimal linux-3.4.48/drivers/block/Kconfig linux-3.4.48-vs2.3.3.9/drivers/block/Kconfig 899diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
849--- linux-3.4.48/drivers/block/Kconfig 2012-05-21 16:06:43.000000000 +0000 900index a796407..9bbef0b 100644
850+++ linux-3.4.48-vs2.3.3.9/drivers/block/Kconfig 2012-05-21 16:15:04.000000000 +0000 901--- a/drivers/block/Kconfig
902+++ b/drivers/block/Kconfig
851@@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP 903@@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP
852 904
853 source "drivers/block/drbd/Kconfig" 905 source "drivers/block/drbd/Kconfig"
@@ -862,9 +914,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/Kconfig linux-3.4.48-vs2.3.3.9/
862 config BLK_DEV_NBD 914 config BLK_DEV_NBD
863 tristate "Network block device support" 915 tristate "Network block device support"
864 depends on NET 916 depends on NET
865diff -NurpP --minimal linux-3.4.48/drivers/block/Makefile linux-3.4.48-vs2.3.3.9/drivers/block/Makefile 917diff --git a/drivers/block/Makefile b/drivers/block/Makefile
866--- linux-3.4.48/drivers/block/Makefile 2012-03-19 18:46:52.000000000 +0000 918index 5b79505..eb19a27 100644
867+++ linux-3.4.48-vs2.3.3.9/drivers/block/Makefile 2012-05-21 16:15:04.000000000 +0000 919--- a/drivers/block/Makefile
920+++ b/drivers/block/Makefile
868@@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o 921@@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
869 obj-$(CONFIG_BLK_DEV_SX8) += sx8.o 922 obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
870 obj-$(CONFIG_BLK_DEV_UB) += ub.o 923 obj-$(CONFIG_BLK_DEV_UB) += ub.o
@@ -873,9 +926,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/Makefile linux-3.4.48-vs2.3.3.9
873 926
874 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o 927 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
875 obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ 928 obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
876diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/drivers/block/loop.c 929diff --git a/drivers/block/loop.c b/drivers/block/loop.c
877--- linux-3.4.48/drivers/block/loop.c 2013-06-13 08:59:17.000000000 +0000 930index 179b5b4..a718b5d 100644
878+++ linux-3.4.48-vs2.3.3.9/drivers/block/loop.c 2013-06-13 09:46:37.000000000 +0000 931--- a/drivers/block/loop.c
932+++ b/drivers/block/loop.c
879@@ -76,6 +76,7 @@ 933@@ -76,6 +76,7 @@
880 #include <linux/sysfs.h> 934 #include <linux/sysfs.h>
881 #include <linux/miscdevice.h> 935 #include <linux/miscdevice.h>
@@ -884,7 +938,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/d
884 938
885 #include <asm/uaccess.h> 939 #include <asm/uaccess.h>
886 940
887@@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_devic 941@@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
888 lo->lo_blocksize = lo_blocksize; 942 lo->lo_blocksize = lo_blocksize;
889 lo->lo_device = bdev; 943 lo->lo_device = bdev;
890 lo->lo_flags = lo_flags; 944 lo->lo_flags = lo_flags;
@@ -892,7 +946,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/d
892 lo->lo_backing_file = file; 946 lo->lo_backing_file = file;
893 lo->transfer = transfer_none; 947 lo->transfer = transfer_none;
894 lo->ioctl = NULL; 948 lo->ioctl = NULL;
895@@ -1001,6 +1003,7 @@ static int loop_clr_fd(struct loop_devic 949@@ -1006,6 +1008,7 @@ static int loop_clr_fd(struct loop_device *lo)
896 lo->lo_sizelimit = 0; 950 lo->lo_sizelimit = 0;
897 lo->lo_encrypt_key_size = 0; 951 lo->lo_encrypt_key_size = 0;
898 lo->lo_thread = NULL; 952 lo->lo_thread = NULL;
@@ -900,7 +954,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/d
900 memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); 954 memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
901 memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); 955 memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
902 memset(lo->lo_file_name, 0, LO_NAME_SIZE); 956 memset(lo->lo_file_name, 0, LO_NAME_SIZE);
903@@ -1042,7 +1045,7 @@ loop_set_status(struct loop_device *lo, 957@@ -1049,7 +1052,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
904 958
905 if (lo->lo_encrypt_key_size && 959 if (lo->lo_encrypt_key_size &&
906 lo->lo_key_owner != uid && 960 lo->lo_key_owner != uid &&
@@ -909,7 +963,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/d
909 return -EPERM; 963 return -EPERM;
910 if (lo->lo_state != Lo_bound) 964 if (lo->lo_state != Lo_bound)
911 return -ENXIO; 965 return -ENXIO;
912@@ -1132,7 +1135,8 @@ loop_get_status(struct loop_device *lo, 966@@ -1139,7 +1142,8 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info)
913 memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE); 967 memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
914 info->lo_encrypt_type = 968 info->lo_encrypt_type =
915 lo->lo_encryption ? lo->lo_encryption->number : 0; 969 lo->lo_encryption ? lo->lo_encryption->number : 0;
@@ -919,7 +973,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/d
919 info->lo_encrypt_key_size = lo->lo_encrypt_key_size; 973 info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
920 memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, 974 memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
921 lo->lo_encrypt_key_size); 975 lo->lo_encrypt_key_size);
922@@ -1490,6 +1494,11 @@ static int lo_open(struct block_device * 976@@ -1497,6 +1501,11 @@ static int lo_open(struct block_device *bdev, fmode_t mode)
923 goto out; 977 goto out;
924 } 978 }
925 979
@@ -931,9 +985,11 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/loop.c linux-3.4.48-vs2.3.3.9/d
931 mutex_lock(&lo->lo_ctl_mutex); 985 mutex_lock(&lo->lo_ctl_mutex);
932 lo->lo_refcnt++; 986 lo->lo_refcnt++;
933 mutex_unlock(&lo->lo_ctl_mutex); 987 mutex_unlock(&lo->lo_ctl_mutex);
934diff -NurpP --minimal linux-3.4.48/drivers/block/vroot.c linux-3.4.48-vs2.3.3.9/drivers/block/vroot.c 988diff --git a/drivers/block/vroot.c b/drivers/block/vroot.c
935--- linux-3.4.48/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 989new file mode 100644
936+++ linux-3.4.48-vs2.3.3.9/drivers/block/vroot.c 2012-05-21 16:15:04.000000000 +0000 990index 0000000..942ad53
991--- /dev/null
992+++ b/drivers/block/vroot.c
937@@ -0,0 +1,291 @@ 993@@ -0,0 +1,291 @@
938+/* 994+/*
939+ * linux/drivers/block/vroot.c 995+ * linux/drivers/block/vroot.c
@@ -1226,9 +1282,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/block/vroot.c linux-3.4.48-vs2.3.3.9/
1226+ 1282+
1227+#endif 1283+#endif
1228+ 1284+
1229diff -NurpP --minimal linux-3.4.48/drivers/infiniband/Kconfig linux-3.4.48-vs2.3.3.9/drivers/infiniband/Kconfig 1285diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
1230--- linux-3.4.48/drivers/infiniband/Kconfig 2012-03-19 18:46:54.000000000 +0000 1286index eb0add3..bc760cb 100644
1231+++ linux-3.4.48-vs2.3.3.9/drivers/infiniband/Kconfig 2012-05-21 16:15:04.000000000 +0000 1287--- a/drivers/infiniband/Kconfig
1288+++ b/drivers/infiniband/Kconfig
1232@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM 1289@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
1233 config INFINIBAND_ADDR_TRANS 1290 config INFINIBAND_ADDR_TRANS
1234 bool 1291 bool
@@ -1238,10 +1295,11 @@ diff -NurpP --minimal linux-3.4.48/drivers/infiniband/Kconfig linux-3.4.48-vs2.3
1238 default y 1295 default y
1239 1296
1240 source "drivers/infiniband/hw/mthca/Kconfig" 1297 source "drivers/infiniband/hw/mthca/Kconfig"
1241diff -NurpP --minimal linux-3.4.48/drivers/infiniband/core/addr.c linux-3.4.48-vs2.3.3.9/drivers/infiniband/core/addr.c 1298diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
1242--- linux-3.4.48/drivers/infiniband/core/addr.c 2012-05-21 16:06:46.000000000 +0000 1299index 6ef660c..409b035 100644
1243+++ linux-3.4.48-vs2.3.3.9/drivers/infiniband/core/addr.c 2012-05-21 16:15:04.000000000 +0000 1300--- a/drivers/infiniband/core/addr.c
1244@@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr 1301+++ b/drivers/infiniband/core/addr.c
1302@@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
1245 1303
1246 if (ipv6_addr_any(&fl6.saddr)) { 1304 if (ipv6_addr_any(&fl6.saddr)) {
1247 ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, 1305 ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
@@ -1250,9 +1308,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/infiniband/core/addr.c linux-3.4.48-v
1250 if (ret) 1308 if (ret)
1251 goto put; 1309 goto put;
1252 1310
1253diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/drivers/md/dm-ioctl.c 1311diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
1254--- linux-3.4.48/drivers/md/dm-ioctl.c 2013-06-13 08:59:20.000000000 +0000 1312index f011d4b..724cc20 100644
1255+++ linux-3.4.48-vs2.3.3.9/drivers/md/dm-ioctl.c 2013-02-11 23:37:30.000000000 +0000 1313--- a/drivers/md/dm-ioctl.c
1314+++ b/drivers/md/dm-ioctl.c
1256@@ -16,6 +16,7 @@ 1315@@ -16,6 +16,7 @@
1257 #include <linux/dm-ioctl.h> 1316 #include <linux/dm-ioctl.h>
1258 #include <linux/hdreg.h> 1317 #include <linux/hdreg.h>
@@ -1261,7 +1320,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1261 1320
1262 #include <asm/uaccess.h> 1321 #include <asm/uaccess.h>
1263 1322
1264@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell 1323@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell(const char *str)
1265 unsigned int h = hash_str(str); 1324 unsigned int h = hash_str(str);
1266 1325
1267 list_for_each_entry (hc, _name_buckets + h, name_list) 1326 list_for_each_entry (hc, _name_buckets + h, name_list)
@@ -1271,7 +1330,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1271 dm_get(hc->md); 1330 dm_get(hc->md);
1272 return hc; 1331 return hc;
1273 } 1332 }
1274@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell 1333@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell(const char *str)
1275 unsigned int h = hash_str(str); 1334 unsigned int h = hash_str(str);
1276 1335
1277 list_for_each_entry (hc, _uuid_buckets + h, uuid_list) 1336 list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
@@ -1281,7 +1340,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1281 dm_get(hc->md); 1340 dm_get(hc->md);
1282 return hc; 1341 return hc;
1283 } 1342 }
1284@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell 1343@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell(const char *str)
1285 static struct hash_cell *__get_dev_cell(uint64_t dev) 1344 static struct hash_cell *__get_dev_cell(uint64_t dev)
1286 { 1345 {
1287 struct mapped_device *md; 1346 struct mapped_device *md;
@@ -1299,7 +1358,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1299 if (!hc) { 1358 if (!hc) {
1300 dm_put(md); 1359 dm_put(md);
1301 return NULL; 1360 return NULL;
1302@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl 1361@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl *param, size_t param_size);
1303 1362
1304 static int remove_all(struct dm_ioctl *param, size_t param_size) 1363 static int remove_all(struct dm_ioctl *param, size_t param_size)
1305 { 1364 {
@@ -1309,7 +1368,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1309 dm_hash_remove_all(1); 1368 dm_hash_remove_all(1);
1310 param->data_size = 0; 1369 param->data_size = 0;
1311 return 0; 1370 return 0;
1312@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl 1371@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl *param, size_t param_size)
1313 */ 1372 */
1314 for (i = 0; i < NUM_BUCKETS; i++) { 1373 for (i = 0; i < NUM_BUCKETS; i++) {
1315 list_for_each_entry (hc, _name_buckets + i, name_list) { 1374 list_for_each_entry (hc, _name_buckets + i, name_list) {
@@ -1318,7 +1377,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1318 needed += sizeof(struct dm_name_list); 1377 needed += sizeof(struct dm_name_list);
1319 needed += strlen(hc->name) + 1; 1378 needed += strlen(hc->name) + 1;
1320 needed += ALIGN_MASK; 1379 needed += ALIGN_MASK;
1321@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl 1380@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl *param, size_t param_size)
1322 */ 1381 */
1323 for (i = 0; i < NUM_BUCKETS; i++) { 1382 for (i = 0; i < NUM_BUCKETS; i++) {
1324 list_for_each_entry (hc, _name_buckets + i, name_list) { 1383 list_for_each_entry (hc, _name_buckets + i, name_list) {
@@ -1327,7 +1386,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1327 if (old_nl) 1386 if (old_nl)
1328 old_nl->next = (uint32_t) ((void *) nl - 1387 old_nl->next = (uint32_t) ((void *) nl -
1329 (void *) old_nl); 1388 (void *) old_nl);
1330@@ -1624,8 +1636,8 @@ static int ctl_ioctl(uint command, struc 1389@@ -1624,8 +1636,8 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user)
1331 ioctl_fn fn = NULL; 1390 ioctl_fn fn = NULL;
1332 size_t input_param_size; 1391 size_t input_param_size;
1333 1392
@@ -1338,9 +1397,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm-ioctl.c linux-3.4.48-vs2.3.3.9/
1338 return -EACCES; 1397 return -EACCES;
1339 1398
1340 if (_IOC_TYPE(command) != DM_IOCTL) 1399 if (_IOC_TYPE(command) != DM_IOCTL)
1341diff -NurpP --minimal linux-3.4.48/drivers/md/dm.c linux-3.4.48-vs2.3.3.9/drivers/md/dm.c 1400diff --git a/drivers/md/dm.c b/drivers/md/dm.c
1342--- linux-3.4.48/drivers/md/dm.c 2013-06-13 08:59:20.000000000 +0000 1401index 32370ea..d700817 100644
1343+++ linux-3.4.48-vs2.3.3.9/drivers/md/dm.c 2012-12-08 00:53:53.000000000 +0000 1402--- a/drivers/md/dm.c
1403+++ b/drivers/md/dm.c
1344@@ -19,6 +19,7 @@ 1404@@ -19,6 +19,7 @@
1345 #include <linux/idr.h> 1405 #include <linux/idr.h>
1346 #include <linux/hdreg.h> 1406 #include <linux/hdreg.h>
@@ -1357,7 +1417,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm.c linux-3.4.48-vs2.3.3.9/driver
1357 1417
1358 unsigned long flags; 1418 unsigned long flags;
1359 1419
1360@@ -343,6 +345,7 @@ int dm_deleting_md(struct mapped_device 1420@@ -343,6 +345,7 @@ int dm_deleting_md(struct mapped_device *md)
1361 static int dm_blk_open(struct block_device *bdev, fmode_t mode) 1421 static int dm_blk_open(struct block_device *bdev, fmode_t mode)
1362 { 1422 {
1363 struct mapped_device *md; 1423 struct mapped_device *md;
@@ -1365,7 +1425,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm.c linux-3.4.48-vs2.3.3.9/driver
1365 1425
1366 spin_lock(&_minor_lock); 1426 spin_lock(&_minor_lock);
1367 1427
1368@@ -351,18 +354,19 @@ static int dm_blk_open(struct block_devi 1428@@ -351,18 +354,19 @@ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
1369 goto out; 1429 goto out;
1370 1430
1371 if (test_bit(DMF_FREEING, &md->flags) || 1431 if (test_bit(DMF_FREEING, &md->flags) ||
@@ -1391,7 +1451,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm.c linux-3.4.48-vs2.3.3.9/driver
1391 } 1451 }
1392 1452
1393 static int dm_blk_close(struct gendisk *disk, fmode_t mode) 1453 static int dm_blk_close(struct gendisk *disk, fmode_t mode)
1394@@ -583,6 +587,14 @@ int dm_set_geometry(struct mapped_device 1454@@ -583,6 +587,14 @@ int dm_set_geometry(struct mapped_device *md, struct hd_geometry *geo)
1395 return 0; 1455 return 0;
1396 } 1456 }
1397 1457
@@ -1406,7 +1466,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm.c linux-3.4.48-vs2.3.3.9/driver
1406 /*----------------------------------------------------------------- 1466 /*-----------------------------------------------------------------
1407 * CRUD START: 1467 * CRUD START:
1408 * A more elegant soln is in the works that uses the queue 1468 * A more elegant soln is in the works that uses the queue
1409@@ -1876,6 +1888,7 @@ static struct mapped_device *alloc_dev(i 1469@@ -1876,6 +1888,7 @@ static struct mapped_device *alloc_dev(int minor)
1410 INIT_LIST_HEAD(&md->uevent_list); 1470 INIT_LIST_HEAD(&md->uevent_list);
1411 spin_lock_init(&md->uevent_lock); 1471 spin_lock_init(&md->uevent_lock);
1412 1472
@@ -1414,9 +1474,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm.c linux-3.4.48-vs2.3.3.9/driver
1414 md->queue = blk_alloc_queue(GFP_KERNEL); 1474 md->queue = blk_alloc_queue(GFP_KERNEL);
1415 if (!md->queue) 1475 if (!md->queue)
1416 goto bad_queue; 1476 goto bad_queue;
1417diff -NurpP --minimal linux-3.4.48/drivers/md/dm.h linux-3.4.48-vs2.3.3.9/drivers/md/dm.h 1477diff --git a/drivers/md/dm.h b/drivers/md/dm.h
1418--- linux-3.4.48/drivers/md/dm.h 2012-01-09 15:14:21.000000000 +0000 1478index b7dacd5..8afbf20 100644
1419+++ linux-3.4.48-vs2.3.3.9/drivers/md/dm.h 2012-05-21 16:15:04.000000000 +0000 1479--- a/drivers/md/dm.h
1480+++ b/drivers/md/dm.h
1420@@ -41,6 +41,8 @@ struct dm_dev_internal { 1481@@ -41,6 +41,8 @@ struct dm_dev_internal {
1421 struct dm_table; 1482 struct dm_table;
1422 struct dm_md_mempools; 1483 struct dm_md_mempools;
@@ -1426,9 +1487,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/md/dm.h linux-3.4.48-vs2.3.3.9/driver
1426 /*----------------------------------------------------------------- 1487 /*-----------------------------------------------------------------
1427 * Internal table functions. 1488 * Internal table functions.
1428 *---------------------------------------------------------------*/ 1489 *---------------------------------------------------------------*/
1429diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/drivers/net/tun.c 1490diff --git a/drivers/net/tun.c b/drivers/net/tun.c
1430--- linux-3.4.48/drivers/net/tun.c 2013-06-13 08:59:22.000000000 +0000 1491index c896b8f..9766b23 100644
1431+++ linux-3.4.48-vs2.3.3.9/drivers/net/tun.c 2013-03-30 21:29:17.000000000 +0000 1492--- a/drivers/net/tun.c
1493+++ b/drivers/net/tun.c
1432@@ -64,6 +64,7 @@ 1494@@ -64,6 +64,7 @@
1433 #include <linux/nsproxy.h> 1495 #include <linux/nsproxy.h>
1434 #include <linux/virtio_net.h> 1496 #include <linux/virtio_net.h>
@@ -1445,7 +1507,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/driv
1445 1507
1446 struct net_device *dev; 1508 struct net_device *dev;
1447 netdev_features_t set_features; 1509 netdev_features_t set_features;
1448@@ -912,6 +914,7 @@ static void tun_setup(struct net_device 1510@@ -912,6 +914,7 @@ static void tun_setup(struct net_device *dev)
1449 1511
1450 tun->owner = -1; 1512 tun->owner = -1;
1451 tun->group = -1; 1513 tun->group = -1;
@@ -1453,7 +1515,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/driv
1453 1515
1454 dev->ethtool_ops = &tun_ethtool_ops; 1516 dev->ethtool_ops = &tun_ethtool_ops;
1455 dev->destructor = tun_free_netdev; 1517 dev->destructor = tun_free_netdev;
1456@@ -1070,7 +1073,7 @@ static int tun_set_iff(struct net *net, 1518@@ -1070,7 +1073,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
1457 1519
1458 if (((tun->owner != -1 && cred->euid != tun->owner) || 1520 if (((tun->owner != -1 && cred->euid != tun->owner) ||
1459 (tun->group != -1 && !in_egroup_p(tun->group))) && 1521 (tun->group != -1 && !in_egroup_p(tun->group))) &&
@@ -1462,7 +1524,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/driv
1462 return -EPERM; 1524 return -EPERM;
1463 err = security_tun_dev_attach(tun->socket.sk); 1525 err = security_tun_dev_attach(tun->socket.sk);
1464 if (err < 0) 1526 if (err < 0)
1465@@ -1084,7 +1087,7 @@ static int tun_set_iff(struct net *net, 1527@@ -1084,7 +1087,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
1466 char *name; 1528 char *name;
1467 unsigned long flags = 0; 1529 unsigned long flags = 0;
1468 1530
@@ -1471,7 +1533,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/driv
1471 return -EPERM; 1533 return -EPERM;
1472 err = security_tun_dev_create(); 1534 err = security_tun_dev_create();
1473 if (err < 0) 1535 if (err < 0)
1474@@ -1154,6 +1157,9 @@ static int tun_set_iff(struct net *net, 1536@@ -1154,6 +1157,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
1475 1537
1476 sk->sk_destruct = tun_sock_destruct; 1538 sk->sk_destruct = tun_sock_destruct;
1477 1539
@@ -1481,7 +1543,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/driv
1481 err = tun_attach(tun, file); 1543 err = tun_attach(tun, file);
1482 if (err < 0) 1544 if (err < 0)
1483 goto failed; 1545 goto failed;
1484@@ -1337,6 +1343,16 @@ static long __tun_chr_ioctl(struct file 1546@@ -1337,6 +1343,16 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
1485 tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group); 1547 tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
1486 break; 1548 break;
1487 1549
@@ -1498,9 +1560,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/net/tun.c linux-3.4.48-vs2.3.3.9/driv
1498 case TUNSETLINK: 1560 case TUNSETLINK:
1499 /* Only allow setting the type when the interface is down */ 1561 /* Only allow setting the type when the interface is down */
1500 if (tun->dev->flags & IFF_UP) { 1562 if (tun->dev->flags & IFF_UP) {
1501diff -NurpP --minimal linux-3.4.48/drivers/tty/sysrq.c linux-3.4.48-vs2.3.3.9/drivers/tty/sysrq.c 1563diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
1502--- linux-3.4.48/drivers/tty/sysrq.c 2012-05-21 16:07:16.000000000 +0000 1564index 05728894..00e0d96 100644
1503+++ linux-3.4.48-vs2.3.3.9/drivers/tty/sysrq.c 2012-05-21 16:15:04.000000000 +0000 1565--- a/drivers/tty/sysrq.c
1566+++ b/drivers/tty/sysrq.c
1504@@ -41,6 +41,7 @@ 1567@@ -41,6 +41,7 @@
1505 #include <linux/slab.h> 1568 #include <linux/slab.h>
1506 #include <linux/input.h> 1569 #include <linux/input.h>
@@ -1509,7 +1572,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/tty/sysrq.c linux-3.4.48-vs2.3.3.9/dr
1509 1572
1510 #include <asm/ptrace.h> 1573 #include <asm/ptrace.h>
1511 #include <asm/irq_regs.h> 1574 #include <asm/irq_regs.h>
1512@@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op 1575@@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op = {
1513 .enable_mask = SYSRQ_ENABLE_RTNICE, 1576 .enable_mask = SYSRQ_ENABLE_RTNICE,
1514 }; 1577 };
1515 1578
@@ -1531,7 +1594,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/tty/sysrq.c linux-3.4.48-vs2.3.3.9/dr
1531 /* Key Operations table and lock */ 1594 /* Key Operations table and lock */
1532 static DEFINE_SPINLOCK(sysrq_key_table_lock); 1595 static DEFINE_SPINLOCK(sysrq_key_table_lock);
1533 1596
1534@@ -452,7 +468,11 @@ static struct sysrq_key_op *sysrq_key_ta 1597@@ -452,7 +468,11 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
1535 NULL, /* v */ 1598 NULL, /* v */
1536 &sysrq_showstate_blocked_op, /* w */ 1599 &sysrq_showstate_blocked_op, /* w */
1537 /* x: May be registered on ppc/powerpc for xmon */ 1600 /* x: May be registered on ppc/powerpc for xmon */
@@ -1543,7 +1606,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/tty/sysrq.c linux-3.4.48-vs2.3.3.9/dr
1543 /* y: May be registered on sparc64 for global register dump */ 1606 /* y: May be registered on sparc64 for global register dump */
1544 NULL, /* y */ 1607 NULL, /* y */
1545 &sysrq_ftrace_dump_op, /* z */ 1608 &sysrq_ftrace_dump_op, /* z */
1546@@ -467,6 +487,8 @@ static int sysrq_key_table_key2index(int 1609@@ -467,6 +487,8 @@ static int sysrq_key_table_key2index(int key)
1547 retval = key - '0'; 1610 retval = key - '0';
1548 else if ((key >= 'a') && (key <= 'z')) 1611 else if ((key >= 'a') && (key <= 'z'))
1549 retval = key + 10 - 'a'; 1612 retval = key + 10 - 'a';
@@ -1552,9 +1615,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/tty/sysrq.c linux-3.4.48-vs2.3.3.9/dr
1552 else 1615 else
1553 retval = -1; 1616 retval = -1;
1554 return retval; 1617 return retval;
1555diff -NurpP --minimal linux-3.4.48/drivers/tty/tty_io.c linux-3.4.48-vs2.3.3.9/drivers/tty/tty_io.c 1618diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
1556--- linux-3.4.48/drivers/tty/tty_io.c 2012-05-21 16:07:16.000000000 +0000 1619index b28d635..3cf9232 100644
1557+++ linux-3.4.48-vs2.3.3.9/drivers/tty/tty_io.c 2013-06-13 09:46:38.000000000 +0000 1620--- a/drivers/tty/tty_io.c
1621+++ b/drivers/tty/tty_io.c
1558@@ -104,6 +104,7 @@ 1622@@ -104,6 +104,7 @@
1559 1623
1560 #include <linux/kmod.h> 1624 #include <linux/kmod.h>
@@ -1563,7 +1627,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/tty/tty_io.c linux-3.4.48-vs2.3.3.9/d
1563 1627
1564 #undef TTY_DEBUG_HANGUP 1628 #undef TTY_DEBUG_HANGUP
1565 1629
1566@@ -2118,7 +2119,8 @@ static int tiocsti(struct tty_struct *tt 1630@@ -2128,7 +2129,8 @@ static int tiocsti(struct tty_struct *tty, char __user *p)
1567 char ch, mbz = 0; 1631 char ch, mbz = 0;
1568 struct tty_ldisc *ld; 1632 struct tty_ldisc *ld;
1569 1633
@@ -1573,7 +1637,7 @@ diff -NurpP --minimal linux-3.4.48/drivers/tty/tty_io.c linux-3.4.48-vs2.3.3.9/d
1573 return -EPERM; 1637 return -EPERM;
1574 if (get_user(ch, p)) 1638 if (get_user(ch, p))
1575 return -EFAULT; 1639 return -EFAULT;
1576@@ -2406,6 +2408,7 @@ static int tiocspgrp(struct tty_struct * 1640@@ -2416,6 +2418,7 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t
1577 return -ENOTTY; 1641 return -ENOTTY;
1578 if (get_user(pgrp_nr, p)) 1642 if (get_user(pgrp_nr, p))
1579 return -EFAULT; 1643 return -EFAULT;
@@ -1581,9 +1645,10 @@ diff -NurpP --minimal linux-3.4.48/drivers/tty/tty_io.c linux-3.4.48-vs2.3.3.9/d
1581 if (pgrp_nr < 0) 1645 if (pgrp_nr < 0)
1582 return -EINVAL; 1646 return -EINVAL;
1583 rcu_read_lock(); 1647 rcu_read_lock();
1584diff -NurpP --minimal linux-3.4.48/fs/attr.c linux-3.4.48-vs2.3.3.9/fs/attr.c 1648diff --git a/fs/attr.c b/fs/attr.c
1585--- linux-3.4.48/fs/attr.c 2013-06-13 08:59:31.000000000 +0000 1649index d94d1b6..465c795 100644
1586+++ linux-3.4.48-vs2.3.3.9/fs/attr.c 2012-06-28 14:45:07.000000000 +0000 1650--- a/fs/attr.c
1651+++ b/fs/attr.c
1587@@ -14,6 +14,9 @@ 1652@@ -14,6 +14,9 @@
1588 #include <linux/fcntl.h> 1653 #include <linux/fcntl.h>
1589 #include <linux/security.h> 1654 #include <linux/security.h>
@@ -1594,7 +1659,7 @@ diff -NurpP --minimal linux-3.4.48/fs/attr.c linux-3.4.48-vs2.3.3.9/fs/attr.c
1594 1659
1595 /** 1660 /**
1596 * inode_change_ok - check if attribute changes to an inode are allowed 1661 * inode_change_ok - check if attribute changes to an inode are allowed
1597@@ -74,6 +77,10 @@ int inode_change_ok(const struct inode * 1662@@ -74,6 +77,10 @@ int inode_change_ok(const struct inode *inode, struct iattr *attr)
1598 return -EPERM; 1663 return -EPERM;
1599 } 1664 }
1600 1665
@@ -1605,7 +1670,7 @@ diff -NurpP --minimal linux-3.4.48/fs/attr.c linux-3.4.48-vs2.3.3.9/fs/attr.c
1605 return 0; 1670 return 0;
1606 } 1671 }
1607 EXPORT_SYMBOL(inode_change_ok); 1672 EXPORT_SYMBOL(inode_change_ok);
1608@@ -144,6 +151,8 @@ void setattr_copy(struct inode *inode, c 1673@@ -144,6 +151,8 @@ void setattr_copy(struct inode *inode, const struct iattr *attr)
1609 inode->i_uid = attr->ia_uid; 1674 inode->i_uid = attr->ia_uid;
1610 if (ia_valid & ATTR_GID) 1675 if (ia_valid & ATTR_GID)
1611 inode->i_gid = attr->ia_gid; 1676 inode->i_gid = attr->ia_gid;
@@ -1614,7 +1679,7 @@ diff -NurpP --minimal linux-3.4.48/fs/attr.c linux-3.4.48-vs2.3.3.9/fs/attr.c
1614 if (ia_valid & ATTR_ATIME) 1679 if (ia_valid & ATTR_ATIME)
1615 inode->i_atime = timespec_trunc(attr->ia_atime, 1680 inode->i_atime = timespec_trunc(attr->ia_atime,
1616 inode->i_sb->s_time_gran); 1681 inode->i_sb->s_time_gran);
1617@@ -171,7 +180,8 @@ int notify_change(struct dentry * dentry 1682@@ -171,7 +180,8 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
1618 struct timespec now; 1683 struct timespec now;
1619 unsigned int ia_valid = attr->ia_valid; 1684 unsigned int ia_valid = attr->ia_valid;
1620 1685
@@ -1624,9 +1689,10 @@ diff -NurpP --minimal linux-3.4.48/fs/attr.c linux-3.4.48-vs2.3.3.9/fs/attr.c
1624 if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) 1689 if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
1625 return -EPERM; 1690 return -EPERM;
1626 } 1691 }
1627diff -NurpP --minimal linux-3.4.48/fs/block_dev.c linux-3.4.48-vs2.3.3.9/fs/block_dev.c 1692diff --git a/fs/block_dev.c b/fs/block_dev.c
1628--- linux-3.4.48/fs/block_dev.c 2013-06-13 08:59:31.000000000 +0000 1693index 319d9c7..98a5360 100644
1629+++ linux-3.4.48-vs2.3.3.9/fs/block_dev.c 2013-06-13 09:46:38.000000000 +0000 1694--- a/fs/block_dev.c
1695+++ b/fs/block_dev.c
1630@@ -27,6 +27,7 @@ 1696@@ -27,6 +27,7 @@
1631 #include <linux/namei.h> 1697 #include <linux/namei.h>
1632 #include <linux/log2.h> 1698 #include <linux/log2.h>
@@ -1635,7 +1701,7 @@ diff -NurpP --minimal linux-3.4.48/fs/block_dev.c linux-3.4.48-vs2.3.3.9/fs/bloc
1635 #include <asm/uaccess.h> 1701 #include <asm/uaccess.h>
1636 #include "internal.h" 1702 #include "internal.h"
1637 1703
1638@@ -581,6 +582,7 @@ struct block_device *bdget(dev_t dev) 1704@@ -588,6 +589,7 @@ struct block_device *bdget(dev_t dev)
1639 bdev->bd_invalidated = 0; 1705 bdev->bd_invalidated = 0;
1640 inode->i_mode = S_IFBLK; 1706 inode->i_mode = S_IFBLK;
1641 inode->i_rdev = dev; 1707 inode->i_rdev = dev;
@@ -1643,7 +1709,7 @@ diff -NurpP --minimal linux-3.4.48/fs/block_dev.c linux-3.4.48-vs2.3.3.9/fs/bloc
1643 inode->i_bdev = bdev; 1709 inode->i_bdev = bdev;
1644 inode->i_data.a_ops = &def_blk_aops; 1710 inode->i_data.a_ops = &def_blk_aops;
1645 mapping_set_gfp_mask(&inode->i_data, GFP_USER); 1711 mapping_set_gfp_mask(&inode->i_data, GFP_USER);
1646@@ -627,6 +629,11 @@ EXPORT_SYMBOL(bdput); 1712@@ -635,6 +637,11 @@ EXPORT_SYMBOL(bdput);
1647 static struct block_device *bd_acquire(struct inode *inode) 1713 static struct block_device *bd_acquire(struct inode *inode)
1648 { 1714 {
1649 struct block_device *bdev; 1715 struct block_device *bdev;
@@ -1655,7 +1721,7 @@ diff -NurpP --minimal linux-3.4.48/fs/block_dev.c linux-3.4.48-vs2.3.3.9/fs/bloc
1655 1721
1656 spin_lock(&bdev_lock); 1722 spin_lock(&bdev_lock);
1657 bdev = inode->i_bdev; 1723 bdev = inode->i_bdev;
1658@@ -637,7 +644,7 @@ static struct block_device *bd_acquire(s 1724@@ -645,7 +652,7 @@ static struct block_device *bd_acquire(struct inode *inode)
1659 } 1725 }
1660 spin_unlock(&bdev_lock); 1726 spin_unlock(&bdev_lock);
1661 1727
@@ -1664,9 +1730,10 @@ diff -NurpP --minimal linux-3.4.48/fs/block_dev.c linux-3.4.48-vs2.3.3.9/fs/bloc
1664 if (bdev) { 1730 if (bdev) {
1665 spin_lock(&bdev_lock); 1731 spin_lock(&bdev_lock);
1666 if (!inode->i_bdev) { 1732 if (!inode->i_bdev) {
1667diff -NurpP --minimal linux-3.4.48/fs/btrfs/ctree.h linux-3.4.48-vs2.3.3.9/fs/btrfs/ctree.h 1733diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
1668--- linux-3.4.48/fs/btrfs/ctree.h 2012-05-21 16:07:18.000000000 +0000 1734index 8fd7233..7094fc9 100644
1669+++ linux-3.4.48-vs2.3.3.9/fs/btrfs/ctree.h 2012-05-21 16:15:04.000000000 +0000 1735--- a/fs/btrfs/ctree.h
1736+++ b/fs/btrfs/ctree.h
1670@@ -668,11 +668,14 @@ struct btrfs_inode_item { 1737@@ -668,11 +668,14 @@ struct btrfs_inode_item {
1671 /* modification sequence number for NFS */ 1738 /* modification sequence number for NFS */
1672 __le64 sequence; 1739 __le64 sequence;
@@ -1692,7 +1759,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ctree.h linux-3.4.48-vs2.3.3.9/fs/bt
1692 #define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt) 1759 #define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt)
1693 #define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt) 1760 #define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt)
1694 #define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \ 1761 #define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \
1695@@ -1762,6 +1767,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st 1762@@ -1762,6 +1767,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, struct btrfs_inode_item, block_group, 64);
1696 BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32); 1763 BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
1697 BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32); 1764 BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
1698 BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32); 1765 BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
@@ -1700,7 +1767,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ctree.h linux-3.4.48-vs2.3.3.9/fs/bt
1700 BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32); 1767 BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
1701 BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64); 1768 BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
1702 BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64); 1769 BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
1703@@ -1815,6 +1821,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct 1770@@ -1815,6 +1821,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct btrfs_extent_item, flags, 64);
1704 1771
1705 BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32); 1772 BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
1706 1773
@@ -1711,7 +1778,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ctree.h linux-3.4.48-vs2.3.3.9/fs/bt
1711 1778
1712 BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8); 1779 BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
1713 1780
1714@@ -2959,6 +2969,7 @@ extern const struct dentry_operations bt 1781@@ -2959,6 +2969,7 @@ extern const struct dentry_operations btrfs_dentry_operations;
1715 long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); 1782 long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
1716 void btrfs_update_iflags(struct inode *inode); 1783 void btrfs_update_iflags(struct inode *inode);
1717 void btrfs_inherit_iflags(struct inode *inode, struct inode *dir); 1784 void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
@@ -1719,9 +1786,10 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ctree.h linux-3.4.48-vs2.3.3.9/fs/bt
1719 int btrfs_defrag_file(struct inode *inode, struct file *file, 1786 int btrfs_defrag_file(struct inode *inode, struct file *file,
1720 struct btrfs_ioctl_defrag_range_args *range, 1787 struct btrfs_ioctl_defrag_range_args *range,
1721 u64 newer_than, unsigned long max_pages); 1788 u64 newer_than, unsigned long max_pages);
1722diff -NurpP --minimal linux-3.4.48/fs/btrfs/disk-io.c linux-3.4.48-vs2.3.3.9/fs/btrfs/disk-io.c 1789diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
1723--- linux-3.4.48/fs/btrfs/disk-io.c 2012-05-21 16:07:18.000000000 +0000 1790index a7ffc88..e664ffd 100644
1724+++ linux-3.4.48-vs2.3.3.9/fs/btrfs/disk-io.c 2012-05-21 16:15:04.000000000 +0000 1791--- a/fs/btrfs/disk-io.c
1792+++ b/fs/btrfs/disk-io.c
1725@@ -2083,6 +2083,9 @@ int open_ctree(struct super_block *sb, 1793@@ -2083,6 +2083,9 @@ int open_ctree(struct super_block *sb,
1726 goto fail_alloc; 1794 goto fail_alloc;
1727 } 1795 }
@@ -1732,9 +1800,10 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/disk-io.c linux-3.4.48-vs2.3.3.9/fs/
1732 features = btrfs_super_incompat_flags(disk_super) & 1800 features = btrfs_super_incompat_flags(disk_super) &
1733 ~BTRFS_FEATURE_INCOMPAT_SUPP; 1801 ~BTRFS_FEATURE_INCOMPAT_SUPP;
1734 if (features) { 1802 if (features) {
1735diff -NurpP --minimal linux-3.4.48/fs/btrfs/inode.c linux-3.4.48-vs2.3.3.9/fs/btrfs/inode.c 1803diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
1736--- linux-3.4.48/fs/btrfs/inode.c 2013-06-13 08:59:31.000000000 +0000 1804index 9e51325..c144755 100644
1737+++ linux-3.4.48-vs2.3.3.9/fs/btrfs/inode.c 2013-06-13 09:46:38.000000000 +0000 1805--- a/fs/btrfs/inode.c
1806+++ b/fs/btrfs/inode.c
1738@@ -39,6 +39,7 @@ 1807@@ -39,6 +39,7 @@
1739 #include <linux/slab.h> 1808 #include <linux/slab.h>
1740 #include <linux/ratelimit.h> 1809 #include <linux/ratelimit.h>
@@ -1743,7 +1812,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/inode.c linux-3.4.48-vs2.3.3.9/fs/bt
1743 #include "compat.h" 1812 #include "compat.h"
1744 #include "ctree.h" 1813 #include "ctree.h"
1745 #include "disk-io.h" 1814 #include "disk-io.h"
1746@@ -2468,6 +2469,8 @@ static void btrfs_read_locked_inode(stru 1815@@ -2482,6 +2483,8 @@ static void btrfs_read_locked_inode(struct inode *inode)
1747 struct btrfs_key location; 1816 struct btrfs_key location;
1748 int maybe_acls; 1817 int maybe_acls;
1749 u32 rdev; 1818 u32 rdev;
@@ -1752,7 +1821,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/inode.c linux-3.4.48-vs2.3.3.9/fs/bt
1752 int ret; 1821 int ret;
1753 bool filled = false; 1822 bool filled = false;
1754 1823
1755@@ -2495,8 +2498,13 @@ static void btrfs_read_locked_inode(stru 1824@@ -2509,8 +2512,13 @@ static void btrfs_read_locked_inode(struct inode *inode)
1756 struct btrfs_inode_item); 1825 struct btrfs_inode_item);
1757 inode->i_mode = btrfs_inode_mode(leaf, inode_item); 1826 inode->i_mode = btrfs_inode_mode(leaf, inode_item);
1758 set_nlink(inode, btrfs_inode_nlink(leaf, inode_item)); 1827 set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
@@ -1768,7 +1837,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/inode.c linux-3.4.48-vs2.3.3.9/fs/bt
1768 btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); 1837 btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
1769 1838
1770 tspec = btrfs_inode_atime(inode_item); 1839 tspec = btrfs_inode_atime(inode_item);
1771@@ -2574,8 +2582,14 @@ static void fill_inode_item(struct btrfs 1840@@ -2588,8 +2596,14 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
1772 struct btrfs_inode_item *item, 1841 struct btrfs_inode_item *item,
1773 struct inode *inode) 1842 struct inode *inode)
1774 { 1843 {
@@ -1785,7 +1854,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/inode.c linux-3.4.48-vs2.3.3.9/fs/bt
1785 btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size); 1854 btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
1786 btrfs_set_inode_mode(leaf, item, inode->i_mode); 1855 btrfs_set_inode_mode(leaf, item, inode->i_mode);
1787 btrfs_set_inode_nlink(leaf, item, inode->i_nlink); 1856 btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
1788@@ -7576,11 +7590,13 @@ static const struct inode_operations btr 1857@@ -7590,11 +7604,13 @@ static const struct inode_operations btrfs_dir_inode_operations = {
1789 .listxattr = btrfs_listxattr, 1858 .listxattr = btrfs_listxattr,
1790 .removexattr = btrfs_removexattr, 1859 .removexattr = btrfs_removexattr,
1791 .permission = btrfs_permission, 1860 .permission = btrfs_permission,
@@ -1799,10 +1868,11 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/inode.c linux-3.4.48-vs2.3.3.9/fs/bt
1799 .get_acl = btrfs_get_acl, 1868 .get_acl = btrfs_get_acl,
1800 }; 1869 };
1801 1870
1802diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/btrfs/ioctl.c 1871diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
1803--- linux-3.4.48/fs/btrfs/ioctl.c 2012-05-21 16:07:19.000000000 +0000 1872index 3a65f43..4b171c2 100644
1804+++ linux-3.4.48-vs2.3.3.9/fs/btrfs/ioctl.c 2012-05-21 16:15:04.000000000 +0000 1873--- a/fs/btrfs/ioctl.c
1805@@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl 1874+++ b/fs/btrfs/ioctl.c
1875@@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl(unsigned int flags)
1806 { 1876 {
1807 unsigned int iflags = 0; 1877 unsigned int iflags = 0;
1808 1878
@@ -1818,7 +1888,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/bt
1818 if (flags & BTRFS_INODE_APPEND) 1888 if (flags & BTRFS_INODE_APPEND)
1819 iflags |= FS_APPEND_FL; 1889 iflags |= FS_APPEND_FL;
1820 if (flags & BTRFS_INODE_NODUMP) 1890 if (flags & BTRFS_INODE_NODUMP)
1821@@ -91,28 +94,78 @@ static unsigned int btrfs_flags_to_ioctl 1891@@ -91,28 +94,78 @@ static unsigned int btrfs_flags_to_ioctl(unsigned int flags)
1822 else if (flags & BTRFS_INODE_NOCOMPRESS) 1892 else if (flags & BTRFS_INODE_NOCOMPRESS)
1823 iflags |= FS_NOCOMP_FL; 1893 iflags |= FS_NOCOMP_FL;
1824 1894
@@ -1901,7 +1971,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/bt
1901 } 1971 }
1902 1972
1903 /* 1973 /*
1904@@ -128,6 +181,7 @@ void btrfs_inherit_iflags(struct inode * 1974@@ -128,6 +181,7 @@ void btrfs_inherit_iflags(struct inode *inode, struct inode *dir)
1905 return; 1975 return;
1906 1976
1907 flags = BTRFS_I(dir)->flags; 1977 flags = BTRFS_I(dir)->flags;
@@ -1909,7 +1979,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/bt
1909 1979
1910 if (flags & BTRFS_INODE_NOCOMPRESS) { 1980 if (flags & BTRFS_INODE_NOCOMPRESS) {
1911 BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; 1981 BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
1912@@ -143,6 +197,30 @@ void btrfs_inherit_iflags(struct inode * 1982@@ -143,6 +197,30 @@ void btrfs_inherit_iflags(struct inode *inode, struct inode *dir)
1913 btrfs_update_iflags(inode); 1983 btrfs_update_iflags(inode);
1914 } 1984 }
1915 1985
@@ -1940,7 +2010,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/bt
1940 static int btrfs_ioctl_getflags(struct file *file, void __user *arg) 2010 static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
1941 { 2011 {
1942 struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode); 2012 struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
1943@@ -199,7 +277,8 @@ static int btrfs_ioctl_setflags(struct f 2013@@ -199,7 +277,8 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
1944 2014
1945 flags = btrfs_mask_flags(inode->i_mode, flags); 2015 flags = btrfs_mask_flags(inode->i_mode, flags);
1946 oldflags = btrfs_flags_to_ioctl(ip->flags); 2016 oldflags = btrfs_flags_to_ioctl(ip->flags);
@@ -1950,7 +2020,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/bt
1950 if (!capable(CAP_LINUX_IMMUTABLE)) { 2020 if (!capable(CAP_LINUX_IMMUTABLE)) {
1951 ret = -EPERM; 2021 ret = -EPERM;
1952 goto out_unlock; 2022 goto out_unlock;
1953@@ -210,14 +289,19 @@ static int btrfs_ioctl_setflags(struct f 2023@@ -210,14 +289,19 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
1954 if (ret) 2024 if (ret)
1955 goto out_unlock; 2025 goto out_unlock;
1956 2026
@@ -1974,9 +2044,10 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/bt
1974 if (flags & FS_APPEND_FL) 2044 if (flags & FS_APPEND_FL)
1975 ip->flags |= BTRFS_INODE_APPEND; 2045 ip->flags |= BTRFS_INODE_APPEND;
1976 else 2046 else
1977diff -NurpP --minimal linux-3.4.48/fs/btrfs/super.c linux-3.4.48-vs2.3.3.9/fs/btrfs/super.c 2047diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
1978--- linux-3.4.48/fs/btrfs/super.c 2012-05-21 16:07:19.000000000 +0000 2048index c5f8fca..847062b 100644
1979+++ linux-3.4.48-vs2.3.3.9/fs/btrfs/super.c 2012-05-21 16:15:04.000000000 +0000 2049--- a/fs/btrfs/super.c
2050+++ b/fs/btrfs/super.c
1980@@ -279,7 +279,7 @@ enum { 2051@@ -279,7 +279,7 @@ enum {
1981 Opt_no_space_cache, Opt_recovery, Opt_skip_balance, 2052 Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
1982 Opt_check_integrity, Opt_check_integrity_including_extent_data, 2053 Opt_check_integrity, Opt_check_integrity_including_extent_data,
@@ -1996,7 +2067,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/super.c linux-3.4.48-vs2.3.3.9/fs/bt
1996 {Opt_err, NULL}, 2067 {Opt_err, NULL},
1997 }; 2068 };
1998 2069
1999@@ -564,6 +567,22 @@ int btrfs_parse_options(struct btrfs_roo 2070@@ -564,6 +567,22 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
2000 goto out; 2071 goto out;
2001 } 2072 }
2002 break; 2073 break;
@@ -2019,7 +2090,7 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/super.c linux-3.4.48-vs2.3.3.9/fs/bt
2019 case Opt_err: 2090 case Opt_err:
2020 printk(KERN_INFO "btrfs: unrecognized mount option " 2091 printk(KERN_INFO "btrfs: unrecognized mount option "
2021 "'%s'\n", p); 2092 "'%s'\n", p);
2022@@ -1137,6 +1156,12 @@ static int btrfs_remount(struct super_bl 2093@@ -1137,6 +1156,12 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
2023 goto restore; 2094 goto restore;
2024 } 2095 }
2025 2096
@@ -2032,9 +2103,10 @@ diff -NurpP --minimal linux-3.4.48/fs/btrfs/super.c linux-3.4.48-vs2.3.3.9/fs/bt
2032 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) 2103 if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
2033 return 0; 2104 return 0;
2034 2105
2035diff -NurpP --minimal linux-3.4.48/fs/char_dev.c linux-3.4.48-vs2.3.3.9/fs/char_dev.c 2106diff --git a/fs/char_dev.c b/fs/char_dev.c
2036--- linux-3.4.48/fs/char_dev.c 2012-03-19 18:47:25.000000000 +0000 2107index 3f152b9..b103570 100644
2037+++ linux-3.4.48-vs2.3.3.9/fs/char_dev.c 2012-05-21 16:15:04.000000000 +0000 2108--- a/fs/char_dev.c
2109+++ b/fs/char_dev.c
2038@@ -21,6 +21,8 @@ 2110@@ -21,6 +21,8 @@
2039 #include <linux/mutex.h> 2111 #include <linux/mutex.h>
2040 #include <linux/backing-dev.h> 2112 #include <linux/backing-dev.h>
@@ -2044,7 +2116,7 @@ diff -NurpP --minimal linux-3.4.48/fs/char_dev.c linux-3.4.48-vs2.3.3.9/fs/char_
2044 2116
2045 #include "internal.h" 2117 #include "internal.h"
2046 2118
2047@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino 2119@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *inode, struct file *filp)
2048 struct cdev *p; 2120 struct cdev *p;
2049 struct cdev *new = NULL; 2121 struct cdev *new = NULL;
2050 int ret = 0; 2122 int ret = 0;
@@ -2067,9 +2139,10 @@ diff -NurpP --minimal linux-3.4.48/fs/char_dev.c linux-3.4.48-vs2.3.3.9/fs/char_
2067 if (!kobj) 2139 if (!kobj)
2068 return -ENXIO; 2140 return -ENXIO;
2069 new = container_of(kobj, struct cdev, kobj); 2141 new = container_of(kobj, struct cdev, kobj);
2070diff -NurpP --minimal linux-3.4.48/fs/dcache.c linux-3.4.48-vs2.3.3.9/fs/dcache.c 2142diff --git a/fs/dcache.c b/fs/dcache.c
2071--- linux-3.4.48/fs/dcache.c 2013-06-13 08:59:32.000000000 +0000 2143index e498de2..fb162ec 100644
2072+++ linux-3.4.48-vs2.3.3.9/fs/dcache.c 2013-06-13 09:46:38.000000000 +0000 2144--- a/fs/dcache.c
2145+++ b/fs/dcache.c
2073@@ -37,6 +37,7 @@ 2146@@ -37,6 +37,7 @@
2074 #include <linux/rculist_bl.h> 2147 #include <linux/rculist_bl.h>
2075 #include <linux/prefetch.h> 2148 #include <linux/prefetch.h>
@@ -2095,7 +2168,7 @@ diff -NurpP --minimal linux-3.4.48/fs/dcache.c linux-3.4.48-vs2.3.3.9/fs/dcache.
2095 } 2168 }
2096 2169
2097 static inline void __dget(struct dentry *dentry) 2170 static inline void __dget(struct dentry *dentry)
2098@@ -1258,6 +1262,9 @@ struct dentry *__d_alloc(struct super_bl 2171@@ -1260,6 +1264,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
2099 struct dentry *dentry; 2172 struct dentry *dentry;
2100 char *dname; 2173 char *dname;
2101 2174
@@ -2105,7 +2178,7 @@ diff -NurpP --minimal linux-3.4.48/fs/dcache.c linux-3.4.48-vs2.3.3.9/fs/dcache.
2105 dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL); 2178 dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
2106 if (!dentry) 2179 if (!dentry)
2107 return NULL; 2180 return NULL;
2108@@ -1280,6 +1287,7 @@ struct dentry *__d_alloc(struct super_bl 2181@@ -1282,6 +1289,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
2109 2182
2110 dentry->d_count = 1; 2183 dentry->d_count = 1;
2111 dentry->d_flags = 0; 2184 dentry->d_flags = 0;
@@ -2113,7 +2186,7 @@ diff -NurpP --minimal linux-3.4.48/fs/dcache.c linux-3.4.48-vs2.3.3.9/fs/dcache.
2113 spin_lock_init(&dentry->d_lock); 2186 spin_lock_init(&dentry->d_lock);
2114 seqcount_init(&dentry->d_seq); 2187 seqcount_init(&dentry->d_seq);
2115 dentry->d_inode = NULL; 2188 dentry->d_inode = NULL;
2116@@ -1941,6 +1949,7 @@ struct dentry *__d_lookup(struct dentry 2189@@ -1943,6 +1951,7 @@ struct dentry *__d_lookup(struct dentry *parent, struct qstr *name)
2117 } 2190 }
2118 2191
2119 dentry->d_count++; 2192 dentry->d_count++;
@@ -2121,9 +2194,10 @@ diff -NurpP --minimal linux-3.4.48/fs/dcache.c linux-3.4.48-vs2.3.3.9/fs/dcache.
2121 found = dentry; 2194 found = dentry;
2122 spin_unlock(&dentry->d_lock); 2195 spin_unlock(&dentry->d_lock);
2123 break; 2196 break;
2124diff -NurpP --minimal linux-3.4.48/fs/devpts/inode.c linux-3.4.48-vs2.3.3.9/fs/devpts/inode.c 2197diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
2125--- linux-3.4.48/fs/devpts/inode.c 2012-05-21 16:07:20.000000000 +0000 2198index 10f5e0b..df81cf1 100644
2126+++ linux-3.4.48-vs2.3.3.9/fs/devpts/inode.c 2012-05-21 16:15:04.000000000 +0000 2199--- a/fs/devpts/inode.c
2200+++ b/fs/devpts/inode.c
2127@@ -25,6 +25,7 @@ 2201@@ -25,6 +25,7 @@
2128 #include <linux/parser.h> 2202 #include <linux/parser.h>
2129 #include <linux/fsnotify.h> 2203 #include <linux/fsnotify.h>
@@ -2154,7 +2228,7 @@ diff -NurpP --minimal linux-3.4.48/fs/devpts/inode.c linux-3.4.48-vs2.3.3.9/fs/d
2154 /* 2228 /*
2155 * sysctl support for setting limits on the number of Unix98 ptys allocated. 2229 * sysctl support for setting limits on the number of Unix98 ptys allocated.
2156 * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly. 2230 * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
2157@@ -328,6 +344,34 @@ static int devpts_show_options(struct se 2231@@ -328,6 +344,34 @@ static int devpts_show_options(struct seq_file *seq, struct dentry *root)
2158 return 0; 2232 return 0;
2159 } 2233 }
2160 2234
@@ -2189,7 +2263,7 @@ diff -NurpP --minimal linux-3.4.48/fs/devpts/inode.c linux-3.4.48-vs2.3.3.9/fs/d
2189 static const struct super_operations devpts_sops = { 2263 static const struct super_operations devpts_sops = {
2190 .statfs = simple_statfs, 2264 .statfs = simple_statfs,
2191 .remount_fs = devpts_remount, 2265 .remount_fs = devpts_remount,
2192@@ -371,8 +415,10 @@ devpts_fill_super(struct super_block *s, 2266@@ -371,8 +415,10 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
2193 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; 2267 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
2194 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; 2268 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
2195 inode->i_op = &simple_dir_inode_operations; 2269 inode->i_op = &simple_dir_inode_operations;
@@ -2201,7 +2275,7 @@ diff -NurpP --minimal linux-3.4.48/fs/devpts/inode.c linux-3.4.48-vs2.3.3.9/fs/d
2201 2275
2202 s->s_root = d_make_root(inode); 2276 s->s_root = d_make_root(inode);
2203 if (s->s_root) 2277 if (s->s_root)
2204@@ -564,6 +610,9 @@ int devpts_pty_new(struct inode *ptmx_in 2278@@ -564,6 +610,9 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
2205 inode->i_gid = opts->setgid ? opts->gid : current_fsgid(); 2279 inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
2206 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; 2280 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
2207 init_special_inode(inode, S_IFCHR|opts->mode, device); 2281 init_special_inode(inode, S_IFCHR|opts->mode, device);
@@ -2211,10 +2285,11 @@ diff -NurpP --minimal linux-3.4.48/fs/devpts/inode.c linux-3.4.48-vs2.3.3.9/fs/d
2211 inode->i_private = tty; 2285 inode->i_private = tty;
2212 tty->driver_data = inode; 2286 tty->driver_data = inode;
2213 2287
2214diff -NurpP --minimal linux-3.4.48/fs/ext2/balloc.c linux-3.4.48-vs2.3.3.9/fs/ext2/balloc.c 2288diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
2215--- linux-3.4.48/fs/ext2/balloc.c 2012-01-09 15:14:54.000000000 +0000 2289index a8cbe1b..1469e14 100644
2216+++ linux-3.4.48-vs2.3.3.9/fs/ext2/balloc.c 2012-05-21 16:15:04.000000000 +0000 2290--- a/fs/ext2/balloc.c
2217@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block 2291+++ b/fs/ext2/balloc.c
2292@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block *sb, int group,
2218 start = 0; 2293 start = 0;
2219 end = EXT2_BLOCKS_PER_GROUP(sb); 2294 end = EXT2_BLOCKS_PER_GROUP(sb);
2220 } 2295 }
@@ -2222,9 +2297,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/balloc.c linux-3.4.48-vs2.3.3.9/fs/ex
2222 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); 2297 BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
2223 2298
2224 repeat: 2299 repeat:
2225diff -NurpP --minimal linux-3.4.48/fs/ext2/ext2.h linux-3.4.48-vs2.3.3.9/fs/ext2/ext2.h 2300diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
2226--- linux-3.4.48/fs/ext2/ext2.h 2012-05-21 16:07:20.000000000 +0000 2301index 0b2b4db..0818565 100644
2227+++ linux-3.4.48-vs2.3.3.9/fs/ext2/ext2.h 2012-05-21 16:15:05.000000000 +0000 2302--- a/fs/ext2/ext2.h
2303+++ b/fs/ext2/ext2.h
2228@@ -244,8 +244,12 @@ struct ext2_group_desc 2304@@ -244,8 +244,12 @@ struct ext2_group_desc
2229 #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ 2305 #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
2230 #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ 2306 #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
@@ -2264,7 +2340,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/ext2.h linux-3.4.48-vs2.3.3.9/fs/ext2
2264 2340
2265 2341
2266 #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt 2342 #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
2267@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct 2343@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct inode *inode);
2268 extern void ext2_get_inode_flags(struct ext2_inode_info *); 2344 extern void ext2_get_inode_flags(struct ext2_inode_info *);
2269 extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 2345 extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
2270 u64 start, u64 len); 2346 u64 start, u64 len);
@@ -2272,18 +2348,20 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/ext2.h linux-3.4.48-vs2.3.3.9/fs/ext2
2272 2348
2273 /* ioctl.c */ 2349 /* ioctl.c */
2274 extern long ext2_ioctl(struct file *, unsigned int, unsigned long); 2350 extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
2275diff -NurpP --minimal linux-3.4.48/fs/ext2/file.c linux-3.4.48-vs2.3.3.9/fs/ext2/file.c 2351diff --git a/fs/ext2/file.c b/fs/ext2/file.c
2276--- linux-3.4.48/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000 2352index a5b3a5d..e86e897 100644
2277+++ linux-3.4.48-vs2.3.3.9/fs/ext2/file.c 2012-05-21 16:15:05.000000000 +0000 2353--- a/fs/ext2/file.c
2278@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ 2354+++ b/fs/ext2/file.c
2355@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_inode_operations = {
2279 .setattr = ext2_setattr, 2356 .setattr = ext2_setattr,
2280 .get_acl = ext2_get_acl, 2357 .get_acl = ext2_get_acl,
2281 .fiemap = ext2_fiemap, 2358 .fiemap = ext2_fiemap,
2282+ .sync_flags = ext2_sync_flags, 2359+ .sync_flags = ext2_sync_flags,
2283 }; 2360 };
2284diff -NurpP --minimal linux-3.4.48/fs/ext2/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ext2/ialloc.c 2361diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
2285--- linux-3.4.48/fs/ext2/ialloc.c 2012-03-19 18:47:25.000000000 +0000 2362index 8b15cf8..ae251a8 100644
2286+++ linux-3.4.48-vs2.3.3.9/fs/ext2/ialloc.c 2012-05-21 16:15:05.000000000 +0000 2363--- a/fs/ext2/ialloc.c
2364+++ b/fs/ext2/ialloc.c
2287@@ -17,6 +17,7 @@ 2365@@ -17,6 +17,7 @@
2288 #include <linux/backing-dev.h> 2366 #include <linux/backing-dev.h>
2289 #include <linux/buffer_head.h> 2367 #include <linux/buffer_head.h>
@@ -2300,9 +2378,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ex
2300 } else 2378 } else
2301 inode_init_owner(inode, dir, mode); 2379 inode_init_owner(inode, dir, mode);
2302 2380
2303diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext2/inode.c 2381diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
2304--- linux-3.4.48/fs/ext2/inode.c 2012-03-19 18:47:25.000000000 +0000 2382index 740cad8..24137f6 100644
2305+++ linux-3.4.48-vs2.3.3.9/fs/ext2/inode.c 2012-05-21 16:15:05.000000000 +0000 2383--- a/fs/ext2/inode.c
2384+++ b/fs/ext2/inode.c
2306@@ -31,6 +31,7 @@ 2385@@ -31,6 +31,7 @@
2307 #include <linux/mpage.h> 2386 #include <linux/mpage.h>
2308 #include <linux/fiemap.h> 2387 #include <linux/fiemap.h>
@@ -2311,7 +2390,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2311 #include "ext2.h" 2390 #include "ext2.h"
2312 #include "acl.h" 2391 #include "acl.h"
2313 #include "xip.h" 2392 #include "xip.h"
2314@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct 2393@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct inode *inode, loff_t offset)
2315 return; 2394 return;
2316 if (ext2_inode_is_fast_symlink(inode)) 2395 if (ext2_inode_is_fast_symlink(inode))
2317 return; 2396 return;
@@ -2320,7 +2399,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2320 return; 2399 return;
2321 __ext2_truncate_blocks(inode, offset); 2400 __ext2_truncate_blocks(inode, offset);
2322 } 2401 }
2323@@ -1253,36 +1254,61 @@ void ext2_set_inode_flags(struct inode * 2402@@ -1253,36 +1254,61 @@ void ext2_set_inode_flags(struct inode *inode)
2324 { 2403 {
2325 unsigned int flags = EXT2_I(inode)->i_flags; 2404 unsigned int flags = EXT2_I(inode)->i_flags;
2326 2405
@@ -2389,7 +2468,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2389 } 2468 }
2390 2469
2391 struct inode *ext2_iget (struct super_block *sb, unsigned long ino) 2470 struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
2392@@ -1292,6 +1318,8 @@ struct inode *ext2_iget (struct super_bl 2471@@ -1292,6 +1318,8 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
2393 struct ext2_inode *raw_inode; 2472 struct ext2_inode *raw_inode;
2394 struct inode *inode; 2473 struct inode *inode;
2395 long ret = -EIO; 2474 long ret = -EIO;
@@ -2398,7 +2477,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2398 int n; 2477 int n;
2399 2478
2400 inode = iget_locked(sb, ino); 2479 inode = iget_locked(sb, ino);
2401@@ -1310,12 +1338,16 @@ struct inode *ext2_iget (struct super_bl 2480@@ -1310,12 +1338,16 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
2402 } 2481 }
2403 2482
2404 inode->i_mode = le16_to_cpu(raw_inode->i_mode); 2483 inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -2419,7 +2498,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2419 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); 2498 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
2420 inode->i_size = le32_to_cpu(raw_inode->i_size); 2499 inode->i_size = le32_to_cpu(raw_inode->i_size);
2421 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); 2500 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
2422@@ -1413,8 +1445,8 @@ static int __ext2_write_inode(struct ino 2501@@ -1413,8 +1445,8 @@ static int __ext2_write_inode(struct inode *inode, int do_sync)
2423 struct ext2_inode_info *ei = EXT2_I(inode); 2502 struct ext2_inode_info *ei = EXT2_I(inode);
2424 struct super_block *sb = inode->i_sb; 2503 struct super_block *sb = inode->i_sb;
2425 ino_t ino = inode->i_ino; 2504 ino_t ino = inode->i_ino;
@@ -2430,7 +2509,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2430 struct buffer_head * bh; 2509 struct buffer_head * bh;
2431 struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh); 2510 struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
2432 int n; 2511 int n;
2433@@ -1450,6 +1482,9 @@ static int __ext2_write_inode(struct ino 2512@@ -1450,6 +1482,9 @@ static int __ext2_write_inode(struct inode *inode, int do_sync)
2434 raw_inode->i_uid_high = 0; 2513 raw_inode->i_uid_high = 0;
2435 raw_inode->i_gid_high = 0; 2514 raw_inode->i_gid_high = 0;
2436 } 2515 }
@@ -2440,7 +2519,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2440 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); 2519 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
2441 raw_inode->i_size = cpu_to_le32(inode->i_size); 2520 raw_inode->i_size = cpu_to_le32(inode->i_size);
2442 raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); 2521 raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
2443@@ -1530,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry, 2522@@ -1530,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
2444 if (is_quota_modification(inode, iattr)) 2523 if (is_quota_modification(inode, iattr))
2445 dquot_initialize(inode); 2524 dquot_initialize(inode);
2446 if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) || 2525 if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
@@ -2450,9 +2529,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2450 error = dquot_transfer(inode, iattr); 2529 error = dquot_transfer(inode, iattr);
2451 if (error) 2530 if (error)
2452 return error; 2531 return error;
2453diff -NurpP --minimal linux-3.4.48/fs/ext2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext2/ioctl.c 2532diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
2454--- linux-3.4.48/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000 2533index 2de655f..f1534ec1 100644
2455+++ linux-3.4.48-vs2.3.3.9/fs/ext2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 2534--- a/fs/ext2/ioctl.c
2535+++ b/fs/ext2/ioctl.c
2456@@ -17,6 +17,16 @@ 2536@@ -17,6 +17,16 @@
2457 #include <asm/uaccess.h> 2537 #include <asm/uaccess.h>
2458 2538
@@ -2470,7 +2550,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2470 long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 2550 long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2471 { 2551 {
2472 struct inode *inode = filp->f_dentry->d_inode; 2552 struct inode *inode = filp->f_dentry->d_inode;
2473@@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig 2553@@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2474 2554
2475 flags = ext2_mask_flags(inode->i_mode, flags); 2555 flags = ext2_mask_flags(inode->i_mode, flags);
2476 2556
@@ -2482,7 +2562,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2482 mutex_lock(&inode->i_mutex); 2562 mutex_lock(&inode->i_mutex);
2483 /* Is it quota file? Do not allow user to mess with it */ 2563 /* Is it quota file? Do not allow user to mess with it */
2484 if (IS_NOQUOTA(inode)) { 2564 if (IS_NOQUOTA(inode)) {
2485@@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig 2565@@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2486 * 2566 *
2487 * This test looks nicer. Thanks to Pauline Middelink 2567 * This test looks nicer. Thanks to Pauline Middelink
2488 */ 2568 */
@@ -2493,7 +2573,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2493 if (!capable(CAP_LINUX_IMMUTABLE)) { 2573 if (!capable(CAP_LINUX_IMMUTABLE)) {
2494 mutex_unlock(&inode->i_mutex); 2574 mutex_unlock(&inode->i_mutex);
2495 ret = -EPERM; 2575 ret = -EPERM;
2496@@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig 2576@@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2497 } 2577 }
2498 } 2578 }
2499 2579
@@ -2502,9 +2582,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2502 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; 2582 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
2503 ei->i_flags = flags; 2583 ei->i_flags = flags;
2504 2584
2505diff -NurpP --minimal linux-3.4.48/fs/ext2/namei.c linux-3.4.48-vs2.3.3.9/fs/ext2/namei.c 2585diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
2506--- linux-3.4.48/fs/ext2/namei.c 2012-05-21 16:07:20.000000000 +0000 2586index dffb865..e0509e7 100644
2507+++ linux-3.4.48-vs2.3.3.9/fs/ext2/namei.c 2012-05-21 16:15:05.000000000 +0000 2587--- a/fs/ext2/namei.c
2588+++ b/fs/ext2/namei.c
2508@@ -32,6 +32,7 @@ 2589@@ -32,6 +32,7 @@
2509 2590
2510 #include <linux/pagemap.h> 2591 #include <linux/pagemap.h>
@@ -2513,7 +2594,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
2513 #include "ext2.h" 2594 #include "ext2.h"
2514 #include "xattr.h" 2595 #include "xattr.h"
2515 #include "acl.h" 2596 #include "acl.h"
2516@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct 2597@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
2517 (unsigned long) ino); 2598 (unsigned long) ino);
2518 return ERR_PTR(-EIO); 2599 return ERR_PTR(-EIO);
2519 } 2600 }
@@ -2521,7 +2602,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
2521 } 2602 }
2522 return d_splice_alias(inode, dentry); 2603 return d_splice_alias(inode, dentry);
2523 } 2604 }
2524@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i 2605@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_inode_operations = {
2525 .removexattr = generic_removexattr, 2606 .removexattr = generic_removexattr,
2526 #endif 2607 #endif
2527 .setattr = ext2_setattr, 2608 .setattr = ext2_setattr,
@@ -2529,9 +2610,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
2529 .get_acl = ext2_get_acl, 2610 .get_acl = ext2_get_acl,
2530 }; 2611 };
2531 2612
2532diff -NurpP --minimal linux-3.4.48/fs/ext2/super.c linux-3.4.48-vs2.3.3.9/fs/ext2/super.c 2613diff --git a/fs/ext2/super.c b/fs/ext2/super.c
2533--- linux-3.4.48/fs/ext2/super.c 2012-05-21 16:07:20.000000000 +0000 2614index e1025c7..815078c 100644
2534+++ linux-3.4.48-vs2.3.3.9/fs/ext2/super.c 2012-05-21 16:15:05.000000000 +0000 2615--- a/fs/ext2/super.c
2616+++ b/fs/ext2/super.c
2535@@ -393,7 +393,8 @@ enum { 2617@@ -393,7 +393,8 @@ enum {
2536 Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, 2618 Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
2537 Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, 2619 Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2552,7 +2634,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/super.c linux-3.4.48-vs2.3.3.9/fs/ext
2552 {Opt_grpquota, "grpquota"}, 2634 {Opt_grpquota, "grpquota"},
2553 {Opt_ignore, "noquota"}, 2635 {Opt_ignore, "noquota"},
2554 {Opt_quota, "quota"}, 2636 {Opt_quota, "quota"},
2555@@ -491,6 +495,20 @@ static int parse_options(char *options, 2637@@ -491,6 +495,20 @@ static int parse_options(char *options, struct super_block *sb)
2556 case Opt_nouid32: 2638 case Opt_nouid32:
2557 set_opt (sbi->s_mount_opt, NO_UID32); 2639 set_opt (sbi->s_mount_opt, NO_UID32);
2558 break; 2640 break;
@@ -2573,7 +2655,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/super.c linux-3.4.48-vs2.3.3.9/fs/ext
2573 case Opt_nocheck: 2655 case Opt_nocheck:
2574 clear_opt (sbi->s_mount_opt, CHECK); 2656 clear_opt (sbi->s_mount_opt, CHECK);
2575 break; 2657 break;
2576@@ -849,6 +867,8 @@ static int ext2_fill_super(struct super_ 2658@@ -849,6 +867,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
2577 if (!parse_options((char *) data, sb)) 2659 if (!parse_options((char *) data, sb))
2578 goto failed_mount; 2660 goto failed_mount;
2579 2661
@@ -2582,11 +2664,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/super.c linux-3.4.48-vs2.3.3.9/fs/ext
2582 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 2664 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2583 ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? 2665 ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
2584 MS_POSIXACL : 0); 2666 MS_POSIXACL : 0);
2585@@ -1222,6 +1242,14 @@ static int ext2_remount (struct super_bl 2667@@ -1223,6 +1243,14 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
2586 err = -EINVAL;
2587 goto restore_opts; 2668 goto restore_opts;
2588 } 2669 }
2589+ 2670
2590+ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) && 2671+ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
2591+ !(sb->s_flags & MS_TAGGED)) { 2672+ !(sb->s_flags & MS_TAGGED)) {
2592+ printk("EXT2-fs: %s: tagging not permitted on remount.\n", 2673+ printk("EXT2-fs: %s: tagging not permitted on remount.\n",
@@ -2594,12 +2675,14 @@ diff -NurpP --minimal linux-3.4.48/fs/ext2/super.c linux-3.4.48-vs2.3.3.9/fs/ext
2594+ err = -EINVAL; 2675+ err = -EINVAL;
2595+ goto restore_opts; 2676+ goto restore_opts;
2596+ } 2677+ }
2597 2678+
2598 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 2679 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
2599 ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); 2680 ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
2600diff -NurpP --minimal linux-3.4.48/fs/ext3/ext3.h linux-3.4.48-vs2.3.3.9/fs/ext3/ext3.h 2681
2601--- linux-3.4.48/fs/ext3/ext3.h 2012-05-21 16:07:20.000000000 +0000 2682diff --git a/fs/ext3/ext3.h b/fs/ext3/ext3.h
2602+++ linux-3.4.48-vs2.3.3.9/fs/ext3/ext3.h 2012-05-21 17:13:31.000000000 +0000 2683index b6515fd..c528674 100644
2684--- a/fs/ext3/ext3.h
2685+++ b/fs/ext3/ext3.h
2603@@ -151,10 +151,14 @@ struct ext3_group_desc 2686@@ -151,10 +151,14 @@ struct ext3_group_desc
2604 #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */ 2687 #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
2605 #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ 2688 #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -2643,7 +2726,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/ext3.h linux-3.4.48-vs2.3.3.9/fs/ext3
2643 2726
2644 /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ 2727 /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
2645 #ifndef _LINUX_EXT2_FS_H 2728 #ifndef _LINUX_EXT2_FS_H
2646@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct 2729@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct ext3_inode_info *);
2647 extern void ext3_set_aops(struct inode *inode); 2730 extern void ext3_set_aops(struct inode *inode);
2648 extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 2731 extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
2649 u64 start, u64 len); 2732 u64 start, u64 len);
@@ -2651,19 +2734,21 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/ext3.h linux-3.4.48-vs2.3.3.9/fs/ext3
2651 2734
2652 /* ioctl.c */ 2735 /* ioctl.c */
2653 extern long ext3_ioctl(struct file *, unsigned int, unsigned long); 2736 extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
2654diff -NurpP --minimal linux-3.4.48/fs/ext3/file.c linux-3.4.48-vs2.3.3.9/fs/ext3/file.c 2737diff --git a/fs/ext3/file.c b/fs/ext3/file.c
2655--- linux-3.4.48/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000 2738index 25cb413..85b15ad 100644
2656+++ linux-3.4.48-vs2.3.3.9/fs/ext3/file.c 2012-05-21 16:15:05.000000000 +0000 2739--- a/fs/ext3/file.c
2657@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ 2740+++ b/fs/ext3/file.c
2741@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_inode_operations = {
2658 #endif 2742 #endif
2659 .get_acl = ext3_get_acl, 2743 .get_acl = ext3_get_acl,
2660 .fiemap = ext3_fiemap, 2744 .fiemap = ext3_fiemap,
2661+ .sync_flags = ext3_sync_flags, 2745+ .sync_flags = ext3_sync_flags,
2662 }; 2746 };
2663 2747
2664diff -NurpP --minimal linux-3.4.48/fs/ext3/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ext3/ialloc.c 2748diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
2665--- linux-3.4.48/fs/ext3/ialloc.c 2012-05-21 16:07:20.000000000 +0000 2749index e3c39e4..babbe82 100644
2666+++ linux-3.4.48-vs2.3.3.9/fs/ext3/ialloc.c 2012-05-21 16:15:05.000000000 +0000 2750--- a/fs/ext3/ialloc.c
2751+++ b/fs/ext3/ialloc.c
2667@@ -14,6 +14,7 @@ 2752@@ -14,6 +14,7 @@
2668 2753
2669 #include <linux/quotaops.h> 2754 #include <linux/quotaops.h>
@@ -2680,9 +2765,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ex
2680 } else 2765 } else
2681 inode_init_owner(inode, dir, mode); 2766 inode_init_owner(inode, dir, mode);
2682 2767
2683diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext3/inode.c 2768diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
2684--- linux-3.4.48/fs/ext3/inode.c 2013-06-13 08:59:32.000000000 +0000 2769index aad0f39..b847ded 100644
2685+++ linux-3.4.48-vs2.3.3.9/fs/ext3/inode.c 2012-09-16 18:49:11.000000000 +0000 2770--- a/fs/ext3/inode.c
2771+++ b/fs/ext3/inode.c
2686@@ -27,6 +27,8 @@ 2772@@ -27,6 +27,8 @@
2687 #include <linux/writeback.h> 2773 #include <linux/writeback.h>
2688 #include <linux/mpage.h> 2774 #include <linux/mpage.h>
@@ -2692,7 +2778,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2692 #include "ext3.h" 2778 #include "ext3.h"
2693 #include "xattr.h" 2779 #include "xattr.h"
2694 #include "acl.h" 2780 #include "acl.h"
2695@@ -2848,36 +2850,60 @@ void ext3_set_inode_flags(struct inode * 2781@@ -2849,36 +2851,60 @@ void ext3_set_inode_flags(struct inode *inode)
2696 { 2782 {
2697 unsigned int flags = EXT3_I(inode)->i_flags; 2783 unsigned int flags = EXT3_I(inode)->i_flags;
2698 2784
@@ -2760,7 +2846,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2760 } 2846 }
2761 2847
2762 struct inode *ext3_iget(struct super_block *sb, unsigned long ino) 2848 struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
2763@@ -2891,6 +2917,8 @@ struct inode *ext3_iget(struct super_blo 2849@@ -2892,6 +2918,8 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
2764 transaction_t *transaction; 2850 transaction_t *transaction;
2765 long ret; 2851 long ret;
2766 int block; 2852 int block;
@@ -2769,7 +2855,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2769 2855
2770 inode = iget_locked(sb, ino); 2856 inode = iget_locked(sb, ino);
2771 if (!inode) 2857 if (!inode)
2772@@ -2907,12 +2935,16 @@ struct inode *ext3_iget(struct super_blo 2858@@ -2908,12 +2936,16 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
2773 bh = iloc.bh; 2859 bh = iloc.bh;
2774 raw_inode = ext3_raw_inode(&iloc); 2860 raw_inode = ext3_raw_inode(&iloc);
2775 inode->i_mode = le16_to_cpu(raw_inode->i_mode); 2861 inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -2790,7 +2876,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2790 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); 2876 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
2791 inode->i_size = le32_to_cpu(raw_inode->i_size); 2877 inode->i_size = le32_to_cpu(raw_inode->i_size);
2792 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); 2878 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
2793@@ -3067,6 +3099,8 @@ static int ext3_do_update_inode(handle_t 2879@@ -3068,6 +3100,8 @@ static int ext3_do_update_inode(handle_t *handle,
2794 struct ext3_inode *raw_inode = ext3_raw_inode(iloc); 2880 struct ext3_inode *raw_inode = ext3_raw_inode(iloc);
2795 struct ext3_inode_info *ei = EXT3_I(inode); 2881 struct ext3_inode_info *ei = EXT3_I(inode);
2796 struct buffer_head *bh = iloc->bh; 2882 struct buffer_head *bh = iloc->bh;
@@ -2799,7 +2885,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2799 int err = 0, rc, block; 2885 int err = 0, rc, block;
2800 int need_datasync = 0; 2886 int need_datasync = 0;
2801 __le32 disksize; 2887 __le32 disksize;
2802@@ -3083,29 +3117,32 @@ again: 2888@@ -3084,29 +3118,32 @@ again:
2803 ext3_get_inode_flags(ei); 2889 ext3_get_inode_flags(ei);
2804 raw_inode->i_mode = cpu_to_le16(inode->i_mode); 2890 raw_inode->i_mode = cpu_to_le16(inode->i_mode);
2805 if(!(test_opt(inode->i_sb, NO_UID32))) { 2891 if(!(test_opt(inode->i_sb, NO_UID32))) {
@@ -2838,7 +2924,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2838 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); 2924 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
2839 disksize = cpu_to_le32(ei->i_disksize); 2925 disksize = cpu_to_le32(ei->i_disksize);
2840 if (disksize != raw_inode->i_size) { 2926 if (disksize != raw_inode->i_size) {
2841@@ -3274,7 +3311,8 @@ int ext3_setattr(struct dentry *dentry, 2927@@ -3275,7 +3312,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
2842 if (is_quota_modification(inode, attr)) 2928 if (is_quota_modification(inode, attr))
2843 dquot_initialize(inode); 2929 dquot_initialize(inode);
2844 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || 2930 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -2848,7 +2934,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2848 handle_t *handle; 2934 handle_t *handle;
2849 2935
2850 /* (user+group)*(old+new) structure, inode write (sb, 2936 /* (user+group)*(old+new) structure, inode write (sb,
2851@@ -3296,6 +3334,8 @@ int ext3_setattr(struct dentry *dentry, 2937@@ -3297,6 +3335,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr)
2852 inode->i_uid = attr->ia_uid; 2938 inode->i_uid = attr->ia_uid;
2853 if (attr->ia_valid & ATTR_GID) 2939 if (attr->ia_valid & ATTR_GID)
2854 inode->i_gid = attr->ia_gid; 2940 inode->i_gid = attr->ia_gid;
@@ -2857,9 +2943,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
2857 error = ext3_mark_inode_dirty(handle, inode); 2943 error = ext3_mark_inode_dirty(handle, inode);
2858 ext3_journal_stop(handle); 2944 ext3_journal_stop(handle);
2859 } 2945 }
2860diff -NurpP --minimal linux-3.4.48/fs/ext3/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext3/ioctl.c 2946diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
2861--- linux-3.4.48/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000 2947index 677a5c2..0af62fd 100644
2862+++ linux-3.4.48-vs2.3.3.9/fs/ext3/ioctl.c 2012-05-21 16:15:05.000000000 +0000 2948--- a/fs/ext3/ioctl.c
2949+++ b/fs/ext3/ioctl.c
2863@@ -12,6 +12,34 @@ 2950@@ -12,6 +12,34 @@
2864 #include <asm/uaccess.h> 2951 #include <asm/uaccess.h>
2865 #include "ext3.h" 2952 #include "ext3.h"
@@ -2895,7 +2982,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2895 long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 2982 long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2896 { 2983 {
2897 struct inode *inode = filp->f_dentry->d_inode; 2984 struct inode *inode = filp->f_dentry->d_inode;
2898@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig 2985@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2899 2986
2900 flags = ext3_mask_flags(inode->i_mode, flags); 2987 flags = ext3_mask_flags(inode->i_mode, flags);
2901 2988
@@ -2907,7 +2994,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2907 mutex_lock(&inode->i_mutex); 2994 mutex_lock(&inode->i_mutex);
2908 2995
2909 /* Is it quota file? Do not allow user to mess with it */ 2996 /* Is it quota file? Do not allow user to mess with it */
2910@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig 2997@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2911 * 2998 *
2912 * This test looks nicer. Thanks to Pauline Middelink 2999 * This test looks nicer. Thanks to Pauline Middelink
2913 */ 3000 */
@@ -2918,7 +3005,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2918 if (!capable(CAP_LINUX_IMMUTABLE)) 3005 if (!capable(CAP_LINUX_IMMUTABLE))
2919 goto flags_out; 3006 goto flags_out;
2920 } 3007 }
2921@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig 3008@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2922 if (err) 3009 if (err)
2923 goto flags_err; 3010 goto flags_err;
2924 3011
@@ -2927,9 +3014,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
2927 flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; 3014 flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
2928 ei->i_flags = flags; 3015 ei->i_flags = flags;
2929 3016
2930diff -NurpP --minimal linux-3.4.48/fs/ext3/namei.c linux-3.4.48-vs2.3.3.9/fs/ext3/namei.c 3017diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
2931--- linux-3.4.48/fs/ext3/namei.c 2012-05-21 16:07:20.000000000 +0000 3018index fbb9b82..29ac470 100644
2932+++ linux-3.4.48-vs2.3.3.9/fs/ext3/namei.c 2012-05-21 16:15:05.000000000 +0000 3019--- a/fs/ext3/namei.c
3020+++ b/fs/ext3/namei.c
2933@@ -25,6 +25,8 @@ 3021@@ -25,6 +25,8 @@
2934 */ 3022 */
2935 3023
@@ -2939,7 +3027,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
2939 #include "ext3.h" 3027 #include "ext3.h"
2940 #include "namei.h" 3028 #include "namei.h"
2941 #include "xattr.h" 3029 #include "xattr.h"
2942@@ -915,6 +917,7 @@ restart: 3030@@ -912,6 +914,7 @@ restart:
2943 submit_bh(READ | REQ_META | REQ_PRIO, 3031 submit_bh(READ | REQ_META | REQ_PRIO,
2944 bh); 3032 bh);
2945 } 3033 }
@@ -2947,7 +3035,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
2947 } 3035 }
2948 } 3036 }
2949 if ((bh = bh_use[ra_ptr++]) == NULL) 3037 if ((bh = bh_use[ra_ptr++]) == NULL)
2950@@ -2526,6 +2529,7 @@ const struct inode_operations ext3_dir_i 3038@@ -2523,6 +2526,7 @@ const struct inode_operations ext3_dir_inode_operations = {
2951 .listxattr = ext3_listxattr, 3039 .listxattr = ext3_listxattr,
2952 .removexattr = generic_removexattr, 3040 .removexattr = generic_removexattr,
2953 #endif 3041 #endif
@@ -2955,9 +3043,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
2955 .get_acl = ext3_get_acl, 3043 .get_acl = ext3_get_acl,
2956 }; 3044 };
2957 3045
2958diff -NurpP --minimal linux-3.4.48/fs/ext3/super.c linux-3.4.48-vs2.3.3.9/fs/ext3/super.c 3046diff --git a/fs/ext3/super.c b/fs/ext3/super.c
2959--- linux-3.4.48/fs/ext3/super.c 2013-06-13 08:59:32.000000000 +0000 3047index ef4c812..43de0b5 100644
2960+++ linux-3.4.48-vs2.3.3.9/fs/ext3/super.c 2013-03-30 21:29:17.000000000 +0000 3048--- a/fs/ext3/super.c
3049+++ b/fs/ext3/super.c
2961@@ -820,7 +820,8 @@ enum { 3050@@ -820,7 +820,8 @@ enum {
2962 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, 3051 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
2963 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, 3052 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2978,7 +3067,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/super.c linux-3.4.48-vs2.3.3.9/fs/ext
2978 {Opt_err, NULL}, 3067 {Opt_err, NULL},
2979 }; 3068 };
2980 3069
2981@@ -1029,6 +1033,20 @@ static int parse_options (char *options, 3070@@ -1029,6 +1033,20 @@ static int parse_options (char *options, struct super_block *sb,
2982 case Opt_nouid32: 3071 case Opt_nouid32:
2983 set_opt (sbi->s_mount_opt, NO_UID32); 3072 set_opt (sbi->s_mount_opt, NO_UID32);
2984 break; 3073 break;
@@ -2999,7 +3088,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/super.c linux-3.4.48-vs2.3.3.9/fs/ext
2999 case Opt_nocheck: 3088 case Opt_nocheck:
3000 clear_opt (sbi->s_mount_opt, CHECK); 3089 clear_opt (sbi->s_mount_opt, CHECK);
3001 break; 3090 break;
3002@@ -1727,6 +1745,9 @@ static int ext3_fill_super (struct super 3091@@ -1727,6 +1745,9 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
3003 NULL, 0)) 3092 NULL, 0))
3004 goto failed_mount; 3093 goto failed_mount;
3005 3094
@@ -3009,7 +3098,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/super.c linux-3.4.48-vs2.3.3.9/fs/ext
3009 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 3098 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3010 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); 3099 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3011 3100
3012@@ -2608,6 +2629,14 @@ static int ext3_remount (struct super_bl 3101@@ -2608,6 +2629,14 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
3013 if (test_opt(sb, ABORT)) 3102 if (test_opt(sb, ABORT))
3014 ext3_abort(sb, __func__, "Abort forced by user"); 3103 ext3_abort(sb, __func__, "Abort forced by user");
3015 3104
@@ -3024,9 +3113,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext3/super.c linux-3.4.48-vs2.3.3.9/fs/ext
3024 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 3113 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3025 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); 3114 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3026 3115
3027diff -NurpP --minimal linux-3.4.48/fs/ext4/ext4.h linux-3.4.48-vs2.3.3.9/fs/ext4/ext4.h 3116diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
3028--- linux-3.4.48/fs/ext4/ext4.h 2013-06-13 08:59:32.000000000 +0000 3117index d918b55..5c847c0 100644
3029+++ linux-3.4.48-vs2.3.3.9/fs/ext4/ext4.h 2013-06-13 09:46:38.000000000 +0000 3118--- a/fs/ext4/ext4.h
3119+++ b/fs/ext4/ext4.h
3030@@ -380,8 +380,12 @@ struct flex_groups { 3120@@ -380,8 +380,12 @@ struct flex_groups {
3031 #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ 3121 #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
3032 #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ 3122 #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -3066,7 +3156,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/ext4.h linux-3.4.48-vs2.3.3.9/fs/ext4
3066 #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */ 3156 #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
3067 #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ 3157 #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
3068 #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ 3158 #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
3069@@ -2294,6 +2301,7 @@ extern int ext4_map_blocks(handle_t *han 3159@@ -2294,6 +2301,7 @@ extern int ext4_map_blocks(handle_t *handle, struct inode *inode,
3070 struct ext4_map_blocks *map, int flags); 3160 struct ext4_map_blocks *map, int flags);
3071 extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 3161 extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
3072 __u64 start, __u64 len); 3162 __u64 start, __u64 len);
@@ -3074,19 +3164,21 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/ext4.h linux-3.4.48-vs2.3.3.9/fs/ext4
3074 /* move_extent.c */ 3164 /* move_extent.c */
3075 extern int ext4_move_extents(struct file *o_filp, struct file *d_filp, 3165 extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
3076 __u64 start_orig, __u64 start_donor, 3166 __u64 start_orig, __u64 start_donor,
3077diff -NurpP --minimal linux-3.4.48/fs/ext4/file.c linux-3.4.48-vs2.3.3.9/fs/ext4/file.c 3167diff --git a/fs/ext4/file.c b/fs/ext4/file.c
3078--- linux-3.4.48/fs/ext4/file.c 2012-01-09 15:14:54.000000000 +0000 3168index cb70f18..df67251 100644
3079+++ linux-3.4.48-vs2.3.3.9/fs/ext4/file.c 2012-05-21 16:15:05.000000000 +0000 3169--- a/fs/ext4/file.c
3080@@ -258,5 +258,6 @@ const struct inode_operations ext4_file_ 3170+++ b/fs/ext4/file.c
3171@@ -258,5 +258,6 @@ const struct inode_operations ext4_file_inode_operations = {
3081 #endif 3172 #endif
3082 .get_acl = ext4_get_acl, 3173 .get_acl = ext4_get_acl,
3083 .fiemap = ext4_fiemap, 3174 .fiemap = ext4_fiemap,
3084+ .sync_flags = ext4_sync_flags, 3175+ .sync_flags = ext4_sync_flags,
3085 }; 3176 };
3086 3177
3087diff -NurpP --minimal linux-3.4.48/fs/ext4/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ext4/ialloc.c 3178diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
3088--- linux-3.4.48/fs/ext4/ialloc.c 2013-06-13 08:59:32.000000000 +0000 3179index e42b468..d703d53 100644
3089+++ linux-3.4.48-vs2.3.3.9/fs/ext4/ialloc.c 2013-06-13 09:46:38.000000000 +0000 3180--- a/fs/ext4/ialloc.c
3181+++ b/fs/ext4/ialloc.c
3090@@ -22,6 +22,7 @@ 3182@@ -22,6 +22,7 @@
3091 #include <linux/random.h> 3183 #include <linux/random.h>
3092 #include <linux/bitops.h> 3184 #include <linux/bitops.h>
@@ -3103,9 +3195,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/ialloc.c linux-3.4.48-vs2.3.3.9/fs/ex
3103 } else 3195 } else
3104 inode_init_owner(inode, dir, mode); 3196 inode_init_owner(inode, dir, mode);
3105 3197
3106diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext4/inode.c 3198diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
3107--- linux-3.4.48/fs/ext4/inode.c 2013-06-13 08:59:32.000000000 +0000 3199index 98bff01ee..6a1b0af 100644
3108+++ linux-3.4.48-vs2.3.3.9/fs/ext4/inode.c 2013-03-30 21:29:17.000000000 +0000 3200--- a/fs/ext4/inode.c
3201+++ b/fs/ext4/inode.c
3109@@ -37,6 +37,7 @@ 3202@@ -37,6 +37,7 @@
3110 #include <linux/printk.h> 3203 #include <linux/printk.h>
3111 #include <linux/slab.h> 3204 #include <linux/slab.h>
@@ -3114,7 +3207,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3114 3207
3115 #include "ext4_jbd2.h" 3208 #include "ext4_jbd2.h"
3116 #include "xattr.h" 3209 #include "xattr.h"
3117@@ -3585,41 +3586,64 @@ void ext4_set_inode_flags(struct inode * 3210@@ -3585,41 +3586,64 @@ void ext4_set_inode_flags(struct inode *inode)
3118 { 3211 {
3119 unsigned int flags = EXT4_I(inode)->i_flags; 3212 unsigned int flags = EXT4_I(inode)->i_flags;
3120 3213
@@ -3186,7 +3279,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3186 } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); 3279 } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
3187 } 3280 }
3188 3281
3189@@ -3655,6 +3679,8 @@ struct inode *ext4_iget(struct super_blo 3282@@ -3655,6 +3679,8 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
3190 journal_t *journal = EXT4_SB(sb)->s_journal; 3283 journal_t *journal = EXT4_SB(sb)->s_journal;
3191 long ret; 3284 long ret;
3192 int block; 3285 int block;
@@ -3195,7 +3288,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3195 3288
3196 inode = iget_locked(sb, ino); 3289 inode = iget_locked(sb, ino);
3197 if (!inode) 3290 if (!inode)
3198@@ -3670,12 +3696,16 @@ struct inode *ext4_iget(struct super_blo 3291@@ -3670,12 +3696,16 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
3199 goto bad_inode; 3292 goto bad_inode;
3200 raw_inode = ext4_raw_inode(&iloc); 3293 raw_inode = ext4_raw_inode(&iloc);
3201 inode->i_mode = le16_to_cpu(raw_inode->i_mode); 3294 inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -3216,7 +3309,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3216 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); 3309 set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
3217 3310
3218 ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ 3311 ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
3219@@ -3894,6 +3924,8 @@ static int ext4_do_update_inode(handle_t 3312@@ -3894,6 +3924,8 @@ static int ext4_do_update_inode(handle_t *handle,
3220 struct ext4_inode *raw_inode = ext4_raw_inode(iloc); 3313 struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
3221 struct ext4_inode_info *ei = EXT4_I(inode); 3314 struct ext4_inode_info *ei = EXT4_I(inode);
3222 struct buffer_head *bh = iloc->bh; 3315 struct buffer_head *bh = iloc->bh;
@@ -3225,7 +3318,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3225 int err = 0, rc, block; 3318 int err = 0, rc, block;
3226 int need_datasync = 0; 3319 int need_datasync = 0;
3227 3320
3228@@ -3905,29 +3937,32 @@ static int ext4_do_update_inode(handle_t 3321@@ -3905,29 +3937,32 @@ static int ext4_do_update_inode(handle_t *handle,
3229 ext4_get_inode_flags(ei); 3322 ext4_get_inode_flags(ei);
3230 raw_inode->i_mode = cpu_to_le16(inode->i_mode); 3323 raw_inode->i_mode = cpu_to_le16(inode->i_mode);
3231 if (!(test_opt(inode->i_sb, NO_UID32))) { 3324 if (!(test_opt(inode->i_sb, NO_UID32))) {
@@ -3264,7 +3357,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3264 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); 3357 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
3265 3358
3266 EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); 3359 EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
3267@@ -4114,7 +4149,8 @@ int ext4_setattr(struct dentry *dentry, 3360@@ -4114,7 +4149,8 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
3268 if (is_quota_modification(inode, attr)) 3361 if (is_quota_modification(inode, attr))
3269 dquot_initialize(inode); 3362 dquot_initialize(inode);
3270 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || 3363 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -3274,7 +3367,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3274 handle_t *handle; 3367 handle_t *handle;
3275 3368
3276 /* (user+group)*(old+new) structure, inode write (sb, 3369 /* (user+group)*(old+new) structure, inode write (sb,
3277@@ -4136,6 +4172,8 @@ int ext4_setattr(struct dentry *dentry, 3370@@ -4136,6 +4172,8 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
3278 inode->i_uid = attr->ia_uid; 3371 inode->i_uid = attr->ia_uid;
3279 if (attr->ia_valid & ATTR_GID) 3372 if (attr->ia_valid & ATTR_GID)
3280 inode->i_gid = attr->ia_gid; 3373 inode->i_gid = attr->ia_gid;
@@ -3283,9 +3376,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/inode.c linux-3.4.48-vs2.3.3.9/fs/ext
3283 error = ext4_mark_inode_dirty(handle, inode); 3376 error = ext4_mark_inode_dirty(handle, inode);
3284 ext4_journal_stop(handle); 3377 ext4_journal_stop(handle);
3285 } 3378 }
3286diff -NurpP --minimal linux-3.4.48/fs/ext4/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext4/ioctl.c 3379diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
3287--- linux-3.4.48/fs/ext4/ioctl.c 2013-06-13 08:59:32.000000000 +0000 3380index 9727522..5a219c7 100644
3288+++ linux-3.4.48-vs2.3.3.9/fs/ext4/ioctl.c 2012-09-01 08:50:49.000000000 +0000 3381--- a/fs/ext4/ioctl.c
3382+++ b/fs/ext4/ioctl.c
3289@@ -14,12 +14,40 @@ 3383@@ -14,12 +14,40 @@
3290 #include <linux/compat.h> 3384 #include <linux/compat.h>
3291 #include <linux/mount.h> 3385 #include <linux/mount.h>
@@ -3327,7 +3421,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
3327 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 3421 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3328 { 3422 {
3329 struct inode *inode = filp->f_dentry->d_inode; 3423 struct inode *inode = filp->f_dentry->d_inode;
3330@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig 3424@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3331 3425
3332 flags = ext4_mask_flags(inode->i_mode, flags); 3426 flags = ext4_mask_flags(inode->i_mode, flags);
3333 3427
@@ -3339,7 +3433,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
3339 err = -EPERM; 3433 err = -EPERM;
3340 mutex_lock(&inode->i_mutex); 3434 mutex_lock(&inode->i_mutex);
3341 /* Is it quota file? Do not allow user to mess with it */ 3435 /* Is it quota file? Do not allow user to mess with it */
3342@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig 3436@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3343 * 3437 *
3344 * This test looks nicer. Thanks to Pauline Middelink 3438 * This test looks nicer. Thanks to Pauline Middelink
3345 */ 3439 */
@@ -3350,9 +3444,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ext
3350 if (!capable(CAP_LINUX_IMMUTABLE)) 3444 if (!capable(CAP_LINUX_IMMUTABLE))
3351 goto flags_out; 3445 goto flags_out;
3352 } 3446 }
3353diff -NurpP --minimal linux-3.4.48/fs/ext4/namei.c linux-3.4.48-vs2.3.3.9/fs/ext4/namei.c 3447diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
3354--- linux-3.4.48/fs/ext4/namei.c 2013-06-13 08:59:32.000000000 +0000 3448index 9fb3fae..1ea3cb2 100644
3355+++ linux-3.4.48-vs2.3.3.9/fs/ext4/namei.c 2012-10-22 13:09:53.000000000 +0000 3449--- a/fs/ext4/namei.c
3450+++ b/fs/ext4/namei.c
3356@@ -34,6 +34,7 @@ 3451@@ -34,6 +34,7 @@
3357 #include <linux/quotaops.h> 3452 #include <linux/quotaops.h>
3358 #include <linux/buffer_head.h> 3453 #include <linux/buffer_head.h>
@@ -3361,7 +3456,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
3361 #include "ext4.h" 3456 #include "ext4.h"
3362 #include "ext4_jbd2.h" 3457 #include "ext4_jbd2.h"
3363 3458
3364@@ -925,6 +926,7 @@ restart: 3459@@ -922,6 +923,7 @@ restart:
3365 ll_rw_block(READ | REQ_META | REQ_PRIO, 3460 ll_rw_block(READ | REQ_META | REQ_PRIO,
3366 1, &bh); 3461 1, &bh);
3367 } 3462 }
@@ -3369,7 +3464,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
3369 } 3464 }
3370 if ((bh = bh_use[ra_ptr++]) == NULL) 3465 if ((bh = bh_use[ra_ptr++]) == NULL)
3371 goto next; 3466 goto next;
3372@@ -2591,6 +2593,7 @@ const struct inode_operations ext4_dir_i 3467@@ -2588,6 +2590,7 @@ const struct inode_operations ext4_dir_inode_operations = {
3373 #endif 3468 #endif
3374 .get_acl = ext4_get_acl, 3469 .get_acl = ext4_get_acl,
3375 .fiemap = ext4_fiemap, 3470 .fiemap = ext4_fiemap,
@@ -3377,10 +3472,11 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/namei.c linux-3.4.48-vs2.3.3.9/fs/ext
3377 }; 3472 };
3378 3473
3379 const struct inode_operations ext4_special_inode_operations = { 3474 const struct inode_operations ext4_special_inode_operations = {
3380diff -NurpP --minimal linux-3.4.48/fs/ext4/super.c linux-3.4.48-vs2.3.3.9/fs/ext4/super.c 3475diff --git a/fs/ext4/super.c b/fs/ext4/super.c
3381--- linux-3.4.48/fs/ext4/super.c 2013-06-13 08:59:32.000000000 +0000 3476index b93de81..f1e1f91 100644
3382+++ linux-3.4.48-vs2.3.3.9/fs/ext4/super.c 2013-06-13 09:46:38.000000000 +0000 3477--- a/fs/ext4/super.c
3383@@ -1188,6 +1188,7 @@ enum { 3478+++ b/fs/ext4/super.c
3479@@ -1191,6 +1191,7 @@ enum {
3384 Opt_inode_readahead_blks, Opt_journal_ioprio, 3480 Opt_inode_readahead_blks, Opt_journal_ioprio,
3385 Opt_dioread_nolock, Opt_dioread_lock, 3481 Opt_dioread_nolock, Opt_dioread_lock,
3386 Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, 3482 Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
@@ -3388,7 +3484,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/super.c linux-3.4.48-vs2.3.3.9/fs/ext
3388 }; 3484 };
3389 3485
3390 static const match_table_t tokens = { 3486 static const match_table_t tokens = {
3391@@ -1266,6 +1267,9 @@ static const match_table_t tokens = { 3487@@ -1269,6 +1270,9 @@ static const match_table_t tokens = {
3392 {Opt_removed, "reservation"}, /* mount option from ext2/3 */ 3488 {Opt_removed, "reservation"}, /* mount option from ext2/3 */
3393 {Opt_removed, "noreservation"}, /* mount option from ext2/3 */ 3489 {Opt_removed, "noreservation"}, /* mount option from ext2/3 */
3394 {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */ 3490 {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
@@ -3398,7 +3494,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/super.c linux-3.4.48-vs2.3.3.9/fs/ext
3398 {Opt_err, NULL}, 3494 {Opt_err, NULL},
3399 }; 3495 };
3400 3496
3401@@ -1500,6 +1504,20 @@ static int handle_mount_opt(struct super 3497@@ -1503,6 +1507,20 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
3402 return -1; 3498 return -1;
3403 *journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg); 3499 *journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
3404 return 1; 3500 return 1;
@@ -3419,7 +3515,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/super.c linux-3.4.48-vs2.3.3.9/fs/ext
3419 } 3515 }
3420 3516
3421 for (m = ext4_mount_opts; m->token != Opt_err; m++) { 3517 for (m = ext4_mount_opts; m->token != Opt_err; m++) {
3422@@ -3236,6 +3254,9 @@ static int ext4_fill_super(struct super_ 3518@@ -3239,6 +3257,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
3423 clear_opt(sb, DELALLOC); 3519 clear_opt(sb, DELALLOC);
3424 } 3520 }
3425 3521
@@ -3429,7 +3525,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/super.c linux-3.4.48-vs2.3.3.9/fs/ext
3429 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 3525 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3430 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); 3526 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3431 3527
3432@@ -4397,6 +4418,14 @@ static int ext4_remount(struct super_blo 3528@@ -4400,6 +4421,14 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
3433 if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) 3529 if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
3434 ext4_abort(sb, "Abort forced by user"); 3530 ext4_abort(sb, "Abort forced by user");
3435 3531
@@ -3444,9 +3540,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ext4/super.c linux-3.4.48-vs2.3.3.9/fs/ext
3444 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | 3540 sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
3445 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); 3541 (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
3446 3542
3447diff -NurpP --minimal linux-3.4.48/fs/fcntl.c linux-3.4.48-vs2.3.3.9/fs/fcntl.c 3543diff --git a/fs/fcntl.c b/fs/fcntl.c
3448--- linux-3.4.48/fs/fcntl.c 2012-05-21 16:07:20.000000000 +0000 3544index 75e7c1f..3a725a0 100644
3449+++ linux-3.4.48-vs2.3.3.9/fs/fcntl.c 2012-05-21 16:15:05.000000000 +0000 3545--- a/fs/fcntl.c
3546+++ b/fs/fcntl.c
3450@@ -20,6 +20,7 @@ 3547@@ -20,6 +20,7 @@
3451 #include <linux/signal.h> 3548 #include <linux/signal.h>
3452 #include <linux/rcupdate.h> 3549 #include <linux/rcupdate.h>
@@ -3455,7 +3552,7 @@ diff -NurpP --minimal linux-3.4.48/fs/fcntl.c linux-3.4.48-vs2.3.3.9/fs/fcntl.c
3455 3552
3456 #include <asm/poll.h> 3553 #include <asm/poll.h>
3457 #include <asm/siginfo.h> 3554 #include <asm/siginfo.h>
3458@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf 3555@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
3459 3556
3460 if (tofree) 3557 if (tofree)
3461 filp_close(tofree, files); 3558 filp_close(tofree, files);
@@ -3464,7 +3561,7 @@ diff -NurpP --minimal linux-3.4.48/fs/fcntl.c linux-3.4.48-vs2.3.3.9/fs/fcntl.c
3464 3561
3465 return newfd; 3562 return newfd;
3466 3563
3467@@ -447,6 +450,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd, 3564@@ -447,6 +450,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd, unsigned long, arg)
3468 filp = fget_raw(fd); 3565 filp = fget_raw(fd);
3469 if (!filp) 3566 if (!filp)
3470 goto out; 3567 goto out;
@@ -3473,9 +3570,10 @@ diff -NurpP --minimal linux-3.4.48/fs/fcntl.c linux-3.4.48-vs2.3.3.9/fs/fcntl.c
3473 3570
3474 if (unlikely(filp->f_mode & FMODE_PATH)) { 3571 if (unlikely(filp->f_mode & FMODE_PATH)) {
3475 if (!check_fcntl_cmd(cmd)) { 3572 if (!check_fcntl_cmd(cmd)) {
3476diff -NurpP --minimal linux-3.4.48/fs/file.c linux-3.4.48-vs2.3.3.9/fs/file.c 3573diff --git a/fs/file.c b/fs/file.c
3477--- linux-3.4.48/fs/file.c 2012-05-21 16:07:20.000000000 +0000 3574index ba3f605..39007e7 100644
3478+++ linux-3.4.48-vs2.3.3.9/fs/file.c 2012-05-21 16:15:05.000000000 +0000 3575--- a/fs/file.c
3576+++ b/fs/file.c
3479@@ -21,6 +21,7 @@ 3577@@ -21,6 +21,7 @@
3480 #include <linux/spinlock.h> 3578 #include <linux/spinlock.h>
3481 #include <linux/rcupdate.h> 3579 #include <linux/rcupdate.h>
@@ -3484,7 +3582,7 @@ diff -NurpP --minimal linux-3.4.48/fs/file.c linux-3.4.48-vs2.3.3.9/fs/file.c
3484 3582
3485 struct fdtable_defer { 3583 struct fdtable_defer {
3486 spinlock_t lock; 3584 spinlock_t lock;
3487@@ -358,6 +359,8 @@ struct files_struct *dup_fd(struct files 3585@@ -358,6 +359,8 @@ struct files_struct *dup_fd(struct files_struct *oldf, int *errorp)
3488 struct file *f = *old_fds++; 3586 struct file *f = *old_fds++;
3489 if (f) { 3587 if (f) {
3490 get_file(f); 3588 get_file(f);
@@ -3501,9 +3599,10 @@ diff -NurpP --minimal linux-3.4.48/fs/file.c linux-3.4.48-vs2.3.3.9/fs/file.c
3501 #if 1 3599 #if 1
3502 /* Sanity check */ 3600 /* Sanity check */
3503 if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { 3601 if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
3504diff -NurpP --minimal linux-3.4.48/fs/file_table.c linux-3.4.48-vs2.3.3.9/fs/file_table.c 3602diff --git a/fs/file_table.c b/fs/file_table.c
3505--- linux-3.4.48/fs/file_table.c 2012-05-21 16:07:20.000000000 +0000 3603index 70f2a0f..ba4daef 100644
3506+++ linux-3.4.48-vs2.3.3.9/fs/file_table.c 2012-05-21 16:15:05.000000000 +0000 3604--- a/fs/file_table.c
3605+++ b/fs/file_table.c
3507@@ -24,6 +24,8 @@ 3606@@ -24,6 +24,8 @@
3508 #include <linux/percpu_counter.h> 3607 #include <linux/percpu_counter.h>
3509 #include <linux/percpu.h> 3608 #include <linux/percpu.h>
@@ -3540,9 +3639,10 @@ diff -NurpP --minimal linux-3.4.48/fs/file_table.c linux-3.4.48-vs2.3.3.9/fs/fil
3540 file_sb_list_del(file); 3639 file_sb_list_del(file);
3541 file_free(file); 3640 file_free(file);
3542 } 3641 }
3543diff -NurpP --minimal linux-3.4.48/fs/fs_struct.c linux-3.4.48-vs2.3.3.9/fs/fs_struct.c 3642diff --git a/fs/fs_struct.c b/fs/fs_struct.c
3544--- linux-3.4.48/fs/fs_struct.c 2012-05-21 16:07:20.000000000 +0000 3643index e159e68..35a252d 100644
3545+++ linux-3.4.48-vs2.3.3.9/fs/fs_struct.c 2012-05-21 16:15:05.000000000 +0000 3644--- a/fs/fs_struct.c
3645+++ b/fs/fs_struct.c
3546@@ -4,6 +4,7 @@ 3646@@ -4,6 +4,7 @@
3547 #include <linux/path.h> 3647 #include <linux/path.h>
3548 #include <linux/slab.h> 3648 #include <linux/slab.h>
@@ -3551,7 +3651,7 @@ diff -NurpP --minimal linux-3.4.48/fs/fs_struct.c linux-3.4.48-vs2.3.3.9/fs/fs_s
3551 #include "internal.h" 3651 #include "internal.h"
3552 3652
3553 static inline void path_get_longterm(struct path *path) 3653 static inline void path_get_longterm(struct path *path)
3554@@ -99,6 +100,7 @@ void free_fs_struct(struct fs_struct *fs 3654@@ -99,6 +100,7 @@ void free_fs_struct(struct fs_struct *fs)
3555 { 3655 {
3556 path_put_longterm(&fs->root); 3656 path_put_longterm(&fs->root);
3557 path_put_longterm(&fs->pwd); 3657 path_put_longterm(&fs->pwd);
@@ -3559,7 +3659,7 @@ diff -NurpP --minimal linux-3.4.48/fs/fs_struct.c linux-3.4.48-vs2.3.3.9/fs/fs_s
3559 kmem_cache_free(fs_cachep, fs); 3659 kmem_cache_free(fs_cachep, fs);
3560 } 3660 }
3561 3661
3562@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct 3662@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
3563 fs->pwd = old->pwd; 3663 fs->pwd = old->pwd;
3564 path_get_longterm(&fs->pwd); 3664 path_get_longterm(&fs->pwd);
3565 spin_unlock(&old->lock); 3665 spin_unlock(&old->lock);
@@ -3567,9 +3667,10 @@ diff -NurpP --minimal linux-3.4.48/fs/fs_struct.c linux-3.4.48-vs2.3.3.9/fs/fs_s
3567 } 3667 }
3568 return fs; 3668 return fs;
3569 } 3669 }
3570diff -NurpP --minimal linux-3.4.48/fs/gfs2/file.c linux-3.4.48-vs2.3.3.9/fs/gfs2/file.c 3670diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
3571--- linux-3.4.48/fs/gfs2/file.c 2012-05-21 16:07:20.000000000 +0000 3671index a3d2c9e..b089632 100644
3572+++ linux-3.4.48-vs2.3.3.9/fs/gfs2/file.c 2012-05-21 16:15:05.000000000 +0000 3672--- a/fs/gfs2/file.c
3673+++ b/fs/gfs2/file.c
3573@@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = { 3674@@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = {
3574 [7] = GFS2_DIF_NOATIME, 3675 [7] = GFS2_DIF_NOATIME,
3575 [12] = GFS2_DIF_EXHASH, 3676 [12] = GFS2_DIF_EXHASH,
@@ -3590,7 +3691,7 @@ diff -NurpP --minimal linux-3.4.48/fs/gfs2/file.c linux-3.4.48-vs2.3.3.9/fs/gfs2
3590 }; 3691 };
3591 3692
3592 static int gfs2_get_flags(struct file *filp, u32 __user *ptr) 3693 static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
3593@@ -181,12 +187,18 @@ void gfs2_set_inode_flags(struct inode * 3694@@ -181,12 +187,18 @@ void gfs2_set_inode_flags(struct inode *inode)
3594 { 3695 {
3595 struct gfs2_inode *ip = GFS2_I(inode); 3696 struct gfs2_inode *ip = GFS2_I(inode);
3596 unsigned int flags = inode->i_flags; 3697 unsigned int flags = inode->i_flags;
@@ -3610,7 +3711,7 @@ diff -NurpP --minimal linux-3.4.48/fs/gfs2/file.c linux-3.4.48-vs2.3.3.9/fs/gfs2
3610 if (ip->i_diskflags & GFS2_DIF_APPENDONLY) 3711 if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
3611 flags |= S_APPEND; 3712 flags |= S_APPEND;
3612 if (ip->i_diskflags & GFS2_DIF_NOATIME) 3713 if (ip->i_diskflags & GFS2_DIF_NOATIME)
3613@@ -194,6 +206,43 @@ void gfs2_set_inode_flags(struct inode * 3714@@ -194,6 +206,43 @@ void gfs2_set_inode_flags(struct inode *inode)
3614 if (ip->i_diskflags & GFS2_DIF_SYNC) 3715 if (ip->i_diskflags & GFS2_DIF_SYNC)
3615 flags |= S_SYNC; 3716 flags |= S_SYNC;
3616 inode->i_flags = flags; 3717 inode->i_flags = flags;
@@ -3654,7 +3755,7 @@ diff -NurpP --minimal linux-3.4.48/fs/gfs2/file.c linux-3.4.48-vs2.3.3.9/fs/gfs2
3654 } 3755 }
3655 3756
3656 /* Flags that can be set by user space */ 3757 /* Flags that can be set by user space */
3657@@ -305,6 +354,37 @@ static int gfs2_set_flags(struct file *f 3758@@ -305,6 +354,37 @@ static int gfs2_set_flags(struct file *filp, u32 __user *ptr)
3658 return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA); 3759 return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
3659 } 3760 }
3660 3761
@@ -3692,10 +3793,11 @@ diff -NurpP --minimal linux-3.4.48/fs/gfs2/file.c linux-3.4.48-vs2.3.3.9/fs/gfs2
3692 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 3793 static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3693 { 3794 {
3694 switch(cmd) { 3795 switch(cmd) {
3695diff -NurpP --minimal linux-3.4.48/fs/gfs2/inode.h linux-3.4.48-vs2.3.3.9/fs/gfs2/inode.h 3796diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h
3696--- linux-3.4.48/fs/gfs2/inode.h 2012-01-09 15:14:54.000000000 +0000 3797index 276e7b5..c43c053 100644
3697+++ linux-3.4.48-vs2.3.3.9/fs/gfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 3798--- a/fs/gfs2/inode.h
3698@@ -120,6 +120,7 @@ extern const struct file_operations gfs2 3799+++ b/fs/gfs2/inode.h
3800@@ -120,6 +120,7 @@ extern const struct file_operations gfs2_file_fops_nolock;
3699 extern const struct file_operations gfs2_dir_fops_nolock; 3801 extern const struct file_operations gfs2_dir_fops_nolock;
3700 3802
3701 extern void gfs2_set_inode_flags(struct inode *inode); 3803 extern void gfs2_set_inode_flags(struct inode *inode);
@@ -3703,9 +3805,10 @@ diff -NurpP --minimal linux-3.4.48/fs/gfs2/inode.h linux-3.4.48-vs2.3.3.9/fs/gfs
3703 3805
3704 #ifdef CONFIG_GFS2_FS_LOCKING_DLM 3806 #ifdef CONFIG_GFS2_FS_LOCKING_DLM
3705 extern const struct file_operations gfs2_file_fops; 3807 extern const struct file_operations gfs2_file_fops;
3706diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c 3808diff --git a/fs/inode.c b/fs/inode.c
3707--- linux-3.4.48/fs/inode.c 2012-05-21 16:07:24.000000000 +0000 3809index 8de457e..3e643c3 100644
3708+++ linux-3.4.48-vs2.3.3.9/fs/inode.c 2013-06-13 09:46:38.000000000 +0000 3810--- a/fs/inode.c
3811+++ b/fs/inode.c
3709@@ -17,6 +17,7 @@ 3812@@ -17,6 +17,7 @@
3710 #include <linux/prefetch.h> 3813 #include <linux/prefetch.h>
3711 #include <linux/buffer_head.h> /* for inode_has_buffers */ 3814 #include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3714,7 +3817,7 @@ diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c
3714 #include "internal.h" 3817 #include "internal.h"
3715 3818
3716 /* 3819 /*
3717@@ -128,6 +129,9 @@ int inode_init_always(struct super_block 3820@@ -128,6 +129,9 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
3718 struct address_space *const mapping = &inode->i_data; 3821 struct address_space *const mapping = &inode->i_data;
3719 3822
3720 inode->i_sb = sb; 3823 inode->i_sb = sb;
@@ -3724,7 +3827,7 @@ diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c
3724 inode->i_blkbits = sb->s_blocksize_bits; 3827 inode->i_blkbits = sb->s_blocksize_bits;
3725 inode->i_flags = 0; 3828 inode->i_flags = 0;
3726 atomic_set(&inode->i_count, 1); 3829 atomic_set(&inode->i_count, 1);
3727@@ -149,6 +153,7 @@ int inode_init_always(struct super_block 3830@@ -149,6 +153,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
3728 inode->i_bdev = NULL; 3831 inode->i_bdev = NULL;
3729 inode->i_cdev = NULL; 3832 inode->i_cdev = NULL;
3730 inode->i_rdev = 0; 3833 inode->i_rdev = 0;
@@ -3732,7 +3835,7 @@ diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c
3732 inode->dirtied_when = 0; 3835 inode->dirtied_when = 0;
3733 3836
3734 if (security_inode_alloc(inode)) 3837 if (security_inode_alloc(inode))
3735@@ -470,6 +475,8 @@ void __insert_inode_hash(struct inode *i 3838@@ -470,6 +475,8 @@ void __insert_inode_hash(struct inode *inode, unsigned long hashval)
3736 } 3839 }
3737 EXPORT_SYMBOL(__insert_inode_hash); 3840 EXPORT_SYMBOL(__insert_inode_hash);
3738 3841
@@ -3741,7 +3844,7 @@ diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c
3741 /** 3844 /**
3742 * __remove_inode_hash - remove an inode from the hash 3845 * __remove_inode_hash - remove an inode from the hash
3743 * @inode: inode to unhash 3846 * @inode: inode to unhash
3744@@ -1689,9 +1696,11 @@ void init_special_inode(struct inode *in 3847@@ -1689,9 +1696,11 @@ void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev)
3745 if (S_ISCHR(mode)) { 3848 if (S_ISCHR(mode)) {
3746 inode->i_fop = &def_chr_fops; 3849 inode->i_fop = &def_chr_fops;
3747 inode->i_rdev = rdev; 3850 inode->i_rdev = rdev;
@@ -3753,7 +3856,7 @@ diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c
3753 } else if (S_ISFIFO(mode)) 3856 } else if (S_ISFIFO(mode))
3754 inode->i_fop = &def_fifo_fops; 3857 inode->i_fop = &def_fifo_fops;
3755 else if (S_ISSOCK(mode)) 3858 else if (S_ISSOCK(mode))
3756@@ -1720,6 +1729,7 @@ void inode_init_owner(struct inode *inod 3859@@ -1720,6 +1729,7 @@ void inode_init_owner(struct inode *inode, const struct inode *dir,
3757 } else 3860 } else
3758 inode->i_gid = current_fsgid(); 3861 inode->i_gid = current_fsgid();
3759 inode->i_mode = mode; 3862 inode->i_mode = mode;
@@ -3761,9 +3864,10 @@ diff -NurpP --minimal linux-3.4.48/fs/inode.c linux-3.4.48-vs2.3.3.9/fs/inode.c
3761 } 3864 }
3762 EXPORT_SYMBOL(inode_init_owner); 3865 EXPORT_SYMBOL(inode_init_owner);
3763 3866
3764diff -NurpP --minimal linux-3.4.48/fs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ioctl.c 3867diff --git a/fs/ioctl.c b/fs/ioctl.c
3765--- linux-3.4.48/fs/ioctl.c 2012-05-21 16:07:24.000000000 +0000 3868index 29167be..dcc2ab9 100644
3766+++ linux-3.4.48-vs2.3.3.9/fs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 3869--- a/fs/ioctl.c
3870+++ b/fs/ioctl.c
3767@@ -15,6 +15,9 @@ 3871@@ -15,6 +15,9 @@
3768 #include <linux/writeback.h> 3872 #include <linux/writeback.h>
3769 #include <linux/buffer_head.h> 3873 #include <linux/buffer_head.h>
@@ -3774,9 +3878,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ioctl.c
3774 3878
3775 #include <asm/ioctls.h> 3879 #include <asm/ioctls.h>
3776 3880
3777diff -NurpP --minimal linux-3.4.48/fs/ioprio.c linux-3.4.48-vs2.3.3.9/fs/ioprio.c 3881diff --git a/fs/ioprio.c b/fs/ioprio.c
3778--- linux-3.4.48/fs/ioprio.c 2012-03-19 18:47:25.000000000 +0000 3882index 0f1b951..a90276f 100644
3779+++ linux-3.4.48-vs2.3.3.9/fs/ioprio.c 2012-05-21 16:15:05.000000000 +0000 3883--- a/fs/ioprio.c
3884+++ b/fs/ioprio.c
3780@@ -28,6 +28,7 @@ 3885@@ -28,6 +28,7 @@
3781 #include <linux/syscalls.h> 3886 #include <linux/syscalls.h>
3782 #include <linux/security.h> 3887 #include <linux/security.h>
@@ -3785,7 +3890,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ioprio.c linux-3.4.48-vs2.3.3.9/fs/ioprio.
3785 3890
3786 int set_task_ioprio(struct task_struct *task, int ioprio) 3891 int set_task_ioprio(struct task_struct *task, int ioprio)
3787 { 3892 {
3788@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, 3893@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio)
3789 else 3894 else
3790 pgrp = find_vpid(who); 3895 pgrp = find_vpid(who);
3791 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { 3896 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3794,7 +3899,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ioprio.c linux-3.4.48-vs2.3.3.9/fs/ioprio.
3794 ret = set_task_ioprio(p, ioprio); 3899 ret = set_task_ioprio(p, ioprio);
3795 if (ret) 3900 if (ret)
3796 break; 3901 break;
3797@@ -193,6 +196,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, 3902@@ -193,6 +196,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who)
3798 else 3903 else
3799 pgrp = find_vpid(who); 3904 pgrp = find_vpid(who);
3800 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { 3905 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -3803,10 +3908,11 @@ diff -NurpP --minimal linux-3.4.48/fs/ioprio.c linux-3.4.48-vs2.3.3.9/fs/ioprio.
3803 tmpio = get_task_ioprio(p); 3908 tmpio = get_task_ioprio(p);
3804 if (tmpio < 0) 3909 if (tmpio < 0)
3805 continue; 3910 continue;
3806diff -NurpP --minimal linux-3.4.48/fs/jfs/file.c linux-3.4.48-vs2.3.3.9/fs/jfs/file.c 3911diff --git a/fs/jfs/file.c b/fs/jfs/file.c
3807--- linux-3.4.48/fs/jfs/file.c 2011-10-24 16:45:27.000000000 +0000 3912index 844f946..8af7d86 100644
3808+++ linux-3.4.48-vs2.3.3.9/fs/jfs/file.c 2012-05-21 16:15:05.000000000 +0000 3913--- a/fs/jfs/file.c
3809@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s 3914+++ b/fs/jfs/file.c
3915@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
3810 if (is_quota_modification(inode, iattr)) 3916 if (is_quota_modification(inode, iattr))
3811 dquot_initialize(inode); 3917 dquot_initialize(inode);
3812 if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) || 3918 if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
@@ -3816,7 +3922,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/file.c linux-3.4.48-vs2.3.3.9/fs/jfs/f
3816 rc = dquot_transfer(inode, iattr); 3922 rc = dquot_transfer(inode, iattr);
3817 if (rc) 3923 if (rc)
3818 return rc; 3924 return rc;
3819@@ -142,6 +143,7 @@ const struct inode_operations jfs_file_i 3925@@ -142,6 +143,7 @@ const struct inode_operations jfs_file_inode_operations = {
3820 #ifdef CONFIG_JFS_POSIX_ACL 3926 #ifdef CONFIG_JFS_POSIX_ACL
3821 .get_acl = jfs_get_acl, 3927 .get_acl = jfs_get_acl,
3822 #endif 3928 #endif
@@ -3824,9 +3930,10 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/file.c linux-3.4.48-vs2.3.3.9/fs/jfs/f
3824 }; 3930 };
3825 3931
3826 const struct file_operations jfs_file_operations = { 3932 const struct file_operations jfs_file_operations = {
3827diff -NurpP --minimal linux-3.4.48/fs/jfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/jfs/ioctl.c 3933diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c
3828--- linux-3.4.48/fs/jfs/ioctl.c 2012-03-19 18:47:25.000000000 +0000 3934index f19d1e0..db57624 100644
3829+++ linux-3.4.48-vs2.3.3.9/fs/jfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 3935--- a/fs/jfs/ioctl.c
3936+++ b/fs/jfs/ioctl.c
3830@@ -11,6 +11,7 @@ 3937@@ -11,6 +11,7 @@
3831 #include <linux/mount.h> 3938 #include <linux/mount.h>
3832 #include <linux/time.h> 3939 #include <linux/time.h>
@@ -3835,7 +3942,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/jfs/
3835 #include <asm/current.h> 3942 #include <asm/current.h>
3836 #include <asm/uaccess.h> 3943 #include <asm/uaccess.h>
3837 3944
3838@@ -52,6 +53,16 @@ static long jfs_map_ext2(unsigned long f 3945@@ -52,6 +53,16 @@ static long jfs_map_ext2(unsigned long flags, int from)
3839 } 3946 }
3840 3947
3841 3948
@@ -3852,7 +3959,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/jfs/
3852 long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 3959 long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3853 { 3960 {
3854 struct inode *inode = filp->f_dentry->d_inode; 3961 struct inode *inode = filp->f_dentry->d_inode;
3855@@ -85,6 +96,11 @@ long jfs_ioctl(struct file *filp, unsign 3962@@ -85,6 +96,11 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3856 if (!S_ISDIR(inode->i_mode)) 3963 if (!S_ISDIR(inode->i_mode))
3857 flags &= ~JFS_DIRSYNC_FL; 3964 flags &= ~JFS_DIRSYNC_FL;
3858 3965
@@ -3864,7 +3971,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/jfs/
3864 /* Is it quota file? Do not allow user to mess with it */ 3971 /* Is it quota file? Do not allow user to mess with it */
3865 if (IS_NOQUOTA(inode)) { 3972 if (IS_NOQUOTA(inode)) {
3866 err = -EPERM; 3973 err = -EPERM;
3867@@ -102,8 +118,8 @@ long jfs_ioctl(struct file *filp, unsign 3974@@ -102,8 +118,8 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3868 * the relevant capability. 3975 * the relevant capability.
3869 */ 3976 */
3870 if ((oldflags & JFS_IMMUTABLE_FL) || 3977 if ((oldflags & JFS_IMMUTABLE_FL) ||
@@ -3875,7 +3982,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/jfs/
3875 if (!capable(CAP_LINUX_IMMUTABLE)) { 3982 if (!capable(CAP_LINUX_IMMUTABLE)) {
3876 mutex_unlock(&inode->i_mutex); 3983 mutex_unlock(&inode->i_mutex);
3877 err = -EPERM; 3984 err = -EPERM;
3878@@ -111,7 +127,7 @@ long jfs_ioctl(struct file *filp, unsign 3985@@ -111,7 +127,7 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
3879 } 3986 }
3880 } 3987 }
3881 3988
@@ -3884,9 +3991,10 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/jfs/
3884 flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; 3991 flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
3885 jfs_inode->mode2 = flags; 3992 jfs_inode->mode2 = flags;
3886 3993
3887diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_dinode.h linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_dinode.h 3994diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h
3888--- linux-3.4.48/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000 3995index 395c4c0..c3dabc1 100644
3889+++ linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 3996--- a/fs/jfs/jfs_dinode.h
3997+++ b/fs/jfs/jfs_dinode.h
3890@@ -161,9 +161,13 @@ struct dinode { 3998@@ -161,9 +161,13 @@ struct dinode {
3891 3999
3892 #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ 4000 #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3903,9 +4011,10 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_dinode.h linux-3.4.48-vs2.3.3.9/fs
3903 #define JFS_FL_INHERIT 0x03C80000 4011 #define JFS_FL_INHERIT 0x03C80000
3904 4012
3905 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ 4013 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
3906diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_filsys.h linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_filsys.h 4014diff --git a/fs/jfs/jfs_filsys.h b/fs/jfs/jfs_filsys.h
3907--- linux-3.4.48/fs/jfs/jfs_filsys.h 2008-12-24 23:26:37.000000000 +0000 4015index b3f5463..b8b38a7e 100644
3908+++ linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_filsys.h 2012-05-21 16:15:05.000000000 +0000 4016--- a/fs/jfs/jfs_filsys.h
4017+++ b/fs/jfs/jfs_filsys.h
3909@@ -263,6 +263,7 @@ 4018@@ -263,6 +263,7 @@
3910 #define JFS_NAME_MAX 255 4019 #define JFS_NAME_MAX 255
3911 #define JFS_PATH_MAX BPSIZE 4020 #define JFS_PATH_MAX BPSIZE
@@ -3914,9 +4023,10 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_filsys.h linux-3.4.48-vs2.3.3.9/fs
3914 4023
3915 /* 4024 /*
3916 * file system state (superblock state) 4025 * file system state (superblock state)
3917diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_imap.c linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_imap.c 4026diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
3918--- linux-3.4.48/fs/jfs/jfs_imap.c 2012-01-09 15:14:54.000000000 +0000 4027index 1b6f15f..2d5a0b4 100644
3919+++ linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_imap.c 2012-05-21 16:15:05.000000000 +0000 4028--- a/fs/jfs/jfs_imap.c
4029+++ b/fs/jfs/jfs_imap.c
3920@@ -46,6 +46,7 @@ 4030@@ -46,6 +46,7 @@
3921 #include <linux/pagemap.h> 4031 #include <linux/pagemap.h>
3922 #include <linux/quotaops.h> 4032 #include <linux/quotaops.h>
@@ -3925,7 +4035,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_imap.c linux-3.4.48-vs2.3.3.9/fs/j
3925 4035
3926 #include "jfs_incore.h" 4036 #include "jfs_incore.h"
3927 #include "jfs_inode.h" 4037 #include "jfs_inode.h"
3928@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod 4038@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
3929 { 4039 {
3930 struct jfs_inode_info *jfs_ip = JFS_IP(ip); 4040 struct jfs_inode_info *jfs_ip = JFS_IP(ip);
3931 struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); 4041 struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
@@ -3934,7 +4044,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_imap.c linux-3.4.48-vs2.3.3.9/fs/j
3934 4044
3935 jfs_ip->fileset = le32_to_cpu(dip->di_fileset); 4045 jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
3936 jfs_ip->mode2 = le32_to_cpu(dip->di_mode); 4046 jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
3937@@ -3078,14 +3081,18 @@ static int copy_from_dinode(struct dinod 4047@@ -3078,14 +3081,18 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
3938 } 4048 }
3939 set_nlink(ip, le32_to_cpu(dip->di_nlink)); 4049 set_nlink(ip, le32_to_cpu(dip->di_nlink));
3940 4050
@@ -3955,7 +4065,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_imap.c linux-3.4.48-vs2.3.3.9/fs/j
3955 if (sbi->gid == -1) 4065 if (sbi->gid == -1)
3956 ip->i_gid = jfs_ip->saved_gid; 4066 ip->i_gid = jfs_ip->saved_gid;
3957 else { 4067 else {
3958@@ -3150,14 +3157,12 @@ static void copy_to_dinode(struct dinode 4068@@ -3150,14 +3157,12 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip)
3959 dip->di_size = cpu_to_le64(ip->i_size); 4069 dip->di_size = cpu_to_le64(ip->i_size);
3960 dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks)); 4070 dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks));
3961 dip->di_nlink = cpu_to_le32(ip->i_nlink); 4071 dip->di_nlink = cpu_to_le32(ip->i_nlink);
@@ -3976,9 +4086,10 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_imap.c linux-3.4.48-vs2.3.3.9/fs/j
3976 jfs_get_inode_flags(jfs_ip); 4086 jfs_get_inode_flags(jfs_ip);
3977 /* 4087 /*
3978 * mode2 is only needed for storing the higher order bits. 4088 * mode2 is only needed for storing the higher order bits.
3979diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.c linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_inode.c 4089diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
3980--- linux-3.4.48/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000 4090index c1a3e60..3f86fe5 100644
3981+++ linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_inode.c 2012-05-21 16:15:05.000000000 +0000 4091--- a/fs/jfs/jfs_inode.c
4092+++ b/fs/jfs/jfs_inode.c
3982@@ -18,6 +18,7 @@ 4093@@ -18,6 +18,7 @@
3983 4094
3984 #include <linux/fs.h> 4095 #include <linux/fs.h>
@@ -3987,7 +4098,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.c linux-3.4.48-vs2.3.3.9/fs/
3987 #include "jfs_incore.h" 4098 #include "jfs_incore.h"
3988 #include "jfs_inode.h" 4099 #include "jfs_inode.h"
3989 #include "jfs_filsys.h" 4100 #include "jfs_filsys.h"
3990@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i 4101@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *inode)
3991 { 4102 {
3992 unsigned int flags = JFS_IP(inode)->mode2; 4103 unsigned int flags = JFS_IP(inode)->mode2;
3993 4104
@@ -4040,7 +4151,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.c linux-3.4.48-vs2.3.3.9/fs/
4040 if (flags & S_APPEND) 4151 if (flags & S_APPEND)
4041 jfs_ip->mode2 |= JFS_APPEND_FL; 4152 jfs_ip->mode2 |= JFS_APPEND_FL;
4042 if (flags & S_NOATIME) 4153 if (flags & S_NOATIME)
4043@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod 4154@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
4044 jfs_ip->mode2 |= JFS_DIRSYNC_FL; 4155 jfs_ip->mode2 |= JFS_DIRSYNC_FL;
4045 if (flags & S_SYNC) 4156 if (flags & S_SYNC)
4046 jfs_ip->mode2 |= JFS_SYNC_FL; 4157 jfs_ip->mode2 |= JFS_SYNC_FL;
@@ -4052,10 +4163,11 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.c linux-3.4.48-vs2.3.3.9/fs/
4052 } 4163 }
4053 4164
4054 /* 4165 /*
4055diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.h linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_inode.h 4166diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h
4056--- linux-3.4.48/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000 4167index 9271cfe4..ccfdb60 100644
4057+++ linux-3.4.48-vs2.3.3.9/fs/jfs/jfs_inode.h 2012-05-21 16:15:05.000000000 +0000 4168--- a/fs/jfs/jfs_inode.h
4058@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s 4169+++ b/fs/jfs/jfs_inode.h
4170@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
4059 extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, 4171 extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
4060 int fh_len, int fh_type); 4172 int fh_len, int fh_type);
4061 extern void jfs_set_inode_flags(struct inode *); 4173 extern void jfs_set_inode_flags(struct inode *);
@@ -4063,9 +4175,10 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/jfs_inode.h linux-3.4.48-vs2.3.3.9/fs/
4063 extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); 4175 extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
4064 extern int jfs_setattr(struct dentry *, struct iattr *); 4176 extern int jfs_setattr(struct dentry *, struct iattr *);
4065 4177
4066diff -NurpP --minimal linux-3.4.48/fs/jfs/namei.c linux-3.4.48-vs2.3.3.9/fs/jfs/namei.c 4178diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
4067--- linux-3.4.48/fs/jfs/namei.c 2012-05-21 16:07:25.000000000 +0000 4179index 07c91ca..e6877e5 100644
4068+++ linux-3.4.48-vs2.3.3.9/fs/jfs/namei.c 2012-05-21 16:15:05.000000000 +0000 4180--- a/fs/jfs/namei.c
4181+++ b/fs/jfs/namei.c
4069@@ -22,6 +22,7 @@ 4182@@ -22,6 +22,7 @@
4070 #include <linux/ctype.h> 4183 #include <linux/ctype.h>
4071 #include <linux/quotaops.h> 4184 #include <linux/quotaops.h>
@@ -4074,7 +4187,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/namei.c linux-3.4.48-vs2.3.3.9/fs/jfs/
4074 #include "jfs_incore.h" 4187 #include "jfs_incore.h"
4075 #include "jfs_superblock.h" 4188 #include "jfs_superblock.h"
4076 #include "jfs_inode.h" 4189 #include "jfs_inode.h"
4077@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct 4190@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc
4078 jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum); 4191 jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
4079 } 4192 }
4080 4193
@@ -4082,7 +4195,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/namei.c linux-3.4.48-vs2.3.3.9/fs/jfs/
4082 return d_splice_alias(ip, dentry); 4195 return d_splice_alias(ip, dentry);
4083 } 4196 }
4084 4197
4085@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in 4198@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_inode_operations = {
4086 #ifdef CONFIG_JFS_POSIX_ACL 4199 #ifdef CONFIG_JFS_POSIX_ACL
4087 .get_acl = jfs_get_acl, 4200 .get_acl = jfs_get_acl,
4088 #endif 4201 #endif
@@ -4090,10 +4203,11 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/namei.c linux-3.4.48-vs2.3.3.9/fs/jfs/
4090 }; 4203 };
4091 4204
4092 const struct file_operations jfs_dir_operations = { 4205 const struct file_operations jfs_dir_operations = {
4093diff -NurpP --minimal linux-3.4.48/fs/jfs/super.c linux-3.4.48-vs2.3.3.9/fs/jfs/super.c 4206diff --git a/fs/jfs/super.c b/fs/jfs/super.c
4094--- linux-3.4.48/fs/jfs/super.c 2012-05-21 16:07:25.000000000 +0000 4207index 4a82950..d5f12f5 100644
4095+++ linux-3.4.48-vs2.3.3.9/fs/jfs/super.c 2012-05-21 16:15:05.000000000 +0000 4208--- a/fs/jfs/super.c
4096@@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b 4209+++ b/fs/jfs/super.c
4210@@ -197,7 +197,8 @@ static void jfs_put_super(struct super_block *sb)
4097 enum { 4211 enum {
4098 Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, 4212 Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
4099 Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota, 4213 Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -4114,7 +4228,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/super.c linux-3.4.48-vs2.3.3.9/fs/jfs/
4114 {Opt_ignore, "noquota"}, 4228 {Opt_ignore, "noquota"},
4115 {Opt_ignore, "quota"}, 4229 {Opt_ignore, "quota"},
4116 {Opt_usrquota, "usrquota"}, 4230 {Opt_usrquota, "usrquota"},
4117@@ -341,6 +346,20 @@ static int parse_options(char *options, 4231@@ -341,6 +346,20 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
4118 } 4232 }
4119 break; 4233 break;
4120 } 4234 }
@@ -4135,7 +4249,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/super.c linux-3.4.48-vs2.3.3.9/fs/jfs/
4135 default: 4249 default:
4136 printk("jfs: Unrecognized mount option \"%s\" " 4250 printk("jfs: Unrecognized mount option \"%s\" "
4137 " or missing value\n", p); 4251 " or missing value\n", p);
4138@@ -372,6 +391,12 @@ static int jfs_remount(struct super_bloc 4252@@ -372,6 +391,12 @@ static int jfs_remount(struct super_block *sb, int *flags, char *data)
4139 return -EINVAL; 4253 return -EINVAL;
4140 } 4254 }
4141 4255
@@ -4148,7 +4262,7 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/super.c linux-3.4.48-vs2.3.3.9/fs/jfs/
4148 if (newLVSize) { 4262 if (newLVSize) {
4149 if (sb->s_flags & MS_RDONLY) { 4263 if (sb->s_flags & MS_RDONLY) {
4150 printk(KERN_ERR 4264 printk(KERN_ERR
4151@@ -455,6 +480,9 @@ static int jfs_fill_super(struct super_b 4265@@ -455,6 +480,9 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
4152 #ifdef CONFIG_JFS_POSIX_ACL 4266 #ifdef CONFIG_JFS_POSIX_ACL
4153 sb->s_flags |= MS_POSIXACL; 4267 sb->s_flags |= MS_POSIXACL;
4154 #endif 4268 #endif
@@ -4158,10 +4272,11 @@ diff -NurpP --minimal linux-3.4.48/fs/jfs/super.c linux-3.4.48-vs2.3.3.9/fs/jfs/
4158 4272
4159 if (newLVSize) { 4273 if (newLVSize) {
4160 printk(KERN_ERR "resize option for remount only\n"); 4274 printk(KERN_ERR "resize option for remount only\n");
4161diff -NurpP --minimal linux-3.4.48/fs/libfs.c linux-3.4.48-vs2.3.3.9/fs/libfs.c 4275diff --git a/fs/libfs.c b/fs/libfs.c
4162--- linux-3.4.48/fs/libfs.c 2012-05-21 16:07:25.000000000 +0000 4276index 18d08f5..3402ccc 100644
4163+++ linux-3.4.48-vs2.3.3.9/fs/libfs.c 2012-05-21 16:15:05.000000000 +0000 4277--- a/fs/libfs.c
4164@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru 4278+++ b/fs/libfs.c
4279@@ -135,7 +135,8 @@ static inline unsigned char dt_type(struct inode *inode)
4165 * both impossible due to the lock on directory. 4280 * both impossible due to the lock on directory.
4166 */ 4281 */
4167 4282
@@ -4171,7 +4286,7 @@ diff -NurpP --minimal linux-3.4.48/fs/libfs.c linux-3.4.48-vs2.3.3.9/fs/libfs.c
4171 { 4286 {
4172 struct dentry *dentry = filp->f_path.dentry; 4287 struct dentry *dentry = filp->f_path.dentry;
4173 struct dentry *cursor = filp->private_data; 4288 struct dentry *cursor = filp->private_data;
4174@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v 4289@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
4175 for (p=q->next; p != &dentry->d_subdirs; p=p->next) { 4290 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
4176 struct dentry *next; 4291 struct dentry *next;
4177 next = list_entry(p, struct dentry, d_u.d_child); 4292 next = list_entry(p, struct dentry, d_u.d_child);
@@ -4180,7 +4295,7 @@ diff -NurpP --minimal linux-3.4.48/fs/libfs.c linux-3.4.48-vs2.3.3.9/fs/libfs.c
4180 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); 4295 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
4181 if (!simple_positive(next)) { 4296 if (!simple_positive(next)) {
4182 spin_unlock(&next->d_lock); 4297 spin_unlock(&next->d_lock);
4183@@ -192,6 +195,17 @@ int dcache_readdir(struct file * filp, v 4298@@ -192,6 +195,17 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
4184 return 0; 4299 return 0;
4185 } 4300 }
4186 4301
@@ -4206,9 +4321,10 @@ diff -NurpP --minimal linux-3.4.48/fs/libfs.c linux-3.4.48-vs2.3.3.9/fs/libfs.c
4206 EXPORT_SYMBOL(generic_read_dir); 4321 EXPORT_SYMBOL(generic_read_dir);
4207 EXPORT_SYMBOL(mount_pseudo); 4322 EXPORT_SYMBOL(mount_pseudo);
4208 EXPORT_SYMBOL(simple_write_begin); 4323 EXPORT_SYMBOL(simple_write_begin);
4209diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c 4324diff --git a/fs/locks.c b/fs/locks.c
4210--- linux-3.4.48/fs/locks.c 2013-06-13 08:59:34.000000000 +0000 4325index fcc50ab..1bbdd58 100644
4211+++ linux-3.4.48-vs2.3.3.9/fs/locks.c 2012-09-01 08:50:49.000000000 +0000 4326--- a/fs/locks.c
4327+++ b/fs/locks.c
4212@@ -126,6 +126,8 @@ 4328@@ -126,6 +126,8 @@
4213 #include <linux/time.h> 4329 #include <linux/time.h>
4214 #include <linux/rcupdate.h> 4330 #include <linux/rcupdate.h>
@@ -4218,7 +4334,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4218 4334
4219 #include <asm/uaccess.h> 4335 #include <asm/uaccess.h>
4220 4336
4221@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct 4337@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct file_lock *fl)
4222 /* Allocate an empty lock structure. */ 4338 /* Allocate an empty lock structure. */
4223 struct file_lock *locks_alloc_lock(void) 4339 struct file_lock *locks_alloc_lock(void)
4224 { 4340 {
@@ -4229,9 +4345,9 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4229- locks_init_lock_heads(fl); 4345- locks_init_lock_heads(fl);
4230+ if (!vx_locks_avail(1)) 4346+ if (!vx_locks_avail(1))
4231+ return NULL; 4347+ return NULL;
4232
4233+ fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
4234+ 4348+
4349+ fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
4350
4235+ if (fl) { 4351+ if (fl) {
4236+ locks_init_lock_heads(fl); 4352+ locks_init_lock_heads(fl);
4237+ fl->fl_xid = -1; 4353+ fl->fl_xid = -1;
@@ -4239,7 +4355,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4239 return fl; 4355 return fl;
4240 } 4356 }
4241 EXPORT_SYMBOL_GPL(locks_alloc_lock); 4357 EXPORT_SYMBOL_GPL(locks_alloc_lock);
4242@@ -216,6 +224,7 @@ void locks_free_lock(struct file_lock *f 4358@@ -216,6 +224,7 @@ void locks_free_lock(struct file_lock *fl)
4243 BUG_ON(!list_empty(&fl->fl_block)); 4359 BUG_ON(!list_empty(&fl->fl_block));
4244 BUG_ON(!list_empty(&fl->fl_link)); 4360 BUG_ON(!list_empty(&fl->fl_link));
4245 4361
@@ -4247,7 +4363,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4247 locks_release_private(fl); 4363 locks_release_private(fl);
4248 kmem_cache_free(filelock_cache, fl); 4364 kmem_cache_free(filelock_cache, fl);
4249 } 4365 }
4250@@ -225,6 +234,7 @@ void locks_init_lock(struct file_lock *f 4366@@ -225,6 +234,7 @@ void locks_init_lock(struct file_lock *fl)
4251 { 4367 {
4252 memset(fl, 0, sizeof(struct file_lock)); 4368 memset(fl, 0, sizeof(struct file_lock));
4253 locks_init_lock_heads(fl); 4369 locks_init_lock_heads(fl);
@@ -4255,7 +4371,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4255 } 4371 }
4256 4372
4257 EXPORT_SYMBOL(locks_init_lock); 4373 EXPORT_SYMBOL(locks_init_lock);
4258@@ -265,6 +275,7 @@ void locks_copy_lock(struct file_lock *n 4374@@ -265,6 +275,7 @@ void locks_copy_lock(struct file_lock *new, struct file_lock *fl)
4259 new->fl_file = fl->fl_file; 4375 new->fl_file = fl->fl_file;
4260 new->fl_ops = fl->fl_ops; 4376 new->fl_ops = fl->fl_ops;
4261 new->fl_lmops = fl->fl_lmops; 4377 new->fl_lmops = fl->fl_lmops;
@@ -4263,7 +4379,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4263 4379
4264 locks_copy_private(new, fl); 4380 locks_copy_private(new, fl);
4265 } 4381 }
4266@@ -303,6 +314,11 @@ static int flock_make_lock(struct file * 4382@@ -303,6 +314,11 @@ static int flock_make_lock(struct file *filp, struct file_lock **lock,
4267 fl->fl_flags = FL_FLOCK; 4383 fl->fl_flags = FL_FLOCK;
4268 fl->fl_type = type; 4384 fl->fl_type = type;
4269 fl->fl_end = OFFSET_MAX; 4385 fl->fl_end = OFFSET_MAX;
@@ -4275,7 +4391,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4275 4391
4276 *lock = fl; 4392 *lock = fl;
4277 return 0; 4393 return 0;
4278@@ -452,6 +468,7 @@ static int lease_init(struct file *filp, 4394@@ -452,6 +468,7 @@ static int lease_init(struct file *filp, long type, struct file_lock *fl)
4279 4395
4280 fl->fl_owner = current->files; 4396 fl->fl_owner = current->files;
4281 fl->fl_pid = current->tgid; 4397 fl->fl_pid = current->tgid;
@@ -4283,7 +4399,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4283 4399
4284 fl->fl_file = filp; 4400 fl->fl_file = filp;
4285 fl->fl_flags = FL_LEASE; 4401 fl->fl_flags = FL_LEASE;
4286@@ -471,6 +488,11 @@ static struct file_lock *lease_alloc(str 4402@@ -471,6 +488,11 @@ static struct file_lock *lease_alloc(struct file *filp, long type)
4287 if (fl == NULL) 4403 if (fl == NULL)
4288 return ERR_PTR(error); 4404 return ERR_PTR(error);
4289 4405
@@ -4295,7 +4411,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4295 error = lease_init(filp, type, fl); 4411 error = lease_init(filp, type, fl);
4296 if (error) { 4412 if (error) {
4297 locks_free_lock(fl); 4413 locks_free_lock(fl);
4298@@ -773,6 +795,7 @@ static int flock_lock_file(struct file * 4414@@ -773,6 +795,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
4299 lock_flocks(); 4415 lock_flocks();
4300 } 4416 }
4301 4417
@@ -4321,7 +4437,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4321 { 4437 {
4322 struct file_lock *fl; 4438 struct file_lock *fl;
4323 struct file_lock *new_fl = NULL; 4439 struct file_lock *new_fl = NULL;
4324@@ -813,6 +838,8 @@ static int __posix_lock_file(struct inod 4440@@ -813,6 +838,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
4325 struct file_lock **before; 4441 struct file_lock **before;
4326 int error, added = 0; 4442 int error, added = 0;
4327 4443
@@ -4330,7 +4446,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4330 /* 4446 /*
4331 * We may need two file_lock structures for this operation, 4447 * We may need two file_lock structures for this operation,
4332 * so we get them in advance to avoid races. 4448 * so we get them in advance to avoid races.
4333@@ -823,7 +850,11 @@ static int __posix_lock_file(struct inod 4449@@ -823,7 +850,11 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
4334 (request->fl_type != F_UNLCK || 4450 (request->fl_type != F_UNLCK ||
4335 request->fl_start != 0 || request->fl_end != OFFSET_MAX)) { 4451 request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
4336 new_fl = locks_alloc_lock(); 4452 new_fl = locks_alloc_lock();
@@ -4342,7 +4458,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4342 } 4458 }
4343 4459
4344 lock_flocks(); 4460 lock_flocks();
4345@@ -1022,7 +1053,8 @@ static int __posix_lock_file(struct inod 4461@@ -1022,7 +1053,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
4346 int posix_lock_file(struct file *filp, struct file_lock *fl, 4462 int posix_lock_file(struct file *filp, struct file_lock *fl,
4347 struct file_lock *conflock) 4463 struct file_lock *conflock)
4348 { 4464 {
@@ -4352,7 +4468,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4352 } 4468 }
4353 EXPORT_SYMBOL(posix_lock_file); 4469 EXPORT_SYMBOL(posix_lock_file);
4354 4470
4355@@ -1112,7 +1144,7 @@ int locks_mandatory_area(int read_write, 4471@@ -1112,7 +1144,7 @@ int locks_mandatory_area(int read_write, struct inode *inode,
4356 fl.fl_end = offset + count - 1; 4472 fl.fl_end = offset + count - 1;
4357 4473
4358 for (;;) { 4474 for (;;) {
@@ -4361,7 +4477,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4361 if (error != FILE_LOCK_DEFERRED) 4477 if (error != FILE_LOCK_DEFERRED)
4362 break; 4478 break;
4363 error = wait_event_interruptible(fl.fl_wait, !fl.fl_next); 4479 error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
4364@@ -1407,6 +1439,7 @@ int generic_add_lease(struct file *filp, 4480@@ -1407,6 +1439,7 @@ int generic_add_lease(struct file *filp, long arg, struct file_lock **flp)
4365 goto out; 4481 goto out;
4366 4482
4367 locks_insert_lock(before, lease); 4483 locks_insert_lock(before, lease);
@@ -4369,7 +4485,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4369 return 0; 4485 return 0;
4370 4486
4371 out: 4487 out:
4372@@ -1847,6 +1880,11 @@ int fcntl_setlk(unsigned int fd, struct 4488@@ -1847,6 +1880,11 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,
4373 if (file_lock == NULL) 4489 if (file_lock == NULL)
4374 return -ENOLCK; 4490 return -ENOLCK;
4375 4491
@@ -4381,7 +4497,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4381 /* 4497 /*
4382 * This might block, so we do it before checking the inode. 4498 * This might block, so we do it before checking the inode.
4383 */ 4499 */
4384@@ -1965,6 +2003,11 @@ int fcntl_setlk64(unsigned int fd, struc 4500@@ -1965,6 +2003,11 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,
4385 if (file_lock == NULL) 4501 if (file_lock == NULL)
4386 return -ENOLCK; 4502 return -ENOLCK;
4387 4503
@@ -4393,7 +4509,7 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4393 /* 4509 /*
4394 * This might block, so we do it before checking the inode. 4510 * This might block, so we do it before checking the inode.
4395 */ 4511 */
4396@@ -2230,8 +2273,11 @@ static int locks_show(struct seq_file *f 4512@@ -2230,8 +2273,11 @@ static int locks_show(struct seq_file *f, void *v)
4397 4513
4398 lock_get_status(f, fl, *((loff_t *)f->private), ""); 4514 lock_get_status(f, fl, *((loff_t *)f->private), "");
4399 4515
@@ -4406,9 +4522,10 @@ diff -NurpP --minimal linux-3.4.48/fs/locks.c linux-3.4.48-vs2.3.3.9/fs/locks.c
4406 4522
4407 return 0; 4523 return 0;
4408 } 4524 }
4409diff -NurpP --minimal linux-3.4.48/fs/mount.h linux-3.4.48-vs2.3.3.9/fs/mount.h 4525diff --git a/fs/mount.h b/fs/mount.h
4410--- linux-3.4.48/fs/mount.h 2012-03-19 18:47:26.000000000 +0000 4526index 4ef36d9..b7f1af3 100644
4411+++ linux-3.4.48-vs2.3.3.9/fs/mount.h 2012-05-21 16:15:05.000000000 +0000 4527--- a/fs/mount.h
4528+++ b/fs/mount.h
4412@@ -47,6 +47,7 @@ struct mount { 4529@@ -47,6 +47,7 @@ struct mount {
4413 int mnt_expiry_mark; /* true if marked for expiry */ 4530 int mnt_expiry_mark; /* true if marked for expiry */
4414 int mnt_pinned; 4531 int mnt_pinned;
@@ -4417,9 +4534,10 @@ diff -NurpP --minimal linux-3.4.48/fs/mount.h linux-3.4.48-vs2.3.3.9/fs/mount.h
4417 }; 4534 };
4418 4535
4419 static inline struct mount *real_mount(struct vfsmount *mnt) 4536 static inline struct mount *real_mount(struct vfsmount *mnt)
4420diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c 4537diff --git a/fs/namei.c b/fs/namei.c
4421--- linux-3.4.48/fs/namei.c 2012-05-21 16:07:25.000000000 +0000 4538index c427919..e726b31 100644
4422+++ linux-3.4.48-vs2.3.3.9/fs/namei.c 2012-05-21 16:15:05.000000000 +0000 4539--- a/fs/namei.c
4540+++ b/fs/namei.c
4423@@ -33,6 +33,14 @@ 4541@@ -33,6 +33,14 @@
4424 #include <linux/device_cgroup.h> 4542 #include <linux/device_cgroup.h>
4425 #include <linux/fs_struct.h> 4543 #include <linux/fs_struct.h>
@@ -4435,7 +4553,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4435 #include <asm/uaccess.h> 4553 #include <asm/uaccess.h>
4436 4554
4437 #include "internal.h" 4555 #include "internal.h"
4438@@ -221,6 +229,89 @@ static int check_acl(struct inode *inode 4556@@ -221,6 +229,89 @@ static int check_acl(struct inode *inode, int mask)
4439 return -EAGAIN; 4557 return -EAGAIN;
4440 } 4558 }
4441 4559
@@ -4525,7 +4643,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4525 /* 4643 /*
4526 * This does the basic permission checking 4644 * This does the basic permission checking
4527 */ 4645 */
4528@@ -356,10 +447,14 @@ int inode_permission(struct inode *inode 4646@@ -356,10 +447,14 @@ int inode_permission(struct inode *inode, int mask)
4529 /* 4647 /*
4530 * Nobody gets write access to an immutable file. 4648 * Nobody gets write access to an immutable file.
4531 */ 4649 */
@@ -4541,7 +4659,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4541 retval = do_inode_permission(inode, mask); 4659 retval = do_inode_permission(inode, mask);
4542 if (retval) 4660 if (retval)
4543 return retval; 4661 return retval;
4544@@ -1038,7 +1133,8 @@ static void follow_dotdot(struct nameida 4662@@ -1038,7 +1133,8 @@ static void follow_dotdot(struct nameidata *nd)
4545 4663
4546 if (nd->path.dentry == nd->root.dentry && 4664 if (nd->path.dentry == nd->root.dentry &&
4547 nd->path.mnt == nd->root.mnt) { 4665 nd->path.mnt == nd->root.mnt) {
@@ -4551,7 +4669,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4551 } 4669 }
4552 if (nd->path.dentry != nd->path.mnt->mnt_root) { 4670 if (nd->path.dentry != nd->path.mnt->mnt_root) {
4553 /* rare case of legitimate dget_parent()... */ 4671 /* rare case of legitimate dget_parent()... */
4554@@ -1174,6 +1270,9 @@ static int do_lookup(struct nameidata *n 4672@@ -1174,6 +1270,9 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
4555 goto unlazy; 4673 goto unlazy;
4556 } 4674 }
4557 } 4675 }
@@ -4571,7 +4689,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4571 done: 4689 done:
4572 path->mnt = mnt; 4690 path->mnt = mnt;
4573 path->dentry = dentry; 4691 path->dentry = dentry;
4574@@ -1981,7 +2083,7 @@ static int may_delete(struct inode *dir, 4692@@ -1981,7 +2083,7 @@ static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
4575 if (IS_APPEND(dir)) 4693 if (IS_APPEND(dir))
4576 return -EPERM; 4694 return -EPERM;
4577 if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| 4695 if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
@@ -4580,7 +4698,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4580 return -EPERM; 4698 return -EPERM;
4581 if (isdir) { 4699 if (isdir) {
4582 if (!S_ISDIR(victim->d_inode->i_mode)) 4700 if (!S_ISDIR(victim->d_inode->i_mode))
4583@@ -2061,19 +2163,25 @@ int vfs_create(struct inode *dir, struct 4701@@ -2061,19 +2163,25 @@ int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
4584 { 4702 {
4585 int error = may_create(dir, dentry); 4703 int error = may_create(dir, dentry);
4586 4704
@@ -4608,7 +4726,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4608 return error; 4726 return error;
4609 } 4727 }
4610 4728
4611@@ -2108,6 +2216,15 @@ static int may_open(struct path *path, i 4729@@ -2108,6 +2216,15 @@ static int may_open(struct path *path, int acc_mode, int flag)
4612 break; 4730 break;
4613 } 4731 }
4614 4732
@@ -4641,7 +4759,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4641 if (error) 4759 if (error)
4642 goto exit; 4760 goto exit;
4643 filp = nameidata_to_filp(nd); 4761 filp = nameidata_to_filp(nd);
4644@@ -2374,6 +2501,7 @@ static struct file *path_openat(int dfd, 4762@@ -2374,6 +2501,7 @@ static struct file *path_openat(int dfd, const char *pathname,
4645 struct path path; 4763 struct path path;
4646 int error; 4764 int error;
4647 4765
@@ -4649,7 +4767,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4649 filp = get_empty_filp(); 4767 filp = get_empty_filp();
4650 if (!filp) 4768 if (!filp)
4651 return ERR_PTR(-ENFILE); 4769 return ERR_PTR(-ENFILE);
4652@@ -2411,6 +2539,17 @@ static struct file *path_openat(int dfd, 4770@@ -2411,6 +2539,17 @@ static struct file *path_openat(int dfd, const char *pathname,
4653 filp = do_last(nd, &path, op, pathname); 4771 filp = do_last(nd, &path, op, pathname);
4654 put_link(nd, &link, cookie); 4772 put_link(nd, &link, cookie);
4655 } 4773 }
@@ -4667,7 +4785,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4667 out: 4785 out:
4668 if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) 4786 if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
4669 path_put(&nd->root); 4787 path_put(&nd->root);
4670@@ -2500,6 +2639,11 @@ struct dentry *kern_path_create(int dfd, 4788@@ -2500,6 +2639,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
4671 goto fail; 4789 goto fail;
4672 } 4790 }
4673 *path = nd.path; 4791 *path = nd.path;
@@ -4679,7 +4797,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4679 return dentry; 4797 return dentry;
4680 eexist: 4798 eexist:
4681 dput(dentry); 4799 dput(dentry);
4682@@ -2986,7 +3130,7 @@ int vfs_link(struct dentry *old_dentry, 4800@@ -2986,7 +3130,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
4683 /* 4801 /*
4684 * A link to an append-only or immutable file cannot be created. 4802 * A link to an append-only or immutable file cannot be created.
4685 */ 4803 */
@@ -4688,7 +4806,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4688 return -EPERM; 4806 return -EPERM;
4689 if (!dir->i_op->link) 4807 if (!dir->i_op->link)
4690 return -EPERM; 4808 return -EPERM;
4691@@ -3375,6 +3519,253 @@ int vfs_follow_link(struct nameidata *nd 4809@@ -3375,6 +3519,253 @@ int vfs_follow_link(struct nameidata *nd, const char *link)
4692 return __vfs_follow_link(nd, link); 4810 return __vfs_follow_link(nd, link);
4693 } 4811 }
4694 4812
@@ -4947,9 +5065,10 @@ diff -NurpP --minimal linux-3.4.48/fs/namei.c linux-3.4.48-vs2.3.3.9/fs/namei.c
4947 EXPORT_SYMBOL(dentry_unhash); 5065 EXPORT_SYMBOL(dentry_unhash);
4948 EXPORT_SYMBOL(generic_readlink); 5066 EXPORT_SYMBOL(generic_readlink);
4949+EXPORT_SYMBOL(vx_info_mnt_namespace); 5067+EXPORT_SYMBOL(vx_info_mnt_namespace);
4950diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/namespace.c 5068diff --git a/fs/namespace.c b/fs/namespace.c
4951--- linux-3.4.48/fs/namespace.c 2013-06-13 08:59:34.000000000 +0000 5069index 4e46539..887918c 100644
4952+++ linux-3.4.48-vs2.3.3.9/fs/namespace.c 2012-06-28 14:45:07.000000000 +0000 5070--- a/fs/namespace.c
5071+++ b/fs/namespace.c
4953@@ -20,6 +20,11 @@ 5072@@ -20,6 +20,11 @@
4954 #include <linux/fs_struct.h> /* get_fs_root et.al. */ 5073 #include <linux/fs_struct.h> /* get_fs_root et.al. */
4955 #include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */ 5074 #include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
@@ -4962,7 +5081,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
4962 #include "pnode.h" 5081 #include "pnode.h"
4963 #include "internal.h" 5082 #include "internal.h"
4964 5083
4965@@ -697,6 +702,10 @@ vfs_kern_mount(struct file_system_type * 5084@@ -697,6 +702,10 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void
4966 if (!type) 5085 if (!type)
4967 return ERR_PTR(-ENODEV); 5086 return ERR_PTR(-ENODEV);
4968 5087
@@ -4973,7 +5092,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
4973 mnt = alloc_vfsmnt(name); 5092 mnt = alloc_vfsmnt(name);
4974 if (!mnt) 5093 if (!mnt)
4975 return ERR_PTR(-ENOMEM); 5094 return ERR_PTR(-ENOMEM);
4976@@ -745,6 +754,7 @@ static struct mount *clone_mnt(struct mo 5095@@ -745,6 +754,7 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,
4977 mnt->mnt.mnt_root = dget(root); 5096 mnt->mnt.mnt_root = dget(root);
4978 mnt->mnt_mountpoint = mnt->mnt.mnt_root; 5097 mnt->mnt_mountpoint = mnt->mnt.mnt_root;
4979 mnt->mnt_parent = mnt; 5098 mnt->mnt_parent = mnt;
@@ -4981,7 +5100,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
4981 br_write_lock(vfsmount_lock); 5100 br_write_lock(vfsmount_lock);
4982 list_add_tail(&mnt->mnt_instance, &sb->s_mounts); 5101 list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
4983 br_write_unlock(vfsmount_lock); 5102 br_write_unlock(vfsmount_lock);
4984@@ -1210,7 +1220,7 @@ SYSCALL_DEFINE2(umount, char __user *, n 5103@@ -1210,7 +1220,7 @@ SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
4985 goto dput_and_out; 5104 goto dput_and_out;
4986 5105
4987 retval = -EPERM; 5106 retval = -EPERM;
@@ -4990,7 +5109,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
4990 goto dput_and_out; 5109 goto dput_and_out;
4991 5110
4992 retval = do_umount(mnt, flags); 5111 retval = do_umount(mnt, flags);
4993@@ -1236,7 +1246,7 @@ SYSCALL_DEFINE1(oldumount, char __user * 5112@@ -1236,7 +1246,7 @@ SYSCALL_DEFINE1(oldumount, char __user *, name)
4994 5113
4995 static int mount_is_safe(struct path *path) 5114 static int mount_is_safe(struct path *path)
4996 { 5115 {
@@ -4999,7 +5118,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
4999 return 0; 5118 return 0;
5000 return -EPERM; 5119 return -EPERM;
5001 #ifdef notyet 5120 #ifdef notyet
5002@@ -1549,7 +1559,7 @@ static int do_change_type(struct path *p 5121@@ -1549,7 +1559,7 @@ static int do_change_type(struct path *path, int flag)
5003 int type; 5122 int type;
5004 int err = 0; 5123 int err = 0;
5005 5124
@@ -5008,7 +5127,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5008 return -EPERM; 5127 return -EPERM;
5009 5128
5010 if (path->dentry != path->mnt->mnt_root) 5129 if (path->dentry != path->mnt->mnt_root)
5011@@ -1565,6 +1575,7 @@ static int do_change_type(struct path *p 5130@@ -1565,6 +1575,7 @@ static int do_change_type(struct path *path, int flag)
5012 if (err) 5131 if (err)
5013 goto out_unlock; 5132 goto out_unlock;
5014 } 5133 }
@@ -5016,7 +5135,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5016 5135
5017 br_write_lock(vfsmount_lock); 5136 br_write_lock(vfsmount_lock);
5018 for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL)) 5137 for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
5019@@ -1580,12 +1591,14 @@ static int do_change_type(struct path *p 5138@@ -1580,12 +1591,14 @@ static int do_change_type(struct path *path, int flag)
5020 * do loopback mount. 5139 * do loopback mount.
5021 */ 5140 */
5022 static int do_loopback(struct path *path, char *old_name, 5141 static int do_loopback(struct path *path, char *old_name,
@@ -5032,7 +5151,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5032 if (err) 5151 if (err)
5033 return err; 5152 return err;
5034 if (!old_name || !*old_name) 5153 if (!old_name || !*old_name)
5035@@ -1653,13 +1666,13 @@ static int change_mount_flags(struct vfs 5154@@ -1653,13 +1666,13 @@ static int change_mount_flags(struct vfsmount *mnt, int ms_flags)
5036 * on it - tough luck. 5155 * on it - tough luck.
5037 */ 5156 */
5038 static int do_remount(struct path *path, int flags, int mnt_flags, 5157 static int do_remount(struct path *path, int flags, int mnt_flags,
@@ -5048,7 +5167,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5048 return -EPERM; 5167 return -EPERM;
5049 5168
5050 if (!check_mnt(mnt)) 5169 if (!check_mnt(mnt))
5051@@ -1708,7 +1721,7 @@ static int do_move_mount(struct path *pa 5170@@ -1708,7 +1721,7 @@ static int do_move_mount(struct path *path, char *old_name)
5052 struct mount *p; 5171 struct mount *p;
5053 struct mount *old; 5172 struct mount *old;
5054 int err = 0; 5173 int err = 0;
@@ -5057,7 +5176,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5057 return -EPERM; 5176 return -EPERM;
5058 if (!old_name || !*old_name) 5177 if (!old_name || !*old_name)
5059 return -EINVAL; 5178 return -EINVAL;
5060@@ -1859,7 +1872,7 @@ static int do_new_mount(struct path *pat 5179@@ -1859,7 +1872,7 @@ static int do_new_mount(struct path *path, char *type, int flags,
5061 return -EINVAL; 5180 return -EINVAL;
5062 5181
5063 /* we need capabilities... */ 5182 /* we need capabilities... */
@@ -5066,7 +5185,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5066 return -EPERM; 5185 return -EPERM;
5067 5186
5068 mnt = do_kern_mount(type, flags, name, data); 5187 mnt = do_kern_mount(type, flags, name, data);
5069@@ -2129,6 +2142,7 @@ long do_mount(char *dev_name, char *dir_ 5188@@ -2129,6 +2142,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
5070 struct path path; 5189 struct path path;
5071 int retval = 0; 5190 int retval = 0;
5072 int mnt_flags = 0; 5191 int mnt_flags = 0;
@@ -5074,7 +5193,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5074 5193
5075 /* Discard magic */ 5194 /* Discard magic */
5076 if ((flags & MS_MGC_MSK) == MS_MGC_VAL) 5195 if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
5077@@ -2156,6 +2170,12 @@ long do_mount(char *dev_name, char *dir_ 5196@@ -2156,6 +2170,12 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
5078 if (!(flags & MS_NOATIME)) 5197 if (!(flags & MS_NOATIME))
5079 mnt_flags |= MNT_RELATIME; 5198 mnt_flags |= MNT_RELATIME;
5080 5199
@@ -5087,7 +5206,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5087 /* Separate the per-mountpoint flags */ 5206 /* Separate the per-mountpoint flags */
5088 if (flags & MS_NOSUID) 5207 if (flags & MS_NOSUID)
5089 mnt_flags |= MNT_NOSUID; 5208 mnt_flags |= MNT_NOSUID;
5090@@ -2172,15 +2192,17 @@ long do_mount(char *dev_name, char *dir_ 5209@@ -2172,15 +2192,17 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
5091 if (flags & MS_RDONLY) 5210 if (flags & MS_RDONLY)
5092 mnt_flags |= MNT_READONLY; 5211 mnt_flags |= MNT_READONLY;
5093 5212
@@ -5107,7 +5226,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5107 else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) 5226 else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
5108 retval = do_change_type(&path, flags); 5227 retval = do_change_type(&path, flags);
5109 else if (flags & MS_MOVE) 5228 else if (flags & MS_MOVE)
5110@@ -2283,6 +2305,7 @@ static struct mnt_namespace *dup_mnt_ns( 5229@@ -2283,6 +2305,7 @@ static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
5111 q = next_mnt(q, new); 5230 q = next_mnt(q, new);
5112 } 5231 }
5113 up_write(&namespace_sem); 5232 up_write(&namespace_sem);
@@ -5115,7 +5234,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5115 5234
5116 if (rootmnt) 5235 if (rootmnt)
5117 mntput(rootmnt); 5236 mntput(rootmnt);
5118@@ -2479,9 +2502,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ 5237@@ -2479,9 +2502,10 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
5119 error = -EINVAL; 5238 error = -EINVAL;
5120 new_mnt = real_mount(new.mnt); 5239 new_mnt = real_mount(new.mnt);
5121 root_mnt = real_mount(root.mnt); 5240 root_mnt = real_mount(root.mnt);
@@ -5128,7 +5247,7 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5128 goto out4; 5247 goto out4;
5129 if (!check_mnt(root_mnt) || !check_mnt(new_mnt)) 5248 if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
5130 goto out4; 5249 goto out4;
5131@@ -2602,6 +2626,7 @@ void put_mnt_ns(struct mnt_namespace *ns 5250@@ -2602,6 +2626,7 @@ void put_mnt_ns(struct mnt_namespace *ns)
5132 br_write_unlock(vfsmount_lock); 5251 br_write_unlock(vfsmount_lock);
5133 up_write(&namespace_sem); 5252 up_write(&namespace_sem);
5134 release_mounts(&umount_list); 5253 release_mounts(&umount_list);
@@ -5136,10 +5255,11 @@ diff -NurpP --minimal linux-3.4.48/fs/namespace.c linux-3.4.48-vs2.3.3.9/fs/name
5136 kfree(ns); 5255 kfree(ns);
5137 } 5256 }
5138 5257
5139diff -NurpP --minimal linux-3.4.48/fs/nfs/client.c linux-3.4.48-vs2.3.3.9/fs/nfs/client.c 5258diff --git a/fs/nfs/client.c b/fs/nfs/client.c
5140--- linux-3.4.48/fs/nfs/client.c 2013-06-13 08:59:34.000000000 +0000 5259index 37f6de3..95bff63 100644
5141+++ linux-3.4.48-vs2.3.3.9/fs/nfs/client.c 2013-01-16 00:15:57.000000000 +0000 5260--- a/fs/nfs/client.c
5142@@ -801,6 +801,9 @@ static int nfs_init_server_rpcclient(str 5261+++ b/fs/nfs/client.c
5262@@ -801,6 +801,9 @@ static int nfs_init_server_rpcclient(struct nfs_server *server,
5143 if (server->flags & NFS_MOUNT_SOFT) 5263 if (server->flags & NFS_MOUNT_SOFT)
5144 server->client->cl_softrtry = 1; 5264 server->client->cl_softrtry = 1;
5145 5265
@@ -5149,7 +5269,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/client.c linux-3.4.48-vs2.3.3.9/fs/nfs
5149 return 0; 5269 return 0;
5150 } 5270 }
5151 5271
5152@@ -976,6 +979,10 @@ static void nfs_server_set_fsinfo(struct 5272@@ -976,6 +979,10 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,
5153 server->acdirmin = server->acdirmax = 0; 5273 server->acdirmin = server->acdirmax = 0;
5154 } 5274 }
5155 5275
@@ -5160,9 +5280,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/client.c linux-3.4.48-vs2.3.3.9/fs/nfs
5160 server->maxfilesize = fsinfo->maxfilesize; 5280 server->maxfilesize = fsinfo->maxfilesize;
5161 5281
5162 server->time_delta = fsinfo->time_delta; 5282 server->time_delta = fsinfo->time_delta;
5163diff -NurpP --minimal linux-3.4.48/fs/nfs/dir.c linux-3.4.48-vs2.3.3.9/fs/nfs/dir.c 5283diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
5164--- linux-3.4.48/fs/nfs/dir.c 2013-06-13 08:59:34.000000000 +0000 5284index a0daac7..32219ea 100644
5165+++ linux-3.4.48-vs2.3.3.9/fs/nfs/dir.c 2013-01-16 00:15:57.000000000 +0000 5285--- a/fs/nfs/dir.c
5286+++ b/fs/nfs/dir.c
5166@@ -35,6 +35,7 @@ 5287@@ -35,6 +35,7 @@
5167 #include <linux/sched.h> 5288 #include <linux/sched.h>
5168 #include <linux/kmemleak.h> 5289 #include <linux/kmemleak.h>
@@ -5171,7 +5292,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/dir.c linux-3.4.48-vs2.3.3.9/fs/nfs/di
5171 5292
5172 #include "delegation.h" 5293 #include "delegation.h"
5173 #include "iostat.h" 5294 #include "iostat.h"
5174@@ -1314,6 +1315,7 @@ static struct dentry *nfs_lookup(struct 5295@@ -1314,6 +1315,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
5175 if (IS_ERR(res)) 5296 if (IS_ERR(res))
5176 goto out_unblock_sillyrename; 5297 goto out_unblock_sillyrename;
5177 5298
@@ -5179,9 +5300,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/dir.c linux-3.4.48-vs2.3.3.9/fs/nfs/di
5179 no_entry: 5300 no_entry:
5180 res = d_materialise_unique(dentry, inode); 5301 res = d_materialise_unique(dentry, inode);
5181 if (res != NULL) { 5302 if (res != NULL) {
5182diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/inode.c 5303diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
5183--- linux-3.4.48/fs/nfs/inode.c 2013-06-13 08:59:34.000000000 +0000 5304index edf4119..14a368f 100644
5184+++ linux-3.4.48-vs2.3.3.9/fs/nfs/inode.c 2012-10-22 13:09:53.000000000 +0000 5305--- a/fs/nfs/inode.c
5306+++ b/fs/nfs/inode.c
5185@@ -40,6 +40,7 @@ 5307@@ -40,6 +40,7 @@
5186 #include <linux/compat.h> 5308 #include <linux/compat.h>
5187 #include <linux/freezer.h> 5309 #include <linux/freezer.h>
@@ -5190,7 +5312,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5190 5312
5191 #include <asm/uaccess.h> 5313 #include <asm/uaccess.h>
5192 5314
5193@@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct 5315@@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
5194 if (inode->i_state & I_NEW) { 5316 if (inode->i_state & I_NEW) {
5195 struct nfs_inode *nfsi = NFS_I(inode); 5317 struct nfs_inode *nfsi = NFS_I(inode);
5196 unsigned long now = jiffies; 5318 unsigned long now = jiffies;
@@ -5199,7 +5321,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5199 5321
5200 /* We set i_ino for the few things that still rely on it, 5322 /* We set i_ino for the few things that still rely on it,
5201 * such as stat(2) */ 5323 * such as stat(2) */
5202@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct 5324@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
5203 inode->i_version = 0; 5325 inode->i_version = 0;
5204 inode->i_size = 0; 5326 inode->i_size = 0;
5205 clear_nlink(inode); 5327 clear_nlink(inode);
@@ -5210,7 +5332,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5210 inode->i_blocks = 0; 5332 inode->i_blocks = 0;
5211 memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); 5333 memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
5212 5334
5213@@ -361,13 +364,13 @@ nfs_fhget(struct super_block *sb, struct 5335@@ -361,13 +364,13 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
5214 else if (nfs_server_capable(inode, NFS_CAP_NLINK)) 5336 else if (nfs_server_capable(inode, NFS_CAP_NLINK))
5215 nfsi->cache_validity |= NFS_INO_INVALID_ATTR; 5337 nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
5216 if (fattr->valid & NFS_ATTR_FATTR_OWNER) 5338 if (fattr->valid & NFS_ATTR_FATTR_OWNER)
@@ -5226,7 +5348,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5226 else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP)) 5348 else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
5227 nfsi->cache_validity |= NFS_INO_INVALID_ATTR 5349 nfsi->cache_validity |= NFS_INO_INVALID_ATTR
5228 | NFS_INO_INVALID_ACCESS 5350 | NFS_INO_INVALID_ACCESS
5229@@ -380,6 +383,11 @@ nfs_fhget(struct super_block *sb, struct 5351@@ -380,6 +383,11 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
5230 */ 5352 */
5231 inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); 5353 inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
5232 } 5354 }
@@ -5238,7 +5360,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5238 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); 5360 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
5239 nfsi->attrtimeo_timestamp = now; 5361 nfsi->attrtimeo_timestamp = now;
5240 nfsi->access_cache = RB_ROOT; 5362 nfsi->access_cache = RB_ROOT;
5241@@ -497,6 +505,8 @@ void nfs_setattr_update_inode(struct ino 5363@@ -497,6 +505,8 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr)
5242 inode->i_uid = attr->ia_uid; 5364 inode->i_uid = attr->ia_uid;
5243 if ((attr->ia_valid & ATTR_GID) != 0) 5365 if ((attr->ia_valid & ATTR_GID) != 0)
5244 inode->i_gid = attr->ia_gid; 5366 inode->i_gid = attr->ia_gid;
@@ -5247,7 +5369,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5247 NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; 5369 NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
5248 spin_unlock(&inode->i_lock); 5370 spin_unlock(&inode->i_lock);
5249 } 5371 }
5250@@ -946,6 +956,9 @@ static int nfs_check_inode_attributes(st 5372@@ -946,6 +956,9 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
5251 struct nfs_inode *nfsi = NFS_I(inode); 5373 struct nfs_inode *nfsi = NFS_I(inode);
5252 loff_t cur_size, new_isize; 5374 loff_t cur_size, new_isize;
5253 unsigned long invalid = 0; 5375 unsigned long invalid = 0;
@@ -5257,7 +5379,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5257 5379
5258 5380
5259 /* Has the inode gone and changed behind our back? */ 5381 /* Has the inode gone and changed behind our back? */
5260@@ -969,13 +982,18 @@ static int nfs_check_inode_attributes(st 5382@@ -969,13 +982,18 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
5261 invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; 5383 invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
5262 } 5384 }
5263 5385
@@ -5278,7 +5400,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5278 5400
5279 /* Has the link count changed? */ 5401 /* Has the link count changed? */
5280 if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink) 5402 if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
5281@@ -1273,6 +1291,9 @@ static int nfs_update_inode(struct inode 5403@@ -1273,6 +1291,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
5282 unsigned long invalid = 0; 5404 unsigned long invalid = 0;
5283 unsigned long now = jiffies; 5405 unsigned long now = jiffies;
5284 unsigned long save_cache_validity; 5406 unsigned long save_cache_validity;
@@ -5288,7 +5410,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5288 5410
5289 dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n", 5411 dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
5290 __func__, inode->i_sb->s_id, inode->i_ino, 5412 __func__, inode->i_sb->s_id, inode->i_ino,
5291@@ -1381,6 +1402,9 @@ static int nfs_update_inode(struct inode 5413@@ -1381,6 +1402,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
5292 | NFS_INO_REVAL_PAGECACHE 5414 | NFS_INO_REVAL_PAGECACHE
5293 | NFS_INO_REVAL_FORCED); 5415 | NFS_INO_REVAL_FORCED);
5294 5416
@@ -5298,7 +5420,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5298 5420
5299 if (fattr->valid & NFS_ATTR_FATTR_ATIME) 5421 if (fattr->valid & NFS_ATTR_FATTR_ATIME)
5300 memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); 5422 memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
5301@@ -1402,9 +1426,9 @@ static int nfs_update_inode(struct inode 5423@@ -1402,9 +1426,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
5302 | NFS_INO_REVAL_FORCED); 5424 | NFS_INO_REVAL_FORCED);
5303 5425
5304 if (fattr->valid & NFS_ATTR_FATTR_OWNER) { 5426 if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
@@ -5310,7 +5432,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5310 } 5432 }
5311 } else if (server->caps & NFS_CAP_OWNER) 5433 } else if (server->caps & NFS_CAP_OWNER)
5312 invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR 5434 invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
5313@@ -1413,9 +1437,9 @@ static int nfs_update_inode(struct inode 5435@@ -1413,9 +1437,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
5314 | NFS_INO_REVAL_FORCED); 5436 | NFS_INO_REVAL_FORCED);
5315 5437
5316 if (fattr->valid & NFS_ATTR_FATTR_GROUP) { 5438 if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
@@ -5322,7 +5444,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5322 } 5444 }
5323 } else if (server->caps & NFS_CAP_OWNER_GROUP) 5445 } else if (server->caps & NFS_CAP_OWNER_GROUP)
5324 invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR 5446 invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
5325@@ -1423,6 +1447,10 @@ static int nfs_update_inode(struct inode 5447@@ -1423,6 +1447,10 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
5326 | NFS_INO_INVALID_ACL 5448 | NFS_INO_INVALID_ACL
5327 | NFS_INO_REVAL_FORCED); 5449 | NFS_INO_REVAL_FORCED);
5328 5450
@@ -5333,9 +5455,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/inode.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5333 if (fattr->valid & NFS_ATTR_FATTR_NLINK) { 5455 if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
5334 if (inode->i_nlink != fattr->nlink) { 5456 if (inode->i_nlink != fattr->nlink) {
5335 invalid |= NFS_INO_INVALID_ATTR; 5457 invalid |= NFS_INO_INVALID_ATTR;
5336diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nfs/nfs3xdr.c 5458diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
5337--- linux-3.4.48/fs/nfs/nfs3xdr.c 2012-05-21 16:07:25.000000000 +0000 5459index a77cc9a..f7563a8 100644
5338+++ linux-3.4.48-vs2.3.3.9/fs/nfs/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 5460--- a/fs/nfs/nfs3xdr.c
5461+++ b/fs/nfs/nfs3xdr.c
5339@@ -20,6 +20,7 @@ 5462@@ -20,6 +20,7 @@
5340 #include <linux/nfs3.h> 5463 #include <linux/nfs3.h>
5341 #include <linux/nfs_fs.h> 5464 #include <linux/nfs_fs.h>
@@ -5344,7 +5467,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5344 #include "internal.h" 5467 #include "internal.h"
5345 5468
5346 #define NFSDBG_FACILITY NFSDBG_XDR 5469 #define NFSDBG_FACILITY NFSDBG_XDR
5347@@ -562,7 +563,8 @@ static __be32 *xdr_decode_nfstime3(__be3 5470@@ -562,7 +563,8 @@ static __be32 *xdr_decode_nfstime3(__be32 *p, struct timespec *timep)
5348 * set_mtime mtime; 5471 * set_mtime mtime;
5349 * }; 5472 * };
5350 */ 5473 */
@@ -5354,7 +5477,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5354 { 5477 {
5355 u32 nbytes; 5478 u32 nbytes;
5356 __be32 *p; 5479 __be32 *p;
5357@@ -594,15 +596,19 @@ static void encode_sattr3(struct xdr_str 5480@@ -594,15 +596,19 @@ static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr)
5358 } else 5481 } else
5359 *p++ = xdr_zero; 5482 *p++ = xdr_zero;
5360 5483
@@ -5378,7 +5501,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5378 } else 5501 } else
5379 *p++ = xdr_zero; 5502 *p++ = xdr_zero;
5380 5503
5381@@ -878,7 +884,7 @@ static void nfs3_xdr_enc_setattr3args(st 5504@@ -878,7 +884,7 @@ static void nfs3_xdr_enc_setattr3args(struct rpc_rqst *req,
5382 const struct nfs3_sattrargs *args) 5505 const struct nfs3_sattrargs *args)
5383 { 5506 {
5384 encode_nfs_fh3(xdr, args->fh); 5507 encode_nfs_fh3(xdr, args->fh);
@@ -5387,7 +5510,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5387 encode_sattrguard3(xdr, args); 5510 encode_sattrguard3(xdr, args);
5388 } 5511 }
5389 5512
5390@@ -1028,13 +1034,13 @@ static void nfs3_xdr_enc_write3args(stru 5513@@ -1028,13 +1034,13 @@ static void nfs3_xdr_enc_write3args(struct rpc_rqst *req,
5391 * }; 5514 * };
5392 */ 5515 */
5393 static void encode_createhow3(struct xdr_stream *xdr, 5516 static void encode_createhow3(struct xdr_stream *xdr,
@@ -5403,7 +5526,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5403 break; 5526 break;
5404 case NFS3_CREATE_EXCLUSIVE: 5527 case NFS3_CREATE_EXCLUSIVE:
5405 encode_createverf3(xdr, args->verifier); 5528 encode_createverf3(xdr, args->verifier);
5406@@ -1049,7 +1055,7 @@ static void nfs3_xdr_enc_create3args(str 5529@@ -1049,7 +1055,7 @@ static void nfs3_xdr_enc_create3args(struct rpc_rqst *req,
5407 const struct nfs3_createargs *args) 5530 const struct nfs3_createargs *args)
5408 { 5531 {
5409 encode_diropargs3(xdr, args->fh, args->name, args->len); 5532 encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5412,7 +5535,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5412 } 5535 }
5413 5536
5414 /* 5537 /*
5415@@ -1065,7 +1071,7 @@ static void nfs3_xdr_enc_mkdir3args(stru 5538@@ -1065,7 +1071,7 @@ static void nfs3_xdr_enc_mkdir3args(struct rpc_rqst *req,
5416 const struct nfs3_mkdirargs *args) 5539 const struct nfs3_mkdirargs *args)
5417 { 5540 {
5418 encode_diropargs3(xdr, args->fh, args->name, args->len); 5541 encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5421,7 +5544,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5421 } 5544 }
5422 5545
5423 /* 5546 /*
5424@@ -1082,9 +1088,9 @@ static void nfs3_xdr_enc_mkdir3args(stru 5547@@ -1082,9 +1088,9 @@ static void nfs3_xdr_enc_mkdir3args(struct rpc_rqst *req,
5425 * }; 5548 * };
5426 */ 5549 */
5427 static void encode_symlinkdata3(struct xdr_stream *xdr, 5550 static void encode_symlinkdata3(struct xdr_stream *xdr,
@@ -5433,7 +5556,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5433 encode_nfspath3(xdr, args->pages, args->pathlen); 5556 encode_nfspath3(xdr, args->pages, args->pathlen);
5434 } 5557 }
5435 5558
5436@@ -1093,7 +1099,7 @@ static void nfs3_xdr_enc_symlink3args(st 5559@@ -1093,7 +1099,7 @@ static void nfs3_xdr_enc_symlink3args(struct rpc_rqst *req,
5437 const struct nfs3_symlinkargs *args) 5560 const struct nfs3_symlinkargs *args)
5438 { 5561 {
5439 encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen); 5562 encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
@@ -5442,7 +5565,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5442 } 5565 }
5443 5566
5444 /* 5567 /*
5445@@ -1121,24 +1127,24 @@ static void nfs3_xdr_enc_symlink3args(st 5568@@ -1121,24 +1127,24 @@ static void nfs3_xdr_enc_symlink3args(struct rpc_rqst *req,
5446 * }; 5569 * };
5447 */ 5570 */
5448 static void encode_devicedata3(struct xdr_stream *xdr, 5571 static void encode_devicedata3(struct xdr_stream *xdr,
@@ -5472,7 +5595,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5472 break; 5595 break;
5473 case NF3REG: 5596 case NF3REG:
5474 case NF3DIR: 5597 case NF3DIR:
5475@@ -1153,7 +1159,7 @@ static void nfs3_xdr_enc_mknod3args(stru 5598@@ -1153,7 +1159,7 @@ static void nfs3_xdr_enc_mknod3args(struct rpc_rqst *req,
5476 const struct nfs3_mknodargs *args) 5599 const struct nfs3_mknodargs *args)
5477 { 5600 {
5478 encode_diropargs3(xdr, args->fh, args->name, args->len); 5601 encode_diropargs3(xdr, args->fh, args->name, args->len);
@@ -5481,9 +5604,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5481 } 5604 }
5482 5605
5483 /* 5606 /*
5484diff -NurpP --minimal linux-3.4.48/fs/nfs/super.c linux-3.4.48-vs2.3.3.9/fs/nfs/super.c 5607diff --git a/fs/nfs/super.c b/fs/nfs/super.c
5485--- linux-3.4.48/fs/nfs/super.c 2013-06-13 08:59:34.000000000 +0000 5608index c252161..893b6d8 100644
5486+++ linux-3.4.48-vs2.3.3.9/fs/nfs/super.c 2013-01-16 00:15:57.000000000 +0000 5609--- a/fs/nfs/super.c
5610+++ b/fs/nfs/super.c
5487@@ -54,6 +54,7 @@ 5611@@ -54,6 +54,7 @@
5488 #include <linux/parser.h> 5612 #include <linux/parser.h>
5489 #include <linux/nsproxy.h> 5613 #include <linux/nsproxy.h>
@@ -5508,7 +5632,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/super.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5508 5632
5509 /* Mount options that take string arguments */ 5633 /* Mount options that take string arguments */
5510 Opt_nfsvers, 5634 Opt_nfsvers,
5511@@ -180,6 +183,10 @@ static const match_table_t nfs_mount_opt 5635@@ -180,6 +183,10 @@ static const match_table_t nfs_mount_option_tokens = {
5512 /* The following needs to be listed after all other options */ 5636 /* The following needs to be listed after all other options */
5513 { Opt_nfsvers, "v%s" }, 5637 { Opt_nfsvers, "v%s" },
5514 5638
@@ -5519,7 +5643,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/super.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5519 { Opt_err, NULL } 5643 { Opt_err, NULL }
5520 }; 5644 };
5521 5645
5522@@ -674,6 +681,7 @@ static void nfs_show_mount_options(struc 5646@@ -674,6 +681,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
5523 { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" }, 5647 { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
5524 { NFS_MOUNT_UNSHARED, ",nosharecache", "" }, 5648 { NFS_MOUNT_UNSHARED, ",nosharecache", "" },
5525 { NFS_MOUNT_NORESVPORT, ",noresvport", "" }, 5649 { NFS_MOUNT_NORESVPORT, ",noresvport", "" },
@@ -5527,7 +5651,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/super.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5527 { 0, NULL, NULL } 5651 { 0, NULL, NULL }
5528 }; 5652 };
5529 const struct proc_nfs_info *nfs_infop; 5653 const struct proc_nfs_info *nfs_infop;
5530@@ -1286,6 +1294,14 @@ static int nfs_parse_mount_options(char 5654@@ -1286,6 +1294,14 @@ static int nfs_parse_mount_options(char *raw,
5531 kfree(mnt->fscache_uniq); 5655 kfree(mnt->fscache_uniq);
5532 mnt->fscache_uniq = NULL; 5656 mnt->fscache_uniq = NULL;
5533 break; 5657 break;
@@ -5542,7 +5666,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/super.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5542 5666
5543 /* 5667 /*
5544 * options that take numeric values 5668 * options that take numeric values
5545@@ -1372,6 +1388,12 @@ static int nfs_parse_mount_options(char 5669@@ -1372,6 +1388,12 @@ static int nfs_parse_mount_options(char *raw,
5546 goto out_invalid_value; 5670 goto out_invalid_value;
5547 mnt->minorversion = option; 5671 mnt->minorversion = option;
5548 break; 5672 break;
@@ -5555,9 +5679,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfs/super.c linux-3.4.48-vs2.3.3.9/fs/nfs/
5555 5679
5556 /* 5680 /*
5557 * options that take text values 5681 * options that take text values
5558diff -NurpP --minimal linux-3.4.48/fs/nfsd/auth.c linux-3.4.48-vs2.3.3.9/fs/nfsd/auth.c 5682diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
5559--- linux-3.4.48/fs/nfsd/auth.c 2010-02-25 10:52:05.000000000 +0000 5683index 79717a4..ecdce16 100644
5560+++ linux-3.4.48-vs2.3.3.9/fs/nfsd/auth.c 2012-05-21 16:15:05.000000000 +0000 5684--- a/fs/nfsd/auth.c
5685+++ b/fs/nfsd/auth.c
5561@@ -1,6 +1,7 @@ 5686@@ -1,6 +1,7 @@
5562 /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */ 5687 /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
5563 5688
@@ -5566,7 +5691,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/auth.c linux-3.4.48-vs2.3.3.9/fs/nfsd
5566 #include "nfsd.h" 5691 #include "nfsd.h"
5567 #include "auth.h" 5692 #include "auth.h"
5568 5693
5569@@ -36,6 +37,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, 5694@@ -36,6 +37,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
5570 5695
5571 new->fsuid = rqstp->rq_cred.cr_uid; 5696 new->fsuid = rqstp->rq_cred.cr_uid;
5572 new->fsgid = rqstp->rq_cred.cr_gid; 5697 new->fsgid = rqstp->rq_cred.cr_gid;
@@ -5576,9 +5701,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/auth.c linux-3.4.48-vs2.3.3.9/fs/nfsd
5576 5701
5577 rqgi = rqstp->rq_cred.cr_group_info; 5702 rqgi = rqstp->rq_cred.cr_group_info;
5578 5703
5579diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs3xdr.c 5704diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
5580--- linux-3.4.48/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000 5705index 43f46cd..24d537c 100644
5581+++ linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs3xdr.c 2012-05-21 16:15:05.000000000 +0000 5706--- a/fs/nfsd/nfs3xdr.c
5707+++ b/fs/nfsd/nfs3xdr.c
5582@@ -7,6 +7,7 @@ 5708@@ -7,6 +7,7 @@
5583 */ 5709 */
5584 5710
@@ -5596,7 +5722,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/n
5596 5722
5597 iap->ia_valid = 0; 5723 iap->ia_valid = 0;
5598 5724
5599@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i 5725@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *iap)
5600 } 5726 }
5601 if (*p++) { 5727 if (*p++) {
5602 iap->ia_valid |= ATTR_UID; 5728 iap->ia_valid |= ATTR_UID;
@@ -5614,7 +5740,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/n
5614 if (*p++) { 5740 if (*p++) {
5615 u64 newsize; 5741 u64 newsize;
5616 5742
5617@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __ 5743@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
5618 *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]); 5744 *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
5619 *p++ = htonl((u32) stat->mode); 5745 *p++ = htonl((u32) stat->mode);
5620 *p++ = htonl((u32) stat->nlink); 5746 *p++ = htonl((u32) stat->nlink);
@@ -5629,9 +5755,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs3xdr.c linux-3.4.48-vs2.3.3.9/fs/n
5629 if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { 5755 if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
5630 p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); 5756 p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
5631 } else { 5757 } else {
5632diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs4xdr.c linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs4xdr.c 5758diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
5633--- linux-3.4.48/fs/nfsd/nfs4xdr.c 2013-06-13 08:59:34.000000000 +0000 5759index cb997b1..9d1ce48 100644
5634+++ linux-3.4.48-vs2.3.3.9/fs/nfsd/nfs4xdr.c 2013-06-13 09:46:39.000000000 +0000 5760--- a/fs/nfsd/nfs4xdr.c
5761+++ b/fs/nfsd/nfs4xdr.c
5635@@ -46,6 +46,7 @@ 5762@@ -46,6 +46,7 @@
5636 #include <linux/utsname.h> 5763 #include <linux/utsname.h>
5637 #include <linux/pagemap.h> 5764 #include <linux/pagemap.h>
@@ -5640,7 +5767,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs4xdr.c linux-3.4.48-vs2.3.3.9/fs/n
5640 5767
5641 #include "idmap.h" 5768 #include "idmap.h"
5642 #include "acl.h" 5769 #include "acl.h"
5643@@ -2325,14 +2326,18 @@ out_acl: 5770@@ -2319,14 +2320,18 @@ out_acl:
5644 WRITE32(stat.nlink); 5771 WRITE32(stat.nlink);
5645 } 5772 }
5646 if (bmval1 & FATTR4_WORD1_OWNER) { 5773 if (bmval1 & FATTR4_WORD1_OWNER) {
@@ -5661,9 +5788,10 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfs4xdr.c linux-3.4.48-vs2.3.3.9/fs/n
5661 if (status == nfserr_resource) 5788 if (status == nfserr_resource)
5662 goto out_resource; 5789 goto out_resource;
5663 if (status) 5790 if (status)
5664diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfsxdr.c linux-3.4.48-vs2.3.3.9/fs/nfsd/nfsxdr.c 5791diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
5665--- linux-3.4.48/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000 5792index 65ec595..31939e6 100644
5666+++ linux-3.4.48-vs2.3.3.9/fs/nfsd/nfsxdr.c 2012-05-21 16:15:05.000000000 +0000 5793--- a/fs/nfsd/nfsxdr.c
5794+++ b/fs/nfsd/nfsxdr.c
5667@@ -6,6 +6,7 @@ 5795@@ -6,6 +6,7 @@
5668 5796
5669 #include "xdr.h" 5797 #include "xdr.h"
@@ -5681,7 +5809,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfsxdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5681 5809
5682 iap->ia_valid = 0; 5810 iap->ia_valid = 0;
5683 5811
5684@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia 5812@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *iap)
5685 } 5813 }
5686 if ((tmp = ntohl(*p++)) != (u32)-1) { 5814 if ((tmp = ntohl(*p++)) != (u32)-1) {
5687 iap->ia_valid |= ATTR_UID; 5815 iap->ia_valid |= ATTR_UID;
@@ -5699,7 +5827,7 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfsxdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5699 if ((tmp = ntohl(*p++)) != (u32)-1) { 5827 if ((tmp = ntohl(*p++)) != (u32)-1) {
5700 iap->ia_valid |= ATTR_SIZE; 5828 iap->ia_valid |= ATTR_SIZE;
5701 iap->ia_size = tmp; 5829 iap->ia_size = tmp;
5702@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b 5830@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
5703 *p++ = htonl(nfs_ftypes[type >> 12]); 5831 *p++ = htonl(nfs_ftypes[type >> 12]);
5704 *p++ = htonl((u32) stat->mode); 5832 *p++ = htonl((u32) stat->mode);
5705 *p++ = htonl((u32) stat->nlink); 5833 *p++ = htonl((u32) stat->nlink);
@@ -5712,10 +5840,11 @@ diff -NurpP --minimal linux-3.4.48/fs/nfsd/nfsxdr.c linux-3.4.48-vs2.3.3.9/fs/nf
5712 5840
5713 if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { 5841 if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
5714 *p++ = htonl(NFS_MAXPATHLEN); 5842 *p++ = htonl(NFS_MAXPATHLEN);
5715diff -NurpP --minimal linux-3.4.48/fs/ocfs2/dlmglue.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/dlmglue.c 5843diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
5716--- linux-3.4.48/fs/ocfs2/dlmglue.c 2013-06-13 08:59:34.000000000 +0000 5844index 231eab2..c48839a 100644
5717+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/dlmglue.c 2013-03-02 15:26:44.000000000 +0000 5845--- a/fs/ocfs2/dlmglue.c
5718@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc 5846+++ b/fs/ocfs2/dlmglue.c
5847@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)
5719 lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters); 5848 lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
5720 lvb->lvb_iuid = cpu_to_be32(inode->i_uid); 5849 lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
5721 lvb->lvb_igid = cpu_to_be32(inode->i_gid); 5850 lvb->lvb_igid = cpu_to_be32(inode->i_gid);
@@ -5723,7 +5852,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/dlmglue.c linux-3.4.48-vs2.3.3.9/fs/
5723 lvb->lvb_imode = cpu_to_be16(inode->i_mode); 5852 lvb->lvb_imode = cpu_to_be16(inode->i_mode);
5724 lvb->lvb_inlink = cpu_to_be16(inode->i_nlink); 5853 lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
5725 lvb->lvb_iatime_packed = 5854 lvb->lvb_iatime_packed =
5726@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb 5855@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode)
5727 5856
5728 inode->i_uid = be32_to_cpu(lvb->lvb_iuid); 5857 inode->i_uid = be32_to_cpu(lvb->lvb_iuid);
5729 inode->i_gid = be32_to_cpu(lvb->lvb_igid); 5858 inode->i_gid = be32_to_cpu(lvb->lvb_igid);
@@ -5731,9 +5860,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/dlmglue.c linux-3.4.48-vs2.3.3.9/fs/
5731 inode->i_mode = be16_to_cpu(lvb->lvb_imode); 5860 inode->i_mode = be16_to_cpu(lvb->lvb_imode);
5732 set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); 5861 set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
5733 ocfs2_unpack_timespec(&inode->i_atime, 5862 ocfs2_unpack_timespec(&inode->i_atime,
5734diff -NurpP --minimal linux-3.4.48/fs/ocfs2/dlmglue.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/dlmglue.h 5863diff --git a/fs/ocfs2/dlmglue.h b/fs/ocfs2/dlmglue.h
5735--- linux-3.4.48/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000 5864index 1d596d8..357ff1e 100644
5736+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/dlmglue.h 2012-05-21 16:15:05.000000000 +0000 5865--- a/fs/ocfs2/dlmglue.h
5866+++ b/fs/ocfs2/dlmglue.h
5737@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { 5867@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
5738 __be16 lvb_inlink; 5868 __be16 lvb_inlink;
5739 __be32 lvb_iattr; 5869 __be32 lvb_iattr;
@@ -5744,10 +5874,11 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/dlmglue.h linux-3.4.48-vs2.3.3.9/fs/
5744 }; 5874 };
5745 5875
5746 #define OCFS2_QINFO_LVB_VERSION 1 5876 #define OCFS2_QINFO_LVB_VERSION 1
5747diff -NurpP --minimal linux-3.4.48/fs/ocfs2/file.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/file.c 5877diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
5748--- linux-3.4.48/fs/ocfs2/file.c 2013-06-13 08:59:34.000000000 +0000 5878index 7602783..b7567ce 100644
5749+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/file.c 2012-07-17 22:29:43.000000000 +0000 5879--- a/fs/ocfs2/file.c
5750@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, 5880+++ b/fs/ocfs2/file.c
5881@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
5751 attr->ia_valid &= ~ATTR_SIZE; 5882 attr->ia_valid &= ~ATTR_SIZE;
5752 5883
5753 #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \ 5884 #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
@@ -5756,9 +5887,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/file.c linux-3.4.48-vs2.3.3.9/fs/ocf
5756 if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) 5887 if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
5757 return 0; 5888 return 0;
5758 5889
5759diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/inode.c 5890diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
5760--- linux-3.4.48/fs/ocfs2/inode.c 2012-01-09 15:14:55.000000000 +0000 5891index 17454a9..e8e5419 100644
5761+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/inode.c 2012-05-21 16:15:05.000000000 +0000 5892--- a/fs/ocfs2/inode.c
5893+++ b/fs/ocfs2/inode.c
5762@@ -28,6 +28,7 @@ 5894@@ -28,6 +28,7 @@
5763 #include <linux/highmem.h> 5895 #include <linux/highmem.h>
5764 #include <linux/pagemap.h> 5896 #include <linux/pagemap.h>
@@ -5767,7 +5899,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.c linux-3.4.48-vs2.3.3.9/fs/oc
5767 5899
5768 #include <asm/byteorder.h> 5900 #include <asm/byteorder.h>
5769 5901
5770@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode 5902@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode *inode)
5771 { 5903 {
5772 unsigned int flags = OCFS2_I(inode)->ip_attr; 5904 unsigned int flags = OCFS2_I(inode)->ip_attr;
5773 5905
@@ -5782,7 +5914,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.c linux-3.4.48-vs2.3.3.9/fs/oc
5782 5914
5783 if (flags & OCFS2_SYNC_FL) 5915 if (flags & OCFS2_SYNC_FL)
5784 inode->i_flags |= S_SYNC; 5916 inode->i_flags |= S_SYNC;
5785@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode 5917@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode *inode)
5786 inode->i_flags |= S_NOATIME; 5918 inode->i_flags |= S_NOATIME;
5787 if (flags & OCFS2_DIRSYNC_FL) 5919 if (flags & OCFS2_DIRSYNC_FL)
5788 inode->i_flags |= S_DIRSYNC; 5920 inode->i_flags |= S_DIRSYNC;
@@ -5831,7 +5963,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.c linux-3.4.48-vs2.3.3.9/fs/oc
5831 } 5963 }
5832 5964
5833 struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno) 5965 struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
5834@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode * 5966@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
5835 struct super_block *sb; 5967 struct super_block *sb;
5836 struct ocfs2_super *osb; 5968 struct ocfs2_super *osb;
5837 int use_plocks = 1; 5969 int use_plocks = 1;
@@ -5840,7 +5972,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.c linux-3.4.48-vs2.3.3.9/fs/oc
5840 5972
5841 sb = inode->i_sb; 5973 sb = inode->i_sb;
5842 osb = OCFS2_SB(sb); 5974 osb = OCFS2_SB(sb);
5843@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode * 5975@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
5844 inode->i_generation = le32_to_cpu(fe->i_generation); 5976 inode->i_generation = le32_to_cpu(fe->i_generation);
5845 inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); 5977 inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
5846 inode->i_mode = le16_to_cpu(fe->i_mode); 5978 inode->i_mode = le16_to_cpu(fe->i_mode);
@@ -5855,10 +5987,11 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.c linux-3.4.48-vs2.3.3.9/fs/oc
5855 5987
5856 /* Fast symlinks will have i_size but no allocated clusters. */ 5988 /* Fast symlinks will have i_size but no allocated clusters. */
5857 if (S_ISLNK(inode->i_mode) && !fe->i_clusters) 5989 if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
5858diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/inode.h 5990diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
5859--- linux-3.4.48/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000 5991index 88924a3..a154533 100644
5860+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/inode.h 2012-05-21 16:15:05.000000000 +0000 5992--- a/fs/ocfs2/inode.h
5861@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i 5993+++ b/fs/ocfs2/inode.h
5994@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct inode *inode,
5862 5995
5863 void ocfs2_set_inode_flags(struct inode *inode); 5996 void ocfs2_set_inode_flags(struct inode *inode);
5864 void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi); 5997 void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
@@ -5866,10 +5999,11 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/inode.h linux-3.4.48-vs2.3.3.9/fs/oc
5866 5999
5867 static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) 6000 static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
5868 { 6001 {
5869diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/ioctl.c 6002diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
5870--- linux-3.4.48/fs/ocfs2/ioctl.c 2012-05-21 16:07:26.000000000 +0000 6003index a1a1bfd..e97bd26 100644
5871+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/ioctl.c 2012-05-21 16:15:05.000000000 +0000 6004--- a/fs/ocfs2/ioctl.c
5872@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i 6005+++ b/fs/ocfs2/ioctl.c
6006@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags)
5873 return status; 6007 return status;
5874 } 6008 }
5875 6009
@@ -5912,7 +6046,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/oc
5912 unsigned mask) 6046 unsigned mask)
5913 { 6047 {
5914 struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); 6048 struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
5915@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i 6049@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
5916 if (!S_ISDIR(inode->i_mode)) 6050 if (!S_ISDIR(inode->i_mode))
5917 flags &= ~OCFS2_DIRSYNC_FL; 6051 flags &= ~OCFS2_DIRSYNC_FL;
5918 6052
@@ -5932,9 +6066,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ioctl.c linux-3.4.48-vs2.3.3.9/fs/oc
5932 long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 6066 long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
5933 { 6067 {
5934 struct inode *inode = filp->f_path.dentry->d_inode; 6068 struct inode *inode = filp->f_path.dentry->d_inode;
5935diff -NurpP --minimal linux-3.4.48/fs/ocfs2/namei.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/namei.c 6069diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
5936--- linux-3.4.48/fs/ocfs2/namei.c 2012-03-19 18:47:26.000000000 +0000 6070index a9856e3..ab87257 100644
5937+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/namei.c 2012-05-21 16:15:05.000000000 +0000 6071--- a/fs/ocfs2/namei.c
6072+++ b/fs/ocfs2/namei.c
5938@@ -41,6 +41,7 @@ 6073@@ -41,6 +41,7 @@
5939 #include <linux/slab.h> 6074 #include <linux/slab.h>
5940 #include <linux/highmem.h> 6075 #include <linux/highmem.h>
@@ -5943,7 +6078,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/namei.c linux-3.4.48-vs2.3.3.9/fs/oc
5943 6078
5944 #include <cluster/masklog.h> 6079 #include <cluster/masklog.h>
5945 6080
5946@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i 6081@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,
5947 struct ocfs2_dinode *fe = NULL; 6082 struct ocfs2_dinode *fe = NULL;
5948 struct ocfs2_extent_list *fel; 6083 struct ocfs2_extent_list *fel;
5949 u16 feat; 6084 u16 feat;
@@ -5951,7 +6086,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/namei.c linux-3.4.48-vs2.3.3.9/fs/oc
5951 6086
5952 *new_fe_bh = NULL; 6087 *new_fe_bh = NULL;
5953 6088
5954@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i 6089@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct inode *dir,
5955 fe->i_suballoc_loc = cpu_to_le64(suballoc_loc); 6090 fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
5956 fe->i_suballoc_bit = cpu_to_le16(suballoc_bit); 6091 fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
5957 fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot); 6092 fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
@@ -5965,9 +6100,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/namei.c linux-3.4.48-vs2.3.3.9/fs/oc
5965 fe->i_mode = cpu_to_le16(inode->i_mode); 6100 fe->i_mode = cpu_to_le16(inode->i_mode);
5966 if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) 6101 if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
5967 fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev)); 6102 fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
5968diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ocfs2.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/ocfs2.h 6103diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
5969--- linux-3.4.48/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000 6104index d355e6e..5d00443 100644
5970+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/ocfs2.h 2012-05-21 16:15:05.000000000 +0000 6105--- a/fs/ocfs2/ocfs2.h
6106+++ b/fs/ocfs2/ocfs2.h
5971@@ -272,6 +272,7 @@ enum ocfs2_mount_options 6107@@ -272,6 +272,7 @@ enum ocfs2_mount_options
5972 writes */ 6108 writes */
5973 OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ 6109 OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5976,9 +6112,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ocfs2.h linux-3.4.48-vs2.3.3.9/fs/oc
5976 }; 6112 };
5977 6113
5978 #define OCFS2_OSB_SOFT_RO 0x0001 6114 #define OCFS2_OSB_SOFT_RO 0x0001
5979diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ocfs2_fs.h linux-3.4.48-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 6115diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h
5980--- linux-3.4.48/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000 6116index 938387a..6e8d529 100644
5981+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h 2012-05-21 16:15:05.000000000 +0000 6117--- a/fs/ocfs2/ocfs2_fs.h
6118+++ b/fs/ocfs2/ocfs2_fs.h
5982@@ -266,6 +266,11 @@ 6119@@ -266,6 +266,11 @@
5983 #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ 6120 #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
5984 #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ 6121 #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
@@ -5991,9 +6128,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/ocfs2_fs.h linux-3.4.48-vs2.3.3.9/fs
5991 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ 6128 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
5992 #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ 6129 #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
5993 6130
5994diff -NurpP --minimal linux-3.4.48/fs/ocfs2/super.c linux-3.4.48-vs2.3.3.9/fs/ocfs2/super.c 6131diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
5995--- linux-3.4.48/fs/ocfs2/super.c 2012-05-21 16:07:26.000000000 +0000 6132index 68f4541..dbb1f8d 100644
5996+++ linux-3.4.48-vs2.3.3.9/fs/ocfs2/super.c 2012-05-21 16:15:05.000000000 +0000 6133--- a/fs/ocfs2/super.c
6134+++ b/fs/ocfs2/super.c
5997@@ -185,6 +185,7 @@ enum { 6135@@ -185,6 +185,7 @@ enum {
5998 Opt_coherency_full, 6136 Opt_coherency_full,
5999 Opt_resv_level, 6137 Opt_resv_level,
@@ -6012,7 +6150,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/super.c linux-3.4.48-vs2.3.3.9/fs/oc
6012 {Opt_err, NULL} 6150 {Opt_err, NULL}
6013 }; 6151 };
6014 6152
6015@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl 6153@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
6016 goto out; 6154 goto out;
6017 } 6155 }
6018 6156
@@ -6026,7 +6164,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/super.c linux-3.4.48-vs2.3.3.9/fs/oc
6026 /* We're going to/from readonly mode. */ 6164 /* We're going to/from readonly mode. */
6027 if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) { 6165 if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
6028 /* Disable quota accounting before remounting RO */ 6166 /* Disable quota accounting before remounting RO */
6029@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super 6167@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
6030 6168
6031 ocfs2_complete_mount_recovery(osb); 6169 ocfs2_complete_mount_recovery(osb);
6032 6170
@@ -6036,7 +6174,7 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/super.c linux-3.4.48-vs2.3.3.9/fs/oc
6036 if (ocfs2_mount_local(osb)) 6174 if (ocfs2_mount_local(osb))
6037 snprintf(nodestr, sizeof(nodestr), "local"); 6175 snprintf(nodestr, sizeof(nodestr), "local");
6038 else 6176 else
6039@@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct su 6177@@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct super_block *sb,
6040 option < OCFS2_MAX_RESV_LEVEL) 6178 option < OCFS2_MAX_RESV_LEVEL)
6041 mopt->dir_resv_level = option; 6179 mopt->dir_resv_level = option;
6042 break; 6180 break;
@@ -6057,9 +6195,10 @@ diff -NurpP --minimal linux-3.4.48/fs/ocfs2/super.c linux-3.4.48-vs2.3.3.9/fs/oc
6057 default: 6195 default:
6058 mlog(ML_ERROR, 6196 mlog(ML_ERROR,
6059 "Unrecognized mount option \"%s\" " 6197 "Unrecognized mount option \"%s\" "
6060diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c 6198diff --git a/fs/open.c b/fs/open.c
6061--- linux-3.4.48/fs/open.c 2013-06-13 08:59:34.000000000 +0000 6199index cf1d34f..9455091 100644
6062+++ linux-3.4.48-vs2.3.3.9/fs/open.c 2012-09-16 18:49:11.000000000 +0000 6200--- a/fs/open.c
6201+++ b/fs/open.c
6063@@ -30,6 +30,11 @@ 6202@@ -30,6 +30,11 @@
6064 #include <linux/fs_struct.h> 6203 #include <linux/fs_struct.h>
6065 #include <linux/ima.h> 6204 #include <linux/ima.h>
@@ -6072,7 +6211,7 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6072 6211
6073 #include "internal.h" 6212 #include "internal.h"
6074 6213
6075@@ -74,6 +79,12 @@ static long do_sys_truncate(const char _ 6214@@ -74,6 +79,12 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
6076 error = user_path(pathname, &path); 6215 error = user_path(pathname, &path);
6077 if (error) 6216 if (error)
6078 goto out; 6217 goto out;
@@ -6085,7 +6224,7 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6085 inode = path.dentry->d_inode; 6224 inode = path.dentry->d_inode;
6086 6225
6087 /* For directories it's -EISDIR, for other non-regulars - -EINVAL */ 6226 /* For directories it's -EISDIR, for other non-regulars - -EINVAL */
6088@@ -489,6 +500,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons 6227@@ -489,6 +500,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, umode_t, mode
6089 6228
6090 error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path); 6229 error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
6091 if (!error) { 6230 if (!error) {
@@ -6096,7 +6235,7 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6096 error = chmod_common(&path, mode); 6235 error = chmod_common(&path, mode);
6097 path_put(&path); 6236 path_put(&path);
6098 } 6237 }
6099@@ -509,11 +524,11 @@ static int chown_common(struct path *pat 6238@@ -509,11 +524,11 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
6100 newattrs.ia_valid = ATTR_CTIME; 6239 newattrs.ia_valid = ATTR_CTIME;
6101 if (user != (uid_t) -1) { 6240 if (user != (uid_t) -1) {
6102 newattrs.ia_valid |= ATTR_UID; 6241 newattrs.ia_valid |= ATTR_UID;
@@ -6110,7 +6249,7 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6110 } 6249 }
6111 if (!S_ISDIR(inode->i_mode)) 6250 if (!S_ISDIR(inode->i_mode))
6112 newattrs.ia_valid |= 6251 newattrs.ia_valid |=
6113@@ -538,6 +553,10 @@ SYSCALL_DEFINE3(chown, const char __user 6252@@ -538,6 +553,10 @@ SYSCALL_DEFINE3(chown, const char __user *, filename, uid_t, user, gid_t, group)
6114 error = mnt_want_write(path.mnt); 6253 error = mnt_want_write(path.mnt);
6115 if (error) 6254 if (error)
6116 goto out_release; 6255 goto out_release;
@@ -6121,7 +6260,7 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6121 error = chown_common(&path, user, group); 6260 error = chown_common(&path, user, group);
6122 mnt_drop_write(path.mnt); 6261 mnt_drop_write(path.mnt);
6123 out_release: 6262 out_release:
6124@@ -565,6 +584,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons 6263@@ -565,6 +584,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, const char __user *, filename, uid_t, user,
6125 error = mnt_want_write(path.mnt); 6264 error = mnt_want_write(path.mnt);
6126 if (error) 6265 if (error)
6127 goto out_release; 6266 goto out_release;
@@ -6132,7 +6271,7 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6132 error = chown_common(&path, user, group); 6271 error = chown_common(&path, user, group);
6133 mnt_drop_write(path.mnt); 6272 mnt_drop_write(path.mnt);
6134 out_release: 6273 out_release:
6135@@ -584,6 +607,10 @@ SYSCALL_DEFINE3(lchown, const char __use 6274@@ -584,6 +607,10 @@ SYSCALL_DEFINE3(lchown, const char __user *, filename, uid_t, user, gid_t, group
6136 error = mnt_want_write(path.mnt); 6275 error = mnt_want_write(path.mnt);
6137 if (error) 6276 if (error)
6138 goto out_release; 6277 goto out_release;
@@ -6143,7 +6282,7 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6143 error = chown_common(&path, user, group); 6282 error = chown_common(&path, user, group);
6144 mnt_drop_write(path.mnt); 6283 mnt_drop_write(path.mnt);
6145 out_release: 6284 out_release:
6146@@ -839,6 +866,7 @@ static void __put_unused_fd(struct files 6285@@ -839,6 +866,7 @@ static void __put_unused_fd(struct files_struct *files, unsigned int fd)
6147 __clear_open_fd(fd, fdt); 6286 __clear_open_fd(fd, fdt);
6148 if (fd < files->next_fd) 6287 if (fd < files->next_fd)
6149 files->next_fd = fd; 6288 files->next_fd = fd;
@@ -6151,9 +6290,10 @@ diff -NurpP --minimal linux-3.4.48/fs/open.c linux-3.4.48-vs2.3.3.9/fs/open.c
6151 } 6290 }
6152 6291
6153 void put_unused_fd(unsigned int fd) 6292 void put_unused_fd(unsigned int fd)
6154diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/proc/array.c 6293diff --git a/fs/proc/array.c b/fs/proc/array.c
6155--- linux-3.4.48/fs/proc/array.c 2012-05-21 16:07:26.000000000 +0000 6294index f9bd395..b0300cc 100644
6156+++ linux-3.4.48-vs2.3.3.9/fs/proc/array.c 2012-05-21 16:15:05.000000000 +0000 6295--- a/fs/proc/array.c
6296+++ b/fs/proc/array.c
6157@@ -81,6 +81,8 @@ 6297@@ -81,6 +81,8 @@
6158 #include <linux/pid_namespace.h> 6298 #include <linux/pid_namespace.h>
6159 #include <linux/ptrace.h> 6299 #include <linux/ptrace.h>
@@ -6163,7 +6303,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/pro
6163 6303
6164 #include <asm/pgtable.h> 6304 #include <asm/pgtable.h>
6165 #include <asm/processor.h> 6305 #include <asm/processor.h>
6166@@ -170,6 +172,9 @@ static inline void task_state(struct seq 6306@@ -170,6 +172,9 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
6167 rcu_read_lock(); 6307 rcu_read_lock();
6168 ppid = pid_alive(p) ? 6308 ppid = pid_alive(p) ?
6169 task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0; 6309 task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
@@ -6173,7 +6313,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/pro
6173 tpid = 0; 6313 tpid = 0;
6174 if (pid_alive(p)) { 6314 if (pid_alive(p)) {
6175 struct task_struct *tracer = ptrace_parent(p); 6315 struct task_struct *tracer = ptrace_parent(p);
6176@@ -287,7 +292,7 @@ static inline void task_sig(struct seq_f 6316@@ -287,7 +292,7 @@ static inline void task_sig(struct seq_file *m, struct task_struct *p)
6177 } 6317 }
6178 6318
6179 static void render_cap_t(struct seq_file *m, const char *header, 6319 static void render_cap_t(struct seq_file *m, const char *header,
@@ -6182,7 +6322,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/pro
6182 { 6322 {
6183 unsigned __capi; 6323 unsigned __capi;
6184 6324
6185@@ -312,10 +317,11 @@ static inline void task_cap(struct seq_f 6325@@ -312,10 +317,11 @@ static inline void task_cap(struct seq_file *m, struct task_struct *p)
6186 cap_bset = cred->cap_bset; 6326 cap_bset = cred->cap_bset;
6187 rcu_read_unlock(); 6327 rcu_read_unlock();
6188 6328
@@ -6198,7 +6338,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/pro
6198 } 6338 }
6199 6339
6200 static inline void task_context_switch_counts(struct seq_file *m, 6340 static inline void task_context_switch_counts(struct seq_file *m,
6201@@ -337,6 +343,42 @@ static void task_cpus_allowed(struct seq 6341@@ -337,6 +343,42 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
6202 seq_putc(m, '\n'); 6342 seq_putc(m, '\n');
6203 } 6343 }
6204 6344
@@ -6241,7 +6381,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/pro
6241 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, 6381 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
6242 struct pid *pid, struct task_struct *task) 6382 struct pid *pid, struct task_struct *task)
6243 { 6383 {
6244@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m, 6384@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
6245 task_cap(m, task); 6385 task_cap(m, task);
6246 task_cpus_allowed(m, task); 6386 task_cpus_allowed(m, task);
6247 cpuset_task_status_allowed(m, task); 6387 cpuset_task_status_allowed(m, task);
@@ -6249,7 +6389,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/pro
6249 task_context_switch_counts(m, task); 6389 task_context_switch_counts(m, task);
6250 return 0; 6390 return 0;
6251 } 6391 }
6252@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file 6392@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
6253 /* convert nsec -> ticks */ 6393 /* convert nsec -> ticks */
6254 start_time = nsec_to_clock_t(start_time); 6394 start_time = nsec_to_clock_t(start_time);
6255 6395
@@ -6267,9 +6407,10 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/array.c linux-3.4.48-vs2.3.3.9/fs/pro
6267 seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state); 6407 seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
6268 seq_put_decimal_ll(m, ' ', ppid); 6408 seq_put_decimal_ll(m, ' ', ppid);
6269 seq_put_decimal_ll(m, ' ', pgid); 6409 seq_put_decimal_ll(m, ' ', pgid);
6270diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc/base.c 6410diff --git a/fs/proc/base.c b/fs/proc/base.c
6271--- linux-3.4.48/fs/proc/base.c 2013-06-13 08:59:35.000000000 +0000 6411index 9fc77b4..eea14cb 100644
6272+++ linux-3.4.48-vs2.3.3.9/fs/proc/base.c 2012-06-28 14:45:07.000000000 +0000 6412--- a/fs/proc/base.c
6413+++ b/fs/proc/base.c
6273@@ -84,6 +84,8 @@ 6414@@ -84,6 +84,8 @@
6274 #include <linux/fs_struct.h> 6415 #include <linux/fs_struct.h>
6275 #include <linux/slab.h> 6416 #include <linux/slab.h>
@@ -6279,7 +6420,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6279 #ifdef CONFIG_HARDWALL 6420 #ifdef CONFIG_HARDWALL
6280 #include <asm/hardwall.h> 6421 #include <asm/hardwall.h>
6281 #endif 6422 #endif
6282@@ -937,11 +939,16 @@ static ssize_t oom_adjust_write(struct f 6423@@ -937,11 +939,16 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
6283 goto err_task_lock; 6424 goto err_task_lock;
6284 } 6425 }
6285 6426
@@ -6297,7 +6438,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6297 /* 6438 /*
6298 * Warn that /proc/pid/oom_adj is deprecated, see 6439 * Warn that /proc/pid/oom_adj is deprecated, see
6299 * Documentation/feature-removal-schedule.txt. 6440 * Documentation/feature-removal-schedule.txt.
6300@@ -1541,6 +1548,8 @@ struct inode *proc_pid_make_inode(struct 6441@@ -1541,6 +1548,8 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
6301 inode->i_gid = cred->egid; 6442 inode->i_gid = cred->egid;
6302 rcu_read_unlock(); 6443 rcu_read_unlock();
6303 } 6444 }
@@ -6306,7 +6447,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6306 security_task_to_inode(task, inode); 6447 security_task_to_inode(task, inode);
6307 6448
6308 out: 6449 out:
6309@@ -1586,6 +1595,8 @@ int pid_getattr(struct vfsmount *mnt, st 6450@@ -1586,6 +1595,8 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
6310 6451
6311 /* dentry stuff */ 6452 /* dentry stuff */
6312 6453
@@ -6315,7 +6456,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6315 /* 6456 /*
6316 * Exceptional case: normally we are not allowed to unhash a busy 6457 * Exceptional case: normally we are not allowed to unhash a busy
6317 * directory. In this case, however, we can do it - no aliasing problems 6458 * directory. In this case, however, we can do it - no aliasing problems
6318@@ -1614,6 +1625,12 @@ int pid_revalidate(struct dentry *dentry 6459@@ -1614,6 +1625,12 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
6319 task = get_proc_task(inode); 6460 task = get_proc_task(inode);
6320 6461
6321 if (task) { 6462 if (task) {
@@ -6328,7 +6469,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6328 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || 6469 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
6329 task_dumpable(task)) { 6470 task_dumpable(task)) {
6330 rcu_read_lock(); 6471 rcu_read_lock();
6331@@ -1630,6 +1647,7 @@ int pid_revalidate(struct dentry *dentry 6472@@ -1630,6 +1647,7 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
6332 put_task_struct(task); 6473 put_task_struct(task);
6333 return 1; 6474 return 1;
6334 } 6475 }
@@ -6336,7 +6477,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6336 d_drop(dentry); 6477 d_drop(dentry);
6337 return 0; 6478 return 0;
6338 } 6479 }
6339@@ -2452,6 +2470,13 @@ static struct dentry *proc_pident_lookup 6480@@ -2452,6 +2470,13 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
6340 if (!task) 6481 if (!task)
6341 goto out_no_task; 6482 goto out_no_task;
6342 6483
@@ -6359,7 +6500,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6359 const struct pid_entry *p, *last; 6500 const struct pid_entry *p, *last;
6360 6501
6361 error = ERR_PTR(-ENOENT); 6502 error = ERR_PTR(-ENOENT);
6362@@ -2944,6 +2969,9 @@ static int proc_pid_personality(struct s 6503@@ -2944,6 +2969,9 @@ static int proc_pid_personality(struct seq_file *m, struct pid_namespace *ns,
6363 static const struct file_operations proc_task_operations; 6504 static const struct file_operations proc_task_operations;
6364 static const struct inode_operations proc_task_inode_operations; 6505 static const struct inode_operations proc_task_inode_operations;
6365 6506
@@ -6369,7 +6510,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6369 static const struct pid_entry tgid_base_stuff[] = { 6510 static const struct pid_entry tgid_base_stuff[] = {
6370 DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations), 6511 DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
6371 DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), 6512 DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
6372@@ -3010,6 +3038,8 @@ static const struct pid_entry tgid_base_ 6513@@ -3010,6 +3038,8 @@ static const struct pid_entry tgid_base_stuff[] = {
6373 #ifdef CONFIG_CGROUPS 6514 #ifdef CONFIG_CGROUPS
6374 REG("cgroup", S_IRUGO, proc_cgroup_operations), 6515 REG("cgroup", S_IRUGO, proc_cgroup_operations),
6375 #endif 6516 #endif
@@ -6378,7 +6519,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6378 INF("oom_score", S_IRUGO, proc_oom_score), 6519 INF("oom_score", S_IRUGO, proc_oom_score),
6379 REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations), 6520 REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
6380 REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), 6521 REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
6381@@ -3029,6 +3059,7 @@ static const struct pid_entry tgid_base_ 6522@@ -3029,6 +3059,7 @@ static const struct pid_entry tgid_base_stuff[] = {
6382 #ifdef CONFIG_HARDWALL 6523 #ifdef CONFIG_HARDWALL
6383 INF("hardwall", S_IRUGO, proc_pid_hardwall), 6524 INF("hardwall", S_IRUGO, proc_pid_hardwall),
6384 #endif 6525 #endif
@@ -6395,7 +6536,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6395 iter.task = pid_task(pid, PIDTYPE_PID); 6536 iter.task = pid_task(pid, PIDTYPE_PID);
6396 /* What we to know is if the pid we have find is the 6537 /* What we to know is if the pid we have find is the
6397 * pid of a thread_group_leader. Testing for task 6538 * pid of a thread_group_leader. Testing for task
6398@@ -3252,7 +3283,7 @@ static int proc_pid_fill_cache(struct fi 6539@@ -3252,7 +3283,7 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
6399 struct tgid_iter iter) 6540 struct tgid_iter iter)
6400 { 6541 {
6401 char name[PROC_NUMBUF]; 6542 char name[PROC_NUMBUF];
@@ -6404,7 +6545,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6404 return proc_fill_cache(filp, dirent, filldir, name, len, 6545 return proc_fill_cache(filp, dirent, filldir, name, len,
6405 proc_pid_instantiate, iter.task, NULL); 6546 proc_pid_instantiate, iter.task, NULL);
6406 } 6547 }
6407@@ -3276,7 +3307,7 @@ int proc_pid_readdir(struct file * filp, 6548@@ -3276,7 +3307,7 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
6408 goto out_no_task; 6549 goto out_no_task;
6409 nr = filp->f_pos - FIRST_PROCESS_ENTRY; 6550 nr = filp->f_pos - FIRST_PROCESS_ENTRY;
6410 6551
@@ -6413,7 +6554,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6413 if (!reaper) 6554 if (!reaper)
6414 goto out_no_task; 6555 goto out_no_task;
6415 6556
6416@@ -3298,6 +3329,8 @@ int proc_pid_readdir(struct file * filp, 6557@@ -3298,6 +3329,8 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
6417 __filldir = fake_filldir; 6558 __filldir = fake_filldir;
6418 6559
6419 filp->f_pos = iter.tgid + TGID_OFFSET; 6560 filp->f_pos = iter.tgid + TGID_OFFSET;
@@ -6422,7 +6563,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6422 if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) { 6563 if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
6423 put_task_struct(iter.task); 6564 put_task_struct(iter.task);
6424 goto out; 6565 goto out;
6425@@ -3451,6 +3484,8 @@ static struct dentry *proc_task_lookup(s 6566@@ -3451,6 +3484,8 @@ static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry
6426 tid = name_to_int(dentry); 6567 tid = name_to_int(dentry);
6427 if (tid == ~0U) 6568 if (tid == ~0U)
6428 goto out; 6569 goto out;
@@ -6431,9 +6572,10 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/base.c linux-3.4.48-vs2.3.3.9/fs/proc
6431 6572
6432 ns = dentry->d_sb->s_fs_info; 6573 ns = dentry->d_sb->s_fs_info;
6433 rcu_read_lock(); 6574 rcu_read_lock();
6434diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/proc/generic.c 6575diff --git a/fs/proc/generic.c b/fs/proc/generic.c
6435--- linux-3.4.48/fs/proc/generic.c 2012-03-19 18:47:26.000000000 +0000 6576index 2edf34f..3154d5b 100644
6436+++ linux-3.4.48-vs2.3.3.9/fs/proc/generic.c 2012-05-21 16:15:05.000000000 +0000 6577--- a/fs/proc/generic.c
6578+++ b/fs/proc/generic.c
6437@@ -22,6 +22,7 @@ 6579@@ -22,6 +22,7 @@
6438 #include <linux/bitops.h> 6580 #include <linux/bitops.h>
6439 #include <linux/spinlock.h> 6581 #include <linux/spinlock.h>
@@ -6442,7 +6584,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/p
6442 #include <asm/uaccess.h> 6584 #include <asm/uaccess.h>
6443 6585
6444 #include "internal.h" 6586 #include "internal.h"
6445@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro 6587@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct proc_dir_entry *de, struct inode *dir,
6446 for (de = de->subdir; de ; de = de->next) { 6588 for (de = de->subdir; de ; de = de->next) {
6447 if (de->namelen != dentry->d_name.len) 6589 if (de->namelen != dentry->d_name.len)
6448 continue; 6590 continue;
@@ -6458,7 +6600,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/p
6458 goto out_unlock; 6600 goto out_unlock;
6459 } 6601 }
6460 } 6602 }
6461@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr 6603@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entry *de, struct file *filp, void *dirent,
6462 6604
6463 /* filldir passes info to user space */ 6605 /* filldir passes info to user space */
6464 pde_get(de); 6606 pde_get(de);
@@ -6467,7 +6609,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/p
6467 spin_unlock(&proc_subdir_lock); 6609 spin_unlock(&proc_subdir_lock);
6468 if (filldir(dirent, de->name, de->namelen, filp->f_pos, 6610 if (filldir(dirent, de->name, de->namelen, filp->f_pos,
6469 de->low_ino, de->mode >> 12) < 0) { 6611 de->low_ino, de->mode >> 12) < 0) {
6470@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr 6612@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entry *de, struct file *filp, void *dirent,
6471 goto out; 6613 goto out;
6472 } 6614 }
6473 spin_lock(&proc_subdir_lock); 6615 spin_lock(&proc_subdir_lock);
@@ -6475,7 +6617,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/p
6475 filp->f_pos++; 6617 filp->f_pos++;
6476 next = de->next; 6618 next = de->next;
6477 pde_put(de); 6619 pde_put(de);
6478@@ -626,6 +634,7 @@ static struct proc_dir_entry *__proc_cre 6620@@ -626,6 +634,7 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
6479 ent->nlink = nlink; 6621 ent->nlink = nlink;
6480 atomic_set(&ent->count, 1); 6622 atomic_set(&ent->count, 1);
6481 ent->pde_users = 0; 6623 ent->pde_users = 0;
@@ -6483,7 +6625,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/p
6483 spin_lock_init(&ent->pde_unload_lock); 6625 spin_lock_init(&ent->pde_unload_lock);
6484 ent->pde_unload_completion = NULL; 6626 ent->pde_unload_completion = NULL;
6485 INIT_LIST_HEAD(&ent->pde_openers); 6627 INIT_LIST_HEAD(&ent->pde_openers);
6486@@ -649,7 +658,8 @@ struct proc_dir_entry *proc_symlink(cons 6628@@ -649,7 +658,8 @@ struct proc_dir_entry *proc_symlink(const char *name,
6487 kfree(ent->data); 6629 kfree(ent->data);
6488 kfree(ent); 6630 kfree(ent);
6489 ent = NULL; 6631 ent = NULL;
@@ -6493,10 +6635,11 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/generic.c linux-3.4.48-vs2.3.3.9/fs/p
6493 } else { 6635 } else {
6494 kfree(ent); 6636 kfree(ent);
6495 ent = NULL; 6637 ent = NULL;
6496diff -NurpP --minimal linux-3.4.48/fs/proc/inode.c linux-3.4.48-vs2.3.3.9/fs/proc/inode.c 6638diff --git a/fs/proc/inode.c b/fs/proc/inode.c
6497--- linux-3.4.48/fs/proc/inode.c 2012-05-21 16:07:26.000000000 +0000 6639index 205c922..82266c0 100644
6498+++ linux-3.4.48-vs2.3.3.9/fs/proc/inode.c 2012-05-21 16:15:05.000000000 +0000 6640--- a/fs/proc/inode.c
6499@@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe 6641+++ b/fs/proc/inode.c
6642@@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
6500 inode->i_uid = de->uid; 6643 inode->i_uid = de->uid;
6501 inode->i_gid = de->gid; 6644 inode->i_gid = de->gid;
6502 } 6645 }
@@ -6505,9 +6648,10 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/inode.c linux-3.4.48-vs2.3.3.9/fs/pro
6505 if (de->size) 6648 if (de->size)
6506 inode->i_size = de->size; 6649 inode->i_size = de->size;
6507 if (de->nlink) 6650 if (de->nlink)
6508diff -NurpP --minimal linux-3.4.48/fs/proc/internal.h linux-3.4.48-vs2.3.3.9/fs/proc/internal.h 6651diff --git a/fs/proc/internal.h b/fs/proc/internal.h
6509--- linux-3.4.48/fs/proc/internal.h 2012-05-21 16:07:26.000000000 +0000 6652index 5f79bb8..c6bc064 100644
6510+++ linux-3.4.48-vs2.3.3.9/fs/proc/internal.h 2012-05-21 16:15:05.000000000 +0000 6653--- a/fs/proc/internal.h
6654+++ b/fs/proc/internal.h
6511@@ -10,6 +10,8 @@ 6655@@ -10,6 +10,8 @@
6512 */ 6656 */
6513 6657
@@ -6517,7 +6661,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/internal.h linux-3.4.48-vs2.3.3.9/fs/
6517 struct ctl_table_header; 6661 struct ctl_table_header;
6518 6662
6519 extern struct proc_dir_entry proc_root; 6663 extern struct proc_dir_entry proc_root;
6520@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi 6664@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
6521 struct pid *pid, struct task_struct *task); 6665 struct pid *pid, struct task_struct *task);
6522 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 6666 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
6523 struct pid *pid, struct task_struct *task); 6667 struct pid *pid, struct task_struct *task);
@@ -6527,7 +6671,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/internal.h linux-3.4.48-vs2.3.3.9/fs/
6527 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 6671 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
6528 6672
6529 extern const struct file_operations proc_pid_maps_operations; 6673 extern const struct file_operations proc_pid_maps_operations;
6530@@ -82,11 +87,16 @@ static inline struct pid *proc_pid(struc 6674@@ -82,11 +87,16 @@ static inline struct pid *proc_pid(struct inode *inode)
6531 return PROC_I(inode)->pid; 6675 return PROC_I(inode)->pid;
6532 } 6676 }
6533 6677
@@ -6545,9 +6689,10 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/internal.h linux-3.4.48-vs2.3.3.9/fs/
6545 static inline int proc_fd(struct inode *inode) 6689 static inline int proc_fd(struct inode *inode)
6546 { 6690 {
6547 return PROC_I(inode)->fd; 6691 return PROC_I(inode)->fd;
6548diff -NurpP --minimal linux-3.4.48/fs/proc/loadavg.c linux-3.4.48-vs2.3.3.9/fs/proc/loadavg.c 6692diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c
6549--- linux-3.4.48/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000 6693index 1afa4dd..c7a8901 100644
6550+++ linux-3.4.48-vs2.3.3.9/fs/proc/loadavg.c 2012-05-21 16:15:05.000000000 +0000 6694--- a/fs/proc/loadavg.c
6695+++ b/fs/proc/loadavg.c
6551@@ -12,15 +12,27 @@ 6696@@ -12,15 +12,27 @@
6552 6697
6553 static int loadavg_proc_show(struct seq_file *m, void *v) 6698 static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6577,10 +6722,11 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/loadavg.c linux-3.4.48-vs2.3.3.9/fs/p
6577 task_active_pid_ns(current)->last_pid); 6722 task_active_pid_ns(current)->last_pid);
6578 return 0; 6723 return 0;
6579 } 6724 }
6580diff -NurpP --minimal linux-3.4.48/fs/proc/meminfo.c linux-3.4.48-vs2.3.3.9/fs/proc/meminfo.c 6725diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
6581--- linux-3.4.48/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000 6726index 80e4645..c8ae47e 100644
6582+++ linux-3.4.48-vs2.3.3.9/fs/proc/meminfo.c 2012-05-21 16:15:05.000000000 +0000 6727--- a/fs/proc/meminfo.c
6583@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ 6728+++ b/fs/proc/meminfo.c
6729@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
6584 allowed = ((totalram_pages - hugetlb_total_pages()) 6730 allowed = ((totalram_pages - hugetlb_total_pages())
6585 * sysctl_overcommit_ratio / 100) + total_swap_pages; 6731 * sysctl_overcommit_ratio / 100) + total_swap_pages;
6586 6732
@@ -6590,9 +6736,10 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/meminfo.c linux-3.4.48-vs2.3.3.9/fs/p
6590 total_swapcache_pages - i.bufferram; 6736 total_swapcache_pages - i.bufferram;
6591 if (cached < 0) 6737 if (cached < 0)
6592 cached = 0; 6738 cached = 0;
6593diff -NurpP --minimal linux-3.4.48/fs/proc/root.c linux-3.4.48-vs2.3.3.9/fs/proc/root.c 6739diff --git a/fs/proc/root.c b/fs/proc/root.c
6594--- linux-3.4.48/fs/proc/root.c 2012-05-21 16:07:26.000000000 +0000 6740index eed44bf..23bc771 100644
6595+++ linux-3.4.48-vs2.3.3.9/fs/proc/root.c 2012-05-21 16:15:05.000000000 +0000 6741--- a/fs/proc/root.c
6742+++ b/fs/proc/root.c
6596@@ -19,9 +19,14 @@ 6743@@ -19,9 +19,14 @@
6597 #include <linux/mount.h> 6744 #include <linux/mount.h>
6598 #include <linux/pid_namespace.h> 6745 #include <linux/pid_namespace.h>
@@ -6624,9 +6771,10 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/root.c linux-3.4.48-vs2.3.3.9/fs/proc
6624 .name = "/proc", 6771 .name = "/proc",
6625 }; 6772 };
6626 6773
6627diff -NurpP --minimal linux-3.4.48/fs/proc/stat.c linux-3.4.48-vs2.3.3.9/fs/proc/stat.c 6774diff --git a/fs/proc/stat.c b/fs/proc/stat.c
6628--- linux-3.4.48/fs/proc/stat.c 2013-06-13 08:59:35.000000000 +0000 6775index e296572..378a2a9 100644
6629+++ linux-3.4.48-vs2.3.3.9/fs/proc/stat.c 2012-11-06 17:02:35.000000000 +0000 6776--- a/fs/proc/stat.c
6777+++ b/fs/proc/stat.c
6630@@ -9,6 +9,7 @@ 6778@@ -9,6 +9,7 @@
6631 #include <linux/slab.h> 6779 #include <linux/slab.h>
6632 #include <linux/time.h> 6780 #include <linux/time.h>
@@ -6635,7 +6783,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/stat.c linux-3.4.48-vs2.3.3.9/fs/proc
6635 #include <asm/cputime.h> 6783 #include <asm/cputime.h>
6636 #include <linux/tick.h> 6784 #include <linux/tick.h>
6637 6785
6638@@ -92,6 +93,10 @@ static int show_stat(struct seq_file *p, 6786@@ -92,6 +93,10 @@ static int show_stat(struct seq_file *p, void *v)
6639 irq = softirq = steal = 0; 6787 irq = softirq = steal = 0;
6640 guest = guest_nice = 0; 6788 guest = guest_nice = 0;
6641 getboottime(&boottime); 6789 getboottime(&boottime);
@@ -6646,9 +6794,10 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/stat.c linux-3.4.48-vs2.3.3.9/fs/proc
6646 jif = boottime.tv_sec; 6794 jif = boottime.tv_sec;
6647 6795
6648 for_each_possible_cpu(i) { 6796 for_each_possible_cpu(i) {
6649diff -NurpP --minimal linux-3.4.48/fs/proc/uptime.c linux-3.4.48-vs2.3.3.9/fs/proc/uptime.c 6797diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
6650--- linux-3.4.48/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000 6798index 9610ac7..5b37714 100644
6651+++ linux-3.4.48-vs2.3.3.9/fs/proc/uptime.c 2012-05-21 16:15:05.000000000 +0000 6799--- a/fs/proc/uptime.c
6800+++ b/fs/proc/uptime.c
6652@@ -5,6 +5,7 @@ 6801@@ -5,6 +5,7 @@
6653 #include <linux/seq_file.h> 6802 #include <linux/seq_file.h>
6654 #include <linux/time.h> 6803 #include <linux/time.h>
@@ -6657,7 +6806,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/uptime.c linux-3.4.48-vs2.3.3.9/fs/pr
6657 #include <asm/cputime.h> 6806 #include <asm/cputime.h>
6658 6807
6659 static int uptime_proc_show(struct seq_file *m, void *v) 6808 static int uptime_proc_show(struct seq_file *m, void *v)
6660@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f 6809@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_file *m, void *v)
6661 nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC; 6810 nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
6662 idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem); 6811 idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
6663 idle.tv_nsec = rem; 6812 idle.tv_nsec = rem;
@@ -6668,10 +6817,11 @@ diff -NurpP --minimal linux-3.4.48/fs/proc/uptime.c linux-3.4.48-vs2.3.3.9/fs/pr
6668 seq_printf(m, "%lu.%02lu %lu.%02lu\n", 6817 seq_printf(m, "%lu.%02lu %lu.%02lu\n",
6669 (unsigned long) uptime.tv_sec, 6818 (unsigned long) uptime.tv_sec,
6670 (uptime.tv_nsec / (NSEC_PER_SEC / 100)), 6819 (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
6671diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs/proc_namespace.c 6820diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
6672--- linux-3.4.48/fs/proc_namespace.c 2012-03-19 18:47:26.000000000 +0000 6821index 1241285..23000d8 100644
6673+++ linux-3.4.48-vs2.3.3.9/fs/proc_namespace.c 2012-05-21 16:15:05.000000000 +0000 6822--- a/fs/proc_namespace.c
6674@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file 6823+++ b/fs/proc_namespace.c
6824@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file *m, struct super_block *sb)
6675 { MS_SYNCHRONOUS, ",sync" }, 6825 { MS_SYNCHRONOUS, ",sync" },
6676 { MS_DIRSYNC, ",dirsync" }, 6826 { MS_DIRSYNC, ",dirsync" },
6677 { MS_MANDLOCK, ",mand" }, 6827 { MS_MANDLOCK, ",mand" },
@@ -6680,7 +6830,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs
6680 { 0, NULL } 6830 { 0, NULL }
6681 }; 6831 };
6682 const struct proc_fs_info *fs_infop; 6832 const struct proc_fs_info *fs_infop;
6683@@ -80,6 +82,34 @@ static inline void mangle(struct seq_fil 6833@@ -80,6 +82,34 @@ static inline void mangle(struct seq_file *m, const char *s)
6684 seq_escape(m, s, " \t\n\\"); 6834 seq_escape(m, s, " \t\n\\");
6685 } 6835 }
6686 6836
@@ -6715,7 +6865,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs
6715 static void show_type(struct seq_file *m, struct super_block *sb) 6865 static void show_type(struct seq_file *m, struct super_block *sb)
6716 { 6866 {
6717 mangle(m, sb->s_type->name); 6867 mangle(m, sb->s_type->name);
6718@@ -96,6 +126,17 @@ static int show_vfsmnt(struct seq_file * 6868@@ -96,6 +126,17 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
6719 struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; 6869 struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
6720 struct super_block *sb = mnt_path.dentry->d_sb; 6870 struct super_block *sb = mnt_path.dentry->d_sb;
6721 6871
@@ -6733,7 +6883,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs
6733 if (sb->s_op->show_devname) { 6883 if (sb->s_op->show_devname) {
6734 err = sb->s_op->show_devname(m, mnt_path.dentry); 6884 err = sb->s_op->show_devname(m, mnt_path.dentry);
6735 if (err) 6885 if (err)
6736@@ -106,6 +147,7 @@ static int show_vfsmnt(struct seq_file * 6886@@ -106,6 +147,7 @@ static int show_vfsmnt(struct seq_file *m, struct vfsmount *mnt)
6737 seq_putc(m, ' '); 6887 seq_putc(m, ' ');
6738 seq_path(m, &mnt_path, " \t\n\\"); 6888 seq_path(m, &mnt_path, " \t\n\\");
6739 seq_putc(m, ' '); 6889 seq_putc(m, ' ');
@@ -6741,7 +6891,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs
6741 show_type(m, sb); 6891 show_type(m, sb);
6742 seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw"); 6892 seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
6743 err = show_sb_opts(m, sb); 6893 err = show_sb_opts(m, sb);
6744@@ -128,6 +170,11 @@ static int show_mountinfo(struct seq_fil 6894@@ -128,6 +170,11 @@ static int show_mountinfo(struct seq_file *m, struct vfsmount *mnt)
6745 struct path root = p->root; 6895 struct path root = p->root;
6746 int err = 0; 6896 int err = 0;
6747 6897
@@ -6753,7 +6903,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs
6753 seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id, 6903 seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
6754 MAJOR(sb->s_dev), MINOR(sb->s_dev)); 6904 MAJOR(sb->s_dev), MINOR(sb->s_dev));
6755 if (sb->s_op->show_path) 6905 if (sb->s_op->show_path)
6756@@ -187,6 +234,17 @@ static int show_vfsstat(struct seq_file 6906@@ -187,6 +234,17 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
6757 struct super_block *sb = mnt_path.dentry->d_sb; 6907 struct super_block *sb = mnt_path.dentry->d_sb;
6758 int err = 0; 6908 int err = 0;
6759 6909
@@ -6771,7 +6921,7 @@ diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs
6771 /* device */ 6921 /* device */
6772 if (sb->s_op->show_devname) { 6922 if (sb->s_op->show_devname) {
6773 seq_puts(m, "device "); 6923 seq_puts(m, "device ");
6774@@ -203,7 +261,7 @@ static int show_vfsstat(struct seq_file 6924@@ -203,7 +261,7 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
6775 seq_puts(m, " mounted on "); 6925 seq_puts(m, " mounted on ");
6776 seq_path(m, &mnt_path, " \t\n\\"); 6926 seq_path(m, &mnt_path, " \t\n\\");
6777 seq_putc(m, ' '); 6927 seq_putc(m, ' ');
@@ -6780,10 +6930,11 @@ diff -NurpP --minimal linux-3.4.48/fs/proc_namespace.c linux-3.4.48-vs2.3.3.9/fs
6780 /* file system type */ 6930 /* file system type */
6781 seq_puts(m, "with fstype "); 6931 seq_puts(m, "with fstype ");
6782 show_type(m, sb); 6932 show_type(m, sb);
6783diff -NurpP --minimal linux-3.4.48/fs/quota/dquot.c linux-3.4.48-vs2.3.3.9/fs/quota/dquot.c 6933diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
6784--- linux-3.4.48/fs/quota/dquot.c 2012-05-21 16:07:26.000000000 +0000 6934index d69a1d1..77e33ba 100644
6785+++ linux-3.4.48-vs2.3.3.9/fs/quota/dquot.c 2012-05-21 16:15:05.000000000 +0000 6935--- a/fs/quota/dquot.c
6786@@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *in 6936+++ b/fs/quota/dquot.c
6937@@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
6787 struct dquot **dquots = inode->i_dquot; 6938 struct dquot **dquots = inode->i_dquot;
6788 int reserve = flags & DQUOT_SPACE_RESERVE; 6939 int reserve = flags & DQUOT_SPACE_RESERVE;
6789 6940
@@ -6793,7 +6944,7 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/dquot.c linux-3.4.48-vs2.3.3.9/fs/qu
6793 /* 6944 /*
6794 * First test before acquiring mutex - solves deadlocks when we 6945 * First test before acquiring mutex - solves deadlocks when we
6795 * re-enter the quota code and are already holding the mutex 6946 * re-enter the quota code and are already holding the mutex
6796@@ -1618,6 +1621,9 @@ int dquot_alloc_inode(const struct inode 6947@@ -1618,6 +1621,9 @@ int dquot_alloc_inode(const struct inode *inode)
6797 struct dquot_warn warn[MAXQUOTAS]; 6948 struct dquot_warn warn[MAXQUOTAS];
6798 struct dquot * const *dquots = inode->i_dquot; 6949 struct dquot * const *dquots = inode->i_dquot;
6799 6950
@@ -6803,7 +6954,7 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/dquot.c linux-3.4.48-vs2.3.3.9/fs/qu
6803 /* First test before acquiring mutex - solves deadlocks when we 6954 /* First test before acquiring mutex - solves deadlocks when we
6804 * re-enter the quota code and are already holding the mutex */ 6955 * re-enter the quota code and are already holding the mutex */
6805 if (!dquot_active(inode)) 6956 if (!dquot_active(inode))
6806@@ -1689,6 +1695,8 @@ void __dquot_free_space(struct inode *in 6957@@ -1689,6 +1695,8 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
6807 struct dquot **dquots = inode->i_dquot; 6958 struct dquot **dquots = inode->i_dquot;
6808 int reserve = flags & DQUOT_SPACE_RESERVE; 6959 int reserve = flags & DQUOT_SPACE_RESERVE;
6809 6960
@@ -6812,7 +6963,7 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/dquot.c linux-3.4.48-vs2.3.3.9/fs/qu
6812 /* First test before acquiring mutex - solves deadlocks when we 6963 /* First test before acquiring mutex - solves deadlocks when we
6813 * re-enter the quota code and are already holding the mutex */ 6964 * re-enter the quota code and are already holding the mutex */
6814 if (!dquot_active(inode)) { 6965 if (!dquot_active(inode)) {
6815@@ -1733,6 +1741,8 @@ void dquot_free_inode(const struct inode 6966@@ -1733,6 +1741,8 @@ void dquot_free_inode(const struct inode *inode)
6816 struct dquot_warn warn[MAXQUOTAS]; 6967 struct dquot_warn warn[MAXQUOTAS];
6817 struct dquot * const *dquots = inode->i_dquot; 6968 struct dquot * const *dquots = inode->i_dquot;
6818 6969
@@ -6821,9 +6972,10 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/dquot.c linux-3.4.48-vs2.3.3.9/fs/qu
6821 /* First test before acquiring mutex - solves deadlocks when we 6972 /* First test before acquiring mutex - solves deadlocks when we
6822 * re-enter the quota code and are already holding the mutex */ 6973 * re-enter the quota code and are already holding the mutex */
6823 if (!dquot_active(inode)) 6974 if (!dquot_active(inode))
6824diff -NurpP --minimal linux-3.4.48/fs/quota/quota.c linux-3.4.48-vs2.3.3.9/fs/quota/quota.c 6975diff --git a/fs/quota/quota.c b/fs/quota/quota.c
6825--- linux-3.4.48/fs/quota/quota.c 2012-05-21 16:07:26.000000000 +0000 6976index 9a39120..79cb4b1 100644
6826+++ linux-3.4.48-vs2.3.3.9/fs/quota/quota.c 2012-05-21 16:15:05.000000000 +0000 6977--- a/fs/quota/quota.c
6978+++ b/fs/quota/quota.c
6827@@ -8,6 +8,7 @@ 6979@@ -8,6 +8,7 @@
6828 #include <linux/fs.h> 6980 #include <linux/fs.h>
6829 #include <linux/namei.h> 6981 #include <linux/namei.h>
@@ -6832,7 +6984,7 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/quota.c linux-3.4.48-vs2.3.3.9/fs/qu
6832 #include <asm/current.h> 6984 #include <asm/current.h>
6833 #include <asm/uaccess.h> 6985 #include <asm/uaccess.h>
6834 #include <linux/kernel.h> 6986 #include <linux/kernel.h>
6835@@ -37,7 +38,7 @@ static int check_quotactl_permission(str 6987@@ -37,7 +38,7 @@ static int check_quotactl_permission(struct super_block *sb, int type, int cmd,
6836 break; 6988 break;
6837 /*FALLTHROUGH*/ 6989 /*FALLTHROUGH*/
6838 default: 6990 default:
@@ -6841,7 +6993,7 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/quota.c linux-3.4.48-vs2.3.3.9/fs/qu
6841 return -EPERM; 6993 return -EPERM;
6842 } 6994 }
6843 6995
6844@@ -291,6 +292,46 @@ static int do_quotactl(struct super_bloc 6996@@ -291,6 +292,46 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
6845 } 6997 }
6846 } 6998 }
6847 6999
@@ -6888,7 +7040,7 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/quota.c linux-3.4.48-vs2.3.3.9/fs/qu
6888 /* Return 1 if 'cmd' will block on frozen filesystem */ 7040 /* Return 1 if 'cmd' will block on frozen filesystem */
6889 static int quotactl_cmd_write(int cmd) 7041 static int quotactl_cmd_write(int cmd)
6890 { 7042 {
6891@@ -323,6 +364,22 @@ static struct super_block *quotactl_bloc 7043@@ -323,6 +364,22 @@ static struct super_block *quotactl_block(const char __user *special, int cmd)
6892 putname(tmp); 7044 putname(tmp);
6893 if (IS_ERR(bdev)) 7045 if (IS_ERR(bdev))
6894 return ERR_CAST(bdev); 7046 return ERR_CAST(bdev);
@@ -6911,19 +7063,21 @@ diff -NurpP --minimal linux-3.4.48/fs/quota/quota.c linux-3.4.48-vs2.3.3.9/fs/qu
6911 if (quotactl_cmd_write(cmd)) 7063 if (quotactl_cmd_write(cmd))
6912 sb = get_super_thawed(bdev); 7064 sb = get_super_thawed(bdev);
6913 else 7065 else
6914diff -NurpP --minimal linux-3.4.48/fs/reiserfs/file.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/file.c 7066diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
6915--- linux-3.4.48/fs/reiserfs/file.c 2012-05-21 16:07:26.000000000 +0000 7067index 8375c92..8c6e73d 100644
6916+++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/file.c 2012-05-21 16:15:05.000000000 +0000 7068--- a/fs/reiserfs/file.c
6917@@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f 7069+++ b/fs/reiserfs/file.c
7070@@ -319,5 +319,6 @@ const struct inode_operations reiserfs_file_inode_operations = {
6918 .listxattr = reiserfs_listxattr, 7071 .listxattr = reiserfs_listxattr,
6919 .removexattr = reiserfs_removexattr, 7072 .removexattr = reiserfs_removexattr,
6920 .permission = reiserfs_permission, 7073 .permission = reiserfs_permission,
6921+ .sync_flags = reiserfs_sync_flags, 7074+ .sync_flags = reiserfs_sync_flags,
6922 .get_acl = reiserfs_get_acl, 7075 .get_acl = reiserfs_get_acl,
6923 }; 7076 };
6924diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/inode.c 7077diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
6925--- linux-3.4.48/fs/reiserfs/inode.c 2013-06-13 08:59:35.000000000 +0000 7078index c11db51..b7dc936 100644
6926+++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/inode.c 2012-12-08 00:53:53.000000000 +0000 7079--- a/fs/reiserfs/inode.c
7080+++ b/fs/reiserfs/inode.c
6927@@ -18,6 +18,7 @@ 7081@@ -18,6 +18,7 @@
6928 #include <linux/writeback.h> 7082 #include <linux/writeback.h>
6929 #include <linux/quotaops.h> 7083 #include <linux/quotaops.h>
@@ -6932,7 +7086,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
6932 7086
6933 int reiserfs_commit_write(struct file *f, struct page *page, 7087 int reiserfs_commit_write(struct file *f, struct page *page,
6934 unsigned from, unsigned to); 7088 unsigned from, unsigned to);
6935@@ -1131,6 +1132,8 @@ static void init_inode(struct inode *ino 7089@@ -1131,6 +1132,8 @@ static void init_inode(struct inode *inode, struct treepath *path)
6936 struct buffer_head *bh; 7090 struct buffer_head *bh;
6937 struct item_head *ih; 7091 struct item_head *ih;
6938 __u32 rdev; 7092 __u32 rdev;
@@ -6941,7 +7095,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
6941 //int version = ITEM_VERSION_1; 7095 //int version = ITEM_VERSION_1;
6942 7096
6943 bh = PATH_PLAST_BUFFER(path); 7097 bh = PATH_PLAST_BUFFER(path);
6944@@ -1151,12 +1154,13 @@ static void init_inode(struct inode *ino 7098@@ -1151,12 +1154,13 @@ static void init_inode(struct inode *inode, struct treepath *path)
6945 (struct stat_data_v1 *)B_I_PITEM(bh, ih); 7099 (struct stat_data_v1 *)B_I_PITEM(bh, ih);
6946 unsigned long blocks; 7100 unsigned long blocks;
6947 7101
@@ -6957,7 +7111,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
6957 inode->i_size = sd_v1_size(sd); 7111 inode->i_size = sd_v1_size(sd);
6958 inode->i_atime.tv_sec = sd_v1_atime(sd); 7112 inode->i_atime.tv_sec = sd_v1_atime(sd);
6959 inode->i_mtime.tv_sec = sd_v1_mtime(sd); 7113 inode->i_mtime.tv_sec = sd_v1_mtime(sd);
6960@@ -1198,11 +1202,12 @@ static void init_inode(struct inode *ino 7114@@ -1198,11 +1202,12 @@ static void init_inode(struct inode *inode, struct treepath *path)
6961 // (directories and symlinks) 7115 // (directories and symlinks)
6962 struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih); 7116 struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
6963 7117
@@ -6972,7 +7126,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
6972 inode->i_mtime.tv_sec = sd_v2_mtime(sd); 7126 inode->i_mtime.tv_sec = sd_v2_mtime(sd);
6973 inode->i_atime.tv_sec = sd_v2_atime(sd); 7127 inode->i_atime.tv_sec = sd_v2_atime(sd);
6974 inode->i_ctime.tv_sec = sd_v2_ctime(sd); 7128 inode->i_ctime.tv_sec = sd_v2_ctime(sd);
6975@@ -1232,6 +1237,10 @@ static void init_inode(struct inode *ino 7129@@ -1232,6 +1237,10 @@ static void init_inode(struct inode *inode, struct treepath *path)
6976 sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode); 7130 sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
6977 } 7131 }
6978 7132
@@ -6983,7 +7137,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
6983 pathrelse(path); 7137 pathrelse(path);
6984 if (S_ISREG(inode->i_mode)) { 7138 if (S_ISREG(inode->i_mode)) {
6985 inode->i_op = &reiserfs_file_inode_operations; 7139 inode->i_op = &reiserfs_file_inode_operations;
6986@@ -1254,13 +1263,15 @@ static void init_inode(struct inode *ino 7140@@ -1254,13 +1263,15 @@ static void init_inode(struct inode *inode, struct treepath *path)
6987 static void inode2sd(void *sd, struct inode *inode, loff_t size) 7141 static void inode2sd(void *sd, struct inode *inode, loff_t size)
6988 { 7142 {
6989 struct stat_data *sd_v2 = (struct stat_data *)sd; 7143 struct stat_data *sd_v2 = (struct stat_data *)sd;
@@ -7001,7 +7155,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
7001 set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec); 7155 set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec);
7002 set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec); 7156 set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec);
7003 set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec); 7157 set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec);
7004@@ -2875,14 +2886,19 @@ int reiserfs_commit_write(struct file *f 7158@@ -2875,14 +2886,19 @@ int reiserfs_commit_write(struct file *f, struct page *page,
7005 void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode) 7159 void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
7006 { 7160 {
7007 if (reiserfs_attrs(inode->i_sb)) { 7161 if (reiserfs_attrs(inode->i_sb)) {
@@ -7025,7 +7179,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
7025 if (sd_attrs & REISERFS_APPEND_FL) 7179 if (sd_attrs & REISERFS_APPEND_FL)
7026 inode->i_flags |= S_APPEND; 7180 inode->i_flags |= S_APPEND;
7027 else 7181 else
7028@@ -2895,6 +2911,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, 7182@@ -2895,6 +2911,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
7029 REISERFS_I(inode)->i_flags |= i_nopack_mask; 7183 REISERFS_I(inode)->i_flags |= i_nopack_mask;
7030 else 7184 else
7031 REISERFS_I(inode)->i_flags &= ~i_nopack_mask; 7185 REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
@@ -7041,7 +7195,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
7041 } 7195 }
7042 } 7196 }
7043 7197
7044@@ -2905,6 +2930,11 @@ void i_attrs_to_sd_attrs(struct inode *i 7198@@ -2905,6 +2930,11 @@ void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs)
7045 *sd_attrs |= REISERFS_IMMUTABLE_FL; 7199 *sd_attrs |= REISERFS_IMMUTABLE_FL;
7046 else 7200 else
7047 *sd_attrs &= ~REISERFS_IMMUTABLE_FL; 7201 *sd_attrs &= ~REISERFS_IMMUTABLE_FL;
@@ -7053,7 +7207,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
7053 if (inode->i_flags & S_SYNC) 7207 if (inode->i_flags & S_SYNC)
7054 *sd_attrs |= REISERFS_SYNC_FL; 7208 *sd_attrs |= REISERFS_SYNC_FL;
7055 else 7209 else
7056@@ -2917,6 +2947,15 @@ void i_attrs_to_sd_attrs(struct inode *i 7210@@ -2917,6 +2947,15 @@ void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs)
7057 *sd_attrs |= REISERFS_NOTAIL_FL; 7211 *sd_attrs |= REISERFS_NOTAIL_FL;
7058 else 7212 else
7059 *sd_attrs &= ~REISERFS_NOTAIL_FL; 7213 *sd_attrs &= ~REISERFS_NOTAIL_FL;
@@ -7069,7 +7223,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
7069 } 7223 }
7070 } 7224 }
7071 7225
7072@@ -3161,7 +3200,8 @@ int reiserfs_setattr(struct dentry *dent 7226@@ -3161,7 +3200,8 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
7073 } 7227 }
7074 7228
7075 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || 7229 if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -7079,7 +7233,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
7079 struct reiserfs_transaction_handle th; 7233 struct reiserfs_transaction_handle th;
7080 int jbegin_count = 7234 int jbegin_count =
7081 2 * 7235 2 *
7082@@ -3192,6 +3232,9 @@ int reiserfs_setattr(struct dentry *dent 7236@@ -3192,6 +3232,9 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
7083 inode->i_uid = attr->ia_uid; 7237 inode->i_uid = attr->ia_uid;
7084 if (attr->ia_valid & ATTR_GID) 7238 if (attr->ia_valid & ATTR_GID)
7085 inode->i_gid = attr->ia_gid; 7239 inode->i_gid = attr->ia_gid;
@@ -7089,9 +7243,10 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/inode.c linux-3.4.48-vs2.3.3.9/fs
7089 mark_inode_dirty(inode); 7243 mark_inode_dirty(inode);
7090 error = journal_end(&th, inode->i_sb, jbegin_count); 7244 error = journal_end(&th, inode->i_sb, jbegin_count);
7091 if (error) 7245 if (error)
7092diff -NurpP --minimal linux-3.4.48/fs/reiserfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/ioctl.c 7246diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
7093--- linux-3.4.48/fs/reiserfs/ioctl.c 2012-05-21 16:07:27.000000000 +0000 7247index 0c21850..c285691 100644
7094+++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/ioctl.c 2012-05-21 16:15:05.000000000 +0000 7248--- a/fs/reiserfs/ioctl.c
7249+++ b/fs/reiserfs/ioctl.c
7095@@ -11,6 +11,21 @@ 7250@@ -11,6 +11,21 @@
7096 #include <linux/pagemap.h> 7251 #include <linux/pagemap.h>
7097 #include <linux/compat.h> 7252 #include <linux/compat.h>
@@ -7123,7 +7278,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs
7123 int err = 0; 7278 int err = 0;
7124 7279
7125 reiserfs_write_lock(inode->i_sb); 7280 reiserfs_write_lock(inode->i_sb);
7126@@ -47,6 +62,7 @@ long reiserfs_ioctl(struct file *filp, u 7281@@ -47,6 +62,7 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
7127 7282
7128 flags = REISERFS_I(inode)->i_attrs; 7283 flags = REISERFS_I(inode)->i_attrs;
7129 i_attrs_to_sd_attrs(inode, (__u16 *) & flags); 7284 i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
@@ -7131,7 +7286,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs
7131 err = put_user(flags, (int __user *)arg); 7286 err = put_user(flags, (int __user *)arg);
7132 break; 7287 break;
7133 case REISERFS_IOC_SETFLAGS:{ 7288 case REISERFS_IOC_SETFLAGS:{
7134@@ -67,6 +83,10 @@ long reiserfs_ioctl(struct file *filp, u 7289@@ -67,6 +83,10 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
7135 err = -EFAULT; 7290 err = -EFAULT;
7136 goto setflags_out; 7291 goto setflags_out;
7137 } 7292 }
@@ -7142,7 +7297,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs
7142 /* 7297 /*
7143 * Is it quota file? Do not allow user to mess with it 7298 * Is it quota file? Do not allow user to mess with it
7144 */ 7299 */
7145@@ -91,6 +111,10 @@ long reiserfs_ioctl(struct file *filp, u 7300@@ -91,6 +111,10 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
7146 goto setflags_out; 7301 goto setflags_out;
7147 } 7302 }
7148 } 7303 }
@@ -7153,9 +7308,10 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/ioctl.c linux-3.4.48-vs2.3.3.9/fs
7153 sd_attrs_to_i_attrs(flags, inode); 7308 sd_attrs_to_i_attrs(flags, inode);
7154 REISERFS_I(inode)->i_attrs = flags; 7309 REISERFS_I(inode)->i_attrs = flags;
7155 inode->i_ctime = CURRENT_TIME_SEC; 7310 inode->i_ctime = CURRENT_TIME_SEC;
7156diff -NurpP --minimal linux-3.4.48/fs/reiserfs/namei.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/namei.c 7311diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
7157--- linux-3.4.48/fs/reiserfs/namei.c 2012-05-21 16:07:27.000000000 +0000 7312index 84e8a69..2a1a8b3 100644
7158+++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/namei.c 2012-05-21 16:15:05.000000000 +0000 7313--- a/fs/reiserfs/namei.c
7314+++ b/fs/reiserfs/namei.c
7159@@ -18,6 +18,7 @@ 7315@@ -18,6 +18,7 @@
7160 #include "acl.h" 7316 #include "acl.h"
7161 #include "xattr.h" 7317 #include "xattr.h"
@@ -7164,7 +7320,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/namei.c linux-3.4.48-vs2.3.3.9/fs
7164 7320
7165 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) set_nlink(i, 1); } 7321 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) set_nlink(i, 1); }
7166 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i); 7322 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
7167@@ -362,6 +363,7 @@ static struct dentry *reiserfs_lookup(st 7323@@ -362,6 +363,7 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,
7168 if (retval == IO_ERROR) { 7324 if (retval == IO_ERROR) {
7169 return ERR_PTR(-EIO); 7325 return ERR_PTR(-EIO);
7170 } 7326 }
@@ -7172,9 +7328,10 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/namei.c linux-3.4.48-vs2.3.3.9/fs
7172 7328
7173 return d_splice_alias(inode, dentry); 7329 return d_splice_alias(inode, dentry);
7174 } 7330 }
7175diff -NurpP --minimal linux-3.4.48/fs/reiserfs/reiserfs.h linux-3.4.48-vs2.3.3.9/fs/reiserfs/reiserfs.h 7331diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
7176--- linux-3.4.48/fs/reiserfs/reiserfs.h 2012-05-21 16:07:27.000000000 +0000 7332index a59d271..9d9dc3a 100644
7177+++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/reiserfs.h 2012-05-21 17:19:33.000000000 +0000 7333--- a/fs/reiserfs/reiserfs.h
7334+++ b/fs/reiserfs/reiserfs.h
7178@@ -544,6 +544,7 @@ enum reiserfs_mount_options { 7335@@ -544,6 +544,7 @@ enum reiserfs_mount_options {
7179 REISERFS_EXPOSE_PRIVROOT, 7336 REISERFS_EXPOSE_PRIVROOT,
7180 REISERFS_BARRIER_NONE, 7337 REISERFS_BARRIER_NONE,
@@ -7205,7 +7362,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/reiserfs.h linux-3.4.48-vs2.3.3.9
7205 /* Stat Data on disk (reiserfs version of UFS disk inode minus the 7362 /* Stat Data on disk (reiserfs version of UFS disk inode minus the
7206 address blocks) */ 7363 address blocks) */
7207 struct stat_data { 7364 struct stat_data {
7208@@ -2641,6 +2650,7 @@ static inline void reiserfs_update_sd(st 7365@@ -2641,6 +2650,7 @@ static inline void reiserfs_update_sd(struct reiserfs_transaction_handle *th,
7209 void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode); 7366 void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
7210 void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs); 7367 void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
7211 int reiserfs_setattr(struct dentry *dentry, struct iattr *attr); 7368 int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
@@ -7213,10 +7370,11 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/reiserfs.h linux-3.4.48-vs2.3.3.9
7213 7370
7214 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); 7371 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
7215 7372
7216diff -NurpP --minimal linux-3.4.48/fs/reiserfs/super.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/super.c 7373diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
7217--- linux-3.4.48/fs/reiserfs/super.c 2013-06-13 08:59:35.000000000 +0000 7374index 8169be9..ae8e537 100644
7218+++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/super.c 2012-12-08 00:53:53.000000000 +0000 7375--- a/fs/reiserfs/super.c
7219@@ -982,6 +982,14 @@ static int reiserfs_parse_options(struct 7376+++ b/fs/reiserfs/super.c
7377@@ -982,6 +982,14 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
7220 {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, 7378 {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
7221 {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, 7379 {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
7222 #endif 7380 #endif
@@ -7231,7 +7389,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/super.c linux-3.4.48-vs2.3.3.9/fs
7231 #ifdef CONFIG_REISERFS_FS_POSIX_ACL 7389 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
7232 {"acl",.setmask = 1 << REISERFS_POSIXACL}, 7390 {"acl",.setmask = 1 << REISERFS_POSIXACL},
7233 {"noacl",.clrmask = 1 << REISERFS_POSIXACL}, 7391 {"noacl",.clrmask = 1 << REISERFS_POSIXACL},
7234@@ -1300,6 +1308,14 @@ static int reiserfs_remount(struct super 7392@@ -1300,6 +1308,14 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
7235 handle_quota_files(s, qf_names, &qfmt); 7393 handle_quota_files(s, qf_names, &qfmt);
7236 #endif 7394 #endif
7237 7395
@@ -7246,7 +7404,7 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/super.c linux-3.4.48-vs2.3.3.9/fs
7246 handle_attrs(s); 7404 handle_attrs(s);
7247 7405
7248 /* Add options that are safe here */ 7406 /* Add options that are safe here */
7249@@ -1792,6 +1808,10 @@ static int reiserfs_fill_super(struct su 7407@@ -1792,6 +1808,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
7250 goto error_unlocked; 7408 goto error_unlocked;
7251 } 7409 }
7252 7410
@@ -7257,9 +7415,10 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/super.c linux-3.4.48-vs2.3.3.9/fs
7257 rs = SB_DISK_SUPER_BLOCK(s); 7415 rs = SB_DISK_SUPER_BLOCK(s);
7258 /* Let's do basic sanity check to verify that underlying device is not 7416 /* Let's do basic sanity check to verify that underlying device is not
7259 smaller than the filesystem. If the check fails then abort and scream, 7417 smaller than the filesystem. If the check fails then abort and scream,
7260diff -NurpP --minimal linux-3.4.48/fs/reiserfs/xattr.c linux-3.4.48-vs2.3.3.9/fs/reiserfs/xattr.c 7418diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
7261--- linux-3.4.48/fs/reiserfs/xattr.c 2012-05-21 16:07:27.000000000 +0000 7419index 048d990..32bd2be 100644
7262+++ linux-3.4.48-vs2.3.3.9/fs/reiserfs/xattr.c 2013-06-13 09:46:39.000000000 +0000 7420--- a/fs/reiserfs/xattr.c
7421+++ b/fs/reiserfs/xattr.c
7263@@ -40,6 +40,7 @@ 7422@@ -40,6 +40,7 @@
7264 #include <linux/errno.h> 7423 #include <linux/errno.h>
7265 #include <linux/gfp.h> 7424 #include <linux/gfp.h>
@@ -7268,10 +7427,11 @@ diff -NurpP --minimal linux-3.4.48/fs/reiserfs/xattr.c linux-3.4.48-vs2.3.3.9/fs
7268 #include <linux/file.h> 7427 #include <linux/file.h>
7269 #include <linux/pagemap.h> 7428 #include <linux/pagemap.h>
7270 #include <linux/xattr.h> 7429 #include <linux/xattr.h>
7271diff -NurpP --minimal linux-3.4.48/fs/stat.c linux-3.4.48-vs2.3.3.9/fs/stat.c 7430diff --git a/fs/stat.c b/fs/stat.c
7272--- linux-3.4.48/fs/stat.c 2013-06-13 08:59:35.000000000 +0000 7431index dc6d0be..5e6a73f 100644
7273+++ linux-3.4.48-vs2.3.3.9/fs/stat.c 2012-10-22 13:09:53.000000000 +0000 7432--- a/fs/stat.c
7274@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod 7433+++ b/fs/stat.c
7434@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
7275 stat->nlink = inode->i_nlink; 7435 stat->nlink = inode->i_nlink;
7276 stat->uid = inode->i_uid; 7436 stat->uid = inode->i_uid;
7277 stat->gid = inode->i_gid; 7437 stat->gid = inode->i_gid;
@@ -7279,9 +7439,10 @@ diff -NurpP --minimal linux-3.4.48/fs/stat.c linux-3.4.48-vs2.3.3.9/fs/stat.c
7279 stat->rdev = inode->i_rdev; 7439 stat->rdev = inode->i_rdev;
7280 stat->size = i_size_read(inode); 7440 stat->size = i_size_read(inode);
7281 stat->atime = inode->i_atime; 7441 stat->atime = inode->i_atime;
7282diff -NurpP --minimal linux-3.4.48/fs/statfs.c linux-3.4.48-vs2.3.3.9/fs/statfs.c 7442diff --git a/fs/statfs.c b/fs/statfs.c
7283--- linux-3.4.48/fs/statfs.c 2012-05-21 16:07:27.000000000 +0000 7443index 43e6b6f..bb1c8af 100644
7284+++ linux-3.4.48-vs2.3.3.9/fs/statfs.c 2012-05-21 16:15:05.000000000 +0000 7444--- a/fs/statfs.c
7445+++ b/fs/statfs.c
7285@@ -7,6 +7,8 @@ 7446@@ -7,6 +7,8 @@
7286 #include <linux/statfs.h> 7447 #include <linux/statfs.h>
7287 #include <linux/security.h> 7448 #include <linux/security.h>
@@ -7291,7 +7452,7 @@ diff -NurpP --minimal linux-3.4.48/fs/statfs.c linux-3.4.48-vs2.3.3.9/fs/statfs.
7291 #include "internal.h" 7452 #include "internal.h"
7292 7453
7293 static int flags_by_mnt(int mnt_flags) 7454 static int flags_by_mnt(int mnt_flags)
7294@@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr 7455@@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentry *dentry, struct kstatfs *buf)
7295 retval = dentry->d_sb->s_op->statfs(dentry, buf); 7456 retval = dentry->d_sb->s_op->statfs(dentry, buf);
7296 if (retval == 0 && buf->f_frsize == 0) 7457 if (retval == 0 && buf->f_frsize == 0)
7297 buf->f_frsize = buf->f_bsize; 7458 buf->f_frsize = buf->f_bsize;
@@ -7300,9 +7461,10 @@ diff -NurpP --minimal linux-3.4.48/fs/statfs.c linux-3.4.48-vs2.3.3.9/fs/statfs.
7300 return retval; 7461 return retval;
7301 } 7462 }
7302 7463
7303diff -NurpP --minimal linux-3.4.48/fs/super.c linux-3.4.48-vs2.3.3.9/fs/super.c 7464diff --git a/fs/super.c b/fs/super.c
7304--- linux-3.4.48/fs/super.c 2012-05-21 16:07:27.000000000 +0000 7465index 3c520a5..c54c8c3 100644
7305+++ linux-3.4.48-vs2.3.3.9/fs/super.c 2012-05-21 16:59:38.000000000 +0000 7466--- a/fs/super.c
7467+++ b/fs/super.c
7306@@ -33,6 +33,8 @@ 7468@@ -33,6 +33,8 @@
7307 #include <linux/rculist_bl.h> 7469 #include <linux/rculist_bl.h>
7308 #include <linux/cleancache.h> 7470 #include <linux/cleancache.h>
@@ -7312,7 +7474,7 @@ diff -NurpP --minimal linux-3.4.48/fs/super.c linux-3.4.48-vs2.3.3.9/fs/super.c
7312 #include "internal.h" 7474 #include "internal.h"
7313 7475
7314 7476
7315@@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type, 7477@@ -1133,6 +1135,13 @@ mount_fs(struct file_system_type *type, int flags, const char *name, void *data)
7316 WARN_ON(sb->s_bdi == &default_backing_dev_info); 7478 WARN_ON(sb->s_bdi == &default_backing_dev_info);
7317 sb->s_flags |= MS_BORN; 7479 sb->s_flags |= MS_BORN;
7318 7480
@@ -7326,10 +7488,11 @@ diff -NurpP --minimal linux-3.4.48/fs/super.c linux-3.4.48-vs2.3.3.9/fs/super.c
7326 error = security_sb_kern_mount(sb, flags, secdata); 7488 error = security_sb_kern_mount(sb, flags, secdata);
7327 if (error) 7489 if (error)
7328 goto out_sb; 7490 goto out_sb;
7329diff -NurpP --minimal linux-3.4.48/fs/sysfs/mount.c linux-3.4.48-vs2.3.3.9/fs/sysfs/mount.c 7491diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
7330--- linux-3.4.48/fs/sysfs/mount.c 2012-05-21 16:07:27.000000000 +0000 7492index 52c3bdb..9a1d6a5 100644
7331+++ linux-3.4.48-vs2.3.3.9/fs/sysfs/mount.c 2012-05-21 16:15:05.000000000 +0000 7493--- a/fs/sysfs/mount.c
7332@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super 7494+++ b/fs/sysfs/mount.c
7495@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
7333 7496
7334 sb->s_blocksize = PAGE_CACHE_SIZE; 7497 sb->s_blocksize = PAGE_CACHE_SIZE;
7335 sb->s_blocksize_bits = PAGE_CACHE_SHIFT; 7498 sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -7338,9 +7501,10 @@ diff -NurpP --minimal linux-3.4.48/fs/sysfs/mount.c linux-3.4.48-vs2.3.3.9/fs/sy
7338 sb->s_op = &sysfs_ops; 7501 sb->s_op = &sysfs_ops;
7339 sb->s_time_gran = 1; 7502 sb->s_time_gran = 1;
7340 7503
7341diff -NurpP --minimal linux-3.4.48/fs/utimes.c linux-3.4.48-vs2.3.3.9/fs/utimes.c 7504diff --git a/fs/utimes.c b/fs/utimes.c
7342--- linux-3.4.48/fs/utimes.c 2011-05-22 14:17:54.000000000 +0000 7505index ba653f3..ffac095 100644
7343+++ linux-3.4.48-vs2.3.3.9/fs/utimes.c 2012-05-21 16:15:05.000000000 +0000 7506--- a/fs/utimes.c
7507+++ b/fs/utimes.c
7344@@ -8,6 +8,8 @@ 7508@@ -8,6 +8,8 @@
7345 #include <linux/stat.h> 7509 #include <linux/stat.h>
7346 #include <linux/utime.h> 7510 #include <linux/utime.h>
@@ -7350,7 +7514,7 @@ diff -NurpP --minimal linux-3.4.48/fs/utimes.c linux-3.4.48-vs2.3.3.9/fs/utimes.
7350 #include <asm/uaccess.h> 7514 #include <asm/uaccess.h>
7351 #include <asm/unistd.h> 7515 #include <asm/unistd.h>
7352 7516
7353@@ -52,12 +54,18 @@ static int utimes_common(struct path *pa 7517@@ -52,12 +54,18 @@ static int utimes_common(struct path *path, struct timespec *times)
7354 { 7518 {
7355 int error; 7519 int error;
7356 struct iattr newattrs; 7520 struct iattr newattrs;
@@ -7370,9 +7534,10 @@ diff -NurpP --minimal linux-3.4.48/fs/utimes.c linux-3.4.48-vs2.3.3.9/fs/utimes.
7370 if (times && times[0].tv_nsec == UTIME_NOW && 7534 if (times && times[0].tv_nsec == UTIME_NOW &&
7371 times[1].tv_nsec == UTIME_NOW) 7535 times[1].tv_nsec == UTIME_NOW)
7372 times = NULL; 7536 times = NULL;
7373diff -NurpP --minimal linux-3.4.48/fs/xattr.c linux-3.4.48-vs2.3.3.9/fs/xattr.c 7537diff --git a/fs/xattr.c b/fs/xattr.c
7374--- linux-3.4.48/fs/xattr.c 2012-05-21 16:07:27.000000000 +0000 7538index 3c8c1cc..fc48afc 100644
7375+++ linux-3.4.48-vs2.3.3.9/fs/xattr.c 2012-05-21 16:15:05.000000000 +0000 7539--- a/fs/xattr.c
7540+++ b/fs/xattr.c
7376@@ -20,6 +20,7 @@ 7541@@ -20,6 +20,7 @@
7377 #include <linux/fsnotify.h> 7542 #include <linux/fsnotify.h>
7378 #include <linux/audit.h> 7543 #include <linux/audit.h>
@@ -7381,7 +7546,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xattr.c linux-3.4.48-vs2.3.3.9/fs/xattr.c
7381 7546
7382 #include <asm/uaccess.h> 7547 #include <asm/uaccess.h>
7383 7548
7384@@ -51,7 +52,7 @@ xattr_permission(struct inode *inode, co 7549@@ -51,7 +52,7 @@ xattr_permission(struct inode *inode, const char *name, int mask)
7385 * The trusted.* namespace can only be accessed by privileged users. 7550 * The trusted.* namespace can only be accessed by privileged users.
7386 */ 7551 */
7387 if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) { 7552 if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) {
@@ -7390,9 +7555,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xattr.c linux-3.4.48-vs2.3.3.9/fs/xattr.c
7390 return (mask & MAY_WRITE) ? -EPERM : -ENODATA; 7555 return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
7391 return 0; 7556 return 0;
7392 } 7557 }
7393diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_dinode.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_dinode.h 7558diff --git a/fs/xfs/xfs_dinode.h b/fs/xfs/xfs_dinode.h
7394--- linux-3.4.48/fs/xfs/xfs_dinode.h 2011-10-24 16:45:31.000000000 +0000 7559index a372163..a2bad6a 100644
7395+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_dinode.h 2012-05-21 16:15:05.000000000 +0000 7560--- a/fs/xfs/xfs_dinode.h
7561+++ b/fs/xfs/xfs_dinode.h
7396@@ -51,7 +51,9 @@ typedef struct xfs_dinode { 7562@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
7397 __be32 di_nlink; /* number of links to file */ 7563 __be32 di_nlink; /* number of links to file */
7398 __be16 di_projid_lo; /* lower part of owner's project id */ 7564 __be16 di_projid_lo; /* lower part of owner's project id */
@@ -7404,7 +7570,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_dinode.h linux-3.4.48-vs2.3.3.9/fs
7404 __be16 di_flushiter; /* incremented on flush */ 7570 __be16 di_flushiter; /* incremented on flush */
7405 xfs_timestamp_t di_atime; /* time last accessed */ 7571 xfs_timestamp_t di_atime; /* time last accessed */
7406 xfs_timestamp_t di_mtime; /* time last modified */ 7572 xfs_timestamp_t di_mtime; /* time last modified */
7407@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s 7573@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
7408 #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */ 7574 #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */
7409 #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */ 7575 #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */
7410 #define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */ 7576 #define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */
@@ -7413,7 +7579,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_dinode.h linux-3.4.48-vs2.3.3.9/fs
7413 #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT) 7579 #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT)
7414 #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT) 7580 #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT)
7415 #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT) 7581 #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT)
7416@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s 7582@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
7417 #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT) 7583 #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
7418 #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT) 7584 #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT)
7419 #define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT) 7585 #define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT)
@@ -7421,7 +7587,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_dinode.h linux-3.4.48-vs2.3.3.9/fs
7421 7587
7422 #ifdef CONFIG_XFS_RT 7588 #ifdef CONFIG_XFS_RT
7423 #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) 7589 #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
7424@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s 7590@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
7425 XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \ 7591 XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
7426 XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \ 7592 XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \
7427 XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \ 7593 XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \
@@ -7433,9 +7599,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_dinode.h linux-3.4.48-vs2.3.3.9/fs
7433+#define XFS_DIVFLAG_COW 0x02 7599+#define XFS_DIVFLAG_COW 0x02
7434 7600
7435 #endif /* __XFS_DINODE_H__ */ 7601 #endif /* __XFS_DINODE_H__ */
7436diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_fs.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_fs.h 7602diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h
7437--- linux-3.4.48/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000 7603index c13fed8..6bfbcd1 100644
7438+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_fs.h 2012-05-21 16:15:05.000000000 +0000 7604--- a/fs/xfs/xfs_fs.h
7605+++ b/fs/xfs/xfs_fs.h
7439@@ -67,6 +67,9 @@ struct fsxattr { 7606@@ -67,6 +67,9 @@ struct fsxattr {
7440 #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ 7607 #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
7441 #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ 7608 #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
@@ -7456,9 +7623,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_fs.h linux-3.4.48-vs2.3.3.9/fs/xfs
7456 __u32 bs_dmevmask; /* DMIG event mask */ 7623 __u32 bs_dmevmask; /* DMIG event mask */
7457 __u16 bs_dmstate; /* DMIG state info */ 7624 __u16 bs_dmstate; /* DMIG state info */
7458 __u16 bs_aextents; /* attribute number of extents */ 7625 __u16 bs_aextents; /* attribute number of extents */
7459diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ialloc.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ialloc.c 7626diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
7460--- linux-3.4.48/fs/xfs/xfs_ialloc.c 2012-03-19 18:47:27.000000000 +0000 7627index dad1a31..2bb267f 100644
7461+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ialloc.c 2012-05-21 16:15:05.000000000 +0000 7628--- a/fs/xfs/xfs_ialloc.c
7629+++ b/fs/xfs/xfs_ialloc.c
7462@@ -37,7 +37,6 @@ 7630@@ -37,7 +37,6 @@
7463 #include "xfs_error.h" 7631 #include "xfs_error.h"
7464 #include "xfs_bmap.h" 7632 #include "xfs_bmap.h"
@@ -7467,9 +7635,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ialloc.c linux-3.4.48-vs2.3.3.9/fs
7467 /* 7635 /*
7468 * Allocation group level functions. 7636 * Allocation group level functions.
7469 */ 7637 */
7470diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_inode.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_inode.c 7638diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
7471--- linux-3.4.48/fs/xfs/xfs_inode.c 2012-05-21 16:07:27.000000000 +0000 7639index bc46c0a..5b88287 100644
7472+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_inode.c 2012-05-21 16:15:05.000000000 +0000 7640--- a/fs/xfs/xfs_inode.c
7641+++ b/fs/xfs/xfs_inode.c
7473@@ -236,6 +236,7 @@ xfs_inotobp( 7642@@ -236,6 +236,7 @@ xfs_inotobp(
7474 return 0; 7643 return 0;
7475 } 7644 }
@@ -7644,9 +7813,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_inode.c linux-3.4.48-vs2.3.3.9/fs/
7644 7813
7645 /* Wrap, we never let the log put out DI_MAX_FLUSH */ 7814 /* Wrap, we never let the log put out DI_MAX_FLUSH */
7646 if (ip->i_d.di_flushiter == DI_MAX_FLUSH) 7815 if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
7647diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_inode.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_inode.h 7816diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
7648--- linux-3.4.48/fs/xfs/xfs_inode.h 2012-05-21 16:07:27.000000000 +0000 7817index 7fee338..dbc374b 100644
7649+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_inode.h 2012-05-21 16:15:05.000000000 +0000 7818--- a/fs/xfs/xfs_inode.h
7819+++ b/fs/xfs/xfs_inode.h
7650@@ -134,7 +134,9 @@ typedef struct xfs_icdinode { 7820@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
7651 __uint32_t di_nlink; /* number of links to file */ 7821 __uint32_t di_nlink; /* number of links to file */
7652 __uint16_t di_projid_lo; /* lower part of owner's project id */ 7822 __uint16_t di_projid_lo; /* lower part of owner's project id */
@@ -7658,7 +7828,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_inode.h linux-3.4.48-vs2.3.3.9/fs/
7658 __uint16_t di_flushiter; /* incremented on flush */ 7828 __uint16_t di_flushiter; /* incremented on flush */
7659 xfs_ictimestamp_t di_atime; /* time last accessed */ 7829 xfs_ictimestamp_t di_atime; /* time last accessed */
7660 xfs_ictimestamp_t di_mtime; /* time last modified */ 7830 xfs_ictimestamp_t di_mtime; /* time last modified */
7661@@ -565,7 +567,7 @@ int xfs_itobp(struct xfs_mount *, struc 7831@@ -565,7 +567,7 @@ int xfs_itobp(struct xfs_mount *, struct xfs_trans *,
7662 int xfs_iread(struct xfs_mount *, struct xfs_trans *, 7832 int xfs_iread(struct xfs_mount *, struct xfs_trans *,
7663 struct xfs_inode *, uint); 7833 struct xfs_inode *, uint);
7664 void xfs_dinode_to_disk(struct xfs_dinode *, 7834 void xfs_dinode_to_disk(struct xfs_dinode *,
@@ -7667,9 +7837,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_inode.h linux-3.4.48-vs2.3.3.9/fs/
7667 void xfs_idestroy_fork(struct xfs_inode *, int); 7837 void xfs_idestroy_fork(struct xfs_inode *, int);
7668 void xfs_idata_realloc(struct xfs_inode *, int, int); 7838 void xfs_idata_realloc(struct xfs_inode *, int, int);
7669 void xfs_iroot_realloc(struct xfs_inode *, int, int); 7839 void xfs_iroot_realloc(struct xfs_inode *, int, int);
7670diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ioctl.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ioctl.c 7840diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
7671--- linux-3.4.48/fs/xfs/xfs_ioctl.c 2012-05-21 16:07:27.000000000 +0000 7841index 91f8ff5..6b2f15d 100644
7672+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ioctl.c 2012-05-21 16:15:05.000000000 +0000 7842--- a/fs/xfs/xfs_ioctl.c
7843+++ b/fs/xfs/xfs_ioctl.c
7673@@ -28,7 +28,7 @@ 7844@@ -28,7 +28,7 @@
7674 #include "xfs_bmap_btree.h" 7845 #include "xfs_bmap_btree.h"
7675 #include "xfs_dinode.h" 7846 #include "xfs_dinode.h"
@@ -7738,9 +7909,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ioctl.c linux-3.4.48-vs2.3.3.9/fs/
7738 return xfs_ioc_setxflags(ip, filp, arg); 7909 return xfs_ioc_setxflags(ip, filp, arg);
7739 7910
7740 case XFS_IOC_FSSETDM: { 7911 case XFS_IOC_FSSETDM: {
7741diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ioctl.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ioctl.h 7912diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
7742--- linux-3.4.48/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000 7913index d56173b..a8f7331 100644
7743+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_ioctl.h 2012-05-21 16:15:05.000000000 +0000 7914--- a/fs/xfs/xfs_ioctl.h
7915+++ b/fs/xfs/xfs_ioctl.h
7744@@ -70,6 +70,12 @@ xfs_handle_to_dentry( 7916@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
7745 void __user *uhandle, 7917 void __user *uhandle,
7746 u32 hlen); 7918 u32 hlen);
@@ -7754,9 +7926,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_ioctl.h linux-3.4.48-vs2.3.3.9/fs/
7754 extern long 7926 extern long
7755 xfs_file_ioctl( 7927 xfs_file_ioctl(
7756 struct file *filp, 7928 struct file *filp,
7757diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_iops.c 7929diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
7758--- linux-3.4.48/fs/xfs/xfs_iops.c 2012-05-21 16:07:27.000000000 +0000 7930index 23c79ca..91a953f 100644
7759+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_iops.c 2012-05-21 16:15:05.000000000 +0000 7931--- a/fs/xfs/xfs_iops.c
7932+++ b/fs/xfs/xfs_iops.c
7760@@ -30,6 +30,7 @@ 7933@@ -30,6 +30,7 @@
7761 #include "xfs_bmap_btree.h" 7934 #include "xfs_bmap_btree.h"
7762 #include "xfs_dinode.h" 7935 #include "xfs_dinode.h"
@@ -7781,7 +7954,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/x
7781 stat->ino = ip->i_ino; 7954 stat->ino = ip->i_ino;
7782 stat->atime = inode->i_atime; 7955 stat->atime = inode->i_atime;
7783 stat->mtime = inode->i_mtime; 7956 stat->mtime = inode->i_mtime;
7784@@ -996,6 +999,7 @@ static const struct inode_operations xfs 7957@@ -1013,6 +1016,7 @@ static const struct inode_operations xfs_inode_operations = {
7785 .removexattr = generic_removexattr, 7958 .removexattr = generic_removexattr,
7786 .listxattr = xfs_vn_listxattr, 7959 .listxattr = xfs_vn_listxattr,
7787 .fiemap = xfs_vn_fiemap, 7960 .fiemap = xfs_vn_fiemap,
@@ -7789,7 +7962,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/x
7789 }; 7962 };
7790 7963
7791 static const struct inode_operations xfs_dir_inode_operations = { 7964 static const struct inode_operations xfs_dir_inode_operations = {
7792@@ -1021,6 +1025,7 @@ static const struct inode_operations xfs 7965@@ -1038,6 +1042,7 @@ static const struct inode_operations xfs_dir_inode_operations = {
7793 .getxattr = generic_getxattr, 7966 .getxattr = generic_getxattr,
7794 .removexattr = generic_removexattr, 7967 .removexattr = generic_removexattr,
7795 .listxattr = xfs_vn_listxattr, 7968 .listxattr = xfs_vn_listxattr,
@@ -7797,7 +7970,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/x
7797 }; 7970 };
7798 7971
7799 static const struct inode_operations xfs_dir_ci_inode_operations = { 7972 static const struct inode_operations xfs_dir_ci_inode_operations = {
7800@@ -1070,6 +1075,10 @@ xfs_diflags_to_iflags( 7973@@ -1087,6 +1092,10 @@ xfs_diflags_to_iflags(
7801 inode->i_flags |= S_IMMUTABLE; 7974 inode->i_flags |= S_IMMUTABLE;
7802 else 7975 else
7803 inode->i_flags &= ~S_IMMUTABLE; 7976 inode->i_flags &= ~S_IMMUTABLE;
@@ -7808,7 +7981,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/x
7808 if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) 7981 if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
7809 inode->i_flags |= S_APPEND; 7982 inode->i_flags |= S_APPEND;
7810 else 7983 else
7811@@ -1082,6 +1091,15 @@ xfs_diflags_to_iflags( 7984@@ -1099,6 +1108,15 @@ xfs_diflags_to_iflags(
7812 inode->i_flags |= S_NOATIME; 7985 inode->i_flags |= S_NOATIME;
7813 else 7986 else
7814 inode->i_flags &= ~S_NOATIME; 7987 inode->i_flags &= ~S_NOATIME;
@@ -7824,7 +7997,7 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/x
7824 } 7997 }
7825 7998
7826 /* 7999 /*
7827@@ -1113,6 +1131,7 @@ xfs_setup_inode( 8000@@ -1130,6 +1148,7 @@ xfs_setup_inode(
7828 set_nlink(inode, ip->i_d.di_nlink); 8001 set_nlink(inode, ip->i_d.di_nlink);
7829 inode->i_uid = ip->i_d.di_uid; 8002 inode->i_uid = ip->i_d.di_uid;
7830 inode->i_gid = ip->i_d.di_gid; 8003 inode->i_gid = ip->i_d.di_gid;
@@ -7832,9 +8005,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_iops.c linux-3.4.48-vs2.3.3.9/fs/x
7832 8005
7833 switch (inode->i_mode & S_IFMT) { 8006 switch (inode->i_mode & S_IFMT) {
7834 case S_IFBLK: 8007 case S_IFBLK:
7835diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_itable.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_itable.c 8008diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
7836--- linux-3.4.48/fs/xfs/xfs_itable.c 2012-05-21 16:07:27.000000000 +0000 8009index acc2bf2..5ccb314 100644
7837+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_itable.c 2012-05-21 16:15:05.000000000 +0000 8010--- a/fs/xfs/xfs_itable.c
8011+++ b/fs/xfs/xfs_itable.c
7838@@ -97,6 +97,7 @@ xfs_bulkstat_one_int( 8012@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
7839 buf->bs_mode = dic->di_mode; 8013 buf->bs_mode = dic->di_mode;
7840 buf->bs_uid = dic->di_uid; 8014 buf->bs_uid = dic->di_uid;
@@ -7843,9 +8017,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_itable.c linux-3.4.48-vs2.3.3.9/fs
7843 buf->bs_size = dic->di_size; 8017 buf->bs_size = dic->di_size;
7844 buf->bs_atime.tv_sec = dic->di_atime.t_sec; 8018 buf->bs_atime.tv_sec = dic->di_atime.t_sec;
7845 buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; 8019 buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
7846diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_linux.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_linux.h 8020diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
7847--- linux-3.4.48/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000 8021index 828662f..dbc20e6 100644
7848+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_linux.h 2012-05-21 16:15:05.000000000 +0000 8022--- a/fs/xfs/xfs_linux.h
8023+++ b/fs/xfs/xfs_linux.h
7849@@ -121,6 +121,7 @@ 8024@@ -121,6 +121,7 @@
7850 8025
7851 #define current_cpu() (raw_smp_processor_id()) 8026 #define current_cpu() (raw_smp_processor_id())
@@ -7854,9 +8029,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_linux.h linux-3.4.48-vs2.3.3.9/fs/
7854 #define current_test_flags(f) (current->flags & (f)) 8029 #define current_test_flags(f) (current->flags & (f))
7855 #define current_set_flags_nested(sp, f) \ 8030 #define current_set_flags_nested(sp, f) \
7856 (*(sp) = current->flags, current->flags |= (f)) 8031 (*(sp) = current->flags, current->flags |= (f))
7857diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_log_recover.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_log_recover.c 8032diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
7858--- linux-3.4.48/fs/xfs/xfs_log_recover.c 2013-06-13 08:59:35.000000000 +0000 8033index 0abb162..f9bac62 100644
7859+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_log_recover.c 2012-11-18 23:52:29.000000000 +0000 8034--- a/fs/xfs/xfs_log_recover.c
8035+++ b/fs/xfs/xfs_log_recover.c
7860@@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2( 8036@@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2(
7861 } 8037 }
7862 8038
@@ -7867,9 +8043,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_log_recover.c linux-3.4.48-vs2.3.3
7867 8043
7868 /* the rest is in on-disk format */ 8044 /* the rest is in on-disk format */
7869 if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { 8045 if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
7870diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_mount.h linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_mount.h 8046diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
7871--- linux-3.4.48/fs/xfs/xfs_mount.h 2012-05-21 16:07:28.000000000 +0000 8047index 9eba738..e5784cf 100644
7872+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_mount.h 2012-05-21 16:15:05.000000000 +0000 8048--- a/fs/xfs/xfs_mount.h
8049+++ b/fs/xfs/xfs_mount.h
7873@@ -251,6 +251,7 @@ typedef struct xfs_mount { 8050@@ -251,6 +251,7 @@ typedef struct xfs_mount {
7874 allocator */ 8051 allocator */
7875 #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ 8052 #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7878,9 +8055,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_mount.h linux-3.4.48-vs2.3.3.9/fs/
7878 8055
7879 /* 8056 /*
7880 * Default minimum read and write sizes. 8057 * Default minimum read and write sizes.
7881diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_super.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_super.c 8058diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
7882--- linux-3.4.48/fs/xfs/xfs_super.c 2012-05-21 16:07:28.000000000 +0000 8059index dab9a5f..01d34c9 100644
7883+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_super.c 2012-05-21 16:15:05.000000000 +0000 8060--- a/fs/xfs/xfs_super.c
8061+++ b/fs/xfs/xfs_super.c
7884@@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool; 8062@@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool;
7885 #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ 8063 #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
7886 #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ 8064 #define MNTOPT_DISCARD "discard" /* Discard unused blocks */
@@ -7953,9 +8131,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_super.c linux-3.4.48-vs2.3.3.9/fs/
7953 /* 8131 /*
7954 * we must configure the block size in the superblock before we run the 8132 * we must configure the block size in the superblock before we run the
7955 * full mount process as the mount process can lookup and cache inodes. 8133 * full mount process as the mount process can lookup and cache inodes.
7956diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_vnodeops.c linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 8134diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
7957--- linux-3.4.48/fs/xfs/xfs_vnodeops.c 2012-05-21 16:07:28.000000000 +0000 8135index 64981d7..efc3c76 100644
7958+++ linux-3.4.48-vs2.3.3.9/fs/xfs/xfs_vnodeops.c 2012-05-21 16:15:05.000000000 +0000 8136--- a/fs/xfs/xfs_vnodeops.c
8137+++ b/fs/xfs/xfs_vnodeops.c
7959@@ -106,6 +106,77 @@ xfs_readlink_bmap( 8138@@ -106,6 +106,77 @@ xfs_readlink_bmap(
7960 return error; 8139 return error;
7961 } 8140 }
@@ -8034,9 +8213,10 @@ diff -NurpP --minimal linux-3.4.48/fs/xfs/xfs_vnodeops.c linux-3.4.48-vs2.3.3.9/
8034 int 8213 int
8035 xfs_readlink( 8214 xfs_readlink(
8036 xfs_inode_t *ip, 8215 xfs_inode_t *ip,
8037diff -NurpP --minimal linux-3.4.48/include/linux/Kbuild linux-3.4.48-vs2.3.3.9/include/linux/Kbuild 8216diff --git a/include/linux/Kbuild b/include/linux/Kbuild
8038--- linux-3.4.48/include/linux/Kbuild 2013-06-13 08:59:35.000000000 +0000 8217index f2f73f9..936cee2 100644
8039+++ linux-3.4.48-vs2.3.3.9/include/linux/Kbuild 2012-07-24 09:52:30.000000000 +0000 8218--- a/include/linux/Kbuild
8219+++ b/include/linux/Kbuild
8040@@ -18,6 +18,7 @@ header-y += netfilter_bridge/ 8220@@ -18,6 +18,7 @@ header-y += netfilter_bridge/
8041 header-y += netfilter_ipv4/ 8221 header-y += netfilter_ipv4/
8042 header-y += netfilter_ipv6/ 8222 header-y += netfilter_ipv6/
@@ -8045,9 +8225,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/Kbuild linux-3.4.48-vs2.3.3.9/i
8045 header-y += wimax/ 8225 header-y += wimax/
8046 8226
8047 objhdr-y += version.h 8227 objhdr-y += version.h
8048diff -NurpP --minimal linux-3.4.48/include/linux/capability.h linux-3.4.48-vs2.3.3.9/include/linux/capability.h 8228diff --git a/include/linux/capability.h b/include/linux/capability.h
8049--- linux-3.4.48/include/linux/capability.h 2012-03-19 18:47:27.000000000 +0000 8229index 12d52de..80dbfc5 100644
8050+++ linux-3.4.48-vs2.3.3.9/include/linux/capability.h 2012-05-21 16:15:05.000000000 +0000 8230--- a/include/linux/capability.h
8231+++ b/include/linux/capability.h
8051@@ -280,6 +280,7 @@ struct cpu_vfs_cap_data { 8232@@ -280,6 +280,7 @@ struct cpu_vfs_cap_data {
8052 arbitrary SCSI commands */ 8233 arbitrary SCSI commands */
8053 /* Allow setting encryption key on loopback filesystem */ 8234 /* Allow setting encryption key on loopback filesystem */
@@ -8070,10 +8251,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/capability.h linux-3.4.48-vs2.3
8070 8251
8071 /* 8252 /*
8072 * Bit location of each capability (used by user-space library and kernel) 8253 * Bit location of each capability (used by user-space library and kernel)
8073diff -NurpP --minimal linux-3.4.48/include/linux/cred.h linux-3.4.48-vs2.3.3.9/include/linux/cred.h 8254diff --git a/include/linux/cred.h b/include/linux/cred.h
8074--- linux-3.4.48/include/linux/cred.h 2012-03-19 18:47:27.000000000 +0000 8255index adadf71..ed9c50c 100644
8075+++ linux-3.4.48-vs2.3.3.9/include/linux/cred.h 2012-05-21 16:15:05.000000000 +0000 8256--- a/include/linux/cred.h
8076@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc 8257+++ b/include/linux/cred.h
8258@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struct *);
8077 extern int copy_creds(struct task_struct *, unsigned long); 8259 extern int copy_creds(struct task_struct *, unsigned long);
8078 extern const struct cred *get_task_cred(struct task_struct *); 8260 extern const struct cred *get_task_cred(struct task_struct *);
8079 extern struct cred *cred_alloc_blank(void); 8261 extern struct cred *cred_alloc_blank(void);
@@ -8081,7 +8263,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/cred.h linux-3.4.48-vs2.3.3.9/i
8081 extern struct cred *prepare_creds(void); 8263 extern struct cred *prepare_creds(void);
8082 extern struct cred *prepare_exec_creds(void); 8264 extern struct cred *prepare_exec_creds(void);
8083 extern int commit_creds(struct cred *); 8265 extern int commit_creds(struct cred *);
8084@@ -209,6 +210,31 @@ static inline void validate_process_cred 8266@@ -209,6 +210,31 @@ static inline void validate_process_creds(void)
8085 } 8267 }
8086 #endif 8268 #endif
8087 8269
@@ -8113,18 +8295,20 @@ diff -NurpP --minimal linux-3.4.48/include/linux/cred.h linux-3.4.48-vs2.3.3.9/i
8113 /** 8295 /**
8114 * get_new_cred - Get a reference on a new set of credentials 8296 * get_new_cred - Get a reference on a new set of credentials
8115 * @cred: The new credentials to reference 8297 * @cred: The new credentials to reference
8116diff -NurpP --minimal linux-3.4.48/include/linux/devpts_fs.h linux-3.4.48-vs2.3.3.9/include/linux/devpts_fs.h 8298diff --git a/include/linux/devpts_fs.h b/include/linux/devpts_fs.h
8117--- linux-3.4.48/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000 8299index 5ce0e5f..3c122e5 100644
8118+++ linux-3.4.48-vs2.3.3.9/include/linux/devpts_fs.h 2012-05-21 16:15:05.000000000 +0000 8300--- a/include/linux/devpts_fs.h
8119@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc 8301+++ b/include/linux/devpts_fs.h
8302@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struct tty_struct *tty) { }
8120 8303
8121 #endif 8304 #endif
8122 8305
8123- 8306-
8124 #endif /* _LINUX_DEVPTS_FS_H */ 8307 #endif /* _LINUX_DEVPTS_FS_H */
8125diff -NurpP --minimal linux-3.4.48/include/linux/fs.h linux-3.4.48-vs2.3.3.9/include/linux/fs.h 8308diff --git a/include/linux/fs.h b/include/linux/fs.h
8126--- linux-3.4.48/include/linux/fs.h 2012-05-21 16:07:29.000000000 +0000 8309index 25c40b9..fff34c5 100644
8127+++ linux-3.4.48-vs2.3.3.9/include/linux/fs.h 2012-05-21 16:15:05.000000000 +0000 8310--- a/include/linux/fs.h
8311+++ b/include/linux/fs.h
8128@@ -214,6 +214,9 @@ struct inodes_stat_t { 8312@@ -214,6 +214,9 @@ struct inodes_stat_t {
8129 #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ 8313 #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
8130 #define MS_I_VERSION (1<<23) /* Update inode I_version field */ 8314 #define MS_I_VERSION (1<<23) /* Update inode I_version field */
@@ -8202,7 +8386,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/fs.h linux-3.4.48-vs2.3.3.9/inc
8202 8386
8203 #define SYNC_FILE_RANGE_WAIT_BEFORE 1 8387 #define SYNC_FILE_RANGE_WAIT_BEFORE 1
8204 #define SYNC_FILE_RANGE_WRITE 2 8388 #define SYNC_FILE_RANGE_WRITE 2
8205@@ -456,6 +483,7 @@ typedef void (dio_iodone_t)(struct kiocb 8389@@ -456,6 +483,7 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
8206 #define ATTR_KILL_PRIV (1 << 14) 8390 #define ATTR_KILL_PRIV (1 << 14)
8207 #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ 8391 #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
8208 #define ATTR_TIMES_SET (1 << 16) 8392 #define ATTR_TIMES_SET (1 << 16)
@@ -8247,7 +8431,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/fs.h linux-3.4.48-vs2.3.3.9/inc
8247 struct timespec i_atime; 8431 struct timespec i_atime;
8248 struct timespec i_mtime; 8432 struct timespec i_mtime;
8249 struct timespec i_ctime; 8433 struct timespec i_ctime;
8250@@ -929,12 +964,12 @@ static inline void i_size_write(struct i 8434@@ -929,12 +964,12 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
8251 8435
8252 static inline unsigned iminor(const struct inode *inode) 8436 static inline unsigned iminor(const struct inode *inode)
8253 { 8437 {
@@ -8286,7 +8470,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/fs.h linux-3.4.48-vs2.3.3.9/inc
8286 void (*truncate_range)(struct inode *, loff_t, loff_t); 8470 void (*truncate_range)(struct inode *, loff_t, loff_t);
8287 int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, 8471 int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
8288 u64 len); 8472 u64 len);
8289@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *, 8473@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
8290 unsigned long, loff_t *); 8474 unsigned long, loff_t *);
8291 extern ssize_t vfs_writev(struct file *, const struct iovec __user *, 8475 extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
8292 unsigned long, loff_t *); 8476 unsigned long, loff_t *);
@@ -8294,7 +8478,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/fs.h linux-3.4.48-vs2.3.3.9/inc
8294 8478
8295 struct super_operations { 8479 struct super_operations {
8296 struct inode *(*alloc_inode)(struct super_block *sb); 8480 struct inode *(*alloc_inode)(struct super_block *sb);
8297@@ -2509,6 +2548,7 @@ extern int dcache_dir_open(struct inode 8481@@ -2509,6 +2548,7 @@ extern int dcache_dir_open(struct inode *, struct file *);
8298 extern int dcache_dir_close(struct inode *, struct file *); 8482 extern int dcache_dir_close(struct inode *, struct file *);
8299 extern loff_t dcache_dir_lseek(struct file *, loff_t, int); 8483 extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
8300 extern int dcache_readdir(struct file *, void *, filldir_t); 8484 extern int dcache_readdir(struct file *, void *, filldir_t);
@@ -8302,9 +8486,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/fs.h linux-3.4.48-vs2.3.3.9/inc
8302 extern int simple_setattr(struct dentry *, struct iattr *); 8486 extern int simple_setattr(struct dentry *, struct iattr *);
8303 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); 8487 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
8304 extern int simple_statfs(struct dentry *, struct kstatfs *); 8488 extern int simple_statfs(struct dentry *, struct kstatfs *);
8305diff -NurpP --minimal linux-3.4.48/include/linux/gfs2_ondisk.h linux-3.4.48-vs2.3.3.9/include/linux/gfs2_ondisk.h 8489diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
8306--- linux-3.4.48/include/linux/gfs2_ondisk.h 2012-05-21 16:07:29.000000000 +0000 8490index fa98bdb..0963c10 100644
8307+++ linux-3.4.48-vs2.3.3.9/include/linux/gfs2_ondisk.h 2012-05-21 16:15:05.000000000 +0000 8491--- a/include/linux/gfs2_ondisk.h
8492+++ b/include/linux/gfs2_ondisk.h
8308@@ -214,6 +214,9 @@ enum { 8493@@ -214,6 +214,9 @@ enum {
8309 gfs2fl_NoAtime = 7, 8494 gfs2fl_NoAtime = 7,
8310 gfs2fl_Sync = 8, 8495 gfs2fl_Sync = 8,
@@ -8325,9 +8510,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/gfs2_ondisk.h linux-3.4.48-vs2.
8325 #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ 8510 #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
8326 #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 8511 #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
8327 #define GFS2_DIF_INHERIT_JDATA 0x80000000 8512 #define GFS2_DIF_INHERIT_JDATA 0x80000000
8328diff -NurpP --minimal linux-3.4.48/include/linux/if_tun.h linux-3.4.48-vs2.3.3.9/include/linux/if_tun.h 8513diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
8329--- linux-3.4.48/include/linux/if_tun.h 2010-08-02 14:52:54.000000000 +0000 8514index 06b1829..b222127 100644
8330+++ linux-3.4.48-vs2.3.3.9/include/linux/if_tun.h 2012-05-21 16:15:05.000000000 +0000 8515--- a/include/linux/if_tun.h
8516+++ b/include/linux/if_tun.h
8331@@ -53,6 +53,7 @@ 8517@@ -53,6 +53,7 @@
8332 #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) 8518 #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
8333 #define TUNGETVNETHDRSZ _IOR('T', 215, int) 8519 #define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -8336,10 +8522,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/if_tun.h linux-3.4.48-vs2.3.3.9
8336 8522
8337 /* TUNSETIFF ifr flags */ 8523 /* TUNSETIFF ifr flags */
8338 #define IFF_TUN 0x0001 8524 #define IFF_TUN 0x0001
8339diff -NurpP --minimal linux-3.4.48/include/linux/init_task.h linux-3.4.48-vs2.3.3.9/include/linux/init_task.h 8525diff --git a/include/linux/init_task.h b/include/linux/init_task.h
8340--- linux-3.4.48/include/linux/init_task.h 2013-06-13 08:59:35.000000000 +0000 8526index e7bafa4..9f491e1 100644
8341+++ linux-3.4.48-vs2.3.3.9/include/linux/init_task.h 2012-10-22 13:09:53.000000000 +0000 8527--- a/include/linux/init_task.h
8342@@ -210,6 +210,10 @@ extern struct task_group root_task_group 8528+++ b/include/linux/init_task.h
8529@@ -210,6 +210,10 @@ extern struct task_group root_task_group;
8343 INIT_TRACE_RECURSION \ 8530 INIT_TRACE_RECURSION \
8344 INIT_TASK_RCU_PREEMPT(tsk) \ 8531 INIT_TASK_RCU_PREEMPT(tsk) \
8345 INIT_CPUSET_SEQ \ 8532 INIT_CPUSET_SEQ \
@@ -8350,9 +8537,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/init_task.h linux-3.4.48-vs2.3.
8350 } 8537 }
8351 8538
8352 8539
8353diff -NurpP --minimal linux-3.4.48/include/linux/ipc.h linux-3.4.48-vs2.3.3.9/include/linux/ipc.h 8540diff --git a/include/linux/ipc.h b/include/linux/ipc.h
8354--- linux-3.4.48/include/linux/ipc.h 2012-03-19 18:47:28.000000000 +0000 8541index 30e8161..ba4ea32 100644
8355+++ linux-3.4.48-vs2.3.3.9/include/linux/ipc.h 2012-05-21 16:15:05.000000000 +0000 8542--- a/include/linux/ipc.h
8543+++ b/include/linux/ipc.h
8356@@ -91,6 +91,7 @@ struct kern_ipc_perm 8544@@ -91,6 +91,7 @@ struct kern_ipc_perm
8357 key_t key; 8545 key_t key;
8358 uid_t uid; 8546 uid_t uid;
@@ -8361,10 +8549,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/ipc.h linux-3.4.48-vs2.3.3.9/in
8361 uid_t cuid; 8549 uid_t cuid;
8362 gid_t cgid; 8550 gid_t cgid;
8363 umode_t mode; 8551 umode_t mode;
8364diff -NurpP --minimal linux-3.4.48/include/linux/ipc_namespace.h linux-3.4.48-vs2.3.3.9/include/linux/ipc_namespace.h 8552diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
8365--- linux-3.4.48/include/linux/ipc_namespace.h 2011-10-24 16:45:32.000000000 +0000 8553index 497c6cc..56868cd 100644
8366+++ linux-3.4.48-vs2.3.3.9/include/linux/ipc_namespace.h 2013-06-13 09:46:39.000000000 +0000 8554--- a/include/linux/ipc_namespace.h
8367@@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_ 8555+++ b/include/linux/ipc_namespace.h
8556@@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
8368 8557
8369 #if defined(CONFIG_IPC_NS) 8558 #if defined(CONFIG_IPC_NS)
8370 extern struct ipc_namespace *copy_ipcs(unsigned long flags, 8559 extern struct ipc_namespace *copy_ipcs(unsigned long flags,
@@ -8374,7 +8563,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/ipc_namespace.h linux-3.4.48-vs
8374 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) 8563 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
8375 { 8564 {
8376 if (ns) 8565 if (ns)
8377@@ -112,12 +113,13 @@ static inline struct ipc_namespace *get_ 8566@@ -112,12 +113,13 @@ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
8378 extern void put_ipc_ns(struct ipc_namespace *ns); 8567 extern void put_ipc_ns(struct ipc_namespace *ns);
8379 #else 8568 #else
8380 static inline struct ipc_namespace *copy_ipcs(unsigned long flags, 8569 static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
@@ -8390,9 +8579,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/ipc_namespace.h linux-3.4.48-vs
8390 } 8579 }
8391 8580
8392 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) 8581 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
8393diff -NurpP --minimal linux-3.4.48/include/linux/loop.h linux-3.4.48-vs2.3.3.9/include/linux/loop.h 8582diff --git a/include/linux/loop.h b/include/linux/loop.h
8394--- linux-3.4.48/include/linux/loop.h 2012-01-09 15:14:58.000000000 +0000 8583index 11a41a8..ddff471 100644
8395+++ linux-3.4.48-vs2.3.3.9/include/linux/loop.h 2012-05-21 16:15:05.000000000 +0000 8584--- a/include/linux/loop.h
8585+++ b/include/linux/loop.h
8396@@ -45,6 +45,7 @@ struct loop_device { 8586@@ -45,6 +45,7 @@ struct loop_device {
8397 struct loop_func_table *lo_encryption; 8587 struct loop_func_table *lo_encryption;
8398 __u32 lo_init[2]; 8588 __u32 lo_init[2];
@@ -8401,9 +8591,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/loop.h linux-3.4.48-vs2.3.3.9/i
8401 int (*ioctl)(struct loop_device *, int cmd, 8591 int (*ioctl)(struct loop_device *, int cmd,
8402 unsigned long arg); 8592 unsigned long arg);
8403 8593
8404diff -NurpP --minimal linux-3.4.48/include/linux/magic.h linux-3.4.48-vs2.3.3.9/include/linux/magic.h 8594diff --git a/include/linux/magic.h b/include/linux/magic.h
8405--- linux-3.4.48/include/linux/magic.h 2012-05-21 16:07:31.000000000 +0000 8595index e15192c..9f89937 100644
8406+++ linux-3.4.48-vs2.3.3.9/include/linux/magic.h 2012-05-21 16:15:05.000000000 +0000 8596--- a/include/linux/magic.h
8597+++ b/include/linux/magic.h
8407@@ -3,7 +3,7 @@ 8598@@ -3,7 +3,7 @@
8408 8599
8409 #define ADFS_SUPER_MAGIC 0xadf5 8600 #define ADFS_SUPER_MAGIC 0xadf5
@@ -8413,9 +8604,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/magic.h linux-3.4.48-vs2.3.3.9/
8413 #define AUTOFS_SUPER_MAGIC 0x0187 8604 #define AUTOFS_SUPER_MAGIC 0x0187
8414 #define CODA_SUPER_MAGIC 0x73757245 8605 #define CODA_SUPER_MAGIC 0x73757245
8415 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ 8606 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
8416diff -NurpP --minimal linux-3.4.48/include/linux/major.h linux-3.4.48-vs2.3.3.9/include/linux/major.h 8607diff --git a/include/linux/major.h b/include/linux/major.h
8417--- linux-3.4.48/include/linux/major.h 2009-09-10 13:26:25.000000000 +0000 8608index 6a8ca98..da44aa0 100644
8418+++ linux-3.4.48-vs2.3.3.9/include/linux/major.h 2012-05-21 16:15:05.000000000 +0000 8609--- a/include/linux/major.h
8610+++ b/include/linux/major.h
8419@@ -15,6 +15,7 @@ 8611@@ -15,6 +15,7 @@
8420 #define HD_MAJOR IDE0_MAJOR 8612 #define HD_MAJOR IDE0_MAJOR
8421 #define PTY_SLAVE_MAJOR 3 8613 #define PTY_SLAVE_MAJOR 3
@@ -8424,10 +8616,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/major.h linux-3.4.48-vs2.3.3.9/
8424 #define TTYAUX_MAJOR 5 8616 #define TTYAUX_MAJOR 5
8425 #define LP_MAJOR 6 8617 #define LP_MAJOR 6
8426 #define VCS_MAJOR 7 8618 #define VCS_MAJOR 7
8427diff -NurpP --minimal linux-3.4.48/include/linux/memcontrol.h linux-3.4.48-vs2.3.3.9/include/linux/memcontrol.h 8619diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
8428--- linux-3.4.48/include/linux/memcontrol.h 2012-05-21 16:07:31.000000000 +0000 8620index f94efd2..8396eb5 100644
8429+++ linux-3.4.48-vs2.3.3.9/include/linux/memcontrol.h 2012-05-21 16:15:05.000000000 +0000 8621--- a/include/linux/memcontrol.h
8430@@ -88,6 +88,13 @@ extern struct mem_cgroup *try_get_mem_cg 8622+++ b/include/linux/memcontrol.h
8623@@ -88,6 +88,13 @@ extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
8431 extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); 8624 extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
8432 extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); 8625 extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
8433 8626
@@ -8441,9 +8634,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/memcontrol.h linux-3.4.48-vs2.3
8441 static inline 8634 static inline
8442 int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) 8635 int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
8443 { 8636 {
8444diff -NurpP --minimal linux-3.4.48/include/linux/mm_types.h linux-3.4.48-vs2.3.3.9/include/linux/mm_types.h 8637diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
8445--- linux-3.4.48/include/linux/mm_types.h 2013-06-13 08:59:36.000000000 +0000 8638index b35752f..c8a5869 100644
8446+++ linux-3.4.48-vs2.3.3.9/include/linux/mm_types.h 2012-07-17 22:29:43.000000000 +0000 8639--- a/include/linux/mm_types.h
8640+++ b/include/linux/mm_types.h
8447@@ -353,6 +353,7 @@ struct mm_struct { 8641@@ -353,6 +353,7 @@ struct mm_struct {
8448 8642
8449 /* Architecture-specific MM context */ 8643 /* Architecture-specific MM context */
@@ -8452,9 +8646,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/mm_types.h linux-3.4.48-vs2.3.3
8452 8646
8453 /* Swap token stuff */ 8647 /* Swap token stuff */
8454 /* 8648 /*
8455diff -NurpP --minimal linux-3.4.48/include/linux/mmzone.h linux-3.4.48-vs2.3.3.9/include/linux/mmzone.h 8649diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
8456--- linux-3.4.48/include/linux/mmzone.h 2013-06-13 08:59:36.000000000 +0000 8650index 5f6806b..cc90e9c 100644
8457+++ linux-3.4.48-vs2.3.3.9/include/linux/mmzone.h 2012-07-17 22:29:43.000000000 +0000 8651--- a/include/linux/mmzone.h
8652+++ b/include/linux/mmzone.h
8458@@ -684,6 +684,13 @@ typedef struct pglist_data { 8653@@ -684,6 +684,13 @@ typedef struct pglist_data {
8459 __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ 8654 __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
8460 }) 8655 })
@@ -8469,9 +8664,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/mmzone.h linux-3.4.48-vs2.3.3.9
8469 #include <linux/memory_hotplug.h> 8664 #include <linux/memory_hotplug.h>
8470 8665
8471 extern struct mutex zonelists_mutex; 8666 extern struct mutex zonelists_mutex;
8472diff -NurpP --minimal linux-3.4.48/include/linux/mount.h linux-3.4.48-vs2.3.3.9/include/linux/mount.h 8667diff --git a/include/linux/mount.h b/include/linux/mount.h
8473--- linux-3.4.48/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000 8668index d7029f4..1e76e26 100644
8474+++ linux-3.4.48-vs2.3.3.9/include/linux/mount.h 2012-05-21 16:15:05.000000000 +0000 8669--- a/include/linux/mount.h
8670+++ b/include/linux/mount.h
8475@@ -47,6 +47,9 @@ struct mnt_namespace; 8671@@ -47,6 +47,9 @@ struct mnt_namespace;
8476 8672
8477 #define MNT_INTERNAL 0x4000 8673 #define MNT_INTERNAL 0x4000
@@ -8482,9 +8678,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/mount.h linux-3.4.48-vs2.3.3.9/
8482 struct vfsmount { 8678 struct vfsmount {
8483 struct dentry *mnt_root; /* root of the mounted tree */ 8679 struct dentry *mnt_root; /* root of the mounted tree */
8484 struct super_block *mnt_sb; /* pointer to superblock */ 8680 struct super_block *mnt_sb; /* pointer to superblock */
8485diff -NurpP --minimal linux-3.4.48/include/linux/net.h linux-3.4.48-vs2.3.3.9/include/linux/net.h 8681diff --git a/include/linux/net.h b/include/linux/net.h
8486--- linux-3.4.48/include/linux/net.h 2013-06-13 08:59:36.000000000 +0000 8682index 95fea14..0a95dd7 100644
8487+++ linux-3.4.48-vs2.3.3.9/include/linux/net.h 2012-09-01 08:51:18.000000000 +0000 8683--- a/include/linux/net.h
8684+++ b/include/linux/net.h
8488@@ -73,6 +73,7 @@ struct net; 8685@@ -73,6 +73,7 @@ struct net;
8489 #define SOCK_PASSCRED 3 8686 #define SOCK_PASSCRED 3
8490 #define SOCK_PASSSEC 4 8687 #define SOCK_PASSSEC 4
@@ -8493,10 +8690,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/net.h linux-3.4.48-vs2.3.3.9/in
8493 8690
8494 #ifndef ARCH_HAS_SOCKET_TYPES 8691 #ifndef ARCH_HAS_SOCKET_TYPES
8495 /** 8692 /**
8496diff -NurpP --minimal linux-3.4.48/include/linux/netdevice.h linux-3.4.48-vs2.3.3.9/include/linux/netdevice.h 8693diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
8497--- linux-3.4.48/include/linux/netdevice.h 2013-06-13 08:59:36.000000000 +0000 8694index dc6c687..6f626d6 100644
8498+++ linux-3.4.48-vs2.3.3.9/include/linux/netdevice.h 2013-06-13 09:46:39.000000000 +0000 8695--- a/include/linux/netdevice.h
8499@@ -1624,6 +1624,7 @@ extern void netdev_resync_ops(struct ne 8696+++ b/include/linux/netdevice.h
8697@@ -1624,6 +1624,7 @@ extern void netdev_resync_ops(struct net_device *dev);
8500 8698
8501 extern struct net_device *dev_get_by_index(struct net *net, int ifindex); 8699 extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
8502 extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); 8700 extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
@@ -8504,9 +8702,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/netdevice.h linux-3.4.48-vs2.3.
8504 extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); 8702 extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
8505 extern int dev_restart(struct net_device *dev); 8703 extern int dev_restart(struct net_device *dev);
8506 #ifdef CONFIG_NETPOLL_TRAP 8704 #ifdef CONFIG_NETPOLL_TRAP
8507diff -NurpP --minimal linux-3.4.48/include/linux/nfs_mount.h linux-3.4.48-vs2.3.3.9/include/linux/nfs_mount.h 8705diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h
8508--- linux-3.4.48/include/linux/nfs_mount.h 2011-01-05 20:50:31.000000000 +0000 8706index 576bddd..341f621 100644
8509+++ linux-3.4.48-vs2.3.3.9/include/linux/nfs_mount.h 2012-05-21 16:15:05.000000000 +0000 8707--- a/include/linux/nfs_mount.h
8708+++ b/include/linux/nfs_mount.h
8510@@ -63,7 +63,8 @@ struct nfs_mount_data { 8709@@ -63,7 +63,8 @@ struct nfs_mount_data {
8511 #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ 8710 #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
8512 #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ 8711 #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -8517,9 +8716,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/nfs_mount.h linux-3.4.48-vs2.3.
8517 8716
8518 /* The following are for internal use only */ 8717 /* The following are for internal use only */
8519 #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 8718 #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
8520diff -NurpP --minimal linux-3.4.48/include/linux/nsproxy.h linux-3.4.48-vs2.3.3.9/include/linux/nsproxy.h 8719diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
8521--- linux-3.4.48/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000 8720index cc37a55..e995dde 100644
8522+++ linux-3.4.48-vs2.3.3.9/include/linux/nsproxy.h 2012-05-21 16:15:05.000000000 +0000 8721--- a/include/linux/nsproxy.h
8722+++ b/include/linux/nsproxy.h
8523@@ -3,6 +3,7 @@ 8723@@ -3,6 +3,7 @@
8524 8724
8525 #include <linux/spinlock.h> 8725 #include <linux/spinlock.h>
@@ -8528,7 +8728,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/nsproxy.h linux-3.4.48-vs2.3.3.
8528 8728
8529 struct mnt_namespace; 8729 struct mnt_namespace;
8530 struct uts_namespace; 8730 struct uts_namespace;
8531@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro 8731@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nsproxy(struct task_struct *tsk)
8532 } 8732 }
8533 8733
8534 int copy_namespaces(unsigned long flags, struct task_struct *tsk); 8734 int copy_namespaces(unsigned long flags, struct task_struct *tsk);
@@ -8536,7 +8736,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/nsproxy.h linux-3.4.48-vs2.3.3.
8536 void exit_task_namespaces(struct task_struct *tsk); 8736 void exit_task_namespaces(struct task_struct *tsk);
8537 void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new); 8737 void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
8538 void free_nsproxy(struct nsproxy *ns); 8738 void free_nsproxy(struct nsproxy *ns);
8539@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned 8739@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **,
8540 struct fs_struct *); 8740 struct fs_struct *);
8541 int __init nsproxy_cache_init(void); 8741 int __init nsproxy_cache_init(void);
8542 8742
@@ -8569,9 +8769,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/nsproxy.h linux-3.4.48-vs2.3.3.
8569 } 8769 }
8570 8770
8571 #endif 8771 #endif
8572diff -NurpP --minimal linux-3.4.48/include/linux/pid.h linux-3.4.48-vs2.3.3.9/include/linux/pid.h 8772diff --git a/include/linux/pid.h b/include/linux/pid.h
8573--- linux-3.4.48/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000 8773index b152d44..b08d451 100644
8574+++ linux-3.4.48-vs2.3.3.9/include/linux/pid.h 2012-05-21 16:15:05.000000000 +0000 8774--- a/include/linux/pid.h
8775+++ b/include/linux/pid.h
8575@@ -8,7 +8,8 @@ enum pid_type 8776@@ -8,7 +8,8 @@ enum pid_type
8576 PIDTYPE_PID, 8777 PIDTYPE_PID,
8577 PIDTYPE_PGID, 8778 PIDTYPE_PGID,
@@ -8582,7 +8783,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/pid.h linux-3.4.48-vs2.3.3.9/in
8582 }; 8783 };
8583 8784
8584 /* 8785 /*
8585@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p 8786@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *pid)
8586 } 8787 }
8587 8788
8588 pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns); 8789 pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
@@ -8590,9 +8791,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/pid.h linux-3.4.48-vs2.3.3.9/in
8590 pid_t pid_vnr(struct pid *pid); 8791 pid_t pid_vnr(struct pid *pid);
8591 8792
8592 #define do_each_pid_task(pid, type, task) \ 8793 #define do_each_pid_task(pid, type, task) \
8593diff -NurpP --minimal linux-3.4.48/include/linux/proc_fs.h linux-3.4.48-vs2.3.3.9/include/linux/proc_fs.h 8794diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
8594--- linux-3.4.48/include/linux/proc_fs.h 2012-03-19 18:47:28.000000000 +0000 8795index 85c5073..2b8bce2 100644
8595+++ linux-3.4.48-vs2.3.3.9/include/linux/proc_fs.h 2012-05-21 16:15:05.000000000 +0000 8796--- a/include/linux/proc_fs.h
8797+++ b/include/linux/proc_fs.h
8596@@ -54,6 +54,7 @@ struct proc_dir_entry { 8798@@ -54,6 +54,7 @@ struct proc_dir_entry {
8597 nlink_t nlink; 8799 nlink_t nlink;
8598 uid_t uid; 8800 uid_t uid;
@@ -8601,7 +8803,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/proc_fs.h linux-3.4.48-vs2.3.3.
8601 loff_t size; 8803 loff_t size;
8602 const struct inode_operations *proc_iops; 8804 const struct inode_operations *proc_iops;
8603 /* 8805 /*
8604@@ -252,12 +253,18 @@ extern const struct proc_ns_operations n 8806@@ -252,12 +253,18 @@ extern const struct proc_ns_operations netns_operations;
8605 extern const struct proc_ns_operations utsns_operations; 8807 extern const struct proc_ns_operations utsns_operations;
8606 extern const struct proc_ns_operations ipcns_operations; 8808 extern const struct proc_ns_operations ipcns_operations;
8607 8809
@@ -8628,9 +8830,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/proc_fs.h linux-3.4.48-vs2.3.3.
8628 int fd; 8830 int fd;
8629 union proc_op op; 8831 union proc_op op;
8630 struct proc_dir_entry *pde; 8832 struct proc_dir_entry *pde;
8631diff -NurpP --minimal linux-3.4.48/include/linux/quotaops.h linux-3.4.48-vs2.3.3.9/include/linux/quotaops.h 8833diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
8632--- linux-3.4.48/include/linux/quotaops.h 2012-01-09 15:14:58.000000000 +0000 8834index d93f95e..1851154 100644
8633+++ linux-3.4.48-vs2.3.3.9/include/linux/quotaops.h 2012-05-21 16:15:05.000000000 +0000 8835--- a/include/linux/quotaops.h
8836+++ b/include/linux/quotaops.h
8634@@ -8,6 +8,7 @@ 8837@@ -8,6 +8,7 @@
8635 #define _LINUX_QUOTAOPS_ 8838 #define _LINUX_QUOTAOPS_
8636 8839
@@ -8639,7 +8842,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/quotaops.h linux-3.4.48-vs2.3.3
8639 8842
8640 #define DQUOT_SPACE_WARN 0x1 8843 #define DQUOT_SPACE_WARN 0x1
8641 #define DQUOT_SPACE_RESERVE 0x2 8844 #define DQUOT_SPACE_RESERVE 0x2
8642@@ -204,11 +205,12 @@ static inline void dquot_drop(struct ino 8845@@ -204,11 +205,12 @@ static inline void dquot_drop(struct inode *inode)
8643 8846
8644 static inline int dquot_alloc_inode(const struct inode *inode) 8847 static inline int dquot_alloc_inode(const struct inode *inode)
8645 { 8848 {
@@ -8653,7 +8856,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/quotaops.h linux-3.4.48-vs2.3.3
8653 } 8856 }
8654 8857
8655 static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) 8858 static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
8656@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct 8859@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
8657 static inline int __dquot_alloc_space(struct inode *inode, qsize_t number, 8860 static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
8658 int flags) 8861 int flags)
8659 { 8862 {
@@ -8664,7 +8867,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/quotaops.h linux-3.4.48-vs2.3.3
8664 if (!(flags & DQUOT_SPACE_RESERVE)) 8867 if (!(flags & DQUOT_SPACE_RESERVE))
8665 inode_add_bytes(inode, number); 8868 inode_add_bytes(inode, number);
8666 return 0; 8869 return 0;
8667@@ -229,6 +235,7 @@ static inline void __dquot_free_space(st 8870@@ -229,6 +235,7 @@ static inline void __dquot_free_space(struct inode *inode, qsize_t number,
8668 { 8871 {
8669 if (!(flags & DQUOT_SPACE_RESERVE)) 8872 if (!(flags & DQUOT_SPACE_RESERVE))
8670 inode_sub_bytes(inode, number); 8873 inode_sub_bytes(inode, number);
@@ -8672,9 +8875,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/quotaops.h linux-3.4.48-vs2.3.3
8672 } 8875 }
8673 8876
8674 static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) 8877 static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
8675diff -NurpP --minimal linux-3.4.48/include/linux/reboot.h linux-3.4.48-vs2.3.3.9/include/linux/reboot.h 8878diff --git a/include/linux/reboot.h b/include/linux/reboot.h
8676--- linux-3.4.48/include/linux/reboot.h 2011-10-24 16:45:32.000000000 +0000 8879index e0879a7..5a521db 100644
8677+++ linux-3.4.48-vs2.3.3.9/include/linux/reboot.h 2012-05-21 16:15:05.000000000 +0000 8880--- a/include/linux/reboot.h
8881+++ b/include/linux/reboot.h
8678@@ -33,6 +33,7 @@ 8882@@ -33,6 +33,7 @@
8679 #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 8883 #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
8680 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 8884 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -8683,9 +8887,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/reboot.h linux-3.4.48-vs2.3.3.9
8683 8887
8684 8888
8685 #ifdef __KERNEL__ 8889 #ifdef __KERNEL__
8686diff -NurpP --minimal linux-3.4.48/include/linux/sched.h linux-3.4.48-vs2.3.3.9/include/linux/sched.h 8890diff --git a/include/linux/sched.h b/include/linux/sched.h
8687--- linux-3.4.48/include/linux/sched.h 2013-06-13 08:59:36.000000000 +0000 8891index 3dd0efb..1176aa9 100644
8688+++ linux-3.4.48-vs2.3.3.9/include/linux/sched.h 2013-02-11 23:37:30.000000000 +0000 8892--- a/include/linux/sched.h
8893+++ b/include/linux/sched.h
8689@@ -1455,6 +1455,14 @@ struct task_struct { 8894@@ -1455,6 +1455,14 @@ struct task_struct {
8690 #endif 8895 #endif
8691 seccomp_t seccomp; 8896 seccomp_t seccomp;
@@ -8713,7 +8918,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/sched.h linux-3.4.48-vs2.3.3.9/
8713 static inline pid_t task_pid_nr(struct task_struct *tsk) 8918 static inline pid_t task_pid_nr(struct task_struct *tsk)
8714 { 8919 {
8715 return tsk->pid; 8920 return tsk->pid;
8716@@ -1712,7 +1725,8 @@ static inline pid_t task_pid_nr_ns(struc 8921@@ -1712,7 +1725,8 @@ static inline pid_t task_pid_nr_ns(struct task_struct *tsk,
8717 8922
8718 static inline pid_t task_pid_vnr(struct task_struct *tsk) 8923 static inline pid_t task_pid_vnr(struct task_struct *tsk)
8719 { 8924 {
@@ -8723,7 +8928,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/sched.h linux-3.4.48-vs2.3.3.9/
8723 } 8928 }
8724 8929
8725 8930
8726@@ -1725,7 +1739,7 @@ pid_t task_tgid_nr_ns(struct task_struct 8931@@ -1725,7 +1739,7 @@ pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns);
8727 8932
8728 static inline pid_t task_tgid_vnr(struct task_struct *tsk) 8933 static inline pid_t task_tgid_vnr(struct task_struct *tsk)
8729 { 8934 {
@@ -8732,9 +8937,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/sched.h linux-3.4.48-vs2.3.3.9/
8732 } 8937 }
8733 8938
8734 8939
8735diff -NurpP --minimal linux-3.4.48/include/linux/shmem_fs.h linux-3.4.48-vs2.3.3.9/include/linux/shmem_fs.h 8940diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
8736--- linux-3.4.48/include/linux/shmem_fs.h 2012-03-19 18:47:29.000000000 +0000 8941index 79ab255..952ffa6 100644
8737+++ linux-3.4.48-vs2.3.3.9/include/linux/shmem_fs.h 2012-05-21 16:15:05.000000000 +0000 8942--- a/include/linux/shmem_fs.h
8943+++ b/include/linux/shmem_fs.h
8738@@ -8,6 +8,9 @@ 8944@@ -8,6 +8,9 @@
8739 8945
8740 /* inode in-kernel data */ 8946 /* inode in-kernel data */
@@ -8745,9 +8951,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/shmem_fs.h linux-3.4.48-vs2.3.3
8745 struct shmem_inode_info { 8951 struct shmem_inode_info {
8746 spinlock_t lock; 8952 spinlock_t lock;
8747 unsigned long flags; 8953 unsigned long flags;
8748diff -NurpP --minimal linux-3.4.48/include/linux/stat.h linux-3.4.48-vs2.3.3.9/include/linux/stat.h 8954diff --git a/include/linux/stat.h b/include/linux/stat.h
8749--- linux-3.4.48/include/linux/stat.h 2008-12-24 23:26:37.000000000 +0000 8955index 611c398..784c0c3 100644
8750+++ linux-3.4.48-vs2.3.3.9/include/linux/stat.h 2012-05-21 16:15:05.000000000 +0000 8956--- a/include/linux/stat.h
8957+++ b/include/linux/stat.h
8751@@ -66,6 +66,7 @@ struct kstat { 8958@@ -66,6 +66,7 @@ struct kstat {
8752 unsigned int nlink; 8959 unsigned int nlink;
8753 uid_t uid; 8960 uid_t uid;
@@ -8756,9 +8963,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/stat.h linux-3.4.48-vs2.3.3.9/i
8756 dev_t rdev; 8963 dev_t rdev;
8757 loff_t size; 8964 loff_t size;
8758 struct timespec atime; 8965 struct timespec atime;
8759diff -NurpP --minimal linux-3.4.48/include/linux/sunrpc/auth.h linux-3.4.48-vs2.3.3.9/include/linux/sunrpc/auth.h 8966diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
8760--- linux-3.4.48/include/linux/sunrpc/auth.h 2012-05-21 16:07:32.000000000 +0000 8967index 492a36d..f44bf1c 100644
8761+++ linux-3.4.48-vs2.3.3.9/include/linux/sunrpc/auth.h 2012-05-21 16:15:05.000000000 +0000 8968--- a/include/linux/sunrpc/auth.h
8969+++ b/include/linux/sunrpc/auth.h
8762@@ -25,6 +25,7 @@ 8970@@ -25,6 +25,7 @@
8763 struct auth_cred { 8971 struct auth_cred {
8764 uid_t uid; 8972 uid_t uid;
@@ -8767,9 +8975,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/sunrpc/auth.h linux-3.4.48-vs2.
8767 struct group_info *group_info; 8975 struct group_info *group_info;
8768 const char *principal; 8976 const char *principal;
8769 unsigned char machine_cred : 1; 8977 unsigned char machine_cred : 1;
8770diff -NurpP --minimal linux-3.4.48/include/linux/sunrpc/clnt.h linux-3.4.48-vs2.3.3.9/include/linux/sunrpc/clnt.h 8978diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
8771--- linux-3.4.48/include/linux/sunrpc/clnt.h 2012-05-21 16:07:32.000000000 +0000 8979index 523547e..ab51e50 100644
8772+++ linux-3.4.48-vs2.3.3.9/include/linux/sunrpc/clnt.h 2012-05-21 16:15:05.000000000 +0000 8980--- a/include/linux/sunrpc/clnt.h
8981+++ b/include/linux/sunrpc/clnt.h
8773@@ -49,7 +49,8 @@ struct rpc_clnt { 8982@@ -49,7 +49,8 @@ struct rpc_clnt {
8774 unsigned int cl_softrtry : 1,/* soft timeouts */ 8983 unsigned int cl_softrtry : 1,/* soft timeouts */
8775 cl_discrtry : 1,/* disconnect before retry */ 8984 cl_discrtry : 1,/* disconnect before retry */
@@ -8780,9 +8989,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/sunrpc/clnt.h linux-3.4.48-vs2.
8780 8989
8781 struct rpc_rtt * cl_rtt; /* RTO estimator data */ 8990 struct rpc_rtt * cl_rtt; /* RTO estimator data */
8782 const struct rpc_timeout *cl_timeout; /* Timeout strategy */ 8991 const struct rpc_timeout *cl_timeout; /* Timeout strategy */
8783diff -NurpP --minimal linux-3.4.48/include/linux/sysctl.h linux-3.4.48-vs2.3.3.9/include/linux/sysctl.h 8992diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
8784--- linux-3.4.48/include/linux/sysctl.h 2012-05-21 16:07:32.000000000 +0000 8993index c34b4c8..782b12d 100644
8785+++ linux-3.4.48-vs2.3.3.9/include/linux/sysctl.h 2012-05-21 16:15:05.000000000 +0000 8994--- a/include/linux/sysctl.h
8995+++ b/include/linux/sysctl.h
8786@@ -60,6 +60,7 @@ enum 8996@@ -60,6 +60,7 @@ enum
8787 CTL_ABI=9, /* Binary emulation */ 8997 CTL_ABI=9, /* Binary emulation */
8788 CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ 8998 CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -8799,9 +9009,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/sysctl.h linux-3.4.48-vs2.3.3.9
8799 9009
8800 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ 9010 KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
8801 KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ 9011 KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
8802diff -NurpP --minimal linux-3.4.48/include/linux/sysfs.h linux-3.4.48-vs2.3.3.9/include/linux/sysfs.h 9012diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
8803--- linux-3.4.48/include/linux/sysfs.h 2012-03-19 18:47:29.000000000 +0000 9013index 0010009..ccfd222 100644
8804+++ linux-3.4.48-vs2.3.3.9/include/linux/sysfs.h 2012-05-21 16:15:05.000000000 +0000 9014--- a/include/linux/sysfs.h
9015+++ b/include/linux/sysfs.h
8805@@ -19,6 +19,8 @@ 9016@@ -19,6 +19,8 @@
8806 #include <linux/kobject_ns.h> 9017 #include <linux/kobject_ns.h>
8807 #include <linux/atomic.h> 9018 #include <linux/atomic.h>
@@ -8811,10 +9022,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/sysfs.h linux-3.4.48-vs2.3.3.9/
8811 struct kobject; 9022 struct kobject;
8812 struct module; 9023 struct module;
8813 enum kobj_ns_type; 9024 enum kobj_ns_type;
8814diff -NurpP --minimal linux-3.4.48/include/linux/time.h linux-3.4.48-vs2.3.3.9/include/linux/time.h 9025diff --git a/include/linux/time.h b/include/linux/time.h
8815--- linux-3.4.48/include/linux/time.h 2013-06-13 08:59:36.000000000 +0000 9026index 03dce74..a119348 100644
8816+++ linux-3.4.48-vs2.3.3.9/include/linux/time.h 2012-10-22 13:09:53.000000000 +0000 9027--- a/include/linux/time.h
8817@@ -281,6 +281,8 @@ static __always_inline void timespec_add 9028+++ b/include/linux/time.h
9029@@ -281,6 +281,8 @@ static __always_inline void timespec_add_ns(struct timespec *a, u64 ns)
8818 a->tv_nsec = ns; 9030 a->tv_nsec = ns;
8819 } 9031 }
8820 9032
@@ -8823,9 +9035,10 @@ diff -NurpP --minimal linux-3.4.48/include/linux/time.h linux-3.4.48-vs2.3.3.9/i
8823 #endif /* __KERNEL__ */ 9035 #endif /* __KERNEL__ */
8824 9036
8825 /* 9037 /*
8826diff -NurpP --minimal linux-3.4.48/include/linux/types.h linux-3.4.48-vs2.3.3.9/include/linux/types.h 9038diff --git a/include/linux/types.h b/include/linux/types.h
8827--- linux-3.4.48/include/linux/types.h 2012-05-21 16:07:32.000000000 +0000 9039index 7f480db..d417422 100644
8828+++ linux-3.4.48-vs2.3.3.9/include/linux/types.h 2012-05-21 16:15:05.000000000 +0000 9040--- a/include/linux/types.h
9041+++ b/include/linux/types.h
8829@@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t; 9042@@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t;
8830 typedef __kernel_gid32_t gid_t; 9043 typedef __kernel_gid32_t gid_t;
8831 typedef __kernel_uid16_t uid16_t; 9044 typedef __kernel_uid16_t uid16_t;
@@ -8836,10 +9049,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/types.h linux-3.4.48-vs2.3.3.9/
8836 9049
8837 typedef unsigned long uintptr_t; 9050 typedef unsigned long uintptr_t;
8838 9051
8839diff -NurpP --minimal linux-3.4.48/include/linux/utsname.h linux-3.4.48-vs2.3.3.9/include/linux/utsname.h 9052diff --git a/include/linux/utsname.h b/include/linux/utsname.h
8840--- linux-3.4.48/include/linux/utsname.h 2012-01-09 15:14:59.000000000 +0000 9053index c714ed7..0197b43 100644
8841+++ linux-3.4.48-vs2.3.3.9/include/linux/utsname.h 2012-05-21 16:15:05.000000000 +0000 9054--- a/include/linux/utsname.h
8842@@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts 9055+++ b/include/linux/utsname.h
9056@@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts_namespace *ns)
8843 } 9057 }
8844 9058
8845 extern struct uts_namespace *copy_utsname(unsigned long flags, 9059 extern struct uts_namespace *copy_utsname(unsigned long flags,
@@ -8849,7 +9063,7 @@ diff -NurpP --minimal linux-3.4.48/include/linux/utsname.h linux-3.4.48-vs2.3.3.
8849 extern void free_uts_ns(struct kref *kref); 9063 extern void free_uts_ns(struct kref *kref);
8850 9064
8851 static inline void put_uts_ns(struct uts_namespace *ns) 9065 static inline void put_uts_ns(struct uts_namespace *ns)
8852@@ -79,12 +80,13 @@ static inline void put_uts_ns(struct uts 9066@@ -79,12 +80,13 @@ static inline void put_uts_ns(struct uts_namespace *ns)
8853 } 9067 }
8854 9068
8855 static inline struct uts_namespace *copy_utsname(unsigned long flags, 9069 static inline struct uts_namespace *copy_utsname(unsigned long flags,
@@ -8865,9 +9079,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/utsname.h linux-3.4.48-vs2.3.3.
8865 } 9079 }
8866 #endif 9080 #endif
8867 9081
8868diff -NurpP --minimal linux-3.4.48/include/linux/vroot.h linux-3.4.48-vs2.3.3.9/include/linux/vroot.h 9082diff --git a/include/linux/vroot.h b/include/linux/vroot.h
8869--- linux-3.4.48/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 9083new file mode 100644
8870+++ linux-3.4.48-vs2.3.3.9/include/linux/vroot.h 2012-05-21 16:15:05.000000000 +0000 9084index 0000000..5e1d797
9085--- /dev/null
9086+++ b/include/linux/vroot.h
8871@@ -0,0 +1,51 @@ 9087@@ -0,0 +1,51 @@
8872+ 9088+
8873+/* 9089+/*
@@ -8920,9 +9136,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vroot.h linux-3.4.48-vs2.3.3.9/
8920+#define VROOT_CLR_DEV 0x5601 9136+#define VROOT_CLR_DEV 0x5601
8921+ 9137+
8922+#endif /* _LINUX_VROOT_H */ 9138+#endif /* _LINUX_VROOT_H */
8923diff -NurpP --minimal linux-3.4.48/include/linux/vs_base.h linux-3.4.48-vs2.3.3.9/include/linux/vs_base.h 9139diff --git a/include/linux/vs_base.h b/include/linux/vs_base.h
8924--- linux-3.4.48/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 9140new file mode 100644
8925+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_base.h 2012-05-21 16:15:05.000000000 +0000 9141index 0000000..cb0ce81
9142--- /dev/null
9143+++ b/include/linux/vs_base.h
8926@@ -0,0 +1,10 @@ 9144@@ -0,0 +1,10 @@
8927+#ifndef _VS_BASE_H 9145+#ifndef _VS_BASE_H
8928+#define _VS_BASE_H 9146+#define _VS_BASE_H
@@ -8934,9 +9152,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_base.h linux-3.4.48-vs2.3.3.
8934+#else 9152+#else
8935+#warning duplicate inclusion 9153+#warning duplicate inclusion
8936+#endif 9154+#endif
8937diff -NurpP --minimal linux-3.4.48/include/linux/vs_context.h linux-3.4.48-vs2.3.3.9/include/linux/vs_context.h 9155diff --git a/include/linux/vs_context.h b/include/linux/vs_context.h
8938--- linux-3.4.48/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 9156new file mode 100644
8939+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_context.h 2012-05-21 16:15:05.000000000 +0000 9157index 0000000..5848095
9158--- /dev/null
9159+++ b/include/linux/vs_context.h
8940@@ -0,0 +1,242 @@ 9160@@ -0,0 +1,242 @@
8941+#ifndef _VS_CONTEXT_H 9161+#ifndef _VS_CONTEXT_H
8942+#define _VS_CONTEXT_H 9162+#define _VS_CONTEXT_H
@@ -9180,9 +9400,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_context.h linux-3.4.48-vs2.3
9180+#else 9400+#else
9181+#warning duplicate inclusion 9401+#warning duplicate inclusion
9182+#endif 9402+#endif
9183diff -NurpP --minimal linux-3.4.48/include/linux/vs_cowbl.h linux-3.4.48-vs2.3.3.9/include/linux/vs_cowbl.h 9403diff --git a/include/linux/vs_cowbl.h b/include/linux/vs_cowbl.h
9184--- linux-3.4.48/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 9404new file mode 100644
9185+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_cowbl.h 2012-05-21 16:15:05.000000000 +0000 9405index 0000000..1ac1bf2
9406--- /dev/null
9407+++ b/include/linux/vs_cowbl.h
9186@@ -0,0 +1,48 @@ 9408@@ -0,0 +1,48 @@
9187+#ifndef _VS_COWBL_H 9409+#ifndef _VS_COWBL_H
9188+#define _VS_COWBL_H 9410+#define _VS_COWBL_H
@@ -9232,9 +9454,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_cowbl.h linux-3.4.48-vs2.3.3
9232+#else 9454+#else
9233+#warning duplicate inclusion 9455+#warning duplicate inclusion
9234+#endif 9456+#endif
9235diff -NurpP --minimal linux-3.4.48/include/linux/vs_cvirt.h linux-3.4.48-vs2.3.3.9/include/linux/vs_cvirt.h 9457diff --git a/include/linux/vs_cvirt.h b/include/linux/vs_cvirt.h
9236--- linux-3.4.48/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 9458new file mode 100644
9237+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_cvirt.h 2012-05-21 16:15:05.000000000 +0000 9459index 0000000..310af24
9460--- /dev/null
9461+++ b/include/linux/vs_cvirt.h
9238@@ -0,0 +1,50 @@ 9462@@ -0,0 +1,50 @@
9239+#ifndef _VS_CVIRT_H 9463+#ifndef _VS_CVIRT_H
9240+#define _VS_CVIRT_H 9464+#define _VS_CVIRT_H
@@ -9286,9 +9510,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_cvirt.h linux-3.4.48-vs2.3.3
9286+#else 9510+#else
9287+#warning duplicate inclusion 9511+#warning duplicate inclusion
9288+#endif 9512+#endif
9289diff -NurpP --minimal linux-3.4.48/include/linux/vs_device.h linux-3.4.48-vs2.3.3.9/include/linux/vs_device.h 9513diff --git a/include/linux/vs_device.h b/include/linux/vs_device.h
9290--- linux-3.4.48/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 9514new file mode 100644
9291+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_device.h 2012-05-21 16:15:05.000000000 +0000 9515index 0000000..8e2f043
9516--- /dev/null
9517+++ b/include/linux/vs_device.h
9292@@ -0,0 +1,45 @@ 9518@@ -0,0 +1,45 @@
9293+#ifndef _VS_DEVICE_H 9519+#ifndef _VS_DEVICE_H
9294+#define _VS_DEVICE_H 9520+#define _VS_DEVICE_H
@@ -9335,9 +9561,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_device.h linux-3.4.48-vs2.3.
9335+#else 9561+#else
9336+#warning duplicate inclusion 9562+#warning duplicate inclusion
9337+#endif 9563+#endif
9338diff -NurpP --minimal linux-3.4.48/include/linux/vs_dlimit.h linux-3.4.48-vs2.3.3.9/include/linux/vs_dlimit.h 9564diff --git a/include/linux/vs_dlimit.h b/include/linux/vs_dlimit.h
9339--- linux-3.4.48/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 9565new file mode 100644
9340+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_dlimit.h 2012-05-21 16:15:05.000000000 +0000 9566index 0000000..8b0b33b
9567--- /dev/null
9568+++ b/include/linux/vs_dlimit.h
9341@@ -0,0 +1,215 @@ 9569@@ -0,0 +1,215 @@
9342+#ifndef _VS_DLIMIT_H 9570+#ifndef _VS_DLIMIT_H
9343+#define _VS_DLIMIT_H 9571+#define _VS_DLIMIT_H
@@ -9554,9 +9782,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_dlimit.h linux-3.4.48-vs2.3.
9554+#else 9782+#else
9555+#warning duplicate inclusion 9783+#warning duplicate inclusion
9556+#endif 9784+#endif
9557diff -NurpP --minimal linux-3.4.48/include/linux/vs_inet.h linux-3.4.48-vs2.3.3.9/include/linux/vs_inet.h 9785diff --git a/include/linux/vs_inet.h b/include/linux/vs_inet.h
9558--- linux-3.4.48/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 9786new file mode 100644
9559+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_inet.h 2012-05-21 16:15:05.000000000 +0000 9787index 0000000..7c8e02b
9788--- /dev/null
9789+++ b/include/linux/vs_inet.h
9560@@ -0,0 +1,353 @@ 9790@@ -0,0 +1,353 @@
9561+#ifndef _VS_INET_H 9791+#ifndef _VS_INET_H
9562+#define _VS_INET_H 9792+#define _VS_INET_H
@@ -9911,9 +10141,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_inet.h linux-3.4.48-vs2.3.3.
9911+#else 10141+#else
9912+// #warning duplicate inclusion 10142+// #warning duplicate inclusion
9913+#endif 10143+#endif
9914diff -NurpP --minimal linux-3.4.48/include/linux/vs_inet6.h linux-3.4.48-vs2.3.3.9/include/linux/vs_inet6.h 10144diff --git a/include/linux/vs_inet6.h b/include/linux/vs_inet6.h
9915--- linux-3.4.48/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 10145new file mode 100644
9916+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_inet6.h 2012-05-21 16:15:05.000000000 +0000 10146index 0000000..70f797b
10147--- /dev/null
10148+++ b/include/linux/vs_inet6.h
9917@@ -0,0 +1,246 @@ 10149@@ -0,0 +1,246 @@
9918+#ifndef _VS_INET6_H 10150+#ifndef _VS_INET6_H
9919+#define _VS_INET6_H 10151+#define _VS_INET6_H
@@ -10161,9 +10393,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_inet6.h linux-3.4.48-vs2.3.3
10161+#else 10393+#else
10162+#warning duplicate inclusion 10394+#warning duplicate inclusion
10163+#endif 10395+#endif
10164diff -NurpP --minimal linux-3.4.48/include/linux/vs_limit.h linux-3.4.48-vs2.3.3.9/include/linux/vs_limit.h 10396diff --git a/include/linux/vs_limit.h b/include/linux/vs_limit.h
10165--- linux-3.4.48/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 10397new file mode 100644
10166+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_limit.h 2012-05-21 16:15:05.000000000 +0000 10398index 0000000..96b3b5a
10399--- /dev/null
10400+++ b/include/linux/vs_limit.h
10167@@ -0,0 +1,140 @@ 10401@@ -0,0 +1,140 @@
10168+#ifndef _VS_LIMIT_H 10402+#ifndef _VS_LIMIT_H
10169+#define _VS_LIMIT_H 10403+#define _VS_LIMIT_H
@@ -10305,9 +10539,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_limit.h linux-3.4.48-vs2.3.3
10305+#else 10539+#else
10306+#warning duplicate inclusion 10540+#warning duplicate inclusion
10307+#endif 10541+#endif
10308diff -NurpP --minimal linux-3.4.48/include/linux/vs_network.h linux-3.4.48-vs2.3.3.9/include/linux/vs_network.h 10542diff --git a/include/linux/vs_network.h b/include/linux/vs_network.h
10309--- linux-3.4.48/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 10543new file mode 100644
10310+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_network.h 2012-05-21 16:15:05.000000000 +0000 10544index 0000000..5bd3898
10545--- /dev/null
10546+++ b/include/linux/vs_network.h
10311@@ -0,0 +1,169 @@ 10547@@ -0,0 +1,169 @@
10312+#ifndef _NX_VS_NETWORK_H 10548+#ifndef _NX_VS_NETWORK_H
10313+#define _NX_VS_NETWORK_H 10549+#define _NX_VS_NETWORK_H
@@ -10478,9 +10714,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_network.h linux-3.4.48-vs2.3
10478+#else 10714+#else
10479+#warning duplicate inclusion 10715+#warning duplicate inclusion
10480+#endif 10716+#endif
10481diff -NurpP --minimal linux-3.4.48/include/linux/vs_pid.h linux-3.4.48-vs2.3.3.9/include/linux/vs_pid.h 10717diff --git a/include/linux/vs_pid.h b/include/linux/vs_pid.h
10482--- linux-3.4.48/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 10718new file mode 100644
10483+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_pid.h 2012-05-21 16:15:05.000000000 +0000 10719index 0000000..5b79fcd
10720--- /dev/null
10721+++ b/include/linux/vs_pid.h
10484@@ -0,0 +1,50 @@ 10722@@ -0,0 +1,50 @@
10485+#ifndef _VS_PID_H 10723+#ifndef _VS_PID_H
10486+#define _VS_PID_H 10724+#define _VS_PID_H
@@ -10532,9 +10770,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_pid.h linux-3.4.48-vs2.3.3.9
10532+#else 10770+#else
10533+#warning duplicate inclusion 10771+#warning duplicate inclusion
10534+#endif 10772+#endif
10535diff -NurpP --minimal linux-3.4.48/include/linux/vs_sched.h linux-3.4.48-vs2.3.3.9/include/linux/vs_sched.h 10773diff --git a/include/linux/vs_sched.h b/include/linux/vs_sched.h
10536--- linux-3.4.48/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 10774new file mode 100644
10537+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_sched.h 2012-05-21 16:15:05.000000000 +0000 10775index 0000000..d802692
10776--- /dev/null
10777+++ b/include/linux/vs_sched.h
10538@@ -0,0 +1,40 @@ 10778@@ -0,0 +1,40 @@
10539+#ifndef _VS_SCHED_H 10779+#ifndef _VS_SCHED_H
10540+#define _VS_SCHED_H 10780+#define _VS_SCHED_H
@@ -10576,9 +10816,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_sched.h linux-3.4.48-vs2.3.3
10576+#else 10816+#else
10577+#warning duplicate inclusion 10817+#warning duplicate inclusion
10578+#endif 10818+#endif
10579diff -NurpP --minimal linux-3.4.48/include/linux/vs_socket.h linux-3.4.48-vs2.3.3.9/include/linux/vs_socket.h 10819diff --git a/include/linux/vs_socket.h b/include/linux/vs_socket.h
10580--- linux-3.4.48/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 10820new file mode 100644
10581+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_socket.h 2012-05-21 16:15:05.000000000 +0000 10821index 0000000..b190e24
10822--- /dev/null
10823+++ b/include/linux/vs_socket.h
10582@@ -0,0 +1,67 @@ 10824@@ -0,0 +1,67 @@
10583+#ifndef _VS_SOCKET_H 10825+#ifndef _VS_SOCKET_H
10584+#define _VS_SOCKET_H 10826+#define _VS_SOCKET_H
@@ -10647,9 +10889,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_socket.h linux-3.4.48-vs2.3.
10647+#else 10889+#else
10648+#warning duplicate inclusion 10890+#warning duplicate inclusion
10649+#endif 10891+#endif
10650diff -NurpP --minimal linux-3.4.48/include/linux/vs_tag.h linux-3.4.48-vs2.3.3.9/include/linux/vs_tag.h 10892diff --git a/include/linux/vs_tag.h b/include/linux/vs_tag.h
10651--- linux-3.4.48/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 10893new file mode 100644
10652+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_tag.h 2012-05-21 16:15:05.000000000 +0000 10894index 0000000..a83c79b
10895--- /dev/null
10896+++ b/include/linux/vs_tag.h
10653@@ -0,0 +1,47 @@ 10897@@ -0,0 +1,47 @@
10654+#ifndef _VS_TAG_H 10898+#ifndef _VS_TAG_H
10655+#define _VS_TAG_H 10899+#define _VS_TAG_H
@@ -10698,9 +10942,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_tag.h linux-3.4.48-vs2.3.3.9
10698+#else 10942+#else
10699+#warning duplicate inclusion 10943+#warning duplicate inclusion
10700+#endif 10944+#endif
10701diff -NurpP --minimal linux-3.4.48/include/linux/vs_time.h linux-3.4.48-vs2.3.3.9/include/linux/vs_time.h 10945diff --git a/include/linux/vs_time.h b/include/linux/vs_time.h
10702--- linux-3.4.48/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 10946new file mode 100644
10703+++ linux-3.4.48-vs2.3.3.9/include/linux/vs_time.h 2012-05-21 16:15:05.000000000 +0000 10947index 0000000..5b962f9
10948--- /dev/null
10949+++ b/include/linux/vs_time.h
10704@@ -0,0 +1,19 @@ 10950@@ -0,0 +1,19 @@
10705+#ifndef _VS_TIME_H 10951+#ifndef _VS_TIME_H
10706+#define _VS_TIME_H 10952+#define _VS_TIME_H
@@ -10721,9 +10967,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vs_time.h linux-3.4.48-vs2.3.3.
10721+#else 10967+#else
10722+#warning duplicate inclusion 10968+#warning duplicate inclusion
10723+#endif 10969+#endif
10724diff -NurpP --minimal linux-3.4.48/include/linux/vserver/Kbuild linux-3.4.48-vs2.3.3.9/include/linux/vserver/Kbuild 10970diff --git a/include/linux/vserver/Kbuild b/include/linux/vserver/Kbuild
10725--- linux-3.4.48/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 10971new file mode 100644
10726+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/Kbuild 2012-05-21 16:15:05.000000000 +0000 10972index 0000000..3ea3d70
10973--- /dev/null
10974+++ b/include/linux/vserver/Kbuild
10727@@ -0,0 +1,8 @@ 10975@@ -0,0 +1,8 @@
10728+ 10976+
10729+header-y += context_cmd.h network_cmd.h space_cmd.h \ 10977+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -10733,9 +10981,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/Kbuild linux-3.4.48-vs2
10733+ 10981+
10734+header-y += switch.h network.h monitor.h inode.h device.h 10982+header-y += switch.h network.h monitor.h inode.h device.h
10735+ 10983+
10736diff -NurpP --minimal linux-3.4.48/include/linux/vserver/base.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/base.h 10984diff --git a/include/linux/vserver/base.h b/include/linux/vserver/base.h
10737--- linux-3.4.48/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 10985new file mode 100644
10738+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/base.h 2012-05-21 16:15:05.000000000 +0000 10986index 0000000..e31841e
10987--- /dev/null
10988+++ b/include/linux/vserver/base.h
10739@@ -0,0 +1,178 @@ 10989@@ -0,0 +1,178 @@
10740+#ifndef _VX_BASE_H 10990+#ifndef _VX_BASE_H
10741+#define _VX_BASE_H 10991+#define _VX_BASE_H
@@ -10915,9 +11165,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/base.h linux-3.4.48-vs2
10915+#define nx_info_state(n, m) (__nx_state(n) & (m)) 11165+#define nx_info_state(n, m) (__nx_state(n) & (m))
10916+ 11166+
10917+#endif 11167+#endif
10918diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct.h 11168diff --git a/include/linux/vserver/cacct.h b/include/linux/vserver/cacct.h
10919--- linux-3.4.48/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 11169new file mode 100644
10920+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct.h 2012-05-21 16:15:05.000000000 +0000 11170index 0000000..aa202cc
11171--- /dev/null
11172+++ b/include/linux/vserver/cacct.h
10921@@ -0,0 +1,15 @@ 11173@@ -0,0 +1,15 @@
10922+#ifndef _VX_CACCT_H 11174+#ifndef _VX_CACCT_H
10923+#define _VX_CACCT_H 11175+#define _VX_CACCT_H
@@ -10934,9 +11186,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct.h linux-3.4.48-vs
10934+}; 11186+};
10935+ 11187+
10936+#endif /* _VX_CACCT_H */ 11188+#endif /* _VX_CACCT_H */
10937diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 11189diff --git a/include/linux/vserver/cacct_cmd.h b/include/linux/vserver/cacct_cmd.h
10938--- linux-3.4.48/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 11190new file mode 100644
10939+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_cmd.h 2012-05-21 16:15:05.000000000 +0000 11191index 0000000..bcc46bb
11192--- /dev/null
11193+++ b/include/linux/vserver/cacct_cmd.h
10940@@ -0,0 +1,23 @@ 11194@@ -0,0 +1,23 @@
10941+#ifndef _VX_CACCT_CMD_H 11195+#ifndef _VX_CACCT_CMD_H
10942+#define _VX_CACCT_CMD_H 11196+#define _VX_CACCT_CMD_H
@@ -10961,9 +11215,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_cmd.h linux-3.4.4
10961+ 11215+
10962+#endif /* __KERNEL__ */ 11216+#endif /* __KERNEL__ */
10963+#endif /* _VX_CACCT_CMD_H */ 11217+#endif /* _VX_CACCT_CMD_H */
10964diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_def.h 11218diff --git a/include/linux/vserver/cacct_def.h b/include/linux/vserver/cacct_def.h
10965--- linux-3.4.48/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 11219new file mode 100644
10966+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_def.h 2012-05-21 16:15:05.000000000 +0000 11220index 0000000..5945f4f
11221--- /dev/null
11222+++ b/include/linux/vserver/cacct_def.h
10967@@ -0,0 +1,43 @@ 11223@@ -0,0 +1,43 @@
10968+#ifndef _VX_CACCT_DEF_H 11224+#ifndef _VX_CACCT_DEF_H
10969+#define _VX_CACCT_DEF_H 11225+#define _VX_CACCT_DEF_H
@@ -11008,9 +11264,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_def.h linux-3.4.4
11008+#endif 11264+#endif
11009+ 11265+
11010+#endif /* _VX_CACCT_DEF_H */ 11266+#endif /* _VX_CACCT_DEF_H */
11011diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_int.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_int.h 11267diff --git a/include/linux/vserver/cacct_int.h b/include/linux/vserver/cacct_int.h
11012--- linux-3.4.48/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 11268new file mode 100644
11013+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/cacct_int.h 2012-05-21 16:15:05.000000000 +0000 11269index 0000000..a235c01
11270--- /dev/null
11271+++ b/include/linux/vserver/cacct_int.h
11014@@ -0,0 +1,21 @@ 11272@@ -0,0 +1,21 @@
11015+#ifndef _VX_CACCT_INT_H 11273+#ifndef _VX_CACCT_INT_H
11016+#define _VX_CACCT_INT_H 11274+#define _VX_CACCT_INT_H
@@ -11033,9 +11291,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cacct_int.h linux-3.4.4
11033+ 11291+
11034+#endif /* __KERNEL__ */ 11292+#endif /* __KERNEL__ */
11035+#endif /* _VX_CACCT_INT_H */ 11293+#endif /* _VX_CACCT_INT_H */
11036diff -NurpP --minimal linux-3.4.48/include/linux/vserver/check.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/check.h 11294diff --git a/include/linux/vserver/check.h b/include/linux/vserver/check.h
11037--- linux-3.4.48/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 11295new file mode 100644
11038+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/check.h 2012-05-21 16:15:05.000000000 +0000 11296index 0000000..011d16e
11297--- /dev/null
11298+++ b/include/linux/vserver/check.h
11039@@ -0,0 +1,89 @@ 11299@@ -0,0 +1,89 @@
11040+#ifndef _VS_CHECK_H 11300+#ifndef _VS_CHECK_H
11041+#define _VS_CHECK_H 11301+#define _VS_CHECK_H
@@ -11126,9 +11386,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/check.h linux-3.4.48-vs
11126+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) 11386+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
11127+ 11387+
11128+#endif 11388+#endif
11129diff -NurpP --minimal linux-3.4.48/include/linux/vserver/context.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/context.h 11389diff --git a/include/linux/vserver/context.h b/include/linux/vserver/context.h
11130--- linux-3.4.48/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 11390new file mode 100644
11131+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/context.h 2012-05-21 16:15:05.000000000 +0000 11391index 0000000..a63989e
11392--- /dev/null
11393+++ b/include/linux/vserver/context.h
11132@@ -0,0 +1,188 @@ 11394@@ -0,0 +1,188 @@
11133+#ifndef _VX_CONTEXT_H 11395+#ifndef _VX_CONTEXT_H
11134+#define _VX_CONTEXT_H 11396+#define _VX_CONTEXT_H
@@ -11318,9 +11580,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/context.h linux-3.4.48-
11318+ 11580+
11319+#endif /* __KERNEL__ */ 11581+#endif /* __KERNEL__ */
11320+#endif /* _VX_CONTEXT_H */ 11582+#endif /* _VX_CONTEXT_H */
11321diff -NurpP --minimal linux-3.4.48/include/linux/vserver/context_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/context_cmd.h 11583diff --git a/include/linux/vserver/context_cmd.h b/include/linux/vserver/context_cmd.h
11322--- linux-3.4.48/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 11584new file mode 100644
11323+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/context_cmd.h 2012-05-21 16:15:05.000000000 +0000 11585index 0000000..90d3777
11586--- /dev/null
11587+++ b/include/linux/vserver/context_cmd.h
11324@@ -0,0 +1,162 @@ 11588@@ -0,0 +1,162 @@
11325+#ifndef _VX_CONTEXT_CMD_H 11589+#ifndef _VX_CONTEXT_CMD_H
11326+#define _VX_CONTEXT_CMD_H 11590+#define _VX_CONTEXT_CMD_H
@@ -11484,9 +11748,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/context_cmd.h linux-3.4
11484+ 11748+
11485+#endif /* __KERNEL__ */ 11749+#endif /* __KERNEL__ */
11486+#endif /* _VX_CONTEXT_CMD_H */ 11750+#endif /* _VX_CONTEXT_CMD_H */
11487diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt.h 11751diff --git a/include/linux/vserver/cvirt.h b/include/linux/vserver/cvirt.h
11488--- linux-3.4.48/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 11752new file mode 100644
11489+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt.h 2012-05-21 16:15:05.000000000 +0000 11753index 0000000..ec69508
11754--- /dev/null
11755+++ b/include/linux/vserver/cvirt.h
11490@@ -0,0 +1,22 @@ 11756@@ -0,0 +1,22 @@
11491+#ifndef _VX_CVIRT_H 11757+#ifndef _VX_CVIRT_H
11492+#define _VX_CVIRT_H 11758+#define _VX_CVIRT_H
@@ -11510,9 +11776,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt.h linux-3.4.48-vs
11510+ 11776+
11511+#endif /* __KERNEL__ */ 11777+#endif /* __KERNEL__ */
11512+#endif /* _VX_CVIRT_H */ 11778+#endif /* _VX_CVIRT_H */
11513diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 11779diff --git a/include/linux/vserver/cvirt_cmd.h b/include/linux/vserver/cvirt_cmd.h
11514--- linux-3.4.48/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 11780new file mode 100644
11515+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h 2012-05-21 16:15:05.000000000 +0000 11781index 0000000..249db86
11782--- /dev/null
11783+++ b/include/linux/vserver/cvirt_cmd.h
11516@@ -0,0 +1,53 @@ 11784@@ -0,0 +1,53 @@
11517+#ifndef _VX_CVIRT_CMD_H 11785+#ifndef _VX_CVIRT_CMD_H
11518+#define _VX_CVIRT_CMD_H 11786+#define _VX_CVIRT_CMD_H
@@ -11567,9 +11835,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt_cmd.h linux-3.4.4
11567+ 11835+
11568+#endif /* __KERNEL__ */ 11836+#endif /* __KERNEL__ */
11569+#endif /* _VX_CVIRT_CMD_H */ 11837+#endif /* _VX_CVIRT_CMD_H */
11570diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt_def.h 11838diff --git a/include/linux/vserver/cvirt_def.h b/include/linux/vserver/cvirt_def.h
11571--- linux-3.4.48/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 11839new file mode 100644
11572+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/cvirt_def.h 2012-05-21 16:15:05.000000000 +0000 11840index 0000000..9eb9837
11841--- /dev/null
11842+++ b/include/linux/vserver/cvirt_def.h
11573@@ -0,0 +1,80 @@ 11843@@ -0,0 +1,80 @@
11574+#ifndef _VX_CVIRT_DEF_H 11844+#ifndef _VX_CVIRT_DEF_H
11575+#define _VX_CVIRT_DEF_H 11845+#define _VX_CVIRT_DEF_H
@@ -11651,9 +11921,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/cvirt_def.h linux-3.4.4
11651+#endif 11921+#endif
11652+ 11922+
11653+#endif /* _VX_CVIRT_DEF_H */ 11923+#endif /* _VX_CVIRT_DEF_H */
11654diff -NurpP --minimal linux-3.4.48/include/linux/vserver/debug.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/debug.h 11924diff --git a/include/linux/vserver/debug.h b/include/linux/vserver/debug.h
11655--- linux-3.4.48/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 11925new file mode 100644
11656+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/debug.h 2012-05-21 16:15:05.000000000 +0000 11926index 0000000..21cd597
11927--- /dev/null
11928+++ b/include/linux/vserver/debug.h
11657@@ -0,0 +1,145 @@ 11929@@ -0,0 +1,145 @@
11658+#ifndef _VX_DEBUG_H 11930+#ifndef _VX_DEBUG_H
11659+#define _VX_DEBUG_H 11931+#define _VX_DEBUG_H
@@ -11800,9 +12072,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/debug.h linux-3.4.48-vs
11800+ 12072+
11801+ 12073+
11802+#endif /* _VX_DEBUG_H */ 12074+#endif /* _VX_DEBUG_H */
11803diff -NurpP --minimal linux-3.4.48/include/linux/vserver/debug_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/debug_cmd.h 12075diff --git a/include/linux/vserver/debug_cmd.h b/include/linux/vserver/debug_cmd.h
11804--- linux-3.4.48/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 12076new file mode 100644
11805+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/debug_cmd.h 2012-05-21 16:15:05.000000000 +0000 12077index 0000000..441eb62
12078--- /dev/null
12079+++ b/include/linux/vserver/debug_cmd.h
11806@@ -0,0 +1,58 @@ 12080@@ -0,0 +1,58 @@
11807+#ifndef _VX_DEBUG_CMD_H 12081+#ifndef _VX_DEBUG_CMD_H
11808+#define _VX_DEBUG_CMD_H 12082+#define _VX_DEBUG_CMD_H
@@ -11862,9 +12136,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/debug_cmd.h linux-3.4.4
11862+ 12136+
11863+#endif /* __KERNEL__ */ 12137+#endif /* __KERNEL__ */
11864+#endif /* _VX_DEBUG_CMD_H */ 12138+#endif /* _VX_DEBUG_CMD_H */
11865diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/device.h 12139diff --git a/include/linux/vserver/device.h b/include/linux/vserver/device.h
11866--- linux-3.4.48/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 12140new file mode 100644
11867+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/device.h 2012-05-21 16:15:05.000000000 +0000 12141index 0000000..dc10daa
12142--- /dev/null
12143+++ b/include/linux/vserver/device.h
11868@@ -0,0 +1,15 @@ 12144@@ -0,0 +1,15 @@
11869+#ifndef _VX_DEVICE_H 12145+#ifndef _VX_DEVICE_H
11870+#define _VX_DEVICE_H 12146+#define _VX_DEVICE_H
@@ -11881,9 +12157,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device.h linux-3.4.48-v
11881+#else /* _VX_DEVICE_H */ 12157+#else /* _VX_DEVICE_H */
11882+#warning duplicate inclusion 12158+#warning duplicate inclusion
11883+#endif /* _VX_DEVICE_H */ 12159+#endif /* _VX_DEVICE_H */
11884diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/device_cmd.h 12160diff --git a/include/linux/vserver/device_cmd.h b/include/linux/vserver/device_cmd.h
11885--- linux-3.4.48/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 12161new file mode 100644
11886+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/device_cmd.h 2012-05-21 16:15:05.000000000 +0000 12162index 0000000..3e45a99
12163--- /dev/null
12164+++ b/include/linux/vserver/device_cmd.h
11887@@ -0,0 +1,44 @@ 12165@@ -0,0 +1,44 @@
11888+#ifndef _VX_DEVICE_CMD_H 12166+#ifndef _VX_DEVICE_CMD_H
11889+#define _VX_DEVICE_CMD_H 12167+#define _VX_DEVICE_CMD_H
@@ -11929,9 +12207,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device_cmd.h linux-3.4.
11929+ 12207+
11930+#endif /* __KERNEL__ */ 12208+#endif /* __KERNEL__ */
11931+#endif /* _VX_DEVICE_CMD_H */ 12209+#endif /* _VX_DEVICE_CMD_H */
11932diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/device_def.h 12210diff --git a/include/linux/vserver/device_def.h b/include/linux/vserver/device_def.h
11933--- linux-3.4.48/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 12211new file mode 100644
11934+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/device_def.h 2012-05-21 16:15:05.000000000 +0000 12212index 0000000..aa12784
12213--- /dev/null
12214+++ b/include/linux/vserver/device_def.h
11935@@ -0,0 +1,17 @@ 12215@@ -0,0 +1,17 @@
11936+#ifndef _VX_DEVICE_DEF_H 12216+#ifndef _VX_DEVICE_DEF_H
11937+#define _VX_DEVICE_DEF_H 12217+#define _VX_DEVICE_DEF_H
@@ -11950,9 +12230,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/device_def.h linux-3.4.
11950+}; 12230+};
11951+ 12231+
11952+#endif /* _VX_DEVICE_DEF_H */ 12232+#endif /* _VX_DEVICE_DEF_H */
11953diff -NurpP --minimal linux-3.4.48/include/linux/vserver/dlimit.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/dlimit.h 12233diff --git a/include/linux/vserver/dlimit.h b/include/linux/vserver/dlimit.h
11954--- linux-3.4.48/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 12234new file mode 100644
11955+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/dlimit.h 2012-05-21 16:15:05.000000000 +0000 12235index 0000000..f026233
12236--- /dev/null
12237+++ b/include/linux/vserver/dlimit.h
11956@@ -0,0 +1,54 @@ 12238@@ -0,0 +1,54 @@
11957+#ifndef _VX_DLIMIT_H 12239+#ifndef _VX_DLIMIT_H
11958+#define _VX_DLIMIT_H 12240+#define _VX_DLIMIT_H
@@ -12008,9 +12290,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/dlimit.h linux-3.4.48-v
12008+#else /* _VX_DLIMIT_H */ 12290+#else /* _VX_DLIMIT_H */
12009+#warning duplicate inclusion 12291+#warning duplicate inclusion
12010+#endif /* _VX_DLIMIT_H */ 12292+#endif /* _VX_DLIMIT_H */
12011diff -NurpP --minimal linux-3.4.48/include/linux/vserver/dlimit_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 12293diff --git a/include/linux/vserver/dlimit_cmd.h b/include/linux/vserver/dlimit_cmd.h
12012--- linux-3.4.48/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 12294new file mode 100644
12013+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h 2012-05-21 16:15:05.000000000 +0000 12295index 0000000..3ae7de3
12296--- /dev/null
12297+++ b/include/linux/vserver/dlimit_cmd.h
12014@@ -0,0 +1,109 @@ 12298@@ -0,0 +1,109 @@
12015+#ifndef _VX_DLIMIT_CMD_H 12299+#ifndef _VX_DLIMIT_CMD_H
12016+#define _VX_DLIMIT_CMD_H 12300+#define _VX_DLIMIT_CMD_H
@@ -12121,9 +12405,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/dlimit_cmd.h linux-3.4.
12121+ 12405+
12122+#endif /* __KERNEL__ */ 12406+#endif /* __KERNEL__ */
12123+#endif /* _VX_DLIMIT_CMD_H */ 12407+#endif /* _VX_DLIMIT_CMD_H */
12124diff -NurpP --minimal linux-3.4.48/include/linux/vserver/global.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/global.h 12408diff --git a/include/linux/vserver/global.h b/include/linux/vserver/global.h
12125--- linux-3.4.48/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 12409new file mode 100644
12126+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/global.h 2012-05-21 16:15:05.000000000 +0000 12410index 0000000..2c317dd
12411--- /dev/null
12412+++ b/include/linux/vserver/global.h
12127@@ -0,0 +1,19 @@ 12413@@ -0,0 +1,19 @@
12128+#ifndef _VX_GLOBAL_H 12414+#ifndef _VX_GLOBAL_H
12129+#define _VX_GLOBAL_H 12415+#define _VX_GLOBAL_H
@@ -12144,9 +12430,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/global.h linux-3.4.48-v
12144+ 12430+
12145+ 12431+
12146+#endif /* _VX_GLOBAL_H */ 12432+#endif /* _VX_GLOBAL_H */
12147diff -NurpP --minimal linux-3.4.48/include/linux/vserver/history.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/history.h 12433diff --git a/include/linux/vserver/history.h b/include/linux/vserver/history.h
12148--- linux-3.4.48/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 12434new file mode 100644
12149+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/history.h 2012-05-21 16:15:05.000000000 +0000 12435index 0000000..0efe903
12436--- /dev/null
12437+++ b/include/linux/vserver/history.h
12150@@ -0,0 +1,197 @@ 12438@@ -0,0 +1,197 @@
12151+#ifndef _VX_HISTORY_H 12439+#ifndef _VX_HISTORY_H
12152+#define _VX_HISTORY_H 12440+#define _VX_HISTORY_H
@@ -12345,9 +12633,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/history.h linux-3.4.48-
12345+#endif /* CONFIG_VSERVER_HISTORY */ 12633+#endif /* CONFIG_VSERVER_HISTORY */
12346+ 12634+
12347+#endif /* _VX_HISTORY_H */ 12635+#endif /* _VX_HISTORY_H */
12348diff -NurpP --minimal linux-3.4.48/include/linux/vserver/inode.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/inode.h 12636diff --git a/include/linux/vserver/inode.h b/include/linux/vserver/inode.h
12349--- linux-3.4.48/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 12637new file mode 100644
12350+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/inode.h 2012-05-21 16:15:05.000000000 +0000 12638index 0000000..e44f416
12639--- /dev/null
12640+++ b/include/linux/vserver/inode.h
12351@@ -0,0 +1,39 @@ 12641@@ -0,0 +1,39 @@
12352+#ifndef _VX_INODE_H 12642+#ifndef _VX_INODE_H
12353+#define _VX_INODE_H 12643+#define _VX_INODE_H
@@ -12388,9 +12678,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/inode.h linux-3.4.48-vs
12388+#else /* _VX_INODE_H */ 12678+#else /* _VX_INODE_H */
12389+#warning duplicate inclusion 12679+#warning duplicate inclusion
12390+#endif /* _VX_INODE_H */ 12680+#endif /* _VX_INODE_H */
12391diff -NurpP --minimal linux-3.4.48/include/linux/vserver/inode_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/inode_cmd.h 12681diff --git a/include/linux/vserver/inode_cmd.h b/include/linux/vserver/inode_cmd.h
12392--- linux-3.4.48/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 12682new file mode 100644
12393+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/inode_cmd.h 2012-05-21 16:15:05.000000000 +0000 12683index 0000000..4444c11
12684--- /dev/null
12685+++ b/include/linux/vserver/inode_cmd.h
12394@@ -0,0 +1,59 @@ 12686@@ -0,0 +1,59 @@
12395+#ifndef _VX_INODE_CMD_H 12687+#ifndef _VX_INODE_CMD_H
12396+#define _VX_INODE_CMD_H 12688+#define _VX_INODE_CMD_H
@@ -12451,9 +12743,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/inode_cmd.h linux-3.4.4
12451+ 12743+
12452+#endif /* __KERNEL__ */ 12744+#endif /* __KERNEL__ */
12453+#endif /* _VX_INODE_CMD_H */ 12745+#endif /* _VX_INODE_CMD_H */
12454diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit.h 12746diff --git a/include/linux/vserver/limit.h b/include/linux/vserver/limit.h
12455--- linux-3.4.48/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 12747new file mode 100644
12456+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit.h 2012-05-21 16:15:05.000000000 +0000 12748index 0000000..804cc20
12749--- /dev/null
12750+++ b/include/linux/vserver/limit.h
12457@@ -0,0 +1,71 @@ 12751@@ -0,0 +1,71 @@
12458+#ifndef _VX_LIMIT_H 12752+#ifndef _VX_LIMIT_H
12459+#define _VX_LIMIT_H 12753+#define _VX_LIMIT_H
@@ -12526,9 +12820,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit.h linux-3.4.48-vs
12526+ 12820+
12527+#endif /* __KERNEL__ */ 12821+#endif /* __KERNEL__ */
12528+#endif /* _VX_LIMIT_H */ 12822+#endif /* _VX_LIMIT_H */
12529diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_cmd.h 12823diff --git a/include/linux/vserver/limit_cmd.h b/include/linux/vserver/limit_cmd.h
12530--- linux-3.4.48/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 12824new file mode 100644
12531+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_cmd.h 2012-05-21 16:15:05.000000000 +0000 12825index 0000000..62eaaf7
12826--- /dev/null
12827+++ b/include/linux/vserver/limit_cmd.h
12532@@ -0,0 +1,71 @@ 12828@@ -0,0 +1,71 @@
12533+#ifndef _VX_LIMIT_CMD_H 12829+#ifndef _VX_LIMIT_CMD_H
12534+#define _VX_LIMIT_CMD_H 12830+#define _VX_LIMIT_CMD_H
@@ -12601,9 +12897,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_cmd.h linux-3.4.4
12601+ 12897+
12602+#endif /* __KERNEL__ */ 12898+#endif /* __KERNEL__ */
12603+#endif /* _VX_LIMIT_CMD_H */ 12899+#endif /* _VX_LIMIT_CMD_H */
12604diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_def.h 12900diff --git a/include/linux/vserver/limit_def.h b/include/linux/vserver/limit_def.h
12605--- linux-3.4.48/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 12901new file mode 100644
12606+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_def.h 2012-05-21 16:15:05.000000000 +0000 12902index 0000000..2be25ac
12903--- /dev/null
12904+++ b/include/linux/vserver/limit_def.h
12607@@ -0,0 +1,47 @@ 12905@@ -0,0 +1,47 @@
12608+#ifndef _VX_LIMIT_DEF_H 12906+#ifndef _VX_LIMIT_DEF_H
12609+#define _VX_LIMIT_DEF_H 12907+#define _VX_LIMIT_DEF_H
@@ -12652,9 +12950,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_def.h linux-3.4.4
12652+#endif 12950+#endif
12653+ 12951+
12654+#endif /* _VX_LIMIT_DEF_H */ 12952+#endif /* _VX_LIMIT_DEF_H */
12655diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_int.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_int.h 12953diff --git a/include/linux/vserver/limit_int.h b/include/linux/vserver/limit_int.h
12656--- linux-3.4.48/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 12954new file mode 100644
12657+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/limit_int.h 2012-05-21 16:15:05.000000000 +0000 12955index 0000000..0adf9cb
12956--- /dev/null
12957+++ b/include/linux/vserver/limit_int.h
12658@@ -0,0 +1,198 @@ 12958@@ -0,0 +1,198 @@
12659+#ifndef _VX_LIMIT_INT_H 12959+#ifndef _VX_LIMIT_INT_H
12660+#define _VX_LIMIT_INT_H 12960+#define _VX_LIMIT_INT_H
@@ -12854,9 +13154,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/limit_int.h linux-3.4.4
12854+ 13154+
12855+#endif /* __KERNEL__ */ 13155+#endif /* __KERNEL__ */
12856+#endif /* _VX_LIMIT_INT_H */ 13156+#endif /* _VX_LIMIT_INT_H */
12857diff -NurpP --minimal linux-3.4.48/include/linux/vserver/monitor.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/monitor.h 13157diff --git a/include/linux/vserver/monitor.h b/include/linux/vserver/monitor.h
12858--- linux-3.4.48/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 13158new file mode 100644
12859+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/monitor.h 2012-05-21 16:15:05.000000000 +0000 13159index 0000000..53cd19f
13160--- /dev/null
13161+++ b/include/linux/vserver/monitor.h
12860@@ -0,0 +1,96 @@ 13162@@ -0,0 +1,96 @@
12861+#ifndef _VX_MONITOR_H 13163+#ifndef _VX_MONITOR_H
12862+#define _VX_MONITOR_H 13164+#define _VX_MONITOR_H
@@ -12954,9 +13256,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/monitor.h linux-3.4.48-
12954+ 13256+
12955+ 13257+
12956+#endif /* _VX_MONITOR_H */ 13258+#endif /* _VX_MONITOR_H */
12957diff -NurpP --minimal linux-3.4.48/include/linux/vserver/network.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/network.h 13259diff --git a/include/linux/vserver/network.h b/include/linux/vserver/network.h
12958--- linux-3.4.48/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 13260new file mode 100644
12959+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/network.h 2012-05-21 16:15:05.000000000 +0000 13261index 0000000..a6695d5
13262--- /dev/null
13263+++ b/include/linux/vserver/network.h
12960@@ -0,0 +1,148 @@ 13264@@ -0,0 +1,148 @@
12961+#ifndef _VX_NETWORK_H 13265+#ifndef _VX_NETWORK_H
12962+#define _VX_NETWORK_H 13266+#define _VX_NETWORK_H
@@ -13106,9 +13410,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/network.h linux-3.4.48-
13106+ 13410+
13107+#endif /* __KERNEL__ */ 13411+#endif /* __KERNEL__ */
13108+#endif /* _VX_NETWORK_H */ 13412+#endif /* _VX_NETWORK_H */
13109diff -NurpP --minimal linux-3.4.48/include/linux/vserver/network_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/network_cmd.h 13413diff --git a/include/linux/vserver/network_cmd.h b/include/linux/vserver/network_cmd.h
13110--- linux-3.4.48/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 13414new file mode 100644
13111+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/network_cmd.h 2012-05-21 16:15:05.000000000 +0000 13415index 0000000..32bcc39
13416--- /dev/null
13417+++ b/include/linux/vserver/network_cmd.h
13112@@ -0,0 +1,164 @@ 13418@@ -0,0 +1,164 @@
13113+#ifndef _VX_NETWORK_CMD_H 13419+#ifndef _VX_NETWORK_CMD_H
13114+#define _VX_NETWORK_CMD_H 13420+#define _VX_NETWORK_CMD_H
@@ -13274,9 +13580,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/network_cmd.h linux-3.4
13274+ 13580+
13275+#endif /* __KERNEL__ */ 13581+#endif /* __KERNEL__ */
13276+#endif /* _VX_CONTEXT_CMD_H */ 13582+#endif /* _VX_CONTEXT_CMD_H */
13277diff -NurpP --minimal linux-3.4.48/include/linux/vserver/percpu.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/percpu.h 13583diff --git a/include/linux/vserver/percpu.h b/include/linux/vserver/percpu.h
13278--- linux-3.4.48/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 13584new file mode 100644
13279+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/percpu.h 2012-05-21 16:15:05.000000000 +0000 13585index 0000000..647d22c
13586--- /dev/null
13587+++ b/include/linux/vserver/percpu.h
13280@@ -0,0 +1,14 @@ 13588@@ -0,0 +1,14 @@
13281+#ifndef _VX_PERCPU_H 13589+#ifndef _VX_PERCPU_H
13282+#define _VX_PERCPU_H 13590+#define _VX_PERCPU_H
@@ -13292,9 +13600,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/percpu.h linux-3.4.48-v
13292+#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) 13600+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
13293+ 13601+
13294+#endif /* _VX_PERCPU_H */ 13602+#endif /* _VX_PERCPU_H */
13295diff -NurpP --minimal linux-3.4.48/include/linux/vserver/pid.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/pid.h 13603diff --git a/include/linux/vserver/pid.h b/include/linux/vserver/pid.h
13296--- linux-3.4.48/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 13604new file mode 100644
13297+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/pid.h 2012-05-21 16:15:05.000000000 +0000 13605index 0000000..34b8f44
13606--- /dev/null
13607+++ b/include/linux/vserver/pid.h
13298@@ -0,0 +1,51 @@ 13608@@ -0,0 +1,51 @@
13299+#ifndef _VSERVER_PID_H 13609+#ifndef _VSERVER_PID_H
13300+#define _VSERVER_PID_H 13610+#define _VSERVER_PID_H
@@ -13347,9 +13657,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/pid.h linux-3.4.48-vs2.
13347+} 13657+}
13348+ 13658+
13349+#endif 13659+#endif
13350diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched.h 13660diff --git a/include/linux/vserver/sched.h b/include/linux/vserver/sched.h
13351--- linux-3.4.48/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 13661new file mode 100644
13352+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched.h 2012-05-21 16:15:05.000000000 +0000 13662index 0000000..296c63f
13663--- /dev/null
13664+++ b/include/linux/vserver/sched.h
13353@@ -0,0 +1,23 @@ 13665@@ -0,0 +1,23 @@
13354+#ifndef _VX_SCHED_H 13666+#ifndef _VX_SCHED_H
13355+#define _VX_SCHED_H 13667+#define _VX_SCHED_H
@@ -13374,9 +13686,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched.h linux-3.4.48-vs
13374+#else /* _VX_SCHED_H */ 13686+#else /* _VX_SCHED_H */
13375+#warning duplicate inclusion 13687+#warning duplicate inclusion
13376+#endif /* _VX_SCHED_H */ 13688+#endif /* _VX_SCHED_H */
13377diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched_cmd.h 13689diff --git a/include/linux/vserver/sched_cmd.h b/include/linux/vserver/sched_cmd.h
13378--- linux-3.4.48/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 13690new file mode 100644
13379+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched_cmd.h 2012-05-21 16:15:05.000000000 +0000 13691index 0000000..9accd68
13692--- /dev/null
13693+++ b/include/linux/vserver/sched_cmd.h
13380@@ -0,0 +1,21 @@ 13694@@ -0,0 +1,21 @@
13381+#ifndef _VX_SCHED_CMD_H 13695+#ifndef _VX_SCHED_CMD_H
13382+#define _VX_SCHED_CMD_H 13696+#define _VX_SCHED_CMD_H
@@ -13399,9 +13713,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched_cmd.h linux-3.4.4
13399+ 13713+
13400+#endif /* __KERNEL__ */ 13714+#endif /* __KERNEL__ */
13401+#endif /* _VX_SCHED_CMD_H */ 13715+#endif /* _VX_SCHED_CMD_H */
13402diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched_def.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched_def.h 13716diff --git a/include/linux/vserver/sched_def.h b/include/linux/vserver/sched_def.h
13403--- linux-3.4.48/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 13717new file mode 100644
13404+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/sched_def.h 2012-05-21 16:15:05.000000000 +0000 13718index 0000000..99f5728
13719--- /dev/null
13720+++ b/include/linux/vserver/sched_def.h
13405@@ -0,0 +1,38 @@ 13721@@ -0,0 +1,38 @@
13406+#ifndef _VX_SCHED_DEF_H 13722+#ifndef _VX_SCHED_DEF_H
13407+#define _VX_SCHED_DEF_H 13723+#define _VX_SCHED_DEF_H
@@ -13441,9 +13757,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/sched_def.h linux-3.4.4
13441+#endif 13757+#endif
13442+ 13758+
13443+#endif /* _VX_SCHED_DEF_H */ 13759+#endif /* _VX_SCHED_DEF_H */
13444diff -NurpP --minimal linux-3.4.48/include/linux/vserver/signal.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/signal.h 13760diff --git a/include/linux/vserver/signal.h b/include/linux/vserver/signal.h
13445--- linux-3.4.48/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 13761new file mode 100644
13446+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/signal.h 2012-05-21 16:15:05.000000000 +0000 13762index 0000000..690168e
13763--- /dev/null
13764+++ b/include/linux/vserver/signal.h
13447@@ -0,0 +1,14 @@ 13765@@ -0,0 +1,14 @@
13448+#ifndef _VX_SIGNAL_H 13766+#ifndef _VX_SIGNAL_H
13449+#define _VX_SIGNAL_H 13767+#define _VX_SIGNAL_H
@@ -13459,9 +13777,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/signal.h linux-3.4.48-v
13459+#else /* _VX_SIGNAL_H */ 13777+#else /* _VX_SIGNAL_H */
13460+#warning duplicate inclusion 13778+#warning duplicate inclusion
13461+#endif /* _VX_SIGNAL_H */ 13779+#endif /* _VX_SIGNAL_H */
13462diff -NurpP --minimal linux-3.4.48/include/linux/vserver/signal_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/signal_cmd.h 13780diff --git a/include/linux/vserver/signal_cmd.h b/include/linux/vserver/signal_cmd.h
13463--- linux-3.4.48/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 13781new file mode 100644
13464+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/signal_cmd.h 2012-05-21 16:15:05.000000000 +0000 13782index 0000000..ed1ac7b
13783--- /dev/null
13784+++ b/include/linux/vserver/signal_cmd.h
13465@@ -0,0 +1,43 @@ 13785@@ -0,0 +1,43 @@
13466+#ifndef _VX_SIGNAL_CMD_H 13786+#ifndef _VX_SIGNAL_CMD_H
13467+#define _VX_SIGNAL_CMD_H 13787+#define _VX_SIGNAL_CMD_H
@@ -13506,9 +13826,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/signal_cmd.h linux-3.4.
13506+ 13826+
13507+#endif /* __KERNEL__ */ 13827+#endif /* __KERNEL__ */
13508+#endif /* _VX_SIGNAL_CMD_H */ 13828+#endif /* _VX_SIGNAL_CMD_H */
13509diff -NurpP --minimal linux-3.4.48/include/linux/vserver/space.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/space.h 13829diff --git a/include/linux/vserver/space.h b/include/linux/vserver/space.h
13510--- linux-3.4.48/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 13830new file mode 100644
13511+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/space.h 2012-05-21 16:15:05.000000000 +0000 13831index 0000000..65e8021
13832--- /dev/null
13833+++ b/include/linux/vserver/space.h
13512@@ -0,0 +1,12 @@ 13834@@ -0,0 +1,12 @@
13513+#ifndef _VX_SPACE_H 13835+#ifndef _VX_SPACE_H
13514+#define _VX_SPACE_H 13836+#define _VX_SPACE_H
@@ -13522,9 +13844,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/space.h linux-3.4.48-vs
13522+#else /* _VX_SPACE_H */ 13844+#else /* _VX_SPACE_H */
13523+#warning duplicate inclusion 13845+#warning duplicate inclusion
13524+#endif /* _VX_SPACE_H */ 13846+#endif /* _VX_SPACE_H */
13525diff -NurpP --minimal linux-3.4.48/include/linux/vserver/space_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/space_cmd.h 13847diff --git a/include/linux/vserver/space_cmd.h b/include/linux/vserver/space_cmd.h
13526--- linux-3.4.48/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 13848new file mode 100644
13527+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/space_cmd.h 2012-05-21 16:15:05.000000000 +0000 13849index 0000000..2ef8117
13850--- /dev/null
13851+++ b/include/linux/vserver/space_cmd.h
13528@@ -0,0 +1,38 @@ 13852@@ -0,0 +1,38 @@
13529+#ifndef _VX_SPACE_CMD_H 13853+#ifndef _VX_SPACE_CMD_H
13530+#define _VX_SPACE_CMD_H 13854+#define _VX_SPACE_CMD_H
@@ -13564,9 +13888,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/space_cmd.h linux-3.4.4
13564+ 13888+
13565+#endif /* __KERNEL__ */ 13889+#endif /* __KERNEL__ */
13566+#endif /* _VX_SPACE_CMD_H */ 13890+#endif /* _VX_SPACE_CMD_H */
13567diff -NurpP --minimal linux-3.4.48/include/linux/vserver/switch.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/switch.h 13891diff --git a/include/linux/vserver/switch.h b/include/linux/vserver/switch.h
13568--- linux-3.4.48/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 13892new file mode 100644
13569+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/switch.h 2012-05-21 16:15:05.000000000 +0000 13893index 0000000..f9afa8a
13894--- /dev/null
13895+++ b/include/linux/vserver/switch.h
13570@@ -0,0 +1,98 @@ 13896@@ -0,0 +1,98 @@
13571+#ifndef _VX_SWITCH_H 13897+#ifndef _VX_SWITCH_H
13572+#define _VX_SWITCH_H 13898+#define _VX_SWITCH_H
@@ -13666,9 +13992,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/switch.h linux-3.4.48-v
13666+ 13992+
13667+#endif /* _VX_SWITCH_H */ 13993+#endif /* _VX_SWITCH_H */
13668+ 13994+
13669diff -NurpP --minimal linux-3.4.48/include/linux/vserver/tag.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/tag.h 13995diff --git a/include/linux/vserver/tag.h b/include/linux/vserver/tag.h
13670--- linux-3.4.48/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 13996new file mode 100644
13671+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/tag.h 2012-05-21 16:15:05.000000000 +0000 13997index 0000000..f4afd42
13998--- /dev/null
13999+++ b/include/linux/vserver/tag.h
13672@@ -0,0 +1,143 @@ 14000@@ -0,0 +1,143 @@
13673+#ifndef _DX_TAG_H 14001+#ifndef _DX_TAG_H
13674+#define _DX_TAG_H 14002+#define _DX_TAG_H
@@ -13813,9 +14141,11 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/tag.h linux-3.4.48-vs2.
13813+#endif 14141+#endif
13814+ 14142+
13815+#endif /* _DX_TAG_H */ 14143+#endif /* _DX_TAG_H */
13816diff -NurpP --minimal linux-3.4.48/include/linux/vserver/tag_cmd.h linux-3.4.48-vs2.3.3.9/include/linux/vserver/tag_cmd.h 14144diff --git a/include/linux/vserver/tag_cmd.h b/include/linux/vserver/tag_cmd.h
13817--- linux-3.4.48/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 14145new file mode 100644
13818+++ linux-3.4.48-vs2.3.3.9/include/linux/vserver/tag_cmd.h 2012-05-21 16:15:05.000000000 +0000 14146index 0000000..7f3f393
14147--- /dev/null
14148+++ b/include/linux/vserver/tag_cmd.h
13819@@ -0,0 +1,22 @@ 14149@@ -0,0 +1,22 @@
13820+#ifndef _VX_TAG_CMD_H 14150+#ifndef _VX_TAG_CMD_H
13821+#define _VX_TAG_CMD_H 14151+#define _VX_TAG_CMD_H
@@ -13839,22 +14169,24 @@ diff -NurpP --minimal linux-3.4.48/include/linux/vserver/tag_cmd.h linux-3.4.48-
13839+ 14169+
13840+#endif /* __KERNEL__ */ 14170+#endif /* __KERNEL__ */
13841+#endif /* _VX_TAG_CMD_H */ 14171+#endif /* _VX_TAG_CMD_H */
13842diff -NurpP --minimal linux-3.4.48/include/net/addrconf.h linux-3.4.48-vs2.3.3.9/include/net/addrconf.h 14172diff --git a/include/net/addrconf.h b/include/net/addrconf.h
13843--- linux-3.4.48/include/net/addrconf.h 2012-05-21 16:07:33.000000000 +0000 14173index 1a77dbb..369e8f8 100644
13844+++ linux-3.4.48-vs2.3.3.9/include/net/addrconf.h 2012-05-21 16:15:05.000000000 +0000 14174--- a/include/net/addrconf.h
13845@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n 14175+++ b/include/net/addrconf.h
14176@@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct net *net,
13846 struct net_device *dev, 14177 struct net_device *dev,
13847 const struct in6_addr *daddr, 14178 const struct in6_addr *daddr,
13848 unsigned int srcprefs, 14179 unsigned int srcprefs,
13849- struct in6_addr *saddr); 14180- struct in6_addr *saddr);
13850+ struct in6_addr *saddr, 14181+ struct in6_addr *saddr,
13851+ struct nx_info *nxi); 14182+ struct nx_info *nxi);
13852 extern int ipv6_get_lladdr(struct net_device *dev, 14183 extern int __ipv6_get_lladdr(struct inet6_dev *idev,
13853 struct in6_addr *addr, 14184 struct in6_addr *addr,
13854 unsigned char banned_flags); 14185 unsigned char banned_flags);
13855diff -NurpP --minimal linux-3.4.48/include/net/af_unix.h linux-3.4.48-vs2.3.3.9/include/net/af_unix.h 14186diff --git a/include/net/af_unix.h b/include/net/af_unix.h
13856--- linux-3.4.48/include/net/af_unix.h 2012-05-21 16:07:33.000000000 +0000 14187index ca68e2c..820e190 100644
13857+++ linux-3.4.48-vs2.3.3.9/include/net/af_unix.h 2012-05-21 16:15:05.000000000 +0000 14188--- a/include/net/af_unix.h
14189+++ b/include/net/af_unix.h
13858@@ -4,6 +4,7 @@ 14190@@ -4,6 +4,7 @@
13859 #include <linux/socket.h> 14191 #include <linux/socket.h>
13860 #include <linux/un.h> 14192 #include <linux/un.h>
@@ -13863,9 +14195,10 @@ diff -NurpP --minimal linux-3.4.48/include/net/af_unix.h linux-3.4.48-vs2.3.3.9/
13863 #include <net/sock.h> 14195 #include <net/sock.h>
13864 14196
13865 extern void unix_inflight(struct file *fp); 14197 extern void unix_inflight(struct file *fp);
13866diff -NurpP --minimal linux-3.4.48/include/net/inet_timewait_sock.h linux-3.4.48-vs2.3.3.9/include/net/inet_timewait_sock.h 14198diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
13867--- linux-3.4.48/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000 14199index ba52c83..d3f921f 100644
13868+++ linux-3.4.48-vs2.3.3.9/include/net/inet_timewait_sock.h 2012-05-21 16:15:05.000000000 +0000 14200--- a/include/net/inet_timewait_sock.h
14201+++ b/include/net/inet_timewait_sock.h
13869@@ -112,6 +112,10 @@ struct inet_timewait_sock { 14202@@ -112,6 +112,10 @@ struct inet_timewait_sock {
13870 #define tw_net __tw_common.skc_net 14203 #define tw_net __tw_common.skc_net
13871 #define tw_daddr __tw_common.skc_daddr 14204 #define tw_daddr __tw_common.skc_daddr
@@ -13877,10 +14210,11 @@ diff -NurpP --minimal linux-3.4.48/include/net/inet_timewait_sock.h linux-3.4.48
13877 int tw_timeout; 14210 int tw_timeout;
13878 volatile unsigned char tw_substate; 14211 volatile unsigned char tw_substate;
13879 unsigned char tw_rcv_wscale; 14212 unsigned char tw_rcv_wscale;
13880diff -NurpP --minimal linux-3.4.48/include/net/ip6_route.h linux-3.4.48-vs2.3.3.9/include/net/ip6_route.h 14213diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
13881--- linux-3.4.48/include/net/ip6_route.h 2012-03-19 18:47:29.000000000 +0000 14214index 2ad92ca..fd3b66f 100644
13882+++ linux-3.4.48-vs2.3.3.9/include/net/ip6_route.h 2012-05-21 16:15:05.000000000 +0000 14215--- a/include/net/ip6_route.h
13883@@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct 14216+++ b/include/net/ip6_route.h
14217@@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct net *net,
13884 struct rt6_info *rt, 14218 struct rt6_info *rt,
13885 const struct in6_addr *daddr, 14219 const struct in6_addr *daddr,
13886 unsigned int prefs, 14220 unsigned int prefs,
@@ -13890,10 +14224,11 @@ diff -NurpP --minimal linux-3.4.48/include/net/ip6_route.h linux-3.4.48-vs2.3.3.
13890 14224
13891 extern struct rt6_info *rt6_lookup(struct net *net, 14225 extern struct rt6_info *rt6_lookup(struct net *net,
13892 const struct in6_addr *daddr, 14226 const struct in6_addr *daddr,
13893diff -NurpP --minimal linux-3.4.48/include/net/route.h linux-3.4.48-vs2.3.3.9/include/net/route.h 14227diff --git a/include/net/route.h b/include/net/route.h
13894--- linux-3.4.48/include/net/route.h 2012-03-19 18:47:29.000000000 +0000 14228index b1c0d5b..97cb84b 100644
13895+++ linux-3.4.48-vs2.3.3.9/include/net/route.h 2012-05-21 16:15:05.000000000 +0000 14229--- a/include/net/route.h
13896@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab 14230+++ b/include/net/route.h
14231@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtable * rt)
13897 dst_release(&rt->dst); 14232 dst_release(&rt->dst);
13898 } 14233 }
13899 14234
@@ -13903,7 +14238,7 @@ diff -NurpP --minimal linux-3.4.48/include/net/route.h linux-3.4.48-vs2.3.3.9/in
13903 #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) 14238 #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
13904 14239
13905 extern const __u8 ip_tos2prio[16]; 14240 extern const __u8 ip_tos2prio[16];
13906@@ -253,6 +256,9 @@ static inline void ip_route_connect_init 14241@@ -253,6 +256,9 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32
13907 protocol, flow_flags, dst, src, dport, sport); 14242 protocol, flow_flags, dst, src, dport, sport);
13908 } 14243 }
13909 14244
@@ -13913,7 +14248,7 @@ diff -NurpP --minimal linux-3.4.48/include/net/route.h linux-3.4.48-vs2.3.3.9/in
13913 static inline struct rtable *ip_route_connect(struct flowi4 *fl4, 14248 static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
13914 __be32 dst, __be32 src, u32 tos, 14249 __be32 dst, __be32 src, u32 tos,
13915 int oif, u8 protocol, 14250 int oif, u8 protocol,
13916@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co 14251@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
13917 { 14252 {
13918 struct net *net = sock_net(sk); 14253 struct net *net = sock_net(sk);
13919 struct rtable *rt; 14254 struct rtable *rt;
@@ -13940,9 +14275,10 @@ diff -NurpP --minimal linux-3.4.48/include/net/route.h linux-3.4.48-vs2.3.3.9/in
13940 rt = __ip_route_output_key(net, fl4); 14275 rt = __ip_route_output_key(net, fl4);
13941 if (IS_ERR(rt)) 14276 if (IS_ERR(rt))
13942 return rt; 14277 return rt;
13943diff -NurpP --minimal linux-3.4.48/include/net/sock.h linux-3.4.48-vs2.3.3.9/include/net/sock.h 14278diff --git a/include/net/sock.h b/include/net/sock.h
13944--- linux-3.4.48/include/net/sock.h 2013-06-13 08:59:36.000000000 +0000 14279index f673ba5..88fe8a5 100644
13945+++ linux-3.4.48-vs2.3.3.9/include/net/sock.h 2013-03-02 15:26:44.000000000 +0000 14280--- a/include/net/sock.h
14281+++ b/include/net/sock.h
13946@@ -170,6 +170,10 @@ struct sock_common { 14282@@ -170,6 +170,10 @@ struct sock_common {
13947 #ifdef CONFIG_NET_NS 14283 #ifdef CONFIG_NET_NS
13948 struct net *skc_net; 14284 struct net *skc_net;
@@ -13965,9 +14301,10 @@ diff -NurpP --minimal linux-3.4.48/include/net/sock.h linux-3.4.48-vs2.3.3.9/inc
13965 socket_lock_t sk_lock; 14301 socket_lock_t sk_lock;
13966 struct sk_buff_head sk_receive_queue; 14302 struct sk_buff_head sk_receive_queue;
13967 /* 14303 /*
13968diff -NurpP --minimal linux-3.4.48/init/Kconfig linux-3.4.48-vs2.3.3.9/init/Kconfig 14304diff --git a/init/Kconfig b/init/Kconfig
13969--- linux-3.4.48/init/Kconfig 2012-05-21 16:07:33.000000000 +0000 14305index 6cfd71d..0e1c0f5 100644
13970+++ linux-3.4.48-vs2.3.3.9/init/Kconfig 2012-05-21 16:15:05.000000000 +0000 14306--- a/init/Kconfig
14307+++ b/init/Kconfig
13971@@ -579,6 +579,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK 14308@@ -579,6 +579,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
13972 menuconfig CGROUPS 14309 menuconfig CGROUPS
13973 boolean "Control Group support" 14310 boolean "Control Group support"
@@ -13984,9 +14321,10 @@ diff -NurpP --minimal linux-3.4.48/init/Kconfig linux-3.4.48-vs2.3.3.9/init/Kcon
13984 default y 14321 default y
13985 help 14322 help
13986 This allows containers, i.e. vservers, to use user namespaces 14323 This allows containers, i.e. vservers, to use user namespaces
13987diff -NurpP --minimal linux-3.4.48/init/main.c linux-3.4.48-vs2.3.3.9/init/main.c 14324diff --git a/init/main.c b/init/main.c
13988--- linux-3.4.48/init/main.c 2013-06-13 08:59:37.000000000 +0000 14325index 02c1384..98a0bd8 100644
13989+++ linux-3.4.48-vs2.3.3.9/init/main.c 2013-02-19 14:42:56.000000000 +0000 14326--- a/init/main.c
14327+++ b/init/main.c
13990@@ -68,6 +68,7 @@ 14328@@ -68,6 +68,7 @@
13991 #include <linux/shmem_fs.h> 14329 #include <linux/shmem_fs.h>
13992 #include <linux/slab.h> 14330 #include <linux/slab.h>
@@ -13995,9 +14333,10 @@ diff -NurpP --minimal linux-3.4.48/init/main.c linux-3.4.48-vs2.3.3.9/init/main.
13995 14333
13996 #include <asm/io.h> 14334 #include <asm/io.h>
13997 #include <asm/bugs.h> 14335 #include <asm/bugs.h>
13998diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueue.c 14336diff --git a/ipc/mqueue.c b/ipc/mqueue.c
13999--- linux-3.4.48/ipc/mqueue.c 2012-05-21 16:07:34.000000000 +0000 14337index 28bd64d..fb05d4e 100644
14000+++ linux-3.4.48-vs2.3.3.9/ipc/mqueue.c 2012-05-21 16:15:05.000000000 +0000 14338--- a/ipc/mqueue.c
14339+++ b/ipc/mqueue.c
14001@@ -34,6 +34,8 @@ 14340@@ -34,6 +34,8 @@
14002 #include <linux/ipc_namespace.h> 14341 #include <linux/ipc_namespace.h>
14003 #include <linux/user_namespace.h> 14342 #include <linux/user_namespace.h>
@@ -14015,7 +14354,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueu
14015 struct sock *notify_sock; 14354 struct sock *notify_sock;
14016 struct sk_buff *notify_cookie; 14355 struct sk_buff *notify_cookie;
14017 14356
14018@@ -129,6 +132,7 @@ static struct inode *mqueue_get_inode(st 14357@@ -129,6 +132,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
14019 if (S_ISREG(mode)) { 14358 if (S_ISREG(mode)) {
14020 struct mqueue_inode_info *info; 14359 struct mqueue_inode_info *info;
14021 unsigned long mq_bytes, mq_msg_tblsz; 14360 unsigned long mq_bytes, mq_msg_tblsz;
@@ -14023,7 +14362,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueu
14023 14362
14024 inode->i_fop = &mqueue_file_operations; 14363 inode->i_fop = &mqueue_file_operations;
14025 inode->i_size = FILENT_SIZE; 14364 inode->i_size = FILENT_SIZE;
14026@@ -141,6 +145,7 @@ static struct inode *mqueue_get_inode(st 14365@@ -141,6 +145,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
14027 info->notify_owner = NULL; 14366 info->notify_owner = NULL;
14028 info->qsize = 0; 14367 info->qsize = 0;
14029 info->user = NULL; /* set when all is ok */ 14368 info->user = NULL; /* set when all is ok */
@@ -14031,7 +14370,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueu
14031 memset(&info->attr, 0, sizeof(info->attr)); 14370 memset(&info->attr, 0, sizeof(info->attr));
14032 info->attr.mq_maxmsg = ipc_ns->mq_msg_max; 14371 info->attr.mq_maxmsg = ipc_ns->mq_msg_max;
14033 info->attr.mq_msgsize = ipc_ns->mq_msgsize_max; 14372 info->attr.mq_msgsize = ipc_ns->mq_msgsize_max;
14034@@ -158,17 +163,20 @@ static struct inode *mqueue_get_inode(st 14373@@ -158,17 +163,20 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
14035 14374
14036 spin_lock(&mq_lock); 14375 spin_lock(&mq_lock);
14037 if (u->mq_bytes + mq_bytes < u->mq_bytes || 14376 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
@@ -14053,7 +14392,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueu
14053 } else if (S_ISDIR(mode)) { 14392 } else if (S_ISDIR(mode)) {
14054 inc_nlink(inode); 14393 inc_nlink(inode);
14055 /* Some things misbehave if size == 0 on a directory */ 14394 /* Some things misbehave if size == 0 on a directory */
14056@@ -267,8 +275,11 @@ static void mqueue_evict_inode(struct in 14395@@ -267,8 +275,11 @@ static void mqueue_evict_inode(struct inode *inode)
14057 + info->attr.mq_msgsize); 14396 + info->attr.mq_msgsize);
14058 user = info->user; 14397 user = info->user;
14059 if (user) { 14398 if (user) {
@@ -14065,7 +14404,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueu
14065 /* 14404 /*
14066 * get_ns_from_inode() ensures that the 14405 * get_ns_from_inode() ensures that the
14067 * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns 14406 * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
14068@@ -278,6 +289,7 @@ static void mqueue_evict_inode(struct in 14407@@ -278,6 +289,7 @@ static void mqueue_evict_inode(struct inode *inode)
14069 if (ipc_ns) 14408 if (ipc_ns)
14070 ipc_ns->mq_queues_count--; 14409 ipc_ns->mq_queues_count--;
14071 spin_unlock(&mq_lock); 14410 spin_unlock(&mq_lock);
@@ -14073,9 +14412,10 @@ diff -NurpP --minimal linux-3.4.48/ipc/mqueue.c linux-3.4.48-vs2.3.3.9/ipc/mqueu
14073 free_uid(user); 14412 free_uid(user);
14074 } 14413 }
14075 if (ipc_ns) 14414 if (ipc_ns)
14076diff -NurpP --minimal linux-3.4.48/ipc/msg.c linux-3.4.48-vs2.3.3.9/ipc/msg.c 14415diff --git a/ipc/msg.c b/ipc/msg.c
14077--- linux-3.4.48/ipc/msg.c 2011-05-22 14:17:59.000000000 +0000 14416index 7385de2..bce069a 100644
14078+++ linux-3.4.48-vs2.3.3.9/ipc/msg.c 2012-05-21 16:15:05.000000000 +0000 14417--- a/ipc/msg.c
14418+++ b/ipc/msg.c
14079@@ -37,6 +37,7 @@ 14419@@ -37,6 +37,7 @@
14080 #include <linux/rwsem.h> 14420 #include <linux/rwsem.h>
14081 #include <linux/nsproxy.h> 14421 #include <linux/nsproxy.h>
@@ -14084,7 +14424,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/msg.c linux-3.4.48-vs2.3.3.9/ipc/msg.c
14084 14424
14085 #include <asm/current.h> 14425 #include <asm/current.h>
14086 #include <asm/uaccess.h> 14426 #include <asm/uaccess.h>
14087@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace * 14427@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
14088 14428
14089 msq->q_perm.mode = msgflg & S_IRWXUGO; 14429 msq->q_perm.mode = msgflg & S_IRWXUGO;
14090 msq->q_perm.key = key; 14430 msq->q_perm.key = key;
@@ -14092,9 +14432,10 @@ diff -NurpP --minimal linux-3.4.48/ipc/msg.c linux-3.4.48-vs2.3.3.9/ipc/msg.c
14092 14432
14093 msq->q_perm.security = NULL; 14433 msq->q_perm.security = NULL;
14094 retval = security_msg_queue_alloc(msq); 14434 retval = security_msg_queue_alloc(msq);
14095diff -NurpP --minimal linux-3.4.48/ipc/namespace.c linux-3.4.48-vs2.3.3.9/ipc/namespace.c 14435diff --git a/ipc/namespace.c b/ipc/namespace.c
14096--- linux-3.4.48/ipc/namespace.c 2011-07-22 09:18:12.000000000 +0000 14436index ce0a647..2999f1a 100644
14097+++ linux-3.4.48-vs2.3.3.9/ipc/namespace.c 2012-05-21 16:15:05.000000000 +0000 14437--- a/ipc/namespace.c
14438+++ b/ipc/namespace.c
14098@@ -13,11 +13,12 @@ 14439@@ -13,11 +13,12 @@
14099 #include <linux/mount.h> 14440 #include <linux/mount.h>
14100 #include <linux/user_namespace.h> 14441 #include <linux/user_namespace.h>
@@ -14110,7 +14451,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/namespace.c linux-3.4.48-vs2.3.3.9/ipc/na
14110 { 14451 {
14111 struct ipc_namespace *ns; 14452 struct ipc_namespace *ns;
14112 int err; 14453 int err;
14113@@ -46,19 +47,18 @@ static struct ipc_namespace *create_ipc_ 14454@@ -46,19 +47,18 @@ static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
14114 ipcns_notify(IPCNS_CREATED); 14455 ipcns_notify(IPCNS_CREATED);
14115 register_ipcns_notifier(ns); 14456 register_ipcns_notifier(ns);
14116 14457
@@ -14135,9 +14476,10 @@ diff -NurpP --minimal linux-3.4.48/ipc/namespace.c linux-3.4.48-vs2.3.3.9/ipc/na
14135 } 14476 }
14136 14477
14137 /* 14478 /*
14138diff -NurpP --minimal linux-3.4.48/ipc/sem.c linux-3.4.48-vs2.3.3.9/ipc/sem.c 14479diff --git a/ipc/sem.c b/ipc/sem.c
14139--- linux-3.4.48/ipc/sem.c 2012-01-09 15:14:59.000000000 +0000 14480index 5215a81..c66a364 100644
14140+++ linux-3.4.48-vs2.3.3.9/ipc/sem.c 2012-05-21 16:15:05.000000000 +0000 14481--- a/ipc/sem.c
14482+++ b/ipc/sem.c
14141@@ -86,6 +86,8 @@ 14483@@ -86,6 +86,8 @@
14142 #include <linux/rwsem.h> 14484 #include <linux/rwsem.h>
14143 #include <linux/nsproxy.h> 14485 #include <linux/nsproxy.h>
@@ -14147,7 +14489,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/sem.c linux-3.4.48-vs2.3.3.9/ipc/sem.c
14147 14489
14148 #include <asm/uaccess.h> 14490 #include <asm/uaccess.h>
14149 #include "util.h" 14491 #include "util.h"
14150@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace * 14492@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
14151 14493
14152 sma->sem_perm.mode = (semflg & S_IRWXUGO); 14494 sma->sem_perm.mode = (semflg & S_IRWXUGO);
14153 sma->sem_perm.key = key; 14495 sma->sem_perm.key = key;
@@ -14155,7 +14497,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/sem.c linux-3.4.48-vs2.3.3.9/ipc/sem.c
14155 14497
14156 sma->sem_perm.security = NULL; 14498 sma->sem_perm.security = NULL;
14157 retval = security_sem_alloc(sma); 14499 retval = security_sem_alloc(sma);
14158@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace * 14500@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
14159 return id; 14501 return id;
14160 } 14502 }
14161 ns->used_sems += nsems; 14503 ns->used_sems += nsems;
@@ -14165,7 +14507,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/sem.c linux-3.4.48-vs2.3.3.9/ipc/sem.c
14165 14507
14166 sma->sem_base = (struct sem *) &sma[1]; 14508 sma->sem_base = (struct sem *) &sma[1];
14167 14509
14168@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace 14510@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
14169 14511
14170 wake_up_sem_queue_do(&tasks); 14512 wake_up_sem_queue_do(&tasks);
14171 ns->used_sems -= sma->sem_nsems; 14513 ns->used_sems -= sma->sem_nsems;
@@ -14175,9 +14517,10 @@ diff -NurpP --minimal linux-3.4.48/ipc/sem.c linux-3.4.48-vs2.3.3.9/ipc/sem.c
14175 security_sem_free(sma); 14517 security_sem_free(sma);
14176 ipc_rcu_putref(sma); 14518 ipc_rcu_putref(sma);
14177 } 14519 }
14178diff -NurpP --minimal linux-3.4.48/ipc/shm.c linux-3.4.48-vs2.3.3.9/ipc/shm.c 14520diff --git a/ipc/shm.c b/ipc/shm.c
14179--- linux-3.4.48/ipc/shm.c 2012-05-21 16:07:34.000000000 +0000 14521index a02ef57..18dc4bc 100644
14180+++ linux-3.4.48-vs2.3.3.9/ipc/shm.c 2013-06-13 09:46:39.000000000 +0000 14522--- a/ipc/shm.c
14523+++ b/ipc/shm.c
14181@@ -39,6 +39,8 @@ 14524@@ -39,6 +39,8 @@
14182 #include <linux/nsproxy.h> 14525 #include <linux/nsproxy.h>
14183 #include <linux/mount.h> 14526 #include <linux/mount.h>
@@ -14187,7 +14530,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/shm.c linux-3.4.48-vs2.3.3.9/ipc/shm.c
14187 14530
14188 #include <asm/uaccess.h> 14531 #include <asm/uaccess.h>
14189 14532
14190@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru 14533@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_struct *vma)
14191 */ 14534 */
14192 static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) 14535 static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
14193 { 14536 {
@@ -14201,7 +14544,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/shm.c linux-3.4.48-vs2.3.3.9/ipc/shm.c
14201 shm_rmid(ns, shp); 14544 shm_rmid(ns, shp);
14202 shm_unlock(shp); 14545 shm_unlock(shp);
14203 if (!is_file_hugepages(shp->shm_file)) 14546 if (!is_file_hugepages(shp->shm_file))
14204@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names 14547@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
14205 shp->mlock_user); 14548 shp->mlock_user);
14206 fput (shp->shm_file); 14549 fput (shp->shm_file);
14207 security_shm_free(shp); 14550 security_shm_free(shp);
@@ -14209,7 +14552,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/shm.c linux-3.4.48-vs2.3.3.9/ipc/shm.c
14209 ipc_rcu_putref(shp); 14552 ipc_rcu_putref(shp);
14210 } 14553 }
14211 14554
14212@@ -462,11 +470,15 @@ static int newseg(struct ipc_namespace * 14555@@ -462,11 +470,15 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
14213 if (ns->shm_tot + numpages > ns->shm_ctlall) 14556 if (ns->shm_tot + numpages > ns->shm_ctlall)
14214 return -ENOSPC; 14557 return -ENOSPC;
14215 14558
@@ -14225,7 +14568,7 @@ diff -NurpP --minimal linux-3.4.48/ipc/shm.c linux-3.4.48-vs2.3.3.9/ipc/shm.c
14225 shp->shm_perm.mode = (shmflg & S_IRWXUGO); 14568 shp->shm_perm.mode = (shmflg & S_IRWXUGO);
14226 shp->mlock_user = NULL; 14569 shp->mlock_user = NULL;
14227 14570
14228@@ -521,6 +533,7 @@ static int newseg(struct ipc_namespace * 14571@@ -523,6 +535,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
14229 ns->shm_tot += numpages; 14572 ns->shm_tot += numpages;
14230 error = shp->shm_perm.id; 14573 error = shp->shm_perm.id;
14231 shm_unlock(shp); 14574 shm_unlock(shp);
@@ -14233,9 +14576,10 @@ diff -NurpP --minimal linux-3.4.48/ipc/shm.c linux-3.4.48-vs2.3.3.9/ipc/shm.c
14233 return error; 14576 return error;
14234 14577
14235 no_id: 14578 no_id:
14236diff -NurpP --minimal linux-3.4.48/kernel/Makefile linux-3.4.48-vs2.3.3.9/kernel/Makefile 14579diff --git a/kernel/Makefile b/kernel/Makefile
14237--- linux-3.4.48/kernel/Makefile 2012-05-21 16:07:34.000000000 +0000 14580index cb41b95..da2903a 100644
14238+++ linux-3.4.48-vs2.3.3.9/kernel/Makefile 2012-05-21 16:15:05.000000000 +0000 14581--- a/kernel/Makefile
14582+++ b/kernel/Makefile
14239@@ -25,6 +25,7 @@ endif 14583@@ -25,6 +25,7 @@ endif
14240 obj-y += sched/ 14584 obj-y += sched/
14241 obj-y += power/ 14585 obj-y += power/
@@ -14244,9 +14588,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/Makefile linux-3.4.48-vs2.3.3.9/kernel
14244 obj-$(CONFIG_FREEZER) += freezer.o 14588 obj-$(CONFIG_FREEZER) += freezer.o
14245 obj-$(CONFIG_PROFILING) += profile.o 14589 obj-$(CONFIG_PROFILING) += profile.o
14246 obj-$(CONFIG_STACKTRACE) += stacktrace.o 14590 obj-$(CONFIG_STACKTRACE) += stacktrace.o
14247diff -NurpP --minimal linux-3.4.48/kernel/auditsc.c linux-3.4.48-vs2.3.3.9/kernel/auditsc.c 14591diff --git a/kernel/auditsc.c b/kernel/auditsc.c
14248--- linux-3.4.48/kernel/auditsc.c 2012-03-19 18:47:29.000000000 +0000 14592index af1de0f..467e922 100644
14249+++ linux-3.4.48-vs2.3.3.9/kernel/auditsc.c 2012-05-21 16:15:05.000000000 +0000 14593--- a/kernel/auditsc.c
14594+++ b/kernel/auditsc.c
14250@@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid) 14595@@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid)
14251 if (task->loginuid != -1) 14596 if (task->loginuid != -1)
14252 return -EPERM; 14597 return -EPERM;
@@ -14256,9 +14601,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/auditsc.c linux-3.4.48-vs2.3.3.9/kerne
14256 return -EPERM; 14601 return -EPERM;
14257 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ 14602 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
14258 14603
14259diff -NurpP --minimal linux-3.4.48/kernel/capability.c linux-3.4.48-vs2.3.3.9/kernel/capability.c 14604diff --git a/kernel/capability.c b/kernel/capability.c
14260--- linux-3.4.48/kernel/capability.c 2012-03-19 18:47:29.000000000 +0000 14605index 3f1adb6..3b88352 100644
14261+++ linux-3.4.48-vs2.3.3.9/kernel/capability.c 2012-05-21 16:15:05.000000000 +0000 14606--- a/kernel/capability.c
14607+++ b/kernel/capability.c
14262@@ -15,6 +15,7 @@ 14608@@ -15,6 +15,7 @@
14263 #include <linux/syscalls.h> 14609 #include <linux/syscalls.h>
14264 #include <linux/pid_namespace.h> 14610 #include <linux/pid_namespace.h>
@@ -14267,7 +14613,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/capability.c linux-3.4.48-vs2.3.3.9/ke
14267 #include <asm/uaccess.h> 14613 #include <asm/uaccess.h>
14268 14614
14269 /* 14615 /*
14270@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h 14616@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_header_t header, unsigned *tocopy)
14271 return 0; 14617 return 0;
14272 } 14618 }
14273 14619
@@ -14275,7 +14621,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/capability.c linux-3.4.48-vs2.3.3.9/ke
14275 /* 14621 /*
14276 * The only thing that can change the capabilities of the current 14622 * The only thing that can change the capabilities of the current
14277 * process is the current process. As such, we can't be in this code 14623 * process is the current process. As such, we can't be in this code
14278@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta 14624@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct task_struct *t,
14279 return (ret == 0); 14625 return (ret == 0);
14280 } 14626 }
14281 14627
@@ -14284,10 +14630,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/capability.c linux-3.4.48-vs2.3.3.9/ke
14284 /** 14630 /**
14285 * has_capability_noaudit - Does a task have a capability (unaudited) in the 14631 * has_capability_noaudit - Does a task have a capability (unaudited) in the
14286 * initial user ns 14632 * initial user ns
14287diff -NurpP --minimal linux-3.4.48/kernel/compat.c linux-3.4.48-vs2.3.3.9/kernel/compat.c 14633diff --git a/kernel/compat.c b/kernel/compat.c
14288--- linux-3.4.48/kernel/compat.c 2012-05-21 16:07:34.000000000 +0000 14634index d2c67aa..3e61099 100644
14289+++ linux-3.4.48-vs2.3.3.9/kernel/compat.c 2012-05-21 16:15:05.000000000 +0000 14635--- a/kernel/compat.c
14290@@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_ 14636+++ b/kernel/compat.c
14637@@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_time_t __user *tptr)
14291 if (err) 14638 if (err)
14292 return err; 14639 return err;
14293 14640
@@ -14296,9 +14643,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/compat.c linux-3.4.48-vs2.3.3.9/kernel
14296 return 0; 14643 return 0;
14297 } 14644 }
14298 14645
14299diff -NurpP --minimal linux-3.4.48/kernel/cred.c linux-3.4.48-vs2.3.3.9/kernel/cred.c 14646diff --git a/kernel/cred.c b/kernel/cred.c
14300--- linux-3.4.48/kernel/cred.c 2012-05-21 16:07:34.000000000 +0000 14647index e70683d..ed884ddf 100644
14301+++ linux-3.4.48-vs2.3.3.9/kernel/cred.c 2012-05-21 16:15:05.000000000 +0000 14648--- a/kernel/cred.c
14649+++ b/kernel/cred.c
14302@@ -62,31 +62,6 @@ struct cred init_cred = { 14650@@ -62,31 +62,6 @@ struct cred init_cred = {
14303 #endif 14651 #endif
14304 }; 14652 };
@@ -14368,9 +14716,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/cred.c linux-3.4.48-vs2.3.3.9/kernel/c
14368 EXPORT_SYMBOL(prepare_creds); 14716 EXPORT_SYMBOL(prepare_creds);
14369 14717
14370 /* 14718 /*
14371diff -NurpP --minimal linux-3.4.48/kernel/exit.c linux-3.4.48-vs2.3.3.9/kernel/exit.c 14719diff --git a/kernel/exit.c b/kernel/exit.c
14372--- linux-3.4.48/kernel/exit.c 2013-06-13 08:59:37.000000000 +0000 14720index bfbd856..f8cc8f7 100644
14373+++ linux-3.4.48-vs2.3.3.9/kernel/exit.c 2012-12-08 00:54:06.000000000 +0000 14721--- a/kernel/exit.c
14722+++ b/kernel/exit.c
14374@@ -48,6 +48,10 @@ 14723@@ -48,6 +48,10 @@
14375 #include <linux/fs_struct.h> 14724 #include <linux/fs_struct.h>
14376 #include <linux/init_task.h> 14725 #include <linux/init_task.h>
@@ -14382,7 +14731,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/exit.c linux-3.4.48-vs2.3.3.9/kernel/e
14382 #include <trace/events/sched.h> 14731 #include <trace/events/sched.h>
14383 #include <linux/hw_breakpoint.h> 14732 #include <linux/hw_breakpoint.h>
14384 #include <linux/oom.h> 14733 #include <linux/oom.h>
14385@@ -482,9 +486,11 @@ static void close_files(struct files_str 14734@@ -482,9 +486,11 @@ static void close_files(struct files_struct * files)
14386 filp_close(file, files); 14735 filp_close(file, files);
14387 cond_resched(); 14736 cond_resched();
14388 } 14737 }
@@ -14394,7 +14743,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/exit.c linux-3.4.48-vs2.3.3.9/kernel/e
14394 } 14743 }
14395 } 14744 }
14396 } 14745 }
14397@@ -699,15 +705,25 @@ static struct task_struct *find_new_reap 14746@@ -699,15 +705,25 @@ static struct task_struct *find_new_reaper(struct task_struct *father)
14398 __acquires(&tasklist_lock) 14747 __acquires(&tasklist_lock)
14399 { 14748 {
14400 struct pid_namespace *pid_ns = task_active_pid_ns(father); 14749 struct pid_namespace *pid_ns = task_active_pid_ns(father);
@@ -14423,7 +14772,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/exit.c linux-3.4.48-vs2.3.3.9/kernel/e
14423 } 14772 }
14424 14773
14425 if (unlikely(pid_ns->child_reaper == father)) { 14774 if (unlikely(pid_ns->child_reaper == father)) {
14426@@ -751,7 +767,9 @@ static struct task_struct *find_new_reap 14775@@ -751,7 +767,9 @@ static struct task_struct *find_new_reaper(struct task_struct *father)
14427 } 14776 }
14428 } 14777 }
14429 14778
@@ -14434,7 +14783,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/exit.c linux-3.4.48-vs2.3.3.9/kernel/e
14434 } 14783 }
14435 14784
14436 /* 14785 /*
14437@@ -802,10 +820,15 @@ static void forget_original_parent(struc 14786@@ -802,10 +820,15 @@ static void forget_original_parent(struct task_struct *father)
14438 list_for_each_entry_safe(p, n, &father->children, sibling) { 14787 list_for_each_entry_safe(p, n, &father->children, sibling) {
14439 struct task_struct *t = p; 14788 struct task_struct *t = p;
14440 do { 14789 do {
@@ -14478,9 +14827,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/exit.c linux-3.4.48-vs2.3.3.9/kernel/e
14478 BUG(); 14827 BUG();
14479 /* Avoid "noreturn function does return". */ 14828 /* Avoid "noreturn function does return". */
14480 for (;;) 14829 for (;;)
14481diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/fork.c 14830diff --git a/kernel/fork.c b/kernel/fork.c
14482--- linux-3.4.48/kernel/fork.c 2013-06-13 08:59:37.000000000 +0000 14831index 8163333..33a7b9c 100644
14483+++ linux-3.4.48-vs2.3.3.9/kernel/fork.c 2012-06-28 14:45:07.000000000 +0000 14832--- a/kernel/fork.c
14833+++ b/kernel/fork.c
14484@@ -68,6 +68,9 @@ 14834@@ -68,6 +68,9 @@
14485 #include <linux/oom.h> 14835 #include <linux/oom.h>
14486 #include <linux/khugepaged.h> 14836 #include <linux/khugepaged.h>
@@ -14500,7 +14850,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/f
14500 ftrace_graph_exit_task(tsk); 14850 ftrace_graph_exit_task(tsk);
14501 free_task_struct(tsk); 14851 free_task_struct(tsk);
14502 } 14852 }
14503@@ -507,6 +512,7 @@ static struct mm_struct *mm_init(struct 14853@@ -507,6 +512,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p)
14504 if (likely(!mm_alloc_pgd(mm))) { 14854 if (likely(!mm_alloc_pgd(mm))) {
14505 mm->def_flags = 0; 14855 mm->def_flags = 0;
14506 mmu_notifier_mm_init(mm); 14856 mmu_notifier_mm_init(mm);
@@ -14516,7 +14866,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/f
14516 free_mm(mm); 14866 free_mm(mm);
14517 } 14867 }
14518 EXPORT_SYMBOL_GPL(__mmdrop); 14868 EXPORT_SYMBOL_GPL(__mmdrop);
14519@@ -794,6 +801,7 @@ struct mm_struct *dup_mm(struct task_str 14869@@ -794,6 +801,7 @@ struct mm_struct *dup_mm(struct task_struct *tsk)
14520 goto fail_nomem; 14870 goto fail_nomem;
14521 14871
14522 memcpy(mm, oldmm, sizeof(*mm)); 14872 memcpy(mm, oldmm, sizeof(*mm));
@@ -14532,7 +14882,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/f
14532 mm_free_pgd(mm); 14882 mm_free_pgd(mm);
14533 free_mm(mm); 14883 free_mm(mm);
14534 return NULL; 14884 return NULL;
14535@@ -1125,6 +1134,8 @@ static struct task_struct *copy_process( 14885@@ -1125,6 +1134,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
14536 int retval; 14886 int retval;
14537 struct task_struct *p; 14887 struct task_struct *p;
14538 int cgroup_callbacks_done = 0; 14888 int cgroup_callbacks_done = 0;
@@ -14541,7 +14891,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/f
14541 14891
14542 if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) 14892 if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
14543 return ERR_PTR(-EINVAL); 14893 return ERR_PTR(-EINVAL);
14544@@ -1171,7 +1182,12 @@ static struct task_struct *copy_process( 14894@@ -1171,7 +1182,12 @@ static struct task_struct *copy_process(unsigned long clone_flags,
14545 DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); 14895 DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
14546 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); 14896 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
14547 #endif 14897 #endif
@@ -14554,7 +14904,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/f
14554 if (atomic_read(&p->real_cred->user->processes) >= 14904 if (atomic_read(&p->real_cred->user->processes) >=
14555 task_rlimit(p, RLIMIT_NPROC)) { 14905 task_rlimit(p, RLIMIT_NPROC)) {
14556 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && 14906 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
14557@@ -1448,6 +1464,18 @@ static struct task_struct *copy_process( 14907@@ -1448,6 +1464,18 @@ static struct task_struct *copy_process(unsigned long clone_flags,
14558 14908
14559 total_forks++; 14909 total_forks++;
14560 spin_unlock(&current->sighand->siglock); 14910 spin_unlock(&current->sighand->siglock);
@@ -14573,9 +14923,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/fork.c linux-3.4.48-vs2.3.3.9/kernel/f
14573 write_unlock_irq(&tasklist_lock); 14923 write_unlock_irq(&tasklist_lock);
14574 proc_fork_connector(p); 14924 proc_fork_connector(p);
14575 cgroup_post_fork(p); 14925 cgroup_post_fork(p);
14576diff -NurpP --minimal linux-3.4.48/kernel/kthread.c linux-3.4.48-vs2.3.3.9/kernel/kthread.c 14926diff --git a/kernel/kthread.c b/kernel/kthread.c
14577--- linux-3.4.48/kernel/kthread.c 2013-06-13 08:59:37.000000000 +0000 14927index b579af5..faa5fc9 100644
14578+++ linux-3.4.48-vs2.3.3.9/kernel/kthread.c 2012-10-22 13:09:53.000000000 +0000 14928--- a/kernel/kthread.c
14929+++ b/kernel/kthread.c
14579@@ -16,6 +16,7 @@ 14930@@ -16,6 +16,7 @@
14580 #include <linux/mutex.h> 14931 #include <linux/mutex.h>
14581 #include <linux/slab.h> 14932 #include <linux/slab.h>
@@ -14584,9 +14935,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/kthread.c linux-3.4.48-vs2.3.3.9/kerne
14584 #include <trace/events/sched.h> 14935 #include <trace/events/sched.h>
14585 14936
14586 static DEFINE_SPINLOCK(kthread_create_lock); 14937 static DEFINE_SPINLOCK(kthread_create_lock);
14587diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kernel/nsproxy.c 14938diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
14588--- linux-3.4.48/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000 14939index b576f7f..a358f98 100644
14589+++ linux-3.4.48-vs2.3.3.9/kernel/nsproxy.c 2012-05-21 16:15:05.000000000 +0000 14940--- a/kernel/nsproxy.c
14941+++ b/kernel/nsproxy.c
14590@@ -20,11 +20,14 @@ 14942@@ -20,11 +20,14 @@
14591 #include <linux/mnt_namespace.h> 14943 #include <linux/mnt_namespace.h>
14592 #include <linux/utsname.h> 14944 #include <linux/utsname.h>
@@ -14602,7 +14954,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kerne
14602 14954
14603 static struct kmem_cache *nsproxy_cachep; 14955 static struct kmem_cache *nsproxy_cachep;
14604 14956
14605@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp 14957@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsproxy(void)
14606 struct nsproxy *nsproxy; 14958 struct nsproxy *nsproxy;
14607 14959
14608 nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL); 14960 nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
@@ -14615,7 +14967,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kerne
14615 return nsproxy; 14967 return nsproxy;
14616 } 14968 }
14617 14969
14618@@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsp 14970@@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsproxy(void)
14619 * Return the newly created nsproxy. Do not attach this to the task, 14971 * Return the newly created nsproxy. Do not attach this to the task,
14620 * leave it to the caller to do proper locking and attach it to task. 14972 * leave it to the caller to do proper locking and attach it to task.
14621 */ 14973 */
@@ -14629,7 +14981,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kerne
14629 { 14981 {
14630 struct nsproxy *new_nsp; 14982 struct nsproxy *new_nsp;
14631 int err; 14983 int err;
14632@@ -66,31 +75,31 @@ static struct nsproxy *create_new_namesp 14984@@ -66,31 +75,31 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
14633 if (!new_nsp) 14985 if (!new_nsp)
14634 return ERR_PTR(-ENOMEM); 14986 return ERR_PTR(-ENOMEM);
14635 14987
@@ -14721,7 +15073,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kerne
14721 if (!old_ns) 15073 if (!old_ns)
14722 return 0; 15074 return 0;
14723 15075
14724@@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags, 15076@@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
14725 CLONE_NEWPID | CLONE_NEWNET))) 15077 CLONE_NEWPID | CLONE_NEWNET)))
14726 return 0; 15078 return 0;
14727 15079
@@ -14730,7 +15082,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kerne
14730 err = -EPERM; 15082 err = -EPERM;
14731 goto out; 15083 goto out;
14732 } 15084 }
14733@@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags, 15085@@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
14734 15086
14735 out: 15087 out:
14736 put_nsproxy(old_ns); 15088 put_nsproxy(old_ns);
@@ -14751,7 +15103,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kerne
14751 kmem_cache_free(nsproxy_cachep, ns); 15103 kmem_cache_free(nsproxy_cachep, ns);
14752 } 15104 }
14753 15105
14754@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned 15106@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
14755 { 15107 {
14756 int err = 0; 15108 int err = 0;
14757 15109
@@ -14768,9 +15120,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/nsproxy.c linux-3.4.48-vs2.3.3.9/kerne
14768 return -EPERM; 15120 return -EPERM;
14769 15121
14770 *new_nsp = create_new_namespaces(unshare_flags, current, 15122 *new_nsp = create_new_namespaces(unshare_flags, current,
14771diff -NurpP --minimal linux-3.4.48/kernel/pid.c linux-3.4.48-vs2.3.3.9/kernel/pid.c 15123diff --git a/kernel/pid.c b/kernel/pid.c
14772--- linux-3.4.48/kernel/pid.c 2012-03-19 18:47:30.000000000 +0000 15124index 9f08dfa..46c1be0 100644
14773+++ linux-3.4.48-vs2.3.3.9/kernel/pid.c 2012-05-21 16:15:05.000000000 +0000 15125--- a/kernel/pid.c
15126+++ b/kernel/pid.c
14774@@ -36,6 +36,7 @@ 15127@@ -36,6 +36,7 @@
14775 #include <linux/pid_namespace.h> 15128 #include <linux/pid_namespace.h>
14776 #include <linux/init_task.h> 15129 #include <linux/init_task.h>
@@ -14788,7 +15141,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/pid.c linux-3.4.48-vs2.3.3.9/kernel/pi
14788 } 15141 }
14789 EXPORT_SYMBOL_GPL(find_vpid); 15142 EXPORT_SYMBOL_GPL(find_vpid);
14790 15143
14791@@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *ol 15144@@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *old, struct task_struct *new,
14792 struct task_struct *pid_task(struct pid *pid, enum pid_type type) 15145 struct task_struct *pid_task(struct pid *pid, enum pid_type type)
14793 { 15146 {
14794 struct task_struct *result = NULL; 15147 struct task_struct *result = NULL;
@@ -14798,7 +15151,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/pid.c linux-3.4.48-vs2.3.3.9/kernel/pi
14798 if (pid) { 15151 if (pid) {
14799 struct hlist_node *first; 15152 struct hlist_node *first;
14800 first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]), 15153 first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
14801@@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns( 15154@@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
14802 rcu_lockdep_assert(rcu_read_lock_held(), 15155 rcu_lockdep_assert(rcu_read_lock_held(),
14803 "find_task_by_pid_ns() needs rcu_read_lock()" 15156 "find_task_by_pid_ns() needs rcu_read_lock()"
14804 " protection"); 15157 " protection");
@@ -14816,7 +15169,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/pid.c linux-3.4.48-vs2.3.3.9/kernel/pi
14816 { 15169 {
14817 struct upid *upid; 15170 struct upid *upid;
14818 pid_t nr = 0; 15171 pid_t nr = 0;
14819@@ -480,6 +484,11 @@ pid_t pid_nr_ns(struct pid *pid, struct 15172@@ -480,6 +484,11 @@ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
14820 return nr; 15173 return nr;
14821 } 15174 }
14822 15175
@@ -14828,9 +15181,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/pid.c linux-3.4.48-vs2.3.3.9/kernel/pi
14828 pid_t pid_vnr(struct pid *pid) 15181 pid_t pid_vnr(struct pid *pid)
14829 { 15182 {
14830 return pid_nr_ns(pid, current->nsproxy->pid_ns); 15183 return pid_nr_ns(pid, current->nsproxy->pid_ns);
14831diff -NurpP --minimal linux-3.4.48/kernel/pid_namespace.c linux-3.4.48-vs2.3.3.9/kernel/pid_namespace.c 15184diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
14832--- linux-3.4.48/kernel/pid_namespace.c 2012-05-21 16:07:34.000000000 +0000 15185index 57bc1fd..f7ce229 100644
14833+++ linux-3.4.48-vs2.3.3.9/kernel/pid_namespace.c 2012-05-21 16:15:05.000000000 +0000 15186--- a/kernel/pid_namespace.c
15187+++ b/kernel/pid_namespace.c
14834@@ -16,6 +16,7 @@ 15188@@ -16,6 +16,7 @@
14835 #include <linux/slab.h> 15189 #include <linux/slab.h>
14836 #include <linux/proc_fs.h> 15190 #include <linux/proc_fs.h>
@@ -14839,7 +15193,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/pid_namespace.c linux-3.4.48-vs2.3.3.9
14839 15193
14840 #define BITS_PER_PAGE (PAGE_SIZE*8) 15194 #define BITS_PER_PAGE (PAGE_SIZE*8)
14841 15195
14842@@ -89,6 +90,7 @@ static struct pid_namespace *create_pid_ 15196@@ -89,6 +90,7 @@ static struct pid_namespace *create_pid_namespace(struct pid_namespace *parent_p
14843 goto out_free_map; 15197 goto out_free_map;
14844 15198
14845 kref_init(&ns->kref); 15199 kref_init(&ns->kref);
@@ -14847,7 +15201,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/pid_namespace.c linux-3.4.48-vs2.3.3.9
14847 ns->level = level; 15201 ns->level = level;
14848 ns->parent = get_pid_ns(parent_pid_ns); 15202 ns->parent = get_pid_ns(parent_pid_ns);
14849 15203
14850@@ -120,6 +122,7 @@ static void destroy_pid_namespace(struct 15204@@ -120,6 +122,7 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
14851 15205
14852 for (i = 0; i < PIDMAP_ENTRIES; i++) 15206 for (i = 0; i < PIDMAP_ENTRIES; i++)
14853 kfree(ns->pidmap[i].page); 15207 kfree(ns->pidmap[i].page);
@@ -14855,9 +15209,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/pid_namespace.c linux-3.4.48-vs2.3.3.9
14855 kmem_cache_free(pid_ns_cachep, ns); 15209 kmem_cache_free(pid_ns_cachep, ns);
14856 } 15210 }
14857 15211
14858diff -NurpP --minimal linux-3.4.48/kernel/posix-timers.c linux-3.4.48-vs2.3.3.9/kernel/posix-timers.c 15212diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
14859--- linux-3.4.48/kernel/posix-timers.c 2013-06-13 08:59:37.000000000 +0000 15213index e885be1..1be116d 100644
14860+++ linux-3.4.48-vs2.3.3.9/kernel/posix-timers.c 2013-03-30 21:29:17.000000000 +0000 15214--- a/kernel/posix-timers.c
15215+++ b/kernel/posix-timers.c
14861@@ -47,6 +47,7 @@ 15216@@ -47,6 +47,7 @@
14862 #include <linux/wait.h> 15217 #include <linux/wait.h>
14863 #include <linux/workqueue.h> 15218 #include <linux/workqueue.h>
@@ -14866,7 +15221,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/posix-timers.c linux-3.4.48-vs2.3.3.9/
14866 15221
14867 /* 15222 /*
14868 * Management arrays for POSIX timers. Timers are kept in slab memory 15223 * Management arrays for POSIX timers. Timers are kept in slab memory
14869@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t 15224@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *timr, int si_private)
14870 { 15225 {
14871 struct task_struct *task; 15226 struct task_struct *task;
14872 int shared, ret = -1; 15227 int shared, ret = -1;
@@ -14874,7 +15229,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/posix-timers.c linux-3.4.48-vs2.3.3.9/
14874 /* 15229 /*
14875 * FIXME: if ->sigq is queued we can race with 15230 * FIXME: if ->sigq is queued we can race with
14876 * dequeue_signal()->do_schedule_next_timer(). 15231 * dequeue_signal()->do_schedule_next_timer().
14877@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t 15232@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *timr, int si_private)
14878 rcu_read_lock(); 15233 rcu_read_lock();
14879 task = pid_task(timr->it_pid, PIDTYPE_PID); 15234 task = pid_task(timr->it_pid, PIDTYPE_PID);
14880 if (task) { 15235 if (task) {
@@ -14893,9 +15248,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/posix-timers.c linux-3.4.48-vs2.3.3.9/
14893 /* If we failed to send the signal the timer stops. */ 15248 /* If we failed to send the signal the timer stops. */
14894 return ret > 0; 15249 return ret > 0;
14895 } 15250 }
14896diff -NurpP --minimal linux-3.4.48/kernel/printk.c linux-3.4.48-vs2.3.3.9/kernel/printk.c 15251diff --git a/kernel/printk.c b/kernel/printk.c
14897--- linux-3.4.48/kernel/printk.c 2013-06-13 08:59:37.000000000 +0000 15252index e95c662..53fb49c 100644
14898+++ linux-3.4.48-vs2.3.3.9/kernel/printk.c 2013-03-02 15:26:44.000000000 +0000 15253--- a/kernel/printk.c
15254+++ b/kernel/printk.c
14899@@ -41,6 +41,7 @@ 15255@@ -41,6 +41,7 @@
14900 #include <linux/cpu.h> 15256 #include <linux/cpu.h>
14901 #include <linux/notifier.h> 15257 #include <linux/notifier.h>
@@ -14904,7 +15260,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/printk.c linux-3.4.48-vs2.3.3.9/kernel
14904 15260
14905 #include <asm/uaccess.h> 15261 #include <asm/uaccess.h>
14906 15262
14907@@ -317,7 +318,7 @@ static int check_syslog_permissions(int 15263@@ -317,7 +318,7 @@ static int check_syslog_permissions(int type, bool from_file)
14908 return 0; 15264 return 0;
14909 15265
14910 if (syslog_action_restricted(type)) { 15266 if (syslog_action_restricted(type)) {
@@ -14913,7 +15269,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/printk.c linux-3.4.48-vs2.3.3.9/kernel
14913 return 0; 15269 return 0;
14914 /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */ 15270 /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
14915 if (capable(CAP_SYS_ADMIN)) { 15271 if (capable(CAP_SYS_ADMIN)) {
14916@@ -347,12 +348,9 @@ int do_syslog(int type, char __user *buf 15272@@ -347,12 +348,9 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
14917 if (error) 15273 if (error)
14918 return error; 15274 return error;
14919 15275
@@ -14929,7 +15285,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/printk.c linux-3.4.48-vs2.3.3.9/kernel
14929 error = -EINVAL; 15285 error = -EINVAL;
14930 if (!buf || len < 0) 15286 if (!buf || len < 0)
14931 goto out; 15287 goto out;
14932@@ -363,6 +361,16 @@ int do_syslog(int type, char __user *buf 15288@@ -363,6 +361,16 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
14933 error = -EFAULT; 15289 error = -EFAULT;
14934 goto out; 15290 goto out;
14935 } 15291 }
@@ -14946,7 +15302,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/printk.c linux-3.4.48-vs2.3.3.9/kernel
14946 error = wait_event_interruptible(log_wait, 15302 error = wait_event_interruptible(log_wait,
14947 (log_start - log_end)); 15303 (log_start - log_end));
14948 if (error) 15304 if (error)
14949@@ -389,16 +397,6 @@ int do_syslog(int type, char __user *buf 15305@@ -389,16 +397,6 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
14950 /* FALL THRU */ 15306 /* FALL THRU */
14951 /* Read last kernel messages */ 15307 /* Read last kernel messages */
14952 case SYSLOG_ACTION_READ_ALL: 15308 case SYSLOG_ACTION_READ_ALL:
@@ -14963,9 +15319,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/printk.c linux-3.4.48-vs2.3.3.9/kernel
14963 count = len; 15319 count = len;
14964 if (count > log_buf_len) 15320 if (count > log_buf_len)
14965 count = log_buf_len; 15321 count = log_buf_len;
14966diff -NurpP --minimal linux-3.4.48/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/kernel/ptrace.c 15322diff --git a/kernel/ptrace.c b/kernel/ptrace.c
14967--- linux-3.4.48/kernel/ptrace.c 2013-06-13 08:59:37.000000000 +0000 15323index daf4394..b57b360 100644
14968+++ linux-3.4.48-vs2.3.3.9/kernel/ptrace.c 2013-02-11 23:37:30.000000000 +0000 15324--- a/kernel/ptrace.c
15325+++ b/kernel/ptrace.c
14969@@ -22,6 +22,7 @@ 15326@@ -22,6 +22,7 @@
14970 #include <linux/syscalls.h> 15327 #include <linux/syscalls.h>
14971 #include <linux/uaccess.h> 15328 #include <linux/uaccess.h>
@@ -14986,9 +15343,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/ptrace.c linux-3.4.48-vs2.3.3.9/kernel
14986 15343
14987 return security_ptrace_access_check(task, mode); 15344 return security_ptrace_access_check(task, mode);
14988 } 15345 }
14989diff -NurpP --minimal linux-3.4.48/kernel/sched/core.c linux-3.4.48-vs2.3.3.9/kernel/sched/core.c 15346diff --git a/kernel/sched/core.c b/kernel/sched/core.c
14990--- linux-3.4.48/kernel/sched/core.c 2013-06-13 08:59:37.000000000 +0000 15347index 4b6c546..bb45655 100644
14991+++ linux-3.4.48-vs2.3.3.9/kernel/sched/core.c 2013-06-13 09:46:39.000000000 +0000 15348--- a/kernel/sched/core.c
15349+++ b/kernel/sched/core.c
14992@@ -72,6 +72,8 @@ 15350@@ -72,6 +72,8 @@
14993 #include <linux/slab.h> 15351 #include <linux/slab.h>
14994 #include <linux/init_task.h> 15352 #include <linux/init_task.h>
@@ -14998,7 +15356,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/core.c linux-3.4.48-vs2.3.3.9/ke
14998 15356
14999 #include <asm/switch_to.h> 15357 #include <asm/switch_to.h>
15000 #include <asm/tlb.h> 15358 #include <asm/tlb.h>
15001@@ -2226,9 +2228,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem 15359@@ -2228,9 +2230,17 @@ EXPORT_SYMBOL(avenrun); /* should be removed */
15002 */ 15360 */
15003 void get_avenrun(unsigned long *loads, unsigned long offset, int shift) 15361 void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
15004 { 15362 {
@@ -15019,7 +15377,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/core.c linux-3.4.48-vs2.3.3.9/ke
15019 } 15377 }
15020 15378
15021 static long calc_load_fold_active(struct rq *this_rq) 15379 static long calc_load_fold_active(struct rq *this_rq)
15022@@ -2797,14 +2807,17 @@ static inline void task_group_account_fi 15380@@ -2799,14 +2809,17 @@ static inline void task_group_account_field(struct task_struct *p, int index,
15023 void account_user_time(struct task_struct *p, cputime_t cputime, 15381 void account_user_time(struct task_struct *p, cputime_t cputime,
15024 cputime_t cputime_scaled) 15382 cputime_t cputime_scaled)
15025 { 15383 {
@@ -15038,7 +15396,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/core.c linux-3.4.48-vs2.3.3.9/ke
15038 15396
15039 /* Add user time to cpustat. */ 15397 /* Add user time to cpustat. */
15040 task_group_account_field(p, index, (__force u64) cputime); 15398 task_group_account_field(p, index, (__force u64) cputime);
15041@@ -2851,9 +2864,12 @@ static inline 15399@@ -2853,9 +2866,12 @@ static inline
15042 void __account_system_time(struct task_struct *p, cputime_t cputime, 15400 void __account_system_time(struct task_struct *p, cputime_t cputime,
15043 cputime_t cputime_scaled, int index) 15401 cputime_t cputime_scaled, int index)
15044 { 15402 {
@@ -15051,7 +15409,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/core.c linux-3.4.48-vs2.3.3.9/ke
15051 account_group_system_time(p, cputime); 15409 account_group_system_time(p, cputime);
15052 15410
15053 /* Add system time to cpustat. */ 15411 /* Add system time to cpustat. */
15054@@ -4079,7 +4095,7 @@ SYSCALL_DEFINE1(nice, int, increment) 15412@@ -4081,7 +4097,7 @@ SYSCALL_DEFINE1(nice, int, increment)
15055 nice = 19; 15413 nice = 19;
15056 15414
15057 if (increment < 0 && !can_nice(current, nice)) 15415 if (increment < 0 && !can_nice(current, nice))
@@ -15060,9 +15418,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/core.c linux-3.4.48-vs2.3.3.9/ke
15060 15418
15061 retval = security_task_setnice(current, nice); 15419 retval = security_task_setnice(current, nice);
15062 if (retval) 15420 if (retval)
15063diff -NurpP --minimal linux-3.4.48/kernel/sched/fair.c linux-3.4.48-vs2.3.3.9/kernel/sched/fair.c 15421diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
15064--- linux-3.4.48/kernel/sched/fair.c 2012-05-21 16:07:34.000000000 +0000 15422index e955364..1e5f507 100644
15065+++ linux-3.4.48-vs2.3.3.9/kernel/sched/fair.c 2012-05-21 16:15:05.000000000 +0000 15423--- a/kernel/sched/fair.c
15424+++ b/kernel/sched/fair.c
15066@@ -26,6 +26,7 @@ 15425@@ -26,6 +26,7 @@
15067 #include <linux/slab.h> 15426 #include <linux/slab.h>
15068 #include <linux/profile.h> 15427 #include <linux/profile.h>
@@ -15071,7 +15430,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/fair.c linux-3.4.48-vs2.3.3.9/ke
15071 15430
15072 #include <trace/events/sched.h> 15431 #include <trace/events/sched.h>
15073 15432
15074@@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st 15433@@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
15075 __enqueue_entity(cfs_rq, se); 15434 __enqueue_entity(cfs_rq, se);
15076 se->on_rq = 1; 15435 se->on_rq = 1;
15077 15436
@@ -15080,7 +15439,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/fair.c linux-3.4.48-vs2.3.3.9/ke
15080 if (cfs_rq->nr_running == 1) { 15439 if (cfs_rq->nr_running == 1) {
15081 list_add_leaf_cfs_rq(cfs_rq); 15440 list_add_leaf_cfs_rq(cfs_rq);
15082 check_enqueue_throttle(cfs_rq); 15441 check_enqueue_throttle(cfs_rq);
15083@@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st 15442@@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
15084 if (se != cfs_rq->curr) 15443 if (se != cfs_rq->curr)
15085 __dequeue_entity(cfs_rq, se); 15444 __dequeue_entity(cfs_rq, se);
15086 se->on_rq = 0; 15445 se->on_rq = 0;
@@ -15089,9 +15448,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/sched/fair.c linux-3.4.48-vs2.3.3.9/ke
15089 update_cfs_load(cfs_rq, 0); 15448 update_cfs_load(cfs_rq, 0);
15090 account_entity_dequeue(cfs_rq, se); 15449 account_entity_dequeue(cfs_rq, se);
15091 15450
15092diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel/signal.c 15451diff --git a/kernel/signal.c b/kernel/signal.c
15093--- linux-3.4.48/kernel/signal.c 2013-06-13 08:59:38.000000000 +0000 15452index 959df4f..11a7c4d 100644
15094+++ linux-3.4.48-vs2.3.3.9/kernel/signal.c 2013-06-13 09:46:39.000000000 +0000 15453--- a/kernel/signal.c
15454+++ b/kernel/signal.c
15095@@ -29,6 +29,8 @@ 15455@@ -29,6 +29,8 @@
15096 #include <linux/pid_namespace.h> 15456 #include <linux/pid_namespace.h>
15097 #include <linux/nsproxy.h> 15457 #include <linux/nsproxy.h>
@@ -15101,7 +15461,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel
15101 #define CREATE_TRACE_POINTS 15461 #define CREATE_TRACE_POINTS
15102 #include <trace/events/signal.h> 15462 #include <trace/events/signal.h>
15103 15463
15104@@ -787,9 +789,18 @@ static int check_kill_permission(int sig 15464@@ -787,9 +789,18 @@ static int check_kill_permission(int sig, struct siginfo *info,
15105 struct pid *sid; 15465 struct pid *sid;
15106 int error; 15466 int error;
15107 15467
@@ -15120,7 +15480,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel
15120 if (!si_fromuser(info)) 15480 if (!si_fromuser(info))
15121 return 0; 15481 return 0;
15122 15482
15123@@ -813,6 +824,20 @@ static int check_kill_permission(int sig 15483@@ -813,6 +824,20 @@ static int check_kill_permission(int sig, struct siginfo *info,
15124 } 15484 }
15125 } 15485 }
15126 15486
@@ -15141,7 +15501,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel
15141 return security_task_kill(t, info, sig, 0); 15501 return security_task_kill(t, info, sig, 0);
15142 } 15502 }
15143 15503
15144@@ -1355,7 +1380,7 @@ int kill_pid_info(int sig, struct siginf 15504@@ -1355,7 +1380,7 @@ int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
15145 rcu_read_lock(); 15505 rcu_read_lock();
15146 retry: 15506 retry:
15147 p = pid_task(pid, PIDTYPE_PID); 15507 p = pid_task(pid, PIDTYPE_PID);
@@ -15150,7 +15510,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel
15150 error = group_send_sig_info(sig, info, p); 15510 error = group_send_sig_info(sig, info, p);
15151 if (unlikely(error == -ESRCH)) 15511 if (unlikely(error == -ESRCH))
15152 /* 15512 /*
15153@@ -1405,7 +1430,7 @@ int kill_pid_info_as_cred(int sig, struc 15513@@ -1405,7 +1430,7 @@ int kill_pid_info_as_cred(int sig, struct siginfo *info, struct pid *pid,
15154 15514
15155 rcu_read_lock(); 15515 rcu_read_lock();
15156 p = pid_task(pid, PIDTYPE_PID); 15516 p = pid_task(pid, PIDTYPE_PID);
@@ -15159,7 +15519,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel
15159 ret = -ESRCH; 15519 ret = -ESRCH;
15160 goto out_unlock; 15520 goto out_unlock;
15161 } 15521 }
15162@@ -1457,8 +1482,10 @@ static int kill_something_info(int sig, 15522@@ -1457,8 +1482,10 @@ static int kill_something_info(int sig, struct siginfo *info, pid_t pid)
15163 struct task_struct * p; 15523 struct task_struct * p;
15164 15524
15165 for_each_process(p) { 15525 for_each_process(p) {
@@ -15184,9 +15544,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/signal.c linux-3.4.48-vs2.3.3.9/kernel
15184 if (sig_kernel_stop(signr)) { 15544 if (sig_kernel_stop(signr)) {
15185 /* 15545 /*
15186 * The default action is to stop all threads in 15546 * The default action is to stop all threads in
15187diff -NurpP --minimal linux-3.4.48/kernel/softirq.c linux-3.4.48-vs2.3.3.9/kernel/softirq.c 15547diff --git a/kernel/softirq.c b/kernel/softirq.c
15188--- linux-3.4.48/kernel/softirq.c 2012-05-21 16:07:34.000000000 +0000 15548index 671f959..b985019 100644
15189+++ linux-3.4.48-vs2.3.3.9/kernel/softirq.c 2012-05-21 16:15:05.000000000 +0000 15549--- a/kernel/softirq.c
15550+++ b/kernel/softirq.c
15190@@ -24,6 +24,7 @@ 15551@@ -24,6 +24,7 @@
15191 #include <linux/ftrace.h> 15552 #include <linux/ftrace.h>
15192 #include <linux/smp.h> 15553 #include <linux/smp.h>
@@ -15195,9 +15556,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/softirq.c linux-3.4.48-vs2.3.3.9/kerne
15195 15556
15196 #define CREATE_TRACE_POINTS 15557 #define CREATE_TRACE_POINTS
15197 #include <trace/events/irq.h> 15558 #include <trace/events/irq.h>
15198diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sys.c 15559diff --git a/kernel/sys.c b/kernel/sys.c
15199--- linux-3.4.48/kernel/sys.c 2013-06-13 08:59:39.000000000 +0000 15560index 3449d26..1ddea08 100644
15200+++ linux-3.4.48-vs2.3.3.9/kernel/sys.c 2013-06-13 09:46:39.000000000 +0000 15561--- a/kernel/sys.c
15562+++ b/kernel/sys.c
15201@@ -45,6 +45,7 @@ 15563@@ -45,6 +45,7 @@
15202 #include <linux/syscalls.h> 15564 #include <linux/syscalls.h>
15203 #include <linux/kprobes.h> 15565 #include <linux/kprobes.h>
@@ -15206,7 +15568,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15206 15568
15207 #include <linux/kmsg_dump.h> 15569 #include <linux/kmsg_dump.h>
15208 /* Move somewhere else to avoid recompiling? */ 15570 /* Move somewhere else to avoid recompiling? */
15209@@ -155,7 +156,10 @@ static int set_one_prio(struct task_stru 15571@@ -155,7 +156,10 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
15210 goto out; 15572 goto out;
15211 } 15573 }
15212 if (niceval < task_nice(p) && !can_nice(p, niceval)) { 15574 if (niceval < task_nice(p) && !can_nice(p, niceval)) {
@@ -15218,7 +15580,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15218 goto out; 15580 goto out;
15219 } 15581 }
15220 no_nice = security_task_setnice(p, niceval); 15582 no_nice = security_task_setnice(p, niceval);
15221@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which, 15583@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval)
15222 else 15584 else
15223 pgrp = task_pgrp(current); 15585 pgrp = task_pgrp(current);
15224 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { 15586 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -15227,7 +15589,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15227 error = set_one_prio(p, niceval, error); 15589 error = set_one_prio(p, niceval, error);
15228 } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); 15590 } while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
15229 break; 15591 break;
15230@@ -268,6 +274,8 @@ SYSCALL_DEFINE2(getpriority, int, which, 15592@@ -268,6 +274,8 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
15231 else 15593 else
15232 pgrp = task_pgrp(current); 15594 pgrp = task_pgrp(current);
15233 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { 15595 do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -15236,7 +15598,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15236 niceval = 20 - task_nice(p); 15598 niceval = 20 - task_nice(p);
15237 if (niceval > retval) 15599 if (niceval > retval)
15238 retval = niceval; 15600 retval = niceval;
15239@@ -419,6 +427,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); 15601@@ -443,6 +451,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
15240 15602
15241 static DEFINE_MUTEX(reboot_mutex); 15603 static DEFINE_MUTEX(reboot_mutex);
15242 15604
@@ -15245,7 +15607,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15245 /* 15607 /*
15246 * Reboot system call: for obvious reasons only root may call it, 15608 * Reboot system call: for obvious reasons only root may call it,
15247 * and even root needs to set up some magic numbers in the registers 15609 * and even root needs to set up some magic numbers in the registers
15248@@ -460,6 +470,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int 15610@@ -484,6 +494,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
15249 if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) 15611 if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
15250 cmd = LINUX_REBOOT_CMD_HALT; 15612 cmd = LINUX_REBOOT_CMD_HALT;
15251 15613
@@ -15255,7 +15617,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15255 mutex_lock(&reboot_mutex); 15617 mutex_lock(&reboot_mutex);
15256 switch (cmd) { 15618 switch (cmd) {
15257 case LINUX_REBOOT_CMD_RESTART: 15619 case LINUX_REBOOT_CMD_RESTART:
15258@@ -1285,7 +1298,8 @@ SYSCALL_DEFINE2(sethostname, char __user 15620@@ -1309,7 +1322,8 @@ SYSCALL_DEFINE2(sethostname, char __user *, name, int, len)
15259 int errno; 15621 int errno;
15260 char tmp[__NEW_UTS_LEN]; 15622 char tmp[__NEW_UTS_LEN];
15261 15623
@@ -15265,7 +15627,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15265 return -EPERM; 15627 return -EPERM;
15266 15628
15267 if (len < 0 || len > __NEW_UTS_LEN) 15629 if (len < 0 || len > __NEW_UTS_LEN)
15268@@ -1336,7 +1350,8 @@ SYSCALL_DEFINE2(setdomainname, char __us 15630@@ -1360,7 +1374,8 @@ SYSCALL_DEFINE2(setdomainname, char __user *, name, int, len)
15269 int errno; 15631 int errno;
15270 char tmp[__NEW_UTS_LEN]; 15632 char tmp[__NEW_UTS_LEN];
15271 15633
@@ -15275,7 +15637,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15275 return -EPERM; 15637 return -EPERM;
15276 if (len < 0 || len > __NEW_UTS_LEN) 15638 if (len < 0 || len > __NEW_UTS_LEN)
15277 return -EINVAL; 15639 return -EINVAL;
15278@@ -1455,7 +1470,7 @@ int do_prlimit(struct task_struct *tsk, 15640@@ -1479,7 +1494,7 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
15279 /* Keep the capable check against init_user_ns until 15641 /* Keep the capable check against init_user_ns until
15280 cgroups can contain all limits */ 15642 cgroups can contain all limits */
15281 if (new_rlim->rlim_max > rlim->rlim_max && 15643 if (new_rlim->rlim_max > rlim->rlim_max &&
@@ -15284,7 +15646,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15284 retval = -EPERM; 15646 retval = -EPERM;
15285 if (!retval) 15647 if (!retval)
15286 retval = security_task_setrlimit(tsk->group_leader, 15648 retval = security_task_setrlimit(tsk->group_leader,
15287@@ -1509,7 +1524,8 @@ static int check_prlimit_permission(stru 15649@@ -1533,7 +1548,8 @@ static int check_prlimit_permission(struct task_struct *task)
15288 cred->gid == tcred->sgid && 15650 cred->gid == tcred->sgid &&
15289 cred->gid == tcred->gid)) 15651 cred->gid == tcred->gid))
15290 return 0; 15652 return 0;
@@ -15294,9 +15656,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/sys.c linux-3.4.48-vs2.3.3.9/kernel/sy
15294 return 0; 15656 return 0;
15295 15657
15296 return -EPERM; 15658 return -EPERM;
15297diff -NurpP --minimal linux-3.4.48/kernel/sysctl.c linux-3.4.48-vs2.3.3.9/kernel/sysctl.c 15659diff --git a/kernel/sysctl.c b/kernel/sysctl.c
15298--- linux-3.4.48/kernel/sysctl.c 2012-05-21 16:07:34.000000000 +0000 15660index 4ab1187..9a17056 100644
15299+++ linux-3.4.48-vs2.3.3.9/kernel/sysctl.c 2012-05-21 16:15:05.000000000 +0000 15661--- a/kernel/sysctl.c
15662+++ b/kernel/sysctl.c
15300@@ -81,6 +81,7 @@ 15663@@ -81,6 +81,7 @@
15301 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) 15664 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
15302 #include <linux/lockdep.h> 15665 #include <linux/lockdep.h>
@@ -15319,10 +15682,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/sysctl.c linux-3.4.48-vs2.3.3.9/kernel
15319 #ifdef CONFIG_CHR_DEV_SG 15682 #ifdef CONFIG_CHR_DEV_SG
15320 { 15683 {
15321 .procname = "sg-big-buff", 15684 .procname = "sg-big-buff",
15322diff -NurpP --minimal linux-3.4.48/kernel/sysctl_binary.c linux-3.4.48-vs2.3.3.9/kernel/sysctl_binary.c 15685diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
15323--- linux-3.4.48/kernel/sysctl_binary.c 2013-06-13 08:59:39.000000000 +0000 15686index 9f9aa32..e967bde 100644
15324+++ linux-3.4.48-vs2.3.3.9/kernel/sysctl_binary.c 2013-03-30 21:29:17.000000000 +0000 15687--- a/kernel/sysctl_binary.c
15325@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t 15688+++ b/kernel/sysctl_binary.c
15689@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_table[] = {
15326 15690
15327 { CTL_INT, KERN_PANIC, "panic" }, 15691 { CTL_INT, KERN_PANIC, "panic" },
15328 { CTL_INT, KERN_REALROOTDEV, "real-root-dev" }, 15692 { CTL_INT, KERN_REALROOTDEV, "real-root-dev" },
@@ -15330,21 +15694,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/sysctl_binary.c linux-3.4.48-vs2.3.3.9
15330 15694
15331 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, 15695 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
15332 { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, 15696 { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
15333diff -NurpP --minimal linux-3.4.48/kernel/time/timekeeping.c linux-3.4.48-vs2.3.3.9/kernel/time/timekeeping.c 15697diff --git a/kernel/time.c b/kernel/time.c
15334--- linux-3.4.48/kernel/time/timekeeping.c 2013-06-13 08:59:39.000000000 +0000 15698index ba744cf..14f14d5 100644
15335+++ linux-3.4.48-vs2.3.3.9/kernel/time/timekeeping.c 2012-12-08 00:53:53.000000000 +0000 15699--- a/kernel/time.c
15336@@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts) 15700+++ b/kernel/time.c
15337 } while (read_seqretry(&timekeeper.lock, seq)); 15701@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr)
15338
15339 timespec_add_ns(ts, nsecs);
15340+ vx_adjust_timespec(ts);
15341 }
15342
15343 EXPORT_SYMBOL(getnstimeofday);
15344diff -NurpP --minimal linux-3.4.48/kernel/time.c linux-3.4.48-vs2.3.3.9/kernel/time.c
15345--- linux-3.4.48/kernel/time.c 2012-05-21 16:07:34.000000000 +0000
15346+++ linux-3.4.48-vs2.3.3.9/kernel/time.c 2012-05-21 16:15:05.000000000 +0000
15347@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
15348 if (err) 15702 if (err)
15349 return err; 15703 return err;
15350 15704
@@ -15353,7 +15707,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/time.c linux-3.4.48-vs2.3.3.9/kernel/t
15353 return 0; 15707 return 0;
15354 } 15708 }
15355 15709
15356@@ -172,7 +172,7 @@ int do_sys_settimeofday(const struct tim 15710@@ -172,7 +172,7 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
15357 } 15711 }
15358 } 15712 }
15359 if (tv) 15713 if (tv)
@@ -15362,9 +15716,22 @@ diff -NurpP --minimal linux-3.4.48/kernel/time.c linux-3.4.48-vs2.3.3.9/kernel/t
15362 return 0; 15716 return 0;
15363 } 15717 }
15364 15718
15365diff -NurpP --minimal linux-3.4.48/kernel/timer.c linux-3.4.48-vs2.3.3.9/kernel/timer.c 15719diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
15366--- linux-3.4.48/kernel/timer.c 2013-06-13 08:59:39.000000000 +0000 15720index eff0b1e..5913ef4 100644
15367+++ linux-3.4.48-vs2.3.3.9/kernel/timer.c 2012-10-22 13:09:53.000000000 +0000 15721--- a/kernel/time/timekeeping.c
15722+++ b/kernel/time/timekeeping.c
15723@@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
15724 } while (read_seqretry(&timekeeper.lock, seq));
15725
15726 timespec_add_ns(ts, nsecs);
15727+ vx_adjust_timespec(ts);
15728 }
15729
15730 EXPORT_SYMBOL(getnstimeofday);
15731diff --git a/kernel/timer.c b/kernel/timer.c
15732index 7e0a770..8acf352 100644
15733--- a/kernel/timer.c
15734+++ b/kernel/timer.c
15368@@ -40,6 +40,10 @@ 15735@@ -40,6 +40,10 @@
15369 #include <linux/irq_work.h> 15736 #include <linux/irq_work.h>
15370 #include <linux/sched.h> 15737 #include <linux/sched.h>
@@ -15376,7 +15743,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/timer.c linux-3.4.48-vs2.3.3.9/kernel/
15376 15743
15377 #include <asm/uaccess.h> 15744 #include <asm/uaccess.h>
15378 #include <asm/unistd.h> 15745 #include <asm/unistd.h>
15379@@ -1388,12 +1392,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec 15746@@ -1390,12 +1394,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, seconds)
15380 15747
15381 #endif 15748 #endif
15382 15749
@@ -15389,16 +15756,16 @@ diff -NurpP --minimal linux-3.4.48/kernel/timer.c linux-3.4.48-vs2.3.3.9/kernel/
15389 15756
15390 /** 15757 /**
15391 * sys_getpid - return the thread group id of the current process 15758 * sys_getpid - return the thread group id of the current process
15392@@ -1422,10 +1420,23 @@ SYSCALL_DEFINE0(getppid) 15759@@ -1424,10 +1422,23 @@ SYSCALL_DEFINE0(getppid)
15393 rcu_read_lock(); 15760 rcu_read_lock();
15394 pid = task_tgid_vnr(rcu_dereference(current->real_parent)); 15761 pid = task_tgid_vnr(rcu_dereference(current->real_parent));
15395 rcu_read_unlock(); 15762 rcu_read_unlock();
15396+ return vx_map_pid(pid); 15763+ return vx_map_pid(pid);
15397+} 15764+}
15765+
15766+#ifdef __alpha__
15398 15767
15399- return pid; 15768- return pid;
15400+#ifdef __alpha__
15401+
15402+/* 15769+/*
15403+ * The Alpha uses getxpid, getxuid, and getxgid instead. 15770+ * The Alpha uses getxpid, getxuid, and getxgid instead.
15404+ */ 15771+ */
@@ -15414,9 +15781,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/timer.c linux-3.4.48-vs2.3.3.9/kernel/
15414 SYSCALL_DEFINE0(getuid) 15781 SYSCALL_DEFINE0(getuid)
15415 { 15782 {
15416 /* Only we change this so SMP safe */ 15783 /* Only we change this so SMP safe */
15417diff -NurpP --minimal linux-3.4.48/kernel/user_namespace.c linux-3.4.48-vs2.3.3.9/kernel/user_namespace.c 15784diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
15418--- linux-3.4.48/kernel/user_namespace.c 2012-01-09 15:15:00.000000000 +0000 15785index 3b906e9..48a8927 100644
15419+++ linux-3.4.48-vs2.3.3.9/kernel/user_namespace.c 2012-05-21 16:15:05.000000000 +0000 15786--- a/kernel/user_namespace.c
15787+++ b/kernel/user_namespace.c
15420@@ -11,6 +11,7 @@ 15788@@ -11,6 +11,7 @@
15421 #include <linux/user_namespace.h> 15789 #include <linux/user_namespace.h>
15422 #include <linux/highuid.h> 15790 #include <linux/highuid.h>
@@ -15442,9 +15810,10 @@ diff -NurpP --minimal linux-3.4.48/kernel/user_namespace.c linux-3.4.48-vs2.3.3.
15442 INIT_WORK(&ns->destroyer, free_user_ns_work); 15810 INIT_WORK(&ns->destroyer, free_user_ns_work);
15443 schedule_work(&ns->destroyer); 15811 schedule_work(&ns->destroyer);
15444 } 15812 }
15445diff -NurpP --minimal linux-3.4.48/kernel/utsname.c linux-3.4.48-vs2.3.3.9/kernel/utsname.c 15813diff --git a/kernel/utsname.c b/kernel/utsname.c
15446--- linux-3.4.48/kernel/utsname.c 2012-01-09 15:15:00.000000000 +0000 15814index 405caf9..307d077 100644
15447+++ linux-3.4.48-vs2.3.3.9/kernel/utsname.c 2012-05-21 16:15:05.000000000 +0000 15815--- a/kernel/utsname.c
15816+++ b/kernel/utsname.c
15448@@ -16,14 +16,17 @@ 15817@@ -16,14 +16,17 @@
15449 #include <linux/slab.h> 15818 #include <linux/slab.h>
15450 #include <linux/user_namespace.h> 15819 #include <linux/user_namespace.h>
@@ -15464,7 +15833,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/utsname.c linux-3.4.48-vs2.3.3.9/kerne
15464 return uts_ns; 15833 return uts_ns;
15465 } 15834 }
15466 15835
15467@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_ 15836@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_ns(void)
15468 * @old_ns: namespace to clone 15837 * @old_ns: namespace to clone
15469 * Return NULL on error (failure to kmalloc), new ns otherwise 15838 * Return NULL on error (failure to kmalloc), new ns otherwise
15470 */ 15839 */
@@ -15475,7 +15844,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/utsname.c linux-3.4.48-vs2.3.3.9/kerne
15475 { 15844 {
15476 struct uts_namespace *ns; 15845 struct uts_namespace *ns;
15477 15846
15478@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n 15847@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_ns(struct task_struct *tsk,
15479 15848
15480 down_read(&uts_sem); 15849 down_read(&uts_sem);
15481 memcpy(&ns->name, &old_ns->name, sizeof(ns->name)); 15850 memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
@@ -15484,7 +15853,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/utsname.c linux-3.4.48-vs2.3.3.9/kerne
15484 up_read(&uts_sem); 15853 up_read(&uts_sem);
15485 return ns; 15854 return ns;
15486 } 15855 }
15487@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n 15856@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_ns(struct task_struct *tsk,
15488 * versa. 15857 * versa.
15489 */ 15858 */
15490 struct uts_namespace *copy_utsname(unsigned long flags, 15859 struct uts_namespace *copy_utsname(unsigned long flags,
@@ -15496,7 +15865,7 @@ diff -NurpP --minimal linux-3.4.48/kernel/utsname.c linux-3.4.48-vs2.3.3.9/kerne
15496 struct uts_namespace *new_ns; 15865 struct uts_namespace *new_ns;
15497 15866
15498 BUG_ON(!old_ns); 15867 BUG_ON(!old_ns);
15499@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig 15868@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsigned long flags,
15500 if (!(flags & CLONE_NEWUTS)) 15869 if (!(flags & CLONE_NEWUTS))
15501 return old_ns; 15870 return old_ns;
15502 15871
@@ -15513,9 +15882,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/utsname.c linux-3.4.48-vs2.3.3.9/kerne
15513 kfree(ns); 15882 kfree(ns);
15514 } 15883 }
15515 15884
15516diff -NurpP --minimal linux-3.4.48/kernel/vserver/Kconfig linux-3.4.48-vs2.3.3.9/kernel/vserver/Kconfig 15885diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
15517--- linux-3.4.48/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 15886new file mode 100644
15518+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/Kconfig 2012-05-21 16:15:05.000000000 +0000 15887index 0000000..0903150
15888--- /dev/null
15889+++ b/kernel/vserver/Kconfig
15519@@ -0,0 +1,224 @@ 15890@@ -0,0 +1,224 @@
15520+# 15891+#
15521+# Linux VServer configuration 15892+# Linux VServer configuration
@@ -15741,9 +16112,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/Kconfig linux-3.4.48-vs2.3.3.9
15741+ bool 16112+ bool
15742+ default n 16113+ default n
15743+ 16114+
15744diff -NurpP --minimal linux-3.4.48/kernel/vserver/Makefile linux-3.4.48-vs2.3.3.9/kernel/vserver/Makefile 16115diff --git a/kernel/vserver/Makefile b/kernel/vserver/Makefile
15745--- linux-3.4.48/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 16116new file mode 100644
15746+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/Makefile 2012-05-21 16:15:05.000000000 +0000 16117index 0000000..ba95c6c
16118--- /dev/null
16119+++ b/kernel/vserver/Makefile
15747@@ -0,0 +1,18 @@ 16120@@ -0,0 +1,18 @@
15748+# 16121+#
15749+# Makefile for the Linux vserver routines. 16122+# Makefile for the Linux vserver routines.
@@ -15763,9 +16136,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/Makefile linux-3.4.48-vs2.3.3.
15763+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o 16136+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
15764+vserver-$(CONFIG_VSERVER_DEVICE) += device.o 16137+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
15765+ 16138+
15766diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct.c linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct.c 16139diff --git a/kernel/vserver/cacct.c b/kernel/vserver/cacct.c
15767--- linux-3.4.48/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 16140new file mode 100644
15768+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct.c 2012-05-21 16:15:05.000000000 +0000 16141index 0000000..80dea24
16142--- /dev/null
16143+++ b/kernel/vserver/cacct.c
15769@@ -0,0 +1,42 @@ 16144@@ -0,0 +1,42 @@
15770+/* 16145+/*
15771+ * linux/kernel/vserver/cacct.c 16146+ * linux/kernel/vserver/cacct.c
@@ -15809,9 +16184,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct.c linux-3.4.48-vs2.3.3.9
15809+ return 0; 16184+ return 0;
15810+} 16185+}
15811+ 16186+
15812diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_init.h 16187diff --git a/kernel/vserver/cacct_init.h b/kernel/vserver/cacct_init.h
15813--- linux-3.4.48/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 16188new file mode 100644
15814+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_init.h 2012-05-21 16:15:05.000000000 +0000 16189index 0000000..94d82e9
16190--- /dev/null
16191+++ b/kernel/vserver/cacct_init.h
15815@@ -0,0 +1,25 @@ 16192@@ -0,0 +1,25 @@
15816+ 16193+
15817+ 16194+
@@ -15838,9 +16215,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct_init.h linux-3.4.48-vs2.
15838+ return; 16215+ return;
15839+} 16216+}
15840+ 16217+
15841diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_proc.h 16218diff --git a/kernel/vserver/cacct_proc.h b/kernel/vserver/cacct_proc.h
15842--- linux-3.4.48/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 16219new file mode 100644
15843+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cacct_proc.h 2012-05-21 16:15:05.000000000 +0000 16220index 0000000..0de9a38
16221--- /dev/null
16222+++ b/kernel/vserver/cacct_proc.h
15844@@ -0,0 +1,53 @@ 16223@@ -0,0 +1,53 @@
15845+#ifndef _VX_CACCT_PROC_H 16224+#ifndef _VX_CACCT_PROC_H
15846+#define _VX_CACCT_PROC_H 16225+#define _VX_CACCT_PROC_H
@@ -15895,9 +16274,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/cacct_proc.h linux-3.4.48-vs2.
15895+} 16274+}
15896+ 16275+
15897+#endif /* _VX_CACCT_PROC_H */ 16276+#endif /* _VX_CACCT_PROC_H */
15898diff -NurpP --minimal linux-3.4.48/kernel/vserver/context.c linux-3.4.48-vs2.3.3.9/kernel/vserver/context.c 16277diff --git a/kernel/vserver/context.c b/kernel/vserver/context.c
15899--- linux-3.4.48/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 16278new file mode 100644
15900+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/context.c 2012-06-28 14:45:48.000000000 +0000 16279index 0000000..1061eac
16280--- /dev/null
16281+++ b/kernel/vserver/context.c
15901@@ -0,0 +1,1119 @@ 16282@@ -0,0 +1,1119 @@
15902+/* 16283+/*
15903+ * linux/kernel/vserver/context.c 16284+ * linux/kernel/vserver/context.c
@@ -17018,9 +17399,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/context.c linux-3.4.48-vs2.3.3
17018+ 17399+
17019+EXPORT_SYMBOL_GPL(free_vx_info); 17400+EXPORT_SYMBOL_GPL(free_vx_info);
17020+ 17401+
17021diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt.c linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt.c 17402diff --git a/kernel/vserver/cvirt.c b/kernel/vserver/cvirt.c
17022--- linux-3.4.48/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 17403new file mode 100644
17023+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt.c 2012-05-21 16:15:05.000000000 +0000 17404index 0000000..ca0d207
17405--- /dev/null
17406+++ b/kernel/vserver/cvirt.c
17024@@ -0,0 +1,313 @@ 17407@@ -0,0 +1,313 @@
17025+/* 17408+/*
17026+ * linux/kernel/vserver/cvirt.c 17409+ * linux/kernel/vserver/cvirt.c
@@ -17335,9 +17718,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt.c linux-3.4.48-vs2.3.3.9
17335+ 17718+
17336+#endif 17719+#endif
17337+ 17720+
17338diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_init.h 17721diff --git a/kernel/vserver/cvirt_init.h b/kernel/vserver/cvirt_init.h
17339--- linux-3.4.48/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 17722new file mode 100644
17340+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_init.h 2012-05-21 16:15:05.000000000 +0000 17723index 0000000..0efd0de
17724--- /dev/null
17725+++ b/kernel/vserver/cvirt_init.h
17341@@ -0,0 +1,70 @@ 17726@@ -0,0 +1,70 @@
17342+ 17727+
17343+ 17728+
@@ -17409,9 +17794,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt_init.h linux-3.4.48-vs2.
17409+ return; 17794+ return;
17410+} 17795+}
17411+ 17796+
17412diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_proc.h 17797diff --git a/kernel/vserver/cvirt_proc.h b/kernel/vserver/cvirt_proc.h
17413--- linux-3.4.48/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 17798new file mode 100644
17414+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/cvirt_proc.h 2012-05-21 16:15:05.000000000 +0000 17799index 0000000..8b95ff4
17800--- /dev/null
17801+++ b/kernel/vserver/cvirt_proc.h
17415@@ -0,0 +1,123 @@ 17802@@ -0,0 +1,123 @@
17416+#ifndef _VX_CVIRT_PROC_H 17803+#ifndef _VX_CVIRT_PROC_H
17417+#define _VX_CVIRT_PROC_H 17804+#define _VX_CVIRT_PROC_H
@@ -17536,9 +17923,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/cvirt_proc.h linux-3.4.48-vs2.
17536+} 17923+}
17537+ 17924+
17538+#endif /* _VX_CVIRT_PROC_H */ 17925+#endif /* _VX_CVIRT_PROC_H */
17539diff -NurpP --minimal linux-3.4.48/kernel/vserver/debug.c linux-3.4.48-vs2.3.3.9/kernel/vserver/debug.c 17926diff --git a/kernel/vserver/debug.c b/kernel/vserver/debug.c
17540--- linux-3.4.48/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 17927new file mode 100644
17541+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/debug.c 2012-05-21 16:15:05.000000000 +0000 17928index 0000000..22cf710
17929--- /dev/null
17930+++ b/kernel/vserver/debug.c
17542@@ -0,0 +1,32 @@ 17931@@ -0,0 +1,32 @@
17543+/* 17932+/*
17544+ * kernel/vserver/debug.c 17933+ * kernel/vserver/debug.c
@@ -17572,9 +17961,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/debug.c linux-3.4.48-vs2.3.3.9
17572+ 17961+
17573+EXPORT_SYMBOL_GPL(dump_vx_info); 17962+EXPORT_SYMBOL_GPL(dump_vx_info);
17574+ 17963+
17575diff -NurpP --minimal linux-3.4.48/kernel/vserver/device.c linux-3.4.48-vs2.3.3.9/kernel/vserver/device.c 17964diff --git a/kernel/vserver/device.c b/kernel/vserver/device.c
17576--- linux-3.4.48/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 17965new file mode 100644
17577+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/device.c 2012-05-21 16:15:05.000000000 +0000 17966index 0000000..59277f6
17967--- /dev/null
17968+++ b/kernel/vserver/device.c
17578@@ -0,0 +1,443 @@ 17969@@ -0,0 +1,443 @@
17579+/* 17970+/*
17580+ * linux/kernel/vserver/device.c 17971+ * linux/kernel/vserver/device.c
@@ -18019,9 +18410,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/device.c linux-3.4.48-vs2.3.3.
18019+#endif /* CONFIG_COMPAT */ 18410+#endif /* CONFIG_COMPAT */
18020+ 18411+
18021+ 18412+
18022diff -NurpP --minimal linux-3.4.48/kernel/vserver/dlimit.c linux-3.4.48-vs2.3.3.9/kernel/vserver/dlimit.c 18413diff --git a/kernel/vserver/dlimit.c b/kernel/vserver/dlimit.c
18023--- linux-3.4.48/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 18414new file mode 100644
18024+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/dlimit.c 2012-05-21 16:15:05.000000000 +0000 18415index 0000000..a674f2c
18416--- /dev/null
18417+++ b/kernel/vserver/dlimit.c
18025@@ -0,0 +1,531 @@ 18418@@ -0,0 +1,531 @@
18026+/* 18419+/*
18027+ * linux/kernel/vserver/dlimit.c 18420+ * linux/kernel/vserver/dlimit.c
@@ -18554,9 +18947,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/dlimit.c linux-3.4.48-vs2.3.3.
18554+EXPORT_SYMBOL_GPL(locate_dl_info); 18947+EXPORT_SYMBOL_GPL(locate_dl_info);
18555+EXPORT_SYMBOL_GPL(rcu_free_dl_info); 18948+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
18556+ 18949+
18557diff -NurpP --minimal linux-3.4.48/kernel/vserver/helper.c linux-3.4.48-vs2.3.3.9/kernel/vserver/helper.c 18950diff --git a/kernel/vserver/helper.c b/kernel/vserver/helper.c
18558--- linux-3.4.48/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 18951new file mode 100644
18559+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/helper.c 2012-09-16 18:49:44.000000000 +0000 18952index 0000000..f012fbf
18953--- /dev/null
18954+++ b/kernel/vserver/helper.c
18560@@ -0,0 +1,229 @@ 18955@@ -0,0 +1,229 @@
18561+/* 18956+/*
18562+ * linux/kernel/vserver/helper.c 18957+ * linux/kernel/vserver/helper.c
@@ -18787,9 +19182,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/helper.c linux-3.4.48-vs2.3.3.
18787+ return do_vshelper(vshelper_path, argv, envp, 1); 19182+ return do_vshelper(vshelper_path, argv, envp, 1);
18788+} 19183+}
18789+ 19184+
18790diff -NurpP --minimal linux-3.4.48/kernel/vserver/history.c linux-3.4.48-vs2.3.3.9/kernel/vserver/history.c 19185diff --git a/kernel/vserver/history.c b/kernel/vserver/history.c
18791--- linux-3.4.48/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 19186new file mode 100644
18792+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/history.c 2012-05-21 16:15:05.000000000 +0000 19187index 0000000..e3e0712
19188--- /dev/null
19189+++ b/kernel/vserver/history.c
18793@@ -0,0 +1,258 @@ 19190@@ -0,0 +1,258 @@
18794+/* 19191+/*
18795+ * kernel/vserver/history.c 19192+ * kernel/vserver/history.c
@@ -19049,9 +19446,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/history.c linux-3.4.48-vs2.3.3
19049+ 19446+
19050+#endif /* CONFIG_COMPAT */ 19447+#endif /* CONFIG_COMPAT */
19051+ 19448+
19052diff -NurpP --minimal linux-3.4.48/kernel/vserver/inet.c linux-3.4.48-vs2.3.3.9/kernel/vserver/inet.c 19449diff --git a/kernel/vserver/inet.c b/kernel/vserver/inet.c
19053--- linux-3.4.48/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 19450new file mode 100644
19054+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/inet.c 2012-05-21 16:15:05.000000000 +0000 19451index 0000000..6c56f69
19452--- /dev/null
19453+++ b/kernel/vserver/inet.c
19055@@ -0,0 +1,226 @@ 19454@@ -0,0 +1,226 @@
19056+ 19455+
19057+#include <linux/in.h> 19456+#include <linux/in.h>
@@ -19279,9 +19678,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/inet.c linux-3.4.48-vs2.3.3.9/
19279+ 19678+
19280+EXPORT_SYMBOL_GPL(ip_v4_find_src); 19679+EXPORT_SYMBOL_GPL(ip_v4_find_src);
19281+ 19680+
19282diff -NurpP --minimal linux-3.4.48/kernel/vserver/init.c linux-3.4.48-vs2.3.3.9/kernel/vserver/init.c 19681diff --git a/kernel/vserver/init.c b/kernel/vserver/init.c
19283--- linux-3.4.48/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 19682new file mode 100644
19284+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/init.c 2012-05-21 16:15:05.000000000 +0000 19683index 0000000..17f62f8
19684--- /dev/null
19685+++ b/kernel/vserver/init.c
19285@@ -0,0 +1,45 @@ 19686@@ -0,0 +1,45 @@
19286+/* 19687+/*
19287+ * linux/kernel/init.c 19688+ * linux/kernel/init.c
@@ -19328,9 +19729,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/init.c linux-3.4.48-vs2.3.3.9/
19328+module_init(init_vserver); 19729+module_init(init_vserver);
19329+module_exit(exit_vserver); 19730+module_exit(exit_vserver);
19330+ 19731+
19331diff -NurpP --minimal linux-3.4.48/kernel/vserver/inode.c linux-3.4.48-vs2.3.3.9/kernel/vserver/inode.c 19732diff --git a/kernel/vserver/inode.c b/kernel/vserver/inode.c
19332--- linux-3.4.48/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 19733new file mode 100644
19333+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/inode.c 2012-05-21 16:15:05.000000000 +0000 19734index 0000000..69b17f7
19735--- /dev/null
19736+++ b/kernel/vserver/inode.c
19334@@ -0,0 +1,437 @@ 19737@@ -0,0 +1,437 @@
19335+/* 19738+/*
19336+ * linux/kernel/vserver/inode.c 19739+ * linux/kernel/vserver/inode.c
@@ -19769,9 +20172,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/inode.c linux-3.4.48-vs2.3.3.9
19769+ 20172+
19770+#endif /* CONFIG_PROPAGATE */ 20173+#endif /* CONFIG_PROPAGATE */
19771+ 20174+
19772diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit.c linux-3.4.48-vs2.3.3.9/kernel/vserver/limit.c 20175diff --git a/kernel/vserver/limit.c b/kernel/vserver/limit.c
19773--- linux-3.4.48/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 20176new file mode 100644
19774+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/limit.c 2012-09-01 09:15:21.000000000 +0000 20177index 0000000..8bda9de
20178--- /dev/null
20179+++ b/kernel/vserver/limit.c
19775@@ -0,0 +1,345 @@ 20180@@ -0,0 +1,345 @@
19776+/* 20181+/*
19777+ * linux/kernel/vserver/limit.c 20182+ * linux/kernel/vserver/limit.c
@@ -20118,9 +20523,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit.c linux-3.4.48-vs2.3.3.9
20118+ return cache; 20523+ return cache;
20119+} 20524+}
20120+ 20525+
20121diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_init.h 20526diff --git a/kernel/vserver/limit_init.h b/kernel/vserver/limit_init.h
20122--- linux-3.4.48/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 20527new file mode 100644
20123+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_init.h 2012-05-21 16:15:05.000000000 +0000 20528index 0000000..dfce7a2
20529--- /dev/null
20530+++ b/kernel/vserver/limit_init.h
20124@@ -0,0 +1,31 @@ 20531@@ -0,0 +1,31 @@
20125+ 20532+
20126+ 20533+
@@ -20153,9 +20560,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit_init.h linux-3.4.48-vs2.
20153+ } 20560+ }
20154+} 20561+}
20155+ 20562+
20156diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_proc.h 20563diff --git a/kernel/vserver/limit_proc.h b/kernel/vserver/limit_proc.h
20157--- linux-3.4.48/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 20564new file mode 100644
20158+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/limit_proc.h 2012-05-21 16:15:05.000000000 +0000 20565index 0000000..ff5d910
20566--- /dev/null
20567+++ b/kernel/vserver/limit_proc.h
20159@@ -0,0 +1,57 @@ 20568@@ -0,0 +1,57 @@
20160+#ifndef _VX_LIMIT_PROC_H 20569+#ifndef _VX_LIMIT_PROC_H
20161+#define _VX_LIMIT_PROC_H 20570+#define _VX_LIMIT_PROC_H
@@ -20214,9 +20623,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/limit_proc.h linux-3.4.48-vs2.
20214+#endif /* _VX_LIMIT_PROC_H */ 20623+#endif /* _VX_LIMIT_PROC_H */
20215+ 20624+
20216+ 20625+
20217diff -NurpP --minimal linux-3.4.48/kernel/vserver/network.c linux-3.4.48-vs2.3.3.9/kernel/vserver/network.c 20626diff --git a/kernel/vserver/network.c b/kernel/vserver/network.c
20218--- linux-3.4.48/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 20627new file mode 100644
20219+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/network.c 2012-05-21 16:15:05.000000000 +0000 20628index 0000000..9ec1bba
20629--- /dev/null
20630+++ b/kernel/vserver/network.c
20220@@ -0,0 +1,912 @@ 20631@@ -0,0 +1,912 @@
20221+/* 20632+/*
20222+ * linux/kernel/vserver/network.c 20633+ * linux/kernel/vserver/network.c
@@ -21130,9 +21541,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/network.c linux-3.4.48-vs2.3.3
21130+EXPORT_SYMBOL_GPL(free_nx_info); 21541+EXPORT_SYMBOL_GPL(free_nx_info);
21131+EXPORT_SYMBOL_GPL(unhash_nx_info); 21542+EXPORT_SYMBOL_GPL(unhash_nx_info);
21132+ 21543+
21133diff -NurpP --minimal linux-3.4.48/kernel/vserver/proc.c linux-3.4.48-vs2.3.3.9/kernel/vserver/proc.c 21544diff --git a/kernel/vserver/proc.c b/kernel/vserver/proc.c
21134--- linux-3.4.48/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 21545new file mode 100644
21135+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/proc.c 2012-05-21 16:15:05.000000000 +0000 21546index 0000000..b41558d
21547--- /dev/null
21548+++ b/kernel/vserver/proc.c
21136@@ -0,0 +1,1103 @@ 21549@@ -0,0 +1,1103 @@
21137+/* 21550+/*
21138+ * linux/kernel/vserver/proc.c 21551+ * linux/kernel/vserver/proc.c
@@ -22237,9 +22650,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/proc.c linux-3.4.48-vs2.3.3.9/
22237+ return buffer - orig; 22650+ return buffer - orig;
22238+} 22651+}
22239+ 22652+
22240diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched.c linux-3.4.48-vs2.3.3.9/kernel/vserver/sched.c 22653diff --git a/kernel/vserver/sched.c b/kernel/vserver/sched.c
22241--- linux-3.4.48/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 22654new file mode 100644
22242+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sched.c 2012-05-21 16:25:11.000000000 +0000 22655index 0000000..0c80b79
22656--- /dev/null
22657+++ b/kernel/vserver/sched.c
22243@@ -0,0 +1,83 @@ 22658@@ -0,0 +1,83 @@
22244+/* 22659+/*
22245+ * linux/kernel/vserver/sched.c 22660+ * linux/kernel/vserver/sched.c
@@ -22324,9 +22739,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched.c linux-3.4.48-vs2.3.3.9
22324+ return 0; 22739+ return 0;
22325+} 22740+}
22326+ 22741+
22327diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched_init.h linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_init.h 22742diff --git a/kernel/vserver/sched_init.h b/kernel/vserver/sched_init.h
22328--- linux-3.4.48/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 22743new file mode 100644
22329+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_init.h 2012-05-21 16:15:05.000000000 +0000 22744index 0000000..725ab06
22745--- /dev/null
22746+++ b/kernel/vserver/sched_init.h
22330@@ -0,0 +1,27 @@ 22747@@ -0,0 +1,27 @@
22331+ 22748+
22332+static inline void vx_info_init_sched(struct _vx_sched *sched) 22749+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -22355,9 +22772,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched_init.h linux-3.4.48-vs2.
22355+{ 22772+{
22356+ return; 22773+ return;
22357+} 22774+}
22358diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched_proc.h linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_proc.h 22775diff --git a/kernel/vserver/sched_proc.h b/kernel/vserver/sched_proc.h
22359--- linux-3.4.48/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 22776new file mode 100644
22360+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sched_proc.h 2012-05-21 16:15:05.000000000 +0000 22777index 0000000..35b8fd4
22778--- /dev/null
22779+++ b/kernel/vserver/sched_proc.h
22361@@ -0,0 +1,32 @@ 22780@@ -0,0 +1,32 @@
22362+#ifndef _VX_SCHED_PROC_H 22781+#ifndef _VX_SCHED_PROC_H
22363+#define _VX_SCHED_PROC_H 22782+#define _VX_SCHED_PROC_H
@@ -22391,9 +22810,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/sched_proc.h linux-3.4.48-vs2.
22391+} 22810+}
22392+ 22811+
22393+#endif /* _VX_SCHED_PROC_H */ 22812+#endif /* _VX_SCHED_PROC_H */
22394diff -NurpP --minimal linux-3.4.48/kernel/vserver/signal.c linux-3.4.48-vs2.3.3.9/kernel/vserver/signal.c 22813diff --git a/kernel/vserver/signal.c b/kernel/vserver/signal.c
22395--- linux-3.4.48/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 22814new file mode 100644
22396+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/signal.c 2012-05-21 16:15:05.000000000 +0000 22815index 0000000..2c72a86
22816--- /dev/null
22817+++ b/kernel/vserver/signal.c
22397@@ -0,0 +1,134 @@ 22818@@ -0,0 +1,134 @@
22398+/* 22819+/*
22399+ * linux/kernel/vserver/signal.c 22820+ * linux/kernel/vserver/signal.c
@@ -22529,9 +22950,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/signal.c linux-3.4.48-vs2.3.3.
22529+ return ret; 22950+ return ret;
22530+} 22951+}
22531+ 22952+
22532diff -NurpP --minimal linux-3.4.48/kernel/vserver/space.c linux-3.4.48-vs2.3.3.9/kernel/vserver/space.c 22953diff --git a/kernel/vserver/space.c b/kernel/vserver/space.c
22533--- linux-3.4.48/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 22954new file mode 100644
22534+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/space.c 2013-02-12 00:16:04.000000000 +0000 22955index 0000000..cf6dd38
22956--- /dev/null
22957+++ b/kernel/vserver/space.c
22535@@ -0,0 +1,436 @@ 22958@@ -0,0 +1,436 @@
22536+/* 22959+/*
22537+ * linux/kernel/vserver/space.c 22960+ * linux/kernel/vserver/space.c
@@ -22969,9 +23392,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/space.c linux-3.4.48-vs2.3.3.9
22969+ return 0; 23392+ return 0;
22970+} 23393+}
22971+ 23394+
22972diff -NurpP --minimal linux-3.4.48/kernel/vserver/switch.c linux-3.4.48-vs2.3.3.9/kernel/vserver/switch.c 23395diff --git a/kernel/vserver/switch.c b/kernel/vserver/switch.c
22973--- linux-3.4.48/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 23396new file mode 100644
22974+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/switch.c 2012-05-21 16:15:05.000000000 +0000 23397index 0000000..b9e1210
23398--- /dev/null
23399+++ b/kernel/vserver/switch.c
22975@@ -0,0 +1,556 @@ 23400@@ -0,0 +1,556 @@
22976+/* 23401+/*
22977+ * linux/kernel/vserver/switch.c 23402+ * linux/kernel/vserver/switch.c
@@ -23529,9 +23954,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/switch.c linux-3.4.48-vs2.3.3.
23529+} 23954+}
23530+ 23955+
23531+#endif /* CONFIG_COMPAT */ 23956+#endif /* CONFIG_COMPAT */
23532diff -NurpP --minimal linux-3.4.48/kernel/vserver/sysctl.c linux-3.4.48-vs2.3.3.9/kernel/vserver/sysctl.c 23957diff --git a/kernel/vserver/sysctl.c b/kernel/vserver/sysctl.c
23533--- linux-3.4.48/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 23958new file mode 100644
23534+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/sysctl.c 2012-05-21 16:15:05.000000000 +0000 23959index 0000000..a55cda1
23960--- /dev/null
23961+++ b/kernel/vserver/sysctl.c
23535@@ -0,0 +1,247 @@ 23962@@ -0,0 +1,247 @@
23536+/* 23963+/*
23537+ * kernel/vserver/sysctl.c 23964+ * kernel/vserver/sysctl.c
@@ -23780,9 +24207,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/sysctl.c linux-3.4.48-vs2.3.3.
23780+EXPORT_SYMBOL_GPL(vs_debug_perm); 24207+EXPORT_SYMBOL_GPL(vs_debug_perm);
23781+EXPORT_SYMBOL_GPL(vs_debug_misc); 24208+EXPORT_SYMBOL_GPL(vs_debug_misc);
23782+ 24209+
23783diff -NurpP --minimal linux-3.4.48/kernel/vserver/tag.c linux-3.4.48-vs2.3.3.9/kernel/vserver/tag.c 24210diff --git a/kernel/vserver/tag.c b/kernel/vserver/tag.c
23784--- linux-3.4.48/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 24211new file mode 100644
23785+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/tag.c 2012-05-21 16:15:05.000000000 +0000 24212index 0000000..586900c
24213--- /dev/null
24214+++ b/kernel/vserver/tag.c
23786@@ -0,0 +1,63 @@ 24215@@ -0,0 +1,63 @@
23787+/* 24216+/*
23788+ * linux/kernel/vserver/tag.c 24217+ * linux/kernel/vserver/tag.c
@@ -23847,9 +24276,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/tag.c linux-3.4.48-vs2.3.3.9/k
23847+} 24276+}
23848+ 24277+
23849+ 24278+
23850diff -NurpP --minimal linux-3.4.48/kernel/vserver/vci_config.h linux-3.4.48-vs2.3.3.9/kernel/vserver/vci_config.h 24279diff --git a/kernel/vserver/vci_config.h b/kernel/vserver/vci_config.h
23851--- linux-3.4.48/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 24280new file mode 100644
23852+++ linux-3.4.48-vs2.3.3.9/kernel/vserver/vci_config.h 2012-05-21 16:15:05.000000000 +0000 24281index 0000000..31d786d
24282--- /dev/null
24283+++ b/kernel/vserver/vci_config.h
23853@@ -0,0 +1,76 @@ 24284@@ -0,0 +1,76 @@
23854+ 24285+
23855+/* interface version */ 24286+/* interface version */
@@ -23927,10 +24358,11 @@ diff -NurpP --minimal linux-3.4.48/kernel/vserver/vci_config.h linux-3.4.48-vs2.
23927+ 0; 24358+ 0;
23928+} 24359+}
23929+ 24360+
23930diff -NurpP --minimal linux-3.4.48/mm/memcontrol.c linux-3.4.48-vs2.3.3.9/mm/memcontrol.c 24361diff --git a/mm/memcontrol.c b/mm/memcontrol.c
23931--- linux-3.4.48/mm/memcontrol.c 2013-06-13 08:59:39.000000000 +0000 24362index 81c275b..aba10b1 100644
23932+++ linux-3.4.48-vs2.3.3.9/mm/memcontrol.c 2012-12-08 00:53:53.000000000 +0000 24363--- a/mm/memcontrol.c
23933@@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task( 24364+++ b/mm/memcontrol.c
24365@@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p)
23934 struct mem_cgroup, css); 24366 struct mem_cgroup, css);
23935 } 24367 }
23936 24368
@@ -23962,9 +24394,10 @@ diff -NurpP --minimal linux-3.4.48/mm/memcontrol.c linux-3.4.48-vs2.3.3.9/mm/mem
23962 struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) 24394 struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
23963 { 24395 {
23964 struct mem_cgroup *memcg = NULL; 24396 struct mem_cgroup *memcg = NULL;
23965diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_kill.c 24397diff --git a/mm/oom_kill.c b/mm/oom_kill.c
23966--- linux-3.4.48/mm/oom_kill.c 2012-05-21 16:07:35.000000000 +0000 24398index 46bf2ed5..d8cdda8 100644
23967+++ linux-3.4.48-vs2.3.3.9/mm/oom_kill.c 2012-05-21 16:15:05.000000000 +0000 24399--- a/mm/oom_kill.c
24400+++ b/mm/oom_kill.c
23968@@ -35,6 +35,8 @@ 24401@@ -35,6 +35,8 @@
23969 #include <linux/freezer.h> 24402 #include <linux/freezer.h>
23970 #include <linux/ftrace.h> 24403 #include <linux/ftrace.h>
@@ -23974,7 +24407,7 @@ diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_k
23974 24407
23975 #define CREATE_TRACE_POINTS 24408 #define CREATE_TRACE_POINTS
23976 #include <trace/events/oom.h> 24409 #include <trace/events/oom.h>
23977@@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(st 24410@@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(struct task_struct *p)
23978 static bool oom_unkillable_task(struct task_struct *p, 24411 static bool oom_unkillable_task(struct task_struct *p,
23979 const struct mem_cgroup *memcg, const nodemask_t *nodemask) 24412 const struct mem_cgroup *memcg, const nodemask_t *nodemask)
23980 { 24413 {
@@ -23994,7 +24427,7 @@ diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_k
23994 /* When mem_cgroup_out_of_memory() and p is not member of the group */ 24427 /* When mem_cgroup_out_of_memory() and p is not member of the group */
23995 if (memcg && !task_in_mem_cgroup(p, memcg)) 24428 if (memcg && !task_in_mem_cgroup(p, memcg))
23996 return true; 24429 return true;
23997@@ -462,8 +471,8 @@ static void oom_kill_process(struct task 24430@@ -462,8 +471,8 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
23998 dump_header(p, gfp_mask, order, memcg, nodemask); 24431 dump_header(p, gfp_mask, order, memcg, nodemask);
23999 24432
24000 task_lock(p); 24433 task_lock(p);
@@ -24005,7 +24438,7 @@ diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_k
24005 task_unlock(p); 24438 task_unlock(p);
24006 24439
24007 /* 24440 /*
24008@@ -496,8 +505,8 @@ static void oom_kill_process(struct task 24441@@ -496,8 +505,8 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
24009 24442
24010 /* mm cannot safely be dereferenced after task_unlock(victim) */ 24443 /* mm cannot safely be dereferenced after task_unlock(victim) */
24011 mm = victim->mm; 24444 mm = victim->mm;
@@ -24016,7 +24449,7 @@ diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_k
24016 K(get_mm_counter(victim->mm, MM_ANONPAGES)), 24449 K(get_mm_counter(victim->mm, MM_ANONPAGES)),
24017 K(get_mm_counter(victim->mm, MM_FILEPAGES))); 24450 K(get_mm_counter(victim->mm, MM_FILEPAGES)));
24018 task_unlock(victim); 24451 task_unlock(victim);
24019@@ -596,6 +605,8 @@ int unregister_oom_notifier(struct notif 24452@@ -596,6 +605,8 @@ int unregister_oom_notifier(struct notifier_block *nb)
24020 } 24453 }
24021 EXPORT_SYMBOL_GPL(unregister_oom_notifier); 24454 EXPORT_SYMBOL_GPL(unregister_oom_notifier);
24022 24455
@@ -24025,7 +24458,7 @@ diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_k
24025 /* 24458 /*
24026 * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero 24459 * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero
24027 * if a parallel OOM killing is already taking place that includes a zone in 24460 * if a parallel OOM killing is already taking place that includes a zone in
24028@@ -747,7 +758,12 @@ void out_of_memory(struct zonelist *zone 24461@@ -747,7 +758,12 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
24029 if (!p) { 24462 if (!p) {
24030 dump_header(NULL, gfp_mask, order, NULL, mpol_mask); 24463 dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
24031 read_unlock(&tasklist_lock); 24464 read_unlock(&tasklist_lock);
@@ -24039,9 +24472,10 @@ diff -NurpP --minimal linux-3.4.48/mm/oom_kill.c linux-3.4.48-vs2.3.3.9/mm/oom_k
24039 } 24472 }
24040 if (PTR_ERR(p) != -1UL) { 24473 if (PTR_ERR(p) != -1UL) {
24041 oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, 24474 oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
24042diff -NurpP --minimal linux-3.4.48/mm/page_alloc.c linux-3.4.48-vs2.3.3.9/mm/page_alloc.c 24475diff --git a/mm/page_alloc.c b/mm/page_alloc.c
24043--- linux-3.4.48/mm/page_alloc.c 2013-06-13 08:59:39.000000000 +0000 24476index 8090542..0bded51 100644
24044+++ linux-3.4.48-vs2.3.3.9/mm/page_alloc.c 2013-03-02 15:26:44.000000000 +0000 24477--- a/mm/page_alloc.c
24478+++ b/mm/page_alloc.c
24045@@ -58,6 +58,8 @@ 24479@@ -58,6 +58,8 @@
24046 #include <linux/memcontrol.h> 24480 #include <linux/memcontrol.h>
24047 #include <linux/prefetch.h> 24481 #include <linux/prefetch.h>
@@ -24061,7 +24495,7 @@ diff -NurpP --minimal linux-3.4.48/mm/page_alloc.c linux-3.4.48-vs2.3.3.9/mm/pag
24061 } 24495 }
24062 24496
24063 EXPORT_SYMBOL(si_meminfo); 24497 EXPORT_SYMBOL(si_meminfo);
24064@@ -2675,6 +2680,9 @@ void si_meminfo_node(struct sysinfo *val 24498@@ -2675,6 +2680,9 @@ void si_meminfo_node(struct sysinfo *val, int nid)
24065 val->freehigh = 0; 24499 val->freehigh = 0;
24066 #endif 24500 #endif
24067 val->mem_unit = PAGE_SIZE; 24501 val->mem_unit = PAGE_SIZE;
@@ -24071,9 +24505,10 @@ diff -NurpP --minimal linux-3.4.48/mm/page_alloc.c linux-3.4.48-vs2.3.3.9/mm/pag
24071 } 24505 }
24072 #endif 24506 #endif
24073 24507
24074diff -NurpP --minimal linux-3.4.48/mm/pgtable-generic.c linux-3.4.48-vs2.3.3.9/mm/pgtable-generic.c 24508diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c
24075--- linux-3.4.48/mm/pgtable-generic.c 2012-05-21 16:07:35.000000000 +0000 24509index 5a74fea..e8b8d74 100644
24076+++ linux-3.4.48-vs2.3.3.9/mm/pgtable-generic.c 2012-05-21 16:15:05.000000000 +0000 24510--- a/mm/pgtable-generic.c
24511+++ b/mm/pgtable-generic.c
24077@@ -6,6 +6,8 @@ 24512@@ -6,6 +6,8 @@
24078 * Copyright (C) 2010 Linus Torvalds 24513 * Copyright (C) 2010 Linus Torvalds
24079 */ 24514 */
@@ -24083,10 +24518,11 @@ diff -NurpP --minimal linux-3.4.48/mm/pgtable-generic.c linux-3.4.48-vs2.3.3.9/m
24083 #include <linux/pagemap.h> 24518 #include <linux/pagemap.h>
24084 #include <asm/tlb.h> 24519 #include <asm/tlb.h>
24085 #include <asm-generic/pgtable.h> 24520 #include <asm-generic/pgtable.h>
24086diff -NurpP --minimal linux-3.4.48/mm/shmem.c linux-3.4.48-vs2.3.3.9/mm/shmem.c 24521diff --git a/mm/shmem.c b/mm/shmem.c
24087--- linux-3.4.48/mm/shmem.c 2013-06-13 08:59:39.000000000 +0000 24522index 58c4a47..55757c7 100644
24088+++ linux-3.4.48-vs2.3.3.9/mm/shmem.c 2013-03-02 15:26:44.000000000 +0000 24523--- a/mm/shmem.c
24089@@ -1473,7 +1473,7 @@ static int shmem_statfs(struct dentry *d 24524+++ b/mm/shmem.c
24525@@ -1473,7 +1473,7 @@ static int shmem_statfs(struct dentry *dentry, struct kstatfs *buf)
24090 { 24526 {
24091 struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); 24527 struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
24092 24528
@@ -24095,7 +24531,7 @@ diff -NurpP --minimal linux-3.4.48/mm/shmem.c linux-3.4.48-vs2.3.3.9/mm/shmem.c
24095 buf->f_bsize = PAGE_CACHE_SIZE; 24531 buf->f_bsize = PAGE_CACHE_SIZE;
24096 buf->f_namelen = NAME_MAX; 24532 buf->f_namelen = NAME_MAX;
24097 if (sbinfo->max_blocks) { 24533 if (sbinfo->max_blocks) {
24098@@ -2287,7 +2287,7 @@ int shmem_fill_super(struct super_block 24534@@ -2287,7 +2287,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
24099 sb->s_maxbytes = MAX_LFS_FILESIZE; 24535 sb->s_maxbytes = MAX_LFS_FILESIZE;
24100 sb->s_blocksize = PAGE_CACHE_SIZE; 24536 sb->s_blocksize = PAGE_CACHE_SIZE;
24101 sb->s_blocksize_bits = PAGE_CACHE_SHIFT; 24537 sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -24104,10 +24540,11 @@ diff -NurpP --minimal linux-3.4.48/mm/shmem.c linux-3.4.48-vs2.3.3.9/mm/shmem.c
24104 sb->s_op = &shmem_ops; 24540 sb->s_op = &shmem_ops;
24105 sb->s_time_gran = 1; 24541 sb->s_time_gran = 1;
24106 #ifdef CONFIG_TMPFS_XATTR 24542 #ifdef CONFIG_TMPFS_XATTR
24107diff -NurpP --minimal linux-3.4.48/mm/slab.c linux-3.4.48-vs2.3.3.9/mm/slab.c 24543diff --git a/mm/slab.c b/mm/slab.c
24108--- linux-3.4.48/mm/slab.c 2013-06-13 08:59:39.000000000 +0000 24544index da2bb68..2e1c4bb 100644
24109+++ linux-3.4.48-vs2.3.3.9/mm/slab.c 2012-10-22 13:09:53.000000000 +0000 24545--- a/mm/slab.c
24110@@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_ 24546+++ b/mm/slab.c
24547@@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_list3 *parent)
24111 #define STATS_INC_FREEMISS(x) do { } while (0) 24548 #define STATS_INC_FREEMISS(x) do { } while (0)
24112 #endif 24549 #endif
24113 24550
@@ -24124,7 +24561,7 @@ diff -NurpP --minimal linux-3.4.48/mm/slab.c linux-3.4.48-vs2.3.3.9/mm/slab.c
24124 l3->free_objects--; 24561 l3->free_objects--;
24125 /* move slabp to correct slabp list: */ 24562 /* move slabp to correct slabp list: */
24126 list_del(&slabp->list); 24563 list_del(&slabp->list);
24127@@ -3543,6 +3546,7 @@ __cache_alloc_node(struct kmem_cache *ca 24564@@ -3543,6 +3546,7 @@ __cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
24128 /* ___cache_alloc_node can fall back to other nodes */ 24565 /* ___cache_alloc_node can fall back to other nodes */
24129 ptr = ____cache_alloc_node(cachep, flags, nodeid); 24566 ptr = ____cache_alloc_node(cachep, flags, nodeid);
24130 out: 24567 out:
@@ -24132,7 +24569,7 @@ diff -NurpP --minimal linux-3.4.48/mm/slab.c linux-3.4.48-vs2.3.3.9/mm/slab.c
24132 local_irq_restore(save_flags); 24569 local_irq_restore(save_flags);
24133 ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller); 24570 ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
24134 kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags, 24571 kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
24135@@ -3730,6 +3734,7 @@ static inline void __cache_free(struct k 24572@@ -3730,6 +3734,7 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
24136 check_irq_off(); 24573 check_irq_off();
24137 kmemleak_free_recursive(objp, cachep->flags); 24574 kmemleak_free_recursive(objp, cachep->flags);
24138 objp = cache_free_debugcheck(cachep, objp, caller); 24575 objp = cache_free_debugcheck(cachep, objp, caller);
@@ -24140,9 +24577,11 @@ diff -NurpP --minimal linux-3.4.48/mm/slab.c linux-3.4.48-vs2.3.3.9/mm/slab.c
24140 24577
24141 kmemcheck_slab_free(cachep, objp, obj_size(cachep)); 24578 kmemcheck_slab_free(cachep, objp, obj_size(cachep));
24142 24579
24143diff -NurpP --minimal linux-3.4.48/mm/slab_vs.h linux-3.4.48-vs2.3.3.9/mm/slab_vs.h 24580diff --git a/mm/slab_vs.h b/mm/slab_vs.h
24144--- linux-3.4.48/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 24581new file mode 100644
24145+++ linux-3.4.48-vs2.3.3.9/mm/slab_vs.h 2012-05-21 16:15:05.000000000 +0000 24582index 0000000..00c065e
24583--- /dev/null
24584+++ b/mm/slab_vs.h
24146@@ -0,0 +1,29 @@ 24585@@ -0,0 +1,29 @@
24147+ 24586+
24148+#include <linux/vserver/context.h> 24587+#include <linux/vserver/context.h>
@@ -24173,9 +24612,10 @@ diff -NurpP --minimal linux-3.4.48/mm/slab_vs.h linux-3.4.48-vs2.3.3.9/mm/slab_v
24173+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); 24612+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
24174+} 24613+}
24175+ 24614+
24176diff -NurpP --minimal linux-3.4.48/mm/swapfile.c linux-3.4.48-vs2.3.3.9/mm/swapfile.c 24615diff --git a/mm/swapfile.c b/mm/swapfile.c
24177--- linux-3.4.48/mm/swapfile.c 2013-06-13 08:59:40.000000000 +0000 24616index 38186d9..d0d26b4 100644
24178+++ linux-3.4.48-vs2.3.3.9/mm/swapfile.c 2012-06-28 14:45:07.000000000 +0000 24617--- a/mm/swapfile.c
24618+++ b/mm/swapfile.c
24179@@ -36,6 +36,7 @@ 24619@@ -36,6 +36,7 @@
24180 #include <asm/tlbflush.h> 24620 #include <asm/tlbflush.h>
24181 #include <linux/swapops.h> 24621 #include <linux/swapops.h>
@@ -24184,7 +24624,7 @@ diff -NurpP --minimal linux-3.4.48/mm/swapfile.c linux-3.4.48-vs2.3.3.9/mm/swapf
24184 24624
24185 static bool swap_count_continued(struct swap_info_struct *, pgoff_t, 24625 static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
24186 unsigned char); 24626 unsigned char);
24187@@ -1754,6 +1755,16 @@ static int swap_show(struct seq_file *sw 24627@@ -1754,6 +1755,16 @@ static int swap_show(struct seq_file *swap, void *v)
24188 24628
24189 if (si == SEQ_START_TOKEN) { 24629 if (si == SEQ_START_TOKEN) {
24190 seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); 24630 seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
@@ -24210,10 +24650,11 @@ diff -NurpP --minimal linux-3.4.48/mm/swapfile.c linux-3.4.48-vs2.3.3.9/mm/swapf
24210 } 24650 }
24211 24651
24212 /* 24652 /*
24213diff -NurpP --minimal linux-3.4.48/net/bridge/br_multicast.c linux-3.4.48-vs2.3.3.9/net/bridge/br_multicast.c 24653diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
24214--- linux-3.4.48/net/bridge/br_multicast.c 2012-05-21 16:07:40.000000000 +0000 24654index 9069071..f8d1b39 100644
24215+++ linux-3.4.48-vs2.3.3.9/net/bridge/br_multicast.c 2012-05-21 16:15:05.000000000 +0000 24655--- a/net/bridge/br_multicast.c
24216@@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_ 24656+++ b/net/bridge/br_multicast.c
24657@@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
24217 ip6h->hop_limit = 1; 24658 ip6h->hop_limit = 1;
24218 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); 24659 ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
24219 if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0, 24660 if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
@@ -24222,9 +24663,10 @@ diff -NurpP --minimal linux-3.4.48/net/bridge/br_multicast.c linux-3.4.48-vs2.3.
24222 kfree_skb(skb); 24663 kfree_skb(skb);
24223 return NULL; 24664 return NULL;
24224 } 24665 }
24225diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/core/dev.c 24666diff --git a/net/core/dev.c b/net/core/dev.c
24226--- linux-3.4.48/net/core/dev.c 2013-06-13 08:59:40.000000000 +0000 24667index 7db83d6..4676b62 100644
24227+++ linux-3.4.48-vs2.3.3.9/net/core/dev.c 2013-06-13 09:46:39.000000000 +0000 24668--- a/net/core/dev.c
24669+++ b/net/core/dev.c
24228@@ -126,6 +126,7 @@ 24670@@ -126,6 +126,7 @@
24229 #include <linux/in.h> 24671 #include <linux/in.h>
24230 #include <linux/jhash.h> 24672 #include <linux/jhash.h>
@@ -24233,7 +24675,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24233 #include <trace/events/napi.h> 24675 #include <trace/events/napi.h>
24234 #include <trace/events/net.h> 24676 #include <trace/events/net.h>
24235 #include <trace/events/skb.h> 24677 #include <trace/events/skb.h>
24236@@ -621,7 +622,8 @@ struct net_device *__dev_get_by_name(str 24678@@ -621,7 +622,8 @@ struct net_device *__dev_get_by_name(struct net *net, const char *name)
24237 struct hlist_head *head = dev_name_hash(net, name); 24679 struct hlist_head *head = dev_name_hash(net, name);
24238 24680
24239 hlist_for_each_entry(dev, p, head, name_hlist) 24681 hlist_for_each_entry(dev, p, head, name_hlist)
@@ -24243,7 +24685,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24243 return dev; 24685 return dev;
24244 24686
24245 return NULL; 24687 return NULL;
24246@@ -647,7 +649,8 @@ struct net_device *dev_get_by_name_rcu(s 24688@@ -647,7 +649,8 @@ struct net_device *dev_get_by_name_rcu(struct net *net, const char *name)
24247 struct hlist_head *head = dev_name_hash(net, name); 24689 struct hlist_head *head = dev_name_hash(net, name);
24248 24690
24249 hlist_for_each_entry_rcu(dev, p, head, name_hlist) 24691 hlist_for_each_entry_rcu(dev, p, head, name_hlist)
@@ -24253,7 +24695,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24253 return dev; 24695 return dev;
24254 24696
24255 return NULL; 24697 return NULL;
24256@@ -698,7 +701,8 @@ struct net_device *__dev_get_by_index(st 24698@@ -698,7 +701,8 @@ struct net_device *__dev_get_by_index(struct net *net, int ifindex)
24257 struct hlist_head *head = dev_index_hash(net, ifindex); 24699 struct hlist_head *head = dev_index_hash(net, ifindex);
24258 24700
24259 hlist_for_each_entry(dev, p, head, index_hlist) 24701 hlist_for_each_entry(dev, p, head, index_hlist)
@@ -24272,7 +24714,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24272 { 24714 {
24273 struct hlist_node *p; 24715 struct hlist_node *p;
24274 struct net_device *dev; 24716 struct net_device *dev;
24275@@ -728,6 +732,16 @@ struct net_device *dev_get_by_index_rcu( 24717@@ -728,6 +732,16 @@ struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
24276 24718
24277 return NULL; 24719 return NULL;
24278 } 24720 }
@@ -24289,7 +24731,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24289 EXPORT_SYMBOL(dev_get_by_index_rcu); 24731 EXPORT_SYMBOL(dev_get_by_index_rcu);
24290 24732
24291 24733
24292@@ -776,7 +790,8 @@ struct net_device *dev_getbyhwaddr_rcu(s 24734@@ -776,7 +790,8 @@ struct net_device *dev_getbyhwaddr_rcu(struct net *net, unsigned short type,
24293 24735
24294 for_each_netdev_rcu(net, dev) 24736 for_each_netdev_rcu(net, dev)
24295 if (dev->type == type && 24737 if (dev->type == type &&
@@ -24299,7 +24741,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24299 return dev; 24741 return dev;
24300 24742
24301 return NULL; 24743 return NULL;
24302@@ -788,9 +803,11 @@ struct net_device *__dev_getfirstbyhwtyp 24744@@ -788,9 +803,11 @@ struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type)
24303 struct net_device *dev; 24745 struct net_device *dev;
24304 24746
24305 ASSERT_RTNL(); 24747 ASSERT_RTNL();
@@ -24313,7 +24755,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24313 24755
24314 return NULL; 24756 return NULL;
24315 } 24757 }
24316@@ -908,6 +925,8 @@ static int __dev_alloc_name(struct net * 24758@@ -908,6 +925,8 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)
24317 continue; 24759 continue;
24318 if (i < 0 || i >= max_netdevices) 24760 if (i < 0 || i >= max_netdevices)
24319 continue; 24761 continue;
@@ -24322,7 +24764,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24322 24764
24323 /* avoid cases where sscanf is not exact inverse of printf */ 24765 /* avoid cases where sscanf is not exact inverse of printf */
24324 snprintf(buf, IFNAMSIZ, name, i); 24766 snprintf(buf, IFNAMSIZ, name, i);
24325@@ -4000,6 +4019,8 @@ static int dev_ifconf(struct net *net, c 24767@@ -4009,6 +4028,8 @@ static int dev_ifconf(struct net *net, char __user *arg)
24326 24768
24327 total = 0; 24769 total = 0;
24328 for_each_netdev(net, dev) { 24770 for_each_netdev(net, dev) {
@@ -24331,7 +24773,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24331 for (i = 0; i < NPROTO; i++) { 24773 for (i = 0; i < NPROTO; i++) {
24332 if (gifconf_list[i]) { 24774 if (gifconf_list[i]) {
24333 int done; 24775 int done;
24334@@ -4102,6 +4123,10 @@ static void dev_seq_printf_stats(struct 24776@@ -4111,6 +4132,10 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
24335 struct rtnl_link_stats64 temp; 24777 struct rtnl_link_stats64 temp;
24336 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); 24778 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
24337 24779
@@ -24342,10 +24784,11 @@ diff -NurpP --minimal linux-3.4.48/net/core/dev.c linux-3.4.48-vs2.3.3.9/net/cor
24342 seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " 24784 seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
24343 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", 24785 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
24344 dev->name, stats->rx_bytes, stats->rx_packets, 24786 dev->name, stats->rx_bytes, stats->rx_packets,
24345diff -NurpP --minimal linux-3.4.48/net/core/rtnetlink.c linux-3.4.48-vs2.3.3.9/net/core/rtnetlink.c 24787diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
24346--- linux-3.4.48/net/core/rtnetlink.c 2013-06-13 08:59:40.000000000 +0000 24788index a133427..93ff5d5 100644
24347+++ linux-3.4.48-vs2.3.3.9/net/core/rtnetlink.c 2013-06-13 09:46:39.000000000 +0000 24789--- a/net/core/rtnetlink.c
24348@@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_bu 24790+++ b/net/core/rtnetlink.c
24791@@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
24349 hlist_for_each_entry_rcu(dev, node, head, index_hlist) { 24792 hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
24350 if (idx < s_idx) 24793 if (idx < s_idx)
24351 goto cont; 24794 goto cont;
@@ -24354,7 +24797,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/rtnetlink.c linux-3.4.48-vs2.3.3.9/n
24354 if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, 24797 if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
24355 NETLINK_CB(cb->skb).pid, 24798 NETLINK_CB(cb->skb).pid,
24356 cb->nlh->nlmsg_seq, 0, 24799 cb->nlh->nlmsg_seq, 0,
24357@@ -1962,6 +1964,9 @@ void rtmsg_ifinfo(int type, struct net_d 24800@@ -1962,6 +1964,9 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change)
24358 int err = -ENOBUFS; 24801 int err = -ENOBUFS;
24359 size_t if_info_size; 24802 size_t if_info_size;
24360 24803
@@ -24364,9 +24807,10 @@ diff -NurpP --minimal linux-3.4.48/net/core/rtnetlink.c linux-3.4.48-vs2.3.3.9/n
24364 skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); 24807 skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
24365 if (skb == NULL) 24808 if (skb == NULL)
24366 goto errout; 24809 goto errout;
24367diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/core/sock.c 24810diff --git a/net/core/sock.c b/net/core/sock.c
24368--- linux-3.4.48/net/core/sock.c 2013-06-13 08:59:40.000000000 +0000 24811index 561eb57..4de81b0 100644
24369+++ linux-3.4.48-vs2.3.3.9/net/core/sock.c 2013-06-13 09:46:39.000000000 +0000 24812--- a/net/core/sock.c
24813+++ b/net/core/sock.c
24370@@ -129,6 +129,10 @@ 24814@@ -129,6 +129,10 @@
24371 #include <net/netprio_cgroup.h> 24815 #include <net/netprio_cgroup.h>
24372 24816
@@ -24378,7 +24822,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/co
24378 24822
24379 #include <trace/events/sock.h> 24823 #include <trace/events/sock.h>
24380 24824
24381@@ -1147,6 +1151,8 @@ static struct sock *sk_prot_alloc(struct 24825@@ -1141,6 +1145,8 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,
24382 goto out_free_sec; 24826 goto out_free_sec;
24383 sk_tx_queue_clear(sk); 24827 sk_tx_queue_clear(sk);
24384 } 24828 }
@@ -24387,7 +24831,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/co
24387 24831
24388 return sk; 24832 return sk;
24389 24833
24390@@ -1255,6 +1261,11 @@ static void __sk_free(struct sock *sk) 24834@@ -1249,6 +1255,11 @@ static void __sk_free(struct sock *sk)
24391 put_cred(sk->sk_peer_cred); 24835 put_cred(sk->sk_peer_cred);
24392 put_pid(sk->sk_peer_pid); 24836 put_pid(sk->sk_peer_pid);
24393 put_net(sock_net(sk)); 24837 put_net(sock_net(sk));
@@ -24399,7 +24843,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/co
24399 sk_prot_free(sk->sk_prot_creator, sk); 24843 sk_prot_free(sk->sk_prot_creator, sk);
24400 } 24844 }
24401 24845
24402@@ -1315,6 +1326,8 @@ struct sock *sk_clone_lock(const struct 24846@@ -1309,6 +1320,8 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
24403 24847
24404 /* SANITY */ 24848 /* SANITY */
24405 get_net(sock_net(newsk)); 24849 get_net(sock_net(newsk));
@@ -24408,7 +24852,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/co
24408 sk_node_init(&newsk->sk_node); 24852 sk_node_init(&newsk->sk_node);
24409 sock_lock_init(newsk); 24853 sock_lock_init(newsk);
24410 bh_lock_sock(newsk); 24854 bh_lock_sock(newsk);
24411@@ -1371,6 +1384,12 @@ struct sock *sk_clone_lock(const struct 24855@@ -1365,6 +1378,12 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
24412 smp_wmb(); 24856 smp_wmb();
24413 atomic_set(&newsk->sk_refcnt, 2); 24857 atomic_set(&newsk->sk_refcnt, 2);
24414 24858
@@ -24421,7 +24865,7 @@ diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/co
24421 /* 24865 /*
24422 * Increment the counter in the same struct proto as the master 24866 * Increment the counter in the same struct proto as the master
24423 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that 24867 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
24424@@ -2127,6 +2146,12 @@ void sock_init_data(struct socket *sock, 24868@@ -2121,6 +2140,12 @@ void sock_init_data(struct socket *sock, struct sock *sk)
24425 24869
24426 sk->sk_stamp = ktime_set(-1L, 0); 24870 sk->sk_stamp = ktime_set(-1L, 0);
24427 24871
@@ -24434,9 +24878,10 @@ diff -NurpP --minimal linux-3.4.48/net/core/sock.c linux-3.4.48-vs2.3.3.9/net/co
24434 /* 24878 /*
24435 * Before updating sk_refcnt, we must commit prior changes to memory 24879 * Before updating sk_refcnt, we must commit prior changes to memory
24436 * (Documentation/RCU/rculist_nulls.txt for details) 24880 * (Documentation/RCU/rculist_nulls.txt for details)
24437diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net/ipv4/af_inet.c 24881diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
24438--- linux-3.4.48/net/ipv4/af_inet.c 2013-06-13 08:59:41.000000000 +0000 24882index 78ec298..fce68cf 100644
24439+++ linux-3.4.48-vs2.3.3.9/net/ipv4/af_inet.c 2013-03-02 15:26:44.000000000 +0000 24883--- a/net/ipv4/af_inet.c
24884+++ b/net/ipv4/af_inet.c
24440@@ -118,6 +118,7 @@ 24885@@ -118,6 +118,7 @@
24441 #ifdef CONFIG_IP_MROUTE 24886 #ifdef CONFIG_IP_MROUTE
24442 #include <linux/mroute.h> 24887 #include <linux/mroute.h>
@@ -24460,7 +24905,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net
24460 err = -EAFNOSUPPORT; 24905 err = -EAFNOSUPPORT;
24461 if (!inet_netns_ok(net, protocol)) 24906 if (!inet_netns_ok(net, protocol))
24462 goto out_rcu_unlock; 24907 goto out_rcu_unlock;
24463@@ -459,6 +464,7 @@ int inet_bind(struct socket *sock, struc 24908@@ -459,6 +464,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
24464 struct sockaddr_in *addr = (struct sockaddr_in *)uaddr; 24909 struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
24465 struct sock *sk = sock->sk; 24910 struct sock *sk = sock->sk;
24466 struct inet_sock *inet = inet_sk(sk); 24911 struct inet_sock *inet = inet_sk(sk);
@@ -24468,7 +24913,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net
24468 unsigned short snum; 24913 unsigned short snum;
24469 int chk_addr_ret; 24914 int chk_addr_ret;
24470 int err; 24915 int err;
24471@@ -482,7 +488,11 @@ int inet_bind(struct socket *sock, struc 24916@@ -482,7 +488,11 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
24472 goto out; 24917 goto out;
24473 } 24918 }
24474 24919
@@ -24481,7 +24926,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net
24481 24926
24482 /* Not specified by any standard per-se, however it breaks too 24927 /* Not specified by any standard per-se, however it breaks too
24483 * many applications when removed. It is unfortunate since 24928 * many applications when removed. It is unfortunate since
24484@@ -494,7 +504,7 @@ int inet_bind(struct socket *sock, struc 24929@@ -494,7 +504,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
24485 err = -EADDRNOTAVAIL; 24930 err = -EADDRNOTAVAIL;
24486 if (!sysctl_ip_nonlocal_bind && 24931 if (!sysctl_ip_nonlocal_bind &&
24487 !(inet->freebind || inet->transparent) && 24932 !(inet->freebind || inet->transparent) &&
@@ -24490,7 +24935,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net
24490 chk_addr_ret != RTN_LOCAL && 24935 chk_addr_ret != RTN_LOCAL &&
24491 chk_addr_ret != RTN_MULTICAST && 24936 chk_addr_ret != RTN_MULTICAST &&
24492 chk_addr_ret != RTN_BROADCAST) 24937 chk_addr_ret != RTN_BROADCAST)
24493@@ -519,7 +529,7 @@ int inet_bind(struct socket *sock, struc 24938@@ -519,7 +529,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
24494 if (sk->sk_state != TCP_CLOSE || inet->inet_num) 24939 if (sk->sk_state != TCP_CLOSE || inet->inet_num)
24495 goto out_release_sock; 24940 goto out_release_sock;
24496 24941
@@ -24499,7 +24944,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net
24499 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) 24944 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
24500 inet->inet_saddr = 0; /* Use device */ 24945 inet->inet_saddr = 0; /* Use device */
24501 24946
24502@@ -722,11 +732,13 @@ int inet_getname(struct socket *sock, st 24947@@ -722,11 +732,13 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,
24503 peer == 1)) 24948 peer == 1))
24504 return -ENOTCONN; 24949 return -ENOTCONN;
24505 sin->sin_port = inet->inet_dport; 24950 sin->sin_port = inet->inet_dport;
@@ -24514,10 +24959,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/af_inet.c linux-3.4.48-vs2.3.3.9/net
24514 sin->sin_port = inet->inet_sport; 24959 sin->sin_port = inet->inet_sport;
24515 sin->sin_addr.s_addr = addr; 24960 sin->sin_addr.s_addr = addr;
24516 } 24961 }
24517diff -NurpP --minimal linux-3.4.48/net/ipv4/arp.c linux-3.4.48-vs2.3.3.9/net/ipv4/arp.c 24962diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
24518--- linux-3.4.48/net/ipv4/arp.c 2012-05-21 16:07:40.000000000 +0000 24963index 18d9b81..d45cd32 100644
24519+++ linux-3.4.48-vs2.3.3.9/net/ipv4/arp.c 2012-05-21 16:15:05.000000000 +0000 24964--- a/net/ipv4/arp.c
24520@@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struc 24965+++ b/net/ipv4/arp.c
24966@@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struct seq_file *seq,
24521 struct net_device *dev = n->dev; 24967 struct net_device *dev = n->dev;
24522 int hatype = dev->type; 24968 int hatype = dev->type;
24523 24969
@@ -24525,7 +24971,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/arp.c linux-3.4.48-vs2.3.3.9/net/ipv
24525 read_lock(&n->lock); 24971 read_lock(&n->lock);
24526 /* Convert hardware address to XX:XX:XX:XX ... form. */ 24972 /* Convert hardware address to XX:XX:XX:XX ... form. */
24527 #if IS_ENABLED(CONFIG_AX25) 24973 #if IS_ENABLED(CONFIG_AX25)
24528@@ -1359,6 +1360,7 @@ static void arp_format_pneigh_entry(stru 24974@@ -1359,6 +1360,7 @@ static void arp_format_pneigh_entry(struct seq_file *seq,
24529 int hatype = dev ? dev->type : 0; 24975 int hatype = dev ? dev->type : 0;
24530 char tbuf[16]; 24976 char tbuf[16];
24531 24977
@@ -24533,10 +24979,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/arp.c linux-3.4.48-vs2.3.3.9/net/ipv
24533 sprintf(tbuf, "%pI4", n->key); 24979 sprintf(tbuf, "%pI4", n->key);
24534 seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", 24980 seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
24535 tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", 24981 tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
24536diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net/ipv4/devinet.c 24982diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
24537--- linux-3.4.48/net/ipv4/devinet.c 2012-05-21 16:07:40.000000000 +0000 24983index 6e447ff..3c0d332 100644
24538+++ linux-3.4.48-vs2.3.3.9/net/ipv4/devinet.c 2012-05-21 16:15:05.000000000 +0000 24984--- a/net/ipv4/devinet.c
24539@@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struc 24985+++ b/net/ipv4/devinet.c
24986@@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struct net *net, int ifindex)
24540 } 24987 }
24541 EXPORT_SYMBOL(inetdev_by_index); 24988 EXPORT_SYMBOL(inetdev_by_index);
24542 24989
@@ -24544,7 +24991,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net
24544 /* Called only from RTNL semaphored context. No locks. */ 24991 /* Called only from RTNL semaphored context. No locks. */
24545 24992
24546 struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, 24993 struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
24547@@ -758,6 +759,8 @@ int devinet_ioctl(struct net *net, unsig 24994@@ -758,6 +759,8 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg)
24548 24995
24549 in_dev = __in_dev_get_rtnl(dev); 24996 in_dev = __in_dev_get_rtnl(dev);
24550 if (in_dev) { 24997 if (in_dev) {
@@ -24553,7 +25000,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net
24553 if (tryaddrmatch) { 25000 if (tryaddrmatch) {
24554 /* Matthias Andree */ 25001 /* Matthias Andree */
24555 /* compare label and address (4.4BSD style) */ 25002 /* compare label and address (4.4BSD style) */
24556@@ -766,6 +769,8 @@ int devinet_ioctl(struct net *net, unsig 25003@@ -766,6 +769,8 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg)
24557 This is checked above. */ 25004 This is checked above. */
24558 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; 25005 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
24559 ifap = &ifa->ifa_next) { 25006 ifap = &ifa->ifa_next) {
@@ -24562,7 +25009,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net
24562 if (!strcmp(ifr.ifr_name, ifa->ifa_label) && 25009 if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
24563 sin_orig.sin_addr.s_addr == 25010 sin_orig.sin_addr.s_addr ==
24564 ifa->ifa_local) { 25011 ifa->ifa_local) {
24565@@ -778,9 +783,12 @@ int devinet_ioctl(struct net *net, unsig 25012@@ -778,9 +783,12 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg)
24566 comparing just the label */ 25013 comparing just the label */
24567 if (!ifa) { 25014 if (!ifa) {
24568 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; 25015 for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
@@ -24576,7 +25023,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net
24576 } 25023 }
24577 } 25024 }
24578 25025
24579@@ -933,6 +941,8 @@ static int inet_gifconf(struct net_devic 25026@@ -933,6 +941,8 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
24580 goto out; 25027 goto out;
24581 25028
24582 for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { 25029 for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
@@ -24585,7 +25032,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net
24585 if (!buf) { 25032 if (!buf) {
24586 done += sizeof(ifr); 25033 done += sizeof(ifr);
24587 continue; 25034 continue;
24588@@ -1294,6 +1304,7 @@ static int inet_dump_ifaddr(struct sk_bu 25035@@ -1294,6 +1304,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
24589 struct net_device *dev; 25036 struct net_device *dev;
24590 struct in_device *in_dev; 25037 struct in_device *in_dev;
24591 struct in_ifaddr *ifa; 25038 struct in_ifaddr *ifa;
@@ -24593,7 +25040,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net
24593 struct hlist_head *head; 25040 struct hlist_head *head;
24594 struct hlist_node *node; 25041 struct hlist_node *node;
24595 25042
24596@@ -1316,6 +1327,8 @@ static int inet_dump_ifaddr(struct sk_bu 25043@@ -1316,6 +1327,8 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
24597 25044
24598 for (ifa = in_dev->ifa_list, ip_idx = 0; ifa; 25045 for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
24599 ifa = ifa->ifa_next, ip_idx++) { 25046 ifa = ifa->ifa_next, ip_idx++) {
@@ -24602,10 +25049,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/devinet.c linux-3.4.48-vs2.3.3.9/net
24602 if (ip_idx < s_ip_idx) 25049 if (ip_idx < s_ip_idx)
24603 continue; 25050 continue;
24604 if (inet_fill_ifaddr(skb, ifa, 25051 if (inet_fill_ifaddr(skb, ifa,
24605diff -NurpP --minimal linux-3.4.48/net/ipv4/fib_trie.c linux-3.4.48-vs2.3.3.9/net/ipv4/fib_trie.c 25052diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
24606--- linux-3.4.48/net/ipv4/fib_trie.c 2012-05-21 16:07:40.000000000 +0000 25053index 30b88d7..f26a2d1 100644
24607+++ linux-3.4.48-vs2.3.3.9/net/ipv4/fib_trie.c 2012-05-21 16:15:05.000000000 +0000 25054--- a/net/ipv4/fib_trie.c
24608@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq 25055+++ b/net/ipv4/fib_trie.c
25056@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
24609 || fa->fa_type == RTN_MULTICAST) 25057 || fa->fa_type == RTN_MULTICAST)
24610 continue; 25058 continue;
24611 25059
@@ -24613,10 +25061,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/fib_trie.c linux-3.4.48-vs2.3.3.9/ne
24613 if (fi) 25061 if (fi)
24614 seq_printf(seq, 25062 seq_printf(seq,
24615 "%s\t%08X\t%08X\t%04X\t%d\t%u\t" 25063 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
24616diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_connection_sock.c linux-3.4.48-vs2.3.3.9/net/ipv4/inet_connection_sock.c 25064diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
24617--- linux-3.4.48/net/ipv4/inet_connection_sock.c 2013-06-13 08:59:41.000000000 +0000 25065index 3f40432..aa64692 100644
24618+++ linux-3.4.48-vs2.3.3.9/net/ipv4/inet_connection_sock.c 2013-01-16 00:15:57.000000000 +0000 25066--- a/net/ipv4/inet_connection_sock.c
24619@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low, 25067+++ b/net/ipv4/inet_connection_sock.c
25068@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low, int *high)
24620 } 25069 }
24621 EXPORT_SYMBOL(inet_get_local_port_range); 25070 EXPORT_SYMBOL(inet_get_local_port_range);
24622 25071
@@ -24654,7 +25103,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_connection_sock.c linux-3.4.48-
24654 int inet_csk_bind_conflict(const struct sock *sk, 25103 int inet_csk_bind_conflict(const struct sock *sk,
24655 const struct inet_bind_bucket *tb) 25104 const struct inet_bind_bucket *tb)
24656 { 25105 {
24657@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct 25106@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct sock *sk,
24658 sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { 25107 sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
24659 if (!reuse || !sk2->sk_reuse || 25108 if (!reuse || !sk2->sk_reuse ||
24660 sk2->sk_state == TCP_LISTEN) { 25109 sk2->sk_state == TCP_LISTEN) {
@@ -24665,9 +25114,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_connection_sock.c linux-3.4.48-
24665 break; 25114 break;
24666 } 25115 }
24667 } 25116 }
24668diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/net/ipv4/inet_diag.c 25117diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
24669--- linux-3.4.48/net/ipv4/inet_diag.c 2013-06-13 08:59:41.000000000 +0000 25118index d7b862a..cac6ffa 100644
24670+++ linux-3.4.48-vs2.3.3.9/net/ipv4/inet_diag.c 2013-01-16 00:18:21.000000000 +0000 25119--- a/net/ipv4/inet_diag.c
25120+++ b/net/ipv4/inet_diag.c
24671@@ -31,6 +31,8 @@ 25121@@ -31,6 +31,8 @@
24672 25122
24673 #include <linux/inet.h> 25123 #include <linux/inet.h>
@@ -24677,7 +25127,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24677 25127
24678 #include <linux/inet_diag.h> 25128 #include <linux/inet_diag.h>
24679 #include <linux/sock_diag.h> 25129 #include <linux/sock_diag.h>
24680@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s 25130@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
24681 25131
24682 r->id.idiag_sport = inet->inet_sport; 25132 r->id.idiag_sport = inet->inet_sport;
24683 r->id.idiag_dport = inet->inet_dport; 25133 r->id.idiag_dport = inet->inet_dport;
@@ -24690,7 +25140,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24690 25140
24691 /* IPv6 dual-stack sockets use inet->tos for IPv4 connections, 25141 /* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
24692 * hence this needs to be included regardless of socket family. 25142 * hence this needs to be included regardless of socket family.
24693@@ -231,8 +235,8 @@ static int inet_twsk_diag_fill(struct in 25143@@ -231,8 +235,8 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
24694 sock_diag_save_cookie(tw, r->id.idiag_cookie); 25144 sock_diag_save_cookie(tw, r->id.idiag_cookie);
24695 r->id.idiag_sport = tw->tw_sport; 25145 r->id.idiag_sport = tw->tw_sport;
24696 r->id.idiag_dport = tw->tw_dport; 25146 r->id.idiag_dport = tw->tw_dport;
@@ -24701,7 +25151,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24701 r->idiag_state = tw->tw_substate; 25151 r->idiag_state = tw->tw_substate;
24702 r->idiag_timer = 3; 25152 r->idiag_timer = 3;
24703 r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ); 25153 r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
24704@@ -276,12 +280,14 @@ int inet_diag_dump_one_icsk(struct inet_ 25154@@ -276,12 +280,14 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s
24705 25155
24706 err = -EINVAL; 25156 err = -EINVAL;
24707 if (req->sdiag_family == AF_INET) { 25157 if (req->sdiag_family == AF_INET) {
@@ -24716,7 +25166,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24716 sk = inet6_lookup(&init_net, hashinfo, 25166 sk = inet6_lookup(&init_net, hashinfo,
24717 (struct in6_addr *)req->id.idiag_dst, 25167 (struct in6_addr *)req->id.idiag_dst,
24718 req->id.idiag_dport, 25168 req->id.idiag_dport,
24719@@ -482,6 +488,7 @@ int inet_diag_bc_sk(const struct nlattr 25169@@ -482,6 +488,7 @@ int inet_diag_bc_sk(const struct nlattr *bc, struct sock *sk)
24720 } else 25170 } else
24721 #endif 25171 #endif
24722 { 25172 {
@@ -24724,7 +25174,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24724 entry.saddr = &inet->inet_rcv_saddr; 25174 entry.saddr = &inet->inet_rcv_saddr;
24725 entry.daddr = &inet->inet_daddr; 25175 entry.daddr = &inet->inet_daddr;
24726 } 25176 }
24727@@ -639,6 +646,7 @@ static int inet_twsk_diag_dump(struct in 25177@@ -639,6 +646,7 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
24728 } else 25178 } else
24729 #endif 25179 #endif
24730 { 25180 {
@@ -24732,7 +25182,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24732 entry.saddr = &tw->tw_rcv_saddr; 25182 entry.saddr = &tw->tw_rcv_saddr;
24733 entry.daddr = &tw->tw_daddr; 25183 entry.daddr = &tw->tw_daddr;
24734 } 25184 }
24735@@ -714,8 +722,8 @@ static int inet_diag_fill_req(struct sk_ 25185@@ -714,8 +722,8 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
24736 25186
24737 r->id.idiag_sport = inet->inet_sport; 25187 r->id.idiag_sport = inet->inet_sport;
24738 r->id.idiag_dport = ireq->rmt_port; 25188 r->id.idiag_dport = ireq->rmt_port;
@@ -24743,7 +25193,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24743 r->idiag_expires = jiffies_to_msecs(tmo); 25193 r->idiag_expires = jiffies_to_msecs(tmo);
24744 r->idiag_rqueue = 0; 25194 r->idiag_rqueue = 0;
24745 r->idiag_wqueue = 0; 25195 r->idiag_wqueue = 0;
24746@@ -784,6 +792,7 @@ static int inet_diag_dump_reqs(struct sk 25196@@ -784,6 +792,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
24747 continue; 25197 continue;
24748 25198
24749 if (bc) { 25199 if (bc) {
@@ -24751,7 +25201,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24751 inet_diag_req_addrs(sk, req, &entry); 25201 inet_diag_req_addrs(sk, req, &entry);
24752 entry.dport = ntohs(ireq->rmt_port); 25202 entry.dport = ntohs(ireq->rmt_port);
24753 25203
24754@@ -834,6 +843,8 @@ void inet_diag_dump_icsk(struct inet_has 25204@@ -834,6 +843,8 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,
24755 sk_nulls_for_each(sk, node, &ilb->head) { 25205 sk_nulls_for_each(sk, node, &ilb->head) {
24756 struct inet_sock *inet = inet_sk(sk); 25206 struct inet_sock *inet = inet_sk(sk);
24757 25207
@@ -24778,9 +25228,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_diag.c linux-3.4.48-vs2.3.3.9/n
24778 if (num < s_num) 25228 if (num < s_num)
24779 goto next_dying; 25229 goto next_dying;
24780 if (r->sdiag_family != AF_UNSPEC && 25230 if (r->sdiag_family != AF_UNSPEC &&
24781diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_hashtables.c linux-3.4.48-vs2.3.3.9/net/ipv4/inet_hashtables.c 25231diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
24782--- linux-3.4.48/net/ipv4/inet_hashtables.c 2011-10-24 16:45:34.000000000 +0000 25232index 984ec65..2dc65a1 100644
24783+++ linux-3.4.48-vs2.3.3.9/net/ipv4/inet_hashtables.c 2012-05-21 16:15:05.000000000 +0000 25233--- a/net/ipv4/inet_hashtables.c
25234+++ b/net/ipv4/inet_hashtables.c
24784@@ -22,6 +22,7 @@ 25235@@ -22,6 +22,7 @@
24785 #include <net/inet_connection_sock.h> 25236 #include <net/inet_connection_sock.h>
24786 #include <net/inet_hashtables.h> 25237 #include <net/inet_hashtables.h>
@@ -24789,7 +25240,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_hashtables.c linux-3.4.48-vs2.3
24789 #include <net/ip.h> 25240 #include <net/ip.h>
24790 25241
24791 /* 25242 /*
24792@@ -156,6 +157,11 @@ static inline int compute_score(struct s 25243@@ -156,6 +157,11 @@ static inline int compute_score(struct sock *sk, struct net *net,
24793 if (rcv_saddr != daddr) 25244 if (rcv_saddr != daddr)
24794 return -1; 25245 return -1;
24795 score += 2; 25246 score += 2;
@@ -24801,7 +25252,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_hashtables.c linux-3.4.48-vs2.3
24801 } 25252 }
24802 if (sk->sk_bound_dev_if) { 25253 if (sk->sk_bound_dev_if) {
24803 if (sk->sk_bound_dev_if != dif) 25254 if (sk->sk_bound_dev_if != dif)
24804@@ -173,7 +179,6 @@ static inline int compute_score(struct s 25255@@ -173,7 +179,6 @@ static inline int compute_score(struct sock *sk, struct net *net,
24805 * wildcarded during the search since they can never be otherwise. 25256 * wildcarded during the search since they can never be otherwise.
24806 */ 25257 */
24807 25258
@@ -24817,20 +25268,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/inet_hashtables.c linux-3.4.48-vs2.3
24817 /* 25268 /*
24818 * if the nulls value we got at the end of this lookup is 25269 * if the nulls value we got at the end of this lookup is
24819 * not the expected one, we must restart lookup. 25270 * not the expected one, we must restart lookup.
24820diff -NurpP --minimal linux-3.4.48/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 25271diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
24821--- linux-3.4.48/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 18:47:33.000000000 +0000 25272index 4f47e06..aec869b 100644
24822+++ linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c 2012-05-21 16:15:05.000000000 +0000 25273--- a/net/ipv4/netfilter.c
24823@@ -20,6 +20,7 @@ 25274+++ b/net/ipv4/netfilter.c
24824 #include <net/route.h>
24825
24826 #include <linux/netfilter_ipv4.h>
24827+#include <net/route.h>
24828 #include <net/netfilter/nf_conntrack.h>
24829 #include <net/netfilter/nf_conntrack_helper.h>
24830 #include <net/netfilter/nf_conntrack_ecache.h>
24831diff -NurpP --minimal linux-3.4.48/net/ipv4/netfilter.c linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter.c
24832--- linux-3.4.48/net/ipv4/netfilter.c 2012-01-09 15:15:03.000000000 +0000
24833+++ linux-3.4.48-vs2.3.3.9/net/ipv4/netfilter.c 2012-05-21 16:15:05.000000000 +0000
24834@@ -6,7 +6,7 @@ 25275@@ -6,7 +6,7 @@
24835 #include <linux/skbuff.h> 25276 #include <linux/skbuff.h>
24836 #include <linux/gfp.h> 25277 #include <linux/gfp.h>
@@ -24840,10 +25281,23 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/netfilter.c linux-3.4.48-vs2.3.3.9/n
24840 #include <net/xfrm.h> 25281 #include <net/xfrm.h>
24841 #include <net/ip.h> 25282 #include <net/ip.h>
24842 #include <net/netfilter/nf_queue.h> 25283 #include <net/netfilter/nf_queue.h>
24843diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv4/raw.c 25284diff --git a/net/ipv4/netfilter/nf_nat_helper.c b/net/ipv4/netfilter/nf_nat_helper.c
24844--- linux-3.4.48/net/ipv4/raw.c 2013-06-13 08:59:41.000000000 +0000 25285index af65958..34b8007 100644
24845+++ linux-3.4.48-vs2.3.3.9/net/ipv4/raw.c 2012-10-22 13:09:53.000000000 +0000 25286--- a/net/ipv4/netfilter/nf_nat_helper.c
24846@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru 25287+++ b/net/ipv4/netfilter/nf_nat_helper.c
25288@@ -20,6 +20,7 @@
25289 #include <net/route.h>
25290
25291 #include <linux/netfilter_ipv4.h>
25292+#include <net/route.h>
25293 #include <net/netfilter/nf_conntrack.h>
25294 #include <net/netfilter/nf_conntrack_helper.h>
25295 #include <net/netfilter/nf_conntrack_ecache.h>
25296diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
25297index 2fe0dc2..d91443e 100644
25298--- a/net/ipv4/raw.c
25299+++ b/net/ipv4/raw.c
25300@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(struct net *net, struct sock *sk,
24847 25301
24848 if (net_eq(sock_net(sk), net) && inet->inet_num == num && 25302 if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
24849 !(inet->inet_daddr && inet->inet_daddr != raddr) && 25303 !(inet->inet_daddr && inet->inet_daddr != raddr) &&
@@ -24852,7 +25306,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
24852 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) 25306 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
24853 goto found; /* gotcha */ 25307 goto found; /* gotcha */
24854 } 25308 }
24855@@ -392,6 +392,12 @@ static int raw_send_hdrinc(struct sock * 25309@@ -392,6 +392,12 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
24856 icmp_out_count(net, ((struct icmphdr *) 25310 icmp_out_count(net, ((struct icmphdr *)
24857 skb_transport_header(skb))->type); 25311 skb_transport_header(skb))->type);
24858 25312
@@ -24865,7 +25319,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
24865 err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, 25319 err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
24866 rt->dst.dev, dst_output); 25320 rt->dst.dev, dst_output);
24867 if (err > 0) 25321 if (err > 0)
24868@@ -577,6 +583,16 @@ static int raw_sendmsg(struct kiocb *ioc 25322@@ -577,6 +583,16 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
24869 goto done; 25323 goto done;
24870 } 25324 }
24871 25325
@@ -24882,7 +25336,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
24882 security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); 25336 security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
24883 rt = ip_route_output_flow(sock_net(sk), &fl4, sk); 25337 rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
24884 if (IS_ERR(rt)) { 25338 if (IS_ERR(rt)) {
24885@@ -653,17 +669,19 @@ static int raw_bind(struct sock *sk, str 25339@@ -653,17 +669,19 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
24886 { 25340 {
24887 struct inet_sock *inet = inet_sk(sk); 25341 struct inet_sock *inet = inet_sk(sk);
24888 struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; 25342 struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
@@ -24905,7 +25359,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
24905 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) 25359 if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
24906 inet->inet_saddr = 0; /* Use device */ 25360 inet->inet_saddr = 0; /* Use device */
24907 sk_dst_reset(sk); 25361 sk_dst_reset(sk);
24908@@ -715,7 +733,8 @@ static int raw_recvmsg(struct kiocb *ioc 25362@@ -715,7 +733,8 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
24909 /* Copy the address. */ 25363 /* Copy the address. */
24910 if (sin) { 25364 if (sin) {
24911 sin->sin_family = AF_INET; 25365 sin->sin_family = AF_INET;
@@ -24915,7 +25369,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
24915 sin->sin_port = 0; 25369 sin->sin_port = 0;
24916 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); 25370 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
24917 } 25371 }
24918@@ -911,7 +930,8 @@ static struct sock *raw_get_first(struct 25372@@ -911,7 +930,8 @@ static struct sock *raw_get_first(struct seq_file *seq)
24919 struct hlist_node *node; 25373 struct hlist_node *node;
24920 25374
24921 sk_for_each(sk, node, &state->h->ht[state->bucket]) 25375 sk_for_each(sk, node, &state->h->ht[state->bucket])
@@ -24925,7 +25379,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
24925 goto found; 25379 goto found;
24926 } 25380 }
24927 sk = NULL; 25381 sk = NULL;
24928@@ -927,7 +947,8 @@ static struct sock *raw_get_next(struct 25382@@ -927,7 +947,8 @@ static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
24929 sk = sk_next(sk); 25383 sk = sk_next(sk);
24930 try_again: 25384 try_again:
24931 ; 25385 ;
@@ -24935,10 +25389,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
24935 25389
24936 if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { 25390 if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
24937 sk = sk_head(&state->h->ht[state->bucket]); 25391 sk = sk_head(&state->h->ht[state->bucket]);
24938diff -NurpP --minimal linux-3.4.48/net/ipv4/route.c linux-3.4.48-vs2.3.3.9/net/ipv4/route.c 25392diff --git a/net/ipv4/route.c b/net/ipv4/route.c
24939--- linux-3.4.48/net/ipv4/route.c 2012-05-21 16:07:40.000000000 +0000 25393index 167ea10..747208b 100644
24940+++ linux-3.4.48-vs2.3.3.9/net/ipv4/route.c 2012-05-21 16:15:05.000000000 +0000 25394--- a/net/ipv4/route.c
24941@@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_sl 25395+++ b/net/ipv4/route.c
25396@@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_slow(struct net *net, struct flowi4 *fl4)
24942 25397
24943 25398
24944 if (fl4->flowi4_oif) { 25399 if (fl4->flowi4_oif) {
@@ -24947,9 +25402,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/route.c linux-3.4.48-vs2.3.3.9/net/i
24947 rth = ERR_PTR(-ENODEV); 25402 rth = ERR_PTR(-ENODEV);
24948 if (dev_out == NULL) 25403 if (dev_out == NULL)
24949 goto out; 25404 goto out;
24950diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp.c linux-3.4.48-vs2.3.3.9/net/ipv4/tcp.c 25405diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
24951--- linux-3.4.48/net/ipv4/tcp.c 2013-06-13 08:59:41.000000000 +0000 25406index 0b91c30..e3a3044 100644
24952+++ linux-3.4.48-vs2.3.3.9/net/ipv4/tcp.c 2013-03-30 21:29:17.000000000 +0000 25407--- a/net/ipv4/tcp.c
25408+++ b/net/ipv4/tcp.c
24953@@ -268,6 +268,7 @@ 25409@@ -268,6 +268,7 @@
24954 #include <linux/crypto.h> 25410 #include <linux/crypto.h>
24955 #include <linux/time.h> 25411 #include <linux/time.h>
@@ -24958,10 +25414,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp.c linux-3.4.48-vs2.3.3.9/net/ipv
24958 25414
24959 #include <net/icmp.h> 25415 #include <net/icmp.h>
24960 #include <net/tcp.h> 25416 #include <net/tcp.h>
24961diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_ipv4.c 25417diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
24962--- linux-3.4.48/net/ipv4/tcp_ipv4.c 2013-06-13 08:59:41.000000000 +0000 25418index ae03b7b..7621ce0 100644
24963+++ linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_ipv4.c 2013-01-16 00:15:57.000000000 +0000 25419--- a/net/ipv4/tcp_ipv4.c
24964@@ -2037,6 +2037,12 @@ static void *listening_get_next(struct s 25420+++ b/net/ipv4/tcp_ipv4.c
25421@@ -2037,6 +2037,12 @@ static void *listening_get_next(struct seq_file *seq, void *cur)
24965 req = req->dl_next; 25422 req = req->dl_next;
24966 while (1) { 25423 while (1) {
24967 while (req) { 25424 while (req) {
@@ -24985,7 +25442,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/ne
24985 if (!net_eq(sock_net(sk), net)) 25442 if (!net_eq(sock_net(sk), net))
24986 continue; 25443 continue;
24987 if (sk->sk_family == st->family) { 25444 if (sk->sk_family == st->family) {
24988@@ -2137,6 +2147,11 @@ static void *established_get_first(struc 25445@@ -2137,6 +2147,11 @@ static void *established_get_first(struct seq_file *seq)
24989 25446
24990 spin_lock_bh(lock); 25447 spin_lock_bh(lock);
24991 sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { 25448 sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
@@ -24997,7 +25454,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/ne
24997 if (sk->sk_family != st->family || 25454 if (sk->sk_family != st->family ||
24998 !net_eq(sock_net(sk), net)) { 25455 !net_eq(sock_net(sk), net)) {
24999 continue; 25456 continue;
25000@@ -2147,6 +2162,11 @@ static void *established_get_first(struc 25457@@ -2147,6 +2162,11 @@ static void *established_get_first(struct seq_file *seq)
25001 st->state = TCP_SEQ_STATE_TIME_WAIT; 25458 st->state = TCP_SEQ_STATE_TIME_WAIT;
25002 inet_twsk_for_each(tw, node, 25459 inet_twsk_for_each(tw, node,
25003 &tcp_hashinfo.ehash[st->bucket].twchain) { 25460 &tcp_hashinfo.ehash[st->bucket].twchain) {
@@ -25009,7 +25466,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/ne
25009 if (tw->tw_family != st->family || 25466 if (tw->tw_family != st->family ||
25010 !net_eq(twsk_net(tw), net)) { 25467 !net_eq(twsk_net(tw), net)) {
25011 continue; 25468 continue;
25012@@ -2176,7 +2196,9 @@ static void *established_get_next(struct 25469@@ -2176,7 +2196,9 @@ static void *established_get_next(struct seq_file *seq, void *cur)
25013 tw = cur; 25470 tw = cur;
25014 tw = tw_next(tw); 25471 tw = tw_next(tw);
25015 get_tw: 25472 get_tw:
@@ -25032,7 +25489,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/ne
25032 if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) 25489 if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
25033 goto found; 25490 goto found;
25034 } 25491 }
25035@@ -2405,9 +2432,9 @@ static void get_openreq4(const struct so 25492@@ -2405,9 +2432,9 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
25036 seq_printf(f, "%4d: %08X:%04X %08X:%04X" 25493 seq_printf(f, "%4d: %08X:%04X %08X:%04X"
25037 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n", 25494 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
25038 i, 25495 i,
@@ -25044,7 +25501,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/ne
25044 ntohs(ireq->rmt_port), 25501 ntohs(ireq->rmt_port),
25045 TCP_SYN_RECV, 25502 TCP_SYN_RECV,
25046 0, 0, /* could print option size, but that is af dependent. */ 25503 0, 0, /* could print option size, but that is af dependent. */
25047@@ -2429,8 +2456,8 @@ static void get_tcp4_sock(struct sock *s 25504@@ -2429,8 +2456,8 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
25048 const struct tcp_sock *tp = tcp_sk(sk); 25505 const struct tcp_sock *tp = tcp_sk(sk);
25049 const struct inet_connection_sock *icsk = inet_csk(sk); 25506 const struct inet_connection_sock *icsk = inet_csk(sk);
25050 const struct inet_sock *inet = inet_sk(sk); 25507 const struct inet_sock *inet = inet_sk(sk);
@@ -25055,7 +25512,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/ne
25055 __u16 destp = ntohs(inet->inet_dport); 25512 __u16 destp = ntohs(inet->inet_dport);
25056 __u16 srcp = ntohs(inet->inet_sport); 25513 __u16 srcp = ntohs(inet->inet_sport);
25057 int rx_queue; 25514 int rx_queue;
25058@@ -2487,8 +2514,8 @@ static void get_timewait4_sock(const str 25515@@ -2487,8 +2514,8 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
25059 if (ttd < 0) 25516 if (ttd < 0)
25060 ttd = 0; 25517 ttd = 0;
25061 25518
@@ -25066,9 +25523,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_ipv4.c linux-3.4.48-vs2.3.3.9/ne
25066 destp = ntohs(tw->tw_dport); 25523 destp = ntohs(tw->tw_dport);
25067 srcp = ntohs(tw->tw_sport); 25524 srcp = ntohs(tw->tw_sport);
25068 25525
25069diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_minisocks.c linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_minisocks.c 25526diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
25070--- linux-3.4.48/net/ipv4/tcp_minisocks.c 2012-05-21 16:07:40.000000000 +0000 25527index 3cabafb..3a13a16 100644
25071+++ linux-3.4.48-vs2.3.3.9/net/ipv4/tcp_minisocks.c 2012-05-21 16:15:05.000000000 +0000 25528--- a/net/ipv4/tcp_minisocks.c
25529+++ b/net/ipv4/tcp_minisocks.c
25072@@ -23,6 +23,9 @@ 25530@@ -23,6 +23,9 @@
25073 #include <linux/slab.h> 25531 #include <linux/slab.h>
25074 #include <linux/sysctl.h> 25532 #include <linux/sysctl.h>
@@ -25079,7 +25537,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_minisocks.c linux-3.4.48-vs2.3.3
25079 #include <net/tcp.h> 25537 #include <net/tcp.h>
25080 #include <net/inet_common.h> 25538 #include <net/inet_common.h>
25081 #include <net/xfrm.h> 25539 #include <net/xfrm.h>
25082@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int 25540@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
25083 tcptw->tw_ts_recent = tp->rx_opt.ts_recent; 25541 tcptw->tw_ts_recent = tp->rx_opt.ts_recent;
25084 tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp; 25542 tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
25085 25543
@@ -25091,9 +25549,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/tcp_minisocks.c linux-3.4.48-vs2.3.3
25091 #if IS_ENABLED(CONFIG_IPV6) 25549 #if IS_ENABLED(CONFIG_IPV6)
25092 if (tw->tw_family == PF_INET6) { 25550 if (tw->tw_family == PF_INET6) {
25093 struct ipv6_pinfo *np = inet6_sk(sk); 25551 struct ipv6_pinfo *np = inet6_sk(sk);
25094diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv4/udp.c 25552diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
25095--- linux-3.4.48/net/ipv4/udp.c 2012-05-21 16:07:40.000000000 +0000 25553index 0b6136d..63eb580 100644
25096+++ linux-3.4.48-vs2.3.3.9/net/ipv4/udp.c 2012-06-28 14:45:36.000000000 +0000 25554--- a/net/ipv4/udp.c
25555+++ b/net/ipv4/udp.c
25097@@ -298,14 +298,7 @@ fail: 25556@@ -298,14 +298,7 @@ fail:
25098 } 25557 }
25099 EXPORT_SYMBOL(udp_lib_get_port); 25558 EXPORT_SYMBOL(udp_lib_get_port);
@@ -25110,7 +25569,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25110 25569
25111 static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr, 25570 static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
25112 unsigned int port) 25571 unsigned int port)
25113@@ -340,6 +333,11 @@ static inline int compute_score(struct s 25572@@ -340,6 +333,11 @@ static inline int compute_score(struct sock *sk, struct net *net, __be32 saddr,
25114 if (inet->inet_rcv_saddr != daddr) 25573 if (inet->inet_rcv_saddr != daddr)
25115 return -1; 25574 return -1;
25116 score += 2; 25575 score += 2;
@@ -25158,7 +25617,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25158 rcu_read_unlock(); 25617 rcu_read_unlock();
25159 return result; 25618 return result;
25160 } 25619 }
25161@@ -553,8 +559,7 @@ static inline struct sock *udp_v4_mcast_ 25620@@ -553,8 +559,7 @@ static inline struct sock *udp_v4_mcast_next(struct net *net, struct sock *sk,
25162 udp_sk(s)->udp_port_hash != hnum || 25621 udp_sk(s)->udp_port_hash != hnum ||
25163 (inet->inet_daddr && inet->inet_daddr != rmt_addr) || 25622 (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
25164 (inet->inet_dport != rmt_port && inet->inet_dport) || 25623 (inet->inet_dport != rmt_port && inet->inet_dport) ||
@@ -25168,7 +25627,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25168 ipv6_only_sock(s) || 25627 ipv6_only_sock(s) ||
25169 (s->sk_bound_dev_if && s->sk_bound_dev_if != dif)) 25628 (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
25170 continue; 25629 continue;
25171@@ -933,6 +938,16 @@ int udp_sendmsg(struct kiocb *iocb, stru 25630@@ -934,6 +939,16 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
25172 inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP, 25631 inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
25173 faddr, saddr, dport, inet->inet_sport); 25632 faddr, saddr, dport, inet->inet_sport);
25174 25633
@@ -25185,7 +25644,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25185 security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); 25644 security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
25186 rt = ip_route_output_flow(net, fl4, sk); 25645 rt = ip_route_output_flow(net, fl4, sk);
25187 if (IS_ERR(rt)) { 25646 if (IS_ERR(rt)) {
25188@@ -1231,7 +1246,8 @@ try_again: 25647@@ -1232,7 +1247,8 @@ try_again:
25189 if (sin) { 25648 if (sin) {
25190 sin->sin_family = AF_INET; 25649 sin->sin_family = AF_INET;
25191 sin->sin_port = udp_hdr(skb)->source; 25650 sin->sin_port = udp_hdr(skb)->source;
@@ -25195,7 +25654,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25195 memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); 25654 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
25196 } 25655 }
25197 if (inet->cmsg_flags) 25656 if (inet->cmsg_flags)
25198@@ -1970,6 +1986,8 @@ static struct sock *udp_get_first(struct 25657@@ -1971,6 +1987,8 @@ static struct sock *udp_get_first(struct seq_file *seq, int start)
25199 sk_nulls_for_each(sk, node, &hslot->head) { 25658 sk_nulls_for_each(sk, node, &hslot->head) {
25200 if (!net_eq(sock_net(sk), net)) 25659 if (!net_eq(sock_net(sk), net))
25201 continue; 25660 continue;
@@ -25204,7 +25663,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25204 if (sk->sk_family == state->family) 25663 if (sk->sk_family == state->family)
25205 goto found; 25664 goto found;
25206 } 25665 }
25207@@ -1987,7 +2005,9 @@ static struct sock *udp_get_next(struct 25666@@ -1988,7 +2006,9 @@ static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk)
25208 25667
25209 do { 25668 do {
25210 sk = sk_nulls_next(sk); 25669 sk = sk_nulls_next(sk);
@@ -25215,7 +25674,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25215 25674
25216 if (!sk) { 25675 if (!sk) {
25217 if (state->bucket <= state->udp_table->mask) 25676 if (state->bucket <= state->udp_table->mask)
25218@@ -2083,8 +2103,8 @@ static void udp4_format_sock(struct sock 25677@@ -2084,8 +2104,8 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
25219 int bucket, int *len) 25678 int bucket, int *len)
25220 { 25679 {
25221 struct inet_sock *inet = inet_sk(sp); 25680 struct inet_sock *inet = inet_sk(sp);
@@ -25226,9 +25685,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv4/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25226 __u16 destp = ntohs(inet->inet_dport); 25685 __u16 destp = ntohs(inet->inet_dport);
25227 __u16 srcp = ntohs(inet->inet_sport); 25686 __u16 srcp = ntohs(inet->inet_sport);
25228 25687
25229diff -NurpP --minimal linux-3.4.48/net/ipv6/Kconfig linux-3.4.48-vs2.3.3.9/net/ipv6/Kconfig 25688diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
25230--- linux-3.4.48/net/ipv6/Kconfig 2010-08-02 14:52:59.000000000 +0000 25689index 36d7437..05f84bc 100644
25231+++ linux-3.4.48-vs2.3.3.9/net/ipv6/Kconfig 2012-05-21 16:15:05.000000000 +0000 25690--- a/net/ipv6/Kconfig
25691+++ b/net/ipv6/Kconfig
25232@@ -4,8 +4,8 @@ 25692@@ -4,8 +4,8 @@
25233 25693
25234 # IPv6 as module will cause a CRASH if you try to unload it 25694 # IPv6 as module will cause a CRASH if you try to unload it
@@ -25240,9 +25700,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/Kconfig linux-3.4.48-vs2.3.3.9/net/i
25240 ---help--- 25700 ---help---
25241 This is complemental support for the IP version 6. 25701 This is complemental support for the IP version 6.
25242 You will still be able to do traditional IPv4 networking as well. 25702 You will still be able to do traditional IPv4 networking as well.
25243diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/net/ipv6/addrconf.c 25703diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
25244--- linux-3.4.48/net/ipv6/addrconf.c 2013-06-13 08:59:41.000000000 +0000 25704index d427f1b..a465a6e 100644
25245+++ linux-3.4.48-vs2.3.3.9/net/ipv6/addrconf.c 2013-06-13 09:46:39.000000000 +0000 25705--- a/net/ipv6/addrconf.c
25706+++ b/net/ipv6/addrconf.c
25246@@ -88,6 +88,8 @@ 25707@@ -88,6 +88,8 @@
25247 #include <linux/proc_fs.h> 25708 #include <linux/proc_fs.h>
25248 #include <linux/seq_file.h> 25709 #include <linux/seq_file.h>
@@ -25261,7 +25722,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25261 { 25722 {
25262 struct ipv6_saddr_score scores[2], 25723 struct ipv6_saddr_score scores[2],
25263 *score = &scores[0], *hiscore = &scores[1]; 25724 *score = &scores[0], *hiscore = &scores[1];
25264@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net, 25725@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
25265 dev->name); 25726 dev->name);
25266 continue; 25727 continue;
25267 } 25728 }
@@ -25270,7 +25731,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25270 25731
25271 score->rule = -1; 25732 score->rule = -1;
25272 bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); 25733 bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
25273@@ -3166,7 +3170,10 @@ static void if6_seq_stop(struct seq_file 25734@@ -3206,7 +3210,10 @@ static void if6_seq_stop(struct seq_file *seq, void *v)
25274 static int if6_seq_show(struct seq_file *seq, void *v) 25735 static int if6_seq_show(struct seq_file *seq, void *v)
25275 { 25736 {
25276 struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; 25737 struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
@@ -25282,7 +25743,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25282 &ifp->addr, 25743 &ifp->addr,
25283 ifp->idev->dev->ifindex, 25744 ifp->idev->dev->ifindex,
25284 ifp->prefix_len, 25745 ifp->prefix_len,
25285@@ -3672,6 +3679,11 @@ static int in6_dump_addrs(struct inet6_d 25746@@ -3712,6 +3719,11 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
25286 struct ifacaddr6 *ifaca; 25747 struct ifacaddr6 *ifaca;
25287 int err = 1; 25748 int err = 1;
25288 int ip_idx = *p_ip_idx; 25749 int ip_idx = *p_ip_idx;
@@ -25294,7 +25755,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25294 25755
25295 read_lock_bh(&idev->lock); 25756 read_lock_bh(&idev->lock);
25296 switch (type) { 25757 switch (type) {
25297@@ -3682,6 +3694,8 @@ static int in6_dump_addrs(struct inet6_d 25758@@ -3722,6 +3734,8 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
25298 list_for_each_entry(ifa, &idev->addr_list, if_list) { 25759 list_for_each_entry(ifa, &idev->addr_list, if_list) {
25299 if (++ip_idx < s_ip_idx) 25760 if (++ip_idx < s_ip_idx)
25300 continue; 25761 continue;
@@ -25303,7 +25764,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25303 err = inet6_fill_ifaddr(skb, ifa, 25764 err = inet6_fill_ifaddr(skb, ifa,
25304 NETLINK_CB(cb->skb).pid, 25765 NETLINK_CB(cb->skb).pid,
25305 cb->nlh->nlmsg_seq, 25766 cb->nlh->nlmsg_seq,
25306@@ -3698,6 +3712,8 @@ static int in6_dump_addrs(struct inet6_d 25767@@ -3738,6 +3752,8 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
25307 ifmca = ifmca->next, ip_idx++) { 25768 ifmca = ifmca->next, ip_idx++) {
25308 if (ip_idx < s_ip_idx) 25769 if (ip_idx < s_ip_idx)
25309 continue; 25770 continue;
@@ -25312,7 +25773,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25312 err = inet6_fill_ifmcaddr(skb, ifmca, 25773 err = inet6_fill_ifmcaddr(skb, ifmca,
25313 NETLINK_CB(cb->skb).pid, 25774 NETLINK_CB(cb->skb).pid,
25314 cb->nlh->nlmsg_seq, 25775 cb->nlh->nlmsg_seq,
25315@@ -3713,6 +3729,8 @@ static int in6_dump_addrs(struct inet6_d 25776@@ -3753,6 +3769,8 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
25316 ifaca = ifaca->aca_next, ip_idx++) { 25777 ifaca = ifaca->aca_next, ip_idx++) {
25317 if (ip_idx < s_ip_idx) 25778 if (ip_idx < s_ip_idx)
25318 continue; 25779 continue;
@@ -25321,7 +25782,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25321 err = inet6_fill_ifacaddr(skb, ifaca, 25782 err = inet6_fill_ifacaddr(skb, ifaca,
25322 NETLINK_CB(cb->skb).pid, 25783 NETLINK_CB(cb->skb).pid,
25323 cb->nlh->nlmsg_seq, 25784 cb->nlh->nlmsg_seq,
25324@@ -4098,6 +4116,11 @@ static int inet6_dump_ifinfo(struct sk_b 25785@@ -4138,6 +4156,11 @@ static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
25325 struct inet6_dev *idev; 25786 struct inet6_dev *idev;
25326 struct hlist_head *head; 25787 struct hlist_head *head;
25327 struct hlist_node *node; 25788 struct hlist_node *node;
@@ -25333,7 +25794,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25333 25794
25334 s_h = cb->args[0]; 25795 s_h = cb->args[0];
25335 s_idx = cb->args[1]; 25796 s_idx = cb->args[1];
25336@@ -4109,6 +4132,8 @@ static int inet6_dump_ifinfo(struct sk_b 25797@@ -4149,6 +4172,8 @@ static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
25337 hlist_for_each_entry_rcu(dev, node, head, index_hlist) { 25798 hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
25338 if (idx < s_idx) 25799 if (idx < s_idx)
25339 goto cont; 25800 goto cont;
@@ -25342,9 +25803,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/addrconf.c linux-3.4.48-vs2.3.3.9/ne
25342 idev = __in6_dev_get(dev); 25803 idev = __in6_dev_get(dev);
25343 if (!idev) 25804 if (!idev)
25344 goto cont; 25805 goto cont;
25345diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/net/ipv6/af_inet6.c 25806diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
25346--- linux-3.4.48/net/ipv6/af_inet6.c 2012-05-21 16:07:40.000000000 +0000 25807index 8ed1b93..716c4c5 100644
25347+++ linux-3.4.48-vs2.3.3.9/net/ipv6/af_inet6.c 2012-09-01 09:15:04.000000000 +0000 25808--- a/net/ipv6/af_inet6.c
25809+++ b/net/ipv6/af_inet6.c
25348@@ -42,6 +42,8 @@ 25810@@ -42,6 +42,8 @@
25349 #include <linux/netdevice.h> 25811 #include <linux/netdevice.h>
25350 #include <linux/icmpv6.h> 25812 #include <linux/icmpv6.h>
@@ -25368,7 +25830,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25368 sock->ops = answer->ops; 25830 sock->ops = answer->ops;
25369 answer_prot = answer->prot; 25831 answer_prot = answer->prot;
25370 answer_no_check = answer->no_check; 25832 answer_no_check = answer->no_check;
25371@@ -261,6 +266,7 @@ int inet6_bind(struct socket *sock, stru 25833@@ -261,6 +266,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
25372 struct inet_sock *inet = inet_sk(sk); 25834 struct inet_sock *inet = inet_sk(sk);
25373 struct ipv6_pinfo *np = inet6_sk(sk); 25835 struct ipv6_pinfo *np = inet6_sk(sk);
25374 struct net *net = sock_net(sk); 25836 struct net *net = sock_net(sk);
@@ -25376,7 +25838,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25376 __be32 v4addr = 0; 25838 __be32 v4addr = 0;
25377 unsigned short snum; 25839 unsigned short snum;
25378 int addr_type = 0; 25840 int addr_type = 0;
25379@@ -276,6 +282,10 @@ int inet6_bind(struct socket *sock, stru 25841@@ -276,6 +282,10 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
25380 if (addr->sin6_family != AF_INET6) 25842 if (addr->sin6_family != AF_INET6)
25381 return -EAFNOSUPPORT; 25843 return -EAFNOSUPPORT;
25382 25844
@@ -25387,7 +25849,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25387 addr_type = ipv6_addr_type(&addr->sin6_addr); 25849 addr_type = ipv6_addr_type(&addr->sin6_addr);
25388 if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM) 25850 if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
25389 return -EINVAL; 25851 return -EINVAL;
25390@@ -307,6 +317,7 @@ int inet6_bind(struct socket *sock, stru 25852@@ -307,6 +317,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
25391 /* Reproduce AF_INET checks to make the bindings consistent */ 25853 /* Reproduce AF_INET checks to make the bindings consistent */
25392 v4addr = addr->sin6_addr.s6_addr32[3]; 25854 v4addr = addr->sin6_addr.s6_addr32[3];
25393 chk_addr_ret = inet_addr_type(net, v4addr); 25855 chk_addr_ret = inet_addr_type(net, v4addr);
@@ -25395,7 +25857,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25395 if (!sysctl_ip_nonlocal_bind && 25857 if (!sysctl_ip_nonlocal_bind &&
25396 !(inet->freebind || inet->transparent) && 25858 !(inet->freebind || inet->transparent) &&
25397 v4addr != htonl(INADDR_ANY) && 25859 v4addr != htonl(INADDR_ANY) &&
25398@@ -316,6 +327,10 @@ int inet6_bind(struct socket *sock, stru 25860@@ -316,6 +327,10 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
25399 err = -EADDRNOTAVAIL; 25861 err = -EADDRNOTAVAIL;
25400 goto out; 25862 goto out;
25401 } 25863 }
@@ -25406,7 +25868,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25406 } else { 25868 } else {
25407 if (addr_type != IPV6_ADDR_ANY) { 25869 if (addr_type != IPV6_ADDR_ANY) {
25408 struct net_device *dev = NULL; 25870 struct net_device *dev = NULL;
25409@@ -342,6 +357,11 @@ int inet6_bind(struct socket *sock, stru 25871@@ -342,6 +357,11 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
25410 } 25872 }
25411 } 25873 }
25412 25874
@@ -25418,7 +25880,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25418 /* ipv4 addr of the socket is invalid. Only the 25880 /* ipv4 addr of the socket is invalid. Only the
25419 * unspecified and mapped address have a v4 equivalent. 25881 * unspecified and mapped address have a v4 equivalent.
25420 */ 25882 */
25421@@ -358,6 +378,9 @@ int inet6_bind(struct socket *sock, stru 25883@@ -358,6 +378,9 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
25422 } 25884 }
25423 } 25885 }
25424 25886
@@ -25428,7 +25890,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25428 inet->inet_rcv_saddr = v4addr; 25890 inet->inet_rcv_saddr = v4addr;
25429 inet->inet_saddr = v4addr; 25891 inet->inet_saddr = v4addr;
25430 25892
25431@@ -459,9 +482,11 @@ int inet6_getname(struct socket *sock, s 25893@@ -459,9 +482,11 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
25432 return -ENOTCONN; 25894 return -ENOTCONN;
25433 sin->sin6_port = inet->inet_dport; 25895 sin->sin6_port = inet->inet_dport;
25434 sin->sin6_addr = np->daddr; 25896 sin->sin6_addr = np->daddr;
@@ -25440,10 +25902,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/af_inet6.c linux-3.4.48-vs2.3.3.9/ne
25440 if (ipv6_addr_any(&np->rcv_saddr)) 25902 if (ipv6_addr_any(&np->rcv_saddr))
25441 sin->sin6_addr = np->saddr; 25903 sin->sin6_addr = np->saddr;
25442 else 25904 else
25443diff -NurpP --minimal linux-3.4.48/net/ipv6/datagram.c linux-3.4.48-vs2.3.3.9/net/ipv6/datagram.c 25905diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
25444--- linux-3.4.48/net/ipv6/datagram.c 2012-05-21 16:07:40.000000000 +0000 25906index 76832c8..8e26750 100644
25445+++ linux-3.4.48-vs2.3.3.9/net/ipv6/datagram.c 2012-05-21 16:15:05.000000000 +0000 25907--- a/net/ipv6/datagram.c
25446@@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s 25908+++ b/net/ipv6/datagram.c
25909@@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, struct sock *sk,
25447 25910
25448 rcu_read_lock(); 25911 rcu_read_lock();
25449 if (fl6->flowi6_oif) { 25912 if (fl6->flowi6_oif) {
@@ -25452,10 +25915,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/datagram.c linux-3.4.48-vs2.3.3.9/ne
25452 if (!dev) { 25915 if (!dev) {
25453 rcu_read_unlock(); 25916 rcu_read_unlock();
25454 return -ENODEV; 25917 return -ENODEV;
25455diff -NurpP --minimal linux-3.4.48/net/ipv6/fib6_rules.c linux-3.4.48-vs2.3.3.9/net/ipv6/fib6_rules.c 25918diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
25456--- linux-3.4.48/net/ipv6/fib6_rules.c 2012-03-19 18:47:33.000000000 +0000 25919index b6c5731..de4b61b 100644
25457+++ linux-3.4.48-vs2.3.3.9/net/ipv6/fib6_rules.c 2012-05-21 16:15:05.000000000 +0000 25920--- a/net/ipv6/fib6_rules.c
25458@@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r 25921+++ b/net/ipv6/fib6_rules.c
25922@@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
25459 ip6_dst_idev(&rt->dst)->dev, 25923 ip6_dst_idev(&rt->dst)->dev,
25460 &flp6->daddr, 25924 &flp6->daddr,
25461 rt6_flags2srcprefs(flags), 25925 rt6_flags2srcprefs(flags),
@@ -25464,9 +25928,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/fib6_rules.c linux-3.4.48-vs2.3.3.9/
25464 goto again; 25928 goto again;
25465 if (!ipv6_prefix_equal(&saddr, &r->src.addr, 25929 if (!ipv6_prefix_equal(&saddr, &r->src.addr,
25466 r->src.plen)) 25930 r->src.plen))
25467diff -NurpP --minimal linux-3.4.48/net/ipv6/inet6_hashtables.c linux-3.4.48-vs2.3.3.9/net/ipv6/inet6_hashtables.c 25931diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
25468--- linux-3.4.48/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000 25932index 73f1a00..a6196c7 100644
25469+++ linux-3.4.48-vs2.3.3.9/net/ipv6/inet6_hashtables.c 2012-05-21 16:15:05.000000000 +0000 25933--- a/net/ipv6/inet6_hashtables.c
25934+++ b/net/ipv6/inet6_hashtables.c
25470@@ -16,6 +16,7 @@ 25935@@ -16,6 +16,7 @@
25471 25936
25472 #include <linux/module.h> 25937 #include <linux/module.h>
@@ -25475,7 +25940,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/inet6_hashtables.c linux-3.4.48-vs2.
25475 25940
25476 #include <net/inet_connection_sock.h> 25941 #include <net/inet_connection_sock.h>
25477 #include <net/inet_hashtables.h> 25942 #include <net/inet_hashtables.h>
25478@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established( 25943@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established(struct net *net,
25479 unsigned int slot = hash & hashinfo->ehash_mask; 25944 unsigned int slot = hash & hashinfo->ehash_mask;
25480 struct inet_ehash_bucket *head = &hashinfo->ehash[slot]; 25945 struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
25481 25946
@@ -25492,7 +25957,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/inet6_hashtables.c linux-3.4.48-vs2.
25492 } 25957 }
25493 } 25958 }
25494 if (get_nulls_value(node) != slot) 25959 if (get_nulls_value(node) != slot)
25495@@ -141,6 +141,9 @@ static inline int compute_score(struct s 25960@@ -141,6 +141,9 @@ static inline int compute_score(struct sock *sk, struct net *net,
25496 if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) 25961 if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
25497 return -1; 25962 return -1;
25498 score++; 25963 score++;
@@ -25502,10 +25967,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/inet6_hashtables.c linux-3.4.48-vs2.
25502 } 25967 }
25503 if (sk->sk_bound_dev_if) { 25968 if (sk->sk_bound_dev_if) {
25504 if (sk->sk_bound_dev_if != dif) 25969 if (sk->sk_bound_dev_if != dif)
25505diff -NurpP --minimal linux-3.4.48/net/ipv6/ip6_output.c linux-3.4.48-vs2.3.3.9/net/ipv6/ip6_output.c 25970diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
25506--- linux-3.4.48/net/ipv6/ip6_output.c 2013-06-13 08:59:41.000000000 +0000 25971index d6b9d56..abc7da9 100644
25507+++ linux-3.4.48-vs2.3.3.9/net/ipv6/ip6_output.c 2013-02-19 14:42:56.000000000 +0000 25972--- a/net/ipv6/ip6_output.c
25508@@ -966,7 +966,8 @@ static int ip6_dst_lookup_tail(struct so 25973+++ b/net/ipv6/ip6_output.c
25974@@ -972,7 +972,8 @@ static int ip6_dst_lookup_tail(struct sock *sk,
25509 struct rt6_info *rt = (struct rt6_info *) *dst; 25975 struct rt6_info *rt = (struct rt6_info *) *dst;
25510 err = ip6_route_get_saddr(net, rt, &fl6->daddr, 25976 err = ip6_route_get_saddr(net, rt, &fl6->daddr,
25511 sk ? inet6_sk(sk)->srcprefs : 0, 25977 sk ? inet6_sk(sk)->srcprefs : 0,
@@ -25515,10 +25981,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/ip6_output.c linux-3.4.48-vs2.3.3.9/
25515 if (err) 25981 if (err)
25516 goto out_err_release; 25982 goto out_err_release;
25517 } 25983 }
25518diff -NurpP --minimal linux-3.4.48/net/ipv6/ndisc.c linux-3.4.48-vs2.3.3.9/net/ipv6/ndisc.c 25984diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
25519--- linux-3.4.48/net/ipv6/ndisc.c 2013-06-13 08:59:41.000000000 +0000 25985index 843d6eb..9196d19 100644
25520+++ linux-3.4.48-vs2.3.3.9/net/ipv6/ndisc.c 2012-11-18 23:52:30.000000000 +0000 25986--- a/net/ipv6/ndisc.c
25521@@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev 25987+++ b/net/ipv6/ndisc.c
25988@@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
25522 } else { 25989 } else {
25523 if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, 25990 if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
25524 inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, 25991 inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
@@ -25527,9 +25994,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/ndisc.c linux-3.4.48-vs2.3.3.9/net/i
25527 return; 25994 return;
25528 src_addr = &tmpaddr; 25995 src_addr = &tmpaddr;
25529 } 25996 }
25530diff -NurpP --minimal linux-3.4.48/net/ipv6/raw.c linux-3.4.48-vs2.3.3.9/net/ipv6/raw.c 25997diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
25531--- linux-3.4.48/net/ipv6/raw.c 2013-06-13 08:59:41.000000000 +0000 25998index 3ee2870..3b549ff 100644
25532+++ linux-3.4.48-vs2.3.3.9/net/ipv6/raw.c 2012-10-22 13:09:53.000000000 +0000 25999--- a/net/ipv6/raw.c
26000+++ b/net/ipv6/raw.c
25533@@ -30,6 +30,7 @@ 26001@@ -30,6 +30,7 @@
25534 #include <linux/icmpv6.h> 26002 #include <linux/icmpv6.h>
25535 #include <linux/netfilter.h> 26003 #include <linux/netfilter.h>
@@ -25538,7 +26006,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
25538 #include <linux/skbuff.h> 26006 #include <linux/skbuff.h>
25539 #include <linux/compat.h> 26007 #include <linux/compat.h>
25540 #include <asm/uaccess.h> 26008 #include <asm/uaccess.h>
25541@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s 26009@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
25542 goto out_unlock; 26010 goto out_unlock;
25543 } 26011 }
25544 26012
@@ -25552,9 +26020,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/raw.c linux-3.4.48-vs2.3.3.9/net/ipv
25552 /* ipv4 addr of the socket is invalid. Only the 26020 /* ipv4 addr of the socket is invalid. Only the
25553 * unspecified and mapped address have a v4 equivalent. 26021 * unspecified and mapped address have a v4 equivalent.
25554 */ 26022 */
25555diff -NurpP --minimal linux-3.4.48/net/ipv6/route.c linux-3.4.48-vs2.3.3.9/net/ipv6/route.c 26023diff --git a/net/ipv6/route.c b/net/ipv6/route.c
25556--- linux-3.4.48/net/ipv6/route.c 2013-06-13 08:59:41.000000000 +0000 26024index 016ed7c..16375c0 100644
25557+++ linux-3.4.48-vs2.3.3.9/net/ipv6/route.c 2013-03-30 21:29:17.000000000 +0000 26025--- a/net/ipv6/route.c
26026+++ b/net/ipv6/route.c
25558@@ -55,6 +55,7 @@ 26027@@ -55,6 +55,7 @@
25559 #include <net/xfrm.h> 26028 #include <net/xfrm.h>
25560 #include <net/netevent.h> 26029 #include <net/netevent.h>
@@ -25563,7 +26032,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/route.c linux-3.4.48-vs2.3.3.9/net/i
25563 26032
25564 #include <asm/uaccess.h> 26033 #include <asm/uaccess.h>
25565 26034
25566@@ -2147,15 +2148,17 @@ int ip6_route_get_saddr(struct net *net, 26035@@ -2150,15 +2151,17 @@ int ip6_route_get_saddr(struct net *net,
25567 struct rt6_info *rt, 26036 struct rt6_info *rt,
25568 const struct in6_addr *daddr, 26037 const struct in6_addr *daddr,
25569 unsigned int prefs, 26038 unsigned int prefs,
@@ -25584,7 +26053,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/route.c linux-3.4.48-vs2.3.3.9/net/i
25584 return err; 26053 return err;
25585 } 26054 }
25586 26055
25587@@ -2486,7 +2489,8 @@ static int rt6_fill_node(struct net *net 26056@@ -2489,7 +2492,8 @@ static int rt6_fill_node(struct net *net,
25588 NLA_PUT_U32(skb, RTA_IIF, iif); 26057 NLA_PUT_U32(skb, RTA_IIF, iif);
25589 } else if (dst) { 26058 } else if (dst) {
25590 struct in6_addr saddr_buf; 26059 struct in6_addr saddr_buf;
@@ -25594,7 +26063,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/route.c linux-3.4.48-vs2.3.3.9/net/i
25594 NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); 26063 NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
25595 } 26064 }
25596 26065
25597@@ -2713,6 +2717,7 @@ static int rt6_info_route(struct rt6_inf 26066@@ -2716,6 +2720,7 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
25598 struct seq_file *m = p_arg; 26067 struct seq_file *m = p_arg;
25599 struct neighbour *n; 26068 struct neighbour *n;
25600 26069
@@ -25602,9 +26071,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/route.c linux-3.4.48-vs2.3.3.9/net/i
25602 seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); 26071 seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
25603 26072
25604 #ifdef CONFIG_IPV6_SUBTREES 26073 #ifdef CONFIG_IPV6_SUBTREES
25605diff -NurpP --minimal linux-3.4.48/net/ipv6/tcp_ipv6.c linux-3.4.48-vs2.3.3.9/net/ipv6/tcp_ipv6.c 26074diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
25606--- linux-3.4.48/net/ipv6/tcp_ipv6.c 2013-06-13 08:59:41.000000000 +0000 26075index 7ee7121..4c44785 100644
25607+++ linux-3.4.48-vs2.3.3.9/net/ipv6/tcp_ipv6.c 2013-01-16 00:15:57.000000000 +0000 26076--- a/net/ipv6/tcp_ipv6.c
26077+++ b/net/ipv6/tcp_ipv6.c
25608@@ -71,6 +71,7 @@ 26078@@ -71,6 +71,7 @@
25609 26079
25610 #include <linux/crypto.h> 26080 #include <linux/crypto.h>
@@ -25613,7 +26083,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/tcp_ipv6.c linux-3.4.48-vs2.3.3.9/ne
25613 26083
25614 static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb); 26084 static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
25615 static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, 26085 static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
25616@@ -163,8 +164,15 @@ static int tcp_v6_connect(struct sock *s 26086@@ -163,8 +164,15 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
25617 * connect() to INADDR_ANY means loopback (BSD'ism). 26087 * connect() to INADDR_ANY means loopback (BSD'ism).
25618 */ 26088 */
25619 26089
@@ -25631,9 +26101,10 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/tcp_ipv6.c linux-3.4.48-vs2.3.3.9/ne
25631 26101
25632 addr_type = ipv6_addr_type(&usin->sin6_addr); 26102 addr_type = ipv6_addr_type(&usin->sin6_addr);
25633 26103
25634diff -NurpP --minimal linux-3.4.48/net/ipv6/udp.c linux-3.4.48-vs2.3.3.9/net/ipv6/udp.c 26104diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
25635--- linux-3.4.48/net/ipv6/udp.c 2012-05-21 16:07:40.000000000 +0000 26105index f79bfdb..18c5ac9 100644
25636+++ linux-3.4.48-vs2.3.3.9/net/ipv6/udp.c 2012-05-21 16:15:05.000000000 +0000 26106--- a/net/ipv6/udp.c
26107+++ b/net/ipv6/udp.c
25637@@ -45,41 +45,67 @@ 26108@@ -45,41 +45,67 @@
25638 #include <net/tcp_states.h> 26109 #include <net/tcp_states.h>
25639 #include <net/ip6_checksum.h> 26110 #include <net/ip6_checksum.h>
@@ -25715,7 +26186,7 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25715 } 26186 }
25716 26187
25717 static unsigned int udp6_portaddr_hash(struct net *net, 26188 static unsigned int udp6_portaddr_hash(struct net *net,
25718@@ -143,6 +169,10 @@ static inline int compute_score(struct s 26189@@ -143,6 +169,10 @@ static inline int compute_score(struct sock *sk, struct net *net,
25719 if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) 26190 if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
25720 return -1; 26191 return -1;
25721 score++; 26192 score++;
@@ -25726,10 +26197,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/udp.c linux-3.4.48-vs2.3.3.9/net/ipv
25726 } 26197 }
25727 if (!ipv6_addr_any(&np->daddr)) { 26198 if (!ipv6_addr_any(&np->daddr)) {
25728 if (!ipv6_addr_equal(&np->daddr, saddr)) 26199 if (!ipv6_addr_equal(&np->daddr, saddr))
25729diff -NurpP --minimal linux-3.4.48/net/ipv6/xfrm6_policy.c linux-3.4.48-vs2.3.3.9/net/ipv6/xfrm6_policy.c 26200diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
25730--- linux-3.4.48/net/ipv6/xfrm6_policy.c 2012-03-19 18:47:33.000000000 +0000 26201index 808fd08..b8ca90a 100644
25731+++ linux-3.4.48-vs2.3.3.9/net/ipv6/xfrm6_policy.c 2012-05-21 16:15:05.000000000 +0000 26202--- a/net/ipv6/xfrm6_policy.c
25732@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n 26203+++ b/net/ipv6/xfrm6_policy.c
26204@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *net,
25733 dev = ip6_dst_idev(dst)->dev; 26205 dev = ip6_dst_idev(dst)->dev;
25734 ipv6_dev_get_saddr(dev_net(dev), dev, 26206 ipv6_dev_get_saddr(dev_net(dev), dev,
25735 (struct in6_addr *)&daddr->a6, 0, 26207 (struct in6_addr *)&daddr->a6, 0,
@@ -25738,10 +26210,11 @@ diff -NurpP --minimal linux-3.4.48/net/ipv6/xfrm6_policy.c linux-3.4.48-vs2.3.3.
25738 dst_release(dst); 26210 dst_release(dst);
25739 return 0; 26211 return 0;
25740 } 26212 }
25741diff -NurpP --minimal linux-3.4.48/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.48-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 26213diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
25742--- linux-3.4.48/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 18:47:33.000000000 +0000 26214index 7fd66de..5674a76 100644
25743+++ linux-3.4.48-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c 2012-05-21 16:15:05.000000000 +0000 26215--- a/net/netfilter/ipvs/ip_vs_xmit.c
25744@@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net, 26216+++ b/net/netfilter/ipvs/ip_vs_xmit.c
26217@@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net, struct in6_addr *daddr,
25745 return dst; 26218 return dst;
25746 if (ipv6_addr_any(&fl6.saddr) && 26219 if (ipv6_addr_any(&fl6.saddr) &&
25747 ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev, 26220 ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
@@ -25750,9 +26223,10 @@ diff -NurpP --minimal linux-3.4.48/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.48-
25750 goto out_err; 26223 goto out_err;
25751 if (do_xfrm) { 26224 if (do_xfrm) {
25752 dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); 26225 dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
25753diff -NurpP --minimal linux-3.4.48/net/netlink/af_netlink.c linux-3.4.48-vs2.3.3.9/net/netlink/af_netlink.c 26226diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
25754--- linux-3.4.48/net/netlink/af_netlink.c 2013-06-13 08:59:42.000000000 +0000 26227index 9017e3e..90711f9 100644
25755+++ linux-3.4.48-vs2.3.3.9/net/netlink/af_netlink.c 2012-11-18 23:52:30.000000000 +0000 26228--- a/net/netlink/af_netlink.c
26229+++ b/net/netlink/af_netlink.c
25756@@ -55,6 +55,9 @@ 26230@@ -55,6 +55,9 @@
25757 #include <linux/types.h> 26231 #include <linux/types.h>
25758 #include <linux/audit.h> 26232 #include <linux/audit.h>
@@ -25763,7 +26237,7 @@ diff -NurpP --minimal linux-3.4.48/net/netlink/af_netlink.c linux-3.4.48-vs2.3.3
25763 26237
25764 #include <net/net_namespace.h> 26238 #include <net/net_namespace.h>
25765 #include <net/sock.h> 26239 #include <net/sock.h>
25766@@ -1951,6 +1954,8 @@ static struct sock *netlink_seq_socket_i 26240@@ -1951,6 +1954,8 @@ static struct sock *netlink_seq_socket_idx(struct seq_file *seq, loff_t pos)
25767 sk_for_each(s, node, &hash->table[j]) { 26241 sk_for_each(s, node, &hash->table[j]) {
25768 if (sock_net(s) != seq_file_net(seq)) 26242 if (sock_net(s) != seq_file_net(seq))
25769 continue; 26243 continue;
@@ -25772,7 +26246,7 @@ diff -NurpP --minimal linux-3.4.48/net/netlink/af_netlink.c linux-3.4.48-vs2.3.3
25772 if (off == pos) { 26246 if (off == pos) {
25773 iter->link = i; 26247 iter->link = i;
25774 iter->hash_idx = j; 26248 iter->hash_idx = j;
25775@@ -1985,7 +1990,8 @@ static void *netlink_seq_next(struct seq 26249@@ -1985,7 +1990,8 @@ static void *netlink_seq_next(struct seq_file *seq, void *v, loff_t *pos)
25776 s = v; 26250 s = v;
25777 do { 26251 do {
25778 s = sk_next(s); 26252 s = sk_next(s);
@@ -25782,7 +26256,7 @@ diff -NurpP --minimal linux-3.4.48/net/netlink/af_netlink.c linux-3.4.48-vs2.3.3
25782 if (s) 26256 if (s)
25783 return s; 26257 return s;
25784 26258
25785@@ -1997,7 +2003,8 @@ static void *netlink_seq_next(struct seq 26259@@ -1997,7 +2003,8 @@ static void *netlink_seq_next(struct seq_file *seq, void *v, loff_t *pos)
25786 26260
25787 for (; j <= hash->mask; j++) { 26261 for (; j <= hash->mask; j++) {
25788 s = sk_head(&hash->table[j]); 26262 s = sk_head(&hash->table[j]);
@@ -25792,9 +26266,10 @@ diff -NurpP --minimal linux-3.4.48/net/netlink/af_netlink.c linux-3.4.48-vs2.3.3
25792 s = sk_next(s); 26266 s = sk_next(s);
25793 if (s) { 26267 if (s) {
25794 iter->link = i; 26268 iter->link = i;
25795diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socket.c 26269diff --git a/net/socket.c b/net/socket.c
25796--- linux-3.4.48/net/socket.c 2013-06-13 08:59:42.000000000 +0000 26270index 47ce3ea..4f0a342 100644
25797+++ linux-3.4.48-vs2.3.3.9/net/socket.c 2012-10-22 13:09:53.000000000 +0000 26271--- a/net/socket.c
26272+++ b/net/socket.c
25798@@ -98,6 +98,10 @@ 26273@@ -98,6 +98,10 @@
25799 26274
25800 #include <net/sock.h> 26275 #include <net/sock.h>
@@ -25806,7 +26281,7 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25806 26281
25807 #include <linux/if_tun.h> 26282 #include <linux/if_tun.h>
25808 #include <linux/ipv6_route.h> 26283 #include <linux/ipv6_route.h>
25809@@ -551,6 +555,7 @@ static inline int __sock_sendmsg_nosec(s 26284@@ -551,6 +555,7 @@ static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock,
25810 struct msghdr *msg, size_t size) 26285 struct msghdr *msg, size_t size)
25811 { 26286 {
25812 struct sock_iocb *si = kiocb_to_siocb(iocb); 26287 struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25814,7 +26289,7 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25814 26289
25815 sock_update_classid(sock->sk); 26290 sock_update_classid(sock->sk);
25816 26291
25817@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(s 26292@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock,
25818 si->msg = msg; 26293 si->msg = msg;
25819 si->size = size; 26294 si->size = size;
25820 26295
@@ -25838,7 +26313,7 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25838 } 26313 }
25839 26314
25840 static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, 26315 static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
25841@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(s 26316@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(struct kiocb *iocb, struct socket *sock,
25842 struct msghdr *msg, size_t size, int flags) 26317 struct msghdr *msg, size_t size, int flags)
25843 { 26318 {
25844 struct sock_iocb *si = kiocb_to_siocb(iocb); 26319 struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25846,7 +26321,7 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25846 26321
25847 sock_update_classid(sock->sk); 26322 sock_update_classid(sock->sk);
25848 26323
25849@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(s 26324@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(struct kiocb *iocb, struct socket *sock,
25850 si->size = size; 26325 si->size = size;
25851 si->flags = flags; 26326 si->flags = flags;
25852 26327
@@ -25866,7 +26341,7 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25866 } 26341 }
25867 26342
25868 static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, 26343 static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
25869@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int f 26344@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int family, int type, int protocol,
25870 if (type < 0 || type >= SOCK_MAX) 26345 if (type < 0 || type >= SOCK_MAX)
25871 return -EINVAL; 26346 return -EINVAL;
25872 26347
@@ -25880,7 +26355,7 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25880 /* Compatibility. 26355 /* Compatibility.
25881 26356
25882 This uglymoron is moved from INET layer to here to avoid 26357 This uglymoron is moved from INET layer to here to avoid
25883@@ -1346,6 +1385,7 @@ SYSCALL_DEFINE3(socket, int, family, int 26358@@ -1346,6 +1385,7 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
25884 if (retval < 0) 26359 if (retval < 0)
25885 goto out; 26360 goto out;
25886 26361
@@ -25888,7 +26363,7 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25888 retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); 26363 retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
25889 if (retval < 0) 26364 if (retval < 0)
25890 goto out_release; 26365 goto out_release;
25891@@ -1387,10 +1427,12 @@ SYSCALL_DEFINE4(socketpair, int, family, 26366@@ -1387,10 +1427,12 @@ SYSCALL_DEFINE4(socketpair, int, family, int, type, int, protocol,
25892 err = sock_create(family, type, protocol, &sock1); 26367 err = sock_create(family, type, protocol, &sock1);
25893 if (err < 0) 26368 if (err < 0)
25894 goto out; 26369 goto out;
@@ -25901,9 +26376,10 @@ diff -NurpP --minimal linux-3.4.48/net/socket.c linux-3.4.48-vs2.3.3.9/net/socke
25901 26376
25902 err = sock1->ops->socketpair(sock1, sock2); 26377 err = sock1->ops->socketpair(sock1, sock2);
25903 if (err < 0) 26378 if (err < 0)
25904diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth.c linux-3.4.48-vs2.3.3.9/net/sunrpc/auth.c 26379diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
25905--- linux-3.4.48/net/sunrpc/auth.c 2011-10-24 16:45:34.000000000 +0000 26380index 727e506..97e2387 100644
25906+++ linux-3.4.48-vs2.3.3.9/net/sunrpc/auth.c 2012-05-21 16:15:05.000000000 +0000 26381--- a/net/sunrpc/auth.c
26382+++ b/net/sunrpc/auth.c
25907@@ -14,6 +14,7 @@ 26383@@ -14,6 +14,7 @@
25908 #include <linux/hash.h> 26384 #include <linux/hash.h>
25909 #include <linux/sunrpc/clnt.h> 26385 #include <linux/sunrpc/clnt.h>
@@ -25912,7 +26388,7 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth.c linux-3.4.48-vs2.3.3.9/net/
25912 26388
25913 #ifdef RPC_DEBUG 26389 #ifdef RPC_DEBUG
25914 # define RPCDBG_FACILITY RPCDBG_AUTH 26390 # define RPCDBG_FACILITY RPCDBG_AUTH
25915@@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth 26391@@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth, int flags)
25916 memset(&acred, 0, sizeof(acred)); 26392 memset(&acred, 0, sizeof(acred));
25917 acred.uid = cred->fsuid; 26393 acred.uid = cred->fsuid;
25918 acred.gid = cred->fsgid; 26394 acred.gid = cred->fsgid;
@@ -25920,7 +26396,7 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth.c linux-3.4.48-vs2.3.3.9/net/
25920 acred.group_info = get_group_info(((struct cred *)cred)->group_info); 26396 acred.group_info = get_group_info(((struct cred *)cred)->group_info);
25921 26397
25922 ret = auth->au_ops->lookup_cred(auth, &acred, flags); 26398 ret = auth->au_ops->lookup_cred(auth, &acred, flags);
25923@@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task * 26399@@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task *task, int lookupflags)
25924 struct auth_cred acred = { 26400 struct auth_cred acred = {
25925 .uid = 0, 26401 .uid = 0,
25926 .gid = 0, 26402 .gid = 0,
@@ -25928,9 +26404,10 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth.c linux-3.4.48-vs2.3.3.9/net/
25928 }; 26404 };
25929 26405
25930 dprintk("RPC: %5u looking up %s cred\n", 26406 dprintk("RPC: %5u looking up %s cred\n",
25931diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth_unix.c linux-3.4.48-vs2.3.3.9/net/sunrpc/auth_unix.c 26407diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
25932--- linux-3.4.48/net/sunrpc/auth_unix.c 2012-01-09 15:15:04.000000000 +0000 26408index e50502d..f5980fc 100644
25933+++ linux-3.4.48-vs2.3.3.9/net/sunrpc/auth_unix.c 2012-05-21 16:15:05.000000000 +0000 26409--- a/net/sunrpc/auth_unix.c
26410+++ b/net/sunrpc/auth_unix.c
25934@@ -12,12 +12,14 @@ 26411@@ -12,12 +12,14 @@
25935 #include <linux/module.h> 26412 #include <linux/module.h>
25936 #include <linux/sunrpc/clnt.h> 26413 #include <linux/sunrpc/clnt.h>
@@ -25946,7 +26423,7 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth_unix.c linux-3.4.48-vs2.3.3.9
25946 gid_t uc_gids[NFS_NGROUPS]; 26423 gid_t uc_gids[NFS_NGROUPS];
25947 }; 26424 };
25948 #define uc_uid uc_base.cr_uid 26425 #define uc_uid uc_base.cr_uid
25949@@ -78,6 +80,7 @@ unx_create_cred(struct rpc_auth *auth, s 26426@@ -78,6 +80,7 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
25950 groups = NFS_NGROUPS; 26427 groups = NFS_NGROUPS;
25951 26428
25952 cred->uc_gid = acred->gid; 26429 cred->uc_gid = acred->gid;
@@ -25954,7 +26431,7 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth_unix.c linux-3.4.48-vs2.3.3.9
25954 for (i = 0; i < groups; i++) 26431 for (i = 0; i < groups; i++)
25955 cred->uc_gids[i] = GROUP_AT(acred->group_info, i); 26432 cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
25956 if (i < NFS_NGROUPS) 26433 if (i < NFS_NGROUPS)
25957@@ -119,7 +122,9 @@ unx_match(struct auth_cred *acred, struc 26434@@ -119,7 +122,9 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
25958 unsigned int i; 26435 unsigned int i;
25959 26436
25960 26437
@@ -25965,7 +26442,7 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth_unix.c linux-3.4.48-vs2.3.3.9
25965 return 0; 26442 return 0;
25966 26443
25967 if (acred->group_info != NULL) 26444 if (acred->group_info != NULL)
25968@@ -145,7 +150,7 @@ unx_marshal(struct rpc_task *task, __be3 26445@@ -145,7 +150,7 @@ unx_marshal(struct rpc_task *task, __be32 *p)
25969 struct rpc_clnt *clnt = task->tk_client; 26446 struct rpc_clnt *clnt = task->tk_client;
25970 struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base); 26447 struct unx_cred *cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
25971 __be32 *base, *hold; 26448 __be32 *base, *hold;
@@ -25974,7 +26451,7 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth_unix.c linux-3.4.48-vs2.3.3.9
25974 26451
25975 *p++ = htonl(RPC_AUTH_UNIX); 26452 *p++ = htonl(RPC_AUTH_UNIX);
25976 base = p++; 26453 base = p++;
25977@@ -155,9 +160,12 @@ unx_marshal(struct rpc_task *task, __be3 26454@@ -155,9 +160,12 @@ unx_marshal(struct rpc_task *task, __be32 *p)
25978 * Copy the UTS nodename captured when the client was created. 26455 * Copy the UTS nodename captured when the client was created.
25979 */ 26456 */
25980 p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); 26457 p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
@@ -25989,9 +26466,10 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/auth_unix.c linux-3.4.48-vs2.3.3.9
25989 hold = p++; 26466 hold = p++;
25990 for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++) 26467 for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
25991 *p++ = htonl((u32) cred->uc_gids[i]); 26468 *p++ = htonl((u32) cred->uc_gids[i]);
25992diff -NurpP --minimal linux-3.4.48/net/sunrpc/clnt.c linux-3.4.48-vs2.3.3.9/net/sunrpc/clnt.c 26469diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
25993--- linux-3.4.48/net/sunrpc/clnt.c 2013-06-13 08:59:42.000000000 +0000 26470index a28a211..1b4b069 100644
25994+++ linux-3.4.48-vs2.3.3.9/net/sunrpc/clnt.c 2013-02-11 23:37:30.000000000 +0000 26471--- a/net/sunrpc/clnt.c
26472+++ b/net/sunrpc/clnt.c
25995@@ -31,6 +31,7 @@ 26473@@ -31,6 +31,7 @@
25996 #include <linux/in6.h> 26474 #include <linux/in6.h>
25997 #include <linux/un.h> 26475 #include <linux/un.h>
@@ -26000,7 +26478,7 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/clnt.c linux-3.4.48-vs2.3.3.9/net/
26000 26478
26001 #include <linux/sunrpc/clnt.h> 26479 #include <linux/sunrpc/clnt.h>
26002 #include <linux/sunrpc/rpc_pipe_fs.h> 26480 #include <linux/sunrpc/rpc_pipe_fs.h>
26003@@ -483,6 +484,9 @@ struct rpc_clnt *rpc_create(struct rpc_c 26481@@ -483,6 +484,9 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
26004 if (!(args->flags & RPC_CLNT_CREATE_QUIET)) 26482 if (!(args->flags & RPC_CLNT_CREATE_QUIET))
26005 clnt->cl_chatty = 1; 26483 clnt->cl_chatty = 1;
26006 26484
@@ -26010,9 +26488,10 @@ diff -NurpP --minimal linux-3.4.48/net/sunrpc/clnt.c linux-3.4.48-vs2.3.3.9/net/
26010 return clnt; 26488 return clnt;
26011 } 26489 }
26012 EXPORT_SYMBOL_GPL(rpc_create); 26490 EXPORT_SYMBOL_GPL(rpc_create);
26013diff -NurpP --minimal linux-3.4.48/net/unix/af_unix.c linux-3.4.48-vs2.3.3.9/net/unix/af_unix.c 26491diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
26014--- linux-3.4.48/net/unix/af_unix.c 2013-06-13 08:59:42.000000000 +0000 26492index c4821fd..fd70828 100644
26015+++ linux-3.4.48-vs2.3.3.9/net/unix/af_unix.c 2013-06-13 09:46:39.000000000 +0000 26493--- a/net/unix/af_unix.c
26494+++ b/net/unix/af_unix.c
26016@@ -114,6 +114,8 @@ 26495@@ -114,6 +114,8 @@
26017 #include <linux/mount.h> 26496 #include <linux/mount.h>
26018 #include <net/checksum.h> 26497 #include <net/checksum.h>
@@ -26022,7 +26501,7 @@ diff -NurpP --minimal linux-3.4.48/net/unix/af_unix.c linux-3.4.48-vs2.3.3.9/net
26022 26501
26023 struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1]; 26502 struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
26024 EXPORT_SYMBOL_GPL(unix_socket_table); 26503 EXPORT_SYMBOL_GPL(unix_socket_table);
26025@@ -261,6 +263,8 @@ static struct sock *__unix_find_socket_b 26504@@ -261,6 +263,8 @@ static struct sock *__unix_find_socket_byname(struct net *net,
26026 if (!net_eq(sock_net(s), net)) 26505 if (!net_eq(sock_net(s), net))
26027 continue; 26506 continue;
26028 26507
@@ -26031,7 +26510,7 @@ diff -NurpP --minimal linux-3.4.48/net/unix/af_unix.c linux-3.4.48-vs2.3.3.9/net
26031 if (u->addr->len == len && 26510 if (u->addr->len == len &&
26032 !memcmp(u->addr->name, sunname, len)) 26511 !memcmp(u->addr->name, sunname, len))
26033 goto found; 26512 goto found;
26034@@ -2266,6 +2270,8 @@ static struct sock *unix_seq_idx(struct 26513@@ -2265,6 +2269,8 @@ static struct sock *unix_seq_idx(struct seq_file *seq, loff_t pos)
26035 for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) { 26514 for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
26036 if (sock_net(s) != seq_file_net(seq)) 26515 if (sock_net(s) != seq_file_net(seq))
26037 continue; 26516 continue;
@@ -26040,7 +26519,7 @@ diff -NurpP --minimal linux-3.4.48/net/unix/af_unix.c linux-3.4.48-vs2.3.3.9/net
26040 if (off == pos) 26519 if (off == pos)
26041 return s; 26520 return s;
26042 ++off; 26521 ++off;
26043@@ -2290,7 +2296,8 @@ static void *unix_seq_next(struct seq_fi 26522@@ -2289,7 +2295,8 @@ static void *unix_seq_next(struct seq_file *seq, void *v, loff_t *pos)
26044 sk = first_unix_socket(&iter->i); 26523 sk = first_unix_socket(&iter->i);
26045 else 26524 else
26046 sk = next_unix_socket(&iter->i, sk); 26525 sk = next_unix_socket(&iter->i, sk);
@@ -26050,9 +26529,10 @@ diff -NurpP --minimal linux-3.4.48/net/unix/af_unix.c linux-3.4.48-vs2.3.3.9/net
26050 sk = next_unix_socket(&iter->i, sk); 26529 sk = next_unix_socket(&iter->i, sk);
26051 return sk; 26530 return sk;
26052 } 26531 }
26053diff -NurpP --minimal linux-3.4.48/scripts/checksyscalls.sh linux-3.4.48-vs2.3.3.9/scripts/checksyscalls.sh 26532diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
26054--- linux-3.4.48/scripts/checksyscalls.sh 2012-03-19 18:47:34.000000000 +0000 26533index d24810f..b9e7023 100755
26055+++ linux-3.4.48-vs2.3.3.9/scripts/checksyscalls.sh 2012-05-21 16:15:05.000000000 +0000 26534--- a/scripts/checksyscalls.sh
26535+++ b/scripts/checksyscalls.sh
26056@@ -193,7 +193,6 @@ cat << EOF 26536@@ -193,7 +193,6 @@ cat << EOF
26057 #define __IGNORE_afs_syscall 26537 #define __IGNORE_afs_syscall
26058 #define __IGNORE_getpmsg 26538 #define __IGNORE_getpmsg
@@ -26061,10 +26541,11 @@ diff -NurpP --minimal linux-3.4.48/scripts/checksyscalls.sh linux-3.4.48-vs2.3.3
26061 EOF 26541 EOF
26062 } 26542 }
26063 26543
26064diff -NurpP --minimal linux-3.4.48/security/commoncap.c linux-3.4.48-vs2.3.3.9/security/commoncap.c 26544diff --git a/security/commoncap.c b/security/commoncap.c
26065--- linux-3.4.48/security/commoncap.c 2012-05-21 16:07:41.000000000 +0000 26545index 71a166a..dfa0c4f 100644
26066+++ linux-3.4.48-vs2.3.3.9/security/commoncap.c 2012-05-21 16:15:05.000000000 +0000 26546--- a/security/commoncap.c
26067@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st 26547+++ b/security/commoncap.c
26548@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
26068 int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, 26549 int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
26069 int cap, int audit) 26550 int cap, int audit)
26070 { 26551 {
@@ -26087,7 +26568,7 @@ diff -NurpP --minimal linux-3.4.48/security/commoncap.c linux-3.4.48-vs2.3.3.9/s
26087 26568
26088 /* Have we tried all of the parent namespaces? */ 26569 /* Have we tried all of the parent namespaces? */
26089 if (targ_ns == &init_user_ns) 26570 if (targ_ns == &init_user_ns)
26090@@ -612,7 +618,7 @@ int cap_inode_setxattr(struct dentry *de 26571@@ -612,7 +618,7 @@ int cap_inode_setxattr(struct dentry *dentry, const char *name,
26091 26572
26092 if (!strncmp(name, XATTR_SECURITY_PREFIX, 26573 if (!strncmp(name, XATTR_SECURITY_PREFIX,
26093 sizeof(XATTR_SECURITY_PREFIX) - 1) && 26574 sizeof(XATTR_SECURITY_PREFIX) - 1) &&
@@ -26096,7 +26577,7 @@ diff -NurpP --minimal linux-3.4.48/security/commoncap.c linux-3.4.48-vs2.3.3.9/s
26096 return -EPERM; 26577 return -EPERM;
26097 return 0; 26578 return 0;
26098 } 26579 }
26099@@ -638,7 +644,7 @@ int cap_inode_removexattr(struct dentry 26580@@ -638,7 +644,7 @@ int cap_inode_removexattr(struct dentry *dentry, const char *name)
26100 26581
26101 if (!strncmp(name, XATTR_SECURITY_PREFIX, 26582 if (!strncmp(name, XATTR_SECURITY_PREFIX,
26102 sizeof(XATTR_SECURITY_PREFIX) - 1) && 26583 sizeof(XATTR_SECURITY_PREFIX) - 1) &&
@@ -26105,9 +26586,10 @@ diff -NurpP --minimal linux-3.4.48/security/commoncap.c linux-3.4.48-vs2.3.3.9/s
26105 return -EPERM; 26586 return -EPERM;
26106 return 0; 26587 return 0;
26107 } 26588 }
26108diff -NurpP --minimal linux-3.4.48/security/selinux/hooks.c linux-3.4.48-vs2.3.3.9/security/selinux/hooks.c 26589diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
26109--- linux-3.4.48/security/selinux/hooks.c 2013-06-13 08:59:44.000000000 +0000 26590index 5626222..2ac26b6 100644
26110+++ linux-3.4.48-vs2.3.3.9/security/selinux/hooks.c 2012-09-01 08:50:49.000000000 +0000 26591--- a/security/selinux/hooks.c
26592+++ b/security/selinux/hooks.c
26111@@ -66,7 +66,6 @@ 26593@@ -66,7 +66,6 @@
26112 #include <linux/dccp.h> 26594 #include <linux/dccp.h>
26113 #include <linux/quota.h> 26595 #include <linux/quota.h>
© 2015 Mike Crute