summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2006-12-20 12:44:16 +0000
committerBenedikt Boehm <hollow@gentoo.org>2006-12-20 12:44:16 +0000
commit3172b0a4e4c6a4f03bec93d25583197a678bd154 (patch)
tree1768cf972175611ae0ddb0ccc7a853a9bcbdf50b /vserver-sources/old
parenteverything is in upstream now, no more patch tarballs, yay (diff)
downloadmisc-3172b0a4e4c6a4f03bec93d25583197a678bd154.tar.gz
misc-3172b0a4e4c6a4f03bec93d25583197a678bd154.tar.bz2
misc-3172b0a4e4c6a4f03bec93d25583197a678bd154.zip
create dir for old kernel patches
svn path=/; revision=534
Diffstat (limited to 'vserver-sources/old')
-rw-r--r--vserver-sources/old/2.0-r1/4910_vs2.0.patch20272
-rw-r--r--vserver-sources/old/2.0-r1/4911_vs2.0-vroot-static-fix.patch22
-rw-r--r--vserver-sources/old/2.0-r1/4912_vs2.0-dlimit-feat01.patch880
-rw-r--r--vserver-sources/old/2.0-r1/4913_vs2.0-dlimit-fix01.patch116
-rw-r--r--vserver-sources/old/2.0-r1/4914_vs2.0-loopback-fix01.patch25
-rw-r--r--vserver-sources/old/2.0-r1/4915_vs2.0-bme-0.06.1.patch894
-rw-r--r--vserver-sources/old/2.0.1-r1/4910_vs2.0.1-2.6.15.patch20310
-rw-r--r--vserver-sources/old/2.0.1-r1/4911_vs2.0.1-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1-r1/4913_vs2.0.1-2.6.15-misc-fixes.patch36
-rw-r--r--vserver-sources/old/2.0.1-r2/4910_vs2.0.1-2.6.15.patch20310
-rw-r--r--vserver-sources/old/2.0.1-r2/4911_vs2.0.1-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1-r2/4913_vs2.0.1-2.6.15-misc-fixes.patch36
-rw-r--r--vserver-sources/old/2.0.1-r3/4910_vs2.0.1-2.6.15.patch20310
-rw-r--r--vserver-sources/old/2.0.1-r3/4911_vs2.0.1-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1-r3/4913_vs2.0.1-2.6.15-misc-fixes.patch36
-rw-r--r--vserver-sources/old/2.0.1-r3/4914_vs2.0.1-bme-0.06.2.patch892
-rw-r--r--vserver-sources/old/2.0.1-r4/4910_vs2.0.1-2.6.15.patch20310
-rw-r--r--vserver-sources/old/2.0.1-r4/4911_vs2.0.1-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1-r4/4913_vs2.0.1-2.6.15-misc-fixes.patch36
-rw-r--r--vserver-sources/old/2.0.1-r4/4914_vs2.0.1-bme-0.06.2.patch892
-rw-r--r--vserver-sources/old/2.0.1-r4/4915_vs2.0.1-vxcapable-fix.patch220
-rw-r--r--vserver-sources/old/2.0.1-r5/4910_vs2.0.1-2.6.15.patch20310
-rw-r--r--vserver-sources/old/2.0.1-r5/4911_vs2.0.1-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1-r5/4913_vs2.0.1-2.6.15-misc-fixes.patch36
-rw-r--r--vserver-sources/old/2.0.1-r5/4914_vs2.0.1-bme-0.06.2.patch939
-rw-r--r--vserver-sources/old/2.0.1-r5/4915_vs2.0.1-vxcapable-fix.patch220
-rw-r--r--vserver-sources/old/2.0.1-r5/4916_vs2.0.1-delta-xip.patch10
-rw-r--r--vserver-sources/old/2.0.1/4910_vs2.0.1.patch20300
-rw-r--r--vserver-sources/old/2.0.1/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1_rc3-r1/4910_vs2.0.1-rc3.patch20639
-rw-r--r--vserver-sources/old/2.0.1_rc3-r1/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1_rc3-r2/4910_vs2.0.1-rc3.patch20639
-rw-r--r--vserver-sources/old/2.0.1_rc3-r2/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1_rc3-r3/4910_vs2.0.1-rc3.patch20639
-rw-r--r--vserver-sources/old/2.0.1_rc3-r3/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1_rc3-r3/4912_vs2.0.1-rc2-bme-0.06.1.patch904
-rw-r--r--vserver-sources/old/2.0.1_rc5-r1/4910_vs2.0.1-rc5.patch20636
-rw-r--r--vserver-sources/old/2.0.1_rc5-r1/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1_rc5-r1/4912_vs2.0.1-rc2-bme-0.06.1.patch904
-rw-r--r--vserver-sources/old/2.0.1_rc5-r1/4913_vs2.0.1-rc5-reiserfs-fix03.patch71
-rw-r--r--vserver-sources/old/2.0.1_rc5/4910_vs2.0.1-rc5.patch20636
-rw-r--r--vserver-sources/old/2.0.1_rc5/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.0.1_rc5/4912_vs2.0.1-rc2-bme-0.06.1.patch904
-rw-r--r--vserver-sources/old/2.0.2-r1/4410_vs2.0.2.patch21720
-rw-r--r--vserver-sources/old/2.0.2-r1/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2-r2/4410_vs2.0.2.patch22102
-rw-r--r--vserver-sources/old/2.0.2-r2/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2-r3/4410_vs2.0.2.patch22097
-rw-r--r--vserver-sources/old/2.0.2-r3/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2-r4/4410_vs2.0.2.patch22019
-rw-r--r--vserver-sources/old/2.0.2-r4/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2-r5/4410_vs2.0.2.patch22075
-rw-r--r--vserver-sources/old/2.0.2-r5/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2-r6/4410_vs2.0.2.patch22105
-rw-r--r--vserver-sources/old/2.0.2-r6/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2-r6/4412_vs2.0.2-vkill-fix01.patch13
-rw-r--r--vserver-sources/old/2.0.2-r7/4410_vs2.0.2.patch22105
-rw-r--r--vserver-sources/old/2.0.2-r7/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2-r7/4412_vs2.0.2-vpid-fix01.patch24
-rw-r--r--vserver-sources/old/2.0.2-r8/4410_vs2.0.2.patch22105
-rw-r--r--vserver-sources/old/2.0.2-r8/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2.2_rc3/4410_vs2.0.2.2_rc3.patch22266
-rw-r--r--vserver-sources/old/2.0.2.2_rc3/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2.2_rc4/4410_vs2.0.2.2-rc4.patch22779
-rw-r--r--vserver-sources/old/2.0.2.2_rc4/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2.2_rc6/4410_vs2.0.2.2-rc6.patch22417
-rw-r--r--vserver-sources/old/2.0.2.2_rc6/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2.2_rc9/4410_vs2.0.2.2-rc9.patch23140
-rw-r--r--vserver-sources/old/2.0.2.2_rc9/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2/4410_vs2.0.2.patch21720
-rw-r--r--vserver-sources/old/2.0.2/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc10-r1/4912_vs2.0.2-rc10-powerpc-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc10-r1/4913_vs2.0.2-rc10-migrate-feat01.patch76
-rw-r--r--vserver-sources/old/2.0.2_rc10-r1/4914_vs2.0.2-rc10-vmfork-fix01.patch22
-rw-r--r--vserver-sources/old/2.0.2_rc10-r1/4915_vs2.0.2-rc10-ldebug-feat01.patch93
-rw-r--r--vserver-sources/old/2.0.2_rc10-r1/4916_vs2.0.2-rc10-vproc-fix01.patch22
-rw-r--r--vserver-sources/old/2.0.2_rc10/4910_vs2.0.2-rc10.patch21379
-rw-r--r--vserver-sources/old/2.0.2_rc10/4911_vs2.0.2-rc10-vesafb-tng-fix01.patch14
-rw-r--r--vserver-sources/old/2.0.2_rc10/4912_vs2.0.2-rc10-powerpc-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc11-r1/4910_vs2.0.2-rc11.patch21704
-rw-r--r--vserver-sources/old/2.0.2_rc11-r1/4911_vs2.0.2-rc11-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc11-r1/4912_vs2.0.2-rc11-namespace-fix01.patch28
-rw-r--r--vserver-sources/old/2.0.2_rc11/4910_vs2.0.2-rc11.patch21704
-rw-r--r--vserver-sources/old/2.0.2_rc11/4911_vs2.0.2-rc11-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc12/4910_vs2.0.2-rc12.patch21708
-rw-r--r--vserver-sources/old/2.0.2_rc12/4911_vs2.0.2-rc12-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc13-r1/4910_vs2.0.2-rc13.patch21707
-rw-r--r--vserver-sources/old/2.0.2_rc13-r1/4911_vs2.0.2-rc13-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc13/4910_vs2.0.2-rc13.patch21708
-rw-r--r--vserver-sources/old/2.0.2_rc13/4911_vs2.0.2-rc13-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc14-r1/4410_vs2.0.2-rc14.patch21681
-rw-r--r--vserver-sources/old/2.0.2_rc14-r1/4411_vs2.0.2-rc14-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc14-r1/4412_vs2.0.2-rc14-cloop-feat01.patch35
-rw-r--r--vserver-sources/old/2.0.2_rc14-r1/4413_vs2.0.2-rc14-config-clean03.patch324
-rw-r--r--vserver-sources/old/2.0.2_rc14-r1/4414_vs2.0.2-rc14-ml-loop-fix01.patch28
-rw-r--r--vserver-sources/old/2.0.2_rc14-r1/4415_vs2.0.2-rc14-enosys-clean01.patch142
-rw-r--r--vserver-sources/old/2.0.2_rc14/4410_vs2.0.2-rc14.patch21681
-rw-r--r--vserver-sources/old/2.0.2_rc14/4411_vs2.0.2-rc14-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc14/4412_vs2.0.2-rc14-cloop-feat01.patch35
-rw-r--r--vserver-sources/old/2.0.2_rc15/4410_vs2.0.2-rc15.patch21763
-rw-r--r--vserver-sources/old/2.0.2_rc15/4411_vs2.0.2-rc15-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc16-r1/4410_vs2.0.2-rc16.patch21763
-rw-r--r--vserver-sources/old/2.0.2_rc16-r1/4411_vs2.0.2-rc16-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc16/4410_vs2.0.2-rc16.patch21763
-rw-r--r--vserver-sources/old/2.0.2_rc16/4411_vs2.0.2-rc16-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc17/4410_vs2.0.2-rc17.patch21732
-rw-r--r--vserver-sources/old/2.0.2_rc17/4411_vs2.0.2-rc17-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc18/4410_vs2.0.2-rc18.patch21386
-rw-r--r--vserver-sources/old/2.0.2_rc18/4411_vs2.0.2-rc17-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc19/4410_vs2.0.2-rc19.patch21292
-rw-r--r--vserver-sources/old/2.0.2_rc19/4411_vs2.0.2-rc17-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc2/4910_vs2.0.2-rc2.patch21228
-rw-r--r--vserver-sources/old/2.0.2_rc2/4911_vs2.0.2-rc2-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc20/4410_vs2.0.2-rc10.patch22127
-rw-r--r--vserver-sources/old/2.0.2_rc20/4411_vs2.0.2-rc20-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc21/4410_vs2.0.2-rc21.patch22127
-rw-r--r--vserver-sources/old/2.0.2_rc21/4411_vs2.0.2-rc21-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc22/4410_vs2.0.2-rc22.patch22137
-rw-r--r--vserver-sources/old/2.0.2_rc22/4411_vs2.0.2-rc22-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc23/4410_vs2.0.2-rc23.patch22313
-rw-r--r--vserver-sources/old/2.0.2_rc23/4411_vs2.0.2-rc23-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc24/4410_vs2.0.2-rc24.patch22235
-rw-r--r--vserver-sources/old/2.0.2_rc24/4411_vs2.0.2-rc24-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc25-r1/4410_vs2.0.2-rc25.patch22234
-rw-r--r--vserver-sources/old/2.0.2_rc25-r1/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc25-r1/4412_vs2.0.2-nsclean-disable.patch35
-rw-r--r--vserver-sources/old/2.0.2_rc25-r1/4413_vs2.0.2-utsname-fix02.patch13
-rw-r--r--vserver-sources/old/2.0.2_rc25/4410_vs2.0.2-rc25.patch22234
-rw-r--r--vserver-sources/old/2.0.2_rc25/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc26/4410_vs2.0.2.patch22242
-rw-r--r--vserver-sources/old/2.0.2_rc26/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc27/4410_vs2.0.2.patch22146
-rw-r--r--vserver-sources/old/2.0.2_rc27/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc28-r1/4410_vs2.0.2-rc28-r1.patch21668
-rw-r--r--vserver-sources/old/2.0.2_rc28-r1/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc28/4410_vs2.0.2-rc28.patch22185
-rw-r--r--vserver-sources/old/2.0.2_rc28/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc29/4410_vs2.0.2-rc29.patch22029
-rw-r--r--vserver-sources/old/2.0.2_rc29/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc31/4410_vs2.0.2-rc31.patch21716
-rw-r--r--vserver-sources/old/2.0.2_rc31/4411_vs2.0.2-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc4/4910_vs2.0.2-rc4.patch21435
-rw-r--r--vserver-sources/old/2.0.2_rc4/4911_vs2.0.2-rc4-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.0.2_rc5/4910_vs2.0.2-rc5.patch21463
-rw-r--r--vserver-sources/old/2.0.2_rc5/4911_vs2.0.2-rc5-vesafb-tng-fix01.patch14
-rw-r--r--vserver-sources/old/2.0.2_rc6/4910_vs2.0.2-rc6.patch21473
-rw-r--r--vserver-sources/old/2.0.2_rc6/4911_vs2.0.2-rc6-vesafb-tng-fix01.patch14
-rw-r--r--vserver-sources/old/2.0.2_rc9/4910_vs2.0.2-rc9.patch21033
-rw-r--r--vserver-sources/old/2.0.2_rc9/4911_vs2.0.2-rc6-vesafb-tng-fix01.patch14
-rw-r--r--vserver-sources/old/2.1.0-r1/4910_vs2.1.0-2.6.15.patch26008
-rw-r--r--vserver-sources/old/2.1.0-r1/4911_vs2.1.0-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0-r1/4912_vs2.1.0-2.6.15-misc-fixes.patch36
-rw-r--r--vserver-sources/old/2.1.0-r2/4910_vs2.1.0-2.6.15.patch26008
-rw-r--r--vserver-sources/old/2.1.0-r2/4911_vs2.1.0-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0-r2/4912_vs2.1.0-2.6.15-misc-fixes.patch36
-rw-r--r--vserver-sources/old/2.1.0.3/4910_vs2.1.0.3-2.6.15.patch26671
-rw-r--r--vserver-sources/old/2.1.0.3/4911_vs2.1.0.3-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0.4/4910_vs2.1.0.4-2.6.15.patch26788
-rw-r--r--vserver-sources/old/2.1.0.4/4911_vs2.1.0.4-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0.5/4910_vs2.1.0.5-2.6.15.patch27041
-rw-r--r--vserver-sources/old/2.1.0.5/4911_vs2.1.0.5-2.6.15-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0.5/4912_vs2.1.0.5-2.6.15-gcc4-xconfig.patch24
-rw-r--r--vserver-sources/old/2.1.0.5/4913_vs2.1.0.5-2.6.15-atomic-fix01.patch45
-rw-r--r--vserver-sources/old/2.1.0.5/4914_vs2.1.0.5-2.6.15-ia32-clean01.patch15
-rw-r--r--vserver-sources/old/2.1.0.6/4910_vs2.1.0.6-2.6.16.patch26980
-rw-r--r--vserver-sources/old/2.1.0.6/4911_vs2.1.0.6-2.6.16-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0.9/4910_vs2.1.0.9-2.6.16.patch27143
-rw-r--r--vserver-sources/old/2.1.0.9/4911_vs2.1.0.9-2.6.16-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0/4910_vs2.1.0.patch25948
-rw-r--r--vserver-sources/old/2.1.0/4911_vs2.1.0-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0_rc10/4910_vs2.1.0-rc10.patch26435
-rw-r--r--vserver-sources/old/2.1.0_rc10/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0_rc8-r1/4910_vs2.1.0-rc8.patch26332
-rw-r--r--vserver-sources/old/2.1.0_rc8-r1/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0_rc8-r1/4912_vs2.1.0-rc8-vroot-fix03.patch22
-rw-r--r--vserver-sources/old/2.1.0_rc8/4910_vs2.1.0-rc8.patch26332
-rw-r--r--vserver-sources/old/2.1.0_rc8/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.0_rc9/4910_vs2.1.0-rc9.patch26389
-rw-r--r--vserver-sources/old/2.1.0_rc9/4911_vs2.1.0-rc5-vesafb-tng-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc10-r1/4910_vs2.1.1-rc10.patch28218
-rw-r--r--vserver-sources/old/2.1.1_rc10-r1/4911_vs2.1.1-rc10-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc10-r1/4912_vs2.1.1-rc10-migrate-feat01.patch76
-rw-r--r--vserver-sources/old/2.1.1_rc10-r1/4913_vs2.1.1-rc10-vmfork-fix01.patch22
-rw-r--r--vserver-sources/old/2.1.1_rc10-r1/4914_vs2.1.1-rc10-ldebug-feat01.patch102
-rw-r--r--vserver-sources/old/2.1.1_rc10-r1/4915_vs2.1.1-rc10-quota-fix01.patch13
-rw-r--r--vserver-sources/old/2.1.1_rc10-r1/4916_vs2.1.1-rc10-vproc-fix01.patch22
-rw-r--r--vserver-sources/old/2.1.1_rc10/4910_vs2.1.1-rc10.patch28218
-rw-r--r--vserver-sources/old/2.1.1_rc10/4911_vs2.1.1-rc10-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc10/4912_vs2.1.1-rc10-powerpc-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc11-r1/4910_vs2.1.1-rc11.patch28241
-rw-r--r--vserver-sources/old/2.1.1_rc11-r1/4911_vs2.1.1-rc11-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc11-r1/4912_vs2.1.1-rc11-sendfile-fix02.patch32
-rw-r--r--vserver-sources/old/2.1.1_rc11/4910_vs2.1.1-rc11.patch28241
-rw-r--r--vserver-sources/old/2.1.1_rc11/4911_vs2.1.1-rc11-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc12/4910_vs2.1.1-rc12.patch28239
-rw-r--r--vserver-sources/old/2.1.1_rc12/4911_vs2.1.1-rc12-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc13-r1/4910_vs2.1.1-rc13.patch28174
-rw-r--r--vserver-sources/old/2.1.1_rc13-r1/4911_vs2.1.1-rc13-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc13/4910_vs2.1.1-rc13.patch27821
-rw-r--r--vserver-sources/old/2.1.1_rc13/4911_vs2.1.1-rc13-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4410_vs2.1.1-rc14.patch28174
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4411_vs2.1.1-rc14-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4412_vs2.1.1-rc14-cloop-feat01.patch35
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4413_vs2.1.1-rc14-config-clean03.patch337
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4414_vs2.1.1-rc14-pidmap-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4415_vs2.1.1-rc14-ml-loop-fix01.patch28
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4416_vs2.1.1-rc14-loop-feat01.patch30
-rw-r--r--vserver-sources/old/2.1.1_rc14-r1/4417_vs2.1.1-rc14-enosys-clean01.patch142
-rw-r--r--vserver-sources/old/2.1.1_rc14/4410_vs2.1.1-rc14.patch28174
-rw-r--r--vserver-sources/old/2.1.1_rc14/4411_vs2.1.1-rc14-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc14/4412_vs2.1.1-rc14-cloop-feat01.patch35
-rw-r--r--vserver-sources/old/2.1.1_rc15/4410_vs2.1.1-rc15.patch28380
-rw-r--r--vserver-sources/old/2.1.1_rc15/4411_vs2.1.1-rc15-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4410_vs2.1.1-rc16.patch28908
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4411_vs2.1.1-rc16-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4412_vs2.1.1-rc16-sched-clean01.patch29
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4413_vs2.1.1-rc16-sched-feat01.patch33
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4414_vs2.1.1-rc16-sched-fix01.patch26
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4415_vs2.1.1-rc16-nioctl-feat01.patch46
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4416_vs2.1.1-rc16-udpaddr-fix01.patch30
-rw-r--r--vserver-sources/old/2.1.1_rc16-r1/4417_vs2.1.1-rc16-cq0.01.patch445
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4410_vs2.1.1-rc16.patch28908
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4411_vs2.1.1-rc16-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4412_vs2.1.1-rc16-sched-clean01.patch29
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4413_vs2.1.1-rc16-sched-feat01.patch33
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4414_vs2.1.1-rc16-sched-fix01.patch26
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4415_vs2.1.1-rc16-nioctl-feat01.patch46
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4416_vs2.1.1-rc16-udpaddr-fix01.patch30
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4417_vs2.1.1-rc16-cq0.01.patch445
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4418_vs2.1.1-rc16-lo0.01.patch552
-rw-r--r--vserver-sources/old/2.1.1_rc16-r2/4419_vs2.1.1-rc16-ndpath-fix01.patch35
-rw-r--r--vserver-sources/old/2.1.1_rc16/4410_vs2.1.1-rc16.patch28908
-rw-r--r--vserver-sources/old/2.1.1_rc16/4411_vs2.1.1-rc16-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc16/4412_vs2.1.1-rc16-sched-clean01.patch29
-rw-r--r--vserver-sources/old/2.1.1_rc16/4413_vs2.1.1-rc16-sched-feat01.patch33
-rw-r--r--vserver-sources/old/2.1.1_rc16/4414_vs2.1.1-rc16-sched-fix01.patch26
-rw-r--r--vserver-sources/old/2.1.1_rc17/4410_vs2.1.1-rc17.patch28906
-rw-r--r--vserver-sources/old/2.1.1_rc17/4411_vs2.1.1-rc17-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4410_vs2.1.1-rc18.patch28923
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4411_vs2.1.1-rc17-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4412_vs2.1.1-rc18-iosched-feat01.patch13
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4413_vs2.1.1-rc18-uml-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4414_vs2.1.1-rc18-kvec-fix01.patch94
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4415_vs2.1.1-rc18-plm-fix02d.patch281
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4416_vs2.1.1-rc18-plm-fix03d.patch22
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4417_vs2.1.1-rc18-reaper-fix02.patch42
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4418_vs2.1.1-rc18-iosched-fix01.patch13
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4419_vs2.1.1-rc18-dent-feat02.patch150
-rw-r--r--vserver-sources/old/2.1.1_rc18-r1/4420_vs2.1.1-rc18-dent-fix01.patch21
-rw-r--r--vserver-sources/old/2.1.1_rc18/4410_vs2.1.1-rc18.patch28496
-rw-r--r--vserver-sources/old/2.1.1_rc18/4411_vs2.1.1-rc17-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc19/4410_vs2.1.1-rc19.patch28617
-rw-r--r--vserver-sources/old/2.1.1_rc19/4411_vs2.1.1-rc17-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc2/4910_vs2.1.1-rc2.patch28012
-rw-r--r--vserver-sources/old/2.1.1_rc2/4911_vs2.0.2-rc2-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc20/4410_vs2.1.1-rc20.patch29504
-rw-r--r--vserver-sources/old/2.1.1_rc20/4411_vs2.1.1-rc20-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc21-r1/4410_vs2.1.1-rc21.patch29507
-rw-r--r--vserver-sources/old/2.1.1_rc21-r1/4411_vs2.1.1-rc21-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc21-r1/4412_vs2.1.1-rc21-ioport-fix01.patch55
-rw-r--r--vserver-sources/old/2.1.1_rc21-r1/4413_vs2.1.1-rc21-proc-clean01.patch25
-rw-r--r--vserver-sources/old/2.1.1_rc21-r1/4414_vs2.1.1-rc21-osfsys-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4410_vs2.1.1-rc21.patch29507
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4411_vs2.1.1-rc21-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4412_vs2.1.1-rc21-ioport-fix01.patch55
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4413_vs2.1.1-rc21-proc-clean01.patch25
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4414_vs2.1.1-rc21-osfsys-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4415_vs2.1.1-rc21-vpid-clean01.patch319
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4416_vs2.1.1-rc21-vtime-feat01.patch318
-rw-r--r--vserver-sources/old/2.1.1_rc21-r2/4417_vs2.1.1-rc21-vfsmnt-feat01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4410_vs2.1.1-rc21.patch29507
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4411_vs2.1.1-rc21-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4412_vs2.1.1-rc21-ioport-fix01.patch55
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4413_vs2.1.1-rc21-proc-clean01.patch25
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4414_vs2.1.1-rc21-osfsys-fix01.patch13
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4415_vs2.1.1-rc21-vtime-feat01.patch336
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4416_vs2.1.1-rc21-vfsmnt-feat01.patch13
-rw-r--r--vserver-sources/old/2.1.1_rc21-r3/4417_vs2.1.1-rc21-vtime-fix01.patch42
-rw-r--r--vserver-sources/old/2.1.1_rc21/4410_vs2.1.1-rc21.patch29507
-rw-r--r--vserver-sources/old/2.1.1_rc21/4411_vs2.1.1-rc21-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc22/4410_vs2.1.1-rc22.patch29781
-rw-r--r--vserver-sources/old/2.1.1_rc22/4411_vs2.1.1-rc22-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc22/4412_vs2.1.1-rc22-ocfs2-feat01.patch346
-rw-r--r--vserver-sources/old/2.1.1_rc22/4413_vs2.1.1-rc22-cow-fix05.patch74
-rw-r--r--vserver-sources/old/2.1.1_rc22/4414_vs2.1.1-rc22-cow-fix06.patch76
-rw-r--r--vserver-sources/old/2.1.1_rc23/4410_vs2.1.1-rc23.patch30309
-rw-r--r--vserver-sources/old/2.1.1_rc23/4411_vs2.1.1-rc23-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc24/4410_vs2.1.1-rc24.patch30231
-rw-r--r--vserver-sources/old/2.1.1_rc24/4411_vs2.1.1-rc24-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc25-r1/4410_vs2.1.1-rc25.patch30230
-rw-r--r--vserver-sources/old/2.1.1_rc25-r1/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc25-r1/4412_vs2.1.1-admin-feat01.patch236
-rw-r--r--vserver-sources/old/2.1.1_rc25-r1/4413_vs2.1.1-lock-feat01.patch191
-rw-r--r--vserver-sources/old/2.1.1_rc25-r1/4414_vs2.1.1-nsclean-disable.patch35
-rw-r--r--vserver-sources/old/2.1.1_rc25-r1/4415_vs2.1.1-utsname-fix02.patch13
-rw-r--r--vserver-sources/old/2.1.1_rc25-r2/4410_vs2.1.1-rc25.patch30230
-rw-r--r--vserver-sources/old/2.1.1_rc25-r2/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc25-r2/4412_vs2.1.1-admin-feat01.patch236
-rw-r--r--vserver-sources/old/2.1.1_rc25-r2/4413_vs2.1.1-lock-feat01.patch191
-rw-r--r--vserver-sources/old/2.1.1_rc25-r2/4414_vs2.1.1-nsclean-disable.patch35
-rw-r--r--vserver-sources/old/2.1.1_rc25-r2/4415_vs2.1.1-utsname-fix02.patch13
-rw-r--r--vserver-sources/old/2.1.1_rc25-r2/4416_vs2.1.1-sock-feat01.patch74
-rw-r--r--vserver-sources/old/2.1.1_rc25/4410_vs2.1.1-rc25.patch30230
-rw-r--r--vserver-sources/old/2.1.1_rc25/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc26/4410_vs2.1.1.patch30199
-rw-r--r--vserver-sources/old/2.1.1_rc26/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc27/4410_vs2.1.1.patch30136
-rw-r--r--vserver-sources/old/2.1.1_rc27/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc27/4412_vs2.1.1-loop-fix01.patch21
-rw-r--r--vserver-sources/old/2.1.1_rc27/4413_vs2.1.1-vxret-fix01.patch60
-rw-r--r--vserver-sources/old/2.1.1_rc27/4414_vs2.1.1-lock-feat02.patch100
-rw-r--r--vserver-sources/old/2.1.1_rc27/4415_vs2.1.1-namespace-clean01.patch76
-rw-r--r--vserver-sources/old/2.1.1_rc27/4416_vs2.1.1-admin-feat02.patch99
-rw-r--r--vserver-sources/old/2.1.1_rc27/4417_vs2.1.1-caact-clean01.patch380
-rw-r--r--vserver-sources/old/2.1.1_rc27/4418_vs2.1.1-vstat-feat01.patch99
-rw-r--r--vserver-sources/old/2.1.1_rc28/4410_vs2.1.1-rc28.patch30368
-rw-r--r--vserver-sources/old/2.1.1_rc28/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc28/4412_vs2.1.1-rc28-disol-fix01.patch14
-rw-r--r--vserver-sources/old/2.1.1_rc28/4413_vs2.1.1-rc28-privacy-feat01.patch445
-rw-r--r--vserver-sources/old/2.1.1_rc28/4414_vs2.1.1-rc28-ptrace-fix01.patch16
-rw-r--r--vserver-sources/old/2.1.1_rc28/4415_vs2.1.1-rc28-admin-fix01.patch29
-rw-r--r--vserver-sources/old/2.1.1_rc28/4416_vs2.1.1-rc28-signal-fix01.patch14
-rw-r--r--vserver-sources/old/2.1.1_rc28/4417_vs2.1.1-rc28-signal-fix02.patch17
-rw-r--r--vserver-sources/old/2.1.1_rc29/4410_vs2.1.1-rc29.patch30468
-rw-r--r--vserver-sources/old/2.1.1_rc29/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc31/4410_vs2.1.1-rc31.patch30157
-rw-r--r--vserver-sources/old/2.1.1_rc31/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc42/4410_vs2.1.1-rc42.patch30972
-rw-r--r--vserver-sources/old/2.1.1_rc42/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc43/4410_vs2.1.1-rc43.patch31606
-rw-r--r--vserver-sources/old/2.1.1_rc43/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc43/4412_vs2.1.1-rc43-compat-fix01.patch39
-rw-r--r--vserver-sources/old/2.1.1_rc43/4413_vs2.1.1-rc43-sysctl-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc44/4410_vs2.1.1-rc44.patch31743
-rw-r--r--vserver-sources/old/2.1.1_rc44/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc45/4410_vs2.1.1-rc45.patch31718
-rw-r--r--vserver-sources/old/2.1.1_rc45/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc46/4410_vs2.1.1-rc46.patch31715
-rw-r--r--vserver-sources/old/2.1.1_rc46/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc47/4410_vs2.1.1-rc47.patch31729
-rw-r--r--vserver-sources/old/2.1.1_rc47/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc47/4412_vs2.1.1-rc47-ext23-fix01.patch38
-rw-r--r--vserver-sources/old/2.1.1_rc48/4410_vs2.1.1-rc48.patch31270
-rw-r--r--vserver-sources/old/2.1.1_rc48/4411_vs2.1.1-vesafb-cvirt-fix.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc5/4910_vs2.1.1-rc5.patch28205
-rw-r--r--vserver-sources/old/2.1.1_rc5/4911_vs2.1.1-rc5-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc6/4910_vs2.1.1-rc6.patch28211
-rw-r--r--vserver-sources/old/2.1.1_rc6/4911_vs2.1.1-rc6-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc7/4910_vs2.1.1-rc7.patch28221
-rw-r--r--vserver-sources/old/2.1.1_rc7/4911_vs2.1.1-rc7-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc8/4910_vs2.1.1-rc8.patch28282
-rw-r--r--vserver-sources/old/2.1.1_rc8/4911_vs2.1.1-rc8-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc9-r1/4910_vs2.1.1-rc9.patch27768
-rw-r--r--vserver-sources/old/2.1.1_rc9-r1/4911_vs2.1.1-rc9-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc9-r1/4912_vs2.1.1-rc9-vreaper-fix02.patch57
-rw-r--r--vserver-sources/old/2.1.1_rc9-r1/4913_vs2.1.1-rc9-powerpc-fix01.patch12
-rw-r--r--vserver-sources/old/2.1.1_rc9/4910_vs2.1.1-rc9.patch27768
-rw-r--r--vserver-sources/old/2.1.1_rc9/4911_vs2.1.1-rc9-vesafb-tng-fix01.patch12
-rw-r--r--vserver-sources/old/2.2.0_pre1/4410_vs2.2.0_pre1.patch28142
-rw-r--r--vserver-sources/old/2.2.0_pre1/4411_vs2.1.1-vesafb-cvirt-fix.patch12
360 files changed, 2976180 insertions, 0 deletions
diff --git a/vserver-sources/old/2.0-r1/4910_vs2.0.patch b/vserver-sources/old/2.0-r1/4910_vs2.0.patch
new file mode 100644
index 0000000..25465fa
--- /dev/null
+++ b/vserver-sources/old/2.0-r1/4910_vs2.0.patch
@@ -0,0 +1,20272 @@
+Index: linux-2.6.12/Documentation/vserver/debug.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.12/Documentation/vserver/debug.txt
+@@ -0,0 +1,106 @@
++
++debug_cvirt:
++
++ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
++ "vx_rmap_tgid: %p/%llx: %d -> %d"
++
++debug_dlim:
++
++ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
++ "FREE (%p,#%d)%c inode"
++ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
++ "FREE (%p,#%d)%c %lld bytes"
++ 2 4 "ADJUST: %lld,%lld on %d,%d [mult=%d]"
++ 3 8 "ext3_has_free_blocks(%p): %u<%u+1, %c, %u!=%u r=%d"
++ "ext3_has_free_blocks(%p): free=%u, root=%u"
++ "rcu_free_dl_info(%p)"
++ 4 10 "alloc_dl_info(%p,%d) = %p"
++ "dealloc_dl_info(%p)"
++ "get_dl_info(%p[#%d.%d])"
++ "put_dl_info(%p[#%d.%d])"
++ 5 20 "alloc_dl_info(%p,%d)*"
++ 6 40 "__hash_dl_info: %p[#%d]"
++ "__unhash_dl_info: %p[#%d]"
++ 7 80 "locate_dl_info(%p,#%d) = %p"
++
++debug_net:
++
++ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
++ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
++ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
++ 4 10 "ip_route_connect(%p) %p,%p;%lx"
++ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
++ 6 40 "sk,egf: %p [#%d] (from %d)"
++ "sk,egn: %p [#%d] (from %d)"
++ "sk,req: %p [#%d] (from %d)"
++ "sk: %p [#%d] (from %d)"
++ "tw: %p [#%d] (from %d)"
++ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
++ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
++
++debug_nid:
++
++ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
++ "alloc_nx_info(%d) = %p"
++ "create_nx_info(%d) (dynamic rejected)"
++ "create_nx_info(%d) = %p (already there)"
++ "create_nx_info(%d) = %p (new)"
++ "dealloc_nx_info(%p)"
++ 1 2 "alloc_nx_info(%d)*"
++ "create_nx_info(%d)*"
++ 2 4 "get_nx_info(%p[#%d.%d])"
++ "put_nx_info(%p[#%d.%d])"
++ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
++ "clr_nx_info(%p[#%d.%d])"
++ "init_nx_info(%p[#%d.%d])"
++ "release_nx_info(%p[#%d.%d.%d]) %p"
++ "set_nx_info(%p[#%d.%d])"
++ 4 10 "__hash_nx_info: %p[#%d]"
++ "__nx_dynamic_id: [#%d]"
++ "__unhash_nx_info: %p[#%d]"
++ 5 20 "moved task %p into nxi:%p[#%d]"
++ "nx_migrate_task(%p,%p[#%d.%d.%d])"
++ "task_get_nx_info(%p)"
++
++debug_switch:
++
++ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p,%d"
++ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld)"
++ 4 10 "%s: (%s %s) returned %s with %d"
++
++debug_xid:
++
++ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
++ "alloc_vx_info(%d) = %p"
++ "alloc_vx_info(%d)*"
++ "create_vx_info(%d) (dynamic rejected)"
++ "create_vx_info(%d) = %p (already there)"
++ "create_vx_info(%d) = %p (new)"
++ "dealloc_vx_info(%p)"
++ 1 2 "create_vx_info(%d)*"
++ 2 4 "get_vx_info(%p[#%d.%d])"
++ "put_vx_info(%p[#%d.%d])"
++ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
++ "clr_vx_info(%p[#%d.%d])"
++ "init_vx_info(%p[#%d.%d])"
++ "release_vx_info(%p[#%d.%d.%d]) %p"
++ "set_vx_info(%p[#%d.%d])"
++ 4 10 "__hash_vx_info: %p[#%d]"
++ "__unhash_vx_info: %p[#%d]"
++ "__vx_dynamic_id: [#%d]"
++ 5 20 "moved task %p into vxi:%p[#%d]"
++ "task_get_vx_info(%p)"
++ "vx_migrate_task(%p,%p[#%d.%d])"
++ 6 40 "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++ 7 80 "vx_parse_xid(%s): %d:#%d"
++ "vx_propagate_xid(%p[#%lu.%d]): %d,%d"
++
++
++debug_limit:
++
++ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
++ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
++
++ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
++ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
++ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
+Index: linux-2.6.12/Makefile
+===================================================================
+--- linux-2.6.12.orig/Makefile
++++ linux-2.6.12/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 12
+-EXTRAVERSION =
++EXTRAVERSION = -vs2.0-gentoo-r1
+ NAME=Woozy Numbat
+
+ # *DOCUMENTATION*
+Index: linux-2.6.12/arch/alpha/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/alpha/Kconfig
++++ linux-2.6.12/arch/alpha/Kconfig
+@@ -628,6 +628,8 @@ source "arch/alpha/oprofile/Kconfig"
+
+ source "arch/alpha/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/alpha/kernel/entry.S
+===================================================================
+--- linux-2.6.12.orig/arch/alpha/kernel/entry.S
++++ linux-2.6.12/arch/alpha/kernel/entry.S
+@@ -873,22 +873,15 @@ sys_getxgid:
+ .globl sys_getxpid
+ .ent sys_getxpid
+ sys_getxpid:
++ lda $sp, -16($sp)
++ stq $26, 0($sp)
+ .prologue 0
+- ldq $2, TI_TASK($8)
+
+- /* See linux/kernel/timer.c sys_getppid for discussion
+- about this loop. */
+- ldq $3, TASK_REAL_PARENT($2)
+-1: ldl $1, TASK_TGID($3)
+-#ifdef CONFIG_SMP
+- mov $3, $4
+- mb
+- ldq $3, TASK_REAL_PARENT($2)
+- cmpeq $3, $4, $4
+- beq $4, 1b
+-#endif
+- stq $1, 80($sp)
+- ldl $0, TASK_TGID($2)
++ lda $16, 96($sp)
++ jsr $26, do_getxpid
++ ldq $26, 0($sp)
++
++ lda $sp, 16($sp)
+ ret
+ .end sys_getxpid
+
+Index: linux-2.6.12/arch/alpha/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/alpha/kernel/ptrace.c
++++ linux-2.6.12/arch/alpha/kernel/ptrace.c
+@@ -289,6 +289,8 @@ do_sys_ptrace(long request, long pid, lo
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out_notsk;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out;
+
+ if (request == PTRACE_ATTACH) {
+ ret = ptrace_attach(child);
+Index: linux-2.6.12/arch/alpha/kernel/systbls.S
+===================================================================
+--- linux-2.6.12.orig/arch/alpha/kernel/systbls.S
++++ linux-2.6.12/arch/alpha/kernel/systbls.S
+@@ -447,7 +447,7 @@ sys_call_table:
+ .quad sys_stat64 /* 425 */
+ .quad sys_lstat64
+ .quad sys_fstat64
+- .quad sys_ni_syscall /* sys_vserver */
++ .quad sys_vserver /* sys_vserver */
+ .quad sys_ni_syscall /* sys_mbind */
+ .quad sys_ni_syscall /* sys_get_mempolicy */
+ .quad sys_ni_syscall /* sys_set_mempolicy */
+Index: linux-2.6.12/arch/alpha/mm/init.c
+===================================================================
+--- linux-2.6.12.orig/arch/alpha/mm/init.c
++++ linux-2.6.12/arch/alpha/mm/init.c
+@@ -20,6 +20,7 @@
+ #include <linux/init.h>
+ #include <linux/bootmem.h> /* max_low_pfn */
+ #include <linux/vmalloc.h>
++#include <linux/pagemap.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.12/arch/arm/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/arm/Kconfig
++++ linux-2.6.12/arch/arm/Kconfig
+@@ -740,6 +740,8 @@ source "arch/arm/oprofile/Kconfig"
+
+ source "arch/arm/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/arm/kernel/calls.S
+===================================================================
+--- linux-2.6.12.orig/arch/arm/kernel/calls.S
++++ linux-2.6.12/arch/arm/kernel/calls.S
+@@ -327,6 +327,7 @@ __syscall_start:
+ /* 310 */ .long sys_request_key
+ .long sys_keyctl
+ .long sys_semtimedop
++ .long sys_vserver
+ __syscall_end:
+
+ .rept NR_syscalls - (__syscall_end - __syscall_start) / 4
+Index: linux-2.6.12/arch/arm/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/arm/kernel/ptrace.c
++++ linux-2.6.12/arch/arm/kernel/ptrace.c
+@@ -809,6 +809,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/arm26/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/arm26/Kconfig
++++ linux-2.6.12/arch/arm26/Kconfig
+@@ -224,6 +224,8 @@ source "drivers/usb/Kconfig"
+
+ source "arch/arm26/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/arm26/kernel/calls.S
+===================================================================
+--- linux-2.6.12.orig/arch/arm26/kernel/calls.S
++++ linux-2.6.12/arch/arm26/kernel/calls.S
+@@ -257,6 +257,11 @@ __syscall_start:
+ .long sys_lremovexattr
+ .long sys_fremovexattr
+ .long sys_tkill
++
++ .rept 313 - (. - __syscall_start) / 4
++ .long sys_ni_syscall
++ .endr
++ .long sys_vserver /* 313 */
+ __syscall_end:
+
+ .rept NR_syscalls - (__syscall_end - __syscall_start) / 4
+Index: linux-2.6.12/arch/arm26/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/arm26/kernel/ptrace.c
++++ linux-2.6.12/arch/arm26/kernel/ptrace.c
+@@ -692,6 +692,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/cris/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/cris/Kconfig
++++ linux-2.6.12/arch/cris/Kconfig
+@@ -173,6 +173,8 @@ source "drivers/usb/Kconfig"
+
+ source "arch/cris/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/h8300/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/h8300/Kconfig
++++ linux-2.6.12/arch/h8300/Kconfig
+@@ -187,6 +187,8 @@ source "fs/Kconfig"
+
+ source "arch/h8300/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/h8300/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/h8300/kernel/ptrace.c
++++ linux-2.6.12/arch/h8300/kernel/ptrace.c
+@@ -81,6 +81,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/i386/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/i386/Kconfig
++++ linux-2.6.12/arch/i386/Kconfig
+@@ -574,6 +574,14 @@ config X86_VISWS_APIC
+ depends on X86_VISWS
+ default y
+
++config KERNEL_HZ
++ int "Timer Frequency (100-10000)"
++ range 100 10000
++ default "1000"
++ help
++ This allows you to specify the frequency at which the
++ kernel timer interrupt will occur.
++
+ config X86_TSC
+ bool
+ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ
+@@ -759,6 +767,46 @@ config HIGHMEM64G
+
+ endchoice
+
++choice
++ prompt "Memory Split User Space"
++ default SPLIT_3GB
++ help
++ A different Userspace/Kernel split allows you to
++ utilize up to alsmost 3GB of RAM without the requirement
++ for HIGHMEM. It also increases the available lowmem.
++
++config SPLIT_3GB
++ bool "3.0GB/1.0GB Kernel (Default)"
++ help
++ This is the default split of 3GB userspace to 1GB kernel
++ space, which will result in about 860MB of lowmem.
++
++config SPLIT_25GB
++ bool "2.5GB/1.5GB Kernel"
++ help
++ This split provides 2.5GB userspace and 1.5GB kernel
++ space, which will result in about 1370MB of lowmem.
++
++config SPLIT_2GB
++ bool "2.0GB/2.0GB Kernel"
++ help
++ This split provides 2GB userspace and 2GB kernel
++ space, which will result in about 1880MB of lowmem.
++
++config SPLIT_15GB
++ bool "1.5GB/2.5GB Kernel"
++ help
++ This split provides 1.5GB userspace and 2.5GB kernel
++ space, which will result in about 2390MB of lowmem.
++
++config SPLIT_1GB
++ bool "1.0GB/3.0GB Kernel"
++ help
++ This split provides 1GB userspace and 3GB kernel
++ space, which will result in about 2900MB of lowmem.
++
++endchoice
++
+ config HIGHMEM
+ bool
+ depends on HIGHMEM64G || HIGHMEM4G
+@@ -1246,6 +1294,8 @@ source "arch/i386/oprofile/Kconfig"
+
+ source "arch/i386/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/i386/kernel/cpu/proc.c
+===================================================================
+--- linux-2.6.12.orig/arch/i386/kernel/cpu/proc.c
++++ linux-2.6.12/arch/i386/kernel/cpu/proc.c
+@@ -129,8 +129,8 @@ static int show_cpuinfo(struct seq_file
+ seq_printf(m, " %s", x86_cap_flags[i]);
+
+ seq_printf(m, "\nbogomips\t: %lu.%02lu\n\n",
+- c->loops_per_jiffy/(500000/HZ),
+- (c->loops_per_jiffy/(5000/HZ)) % 100);
++ HZ*(c->loops_per_jiffy >> 3)/62500,
++ (HZ*(c->loops_per_jiffy >> 3)/625) % 100);
+
+ return 0;
+ }
+Index: linux-2.6.12/arch/i386/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/i386/kernel/ptrace.c
++++ linux-2.6.12/arch/i386/kernel/ptrace.c
+@@ -381,6 +381,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/i386/kernel/smpboot.c
+===================================================================
+--- linux-2.6.12.orig/arch/i386/kernel/smpboot.c
++++ linux-2.6.12/arch/i386/kernel/smpboot.c
+@@ -1023,8 +1023,8 @@ static void __init smp_boot_cpus(unsigne
+ printk(KERN_INFO
+ "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
+ cpucount+1,
+- bogosum/(500000/HZ),
+- (bogosum/(5000/HZ))%100);
++ HZ*(bogosum >> 3)/62500,
++ (HZ*(bogosum >> 3)/625) % 100);
+
+ Dprintk("Before bogocount - setting activated=1.\n");
+
+Index: linux-2.6.12/arch/i386/kernel/sys_i386.c
+===================================================================
+--- linux-2.6.12.orig/arch/i386/kernel/sys_i386.c
++++ linux-2.6.12/arch/i386/kernel/sys_i386.c
+@@ -19,6 +19,7 @@
+ #include <linux/mman.h>
+ #include <linux/file.h>
+ #include <linux/utsname.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/ipc.h>
+@@ -217,7 +218,7 @@ asmlinkage int sys_uname(struct old_utsn
+ if (!name)
+ return -EFAULT;
+ down_read(&uts_sem);
+- err=copy_to_user(name, &system_utsname, sizeof (*name));
++ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
+ up_read(&uts_sem);
+ return err?-EFAULT:0;
+ }
+@@ -225,6 +226,7 @@ asmlinkage int sys_uname(struct old_utsn
+ asmlinkage int sys_olduname(struct oldold_utsname __user * name)
+ {
+ int error;
++ struct new_utsname *ptr;
+
+ if (!name)
+ return -EFAULT;
+@@ -233,15 +235,16 @@ asmlinkage int sys_olduname(struct oldol
+
+ down_read(&uts_sem);
+
+- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
++ ptr = vx_new_utsname();
++ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
+ error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
+ error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
+ error |= __put_user(0,name->release+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
+ error |= __put_user(0,name->version+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->machine,ptr->machine,__OLD_UTS_LEN);
+ error |= __put_user(0,name->machine+__OLD_UTS_LEN);
+
+ up_read(&uts_sem);
+Index: linux-2.6.12/arch/i386/kernel/syscall_table.S
+===================================================================
+--- linux-2.6.12.orig/arch/i386/kernel/syscall_table.S
++++ linux-2.6.12/arch/i386/kernel/syscall_table.S
+@@ -273,7 +273,7 @@ ENTRY(sys_call_table)
+ .long sys_tgkill /* 270 */
+ .long sys_utimes
+ .long sys_fadvise64_64
+- .long sys_ni_syscall /* sys_vserver */
++ .long sys_vserver
+ .long sys_mbind
+ .long sys_get_mempolicy
+ .long sys_set_mempolicy
+Index: linux-2.6.12/arch/i386/kernel/traps.c
+===================================================================
+--- linux-2.6.12.orig/arch/i386/kernel/traps.c
++++ linux-2.6.12/arch/i386/kernel/traps.c
+@@ -53,6 +53,7 @@
+
+ #include <linux/irq.h>
+ #include <linux/module.h>
++#include <linux/vserver/debug.h>
+
+ #include "mach_traps.h"
+
+@@ -306,6 +307,7 @@ void die(const char * str, struct pt_reg
+ };
+ static int die_counter;
+
++ vxh_throw_oops();
+ if (die.lock_owner != _smp_processor_id()) {
+ console_verbose();
+ spin_lock_irq(&die.lock);
+@@ -340,6 +342,7 @@ void die(const char * str, struct pt_reg
+ bust_spinlocks(0);
+ die.lock_owner = -1;
+ spin_unlock_irq(&die.lock);
++ vxh_dump_history();
+ if (in_interrupt())
+ panic("Fatal exception in interrupt");
+
+Index: linux-2.6.12/arch/ia64/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/ia64/Kconfig
++++ linux-2.6.12/arch/ia64/Kconfig
+@@ -438,6 +438,8 @@ source "arch/ia64/oprofile/Kconfig"
+
+ source "arch/ia64/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/ia64/ia32/binfmt_elf32.c
+===================================================================
+--- linux-2.6.12.orig/arch/ia64/ia32/binfmt_elf32.c
++++ linux-2.6.12/arch/ia64/ia32/binfmt_elf32.c
+@@ -199,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs)
+ int
+ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
+ {
+- unsigned long stack_base;
++ unsigned long stack_base, grow;
+ struct vm_area_struct *mpnt;
+ struct mm_struct *mm = current->mm;
+ int i, ret;
+@@ -216,8 +216,10 @@ ia32_setup_arg_pages (struct linux_binpr
+ if (!mpnt)
+ return -ENOMEM;
+
+- if (security_vm_enough_memory((IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))
+- >> PAGE_SHIFT)) {
++ grow = (IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))
++ >> PAGE_SHIFT;
++ if (security_vm_enough_memory(grow) ||
++ !vx_vmpages_avail(mm, grow)) {
+ kmem_cache_free(vm_area_cachep, mpnt);
+ return -ENOMEM;
+ }
+@@ -242,7 +244,8 @@ ia32_setup_arg_pages (struct linux_binpr
+ kmem_cache_free(vm_area_cachep, mpnt);
+ return ret;
+ }
+- current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
++ vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
++ current->mm->stack_vm = current->mm->total_vm;
+ }
+
+ for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
+Index: linux-2.6.12/arch/ia64/ia32/ia32_entry.S
+===================================================================
+--- linux-2.6.12.orig/arch/ia64/ia32/ia32_entry.S
++++ linux-2.6.12/arch/ia64/ia32/ia32_entry.S
+@@ -483,7 +483,7 @@ ia32_syscall_table:
+ data8 sys_tgkill /* 270 */
+ data8 compat_sys_utimes
+ data8 sys32_fadvise64_64
+- data8 sys_ni_syscall
++ data8 sys32_vserver
+ data8 sys_ni_syscall
+ data8 sys_ni_syscall /* 275 */
+ data8 sys_ni_syscall
+Index: linux-2.6.12/arch/ia64/kernel/entry.S
+===================================================================
+--- linux-2.6.12.orig/arch/ia64/kernel/entry.S
++++ linux-2.6.12/arch/ia64/kernel/entry.S
+@@ -1572,7 +1572,7 @@ sys_call_table:
+ data8 sys_mq_notify
+ data8 sys_mq_getsetattr
+ data8 sys_ni_syscall // reserved for kexec_load
+- data8 sys_ni_syscall // reserved for vserver
++ data8 sys_vserver
+ data8 sys_waitid // 1270
+ data8 sys_add_key
+ data8 sys_request_key
+Index: linux-2.6.12/arch/ia64/kernel/perfmon.c
+===================================================================
+--- linux-2.6.12.orig/arch/ia64/kernel/perfmon.c
++++ linux-2.6.12/arch/ia64/kernel/perfmon.c
+@@ -39,6 +39,8 @@
+ #include <linux/mount.h>
+ #include <linux/version.h>
+ #include <linux/bitops.h>
++#include <linux/vs_memory.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/errno.h>
+ #include <asm/intrinsics.h>
+@@ -2348,7 +2350,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+ */
+ insert_vm_struct(mm, vma);
+
+- mm->total_vm += size >> PAGE_SHIFT;
++ vx_vmpages_add(mm, size >> PAGE_SHIFT);
+ vm_stat_account(vma);
+ up_write(&task->mm->mmap_sem);
+
+Index: linux-2.6.12/arch/ia64/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/ia64/kernel/ptrace.c
++++ linux-2.6.12/arch/ia64/kernel/ptrace.c
+@@ -1436,6 +1436,9 @@ sys_ptrace (long request, pid_t pid, uns
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
++
+ ret = -EPERM;
+ if (pid == 1) /* no messing around with init! */
+ goto out_tsk;
+Index: linux-2.6.12/arch/ia64/mm/fault.c
+===================================================================
+--- linux-2.6.12.orig/arch/ia64/mm/fault.c
++++ linux-2.6.12/arch/ia64/mm/fault.c
+@@ -9,6 +9,7 @@
+ #include <linux/mm.h>
+ #include <linux/smp_lock.h>
+ #include <linux/interrupt.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+@@ -33,12 +34,17 @@ expand_backing_store (struct vm_area_str
+
+ grow = PAGE_SIZE >> PAGE_SHIFT;
+ if (address - vma->vm_start > current->signal->rlim[RLIMIT_STACK].rlim_cur
+- || (((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) > current->signal->rlim[RLIMIT_AS].rlim_cur))
++ || (((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) >
++ current->signal->rlim[RLIMIT_AS].rlim_cur))
++ return -ENOMEM;
++ if (!vx_vmpages_avail(vma->vm_mm, grow) ||
++ ((vma->vm_flags & VM_LOCKED) &&
++ !vx_vmlocked_avail(vma->vm_mm, grow)))
+ return -ENOMEM;
+ vma->vm_end += PAGE_SIZE;
+- vma->vm_mm->total_vm += grow;
++ vx_vmpages_add(vma->vm_mm, grow);
+ if (vma->vm_flags & VM_LOCKED)
+- vma->vm_mm->locked_vm += grow;
++ vx_vmlocked_add(vma->vm_mm, grow);
+ __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
+ return 0;
+ }
+Index: linux-2.6.12/arch/m68k/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/m68k/Kconfig
++++ linux-2.6.12/arch/m68k/Kconfig
+@@ -663,6 +663,8 @@ source "fs/Kconfig"
+
+ source "arch/m68k/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/m68k/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/m68k/kernel/ptrace.c
++++ linux-2.6.12/arch/m68k/kernel/ptrace.c
+@@ -141,6 +141,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/m68knommu/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/m68knommu/Kconfig
++++ linux-2.6.12/arch/m68knommu/Kconfig
+@@ -579,6 +579,8 @@ source "fs/Kconfig"
+
+ source "arch/m68knommu/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/m68knommu/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/m68knommu/kernel/ptrace.c
++++ linux-2.6.12/arch/m68knommu/kernel/ptrace.c
+@@ -125,6 +125,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/mips/Kconfig
++++ linux-2.6.12/arch/mips/Kconfig
+@@ -1642,6 +1642,8 @@ source "fs/Kconfig"
+
+ source "arch/mips/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/mips/kernel/linux32.c
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/linux32.c
++++ linux-2.6.12/arch/mips/kernel/linux32.c
+@@ -1199,7 +1199,7 @@ asmlinkage long sys32_newuname(struct ne
+ int ret = 0;
+
+ down_read(&uts_sem);
+- if (copy_to_user(name,&system_utsname,sizeof *name))
++ if (copy_to_user(name, vx_new_utsname(), sizeof *name))
+ ret = -EFAULT;
+ up_read(&uts_sem);
+
+Index: linux-2.6.12/arch/mips/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/ptrace.c
++++ linux-2.6.12/arch/mips/kernel/ptrace.c
+@@ -78,6 +78,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/mips/kernel/scall32-o32.S
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/scall32-o32.S
++++ linux-2.6.12/arch/mips/kernel/scall32-o32.S
+@@ -617,7 +617,7 @@ einval: li v0, -EINVAL
+ sys sys_mq_timedreceive 5
+ sys sys_mq_notify 2 /* 4275 */
+ sys sys_mq_getsetattr 3
+- sys sys_ni_syscall 0 /* sys_vserver */
++ sys sys_vserver 3
+ sys sys_waitid 4
+ sys sys_ni_syscall 0 /* available, was setaltroot */
+ sys sys_add_key 5
+Index: linux-2.6.12/arch/mips/kernel/scall64-64.S
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/scall64-64.S
++++ linux-2.6.12/arch/mips/kernel/scall64-64.S
+@@ -443,7 +443,7 @@ sys_call_table:
+ PTR sys_mq_timedreceive
+ PTR sys_mq_notify
+ PTR sys_mq_getsetattr /* 5235 */
+- PTR sys_ni_syscall /* sys_vserver */
++ PTR sys_vserver
+ PTR sys_waitid
+ PTR sys_ni_syscall /* available, was setaltroot */
+ PTR sys_add_key
+Index: linux-2.6.12/arch/mips/kernel/scall64-n32.S
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/scall64-n32.S
++++ linux-2.6.12/arch/mips/kernel/scall64-n32.S
+@@ -357,7 +357,7 @@ EXPORT(sysn32_call_table)
+ PTR compat_sys_mq_timedreceive
+ PTR compat_sys_mq_notify
+ PTR compat_sys_mq_getsetattr
+- PTR sys_ni_syscall /* 6240, sys_vserver */
++ PTR sys32_vserver /* 6240 */
+ PTR sys_waitid
+ PTR sys_ni_syscall /* available, was setaltroot */
+ PTR sys_add_key
+Index: linux-2.6.12/arch/mips/kernel/scall64-o32.S
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/scall64-o32.S
++++ linux-2.6.12/arch/mips/kernel/scall64-o32.S
+@@ -479,7 +479,7 @@ sys_call_table:
+ PTR compat_sys_mq_timedreceive
+ PTR compat_sys_mq_notify /* 4275 */
+ PTR compat_sys_mq_getsetattr
+- PTR sys_ni_syscall /* sys_vserver */
++ PTR sys32_vserver
+ PTR sys_waitid
+ PTR sys_ni_syscall /* available, was setaltroot */
+ PTR sys_add_key /* 4280 */
+Index: linux-2.6.12/arch/mips/kernel/syscall.c
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/syscall.c
++++ linux-2.6.12/arch/mips/kernel/syscall.c
+@@ -26,6 +26,7 @@
+ #include <linux/msg.h>
+ #include <linux/shm.h>
+ #include <linux/compiler.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/branch.h>
+ #include <asm/cachectl.h>
+@@ -210,7 +211,7 @@ out:
+ */
+ asmlinkage int sys_uname(struct old_utsname * name)
+ {
+- if (name && !copy_to_user(name, &system_utsname, sizeof (*name)))
++ if (name && !copy_to_user(name, vx_new_utsname(), sizeof (*name)))
+ return 0;
+ return -EFAULT;
+ }
+@@ -221,21 +222,23 @@ asmlinkage int sys_uname(struct old_utsn
+ asmlinkage int sys_olduname(struct oldold_utsname * name)
+ {
+ int error;
++ struct new_utsname *ptr;
+
+ if (!name)
+ return -EFAULT;
+ if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
+ return -EFAULT;
+
+- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
++ ptr = vx_new_utsname();
++ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
+ error -= __put_user(0,name->sysname+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
+ error -= __put_user(0,name->nodename+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
+ error -= __put_user(0,name->release+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
+ error -= __put_user(0,name->version+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->machine,ptr->machine,__OLD_UTS_LEN);
+ error = __put_user(0,name->machine+__OLD_UTS_LEN);
+ error = error ? -EFAULT : 0;
+
+@@ -261,10 +264,10 @@ asmlinkage int _sys_sysmips(int cmd, lon
+ return -EFAULT;
+
+ down_write(&uts_sem);
+- strncpy(system_utsname.nodename, nodename, len);
++ strncpy(vx_new_uts(nodename), nodename, len);
+ nodename[__NEW_UTS_LEN] = '\0';
+- strlcpy(system_utsname.nodename, nodename,
+- sizeof(system_utsname.nodename));
++ strlcpy(vx_new_uts(nodename), nodename,
++ sizeof(vx_new_uts(nodename)));
+ up_write(&uts_sem);
+ return 0;
+ }
+Index: linux-2.6.12/arch/mips/kernel/sysirix.c
+===================================================================
+--- linux-2.6.12.orig/arch/mips/kernel/sysirix.c
++++ linux-2.6.12/arch/mips/kernel/sysirix.c
+@@ -30,6 +30,7 @@
+ #include <linux/socket.h>
+ #include <linux/security.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/ptrace.h>
+ #include <asm/page.h>
+@@ -583,7 +584,8 @@ asmlinkage int irix_brk(unsigned long br
+ /*
+ * Check if we have enough memory..
+ */
+- if (security_vm_enough_memory((newbrk-oldbrk) >> PAGE_SHIFT)) {
++ if (security_vm_enough_memory((newbrk-oldbrk) >> PAGE_SHIFT) ||
++ !vx_vmpages_avail(mm, (newbrk-oldbrk) >> PAGE_SHIFT)) {
+ ret = -ENOMEM;
+ goto out;
+ }
+Index: linux-2.6.12/arch/parisc/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/parisc/Kconfig
++++ linux-2.6.12/arch/parisc/Kconfig
+@@ -196,6 +196,8 @@ source "arch/parisc/oprofile/Kconfig"
+
+ source "arch/parisc/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/parisc/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/parisc/kernel/ptrace.c
++++ linux-2.6.12/arch/parisc/kernel/ptrace.c
+@@ -111,6 +111,9 @@ long sys_ptrace(long request, pid_t pid,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
++
+ ret = -EPERM;
+ if (pid == 1) /* no messing around with init! */
+ goto out_tsk;
+Index: linux-2.6.12/arch/parisc/kernel/sys_parisc32.c
+===================================================================
+--- linux-2.6.12.orig/arch/parisc/kernel/sys_parisc32.c
++++ linux-2.6.12/arch/parisc/kernel/sys_parisc32.c
+@@ -657,6 +657,7 @@ asmlinkage int sys32_sysinfo(struct sysi
+
+ do {
+ seq = read_seqbegin(&xtime_lock);
++ /* FIXME requires vx virtualization */
+ val.uptime = jiffies / HZ;
+
+ val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
+Index: linux-2.6.12/arch/parisc/kernel/syscall_table.S
+===================================================================
+--- linux-2.6.12.orig/arch/parisc/kernel/syscall_table.S
++++ linux-2.6.12/arch/parisc/kernel/syscall_table.S
+@@ -368,5 +368,6 @@
+ ENTRY_COMP(mbind) /* 260 */
+ ENTRY_COMP(get_mempolicy)
+ ENTRY_COMP(set_mempolicy)
++ ENTRY_DIFF(vserver)
+ /* Nothing yet */
+
+Index: linux-2.6.12/arch/ppc/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/ppc/Kconfig
++++ linux-2.6.12/arch/ppc/Kconfig
+@@ -1332,6 +1332,8 @@ source "arch/ppc/oprofile/Kconfig"
+
+ source "arch/ppc/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/ppc/boot/include/serial.h
+===================================================================
+--- linux-2.6.12.orig/arch/ppc/boot/include/serial.h
++++ linux-2.6.12/arch/ppc/boot/include/serial.h
+@@ -36,8 +36,8 @@ struct serial_state {
+ int count;
+ u8 *iomem_base;
+ u16 iomem_reg_shift;
+- unsigned short close_delay;
+- unsigned short closing_wait; /* time to wait before closing */
++ unsigned int close_delay;
++ unsigned int closing_wait; /* time to wait before closing */
+ unsigned long icount;
+ int io_type;
+ void *info;
+Index: linux-2.6.12/arch/ppc/kernel/misc.S
+===================================================================
+--- linux-2.6.12.orig/arch/ppc/kernel/misc.S
++++ linux-2.6.12/arch/ppc/kernel/misc.S
+@@ -1425,7 +1425,7 @@ _GLOBAL(sys_call_table)
+ .long ppc_fadvise64_64
+ .long sys_ni_syscall /* 255 - rtas (used on ppc64) */
+ .long sys_debug_setcontext
+- .long sys_ni_syscall /* 257 reserved for vserver */
++ .long sys_vserver
+ .long sys_ni_syscall /* 258 reserved for new sys_remap_file_pages */
+ .long sys_ni_syscall /* 259 reserved for new sys_mbind */
+ .long sys_ni_syscall /* 260 reserved for new sys_get_mempolicy */
+Index: linux-2.6.12/arch/ppc/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/ppc/kernel/ptrace.c
++++ linux-2.6.12/arch/ppc/kernel/ptrace.c
+@@ -263,6 +263,8 @@ int sys_ptrace(long request, long pid, l
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/ppc/kernel/syscalls.c
+===================================================================
+--- linux-2.6.12.orig/arch/ppc/kernel/syscalls.c
++++ linux-2.6.12/arch/ppc/kernel/syscalls.c
+@@ -36,6 +36,7 @@
+ #include <linux/utsname.h>
+ #include <linux/file.h>
+ #include <linux/unistd.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/ipc.h>
+@@ -229,7 +230,7 @@ int sys_uname(struct old_utsname __user
+ int err = -EFAULT;
+
+ down_read(&uts_sem);
+- if (name && !copy_to_user(name, &system_utsname, sizeof (*name)))
++ if (name && !copy_to_user(name, vx_new_utsname(), sizeof (*name)))
+ err = 0;
+ up_read(&uts_sem);
+ return err;
+@@ -238,6 +239,7 @@ int sys_uname(struct old_utsname __user
+ int sys_olduname(struct oldold_utsname __user * name)
+ {
+ int error;
++ struct new_utsname *ptr;
+
+ if (!name)
+ return -EFAULT;
+@@ -245,15 +247,16 @@ int sys_olduname(struct oldold_utsname _
+ return -EFAULT;
+
+ down_read(&uts_sem);
+- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
++ ptr = vx_new_utsname();
++ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
+ error -= __put_user(0,name->sysname+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
+ error -= __put_user(0,name->nodename+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
+ error -= __put_user(0,name->release+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
+ error -= __put_user(0,name->version+__OLD_UTS_LEN);
+- error -= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
++ error -= __copy_to_user(&name->machine,ptr->machine,__OLD_UTS_LEN);
+ error = __put_user(0,name->machine+__OLD_UTS_LEN);
+ up_read(&uts_sem);
+
+Index: linux-2.6.12/arch/ppc64/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/ppc64/Kconfig
++++ linux-2.6.12/arch/ppc64/Kconfig
+@@ -415,6 +415,8 @@ source "arch/ppc64/oprofile/Kconfig"
+
+ source "arch/ppc64/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ config KEYS_COMPAT
+Index: linux-2.6.12/arch/ppc64/kernel/misc.S
+===================================================================
+--- linux-2.6.12.orig/arch/ppc64/kernel/misc.S
++++ linux-2.6.12/arch/ppc64/kernel/misc.S
+@@ -940,7 +940,7 @@ _GLOBAL(sys_call_table32)
+ .llong .ppc32_fadvise64_64 /* 32bit only fadvise64_64 */
+ .llong .ppc_rtas /* 255 */
+ .llong .sys_ni_syscall /* 256 reserved for sys_debug_setcontext */
+- .llong .sys_ni_syscall /* 257 reserved for vserver */
++ .llong .sys32_vserver
+ .llong .sys_ni_syscall /* 258 reserved for new sys_remap_file_pages */
+ .llong .compat_sys_mbind
+ .llong .compat_sys_get_mempolicy /* 260 */
+@@ -1216,7 +1216,7 @@ _GLOBAL(sys_call_table)
+ .llong .sys_ni_syscall /* 32bit only fadvise64_64 */
+ .llong .ppc_rtas /* 255 */
+ .llong .sys_ni_syscall /* 256 reserved for sys_debug_setcontext */
+- .llong .sys_ni_syscall /* 257 reserved for vserver */
++ .llong .sys_vserver
+ .llong .sys_ni_syscall /* 258 reserved for new sys_remap_file_pages */
+ .llong .sys_mbind
+ .llong .sys_get_mempolicy /* 260 */
+Index: linux-2.6.12/arch/ppc64/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/ppc64/kernel/ptrace.c
++++ linux-2.6.12/arch/ppc64/kernel/ptrace.c
+@@ -78,6 +78,8 @@ int sys_ptrace(long request, long pid, l
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/ppc64/kernel/sys_ppc32.c
+===================================================================
+--- linux-2.6.12.orig/arch/ppc64/kernel/sys_ppc32.c
++++ linux-2.6.12/arch/ppc64/kernel/sys_ppc32.c
+@@ -1138,7 +1138,7 @@ asmlinkage int sys32_uname(struct old_ut
+ int err = 0;
+
+ down_read(&uts_sem);
+- if (copy_to_user(name, &system_utsname, sizeof(*name)))
++ if (copy_to_user(name, vx_new_utsname(), sizeof(*name)))
+ err = -EFAULT;
+ up_read(&uts_sem);
+ if (!err && personality(current->personality) == PER_LINUX32) {
+@@ -1153,20 +1153,22 @@ asmlinkage int sys32_uname(struct old_ut
+ asmlinkage int sys32_olduname(struct oldold_utsname __user * name)
+ {
+ int error;
++ struct new_utsname *ptr;
+
+ if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
+ return -EFAULT;
+
+ down_read(&uts_sem);
+- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
++ ptr = vx_new_utsname();
++ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
+ error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
+ error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
+ error |= __put_user(0,name->release+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
+ error |= __put_user(0,name->version+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
++ error |= __copy_to_user(&name->machine,ptr->machine,__OLD_UTS_LEN);
+ error |= __put_user(0,name->machine+__OLD_UTS_LEN);
+ if (personality(current->personality) == PER_LINUX32) {
+ /* change "ppc64" to "ppc" */
+Index: linux-2.6.12/arch/s390/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/s390/Kconfig
++++ linux-2.6.12/arch/s390/Kconfig
+@@ -473,6 +473,8 @@ source "arch/s390/oprofile/Kconfig"
+
+ source "arch/s390/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/s390/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/s390/kernel/ptrace.c
++++ linux-2.6.12/arch/s390/kernel/ptrace.c
+@@ -738,9 +738,11 @@ sys_ptrace(long request, long pid, long
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = do_ptrace(child, request, addr, data);
+-
++out_tsk:
+ put_task_struct(child);
+ out:
+ unlock_kernel();
+Index: linux-2.6.12/arch/s390/kernel/syscalls.S
+===================================================================
+--- linux-2.6.12.orig/arch/s390/kernel/syscalls.S
++++ linux-2.6.12/arch/s390/kernel/syscalls.S
+@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
+ SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
+ SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
+ SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
+-NI_SYSCALL /* reserved for vserver */
++SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
+ SYSCALL(s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
+ SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
+ SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
+Index: linux-2.6.12/arch/sh/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/sh/Kconfig
++++ linux-2.6.12/arch/sh/Kconfig
+@@ -790,6 +790,8 @@ source "arch/sh/oprofile/Kconfig"
+
+ source "arch/sh/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/sh/kernel/kgdb_stub.c
+===================================================================
+--- linux-2.6.12.orig/arch/sh/kernel/kgdb_stub.c
++++ linux-2.6.12/arch/sh/kernel/kgdb_stub.c
+@@ -412,7 +412,7 @@ static struct task_struct *get_thread(in
+ if (pid == PID_MAX) pid = 0;
+
+ /* First check via PID */
+- thread = find_task_by_pid(pid);
++ thread = find_task_by_real_pid(pid);
+
+ if (thread)
+ return thread;
+Index: linux-2.6.12/arch/sh/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/sh/kernel/ptrace.c
++++ linux-2.6.12/arch/sh/kernel/ptrace.c
+@@ -108,6 +108,8 @@ asmlinkage int sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/sparc/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/sparc/Kconfig
++++ linux-2.6.12/arch/sparc/Kconfig
+@@ -281,6 +281,8 @@ source "fs/Kconfig"
+
+ source "arch/sparc/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/sparc/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/sparc/kernel/ptrace.c
++++ linux-2.6.12/arch/sparc/kernel/ptrace.c
+@@ -322,6 +322,10 @@ asmlinkage void do_ptrace(struct pt_regs
+ pt_error_return(regs, ESRCH);
+ goto out;
+ }
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++ pt_error_return(regs, ESRCH);
++ goto out_tsk;
++ }
+
+ if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
+ || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
+Index: linux-2.6.12/arch/sparc/kernel/sys_sparc.c
+===================================================================
+--- linux-2.6.12.orig/arch/sparc/kernel/sys_sparc.c
++++ linux-2.6.12/arch/sparc/kernel/sys_sparc.c
+@@ -21,6 +21,7 @@
+ #include <linux/utsname.h>
+ #include <linux/smp.h>
+ #include <linux/smp_lock.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/ipc.h>
+@@ -470,13 +471,13 @@ asmlinkage int sys_getdomainname(char __
+
+ down_read(&uts_sem);
+
+- nlen = strlen(system_utsname.domainname) + 1;
++ nlen = strlen(vx_new_uts(domainname)) + 1;
+
+ if (nlen < len)
+ len = nlen;
+ if (len > __NEW_UTS_LEN)
+ goto done;
+- if (copy_to_user(name, system_utsname.domainname, len))
++ if (copy_to_user(name, vx_new_uts(domainname), len))
+ goto done;
+ err = 0;
+ done:
+Index: linux-2.6.12/arch/sparc/kernel/systbls.S
+===================================================================
+--- linux-2.6.12.orig/arch/sparc/kernel/systbls.S
++++ linux-2.6.12/arch/sparc/kernel/systbls.S
+@@ -72,7 +72,7 @@ sys_call_table:
+ /*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ /*255*/ .long sys_nis_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
+ /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
+-/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
++/*265*/ .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
+ /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
+ /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
+ /*280*/ .long sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl
+Index: linux-2.6.12/arch/sparc64/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/sparc64/Kconfig
++++ linux-2.6.12/arch/sparc64/Kconfig
+@@ -395,6 +395,8 @@ source "arch/sparc64/oprofile/Kconfig"
+
+ source "arch/sparc64/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/sparc64/kernel/binfmt_aout32.c
+===================================================================
+--- linux-2.6.12.orig/arch/sparc64/kernel/binfmt_aout32.c
++++ linux-2.6.12/arch/sparc64/kernel/binfmt_aout32.c
+@@ -27,6 +27,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/personality.h>
+ #include <linux/init.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.12/arch/sparc64/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/sparc64/kernel/ptrace.c
++++ linux-2.6.12/arch/sparc64/kernel/ptrace.c
+@@ -222,6 +222,10 @@ asmlinkage void do_ptrace(struct pt_regs
+ pt_error_return(regs, ESRCH);
+ goto out;
+ }
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT)) {
++ pt_error_return(regs, ESRCH);
++ goto out_tsk;
++ }
+
+ if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
+ || (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
+Index: linux-2.6.12/arch/sparc64/kernel/sys_sparc.c
+===================================================================
+--- linux-2.6.12.orig/arch/sparc64/kernel/sys_sparc.c
++++ linux-2.6.12/arch/sparc64/kernel/sys_sparc.c
+@@ -25,6 +25,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/ipc.h>
+ #include <linux/personality.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/ipc.h>
+@@ -468,13 +469,13 @@ asmlinkage long sys_getdomainname(char _
+
+ down_read(&uts_sem);
+
+- nlen = strlen(system_utsname.domainname) + 1;
++ nlen = strlen(vx_new_uts(domainname)) + 1;
+
+ if (nlen < len)
+ len = nlen;
+ if (len > __NEW_UTS_LEN)
+ goto done;
+- if (copy_to_user(name, system_utsname.domainname, len))
++ if (copy_to_user(name, vx_new_uts(domainname), len))
+ goto done;
+ err = 0;
+ done:
+Index: linux-2.6.12/arch/sparc64/kernel/systbls.S
+===================================================================
+--- linux-2.6.12.orig/arch/sparc64/kernel/systbls.S
++++ linux-2.6.12/arch/sparc64/kernel/systbls.S
+@@ -73,7 +73,7 @@ sys_call_table32:
+ /*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
+ .word sys_ni_syscall, sys32_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
+ /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
+- .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
++ .word sys_timer_delete, sys32_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
+ /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
+ .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
+ /*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl
+@@ -139,7 +139,7 @@ sys_call_table:
+ /*250*/ .word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ .word sys_ni_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
+ /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
+- .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
++ .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
+ /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
+ .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
+ /*280*/ .word sys_nis_syscall, sys_add_key, sys_request_key, sys_keyctl
+Index: linux-2.6.12/arch/um/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/um/Kconfig
++++ linux-2.6.12/arch/um/Kconfig
+@@ -285,6 +285,8 @@ source "net/Kconfig"
+
+ source "fs/Kconfig"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/um/kernel/process_kern.c
+===================================================================
+--- linux-2.6.12.orig/arch/um/kernel/process_kern.c
++++ linux-2.6.12/arch/um/kernel/process_kern.c
+@@ -22,6 +22,8 @@
+ #include "linux/proc_fs.h"
+ #include "linux/ptrace.h"
+ #include "linux/random.h"
++#include "linux/vs_cvirt.h"
++
+ #include "asm/unistd.h"
+ #include "asm/mman.h"
+ #include "asm/segment.h"
+Index: linux-2.6.12/arch/um/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/um/kernel/ptrace.c
++++ linux-2.6.12/arch/um/kernel/ptrace.c
+@@ -72,6 +72,8 @@ long sys_ptrace(long request, long pid,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/um/kernel/syscall_kern.c
+===================================================================
+--- linux-2.6.12.orig/arch/um/kernel/syscall_kern.c
++++ linux-2.6.12/arch/um/kernel/syscall_kern.c
+@@ -15,6 +15,8 @@
+ #include "linux/unistd.h"
+ #include "linux/slab.h"
+ #include "linux/utime.h"
++#include <linux/vs_cvirt.h>
++
+ #include "asm/mman.h"
+ #include "asm/uaccess.h"
+ #include "kern_util.h"
+@@ -108,7 +110,7 @@ long sys_uname(struct old_utsname * name
+ if (!name)
+ return -EFAULT;
+ down_read(&uts_sem);
+- err=copy_to_user(name, &system_utsname, sizeof (*name));
++ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
+ up_read(&uts_sem);
+ return err?-EFAULT:0;
+ }
+@@ -116,6 +118,7 @@ long sys_uname(struct old_utsname * name
+ long sys_olduname(struct oldold_utsname * name)
+ {
+ long error;
++ struct new_utsname *ptr;
+
+ if (!name)
+ return -EFAULT;
+@@ -124,19 +127,20 @@ long sys_olduname(struct oldold_utsname
+
+ down_read(&uts_sem);
+
+- error = __copy_to_user(&name->sysname,&system_utsname.sysname,
++ ptr = vx_new_utsname();
++ error = __copy_to_user(&name->sysname,ptr->sysname,
+ __OLD_UTS_LEN);
+ error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->nodename,&system_utsname.nodename,
++ error |= __copy_to_user(&name->nodename,ptr->nodename,
+ __OLD_UTS_LEN);
+ error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->release,&system_utsname.release,
++ error |= __copy_to_user(&name->release,ptr->release,
+ __OLD_UTS_LEN);
+ error |= __put_user(0,name->release+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->version,&system_utsname.version,
++ error |= __copy_to_user(&name->version,ptr->version,
+ __OLD_UTS_LEN);
+ error |= __put_user(0,name->version+__OLD_UTS_LEN);
+- error |= __copy_to_user(&name->machine,&system_utsname.machine,
++ error |= __copy_to_user(&name->machine,ptr->machine,
+ __OLD_UTS_LEN);
+ error |= __put_user(0,name->machine+__OLD_UTS_LEN);
+
+Index: linux-2.6.12/arch/v850/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/v850/Kconfig
++++ linux-2.6.12/arch/v850/Kconfig
+@@ -307,6 +307,8 @@ source "drivers/usb/Kconfig"
+
+ source "arch/v850/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/v850/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/v850/kernel/ptrace.c
++++ linux-2.6.12/arch/v850/kernel/ptrace.c
+@@ -139,6 +139,8 @@ int sys_ptrace(long request, long pid, l
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ rval = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/x86_64/Kconfig
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/Kconfig
++++ linux-2.6.12/arch/x86_64/Kconfig
+@@ -490,6 +490,8 @@ source "arch/x86_64/oprofile/Kconfig"
+
+ source "arch/x86_64/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+Index: linux-2.6.12/arch/x86_64/ia32/ia32_aout.c
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/ia32/ia32_aout.c
++++ linux-2.6.12/arch/x86_64/ia32/ia32_aout.c
+@@ -25,6 +25,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/personality.h>
+ #include <linux/init.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.12/arch/x86_64/ia32/ia32_binfmt.c
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/ia32/ia32_binfmt.c
++++ linux-2.6.12/arch/x86_64/ia32/ia32_binfmt.c
+@@ -340,7 +340,7 @@ static void elf32_init(struct pt_regs *r
+
+ int setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, int executable_stack)
+ {
+- unsigned long stack_base;
++ unsigned long stack_base, grow;
+ struct vm_area_struct *mpnt;
+ struct mm_struct *mm = current->mm;
+ int i, ret;
+@@ -357,7 +357,10 @@ int setup_arg_pages(struct linux_binprm
+ if (!mpnt)
+ return -ENOMEM;
+
+- if (security_vm_enough_memory((IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))>>PAGE_SHIFT)) {
++ grow = (IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))
++ >> PAGE_SHIFT;
++ if (security_vm_enough_memory(grow) ||
++ !vx_vmpages_avail(mm, grow)) {
+ kmem_cache_free(vm_area_cachep, mpnt);
+ return -ENOMEM;
+ }
+@@ -382,7 +385,8 @@ int setup_arg_pages(struct linux_binprm
+ kmem_cache_free(vm_area_cachep, mpnt);
+ return ret;
+ }
+- mm->stack_vm = mm->total_vm = vma_pages(mpnt);
++ vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
++ mm->stack_vm = mm->total_vm;
+ }
+
+ for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
+Index: linux-2.6.12/arch/x86_64/ia32/ia32entry.S
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/ia32/ia32entry.S
++++ linux-2.6.12/arch/x86_64/ia32/ia32entry.S
+@@ -579,7 +579,7 @@ ia32_sys_call_table:
+ .quad sys_tgkill /* 270 */
+ .quad compat_sys_utimes
+ .quad sys32_fadvise64_64
+- .quad quiet_ni_syscall /* sys_vserver */
++ .quad sys32_vserver
+ .quad sys_mbind
+ .quad compat_sys_get_mempolicy /* 275 */
+ .quad sys_set_mempolicy
+Index: linux-2.6.12/arch/x86_64/ia32/sys_ia32.c
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/ia32/sys_ia32.c
++++ linux-2.6.12/arch/x86_64/ia32/sys_ia32.c
+@@ -859,6 +859,7 @@ asmlinkage long sys32_mmap2(unsigned lon
+ asmlinkage long sys32_olduname(struct oldold_utsname __user * name)
+ {
+ int error;
++ struct new_utsname *ptr;
+
+ if (!name)
+ return -EFAULT;
+@@ -867,13 +868,14 @@ asmlinkage long sys32_olduname(struct ol
+
+ down_read(&uts_sem);
+
+- error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
++ ptr = vx_new_utsname();
++ error = __copy_to_user(&name->sysname,ptr->sysname,__OLD_UTS_LEN);
+ __put_user(0,name->sysname+__OLD_UTS_LEN);
+- __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
++ __copy_to_user(&name->nodename,ptr->nodename,__OLD_UTS_LEN);
+ __put_user(0,name->nodename+__OLD_UTS_LEN);
+- __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
++ __copy_to_user(&name->release,ptr->release,__OLD_UTS_LEN);
+ __put_user(0,name->release+__OLD_UTS_LEN);
+- __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
++ __copy_to_user(&name->version,ptr->version,__OLD_UTS_LEN);
+ __put_user(0,name->version+__OLD_UTS_LEN);
+ {
+ char *arch = "x86_64";
+@@ -896,7 +898,7 @@ long sys32_uname(struct old_utsname __us
+ if (!name)
+ return -EFAULT;
+ down_read(&uts_sem);
+- err=copy_to_user(name, &system_utsname, sizeof (*name));
++ err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
+ up_read(&uts_sem);
+ if (personality(current->personality) == PER_LINUX32)
+ err |= copy_to_user(&name->machine, "i686", 5);
+Index: linux-2.6.12/arch/x86_64/kernel/ptrace.c
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/kernel/ptrace.c
++++ linux-2.6.12/arch/x86_64/kernel/ptrace.c
+@@ -342,6 +342,8 @@ asmlinkage long sys_ptrace(long request,
+ read_unlock(&tasklist_lock);
+ if (!child)
+ goto out;
++ if (!vx_check(vx_task_xid(child), VX_WATCH|VX_IDENT))
++ goto out_tsk;
+
+ ret = -EPERM;
+ if (pid == 1) /* you may not mess with init */
+Index: linux-2.6.12/arch/x86_64/kernel/sys_x86_64.c
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/kernel/sys_x86_64.c
++++ linux-2.6.12/arch/x86_64/kernel/sys_x86_64.c
+@@ -16,6 +16,7 @@
+ #include <linux/file.h>
+ #include <linux/utsname.h>
+ #include <linux/personality.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/ia32.h>
+@@ -145,7 +146,7 @@ asmlinkage long sys_uname(struct new_uts
+ {
+ int err;
+ down_read(&uts_sem);
+- err = copy_to_user(name, &system_utsname, sizeof (*name));
++ err = copy_to_user(name, vx_new_utsname(), sizeof (*name));
+ up_read(&uts_sem);
+ if (personality(current->personality) == PER_LINUX32)
+ err |= copy_to_user(&name->machine, "i686", 5);
+Index: linux-2.6.12/drivers/acpi/osl.c
+===================================================================
+--- linux-2.6.12.orig/drivers/acpi/osl.c
++++ linux-2.6.12/drivers/acpi/osl.c
+@@ -938,7 +938,7 @@ acpi_os_wait_semaphore(
+ // TODO: A better timeout algorithm?
+ {
+ int i = 0;
+- static const int quantum_ms = 1000/HZ;
++ static const int quantum_ms = (HZ>1000)?1:(1000/HZ);
+
+ ret = down_trylock(sem);
+ for (i = timeout; (i > 0 && ret < 0); i -= quantum_ms) {
+Index: linux-2.6.12/drivers/block/Kconfig
+===================================================================
+--- linux-2.6.12.orig/drivers/block/Kconfig
++++ linux-2.6.12/drivers/block/Kconfig
+@@ -315,6 +315,12 @@ config BLK_DEV_CRYPTOLOOP
+ instead, which can be configured to be on-disk compatible with the
+ cryptoloop device.
+
++config BLK_DEV_VROOT
++ tristate "Virtual Root device support"
++ ---help---
++ Saying Y here will allow you to use quota/fs ioctls on a shared
++ partition within a virtual server without compromising security.
++
+ config BLK_DEV_NBD
+ tristate "Network block device support"
+ depends on NET
+Index: linux-2.6.12/drivers/block/Makefile
+===================================================================
+--- linux-2.6.12.orig/drivers/block/Makefile
++++ linux-2.6.12/drivers/block/Makefile
+@@ -44,4 +44,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryp
+ obj-$(CONFIG_VIODASD) += viodasd.o
+ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
+ obj-$(CONFIG_BLK_DEV_UB) += ub.o
++obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
+
+Index: linux-2.6.12/drivers/block/floppy.c
+===================================================================
+--- linux-2.6.12.orig/drivers/block/floppy.c
++++ linux-2.6.12/drivers/block/floppy.c
+@@ -4084,7 +4084,7 @@ static void __init daring(int *ints, int
+ FD_SILENT_DCL_CLEAR;
+ } else {
+ default_drive_params[i].params.select_delay =
+- 2 * HZ / 100;
++ SEL_DLY;
+ default_drive_params[i].params.flags &=
+ ~FD_SILENT_DCL_CLEAR;
+ }
+Index: linux-2.6.12/drivers/block/vroot.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/drivers/block/vroot.c
+@@ -0,0 +1,267 @@
++/*
++ * linux/drivers/block/vroot.c
++ *
++ * written by Herbert Ptzl, 9/11/2002
++ * ported to 2.6.10 by Herbert Ptzl, 30/12/2004
++ *
++ * based on the loop.c code by Theodore Ts'o.
++ *
++ * Copyright (C) 2002-2005 by Herbert Ptzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/file.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
++#include <linux/devfs_fs_kernel.h>
++
++#include <linux/vroot.h>
++#include <linux/vserver/debug.h>
++
++
++static int max_vroot = 8;
++
++static struct vroot_device *vroot_dev;
++static struct gendisk **disks;
++
++
++static int vroot_set_dev(
++ struct vroot_device *vr,
++ struct file *vr_file,
++ struct block_device *bdev,
++ unsigned int arg)
++{
++ struct block_device *real_bdev;
++ struct file *file;
++ struct inode *inode;
++ int error;
++
++ error = -EBUSY;
++ if (vr->vr_state != Vr_unbound)
++ goto out;
++
++ error = -EBADF;
++ file = fget(arg);
++ if (!file)
++ goto out;
++
++ error = -EINVAL;
++ inode = file->f_dentry->d_inode;
++
++
++ if (S_ISBLK(inode->i_mode)) {
++ real_bdev = inode->i_bdev;
++ vr->vr_device = real_bdev;
++ __iget(real_bdev->bd_inode);
++ } else
++ goto out_fput;
++
++ vxdprintk(1, "vroot[%d]_set_dev: dev=%p[%d,%d]\n",
++ vr->vr_number, real_bdev,
++ imajor(real_bdev->bd_inode), iminor(real_bdev->bd_inode));
++
++ vr->vr_state = Vr_bound;
++ error = 0;
++
++ out_fput:
++ fput(file);
++ out:
++ return error;
++}
++
++static int vroot_clr_dev(
++ struct vroot_device *vr,
++ struct file *vr_file,
++ struct block_device *bdev)
++{
++ struct block_device *real_bdev;
++
++ if (vr->vr_state != Vr_bound)
++ return -ENXIO;
++ if (vr->vr_refcnt > 1) /* we needed one fd for the ioctl */
++ return -EBUSY;
++
++ real_bdev = vr->vr_device;
++
++ vxdprintk(1, "vroot[%d]_clr_dev: dev=%p[%d,%d]\n",
++ vr->vr_number, real_bdev,
++ imajor(real_bdev->bd_inode), iminor(real_bdev->bd_inode));
++
++ bdput(real_bdev);
++ vr->vr_state = Vr_unbound;
++ vr->vr_device = NULL;
++ return 0;
++}
++
++
++static int vr_ioctl(struct inode * inode, struct file * file,
++ unsigned int cmd, unsigned long arg)
++{
++ struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++ int err;
++
++ down(&vr->vr_ctl_mutex);
++ switch (cmd) {
++ case VROOT_SET_DEV:
++ err = vroot_set_dev(vr, file, inode->i_bdev, arg);
++ break;
++ case VROOT_CLR_DEV:
++ err = vroot_clr_dev(vr, file, inode->i_bdev);
++ break;
++ default:
++ err = -EINVAL;
++ break;
++ }
++ up(&vr->vr_ctl_mutex);
++ return err;
++}
++
++static int vr_open(struct inode *inode, struct file *file)
++{
++ struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++
++ down(&vr->vr_ctl_mutex);
++ vr->vr_refcnt++;
++ up(&vr->vr_ctl_mutex);
++ return 0;
++}
++
++static int vr_release(struct inode *inode, struct file *file)
++{
++ struct vroot_device *vr = inode->i_bdev->bd_disk->private_data;
++
++ down(&vr->vr_ctl_mutex);
++ --vr->vr_refcnt;
++ up(&vr->vr_ctl_mutex);
++ return 0;
++}
++
++static struct block_device_operations vr_fops = {
++ .owner = THIS_MODULE,
++ .open = vr_open,
++ .release = vr_release,
++ .ioctl = vr_ioctl,
++};
++
++struct block_device *vroot_get_real_bdev(struct block_device *bdev)
++{
++ struct inode *inode = bdev->bd_inode;
++ struct vroot_device *vr;
++ struct block_device *real_bdev;
++ int minor = iminor(inode);
++
++ vr = &vroot_dev[minor];
++ real_bdev = vr->vr_device;
++
++ vxdprintk(1, "vroot[%d]_get_real_bdev: dev=%p[%p,%d,%d]\n",
++ vr->vr_number, real_bdev, real_bdev->bd_inode,
++ imajor(real_bdev->bd_inode), iminor(real_bdev->bd_inode));
++
++ if (vr->vr_state != Vr_bound)
++ return ERR_PTR(-ENXIO);
++
++ __iget(real_bdev->bd_inode);
++ return real_bdev;
++}
++
++/*
++ * And now the modules code and kernel interface.
++ */
++
++module_param(max_vroot, int, 0);
++
++MODULE_PARM_DESC(max_vroot, "Maximum number of vroot devices (1-256)");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
++
++MODULE_AUTHOR ("Herbert Ptzl");
++MODULE_DESCRIPTION ("Virtual Root Device Mapper");
++
++
++int __init vroot_init(void)
++{
++ int i;
++
++ if (max_vroot < 1 || max_vroot > 256) {
++ max_vroot = MAX_VROOT_DEFAULT;
++ printk(KERN_WARNING "vroot: invalid max_vroot "
++ "(must be between 1 and 256), "
++ "using default (%d)\n", max_vroot);
++ }
++
++ if (register_blkdev(VROOT_MAJOR, "vroot"))
++ return -EIO;
++
++ vroot_dev = kmalloc(max_vroot * sizeof(struct vroot_device), GFP_KERNEL);
++ if (!vroot_dev)
++ goto out_mem1;
++ memset(vroot_dev, 0, max_vroot * sizeof(struct vroot_device));
++
++ disks = kmalloc(max_vroot * sizeof(struct gendisk *), GFP_KERNEL);
++ if (!disks)
++ goto out_mem2;
++
++ for (i = 0; i < max_vroot; i++) {
++ disks[i] = alloc_disk(1);
++ if (!disks[i])
++ goto out_mem3;
++ }
++
++ devfs_mk_dir("vroot");
++
++ for (i = 0; i < max_vroot; i++) {
++ struct vroot_device *vr = &vroot_dev[i];
++ struct gendisk *disk = disks[i];
++
++ memset(vr, 0, sizeof(*vr));
++ init_MUTEX(&vr->vr_ctl_mutex);
++ vr->vr_number = i;
++ disk->major = VROOT_MAJOR;
++ disk->first_minor = i;
++ disk->fops = &vr_fops;
++ sprintf(disk->disk_name, "vroot%d", i);
++ sprintf(disk->devfs_name, "vroot/%d", i);
++ disk->private_data = vr;
++ }
++
++ for (i = 0; i < max_vroot; i++)
++ add_disk(disks[i]);
++ printk(KERN_INFO "vroot: loaded (max %d devices)\n", max_vroot);
++ return 0;
++
++out_mem3:
++ while (i--)
++ put_disk(disks[i]);
++ kfree(disks);
++out_mem2:
++ kfree(vroot_dev);
++out_mem1:
++ unregister_blkdev(VROOT_MAJOR, "vroot");
++ printk(KERN_ERR "vroot: ran out of memory\n");
++ return -ENOMEM;
++}
++
++void vroot_exit(void)
++{
++ int i;
++
++ for (i = 0; i < max_vroot; i++) {
++ del_gendisk(disks[i]);
++ put_disk(disks[i]);
++ }
++ devfs_remove("vroot");
++ if (unregister_blkdev(VROOT_MAJOR, "vroot"))
++ printk(KERN_WARNING "vroot: cannot unregister blkdev\n");
++
++ kfree(disks);
++ kfree(vroot_dev);
++}
++
++module_init(vroot_init);
++module_exit(vroot_exit);
++
+Index: linux-2.6.12/drivers/char/cyclades.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/cyclades.c
++++ linux-2.6.12/drivers/char/cyclades.c
+@@ -4054,7 +4054,7 @@ cy_ioctl(struct tty_struct *tty, struct
+ break;
+ #endif /* CONFIG_CYZ_INTR */
+ case CYSETWAIT:
+- info->closing_wait = (unsigned short)arg * HZ/100;
++ info->closing_wait = (unsigned int)arg * HZ/100;
+ ret_val = 0;
+ break;
+ case CYGETWAIT:
+Index: linux-2.6.12/drivers/char/dtlk.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/dtlk.c
++++ linux-2.6.12/drivers/char/dtlk.c
+@@ -198,7 +198,7 @@ static ssize_t dtlk_write(struct file *f
+ up to 250 usec for the RDY bit to
+ go nonzero. */
+ for (retries = 0;
+- retries < loops_per_jiffy / (4000/HZ);
++ retries < HZ*(loops_per_jiffy >> 3)/500;
+ retries++)
+ if (inb_p(dtlk_port_tts) &
+ TTS_WRITABLE)
+@@ -445,7 +445,7 @@ for (i = 0; i < 10; i++) \
+ LOOK
+ dtlk_write_bytes("\0012I\r", 4);
+ buffer[b++] = 0;
+- __delay(50 * loops_per_jiffy / (1000/HZ));
++ __delay(50 * (loops_per_jiffy >> 3) * HZ / 125);
+ outb_p(0xff, dtlk_port_lpc);
+ buffer[b++] = 0;
+ LOOK
+Index: linux-2.6.12/drivers/char/isicom.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/isicom.c
++++ linux-2.6.12/drivers/char/isicom.c
+@@ -194,7 +194,7 @@ struct isi_port {
+ int close_delay;
+ unsigned short channel;
+ unsigned short status;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ struct isi_board * card;
+ struct tty_struct * tty;
+ wait_queue_head_t close_wait;
+Index: linux-2.6.12/drivers/char/moxa.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/moxa.c
++++ linux-2.6.12/drivers/char/moxa.c
+@@ -148,7 +148,7 @@ struct moxa_str {
+ int type;
+ int port;
+ int close_delay;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ int count;
+ int blocked_open;
+ long event; /* long req'd for set_bit --RR */
+Index: linux-2.6.12/drivers/char/mxser.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/mxser.c
++++ linux-2.6.12/drivers/char/mxser.c
+@@ -316,7 +316,7 @@ struct mxser_struct {
+ int custom_divisor;
+ int x_char; /* xon/xoff character */
+ int close_delay;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ int IER; /* Interrupt Enable Register */
+ int MCR; /* Modem control register */
+ unsigned long event;
+Index: linux-2.6.12/drivers/char/pcmcia/synclink_cs.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/pcmcia/synclink_cs.c
++++ linux-2.6.12/drivers/char/pcmcia/synclink_cs.c
+@@ -146,8 +146,8 @@ typedef struct _mgslpc_info {
+ int flags;
+ int count; /* count of opens */
+ int line;
+- unsigned short close_delay;
+- unsigned short closing_wait; /* time to wait before closing */
++ unsigned int close_delay;
++ unsigned int closing_wait; /* time to wait before closing */
+
+ struct mgsl_icount icount;
+
+Index: linux-2.6.12/drivers/char/random.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/random.c
++++ linux-2.6.12/drivers/char/random.c
+@@ -1174,7 +1174,7 @@ static char sysctl_bootid[16];
+ static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
+ {
+- ctl_table fake_table;
++ ctl_table fake_table = {0};
+ unsigned char buf[64], tmp_uuid[16], *uuid;
+
+ uuid = table->data;
+Index: linux-2.6.12/drivers/char/riscom8.h
+===================================================================
+--- linux-2.6.12.orig/drivers/char/riscom8.h
++++ linux-2.6.12/drivers/char/riscom8.h
+@@ -85,7 +85,7 @@ struct riscom_port {
+ struct work_struct tqueue_hangup;
+ short wakeup_chars;
+ short break_length;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ unsigned char mark_mask;
+ unsigned char IER;
+ unsigned char MSVR;
+Index: linux-2.6.12/drivers/char/specialix_io8.h
+===================================================================
+--- linux-2.6.12.orig/drivers/char/specialix_io8.h
++++ linux-2.6.12/drivers/char/specialix_io8.h
+@@ -126,7 +126,7 @@ struct specialix_port {
+ struct work_struct tqueue_hangup;
+ short wakeup_chars;
+ short break_length;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ unsigned char mark_mask;
+ unsigned char IER;
+ unsigned char MSVR;
+Index: linux-2.6.12/drivers/char/synclink.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/synclink.c
++++ linux-2.6.12/drivers/char/synclink.c
+@@ -189,8 +189,8 @@ struct mgsl_struct {
+ int count; /* count of opens */
+ int line;
+ int hw_version;
+- unsigned short close_delay;
+- unsigned short closing_wait; /* time to wait before closing */
++ unsigned int close_delay;
++ unsigned int closing_wait; /* time to wait before closing */
+
+ struct mgsl_icount icount;
+
+Index: linux-2.6.12/drivers/char/synclinkmp.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/synclinkmp.c
++++ linux-2.6.12/drivers/char/synclinkmp.c
+@@ -157,8 +157,8 @@ typedef struct _synclinkmp_info {
+ int flags;
+ int count; /* count of opens */
+ int line;
+- unsigned short close_delay;
+- unsigned short closing_wait; /* time to wait before closing */
++ unsigned int close_delay;
++ unsigned int closing_wait; /* time to wait before closing */
+
+ struct mgsl_icount icount;
+
+Index: linux-2.6.12/drivers/char/tty_io.c
+===================================================================
+--- linux-2.6.12.orig/drivers/char/tty_io.c
++++ linux-2.6.12/drivers/char/tty_io.c
+@@ -102,6 +102,7 @@
+ #include <linux/vt_kern.h>
+ #include <linux/selection.h>
+ #include <linux/devfs_fs_kernel.h>
++#include <linux/vs_cvirt.h>
+
+ #include <linux/kmod.h>
+
+@@ -2115,13 +2116,16 @@ static int tiocsctty(struct tty_struct *
+
+ static int tiocgpgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
+ {
++ pid_t pgrp;
+ /*
+ * (tty == real_tty) is a cheap way of
+ * testing if the tty is NOT a master pty.
+ */
+ if (tty == real_tty && current->signal->tty != real_tty)
+ return -ENOTTY;
+- return put_user(real_tty->pgrp, p);
++
++ pgrp = vx_map_pid(real_tty->pgrp);
++ return put_user(pgrp, p);
+ }
+
+ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t __user *p)
+@@ -2139,6 +2143,8 @@ static int tiocspgrp(struct tty_struct *
+ return -ENOTTY;
+ if (get_user(pgrp, p))
+ return -EFAULT;
++
++ pgrp = vx_rmap_pid(pgrp);
+ if (pgrp < 0)
+ return -EINVAL;
+ if (session_of_pgrp(pgrp) != current->signal->session)
+Index: linux-2.6.12/drivers/macintosh/macserial.h
+===================================================================
+--- linux-2.6.12.orig/drivers/macintosh/macserial.h
++++ linux-2.6.12/drivers/macintosh/macserial.h
+@@ -22,11 +22,11 @@ struct serial_struct {
+ int xmit_fifo_size;
+ int custom_divisor;
+ int baud_base;
+- unsigned short close_delay;
++ unsigned int close_delay;
+ char reserved_char[2];
+ int hub6;
+- unsigned short closing_wait; /* time to wait before closing */
+- unsigned short closing_wait2; /* no longer used... */
++ unsigned int closing_wait; /* time to wait before closing */
++ unsigned int closing_wait2; /* no longer used... */
+ int reserved[4];
+ };
+
+@@ -149,8 +149,8 @@ struct mac_serial {
+ int custom_divisor;
+ int x_char; /* xon/xoff character */
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2;
++ unsigned int closing_wait;
++ unsigned int closing_wait2;
+ unsigned long event;
+ unsigned long last_active;
+ int line;
+Index: linux-2.6.12/drivers/net/wan/z85230.h
+===================================================================
+--- linux-2.6.12.orig/drivers/net/wan/z85230.h
++++ linux-2.6.12/drivers/net/wan/z85230.h
+@@ -348,7 +348,7 @@ struct z8530_channel
+ int xmit_fifo_size; /* Transmit FIFO info */
+
+ int close_delay; /* Do we wait for drain on close ? */
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+
+ /* We need to know the current clock divisor
+ * to read the bps rate the chip has currently
+Index: linux-2.6.12/drivers/sbus/char/aurora.h
+===================================================================
+--- linux-2.6.12.orig/drivers/sbus/char/aurora.h
++++ linux-2.6.12/drivers/sbus/char/aurora.h
+@@ -258,7 +258,7 @@ struct Aurora_port {
+ struct tq_struct tqueue_hangup;
+ short wakeup_chars;
+ short break_length;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ unsigned char mark_mask;
+ unsigned char SRER;
+ unsigned char MSVR;
+Index: linux-2.6.12/drivers/serial/68328serial.h
+===================================================================
+--- linux-2.6.12.orig/drivers/serial/68328serial.h
++++ linux-2.6.12/drivers/serial/68328serial.h
+@@ -22,11 +22,11 @@ struct serial_struct {
+ int xmit_fifo_size;
+ int custom_divisor;
+ int baud_base;
+- unsigned short close_delay;
++ unsigned int close_delay;
+ char reserved_char[2];
+ int hub6; /* FIXME: We don't have AT&T Hub6 boards! */
+- unsigned short closing_wait; /* time to wait before closing */
+- unsigned short closing_wait2; /* no longer used... */
++ unsigned int closing_wait; /* time to wait before closing */
++ unsigned int closing_wait2; /* no longer used... */
+ int reserved[4];
+ };
+
+@@ -148,8 +148,8 @@ struct m68k_serial {
+ int custom_divisor;
+ int x_char; /* xon/xoff character */
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2;
++ unsigned int closing_wait;
++ unsigned int closing_wait2;
+ unsigned long event;
+ unsigned long last_active;
+ int line;
+Index: linux-2.6.12/drivers/serial/68360serial.c
+===================================================================
+--- linux-2.6.12.orig/drivers/serial/68360serial.c
++++ linux-2.6.12/drivers/serial/68360serial.c
+@@ -159,8 +159,8 @@ struct serial_state {
+ int count;
+ u8 *iomem_base;
+ u16 iomem_reg_shift;
+- unsigned short close_delay;
+- unsigned short closing_wait; /* time to wait before closing */
++ unsigned int close_delay;
++ unsigned int closing_wait; /* time to wait before closing */
+ struct async_icount_24 icount;
+ int io_type;
+ struct async_struct *info;
+@@ -244,8 +244,8 @@ typedef struct serial_info {
+ int line;
+ int x_char; /* xon/xoff character */
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2;
++ unsigned int closing_wait;
++ unsigned int closing_wait2;
+ unsigned long event;
+ unsigned long last_active;
+ int blocked_open; /* # of blocked opens */
+Index: linux-2.6.12/drivers/serial/crisv10.h
+===================================================================
+--- linux-2.6.12.orig/drivers/serial/crisv10.h
++++ linux-2.6.12/drivers/serial/crisv10.h
+@@ -78,8 +78,8 @@ struct e100_serial {
+ int ignore_status_mask;
+ int x_char; /* xon/xoff character */
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2;
++ unsigned int closing_wait;
++ unsigned int closing_wait2;
+ unsigned long event;
+ unsigned long last_active;
+ int line;
+Index: linux-2.6.12/drivers/serial/mcfserial.h
+===================================================================
+--- linux-2.6.12.orig/drivers/serial/mcfserial.h
++++ linux-2.6.12/drivers/serial/mcfserial.h
+@@ -52,8 +52,8 @@ struct mcf_serial {
+ int x_char; /* xon/xoff character */
+ int baud_base;
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2;
++ unsigned int closing_wait;
++ unsigned int closing_wait2;
+ unsigned long event;
+ int line;
+ int count; /* # of fd on device */
+Index: linux-2.6.12/drivers/tc/zs.h
+===================================================================
+--- linux-2.6.12.orig/drivers/tc/zs.h
++++ linux-2.6.12/drivers/tc/zs.h
+@@ -24,11 +24,11 @@ struct serial_struct {
+ int xmit_fifo_size;
+ int custom_divisor;
+ int baud_base;
+- unsigned short close_delay;
++ unsigned int close_delay;
+ char reserved_char[2];
+ int hub6;
+- unsigned short closing_wait; /* time to wait before closing */
+- unsigned short closing_wait2; /* no longer used... */
++ unsigned int closing_wait; /* time to wait before closing */
++ unsigned int closing_wait2; /* no longer used... */
+ int reserved[4];
+ };
+
+@@ -128,8 +128,8 @@ struct dec_serial {
+ int custom_divisor;
+ int x_char; /* XON/XOFF character. */
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2;
++ unsigned int closing_wait;
++ unsigned int closing_wait2;
+ unsigned long event;
+ unsigned long last_active;
+ int line;
+Index: linux-2.6.12/fs/attr.c
+===================================================================
+--- linux-2.6.12.orig/fs/attr.c
++++ linux-2.6.12/fs/attr.c
+@@ -15,6 +15,9 @@
+ #include <linux/quotaops.h>
+ #include <linux/security.h>
+ #include <linux/time.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/vserver/debug.h>
+
+ /* Taken over from the old code... */
+
+@@ -56,6 +59,28 @@ int inode_change_ok(struct inode *inode,
+ if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
+ goto error;
+ }
++
++ /* Check for evil vserver activity */
++ if (vx_check(0, VX_ADMIN))
++ goto fine;
++
++ if (IS_BARRIER(inode)) {
++ vxwprintk(1, "xid=%d messing with the barrier.",
++ vx_current_xid());
++ goto error;
++ }
++ switch (inode->i_sb->s_magic) {
++ case PROC_SUPER_MAGIC:
++ vxwprintk(1, "xid=%d messing with the procfs.",
++ vx_current_xid());
++ goto error;
++ case DEVPTS_SUPER_MAGIC:
++ if (vx_check(inode->i_xid, VX_IDENT))
++ goto fine;
++ vxwprintk(1, "xid=%d messing with the devpts.",
++ vx_current_xid());
++ goto error;
++ }
+ fine:
+ retval = 0;
+ error:
+@@ -64,6 +89,24 @@ error:
+
+ EXPORT_SYMBOL(inode_change_ok);
+
++int inode_setattr_flags(struct inode *inode, unsigned int flags)
++{
++ unsigned int oldflags, newflags;
++
++ oldflags = inode->i_flags;
++ newflags = oldflags & ~(S_IMMUTABLE | S_IUNLINK | S_BARRIER);
++ if (flags & ATTR_FLAG_IMMUTABLE)
++ newflags |= S_IMMUTABLE;
++ if (flags & ATTR_FLAG_IUNLINK)
++ newflags |= S_IUNLINK;
++ if (flags & ATTR_FLAG_BARRIER)
++ newflags |= S_BARRIER;
++
++ if (oldflags ^ newflags)
++ inode->i_flags = newflags;
++ return 0;
++}
++
+ int inode_setattr(struct inode * inode, struct iattr * attr)
+ {
+ unsigned int ia_valid = attr->ia_valid;
+@@ -87,6 +130,8 @@ int inode_setattr(struct inode * inode,
+ inode->i_uid = attr->ia_uid;
+ if (ia_valid & ATTR_GID)
+ inode->i_gid = attr->ia_gid;
++ if ((ia_valid & ATTR_XID) && IS_TAGXID(inode))
++ inode->i_xid = attr->ia_xid;
+ if (ia_valid & ATTR_ATIME)
+ inode->i_atime = timespec_trunc(attr->ia_atime,
+ inode->i_sb->s_time_gran);
+@@ -103,6 +148,8 @@ int inode_setattr(struct inode * inode,
+ mode &= ~S_ISGID;
+ inode->i_mode = mode;
+ }
++ if (ia_valid & ATTR_ATTR_FLAG)
++ inode_setattr_flags(inode, attr->ia_attr_flags);
+ mark_inode_dirty(inode);
+ out:
+ return error;
+@@ -164,7 +211,8 @@ int notify_change(struct dentry * dentry
+ error = security_inode_setattr(dentry, attr);
+ if (!error) {
+ if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
+- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
++ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
++ (ia_valid & ATTR_XID && attr->ia_xid != inode->i_xid))
+ error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
+ if (!error)
+ error = inode_setattr(inode, attr);
+Index: linux-2.6.12/fs/binfmt_aout.c
+===================================================================
+--- linux-2.6.12.orig/fs/binfmt_aout.c
++++ linux-2.6.12/fs/binfmt_aout.c
+@@ -24,6 +24,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/personality.h>
+ #include <linux/init.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+Index: linux-2.6.12/fs/binfmt_elf.c
+===================================================================
+--- linux-2.6.12.orig/fs/binfmt_elf.c
++++ linux-2.6.12/fs/binfmt_elf.c
+@@ -38,6 +38,7 @@
+ #include <linux/security.h>
+ #include <linux/syscalls.h>
+ #include <linux/random.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/param.h>
+Index: linux-2.6.12/fs/binfmt_flat.c
+===================================================================
+--- linux-2.6.12.orig/fs/binfmt_flat.c
++++ linux-2.6.12/fs/binfmt_flat.c
+@@ -36,6 +36,7 @@
+ #include <linux/personality.h>
+ #include <linux/init.h>
+ #include <linux/flat.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/byteorder.h>
+ #include <asm/system.h>
+Index: linux-2.6.12/fs/binfmt_som.c
+===================================================================
+--- linux-2.6.12.orig/fs/binfmt_som.c
++++ linux-2.6.12/fs/binfmt_som.c
+@@ -28,6 +28,7 @@
+ #include <linux/shm.h>
+ #include <linux/personality.h>
+ #include <linux/init.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+Index: linux-2.6.12/fs/devpts/inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/devpts/inode.c
++++ linux-2.6.12/fs/devpts/inode.c
+@@ -20,8 +20,6 @@
+ #include <linux/devpts_fs.h>
+ #include <linux/xattr.h>
+
+-#define DEVPTS_SUPER_MAGIC 0x1cd1
+-
+ extern struct xattr_handler devpts_xattr_security_handler;
+
+ static struct xattr_handler *devpts_xattr_handlers[] = {
+@@ -31,6 +29,15 @@ static struct xattr_handler *devpts_xatt
+ NULL
+ };
+
++static int devpts_permission(struct inode *inode, int mask, struct nameidata *nd)
++{
++ int ret = -EACCES;
++
++ if (vx_check(inode->i_xid, VX_IDENT))
++ ret = generic_permission(inode, mask, NULL);
++ return ret;
++}
++
+ static struct inode_operations devpts_file_inode_operations = {
+ #ifdef CONFIG_DEVPTS_FS_XATTR
+ .setxattr = generic_setxattr,
+@@ -38,6 +45,7 @@ static struct inode_operations devpts_fi
+ .listxattr = generic_listxattr,
+ .removexattr = generic_removexattr,
+ #endif
++ .permission = devpts_permission,
+ };
+
+ static struct vfsmount *devpts_mnt;
+@@ -88,6 +96,24 @@ static int devpts_remount(struct super_b
+ return 0;
+ }
+
++static int devpts_filter(struct dentry *de)
++{
++ return vx_check(de->d_inode->i_xid, VX_IDENT);
++}
++
++static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir)
++{
++ return dcache_readdir_filter(filp, dirent, filldir, devpts_filter);
++}
++
++static struct file_operations devpts_dir_operations = {
++ .open = dcache_dir_open,
++ .release = dcache_dir_close,
++ .llseek = dcache_dir_lseek,
++ .read = generic_read_dir,
++ .readdir = devpts_readdir,
++};
++
+ static struct super_operations devpts_sops = {
+ .statfs = simple_statfs,
+ .remount_fs = devpts_remount,
+@@ -115,8 +141,9 @@ devpts_fill_super(struct super_block *s,
+ inode->i_uid = inode->i_gid = 0;
+ inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
+ inode->i_op = &simple_dir_inode_operations;
+- inode->i_fop = &simple_dir_operations;
++ inode->i_fop = &devpts_dir_operations;
+ inode->i_nlink = 2;
++ inode->i_xid = vx_current_xid();
+
+ devpts_root = s->s_root = d_alloc_root(inode);
+ if (s->s_root)
+@@ -175,6 +202,7 @@ int devpts_pty_new(struct tty_struct *tt
+ inode->i_gid = config.setgid ? config.gid : current->fsgid;
+ inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ init_special_inode(inode, S_IFCHR|config.mode, device);
++ inode->i_xid = vx_current_xid();
+ inode->i_op = &devpts_file_inode_operations;
+ inode->u.generic_ip = tty;
+
+Index: linux-2.6.12/fs/exec.c
+===================================================================
+--- linux-2.6.12.orig/fs/exec.c
++++ linux-2.6.12/fs/exec.c
+@@ -48,6 +48,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/rmap.h>
+ #include <linux/acct.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/mmu_context.h>
+@@ -418,7 +419,8 @@ int setup_arg_pages(struct linux_binprm
+ if (!mpnt)
+ return -ENOMEM;
+
+- if (security_vm_enough_memory(arg_size >> PAGE_SHIFT)) {
++ if (security_vm_enough_memory(arg_size >> PAGE_SHIFT) ||
++ !vx_vmpages_avail(mm, arg_size >> PAGE_SHIFT)) {
+ kmem_cache_free(vm_area_cachep, mpnt);
+ return -ENOMEM;
+ }
+@@ -451,7 +453,8 @@ int setup_arg_pages(struct linux_binprm
+ kmem_cache_free(vm_area_cachep, mpnt);
+ return ret;
+ }
+- mm->stack_vm = mm->total_vm = vma_pages(mpnt);
++ vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
++ mm->stack_vm = mm->total_vm;
+ }
+
+ for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
+Index: linux-2.6.12/fs/ext2/balloc.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext2/balloc.c
++++ linux-2.6.12/fs/ext2/balloc.c
+@@ -16,6 +16,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/sched.h>
+ #include <linux/buffer_head.h>
++#include <linux/vs_dlimit.h>
+
+ /*
+ * balloc.c contains the blocks allocation and deallocation routines
+@@ -108,6 +109,8 @@ static int reserve_blocks(struct super_b
+ free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
+ root_blocks = le32_to_cpu(es->s_r_blocks_count);
+
++ DLIMIT_ADJUST_BLOCK(sb, vx_current_xid(), &free_blocks, &root_blocks);
++
+ if (free_blocks < count)
+ count = free_blocks;
+
+@@ -258,6 +261,7 @@ do_more:
+ }
+ error_return:
+ brelse(bitmap_bh);
++ DLIMIT_FREE_BLOCK(sb, inode->i_xid, freed);
+ release_blocks(sb, freed);
+ DQUOT_FREE_BLOCK(inode, freed);
+ }
+@@ -361,6 +365,10 @@ int ext2_new_block(struct inode *inode,
+ *err = -ENOSPC;
+ goto out_dquot;
+ }
++ if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, es_alloc)) {
++ *err = -ENOSPC;
++ goto out_dlimit;
++ }
+
+ ext2_debug ("goal=%lu.\n", goal);
+
+@@ -508,6 +516,8 @@ got_block:
+ *err = 0;
+ out_release:
+ group_release_blocks(sb, group_no, desc, gdp_bh, group_alloc);
++ DLIMIT_FREE_BLOCK(sb, inode->i_xid, es_alloc);
++out_dlimit:
+ release_blocks(sb, es_alloc);
+ out_dquot:
+ DQUOT_FREE_BLOCK(inode, dq_alloc);
+Index: linux-2.6.12/fs/ext2/ialloc.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext2/ialloc.c
++++ linux-2.6.12/fs/ext2/ialloc.c
+@@ -18,6 +18,8 @@
+ #include <linux/backing-dev.h>
+ #include <linux/buffer_head.h>
+ #include <linux/random.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vserver/xid.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -124,6 +126,7 @@ void ext2_free_inode (struct inode * ino
+ if (!is_bad_inode(inode)) {
+ /* Quota is already initialized in iput() */
+ ext2_xattr_delete_inode(inode);
++ DLIMIT_FREE_INODE(sb, inode->i_xid);
+ DQUOT_FREE_INODE(inode);
+ DQUOT_DROP(inode);
+ }
+@@ -465,6 +468,11 @@ struct inode *ext2_new_inode(struct inod
+ if (!inode)
+ return ERR_PTR(-ENOMEM);
+
++ inode->i_xid = vx_current_fsxid(sb);
++ if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
++ err = -ENOSPC;
++ goto fail_dlim;
++ }
+ ei = EXT2_I(inode);
+ sbi = EXT2_SB(sb);
+ es = sbi->s_es;
+@@ -579,7 +587,8 @@ got:
+ inode->i_blocks = 0;
+ inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
+ memset(ei->i_data, 0, sizeof(ei->i_data));
+- ei->i_flags = EXT2_I(dir)->i_flags & ~EXT2_BTREE_FL;
++ ei->i_flags = EXT2_I(dir)->i_flags &
++ ~(EXT2_BTREE_FL|EXT2_IUNLINK_FL|EXT2_BARRIER_FL);
+ if (S_ISLNK(mode))
+ ei->i_flags &= ~(EXT2_IMMUTABLE_FL|EXT2_APPEND_FL);
+ /* dirsync is only applied to directories */
+@@ -620,12 +629,15 @@ got:
+ return inode;
+
+ fail2:
++ DLIMIT_FREE_INODE(sb, inode->i_xid);
+ inode->i_flags |= S_NOQUOTA;
+ inode->i_nlink = 0;
+ iput(inode);
+ return ERR_PTR(err);
+
+ fail:
++ DLIMIT_FREE_INODE(sb, inode->i_xid);
++fail_dlim:
+ make_bad_inode(inode);
+ iput(inode);
+ return ERR_PTR(err);
+Index: linux-2.6.12/fs/ext2/inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext2/inode.c
++++ linux-2.6.12/fs/ext2/inode.c
+@@ -31,6 +31,7 @@
+ #include <linux/writeback.h>
+ #include <linux/buffer_head.h>
+ #include <linux/mpage.h>
++#include <linux/vserver/xid.h>
+ #include "ext2.h"
+ #include "acl.h"
+
+@@ -65,6 +66,8 @@ void ext2_put_inode(struct inode *inode)
+ ext2_discard_prealloc(inode);
+ }
+
++static void ext2_truncate_nocheck (struct inode * inode);
++
+ /*
+ * Called at the last iput() if i_nlink is zero.
+ */
+@@ -78,7 +81,7 @@ void ext2_delete_inode (struct inode * i
+
+ inode->i_size = 0;
+ if (inode->i_blocks)
+- ext2_truncate (inode);
++ ext2_truncate_nocheck(inode);
+ ext2_free_inode (inode);
+
+ return;
+@@ -884,7 +887,7 @@ static void ext2_free_branches(struct in
+ ext2_free_data(inode, p, q);
+ }
+
+-void ext2_truncate (struct inode * inode)
++static void ext2_truncate_nocheck(struct inode * inode)
+ {
+ __le32 *i_data = EXT2_I(inode)->i_data;
+ int addr_per_block = EXT2_ADDR_PER_BLOCK(inode->i_sb);
+@@ -901,8 +904,6 @@ void ext2_truncate (struct inode * inode
+ return;
+ if (ext2_inode_is_fast_symlink(inode))
+ return;
+- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
+- return;
+
+ ext2_discard_prealloc(inode);
+
+@@ -1024,17 +1025,28 @@ Egdp:
+ return ERR_PTR(-EIO);
+ }
+
++void ext2_truncate (struct inode * inode)
++{
++ if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++ return;
++ ext2_truncate_nocheck(inode);
++}
++
+ void ext2_set_inode_flags(struct inode *inode)
+ {
+ unsigned int flags = EXT2_I(inode)->i_flags;
+
+- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++ inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_IUNLINK|S_BARRIER|S_NOATIME|S_DIRSYNC);
+ if (flags & EXT2_SYNC_FL)
+ inode->i_flags |= S_SYNC;
+ if (flags & EXT2_APPEND_FL)
+ inode->i_flags |= S_APPEND;
+ if (flags & EXT2_IMMUTABLE_FL)
+ inode->i_flags |= S_IMMUTABLE;
++ if (flags & EXT2_IUNLINK_FL)
++ inode->i_flags |= S_IUNLINK;
++ if (flags & EXT2_BARRIER_FL)
++ inode->i_flags |= S_BARRIER;
+ if (flags & EXT2_NOATIME_FL)
+ inode->i_flags |= S_NOATIME;
+ if (flags & EXT2_DIRSYNC_FL)
+@@ -1047,6 +1059,8 @@ void ext2_read_inode (struct inode * ino
+ ino_t ino = inode->i_ino;
+ struct buffer_head * bh;
+ struct ext2_inode * raw_inode = ext2_get_inode(inode->i_sb, ino, &bh);
++ uid_t uid;
++ gid_t gid;
+ int n;
+
+ #ifdef CONFIG_EXT2_FS_POSIX_ACL
+@@ -1057,12 +1071,17 @@ void ext2_read_inode (struct inode * ino
+ goto bad_inode;
+
+ inode->i_mode = le16_to_cpu(raw_inode->i_mode);
+- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
+- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
++ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
++ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
+ if (!(test_opt (inode->i_sb, NO_UID32))) {
+- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
++ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
++ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ }
++ inode->i_uid = INOXID_UID(XID_TAG(inode), uid, gid);
++ inode->i_gid = INOXID_GID(XID_TAG(inode), uid, gid);
++ inode->i_xid = INOXID_XID(XID_TAG(inode), uid, gid,
++ le16_to_cpu(raw_inode->i_raw_xid));
++
+ inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
+ inode->i_size = le32_to_cpu(raw_inode->i_size);
+ inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
+@@ -1155,8 +1174,8 @@ static int ext2_update_inode(struct inod
+ struct ext2_inode_info *ei = EXT2_I(inode);
+ struct super_block *sb = inode->i_sb;
+ ino_t ino = inode->i_ino;
+- uid_t uid = inode->i_uid;
+- gid_t gid = inode->i_gid;
++ uid_t uid = XIDINO_UID(XID_TAG(inode), inode->i_uid, inode->i_xid);
++ gid_t gid = XIDINO_GID(XID_TAG(inode), inode->i_gid, inode->i_xid);
+ struct buffer_head * bh;
+ struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
+ int n;
+@@ -1191,6 +1210,9 @@ static int ext2_update_inode(struct inod
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
+ }
++#ifdef CONFIG_INOXID_INTERN
++ raw_inode->i_raw_xid = cpu_to_le16(inode->i_xid);
++#endif
+ raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ raw_inode->i_size = cpu_to_le32(inode->i_size);
+ raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
+@@ -1268,6 +1290,27 @@ int ext2_sync_inode(struct inode *inode)
+ return sync_inode(inode, &wbc);
+ }
+
++int ext2_setattr_flags(struct inode *inode, unsigned int flags)
++{
++ unsigned int oldflags, newflags;
++
++ oldflags = EXT2_I(inode)->i_flags;
++ newflags = oldflags &
++ ~(EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL | EXT2_BARRIER_FL);
++ if (flags & ATTR_FLAG_IMMUTABLE)
++ newflags |= EXT2_IMMUTABLE_FL;
++ if (flags & ATTR_FLAG_IUNLINK)
++ newflags |= EXT2_IUNLINK_FL;
++ if (flags & ATTR_FLAG_BARRIER)
++ newflags |= EXT2_BARRIER_FL;
++
++ if (oldflags ^ newflags) {
++ EXT2_I(inode)->i_flags = newflags;
++ inode->i_ctime = CURRENT_TIME;
++ }
++ return 0;
++}
++
+ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
+ {
+ struct inode *inode = dentry->d_inode;
+@@ -1277,11 +1320,15 @@ int ext2_setattr(struct dentry *dentry,
+ if (error)
+ return error;
+ if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
+- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
++ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
++ (iattr->ia_valid & ATTR_XID && iattr->ia_xid != inode->i_xid)) {
+ error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
+ if (error)
+ return error;
+ }
++ if (iattr->ia_valid & ATTR_ATTR_FLAG)
++ ext2_setattr_flags(inode, iattr->ia_attr_flags);
++
+ error = inode_setattr(inode, iattr);
+ if (!error && (iattr->ia_valid & ATTR_MODE))
+ error = ext2_acl_chmod(inode);
+Index: linux-2.6.12/fs/ext2/ioctl.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext2/ioctl.c
++++ linux-2.6.12/fs/ext2/ioctl.c
+@@ -49,7 +49,9 @@ int ext2_ioctl (struct inode * inode, st
+ *
+ * This test looks nicer. Thanks to Pauline Middelink
+ */
+- if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
++ if ((oldflags & EXT2_IMMUTABLE_FL) ||
++ ((flags ^ oldflags) & (EXT2_APPEND_FL |
++ EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL))) {
+ if (!capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
+ }
+Index: linux-2.6.12/fs/ext2/namei.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext2/namei.c
++++ linux-2.6.12/fs/ext2/namei.c
+@@ -31,6 +31,7 @@
+ */
+
+ #include <linux/pagemap.h>
++#include <linux/vserver/xid.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -81,6 +82,7 @@ static struct dentry *ext2_lookup(struct
+ inode = iget(dir->i_sb, ino);
+ if (!inode)
+ return ERR_PTR(-EACCES);
++ vx_propagate_xid(nd, inode);
+ }
+ if (inode)
+ return d_splice_alias(inode, dentry);
+Index: linux-2.6.12/fs/ext2/super.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext2/super.c
++++ linux-2.6.12/fs/ext2/super.c
+@@ -257,7 +257,7 @@ enum {
+ Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
+ Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,
+ Opt_nouid32, Opt_check, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh,
+- Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,
++ Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl, Opt_tagxid,
+ Opt_ignore, Opt_err,
+ };
+
+@@ -286,6 +286,7 @@ static match_table_t tokens = {
+ {Opt_nouser_xattr, "nouser_xattr"},
+ {Opt_acl, "acl"},
+ {Opt_noacl, "noacl"},
++ {Opt_tagxid, "tagxid"},
+ {Opt_ignore, "grpquota"},
+ {Opt_ignore, "noquota"},
+ {Opt_ignore, "quota"},
+@@ -349,6 +350,11 @@ static int parse_options (char * options
+ case Opt_nouid32:
+ set_opt (sbi->s_mount_opt, NO_UID32);
+ break;
++#ifndef CONFIG_INOXID_NONE
++ case Opt_tagxid:
++ set_opt (sbi->s_mount_opt, TAGXID);
++ break;
++#endif
+ case Opt_check:
+ #ifdef CONFIG_EXT2_CHECK
+ set_opt (sbi->s_mount_opt, CHECK);
+@@ -636,6 +642,8 @@ static int ext2_fill_super(struct super_
+ if (!parse_options ((char *) data, sbi))
+ goto failed_mount;
+
++ if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGXID)
++ sb->s_flags |= MS_TAGXID;
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
+ MS_POSIXACL : 0);
+@@ -923,6 +931,13 @@ static int ext2_remount (struct super_bl
+ if (!parse_options (data, sbi))
+ return -EINVAL;
+
++ if ((sbi->s_mount_opt & EXT2_MOUNT_TAGXID) &&
++ !(sb->s_flags & MS_TAGXID)) {
++ printk("EXT2-fs: %s: tagxid not permitted on remount.\n",
++ sb->s_id);
++ return -EINVAL;
++ }
++
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+
+Index: linux-2.6.12/fs/ext2/xattr.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext2/xattr.c
++++ linux-2.6.12/fs/ext2/xattr.c
+@@ -60,6 +60,7 @@
+ #include <linux/mbcache.h>
+ #include <linux/quotaops.h>
+ #include <linux/rwsem.h>
++#include <linux/vs_dlimit.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -649,8 +650,12 @@ ext2_xattr_set2(struct inode *inode, str
+ the inode. */
+ ea_bdebug(new_bh, "reusing block");
+
++ error = -ENOSPC;
++ if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1))
++ goto cleanup;
+ error = -EDQUOT;
+ if (DQUOT_ALLOC_BLOCK(inode, 1)) {
++ DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1);
+ unlock_buffer(new_bh);
+ goto cleanup;
+ }
+@@ -744,6 +749,7 @@ ext2_xattr_set2(struct inode *inode, str
+ le32_to_cpu(HDR(old_bh)->h_refcount) - 1);
+ if (ce)
+ mb_cache_entry_release(ce);
++ DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1);
+ DQUOT_FREE_BLOCK(inode, 1);
+ mark_buffer_dirty(old_bh);
+ ea_bdebug(old_bh, "refcount now=%d",
+@@ -804,6 +810,7 @@ ext2_xattr_delete_inode(struct inode *in
+ mark_buffer_dirty(bh);
+ if (IS_SYNC(inode))
+ sync_dirty_buffer(bh);
++ DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1);
+ DQUOT_FREE_BLOCK(inode, 1);
+ }
+ ea_bdebug(bh, "refcount now=%d", le32_to_cpu(HDR(bh)->h_refcount) - 1);
+Index: linux-2.6.12/fs/ext3/balloc.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext3/balloc.c
++++ linux-2.6.12/fs/ext3/balloc.c
+@@ -19,6 +19,7 @@
+ #include <linux/ext3_jbd.h>
+ #include <linux/quotaops.h>
+ #include <linux/buffer_head.h>
++#include <linux/vs_dlimit.h>
+
+ /*
+ * balloc.c contains the blocks allocation and deallocation routines
+@@ -503,8 +504,10 @@ void ext3_free_blocks(handle_t *handle,
+ return;
+ }
+ ext3_free_blocks_sb(handle, sb, block, count, &dquot_freed_blocks);
+- if (dquot_freed_blocks)
++ if (dquot_freed_blocks) {
++ DLIMIT_FREE_BLOCK(sb, inode->i_xid, dquot_freed_blocks);
+ DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
++ }
+ return;
+ }
+
+@@ -1124,18 +1127,32 @@ out:
+ return ret;
+ }
+
+-static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
++static int ext3_has_free_blocks(struct super_block *sb)
+ {
+- int free_blocks, root_blocks;
++ struct ext3_sb_info *sbi = EXT3_SB(sb);
++ int free_blocks, root_blocks, cond;
+
+ free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
+ root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
+- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
++
++ vxdprintk(VXD_CBIT(dlim, 3),
++ "ext3_has_free_blocks(%p): free=%u, root=%u",
++ sb, free_blocks, root_blocks);
++
++ DLIMIT_ADJUST_BLOCK(sb, vx_current_xid(), &free_blocks, &root_blocks);
++
++ cond = (free_blocks < root_blocks + 1 &&
++ !capable(CAP_SYS_RESOURCE) &&
+ sbi->s_resuid != current->fsuid &&
+- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
+- return 0;
+- }
+- return 1;
++ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)));
++
++ vxdprintk(VXD_CBIT(dlim, 3),
++ "ext3_has_free_blocks(%p): %u<%u+1, %c, %u!=%u r=%d",
++ sb, free_blocks, root_blocks,
++ !capable(CAP_SYS_RESOURCE)?'1':'0',
++ sbi->s_resuid, current->fsuid, cond?0:1);
++
++ return (cond ? 0 : 1);
+ }
+
+ /*
+@@ -1146,7 +1163,7 @@ static int ext3_has_free_blocks(struct e
+ */
+ int ext3_should_retry_alloc(struct super_block *sb, int *retries)
+ {
+- if (!ext3_has_free_blocks(EXT3_SB(sb)) || (*retries)++ > 3)
++ if (!ext3_has_free_blocks(sb) || (*retries)++ > 3)
+ return 0;
+
+ jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
+@@ -1201,6 +1218,8 @@ int ext3_new_block(handle_t *handle, str
+ *errp = -EDQUOT;
+ return 0;
+ }
++ if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1))
++ goto out_dlimit;
+
+ sbi = EXT3_SB(sb);
+ es = EXT3_SB(sb)->s_es;
+@@ -1217,7 +1236,7 @@ int ext3_new_block(handle_t *handle, str
+ if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))
+ my_rsv = &block_i->rsv_window_node;
+
+- if (!ext3_has_free_blocks(sbi)) {
++ if (!ext3_has_free_blocks(sb)) {
+ *errp = -ENOSPC;
+ goto out;
+ }
+@@ -1401,6 +1420,9 @@ allocated:
+ io_error:
+ *errp = -EIO;
+ out:
++ if (!performed_allocation)
++ DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1);
++out_dlimit:
+ if (fatal) {
+ *errp = fatal;
+ ext3_std_error(sb, fatal);
+Index: linux-2.6.12/fs/ext3/ialloc.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext3/ialloc.c
++++ linux-2.6.12/fs/ext3/ialloc.c
+@@ -23,6 +23,8 @@
+ #include <linux/buffer_head.h>
+ #include <linux/random.h>
+ #include <linux/bitops.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vserver/xid.h>
+
+ #include <asm/byteorder.h>
+
+@@ -125,6 +127,7 @@ void ext3_free_inode (handle_t *handle,
+ */
+ DQUOT_INIT(inode);
+ ext3_xattr_delete_inode(handle, inode);
++ DLIMIT_FREE_INODE(sb, inode->i_xid);
+ DQUOT_FREE_INODE(inode);
+ DQUOT_DROP(inode);
+
+@@ -443,6 +446,12 @@ struct inode *ext3_new_inode(handle_t *h
+ inode = new_inode(sb);
+ if (!inode)
+ return ERR_PTR(-ENOMEM);
++
++ inode->i_xid = vx_current_fsxid(sb);
++ if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
++ err = -ENOSPC;
++ goto out;
++ }
+ ei = EXT3_I(inode);
+
+ sbi = EXT3_SB(sb);
+@@ -565,7 +574,8 @@ got:
+ ei->i_dir_start_lookup = 0;
+ ei->i_disksize = 0;
+
+- ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
++ ei->i_flags = EXT3_I(dir)->i_flags &
++ ~(EXT3_INDEX_FL|EXT3_IUNLINK_FL|EXT3_BARRIER_FL);
+ if (S_ISLNK(mode))
+ ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+ /* dirsync only applies to directories */
+@@ -616,6 +626,7 @@ got:
+ ext3_debug("allocating inode %lu\n", inode->i_ino);
+ goto really_out;
+ fail:
++ DLIMIT_FREE_INODE(sb, inode->i_xid);
+ ext3_std_error(sb, err);
+ out:
+ iput(inode);
+@@ -625,6 +636,7 @@ really_out:
+ return ret;
+
+ fail2:
++ DLIMIT_FREE_INODE(sb, inode->i_xid);
+ inode->i_flags |= S_NOQUOTA;
+ inode->i_nlink = 0;
+ iput(inode);
+Index: linux-2.6.12/fs/ext3/inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext3/inode.c
++++ linux-2.6.12/fs/ext3/inode.c
+@@ -36,6 +36,7 @@
+ #include <linux/writeback.h>
+ #include <linux/mpage.h>
+ #include <linux/uio.h>
++#include <linux/vserver/xid.h>
+ #include "xattr.h"
+ #include "acl.h"
+
+@@ -180,6 +181,8 @@ static int ext3_journal_test_restart(han
+ return ext3_journal_restart(handle, blocks_for_truncate(inode));
+ }
+
++static void ext3_truncate_nocheck (struct inode *inode);
++
+ /*
+ * Called at the last iput() if i_nlink is zero.
+ */
+@@ -203,7 +206,7 @@ void ext3_delete_inode (struct inode * i
+ handle->h_sync = 1;
+ inode->i_size = 0;
+ if (inode->i_blocks)
+- ext3_truncate(inode);
++ ext3_truncate_nocheck(inode);
+ /*
+ * Kill off the orphan record which ext3_truncate created.
+ * AKPM: I think this can be inside the above `if'.
+@@ -2065,7 +2068,7 @@ static void ext3_free_branches(handle_t
+ * ext3_truncate() run will find them and release them.
+ */
+
+-void ext3_truncate(struct inode * inode)
++void ext3_truncate_nocheck(struct inode * inode)
+ {
+ handle_t *handle;
+ struct ext3_inode_info *ei = EXT3_I(inode);
+@@ -2086,8 +2089,6 @@ void ext3_truncate(struct inode * inode)
+ return;
+ if (ext3_inode_is_fast_symlink(inode))
+ return;
+- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
+- return;
+
+ /*
+ * We have to lock the EOF page here, because lock_page() nests
+@@ -2406,17 +2407,28 @@ int ext3_get_inode_loc(struct inode *ino
+ !(EXT3_I(inode)->i_state & EXT3_STATE_XATTR));
+ }
+
++void ext3_truncate(struct inode * inode)
++{
++ if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++ return;
++ ext3_truncate_nocheck(inode);
++}
++
+ void ext3_set_inode_flags(struct inode *inode)
+ {
+ unsigned int flags = EXT3_I(inode)->i_flags;
+
+- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++ inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_IUNLINK|S_BARRIER|S_NOATIME|S_DIRSYNC);
+ if (flags & EXT3_SYNC_FL)
+ inode->i_flags |= S_SYNC;
+ if (flags & EXT3_APPEND_FL)
+ inode->i_flags |= S_APPEND;
+ if (flags & EXT3_IMMUTABLE_FL)
+ inode->i_flags |= S_IMMUTABLE;
++ if (flags & EXT3_IUNLINK_FL)
++ inode->i_flags |= S_IUNLINK;
++ if (flags & EXT3_BARRIER_FL)
++ inode->i_flags |= S_BARRIER;
+ if (flags & EXT3_NOATIME_FL)
+ inode->i_flags |= S_NOATIME;
+ if (flags & EXT3_DIRSYNC_FL)
+@@ -2430,6 +2442,8 @@ void ext3_read_inode(struct inode * inod
+ struct ext3_inode_info *ei = EXT3_I(inode);
+ struct buffer_head *bh;
+ int block;
++ uid_t uid;
++ gid_t gid;
+
+ #ifdef CONFIG_EXT3_FS_POSIX_ACL
+ ei->i_acl = EXT3_ACL_NOT_CACHED;
+@@ -2442,12 +2456,17 @@ void ext3_read_inode(struct inode * inod
+ bh = iloc.bh;
+ raw_inode = ext3_raw_inode(&iloc);
+ inode->i_mode = le16_to_cpu(raw_inode->i_mode);
+- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
+- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
++ uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
++ gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
+ if(!(test_opt (inode->i_sb, NO_UID32))) {
+- inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+- inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
++ uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
++ gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ }
++ inode->i_uid = INOXID_UID(XID_TAG(inode), uid, gid);
++ inode->i_gid = INOXID_GID(XID_TAG(inode), uid, gid);
++ inode->i_xid = INOXID_XID(XID_TAG(inode), uid, gid,
++ le16_to_cpu(raw_inode->i_raw_xid));
++
+ inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
+ inode->i_size = le32_to_cpu(raw_inode->i_size);
+ inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
+@@ -2574,6 +2593,8 @@ static int ext3_do_update_inode(handle_t
+ struct ext3_inode *raw_inode = ext3_raw_inode(iloc);
+ struct ext3_inode_info *ei = EXT3_I(inode);
+ struct buffer_head *bh = iloc->bh;
++ uid_t uid = XIDINO_UID(XID_TAG(inode), inode->i_uid, inode->i_xid);
++ gid_t gid = XIDINO_GID(XID_TAG(inode), inode->i_gid, inode->i_xid);
+ int err = 0, rc, block;
+
+ /* For fields not not tracking in the in-memory inode,
+@@ -2583,29 +2604,32 @@ static int ext3_do_update_inode(handle_t
+
+ raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+ if(!(test_opt(inode->i_sb, NO_UID32))) {
+- raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
+- raw_inode->i_gid_low = cpu_to_le16(low_16_bits(inode->i_gid));
++ raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid));
++ raw_inode->i_gid_low = cpu_to_le16(low_16_bits(gid));
+ /*
+ * Fix up interoperability with old kernels. Otherwise, old inodes get
+ * re-used with the upper 16 bits of the uid/gid intact
+ */
+ if(!ei->i_dtime) {
+ raw_inode->i_uid_high =
+- cpu_to_le16(high_16_bits(inode->i_uid));
++ cpu_to_le16(high_16_bits(uid));
+ raw_inode->i_gid_high =
+- cpu_to_le16(high_16_bits(inode->i_gid));
++ cpu_to_le16(high_16_bits(gid));
+ } else {
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
+ }
+ } else {
+ raw_inode->i_uid_low =
+- cpu_to_le16(fs_high2lowuid(inode->i_uid));
++ cpu_to_le16(fs_high2lowuid(uid));
+ raw_inode->i_gid_low =
+- cpu_to_le16(fs_high2lowgid(inode->i_gid));
++ cpu_to_le16(fs_high2lowgid(gid));
+ raw_inode->i_uid_high = 0;
+ raw_inode->i_gid_high = 0;
+ }
++#ifdef CONFIG_INOXID_INTERN
++ raw_inode->i_raw_xid = cpu_to_le16(inode->i_xid);
++#endif
+ raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ raw_inode->i_size = cpu_to_le32(ei->i_disksize);
+ raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
+@@ -2730,6 +2754,44 @@ int ext3_write_inode(struct inode *inode
+ return ext3_force_commit(inode->i_sb);
+ }
+
++int ext3_setattr_flags(struct inode *inode, unsigned int flags)
++{
++ unsigned int oldflags, newflags;
++ int err = 0;
++
++ oldflags = EXT3_I(inode)->i_flags;
++ newflags = oldflags &
++ ~(EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL | EXT3_BARRIER_FL);
++ if (flags & ATTR_FLAG_IMMUTABLE)
++ newflags |= EXT3_IMMUTABLE_FL;
++ if (flags & ATTR_FLAG_IUNLINK)
++ newflags |= EXT3_IUNLINK_FL;
++ if (flags & ATTR_FLAG_BARRIER)
++ newflags |= EXT3_BARRIER_FL;
++
++ if (oldflags ^ newflags) {
++ handle_t *handle;
++ struct ext3_iloc iloc;
++
++ handle = ext3_journal_start(inode, 1);
++ if (IS_ERR(handle))
++ return PTR_ERR(handle);
++ if (IS_SYNC(inode))
++ handle->h_sync = 1;
++ err = ext3_reserve_inode_write(handle, inode, &iloc);
++ if (err)
++ goto flags_err;
++
++ EXT3_I(inode)->i_flags = newflags;
++ inode->i_ctime = CURRENT_TIME;
++
++ err = ext3_mark_iloc_dirty(handle, inode, &iloc);
++ flags_err:
++ ext3_journal_stop(handle);
++ }
++ return err;
++}
++
+ /*
+ * ext3_setattr()
+ *
+@@ -2758,7 +2820,8 @@ int ext3_setattr(struct dentry *dentry,
+ return error;
+
+ if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
+- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
++ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
++ (ia_valid & ATTR_XID && attr->ia_xid != inode->i_xid)) {
+ handle_t *handle;
+
+ /* (user+group)*(old+new) structure, inode write (sb,
+@@ -2779,6 +2842,8 @@ int ext3_setattr(struct dentry *dentry,
+ inode->i_uid = attr->ia_uid;
+ if (attr->ia_valid & ATTR_GID)
+ inode->i_gid = attr->ia_gid;
++ if ((attr->ia_valid & ATTR_XID) && IS_TAGXID(inode))
++ inode->i_xid = attr->ia_xid;
+ error = ext3_mark_inode_dirty(handle, inode);
+ ext3_journal_stop(handle);
+ }
+@@ -2801,6 +2866,12 @@ int ext3_setattr(struct dentry *dentry,
+ ext3_journal_stop(handle);
+ }
+
++ if (ia_valid & ATTR_ATTR_FLAG) {
++ rc = ext3_setattr_flags(inode, attr->ia_attr_flags);
++ if (!error)
++ error = rc;
++ }
++
+ rc = inode_setattr(inode, attr);
+
+ /* If inode_setattr's call to ext3_truncate failed to get a
+Index: linux-2.6.12/fs/ext3/ioctl.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext3/ioctl.c
++++ linux-2.6.12/fs/ext3/ioctl.c
+@@ -12,6 +12,7 @@
+ #include <linux/ext3_fs.h>
+ #include <linux/ext3_jbd.h>
+ #include <linux/time.h>
++#include <linux/vserver/xid.h>
+ #include <asm/uaccess.h>
+
+
+@@ -58,7 +59,9 @@ int ext3_ioctl (struct inode * inode, st
+ *
+ * This test looks nicer. Thanks to Pauline Middelink
+ */
+- if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) {
++ if ((oldflags & EXT3_IMMUTABLE_FL) ||
++ ((flags ^ oldflags) & (EXT3_APPEND_FL |
++ EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL))) {
+ if (!capable(CAP_LINUX_IMMUTABLE))
+ return -EPERM;
+ }
+@@ -236,6 +239,38 @@ flags_err:
+ return err;
+ }
+
++#if defined(CONFIG_VSERVER_LEGACY) && !defined(CONFIG_INOXID_NONE)
++ case EXT3_IOC_SETXID: {
++ handle_t *handle;
++ struct ext3_iloc iloc;
++ int xid;
++ int err;
++
++ /* fixme: if stealth, return -ENOTTY */
++ if (!capable(CAP_CONTEXT))
++ return -EPERM;
++ if (IS_RDONLY(inode))
++ return -EROFS;
++ if (!(inode->i_sb->s_flags & MS_TAGXID))
++ return -ENOSYS;
++ if (get_user(xid, (int *) arg))
++ return -EFAULT;
++
++ handle = ext3_journal_start(inode, 1);
++ if (IS_ERR(handle))
++ return PTR_ERR(handle);
++ err = ext3_reserve_inode_write(handle, inode, &iloc);
++ if (err)
++ return err;
++
++ inode->i_xid = (xid & 0xFFFF);
++ inode->i_ctime = CURRENT_TIME;
++
++ err = ext3_mark_iloc_dirty(handle, inode, &iloc);
++ ext3_journal_stop(handle);
++ return err;
++ }
++#endif
+
+ default:
+ return -ENOTTY;
+Index: linux-2.6.12/fs/ext3/namei.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext3/namei.c
++++ linux-2.6.12/fs/ext3/namei.c
+@@ -36,6 +36,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/buffer_head.h>
+ #include <linux/smp_lock.h>
++#include <linux/vserver/xid.h>
+ #include "xattr.h"
+ #include "acl.h"
+
+@@ -994,6 +995,7 @@ static struct dentry *ext3_lookup(struct
+
+ if (!inode)
+ return ERR_PTR(-EACCES);
++ vx_propagate_xid(nd, inode);
+ }
+ if (inode)
+ return d_splice_alias(inode, dentry);
+Index: linux-2.6.12/fs/ext3/super.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext3/super.c
++++ linux-2.6.12/fs/ext3/super.c
+@@ -590,7 +590,7 @@ enum {
+ Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
+ Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
+ Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0,
+- Opt_ignore, Opt_barrier, Opt_err, Opt_resize,
++ Opt_tagxid, Opt_barrier, Opt_ignore, Opt_err, Opt_resize,
+ };
+
+ static match_table_t tokens = {
+@@ -634,6 +634,7 @@ static match_table_t tokens = {
+ {Opt_grpjquota, "grpjquota=%s"},
+ {Opt_jqfmt_vfsold, "jqfmt=vfsold"},
+ {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"},
++ {Opt_tagxid, "tagxid"},
+ {Opt_ignore, "grpquota"},
+ {Opt_ignore, "noquota"},
+ {Opt_ignore, "quota"},
+@@ -730,6 +731,11 @@ static int parse_options (char * options
+ case Opt_nouid32:
+ set_opt (sbi->s_mount_opt, NO_UID32);
+ break;
++#ifndef CONFIG_INOXID_NONE
++ case Opt_tagxid:
++ set_opt (sbi->s_mount_opt, TAGXID);
++ break;
++#endif
+ case Opt_check:
+ #ifdef CONFIG_EXT3_CHECK
+ set_opt (sbi->s_mount_opt, CHECK);
+@@ -1333,6 +1339,9 @@ static int ext3_fill_super (struct super
+ if (!parse_options ((char *) data, sb, &journal_inum, NULL, 0))
+ goto failed_mount;
+
++ if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGXID)
++ sb->s_flags |= MS_TAGXID;
++
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+
+@@ -2104,6 +2113,12 @@ static int ext3_remount (struct super_bl
+
+ if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
+ ext3_abort(sb, __FUNCTION__, "Abort forced by user");
++ if ((sbi->s_mount_opt & EXT3_MOUNT_TAGXID) &&
++ !(sb->s_flags & MS_TAGXID)) {
++ printk("EXT3-fs: %s: tagxid not permitted on remount.\n",
++ sb->s_id);
++ return -EINVAL;
++ }
+
+ sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ ((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+Index: linux-2.6.12/fs/ext3/xattr.c
+===================================================================
+--- linux-2.6.12.orig/fs/ext3/xattr.c
++++ linux-2.6.12/fs/ext3/xattr.c
+@@ -58,6 +58,7 @@
+ #include <linux/mbcache.h>
+ #include <linux/quotaops.h>
+ #include <linux/rwsem.h>
++#include <linux/vs_dlimit.h>
+ #include "xattr.h"
+ #include "acl.h"
+
+@@ -495,6 +496,7 @@ ext3_xattr_release_block(handle_t *handl
+ ext3_journal_dirty_metadata(handle, bh);
+ if (IS_SYNC(inode))
+ handle->h_sync = 1;
++ DLIMIT_FREE_BLOCK(inode->i_sb, inode->i_xid, 1);
+ DQUOT_FREE_BLOCK(inode, 1);
+ unlock_buffer(bh);
+ ea_bdebug(bh, "refcount now=%d; releasing",
+@@ -763,11 +765,14 @@ inserted:
+ if (new_bh == bs->bh)
+ ea_bdebug(new_bh, "keeping");
+ else {
++ error = -ENOSPC;
++ if (DLIMIT_ALLOC_BLOCK(sb, inode->i_xid, 1))
++ goto cleanup;
+ /* The old block is released after updating
+ the inode. */
+ error = -EDQUOT;
+ if (DQUOT_ALLOC_BLOCK(inode, 1))
+- goto cleanup;
++ goto cleanup_dlimit;
+ error = ext3_journal_get_write_access(handle,
+ new_bh);
+ if (error)
+@@ -843,6 +848,8 @@ cleanup:
+
+ cleanup_dquot:
+ DQUOT_FREE_BLOCK(inode, 1);
++cleanup_dlimit:
++ DLIMIT_FREE_BLOCK(sb, inode->i_xid, 1);
+ goto cleanup;
+
+ bad_block:
+Index: linux-2.6.12/fs/fcntl.c
+===================================================================
+--- linux-2.6.12.orig/fs/fcntl.c
++++ linux-2.6.12/fs/fcntl.c
+@@ -16,6 +16,7 @@
+ #include <linux/security.h>
+ #include <linux/ptrace.h>
+ #include <linux/signal.h>
++#include <linux/vs_limit.h>
+
+ #include <asm/poll.h>
+ #include <asm/siginfo.h>
+@@ -77,6 +78,8 @@ repeat:
+ error = -EMFILE;
+ if (newfd >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
+ goto out;
++ if (!vx_files_avail(1))
++ goto out;
+
+ error = expand_files(files, newfd);
+ if (error < 0)
+@@ -109,6 +112,7 @@ static int dupfd(struct file *file, unsi
+ FD_SET(fd, files->open_fds);
+ FD_CLR(fd, files->close_on_exec);
+ spin_unlock(&files->file_lock);
++ vx_openfd_inc(fd);
+ fd_install(fd, file);
+ } else {
+ spin_unlock(&files->file_lock);
+@@ -159,6 +163,9 @@ asmlinkage long sys_dup2(unsigned int ol
+
+ if (tofree)
+ filp_close(tofree, files);
++ else
++ vx_openfd_inc(newfd); /* fd was unused */
++
+ err = newfd;
+ out:
+ return err;
+@@ -458,7 +465,7 @@ void send_sigio(struct fown_struct *fown
+
+ read_lock(&tasklist_lock);
+ if (pid > 0) {
+- p = find_task_by_pid(pid);
++ p = find_task_by_real_pid(pid);
+ if (p) {
+ send_sigio_to_task(p, fown, fd, band);
+ }
+@@ -493,7 +500,7 @@ int send_sigurg(struct fown_struct *fown
+
+ read_lock(&tasklist_lock);
+ if (pid > 0) {
+- p = find_task_by_pid(pid);
++ p = find_task_by_real_pid(pid);
+ if (p) {
+ send_sigurg_to_task(p, fown);
+ }
+Index: linux-2.6.12/fs/file_table.c
+===================================================================
+--- linux-2.6.12.orig/fs/file_table.c
++++ linux-2.6.12/fs/file_table.c
+@@ -17,6 +17,8 @@
+ #include <linux/mount.h>
+ #include <linux/cdev.h>
+ #include <linux/fsnotify.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
+
+ /* sysctl tunables... */
+ struct files_stat_struct files_stat = {
+@@ -86,6 +88,8 @@ static int old_max;
+ rwlock_init(&f->f_owner.lock);
+ /* f->f_version: 0 */
+ INIT_LIST_HEAD(&f->f_list);
++ f->f_xid = vx_current_xid();
++ vx_files_inc(f);
+ f->f_maxcount = INT_MAX;
+ return f;
+ }
+@@ -141,6 +145,8 @@ void fastcall __fput(struct file *file)
+ fops_put(file->f_op);
+ if (file->f_mode & FMODE_WRITE)
+ put_write_access(inode);
++ vx_files_dec(file);
++ file->f_xid = 0;
+ file_kill(file);
+ file->f_dentry = NULL;
+ file->f_vfsmnt = NULL;
+@@ -196,6 +202,8 @@ void put_filp(struct file *file)
+ {
+ if (atomic_dec_and_test(&file->f_count)) {
+ security_file_free(file);
++ vx_files_dec(file);
++ file->f_xid = 0;
+ file_kill(file);
+ file_free(file);
+ }
+Index: linux-2.6.12/fs/inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/inode.c
++++ linux-2.6.12/fs/inode.c
+@@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct
+ struct address_space * const mapping = &inode->i_data;
+
+ inode->i_sb = sb;
++
++ /* essential because of inode slab reuse */
++ inode->i_xid = 0;
+ inode->i_blkbits = sb->s_blocksize_bits;
+ inode->i_flags = 0;
+ atomic_set(&inode->i_count, 1);
+@@ -235,6 +238,8 @@ void __iget(struct inode * inode)
+ inodes_stat.nr_unused--;
+ }
+
++EXPORT_SYMBOL_GPL(__iget);
++
+ /**
+ * clear_inode - clear an inode
+ * @inode: inode to clear
+Index: linux-2.6.12/fs/ioctl.c
+===================================================================
+--- linux-2.6.12.orig/fs/ioctl.c
++++ linux-2.6.12/fs/ioctl.c
+@@ -12,10 +12,19 @@
+ #include <linux/fs.h>
+ #include <linux/security.h>
+ #include <linux/module.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vserver/xid.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/ioctls.h>
+
++
++#ifdef CONFIG_VSERVER_LEGACY
++extern int vx_proc_ioctl(struct inode *, struct file *,
++ unsigned int, unsigned long);
++#endif
++
+ static long do_ioctl(struct file *filp, unsigned int cmd,
+ unsigned long arg)
+ {
+@@ -146,6 +155,48 @@ int vfs_ioctl(struct file *filp, unsigne
+ else
+ error = -ENOTTY;
+ break;
++#ifdef CONFIG_VSERVER_LEGACY
++#ifndef CONFIG_INOXID_NONE
++ case FIOC_GETXID: {
++ struct inode *inode = filp->f_dentry->d_inode;
++
++ /* fixme: if stealth, return -ENOTTY */
++ error = -EPERM;
++ if (capable(CAP_CONTEXT))
++ error = put_user(inode->i_xid, (int *) arg);
++ break;
++ }
++ case FIOC_SETXID: {
++ struct inode *inode = filp->f_dentry->d_inode;
++ int xid;
++
++ /* fixme: if stealth, return -ENOTTY */
++ error = -EPERM;
++ if (!capable(CAP_CONTEXT))
++ break;
++ error = -EROFS;
++ if (IS_RDONLY(inode))
++ break;
++ error = -ENOSYS;
++ if (!(inode->i_sb->s_flags & MS_TAGXID))
++ break;
++ error = -EFAULT;
++ if (get_user(xid, (int *) arg))
++ break;
++ error = 0;
++ inode->i_xid = (xid & 0xFFFF);
++ inode->i_ctime = CURRENT_TIME;
++ mark_inode_dirty(inode);
++ break;
++ }
++#endif
++ case FIOC_GETXFLG:
++ case FIOC_SETXFLG:
++ error = -ENOTTY;
++ if (filp->f_dentry->d_inode->i_sb->s_magic == PROC_SUPER_MAGIC)
++ error = vx_proc_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
++ break;
++#endif
+ default:
+ if (S_ISREG(filp->f_dentry->d_inode->i_mode))
+ error = file_ioctl(filp, cmd, arg);
+Index: linux-2.6.12/fs/jfs/acl.c
+===================================================================
+--- linux-2.6.12.orig/fs/jfs/acl.c
++++ linux-2.6.12/fs/jfs/acl.c
+@@ -220,7 +220,8 @@ int jfs_setattr(struct dentry *dentry, s
+ return rc;
+
+ if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||
+- (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {
++ (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid) ||
++ (iattr->ia_valid & ATTR_XID && iattr->ia_xid != inode->i_xid)) {
+ if (DQUOT_TRANSFER(inode, iattr))
+ return -EDQUOT;
+ }
+Index: linux-2.6.12/fs/jfs/jfs_filsys.h
+===================================================================
+--- linux-2.6.12.orig/fs/jfs/jfs_filsys.h
++++ linux-2.6.12/fs/jfs/jfs_filsys.h
+@@ -81,6 +81,7 @@
+ #define JFS_DIR_INDEX 0x00200000 /* Persistant index for */
+ /* directory entries */
+
++#define JFS_TAGXID 0x00800000 /* xid tagging */
+
+ /*
+ * buffer cache configuration
+Index: linux-2.6.12/fs/jfs/jfs_imap.c
+===================================================================
+--- linux-2.6.12.orig/fs/jfs/jfs_imap.c
++++ linux-2.6.12/fs/jfs/jfs_imap.c
+@@ -45,6 +45,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vserver/xid.h>
+
+ #include "jfs_incore.h"
+ #include "jfs_filsys.h"
+@@ -3100,14 +3101,21 @@ static void duplicateIXtree(struct super
+ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
+ {
+ struct jfs_inode_info *jfs_ip = JFS_IP(ip);
++ uid_t uid;
++ gid_t gid;
+
+ jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
+ jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
+
+ ip->i_mode = le32_to_cpu(dip->di_mode) & 0xffff;
+ ip->i_nlink = le32_to_cpu(dip->di_nlink);
+- ip->i_uid = le32_to_cpu(dip->di_uid);
+- ip->i_gid = le32_to_cpu(dip->di_gid);
++
++ uid = le32_to_cpu(dip->di_uid);
++ gid = le32_to_cpu(dip->di_gid);
++ ip->i_uid = INOXID_UID(XID_TAG(ip), uid, gid);
++ ip->i_gid = INOXID_GID(XID_TAG(ip), uid, gid);
++ ip->i_xid = INOXID_XID(XID_TAG(ip), uid, gid, 0);
++
+ ip->i_size = le64_to_cpu(dip->di_size);
+ ip->i_atime.tv_sec = le32_to_cpu(dip->di_atime.tv_sec);
+ ip->i_atime.tv_nsec = le32_to_cpu(dip->di_atime.tv_nsec);
+@@ -3158,6 +3166,8 @@ static int copy_from_dinode(struct dinod
+ static void copy_to_dinode(struct dinode * dip, struct inode *ip)
+ {
+ struct jfs_inode_info *jfs_ip = JFS_IP(ip);
++ uid_t uid;
++ gid_t gid;
+
+ dip->di_fileset = cpu_to_le32(jfs_ip->fileset);
+ dip->di_inostamp = cpu_to_le32(JFS_SBI(ip->i_sb)->inostamp);
+@@ -3166,8 +3176,11 @@ static void copy_to_dinode(struct dinode
+ dip->di_size = cpu_to_le64(ip->i_size);
+ dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks));
+ dip->di_nlink = cpu_to_le32(ip->i_nlink);
+- dip->di_uid = cpu_to_le32(ip->i_uid);
+- dip->di_gid = cpu_to_le32(ip->i_gid);
++
++ uid = XIDINO_UID(XID_TAG(ip), ip->i_uid, ip->i_xid);
++ gid = XIDINO_GID(XID_TAG(ip), ip->i_gid, ip->i_xid);
++ dip->di_uid = cpu_to_le32(uid);
++ dip->di_gid = cpu_to_le32(gid);
+ /*
+ * mode2 is only needed for storing the higher order bits.
+ * Trust i_mode for the lower order ones
+Index: linux-2.6.12/fs/jfs/jfs_inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/jfs/jfs_inode.c
++++ linux-2.6.12/fs/jfs/jfs_inode.c
+@@ -18,6 +18,7 @@
+
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vserver/xid.h>
+ #include "jfs_incore.h"
+ #include "jfs_filsys.h"
+ #include "jfs_imap.h"
+@@ -60,6 +61,7 @@ struct inode *ialloc(struct inode *paren
+ mode |= S_ISGID;
+ } else
+ inode->i_gid = current->fsgid;
++ inode->i_xid = vx_current_fsxid(sb);
+
+ /*
+ * Allocate inode to quota.
+Index: linux-2.6.12/fs/jfs/namei.c
+===================================================================
+--- linux-2.6.12.orig/fs/jfs/namei.c
++++ linux-2.6.12/fs/jfs/namei.c
+@@ -20,6 +20,7 @@
+ #include <linux/fs.h>
+ #include <linux/ctype.h>
+ #include <linux/quotaops.h>
++#include <linux/vserver/xid.h>
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_inode.h"
+@@ -1432,6 +1433,7 @@ static struct dentry *jfs_lookup(struct
+ iput(ip);
+ return ERR_PTR(-EACCES);
+ }
++ vx_propagate_xid(nd, ip);
+
+ if (JFS_SBI(dip->i_sb)->mntflag & JFS_OS2)
+ dentry->d_op = &jfs_ci_dentry_operations;
+Index: linux-2.6.12/fs/jfs/super.c
+===================================================================
+--- linux-2.6.12.orig/fs/jfs/super.c
++++ linux-2.6.12/fs/jfs/super.c
+@@ -219,7 +219,7 @@ static void jfs_put_super(struct super_b
+
+ enum {
+ Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
+- Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err,
++ Opt_resize_nosize, Opt_errors, Opt_tagxid, Opt_ignore, Opt_err,
+ };
+
+ static match_table_t tokens = {
+@@ -229,6 +229,7 @@ static match_table_t tokens = {
+ {Opt_resize, "resize=%u"},
+ {Opt_resize_nosize, "resize"},
+ {Opt_errors, "errors=%s"},
++ {Opt_tagxid, "tagxid"},
+ {Opt_ignore, "noquota"},
+ {Opt_ignore, "quota"},
+ {Opt_ignore, "usrquota"},
+@@ -320,6 +321,11 @@ static int parse_options(char *options,
+ }
+ break;
+ }
++#ifndef CONFIG_INOXID_NONE
++ case Opt_tagxid:
++ *flag |= JFS_TAGXID;
++ break;
++#endif
+ default:
+ printk("jfs: Unrecognized mount option \"%s\" "
+ " or missing value\n", p);
+@@ -350,6 +356,13 @@ static int jfs_remount(struct super_bloc
+ if (!parse_options(data, sb, &newLVSize, &flag)) {
+ return -EINVAL;
+ }
++
++ if ((flag & JFS_TAGXID) && !(sb->s_flags & MS_TAGXID)) {
++ printk(KERN_ERR "JFS: %s: tagxid not permitted on remount.\n",
++ sb->s_id);
++ return -EINVAL;
++ }
++
+ if (newLVSize) {
+ if (sb->s_flags & MS_RDONLY) {
+ printk(KERN_ERR
+@@ -421,6 +434,9 @@ static int jfs_fill_super(struct super_b
+ #ifdef CONFIG_JFS_POSIX_ACL
+ sb->s_flags |= MS_POSIXACL;
+ #endif
++ /* map mount option tagxid */
++ if (sbi->flag & JFS_TAGXID)
++ sb->s_flags |= MS_TAGXID;
+
+ if (newLVSize) {
+ printk(KERN_ERR "resize option for remount only\n");
+Index: linux-2.6.12/fs/libfs.c
+===================================================================
+--- linux-2.6.12.orig/fs/libfs.c
++++ linux-2.6.12/fs/libfs.c
+@@ -122,7 +122,8 @@ static inline unsigned char dt_type(stru
+ * both impossible due to the lock on directory.
+ */
+
+-int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
++static inline int do_dcache_readdir_filter(struct file * filp,
++ void * dirent, filldir_t filldir, int (*filter)(struct dentry *dentry))
+ {
+ struct dentry *dentry = filp->f_dentry;
+ struct dentry *cursor = filp->private_data;
+@@ -156,6 +157,8 @@ int dcache_readdir(struct file * filp, v
+ next = list_entry(p, struct dentry, d_child);
+ if (d_unhashed(next) || !next->d_inode)
+ continue;
++ if (filter && !filter(next))
++ continue;
+
+ spin_unlock(&dcache_lock);
+ if (filldir(dirent, next->d_name.name, next->d_name.len, filp->f_pos, next->d_inode->i_ino, dt_type(next->d_inode)) < 0)
+@@ -172,6 +175,18 @@ int dcache_readdir(struct file * filp, v
+ return 0;
+ }
+
++int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
++{
++ return do_dcache_readdir_filter(filp, dirent, filldir, NULL);
++}
++
++int dcache_readdir_filter(struct file * filp, void * dirent, filldir_t filldir,
++ int (*filter)(struct dentry *))
++{
++ return do_dcache_readdir_filter(filp, dirent, filldir, filter);
++}
++
++
+ ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
+ {
+ return -EISDIR;
+@@ -523,6 +538,7 @@ EXPORT_SYMBOL(dcache_dir_close);
+ EXPORT_SYMBOL(dcache_dir_lseek);
+ EXPORT_SYMBOL(dcache_dir_open);
+ EXPORT_SYMBOL(dcache_readdir);
++EXPORT_SYMBOL(dcache_readdir_filter);
+ EXPORT_SYMBOL(generic_read_dir);
+ EXPORT_SYMBOL(get_sb_pseudo);
+ EXPORT_SYMBOL(simple_commit_write);
+Index: linux-2.6.12/fs/locks.c
+===================================================================
+--- linux-2.6.12.orig/fs/locks.c
++++ linux-2.6.12/fs/locks.c
+@@ -124,6 +124,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/syscalls.h>
+ #include <linux/time.h>
++#include <linux/vs_limit.h>
+
+ #include <asm/semaphore.h>
+ #include <asm/uaccess.h>
+@@ -149,12 +150,16 @@ static kmem_cache_t *filelock_cache;
+ /* Allocate an empty lock structure. */
+ static struct file_lock *locks_alloc_lock(void)
+ {
++ if (!vx_locks_avail(1))
++ return NULL;
+ return kmem_cache_alloc(filelock_cache, SLAB_KERNEL);
+ }
+
+ /* Free a lock which is not in use. */
+ static inline void locks_free_lock(struct file_lock *fl)
+ {
++ vx_locks_dec(fl);
++
+ if (fl == NULL) {
+ BUG();
+ return;
+@@ -198,6 +203,7 @@ void locks_init_lock(struct file_lock *f
+ fl->fl_start = fl->fl_end = 0;
+ fl->fl_ops = NULL;
+ fl->fl_lmops = NULL;
++ fl->fl_xid = -1;
+ }
+
+ EXPORT_SYMBOL(locks_init_lock);
+@@ -235,6 +241,8 @@ void locks_copy_lock(struct file_lock *n
+ fl->fl_ops->fl_copy_lock(new, fl);
+ if (fl->fl_lmops && fl->fl_lmops->fl_copy_lock)
+ fl->fl_lmops->fl_copy_lock(new, fl);
++
++ new->fl_xid = fl->fl_xid;
+ }
+
+ EXPORT_SYMBOL(locks_copy_lock);
+@@ -271,6 +279,11 @@ static int flock_make_lock(struct file *
+ fl->fl_flags = FL_FLOCK;
+ fl->fl_type = type;
+ fl->fl_end = OFFSET_MAX;
++
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ fl->fl_xid = filp->f_xid;
++ vx_locks_inc(fl);
+
+ *lock = fl;
+ return 0;
+@@ -448,6 +461,11 @@ static int lease_alloc(struct file *filp
+ if (fl == NULL)
+ return -ENOMEM;
+
++ fl->fl_xid = vx_current_xid();
++ if (filp)
++ vxd_assert(filp->f_xid == fl->fl_xid,
++ "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
++ vx_locks_inc(fl);
+ error = lease_init(filp, type, fl);
+ if (error)
+ return error;
+@@ -763,7 +781,7 @@ out:
+
+ EXPORT_SYMBOL(posix_lock_file);
+
+-static int __posix_lock_file(struct inode *inode, struct file_lock *request)
++static int __posix_lock_file(struct inode *inode, struct file_lock *request, xid_t xid)
+ {
+ struct file_lock *fl;
+ struct file_lock *new_fl, *new_fl2;
+@@ -772,12 +790,18 @@ static int __posix_lock_file(struct inod
+ struct file_lock **before;
+ int error, added = 0;
+
++ vxd_assert(xid == vx_current_xid(),
++ "xid(%d) == current(%d)", xid, vx_current_xid());
+ /*
+ * We may need two file_lock structures for this operation,
+ * so we get them in advance to avoid races.
+ */
+ new_fl = locks_alloc_lock();
++ new_fl->fl_xid = xid;
++ vx_locks_inc(new_fl);
+ new_fl2 = locks_alloc_lock();
++ new_fl2->fl_xid = xid;
++ vx_locks_inc(new_fl2);
+
+ lock_kernel();
+ if (request->fl_type != F_UNLCK) {
+@@ -951,7 +975,7 @@ static int __posix_lock_file(struct inod
+ */
+ int posix_lock_file(struct file *filp, struct file_lock *fl)
+ {
+- return __posix_lock_file(filp->f_dentry->d_inode, fl);
++ return __posix_lock_file(filp->f_dentry->d_inode, fl, filp->f_xid);
+ }
+
+ /**
+@@ -968,7 +992,8 @@ int posix_lock_file_wait(struct file *fi
+ int error;
+ might_sleep ();
+ for (;;) {
+- error = __posix_lock_file(filp->f_dentry->d_inode, fl);
++ error = __posix_lock_file(filp->f_dentry->d_inode,
++ fl, filp->f_xid);
+ if ((error != -EAGAIN) || !(fl->fl_flags & FL_SLEEP))
+ break;
+ error = wait_event_interruptible(fl->fl_wait, !fl->fl_next);
+@@ -1040,7 +1065,7 @@ int locks_mandatory_area(int read_write,
+ fl.fl_end = offset + count - 1;
+
+ for (;;) {
+- error = __posix_lock_file(inode, &fl);
++ error = __posix_lock_file(inode, &fl, filp->f_xid);
+ if (error != -EAGAIN)
+ break;
+ if (!(fl.fl_flags & FL_SLEEP))
+@@ -1597,6 +1622,11 @@ int fcntl_setlk(struct file *filp, unsig
+ if (file_lock == NULL)
+ return -ENOLCK;
+
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ file_lock->fl_xid = filp->f_xid;
++ vx_locks_inc(file_lock);
++
+ /*
+ * This might block, so we do it before checking the inode.
+ */
+@@ -1650,7 +1680,7 @@ int fcntl_setlk(struct file *filp, unsig
+ }
+
+ for (;;) {
+- error = __posix_lock_file(inode, file_lock);
++ error = __posix_lock_file(inode, file_lock, filp->f_xid);
+ if ((error != -EAGAIN) || (cmd == F_SETLK))
+ break;
+ error = wait_event_interruptible(file_lock->fl_wait,
+@@ -1728,6 +1758,11 @@ int fcntl_setlk64(struct file *filp, uns
+ if (file_lock == NULL)
+ return -ENOLCK;
+
++ vxd_assert(filp->f_xid == vx_current_xid(),
++ "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
++ file_lock->fl_xid = filp->f_xid;
++ vx_locks_inc(file_lock);
++
+ /*
+ * This might block, so we do it before checking the inode.
+ */
+@@ -1781,7 +1816,7 @@ int fcntl_setlk64(struct file *filp, uns
+ }
+
+ for (;;) {
+- error = __posix_lock_file(inode, file_lock);
++ error = __posix_lock_file(inode, file_lock, filp->f_xid);
+ if ((error != -EAGAIN) || (cmd == F_SETLK64))
+ break;
+ error = wait_event_interruptible(file_lock->fl_wait,
+@@ -2051,6 +2086,10 @@ int get_locks_status(char *buffer, char
+ list_for_each(tmp, &file_lock_list) {
+ struct list_head *btmp;
+ struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);
++
++ if (!vx_check(fl->fl_xid, VX_IDENT|VX_WATCH))
++ continue;
++
+ lock_get_status(q, fl, ++i, "");
+ move_lock_status(&q, &pos, offset);
+
+Index: linux-2.6.12/fs/namei.c
+===================================================================
+--- linux-2.6.12.orig/fs/namei.c
++++ linux-2.6.12/fs/namei.c
+@@ -28,6 +28,9 @@
+ #include <linux/syscalls.h>
+ #include <linux/mount.h>
+ #include <linux/audit.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vserver/debug.h>
+ #include <asm/namei.h>
+ #include <asm/uaccess.h>
+
+@@ -221,6 +224,24 @@ int generic_permission(struct inode *ino
+ return -EACCES;
+ }
+
++static inline int xid_permission(struct inode *inode, int mask, struct nameidata *nd)
++{
++ if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN)) {
++ vxwprintk(1, "xid=%d did hit the barrier.",
++ vx_current_xid());
++ return -EACCES;
++ }
++ if (inode->i_xid == 0)
++ return 0;
++ if (vx_check(inode->i_xid, VX_ADMIN|VX_WATCH|VX_IDENT))
++ return 0;
++
++ vxwprintk(1, "xid=%d denied access to %p[#%d,%lu] %s.",
++ vx_current_xid(), inode, inode->i_xid, inode->i_ino,
++ vxd_path(nd->dentry, nd->mnt));
++ return -EACCES;
++}
++
+ int permission(struct inode *inode, int mask, struct nameidata *nd)
+ {
+ int retval, submask;
+@@ -245,6 +266,8 @@ int permission(struct inode *inode, int
+
+ /* Ordinary permission routines do not understand MAY_APPEND. */
+ submask = mask & ~MAY_APPEND;
++ if ((retval = xid_permission(inode, mask, nd)))
++ return retval;
+ if (inode->i_op && inode->i_op->permission)
+ retval = inode->i_op->permission(inode, submask, nd);
+ else
+@@ -637,7 +660,8 @@ static inline void follow_dotdot(struct
+ if (nd->dentry == current->fs->root &&
+ nd->mnt == current->fs->rootmnt) {
+ read_unlock(&current->fs->lock);
+- break;
++ /* for sane '/' avoid follow_mount() */
++ return;
+ }
+ read_unlock(&current->fs->lock);
+ spin_lock(&dcache_lock);
+@@ -674,16 +698,34 @@ static int do_lookup(struct nameidata *n
+ {
+ struct vfsmount *mnt = nd->mnt;
+ struct dentry *dentry = __d_lookup(nd->dentry, name);
++ struct inode *inode;
+
+ if (!dentry)
+ goto need_lookup;
+ if (dentry->d_op && dentry->d_op->d_revalidate)
+ goto need_revalidate;
++ inode = dentry->d_inode;
++ if (!inode)
++ goto done;
++ if (!vx_check(inode->i_xid, VX_WATCH|VX_ADMIN|VX_HOSTID|VX_IDENT))
++ goto hidden;
++ if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) {
++ struct proc_dir_entry *de = PDE(inode);
++
++ if (de && !vx_hide_check(0, de->vx_flags))
++ goto hidden;
++ }
+ done:
+ path->mnt = mnt;
+ path->dentry = dentry;
+ __follow_mount(path);
+ return 0;
++hidden:
++ vxwprintk(1, "xid=%d did lookup hidden %p[#%d,%lu] %s.",
++ vx_current_xid(), inode, inode->i_xid, inode->i_ino,
++ vxd_path(dentry, mnt));
++ dput(dentry);
++ return -ENOENT;
+
+ need_lookup:
+ dentry = real_lookup(nd->dentry, name, nd);
+@@ -1194,7 +1236,7 @@ static inline int may_delete(struct inod
+ if (IS_APPEND(dir))
+ return -EPERM;
+ if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
+- IS_IMMUTABLE(victim->d_inode))
++ IS_IXORUNLINK(victim->d_inode))
+ return -EPERM;
+ if (isdir) {
+ if (!S_ISDIR(victim->d_inode->i_mode))
+@@ -1992,7 +2034,7 @@ int vfs_link(struct dentry *old_dentry,
+ /*
+ * A link to an append-only or immutable file cannot be created.
+ */
+- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ return -EPERM;
+ if (!dir->i_op || !dir->i_op->link)
+ return -EPERM;
+Index: linux-2.6.12/fs/namespace.c
+===================================================================
+--- linux-2.6.12.orig/fs/namespace.c
++++ linux-2.6.12/fs/namespace.c
+@@ -22,6 +22,8 @@
+ #include <linux/namei.h>
+ #include <linux/security.h>
+ #include <linux/mount.h>
++#include <linux/vserver/namespace.h>
++#include <linux/vserver/xid.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+
+@@ -161,6 +163,7 @@ clone_mnt(struct vfsmount *old, struct d
+ mnt->mnt_mountpoint = mnt->mnt_root;
+ mnt->mnt_parent = mnt;
+ mnt->mnt_namespace = old->mnt_namespace;
++ mnt->mnt_xid = old->mnt_xid;
+
+ /* stick the duplicate mount on the same expiry list
+ * as the original if that was on one */
+@@ -215,6 +218,32 @@ static inline void mangle(struct seq_fil
+ seq_escape(m, s, " \t\n\\");
+ }
+
++static int mnt_is_reachable(struct vfsmount *mnt)
++{
++ struct vfsmount *root_mnt;
++ struct dentry *root, *point;
++ int ret;
++
++ if (mnt == mnt->mnt_namespace->root)
++ return 1;
++
++ spin_lock(&dcache_lock);
++ root_mnt = current->fs->rootmnt;
++ root = current->fs->root;
++ point = root;
++
++ while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
++ point = mnt->mnt_mountpoint;
++ mnt = mnt->mnt_parent;
++ }
++
++ ret = (mnt == root_mnt) && is_subdir(point, root);
++
++ spin_unlock(&dcache_lock);
++
++ return ret;
++}
++
+ static int show_vfsmnt(struct seq_file *m, void *v)
+ {
+ struct vfsmount *mnt = v;
+@@ -228,6 +257,7 @@ static int show_vfsmnt(struct seq_file *
+ { MS_MANDLOCK, ",mand" },
+ { MS_NOATIME, ",noatime" },
+ { MS_NODIRATIME, ",nodiratime" },
++ { MS_TAGXID, ",tagxid" },
+ { 0, NULL }
+ };
+ static struct proc_fs_info mnt_info[] = {
+@@ -238,10 +268,20 @@ static int show_vfsmnt(struct seq_file *
+ };
+ struct proc_fs_info *fs_infop;
+
+- mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
+- seq_putc(m, ' ');
+- seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
+- seq_putc(m, ' ');
++ if (vx_flags(VXF_HIDE_MOUNT, 0))
++ return 0;
++ if (!mnt_is_reachable(mnt))
++ return 0;
++
++ if (!vx_check(0, VX_ADMIN|VX_WATCH) &&
++ mnt == current->fs->rootmnt) {
++ seq_puts(m, "/dev/root / ");
++ } else {
++ mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
++ seq_putc(m, ' ');
++ seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
++ seq_putc(m, ' ');
++ }
+ mangle(m, mnt->mnt_sb->s_type->name);
+ seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw");
+ for (fs_infop = fs_info; fs_infop->flag; fs_infop++) {
+@@ -252,6 +292,8 @@ static int show_vfsmnt(struct seq_file *
+ if (mnt->mnt_flags & fs_infop->flag)
+ seq_puts(m, fs_infop->str);
+ }
++ if (mnt->mnt_flags & MNT_XID)
++ seq_printf(m, ",xid=%d", mnt->mnt_xid);
+ if (mnt->mnt_sb->s_op->show_options)
+ err = mnt->mnt_sb->s_op->show_options(m, mnt);
+ seq_puts(m, " 0 0\n");
+@@ -337,18 +379,12 @@ int may_umount(struct vfsmount *mnt)
+
+ EXPORT_SYMBOL(may_umount);
+
+-void umount_tree(struct vfsmount *mnt)
++static inline void __umount_list(struct list_head *kill)
+ {
+- struct vfsmount *p;
+- LIST_HEAD(kill);
+-
+- for (p = mnt; p; p = next_mnt(p, mnt)) {
+- list_del(&p->mnt_list);
+- list_add(&p->mnt_list, &kill);
+- }
++ struct vfsmount *mnt;
+
+- while (!list_empty(&kill)) {
+- mnt = list_entry(kill.next, struct vfsmount, mnt_list);
++ while (!list_empty(kill)) {
++ mnt = list_entry(kill->next, struct vfsmount, mnt_list);
+ list_del_init(&mnt->mnt_list);
+ list_del_init(&mnt->mnt_fslink);
+ if (mnt->mnt_parent == mnt) {
+@@ -364,6 +400,32 @@ void umount_tree(struct vfsmount *mnt)
+ }
+ }
+
++void umount_tree(struct vfsmount *mnt)
++{
++ struct vfsmount *p;
++ LIST_HEAD(kill);
++
++ for (p = mnt; p; p = next_mnt(p, mnt)) {
++ list_del(&p->mnt_list);
++ list_add(&p->mnt_list, &kill);
++ }
++ __umount_list(&kill);
++}
++
++void umount_unused(struct vfsmount *mnt, struct fs_struct *fs)
++{
++ struct vfsmount *p;
++ LIST_HEAD(kill);
++
++ for (p = mnt; p; p = next_mnt(p, mnt)) {
++ if (p == fs->rootmnt || p == fs->pwdmnt)
++ continue;
++ list_del(&p->mnt_list);
++ list_add(&p->mnt_list, &kill);
++ }
++ __umount_list(&kill);
++}
++
+ static int do_umount(struct vfsmount *mnt, int flags)
+ {
+ struct super_block * sb = mnt->mnt_sb;
+@@ -480,7 +542,7 @@ asmlinkage long sys_umount(char __user *
+ goto dput_and_out;
+
+ retval = -EPERM;
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SECURE_MOUNT))
+ goto dput_and_out;
+
+ retval = do_umount(nd.mnt, flags);
+@@ -507,6 +569,8 @@ static int mount_is_safe(struct nameidat
+ {
+ if (capable(CAP_SYS_ADMIN))
+ return 0;
++ if (vx_ccaps(VXC_SECURE_MOUNT))
++ return 0;
+ return -EPERM;
+ #ifdef notyet
+ if (S_ISLNK(nd->dentry->d_inode->i_mode))
+@@ -618,11 +682,12 @@ out_unlock:
+ /*
+ * do loopback mount.
+ */
+-static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
++static int do_loopback(struct nameidata *nd, char *old_name, xid_t xid, int flags)
+ {
+ struct nameidata old_nd;
+ struct vfsmount *mnt = NULL;
+ int err = mount_is_safe(nd);
++ int recurse = flags & MS_REC;
+ if (err)
+ return err;
+ if (!old_name || !*old_name)
+@@ -647,6 +712,10 @@ static int do_loopback(struct nameidata
+ list_del_init(&mnt->mnt_fslink);
+ spin_unlock(&vfsmount_lock);
+
++ if (flags & MS_XID) {
++ mnt->mnt_xid = xid;
++ mnt->mnt_flags |= MNT_XID;
++ }
+ err = graft_tree(mnt, nd);
+ if (err) {
+ spin_lock(&vfsmount_lock);
+@@ -668,12 +737,12 @@ static int do_loopback(struct nameidata
+ */
+
+ static int do_remount(struct nameidata *nd, int flags, int mnt_flags,
+- void *data)
++ void *data, xid_t xid)
+ {
+ int err;
+ struct super_block * sb = nd->mnt->mnt_sb;
+
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SECURE_REMOUNT))
+ return -EPERM;
+
+ if (!check_mnt(nd->mnt))
+@@ -682,10 +751,15 @@ static int do_remount(struct nameidata *
+ if (nd->dentry != nd->mnt->mnt_root)
+ return -EINVAL;
+
++ if (vx_ccaps(VXC_SECURE_REMOUNT))
++ mnt_flags |= MNT_NODEV;
+ down_write(&sb->s_umount);
+ err = do_remount_sb(sb, flags, data, 0);
+- if (!err)
++ if (!err) {
+ nd->mnt->mnt_flags=mnt_flags;
++ if (flags & MS_XID)
++ nd->mnt->mnt_xid = xid;
++ }
+ up_write(&sb->s_umount);
+ if (!err)
+ security_sb_post_remount(nd->mnt, flags, data);
+@@ -697,7 +771,7 @@ static int do_move_mount(struct nameidat
+ struct nameidata old_nd, parent_nd;
+ struct vfsmount *p;
+ int err = 0;
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SECURE_MOUNT))
+ return -EPERM;
+ if (!old_name || !*old_name)
+ return -EINVAL;
+@@ -769,7 +843,7 @@ static int do_new_mount(struct nameidata
+ return -EINVAL;
+
+ /* we need capabilities... */
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SECURE_MOUNT))
+ return -EPERM;
+
+ mnt = do_kern_mount(type, flags, name, data);
+@@ -1011,6 +1085,7 @@ long do_mount(char * dev_name, char * di
+ struct nameidata nd;
+ int retval = 0;
+ int mnt_flags = 0;
++ xid_t xid = 0;
+
+ /* Discard magic */
+ if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+@@ -1026,6 +1101,14 @@ long do_mount(char * dev_name, char * di
+ if (data_page)
+ ((char *)data_page)[PAGE_SIZE - 1] = 0;
+
++ retval = vx_parse_xid(data_page, &xid, 1);
++ if (retval) {
++ mnt_flags |= MNT_XID;
++ /* bind and re-mounts get xid flag */
++ if (flags & (MS_BIND|MS_REMOUNT))
++ flags |= MS_XID;
++ }
++
+ /* Separate the per-mountpoint flags */
+ if (flags & MS_NOSUID)
+ mnt_flags |= MNT_NOSUID;
+@@ -1035,6 +1118,9 @@ long do_mount(char * dev_name, char * di
+ mnt_flags |= MNT_NOEXEC;
+ flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_ACTIVE);
+
++ if (vx_ccaps(VXC_SECURE_MOUNT))
++ mnt_flags |= MNT_NODEV;
++
+ /* ... and get the mountpoint */
+ retval = path_lookup(dir_name, LOOKUP_FOLLOW, &nd);
+ if (retval)
+@@ -1046,9 +1132,9 @@ long do_mount(char * dev_name, char * di
+
+ if (flags & MS_REMOUNT)
+ retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+- data_page);
++ data_page, xid);
+ else if (flags & MS_BIND)
+- retval = do_loopback(&nd, dev_name, flags & MS_REC);
++ retval = do_loopback(&nd, dev_name, xid, flags);
+ else if (flags & MS_MOVE)
+ retval = do_move_mount(&nd, dev_name);
+ else
+@@ -1075,7 +1161,7 @@ int copy_namespace(int flags, struct tas
+ if (!(flags & CLONE_NEWNS))
+ return 0;
+
+- if (!capable(CAP_SYS_ADMIN)) {
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SECURE_MOUNT)) {
+ put_namespace(namespace);
+ return -EPERM;
+ }
+Index: linux-2.6.12/fs/nfs/dir.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfs/dir.c
++++ linux-2.6.12/fs/nfs/dir.c
+@@ -31,6 +31,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/smp_lock.h>
+ #include <linux/namei.h>
++#include <linux/vserver/xid.h>
+
+ #include "delegation.h"
+
+@@ -771,6 +772,7 @@ static struct dentry *nfs_lookup(struct
+ inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr);
+ if (!inode)
+ goto out_unlock;
++ vx_propagate_xid(nd, inode);
+ no_entry:
+ res = d_add_unique(dentry, inode);
+ if (res != NULL)
+Index: linux-2.6.12/fs/nfs/inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfs/inode.c
++++ linux-2.6.12/fs/nfs/inode.c
+@@ -35,6 +35,7 @@
+ #include <linux/mount.h>
+ #include <linux/nfs_idmap.h>
+ #include <linux/vfs.h>
++#include <linux/vserver/xid.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+@@ -322,12 +323,16 @@ nfs_sb_init(struct super_block *sb, rpc_
+ }
+ server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD;
+
++ if (server->flags & NFS_MOUNT_TAGXID)
++ sb->s_flags |= MS_TAGXID;
++
+ sb->s_maxbytes = fsinfo.maxfilesize;
+ if (sb->s_maxbytes > MAX_LFS_FILESIZE)
+ sb->s_maxbytes = MAX_LFS_FILESIZE;
+
+ server->client->cl_intr = (server->flags & NFS_MOUNT_INTR) ? 1 : 0;
+ server->client->cl_softrtry = (server->flags & NFS_MOUNT_SOFT) ? 1 : 0;
++ server->client->cl_tagxid = (server->flags & NFS_MOUNT_TAGXID) ? 1 : 0;
+
+ /* We're airborne Set socket buffersize */
+ rpc_setbufsize(server->client, server->wsize + 100, server->rsize + 100);
+@@ -378,6 +383,7 @@ nfs_create_client(struct nfs_server *ser
+
+ clnt->cl_intr = 1;
+ clnt->cl_softrtry = 1;
++ clnt->cl_tagxid = 1;
+ clnt->cl_chatty = 1;
+
+ return clnt;
+@@ -549,6 +555,7 @@ static int nfs_show_options(struct seq_f
+ { NFS_MOUNT_NOCTO, ",nocto", "" },
+ { NFS_MOUNT_NOAC, ",noac", "" },
+ { NFS_MOUNT_NONLM, ",nolock", ",lock" },
++ { NFS_MOUNT_TAGXID, ",tagxid", "" },
+ { 0, NULL, NULL }
+ };
+ struct proc_nfs_info *nfs_infop;
+@@ -713,8 +720,10 @@ nfs_fhget(struct super_block *sb, struct
+ nfsi->change_attr = fattr->change_attr;
+ inode->i_size = nfs_size_to_loff_t(fattr->size);
+ inode->i_nlink = fattr->nlink;
+- inode->i_uid = fattr->uid;
+- inode->i_gid = fattr->gid;
++ inode->i_uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
++ inode->i_gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
++ inode->i_xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
++ /* maybe fattr->xid someday */
+ if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
+ /*
+ * report the blocks in 512byte units
+@@ -786,6 +795,8 @@ nfs_setattr(struct dentry *dentry, struc
+ inode->i_uid = attr->ia_uid;
+ if ((attr->ia_valid & ATTR_GID) != 0)
+ inode->i_gid = attr->ia_gid;
++ if ((attr->ia_valid & ATTR_XID) && IS_TAGXID(inode))
++ inode->i_xid = attr->ia_xid;
+ if ((attr->ia_valid & ATTR_SIZE) != 0) {
+ inode->i_size = attr->ia_size;
+ vmtruncate(inode, attr->ia_size);
+@@ -1140,6 +1151,9 @@ int nfs_refresh_inode(struct inode *inod
+ struct nfs_inode *nfsi = NFS_I(inode);
+ loff_t cur_size, new_isize;
+ int data_unstable;
++ uid_t uid;
++ gid_t gid;
++ xid_t xid = 0;
+
+ /* Do we hold a delegation? */
+ if (nfs_have_delegation(inode, FMODE_READ))
+@@ -1183,10 +1197,15 @@ int nfs_refresh_inode(struct inode *inod
+ } else if (S_ISREG(inode->i_mode) && new_isize > cur_size)
+ nfsi->flags |= NFS_INO_INVALID_ATTR;
+
++ uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
++ gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
++ xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
++
+ /* Have any file permissions changed? */
+ if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
+- || inode->i_uid != fattr->uid
+- || inode->i_gid != fattr->gid)
++ || inode->i_uid != uid
++ || inode->i_gid != gid
++ || inode->i_xid != xid)
+ nfsi->flags |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;
+
+ /* Has the link count changed? */
+@@ -1220,6 +1239,9 @@ static int nfs_update_inode(struct inode
+ unsigned int invalid = 0;
+ loff_t cur_isize;
+ int data_unstable;
++ uid_t uid;
++ gid_t gid;
++ xid_t xid = 0;
+
+ dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
+ __FUNCTION__, inode->i_sb->s_id, inode->i_ino,
+@@ -1302,15 +1324,21 @@ static int nfs_update_inode(struct inode
+ memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
+ memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
+
++ uid = INOXID_UID(XID_TAG(inode), fattr->uid, fattr->gid);
++ gid = INOXID_GID(XID_TAG(inode), fattr->uid, fattr->gid);
++ xid = INOXID_XID(XID_TAG(inode), fattr->uid, fattr->gid, 0);
++
+ if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
+- inode->i_uid != fattr->uid ||
+- inode->i_gid != fattr->gid)
++ inode->i_uid != uid ||
++ inode->i_gid != gid ||
++ inode->i_xid != xid)
+ invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS;
+
+ inode->i_mode = fattr->mode;
+ inode->i_nlink = fattr->nlink;
+- inode->i_uid = fattr->uid;
+- inode->i_gid = fattr->gid;
++ inode->i_uid = uid;
++ inode->i_gid = gid;
++ inode->i_xid = xid;
+
+ if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
+ /*
+Index: linux-2.6.12/fs/nfs/nfs3xdr.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfs/nfs3xdr.c
++++ linux-2.6.12/fs/nfs/nfs3xdr.c
+@@ -21,6 +21,7 @@
+ #include <linux/nfs.h>
+ #include <linux/nfs3.h>
+ #include <linux/nfs_fs.h>
++#include <linux/vserver/xid.h>
+
+ #define NFSDBG_FACILITY NFSDBG_XDR
+
+@@ -173,7 +174,7 @@ xdr_decode_fattr(u32 *p, struct nfs_fatt
+ }
+
+ static inline u32 *
+-xdr_encode_sattr(u32 *p, struct iattr *attr)
++xdr_encode_sattr(u32 *p, struct iattr *attr, int tagxid)
+ {
+ if (attr->ia_valid & ATTR_MODE) {
+ *p++ = xdr_one;
+@@ -181,15 +182,17 @@ xdr_encode_sattr(u32 *p, struct iattr *a
+ } else {
+ *p++ = xdr_zero;
+ }
+- if (attr->ia_valid & ATTR_UID) {
++ if (attr->ia_valid & ATTR_UID ||
++ (tagxid && (attr->ia_valid & ATTR_XID))) {
+ *p++ = xdr_one;
+- *p++ = htonl(attr->ia_uid);
++ *p++ = htonl(XIDINO_UID(tagxid, attr->ia_uid, attr->ia_xid));
+ } else {
+ *p++ = xdr_zero;
+ }
+- if (attr->ia_valid & ATTR_GID) {
++ if (attr->ia_valid & ATTR_GID ||
++ (tagxid && (attr->ia_valid & ATTR_XID))) {
+ *p++ = xdr_one;
+- *p++ = htonl(attr->ia_gid);
++ *p++ = htonl(XIDINO_GID(tagxid, attr->ia_gid, attr->ia_xid));
+ } else {
+ *p++ = xdr_zero;
+ }
+@@ -274,7 +277,8 @@ static int
+ nfs3_xdr_sattrargs(struct rpc_rqst *req, u32 *p, struct nfs3_sattrargs *args)
+ {
+ p = xdr_encode_fhandle(p, args->fh);
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tagxid);
+ *p++ = htonl(args->guard);
+ if (args->guard)
+ p = xdr_encode_time3(p, &args->guardtime);
+@@ -365,7 +369,8 @@ nfs3_xdr_createargs(struct rpc_rqst *req
+ *p++ = args->verifier[0];
+ *p++ = args->verifier[1];
+ } else
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tagxid);
+
+ req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+ return 0;
+@@ -379,7 +384,8 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req,
+ {
+ p = xdr_encode_fhandle(p, args->fh);
+ p = xdr_encode_array(p, args->name, args->len);
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tagxid);
+ req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+ return 0;
+ }
+@@ -392,7 +398,8 @@ nfs3_xdr_symlinkargs(struct rpc_rqst *re
+ {
+ p = xdr_encode_fhandle(p, args->fromfh);
+ p = xdr_encode_array(p, args->fromname, args->fromlen);
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tagxid);
+ p = xdr_encode_array(p, args->topath, args->tolen);
+ req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+ return 0;
+@@ -407,7 +414,8 @@ nfs3_xdr_mknodargs(struct rpc_rqst *req,
+ p = xdr_encode_fhandle(p, args->fh);
+ p = xdr_encode_array(p, args->name, args->len);
+ *p++ = htonl(args->type);
+- p = xdr_encode_sattr(p, args->sattr);
++ p = xdr_encode_sattr(p, args->sattr,
++ req->rq_task->tk_client->cl_tagxid);
+ if (args->type == NF3CHR || args->type == NF3BLK) {
+ *p++ = htonl(MAJOR(args->rdev));
+ *p++ = htonl(MINOR(args->rdev));
+Index: linux-2.6.12/fs/nfs/nfsroot.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfs/nfsroot.c
++++ linux-2.6.12/fs/nfs/nfsroot.c
+@@ -87,6 +87,7 @@
+ #include <linux/root_dev.h>
+ #include <net/ipconfig.h>
+ #include <linux/parser.h>
++#include <linux/vs_cvirt.h>
+
+ /* Define this to allow debugging output */
+ #undef NFSROOT_DEBUG
+@@ -124,6 +125,7 @@ enum {
+ Opt_soft, Opt_hard, Opt_intr,
+ Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac,
+ Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp,
++ Opt_tagxid,
+ /* Error token */
+ Opt_err
+ };
+@@ -158,6 +160,7 @@ static match_table_t __initdata tokens =
+ {Opt_udp, "udp"},
+ {Opt_tcp, "proto=tcp"},
+ {Opt_tcp, "tcp"},
++ {Opt_tagxid, "tagxid"},
+ {Opt_err, NULL}
+
+ };
+@@ -266,6 +269,11 @@ static int __init root_nfs_parse(char *n
+ case Opt_tcp:
+ nfs_data.flags |= NFS_MOUNT_TCP;
+ break;
++#ifndef CONFIG_INOXID_NONE
++ case Opt_tagxid:
++ nfs_data.flags |= NFS_MOUNT_TAGXID;
++ break;
++#endif
+ default :
+ return 0;
+ }
+@@ -301,7 +309,7 @@ static int __init root_nfs_name(char *na
+ /* Override them by options set on kernel command-line */
+ root_nfs_parse(name, buf);
+
+- cp = system_utsname.nodename;
++ cp = vx_new_uts(nodename);
+ if (strlen(buf) + strlen(cp) > NFS_MAXPATHLEN) {
+ printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n");
+ return -1;
+Index: linux-2.6.12/fs/nfsd/auth.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfsd/auth.c
++++ linux-2.6.12/fs/nfsd/auth.c
+@@ -9,6 +9,7 @@
+ #include <linux/sunrpc/svc.h>
+ #include <linux/sunrpc/svcauth.h>
+ #include <linux/nfsd/nfsd.h>
++#include <linux/vserver/xid.h>
+
+ #define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
+
+@@ -42,18 +43,20 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+ }
+
+ if (cred->cr_uid != (uid_t) -1)
+- current->fsuid = cred->cr_uid;
++ current->fsuid = INOXID_UID(XID_TAG_NFSD, cred->cr_uid, cred->cr_gid);
+ else
+ current->fsuid = exp->ex_anon_uid;
+ if (cred->cr_gid != (gid_t) -1)
+- current->fsgid = cred->cr_gid;
++ current->fsgid = INOXID_GID(XID_TAG_NFSD, cred->cr_uid, cred->cr_gid);
+ else
+ current->fsgid = exp->ex_anon_gid;
+
++ current->xid = INOXID_XID(XID_TAG_NFSD, cred->cr_uid, cred->cr_gid, 0);
++
+ if (!cred->cr_group_info)
+ return -ENOMEM;
+ ret = set_current_groups(cred->cr_group_info);
+- if ((cred->cr_uid)) {
++ if (INOXID_UID(XID_TAG_NFSD, cred->cr_uid, cred->cr_gid)) {
+ cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
+ } else {
+ cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
+Index: linux-2.6.12/fs/nfsd/nfs3xdr.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfsd/nfs3xdr.c
++++ linux-2.6.12/fs/nfsd/nfs3xdr.c
+@@ -21,6 +21,7 @@
+ #include <linux/sunrpc/svc.h>
+ #include <linux/nfsd/nfsd.h>
+ #include <linux/nfsd/xdr3.h>
++#include <linux/vserver/xid.h>
+
+ #define NFSDDBG_FACILITY NFSDDBG_XDR
+
+@@ -105,6 +106,8 @@ static inline u32 *
+ decode_sattr3(u32 *p, struct iattr *iap)
+ {
+ u32 tmp;
++ uid_t uid = 0;
++ gid_t gid = 0;
+
+ iap->ia_valid = 0;
+
+@@ -114,12 +117,15 @@ decode_sattr3(u32 *p, struct iattr *iap)
+ }
+ if (*p++) {
+ iap->ia_valid |= ATTR_UID;
+- iap->ia_uid = ntohl(*p++);
++ uid = ntohl(*p++);
+ }
+ if (*p++) {
+ iap->ia_valid |= ATTR_GID;
+- iap->ia_gid = ntohl(*p++);
++ gid = ntohl(*p++);
+ }
++ iap->ia_uid = INOXID_UID(XID_TAG_NFSD, uid, gid);
++ iap->ia_gid = INOXID_GID(XID_TAG_NFSD, uid, gid);
++ iap->ia_xid = INOXID_XID(XID_TAG_NFSD, uid, gid, 0);
+ if (*p++) {
+ u64 newsize;
+
+@@ -160,8 +166,10 @@ encode_fattr3(struct svc_rqst *rqstp, u3
+ *p++ = htonl(nfs3_ftypes[(stat.mode & S_IFMT) >> 12]);
+ *p++ = htonl((u32) stat.mode);
+ *p++ = htonl((u32) stat.nlink);
+- *p++ = htonl((u32) nfsd_ruid(rqstp, stat.uid));
+- *p++ = htonl((u32) nfsd_rgid(rqstp, stat.gid));
++ *p++ = htonl((u32) nfsd_ruid(rqstp,
++ XIDINO_UID(XID_TAG(dentry->d_inode), stat.uid, stat.xid)));
++ *p++ = htonl((u32) nfsd_rgid(rqstp,
++ XIDINO_GID(XID_TAG(dentry->d_inode), stat.gid, stat.xid)));
+ if (S_ISLNK(stat.mode) && stat.size > NFS3_MAXPATHLEN) {
+ p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
+ } else {
+Index: linux-2.6.12/fs/nfsd/nfs4xdr.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfsd/nfs4xdr.c
++++ linux-2.6.12/fs/nfsd/nfs4xdr.c
+@@ -57,6 +57,7 @@
+ #include <linux/nfsd_idmap.h>
+ #include <linux/nfs4.h>
+ #include <linux/nfs4_acl.h>
++#include <linux/vserver/xid.h>
+
+ #define NFSDDBG_FACILITY NFSDDBG_XDR
+
+@@ -1560,14 +1561,18 @@ out_acl:
+ WRITE32(stat.nlink);
+ }
+ if (bmval1 & FATTR4_WORD1_OWNER) {
+- status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen);
++ status = nfsd4_encode_user(rqstp,
++ XIDINO_UID(XID_TAG(dentry->d_inode),
++ stat.uid, stat.xid), &p, &buflen);
+ if (status == nfserr_resource)
+ goto out_resource;
+ if (status)
+ goto out;
+ }
+ if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
+- status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen);
++ status = nfsd4_encode_group(rqstp,
++ XIDINO_GID(XID_TAG(dentry->d_inode),
++ stat.gid, stat.xid), &p, &buflen);
+ if (status == nfserr_resource)
+ goto out_resource;
+ if (status)
+Index: linux-2.6.12/fs/nfsd/nfsxdr.c
+===================================================================
+--- linux-2.6.12.orig/fs/nfsd/nfsxdr.c
++++ linux-2.6.12/fs/nfsd/nfsxdr.c
+@@ -15,6 +15,7 @@
+ #include <linux/nfsd/nfsd.h>
+ #include <linux/nfsd/xdr.h>
+ #include <linux/mm.h>
++#include <linux/vserver/xid.h>
+
+ #define NFSDDBG_FACILITY NFSDDBG_XDR
+
+@@ -96,6 +97,8 @@ static inline u32 *
+ decode_sattr(u32 *p, struct iattr *iap)
+ {
+ u32 tmp, tmp1;
++ uid_t uid = 0;
++ gid_t gid = 0;
+
+ iap->ia_valid = 0;
+
+@@ -109,12 +112,15 @@ decode_sattr(u32 *p, struct iattr *iap)
+ }
+ if ((tmp = ntohl(*p++)) != (u32)-1) {
+ iap->ia_valid |= ATTR_UID;
+- iap->ia_uid = tmp;
++ uid = tmp;
+ }
+ if ((tmp = ntohl(*p++)) != (u32)-1) {
+ iap->ia_valid |= ATTR_GID;
+- iap->ia_gid = tmp;
++ gid = tmp;
+ }
++ iap->ia_uid = INOXID_UID(XID_TAG_NFSD, uid, gid);
++ iap->ia_gid = INOXID_GID(XID_TAG_NFSD, uid, gid);
++ iap->ia_xid = INOXID_XID(XID_TAG_NFSD, uid, gid, 0);
+ if ((tmp = ntohl(*p++)) != (u32)-1) {
+ iap->ia_valid |= ATTR_SIZE;
+ iap->ia_size = tmp;
+@@ -160,8 +166,10 @@ encode_fattr(struct svc_rqst *rqstp, u32
+ *p++ = htonl(nfs_ftypes[type >> 12]);
+ *p++ = htonl((u32) stat.mode);
+ *p++ = htonl((u32) stat.nlink);
+- *p++ = htonl((u32) nfsd_ruid(rqstp, stat.uid));
+- *p++ = htonl((u32) nfsd_rgid(rqstp, stat.gid));
++ *p++ = htonl((u32) nfsd_ruid(rqstp,
++ XIDINO_UID(XID_TAG(dentry->d_inode), stat.uid, stat.xid)));
++ *p++ = htonl((u32) nfsd_rgid(rqstp,
++ XIDINO_GID(XID_TAG(dentry->d_inode), stat.gid, stat.xid)));
+
+ if (S_ISLNK(type) && stat.size > NFS_MAXPATHLEN) {
+ *p++ = htonl(NFS_MAXPATHLEN);
+Index: linux-2.6.12/fs/open.c
+===================================================================
+--- linux-2.6.12.orig/fs/open.c
++++ linux-2.6.12/fs/open.c
+@@ -23,6 +23,9 @@
+ #include <linux/fs.h>
+ #include <linux/pagemap.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vserver/xid.h>
+
+ #include <asm/unistd.h>
+
+@@ -41,6 +44,8 @@ int vfs_statfs(struct super_block *sb, s
+ if (retval == 0 && buf->f_frsize == 0)
+ buf->f_frsize = buf->f_bsize;
+ }
++ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ vx_vsi_statfs(sb, buf);
+ }
+ return retval;
+ }
+@@ -681,11 +686,11 @@ static int chown_common(struct dentry *
+ newattrs.ia_valid = ATTR_CTIME;
+ if (user != (uid_t) -1) {
+ newattrs.ia_valid |= ATTR_UID;
+- newattrs.ia_uid = user;
++ newattrs.ia_uid = vx_map_uid(user);
+ }
+ if (group != (gid_t) -1) {
+ newattrs.ia_valid |= ATTR_GID;
+- newattrs.ia_gid = group;
++ newattrs.ia_gid = vx_map_gid(group);
+ }
+ if (!S_ISDIR(inode->i_mode))
+ newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
+@@ -872,6 +877,7 @@ repeat:
+ FD_SET(fd, files->open_fds);
+ FD_CLR(fd, files->close_on_exec);
+ files->next_fd = fd + 1;
++ vx_openfd_inc(fd);
+ #if 1
+ /* Sanity check */
+ if (files->fd[fd] != NULL) {
+@@ -893,6 +899,7 @@ static inline void __put_unused_fd(struc
+ __FD_CLR(fd, files->open_fds);
+ if (fd < files->next_fd)
+ files->next_fd = fd;
++ vx_openfd_dec(fd);
+ }
+
+ void fastcall put_unused_fd(unsigned int fd)
+Index: linux-2.6.12/fs/proc/array.c
+===================================================================
+--- linux-2.6.12.orig/fs/proc/array.c
++++ linux-2.6.12/fs/proc/array.c
+@@ -74,6 +74,9 @@
+ #include <linux/file.h>
+ #include <linux/times.h>
+ #include <linux/cpuset.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -134,7 +137,8 @@ static const char *task_state_array[] =
+ "T (stopped)", /* 4 */
+ "T (tracing stop)", /* 8 */
+ "Z (zombie)", /* 16 */
+- "X (dead)" /* 32 */
++ "X (dead)", /* 32 */
++ "H (on hold)" /* 64 */
+ };
+
+ static inline const char * get_task_state(struct task_struct *tsk)
+@@ -143,7 +147,8 @@ static inline const char * get_task_stat
+ TASK_INTERRUPTIBLE |
+ TASK_UNINTERRUPTIBLE |
+ TASK_STOPPED |
+- TASK_TRACED)) |
++ TASK_TRACED |
++ TASK_ONHOLD)) |
+ (tsk->exit_state & (EXIT_ZOMBIE |
+ EXIT_DEAD));
+ const char **p = &task_state_array[0];
+@@ -159,8 +164,13 @@ static inline char * task_state(struct t
+ {
+ struct group_info *group_info;
+ int g;
++ pid_t pid, ptgid, tppid, tgid;
+
+ read_lock(&tasklist_lock);
++ tgid = vx_map_tgid(p->tgid);
++ pid = vx_map_pid(p->pid);
++ ptgid = vx_map_pid(p->group_leader->real_parent->tgid);
++ tppid = vx_map_pid(p->parent->pid);
+ buffer += sprintf(buffer,
+ "State:\t%s\n"
+ "SleepAVG:\t%lu%%\n"
+@@ -172,9 +182,8 @@ static inline char * task_state(struct t
+ "Gid:\t%d\t%d\t%d\t%d\n",
+ get_task_state(p),
+ (p->sleep_avg/1024)*100/(1020000000/1024),
+- p->tgid,
+- p->pid, pid_alive(p) ? p->group_leader->real_parent->tgid : 0,
+- pid_alive(p) && p->ptrace ? p->parent->pid : 0,
++ tgid, pid, (pid > 1) ? ptgid : 0,
++ pid_alive(p) && p->ptrace ? tppid : 0,
+ p->uid, p->euid, p->suid, p->fsuid,
+ p->gid, p->egid, p->sgid, p->fsgid);
+ read_unlock(&tasklist_lock);
+@@ -290,6 +299,12 @@ static inline char *task_cap(struct task
+ int proc_pid_status(struct task_struct *task, char * buffer)
+ {
+ char * orig = buffer;
++#ifdef CONFIG_VSERVER_LEGACY
++ struct vx_info *vxi;
++#endif
++#ifdef CONFIG_VSERVER_LEGACYNET
++ struct nx_info *nxi;
++#endif
+ struct mm_struct *mm = get_task_mm(task);
+
+ buffer = task_name(task, buffer);
+@@ -302,6 +317,46 @@ int proc_pid_status(struct task_struct *
+ buffer = task_sig(task, buffer);
+ buffer = task_cap(task, buffer);
+ buffer = cpuset_task_status_allowed(task, buffer);
++
++ if (task_vx_flags(task, VXF_INFO_HIDE, 0))
++ goto skip;
++#ifdef CONFIG_VSERVER_LEGACY
++ buffer += sprintf (buffer,"s_context: %d\n", vx_task_xid(task));
++ vxi = task_get_vx_info(task);
++ if (vxi) {
++ buffer += sprintf (buffer,"ctxflags: %08llx\n"
++ ,(unsigned long long)vxi->vx_flags);
++ buffer += sprintf (buffer,"initpid: %d\n"
++ ,vxi->vx_initpid);
++ } else {
++ buffer += sprintf (buffer,"ctxflags: none\n");
++ buffer += sprintf (buffer,"initpid: none\n");
++ }
++ put_vx_info(vxi);
++#else
++ buffer += sprintf (buffer,"VxID: %d\n", vx_task_xid(task));
++#endif
++#ifdef CONFIG_VSERVER_LEGACYNET
++ nxi = task_get_nx_info(task);
++ if (nxi) {
++ int i;
++
++ buffer += sprintf (buffer,"ipv4root:");
++ for (i=0; i<nxi->nbipv4; i++){
++ buffer += sprintf (buffer," %08x/%08x"
++ ,nxi->ipv4[i]
++ ,nxi->mask[i]);
++ }
++ *buffer++ = '\n';
++ buffer += sprintf (buffer,"ipv4root_bcast: %08x\n"
++ ,nxi->v4_bcast);
++ } else {
++ buffer += sprintf (buffer,"ipv4root: 0\n");
++ buffer += sprintf (buffer,"ipv4root_bcast: 0\n");
++ }
++ put_nx_info(nxi);
++#endif
++skip:
+ #if defined(CONFIG_ARCH_S390)
+ buffer = task_show_regs(task, buffer);
+ #endif
+@@ -316,7 +371,7 @@ static int do_task_stat(struct task_stru
+ sigset_t sigign, sigcatch;
+ char state;
+ int res;
+- pid_t ppid, pgid = -1, sid = -1;
++ pid_t pid, ppid, pgid = -1, sid = -1;
+ int num_threads = 0;
+ struct mm_struct *mm;
+ unsigned long long start_time;
+@@ -382,7 +437,11 @@ static int do_task_stat(struct task_stru
+ }
+ it_real_value = task->signal->it_real_value;
+ }
+- ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0;
++ pid = vx_info_map_pid(task->vx_info, pid_alive(task) ? task->pid : 0);
++ ppid = (!(pid > 1)) ? 0 : vx_info_map_tgid(task->vx_info,
++ task->group_leader->real_parent->tgid);
++ pgid = vx_info_map_pid(task->vx_info, pgid);
++
+ read_unlock(&tasklist_lock);
+
+ if (!whole || num_threads<2)
+@@ -403,13 +462,25 @@ static int do_task_stat(struct task_stru
+ /* convert timespec -> nsec*/
+ start_time = (unsigned long long)task->start_time.tv_sec * NSEC_PER_SEC
+ + task->start_time.tv_nsec;
++
+ /* convert nsec -> ticks */
+ start_time = nsec_to_clock_t(start_time);
+
++ /* fixup start time for virt uptime */
++ if (vx_flags(VXF_VIRT_UPTIME, 0)) {
++ unsigned long long bias =
++ current->vx_info->cvirt.bias_clock;
++
++ if (start_time > bias)
++ start_time -= bias;
++ else
++ start_time = 0;
++ }
++
+ res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
+ %lu %lu %lu %lu %lu %ld %ld %ld %ld %d %ld %llu %lu %ld %lu %lu %lu %lu %lu \
+ %lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
+- task->pid,
++ pid,
+ tcomm,
+ state,
+ ppid,
+Index: linux-2.6.12/fs/proc/base.c
+===================================================================
+--- linux-2.6.12.orig/fs/proc/base.c
++++ linux-2.6.12/fs/proc/base.c
+@@ -35,6 +35,7 @@
+ #include <linux/seccomp.h>
+ #include <linux/cpuset.h>
+ #include <linux/audit.h>
++#include <linux/vs_network.h>
+ #include "internal.h"
+
+ /*
+@@ -80,6 +81,8 @@ enum pid_directory_inos {
+ PROC_TGID_ATTR_EXEC,
+ PROC_TGID_ATTR_FSCREATE,
+ #endif
++ PROC_TGID_VX_INFO,
++ PROC_TGID_IP_INFO,
+ #ifdef CONFIG_AUDITSYSCALL
+ PROC_TGID_LOGINUID,
+ #endif
+@@ -117,6 +120,8 @@ enum pid_directory_inos {
+ PROC_TID_ATTR_EXEC,
+ PROC_TID_ATTR_FSCREATE,
+ #endif
++ PROC_TID_VX_INFO,
++ PROC_TID_IP_INFO,
+ #ifdef CONFIG_AUDITSYSCALL
+ PROC_TID_LOGINUID,
+ #endif
+@@ -164,6 +169,8 @@ static struct pid_entry tgid_base_stuff[
+ #ifdef CONFIG_CPUSETS
+ E(PROC_TGID_CPUSET, "cpuset", S_IFREG|S_IRUGO),
+ #endif
++ E(PROC_TGID_VX_INFO, "vinfo", S_IFREG|S_IRUGO),
++ E(PROC_TGID_IP_INFO, "ninfo", S_IFREG|S_IRUGO),
+ E(PROC_TGID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO),
+ E(PROC_TGID_OOM_ADJUST,"oom_adj", S_IFREG|S_IRUGO|S_IWUSR),
+ #ifdef CONFIG_AUDITSYSCALL
+@@ -200,6 +207,8 @@ static struct pid_entry tid_base_stuff[]
+ #ifdef CONFIG_CPUSETS
+ E(PROC_TID_CPUSET, "cpuset", S_IFREG|S_IRUGO),
+ #endif
++ E(PROC_TID_VX_INFO, "vinfo", S_IFREG|S_IRUGO),
++ E(PROC_TID_IP_INFO, "ninfo", S_IFREG|S_IRUGO),
+ E(PROC_TID_OOM_SCORE, "oom_score",S_IFREG|S_IRUGO),
+ E(PROC_TID_OOM_ADJUST, "oom_adj", S_IFREG|S_IRUGO|S_IWUSR),
+ #ifdef CONFIG_AUDITSYSCALL
+@@ -1042,7 +1051,7 @@ static int proc_pident_readdir(struct fi
+ struct inode *inode = dentry->d_inode;
+ struct pid_entry *p;
+ ino_t ino;
+- int ret;
++ int ret, hide;
+
+ ret = -ENOENT;
+ if (!pid_alive(proc_task(inode)))
+@@ -1073,11 +1082,20 @@ static int proc_pident_readdir(struct fi
+ goto out;
+ }
+ p = ents + i;
++ hide = vx_flags(VXF_INFO_HIDE, 0);
+ while (p->name) {
++ if (hide) {
++ switch (p->type) {
++ case PROC_TGID_VX_INFO:
++ case PROC_TGID_IP_INFO:
++ goto skip;
++ }
++ }
+ if (filldir(dirent, p->name, p->len, filp->f_pos,
+ fake_ino(pid, p->type), p->mode >> 12) < 0)
+ goto out;
+ filp->f_pos++;
++ skip:
+ p++;
+ }
+ }
+@@ -1149,6 +1167,7 @@ static struct inode *proc_pid_make_inode
+ inode->i_uid = task->euid;
+ inode->i_gid = task->egid;
+ }
++ inode->i_xid = vx_task_xid(task);
+ security_task_to_inode(task, inode);
+
+ out:
+@@ -1174,6 +1193,11 @@ static int pid_revalidate(struct dentry
+ {
+ struct inode *inode = dentry->d_inode;
+ struct task_struct *task = proc_task(inode);
++
++ if (!vx_check(vx_task_xid(task), VX_IDENT))
++ goto out_drop;
++ /* discard wrong fakeinit */
++
+ if (pid_alive(task)) {
+ if (proc_type(inode) == PROC_TGID_INO || proc_type(inode) == PROC_TID_INO || task_dumpable(task)) {
+ inode->i_uid = task->euid;
+@@ -1185,6 +1209,7 @@ static int pid_revalidate(struct dentry
+ security_task_to_inode(task, inode);
+ return 1;
+ }
++out_drop:
+ d_drop(dentry);
+ return 0;
+ }
+@@ -1419,6 +1444,9 @@ static struct file_operations proc_tgid_
+ static struct inode_operations proc_tgid_attr_inode_operations;
+ #endif
+
++extern int proc_pid_vx_info(struct task_struct *, char *);
++extern int proc_pid_nx_info(struct task_struct *, char *);
++
+ static int get_tid_list(int index, unsigned int *tids, struct inode *dir);
+
+ /* SMP-safe */
+@@ -1594,15 +1622,33 @@ static struct dentry *proc_pident_lookup
+ inode->i_fop = &proc_loginuid_operations;
+ break;
+ #endif
++ case PROC_TID_VX_INFO:
++ case PROC_TGID_VX_INFO:
++ if (task_vx_flags(task, VXF_INFO_HIDE, 0))
++ goto out_noent;
++ inode->i_fop = &proc_info_file_operations;
++ ei->op.proc_read = proc_pid_vx_info;
++ break;
++ case PROC_TID_IP_INFO:
++ case PROC_TGID_IP_INFO:
++ if (task_vx_flags(task, VXF_INFO_HIDE, 0))
++ goto out_noent;
++ inode->i_fop = &proc_info_file_operations;
++ ei->op.proc_read = proc_pid_nx_info;
++ break;
+ default:
+ printk("procfs: impossible type (%d)",p->type);
+- iput(inode);
+- return ERR_PTR(-EINVAL);
++ error = -EINVAL;
++ goto out_put;
+ }
+ dentry->d_op = &pid_dentry_operations;
+ d_add(dentry, inode);
+ return NULL;
+
++out_noent:
++ error=-ENOENT;
++out_put:
++ iput(inode);
+ out:
+ return ERR_PTR(error);
+ }
+@@ -1686,14 +1732,14 @@ static int proc_self_readlink(struct den
+ int buflen)
+ {
+ char tmp[30];
+- sprintf(tmp, "%d", current->tgid);
++ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
+ return vfs_readlink(dentry,buffer,buflen,tmp);
+ }
+
+ static int proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+ char tmp[30];
+- sprintf(tmp, "%d", current->tgid);
++ sprintf(tmp, "%d", vx_map_tgid(current->tgid));
+ return vfs_follow_link(nd,tmp);
+ }
+
+@@ -1756,6 +1802,20 @@ void proc_pid_flush(struct dentry *proc_
+ }
+ }
+
++#define VXF_FAKE_INIT (VXF_INFO_INIT|VXF_STATE_INIT)
++
++static inline int proc_pid_visible(struct task_struct *task, int pid)
++{
++ if ((pid == 1) &&
++ !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
++ goto visible;
++ if (vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT))
++ goto visible;
++ return 0;
++visible:
++ return 1;
++}
++
+ /* SMP-safe */
+ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
+ {
+@@ -1792,13 +1852,14 @@ struct dentry *proc_pid_lookup(struct in
+ if (!task)
+ goto out;
+
+- inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
++ /* check for context visibility */
++ if (!proc_pid_visible(task, tgid))
++ goto out_drop_task;
+
++ inode = proc_pid_make_inode(dir->i_sb, task, PROC_TGID_INO);
++ if (!inode)
++ goto out_drop_task;
+
+- if (!inode) {
+- put_task_struct(task);
+- goto out;
+- }
+ inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
+ inode->i_op = &proc_tgid_base_inode_operations;
+ inode->i_fop = &proc_tgid_base_operations;
+@@ -1827,6 +1888,8 @@ struct dentry *proc_pid_lookup(struct in
+ goto out;
+ }
+ return NULL;
++out_drop_task:
++ put_task_struct(task);
+ out:
+ return ERR_PTR(-ENOENT);
+ }
+@@ -1842,6 +1905,8 @@ static struct dentry *proc_task_lookup(s
+ tid = name_to_int(dentry);
+ if (tid == ~0U)
+ goto out;
++ if (vx_current_initpid(tid))
++ goto out;
+
+ read_lock(&tasklist_lock);
+ task = find_task_by_pid(tid);
+@@ -1853,11 +1918,14 @@ static struct dentry *proc_task_lookup(s
+ if (leader->tgid != task->tgid)
+ goto out_drop_task;
+
+- inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO);
+-
++ /* check for context visibility */
++ if (!proc_pid_visible(task, tid))
++ goto out_drop_task;
+
++ inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO);
+ if (!inode)
+ goto out_drop_task;
++
+ inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
+ inode->i_op = &proc_tid_base_inode_operations;
+ inode->i_fop = &proc_tid_base_operations;
+@@ -1897,7 +1965,7 @@ static int get_tgid_list(int index, unsi
+ read_lock(&tasklist_lock);
+ p = NULL;
+ if (version) {
+- p = find_task_by_pid(version);
++ p = find_task_by_real_pid(version);
+ if (p && !thread_group_leader(p))
+ p = NULL;
+ }
+@@ -1909,11 +1977,15 @@ static int get_tgid_list(int index, unsi
+
+ for ( ; p != &init_task; p = next_task(p)) {
+ int tgid = p->pid;
++
+ if (!pid_alive(p))
+ continue;
++ /* check for context visibility */
++ if (!proc_pid_visible(p, tgid))
++ continue;
+ if (--index >= 0)
+ continue;
+- tgids[nr_tgids] = tgid;
++ tgids[nr_tgids] = vx_map_tgid(tgid);
+ nr_tgids++;
+ if (nr_tgids >= PROC_MAXPIDS)
+ break;
+@@ -1943,10 +2015,13 @@ static int get_tid_list(int index, unsig
+ if (pid_alive(task)) do {
+ int tid = task->pid;
+
++ /* check for context visibility */
++ if (!proc_pid_visible(task, tid))
++ continue;
+ if (--index >= 0)
+ continue;
+ if (tids != NULL)
+- tids[nr_tids] = tid;
++ tids[nr_tids] = vx_map_pid(tid);
+ nr_tids++;
+ if (nr_tids >= PROC_MAXPIDS)
+ break;
+@@ -2022,11 +2097,14 @@ static int proc_task_readdir(struct file
+ unsigned int nr_tids, i;
+ struct dentry *dentry = filp->f_dentry;
+ struct inode *inode = dentry->d_inode;
++ struct task_struct *task = proc_task(inode);
+ int retval = -ENOENT;
+ ino_t ino;
+ unsigned long pos = filp->f_pos; /* avoiding "long long" filp->f_pos */
+
+- if (!pid_alive(proc_task(inode)))
++ if (!vx_check(vx_task_xid(task), VX_WATCH|VX_IDENT))
++ goto out;
++ if (!pid_alive(task))
+ goto out;
+ retval = 0;
+
+Index: linux-2.6.12/fs/proc/generic.c
+===================================================================
+--- linux-2.6.12.orig/fs/proc/generic.c
++++ linux-2.6.12/fs/proc/generic.c
+@@ -19,6 +19,7 @@
+ #include <linux/idr.h>
+ #include <linux/namei.h>
+ #include <linux/bitops.h>
++#include <linux/vserver/inode.h>
+ #include <asm/uaccess.h>
+
+ static ssize_t proc_file_read(struct file *file, char __user *buf,
+@@ -372,11 +373,15 @@ struct dentry *proc_lookup(struct inode
+ for (de = de->subdir; de ; de = de->next) {
+ if (de->namelen != dentry->d_name.len)
+ continue;
++ if (!vx_hide_check(0, de->vx_flags))
++ continue;
+ if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
+ unsigned int ino = de->low_ino;
+
+ error = -EINVAL;
+ inode = proc_get_inode(dir->i_sb, ino, de);
++ /* generic proc entries belong to the host */
++ inode->i_xid = 0;
+ break;
+ }
+ }
+@@ -448,9 +453,12 @@ int proc_readdir(struct file * filp,
+ }
+
+ do {
++ if (!vx_hide_check(0, de->vx_flags))
++ goto skip;
+ if (filldir(dirent, de->name, de->namelen, filp->f_pos,
+ de->low_ino, de->mode >> 12) < 0)
+ goto out;
++ skip:
+ filp->f_pos++;
+ de = de->next;
+ } while (de);
+@@ -567,6 +575,7 @@ static struct proc_dir_entry *proc_creat
+ ent->namelen = len;
+ ent->mode = mode;
+ ent->nlink = nlink;
++ ent->vx_flags = IATTR_PROC_DEFAULT;
+ out:
+ return ent;
+ }
+@@ -587,7 +596,8 @@ struct proc_dir_entry *proc_symlink(cons
+ kfree(ent->data);
+ kfree(ent);
+ ent = NULL;
+- }
++ } else
++ ent->vx_flags = IATTR_PROC_SYMLINK;
+ } else {
+ kfree(ent);
+ ent = NULL;
+Index: linux-2.6.12/fs/proc/inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/proc/inode.c
++++ linux-2.6.12/fs/proc/inode.c
+@@ -165,6 +165,8 @@ struct inode *proc_get_inode(struct supe
+ inode->i_uid = de->uid;
+ inode->i_gid = de->gid;
+ }
++ if (de->vx_flags)
++ PROC_I(inode)->vx_flags = de->vx_flags;
+ if (de->size)
+ inode->i_size = de->size;
+ if (de->nlink)
+Index: linux-2.6.12/fs/proc/proc_misc.c
+===================================================================
+--- linux-2.6.12.orig/fs/proc/proc_misc.c
++++ linux-2.6.12/fs/proc/proc_misc.c
+@@ -51,6 +51,8 @@
+ #include <asm/div64.h>
+ #include "internal.h"
+
++#include <linux/vs_cvirt.h>
++
+ #define LOAD_INT(x) ((x) >> FSHIFT)
+ #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+ /*
+@@ -81,17 +83,32 @@ static int proc_calc_metrics(char *page,
+ static int loadavg_read_proc(char *page, char **start, off_t off,
+ int count, int *eof, void *data)
+ {
++ unsigned int running, threads;
+ int a, b, c;
+ int len;
+
+- a = avenrun[0] + (FIXED_1/200);
+- b = avenrun[1] + (FIXED_1/200);
+- c = avenrun[2] + (FIXED_1/200);
+- len = sprintf(page,"%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current->vx_info;
++
++ a = vxi->cvirt.load[0] + (FIXED_1/200);
++ b = vxi->cvirt.load[1] + (FIXED_1/200);
++ c = vxi->cvirt.load[2] + (FIXED_1/200);
++
++ running = atomic_read(&vxi->cvirt.nr_running);
++ threads = atomic_read(&vxi->cvirt.nr_threads);
++ } else {
++ a = avenrun[0] + (FIXED_1/200);
++ b = avenrun[1] + (FIXED_1/200);
++ c = avenrun[2] + (FIXED_1/200);
++
++ running = nr_running();
++ threads = nr_threads;
++ }
++ len = sprintf(page,"%d.%02d %d.%02d %d.%02d %d/%d %d\n",
+ LOAD_INT(a), LOAD_FRAC(a),
+ LOAD_INT(b), LOAD_FRAC(b),
+ LOAD_INT(c), LOAD_FRAC(c),
+- nr_running(), nr_threads, last_pid);
++ running, threads, last_pid);
+ return proc_calc_metrics(page, start, off, count, eof, len);
+ }
+
+@@ -105,6 +122,9 @@ static int uptime_read_proc(char *page,
+
+ do_posix_clock_monotonic_gettime(&uptime);
+ cputime_to_timespec(idletime, &idle);
++ if (vx_flags(VXF_VIRT_UPTIME, 0))
++ vx_vsi_uptime(&uptime, &idle);
++
+ len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
+ (unsigned long) uptime.tv_sec,
+ (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
+@@ -224,8 +244,9 @@ static int version_read_proc(char *page,
+ {
+ int len;
+
+- strcpy(page, linux_banner);
+- len = strlen(page);
++ len = sprintf(page, vx_linux_banner,
++ vx_new_uts(release),
++ vx_new_uts(version));
+ return proc_calc_metrics(page, start, off, count, eof, len);
+ }
+
+Index: linux-2.6.12/fs/proc/root.c
+===================================================================
+--- linux-2.6.12.orig/fs/proc/root.c
++++ linux-2.6.12/fs/proc/root.c
+@@ -23,6 +23,9 @@ struct proc_dir_entry *proc_net, *proc_n
+ #ifdef CONFIG_SYSCTL
+ struct proc_dir_entry *proc_sys_root;
+ #endif
++struct proc_dir_entry *proc_virtual;
++
++extern void proc_vx_init(void);
+
+ static struct super_block *proc_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
+@@ -81,6 +84,7 @@ void __init proc_root_init(void)
+ proc_device_tree_init();
+ #endif
+ proc_bus = proc_mkdir("bus", NULL);
++ proc_vx_init();
+ }
+
+ static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd)
+Index: linux-2.6.12/fs/quota.c
+===================================================================
+--- linux-2.6.12.orig/fs/quota.c
++++ linux-2.6.12/fs/quota.c
+@@ -15,6 +15,8 @@
+ #include <linux/security.h>
+ #include <linux/syscalls.h>
+ #include <linux/buffer_head.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
+
+ /* Check validity of generic quotactl commands */
+ static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
+@@ -79,11 +81,11 @@ static int generic_quotactl_valid(struct
+ if (cmd == Q_GETQUOTA) {
+ if (((type == USRQUOTA && current->euid != id) ||
+ (type == GRPQUOTA && !in_egroup_p(id))) &&
+- !capable(CAP_SYS_ADMIN))
++ !capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_QUOTA_CTL))
+ return -EPERM;
+ }
+ else if (cmd != Q_GETFMT && cmd != Q_SYNC && cmd != Q_GETINFO)
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_QUOTA_CTL))
+ return -EPERM;
+
+ return 0;
+@@ -126,10 +128,10 @@ static int xqm_quotactl_valid(struct sup
+ if (cmd == Q_XGETQUOTA) {
+ if (((type == XQM_USRQUOTA && current->euid != id) ||
+ (type == XQM_GRPQUOTA && !in_egroup_p(id))) &&
+- !capable(CAP_SYS_ADMIN))
++ !capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_QUOTA_CTL))
+ return -EPERM;
+ } else if (cmd != Q_XGETQSTAT) {
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_QUOTA_CTL))
+ return -EPERM;
+ }
+
+@@ -341,6 +343,10 @@ static int do_quotactl(struct super_bloc
+ return 0;
+ }
+
++#ifdef CONFIG_BLK_DEV_VROOT
++extern struct block_device *vroot_get_real_bdev(struct block_device *);
++#endif
++
+ /*
+ * This is the system call interface. This communicates with
+ * the user-level programs. Currently this only supports diskquota
+@@ -366,6 +372,18 @@ asmlinkage long sys_quotactl(unsigned in
+ putname(tmp);
+ if (IS_ERR(bdev))
+ return PTR_ERR(bdev);
++#ifdef CONFIG_BLK_DEV_VROOT
++ if (bdev && bdev->bd_inode &&
++ imajor(bdev->bd_inode) == VROOT_MAJOR) {
++ struct block_device *bdnew =
++ vroot_get_real_bdev(bdev);
++
++ bdput(bdev);
++ if (IS_ERR(bdnew))
++ return PTR_ERR(bdnew);
++ bdev = bdnew;
++ }
++#endif
+ sb = get_super(bdev);
+ bdput(bdev);
+ if (!sb)
+Index: linux-2.6.12/fs/reiserfs/inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/reiserfs/inode.c
++++ linux-2.6.12/fs/reiserfs/inode.c
+@@ -17,6 +17,7 @@
+ #include <linux/mpage.h>
+ #include <linux/writeback.h>
+ #include <linux/quotaops.h>
++#include <linux/vserver/xid.h>
+
+ extern int reiserfs_default_io_size; /* default io size devuned in super.c */
+
+@@ -1047,6 +1048,8 @@ static void init_inode (struct inode * i
+ struct buffer_head * bh;
+ struct item_head * ih;
+ __u32 rdev;
++ uid_t uid;
++ gid_t gid;
+ //int version = ITEM_VERSION_1;
+
+ bh = PATH_PLAST_BUFFER (path);
+@@ -1070,12 +1073,13 @@ static void init_inode (struct inode * i
+ struct stat_data_v1 * sd = (struct stat_data_v1 *)B_I_PITEM (bh, ih);
+ unsigned long blocks;
+
++ uid = sd_v1_uid(sd);
++ gid = sd_v1_gid(sd);
++
+ set_inode_item_key_version (inode, KEY_FORMAT_3_5);
+ set_inode_sd_version (inode, STAT_DATA_V1);
+ inode->i_mode = sd_v1_mode(sd);
+ inode->i_nlink = sd_v1_nlink(sd);
+- inode->i_uid = sd_v1_uid(sd);
+- inode->i_gid = sd_v1_gid(sd);
+ inode->i_size = sd_v1_size(sd);
+ inode->i_atime.tv_sec = sd_v1_atime(sd);
+ inode->i_mtime.tv_sec = sd_v1_mtime(sd);
+@@ -1115,11 +1119,12 @@ static void init_inode (struct inode * i
+ // (directories and symlinks)
+ struct stat_data * sd = (struct stat_data *)B_I_PITEM (bh, ih);
+
++ uid = sd_v2_uid(sd);
++ gid = sd_v2_gid(sd);
++
+ inode->i_mode = sd_v2_mode(sd);
+ inode->i_nlink = sd_v2_nlink(sd);
+- inode->i_uid = sd_v2_uid(sd);
+ inode->i_size = sd_v2_size(sd);
+- inode->i_gid = sd_v2_gid(sd);
+ inode->i_mtime.tv_sec = sd_v2_mtime(sd);
+ inode->i_atime.tv_sec = sd_v2_atime(sd);
+ inode->i_ctime.tv_sec = sd_v2_ctime(sd);
+@@ -1146,6 +1151,9 @@ static void init_inode (struct inode * i
+ REISERFS_I(inode)->i_attrs = sd_v2_attrs( sd );
+ sd_attrs_to_i_attrs( sd_v2_attrs( sd ), inode );
+ }
++ inode->i_uid = INOXID_UID(XID_TAG(inode), uid, gid);
++ inode->i_gid = INOXID_GID(XID_TAG(inode), uid, gid);
++ inode->i_xid = INOXID_XID(XID_TAG(inode), uid, gid, 0);
+
+ pathrelse (path);
+ if (S_ISREG (inode->i_mode)) {
+@@ -1170,13 +1178,15 @@ static void init_inode (struct inode * i
+ static void inode2sd (void * sd, struct inode * inode, loff_t size)
+ {
+ struct stat_data * sd_v2 = (struct stat_data *)sd;
++ uid_t uid = XIDINO_UID(XID_TAG(inode), inode->i_uid, inode->i_xid);
++ gid_t gid = XIDINO_GID(XID_TAG(inode), inode->i_gid, inode->i_xid);
+ __u16 flags;
+
++ set_sd_v2_uid(sd_v2, uid );
++ set_sd_v2_gid(sd_v2, gid );
+ set_sd_v2_mode(sd_v2, inode->i_mode );
+ set_sd_v2_nlink(sd_v2, inode->i_nlink );
+- set_sd_v2_uid(sd_v2, inode->i_uid );
+ set_sd_v2_size(sd_v2, size );
+- set_sd_v2_gid(sd_v2, inode->i_gid );
+ set_sd_v2_mtime(sd_v2, inode->i_mtime.tv_sec );
+ set_sd_v2_atime(sd_v2, inode->i_atime.tv_sec );
+ set_sd_v2_ctime(sd_v2, inode->i_ctime.tv_sec );
+@@ -2552,6 +2562,14 @@ void sd_attrs_to_i_attrs( __u16 sd_attrs
+ inode -> i_flags |= S_IMMUTABLE;
+ else
+ inode -> i_flags &= ~S_IMMUTABLE;
++ if( sd_attrs & REISERFS_IUNLINK_FL )
++ inode -> i_flags |= S_IUNLINK;
++ else
++ inode -> i_flags &= ~S_IUNLINK;
++ if( sd_attrs & REISERFS_BARRIER_FL )
++ inode -> i_flags |= S_BARRIER;
++ else
++ inode -> i_flags &= ~S_BARRIER;
+ if( sd_attrs & REISERFS_APPEND_FL )
+ inode -> i_flags |= S_APPEND;
+ else
+@@ -2574,6 +2592,14 @@ void i_attrs_to_sd_attrs( struct inode *
+ *sd_attrs |= REISERFS_IMMUTABLE_FL;
+ else
+ *sd_attrs &= ~REISERFS_IMMUTABLE_FL;
++ if( inode -> i_flags & S_IUNLINK )
++ *sd_attrs |= REISERFS_IUNLINK_FL;
++ else
++ *sd_attrs &= ~REISERFS_IUNLINK_FL;
++ if( inode -> i_flags & S_BARRIER )
++ *sd_attrs |= REISERFS_BARRIER_FL;
++ else
++ *sd_attrs &= ~REISERFS_BARRIER_FL;
+ if( inode -> i_flags & S_SYNC )
+ *sd_attrs |= REISERFS_SYNC_FL;
+ else
+@@ -2746,6 +2772,27 @@ static ssize_t reiserfs_direct_IO(int rw
+ offset, nr_segs, reiserfs_get_blocks_direct_io, NULL);
+ }
+
++int reiserfs_setattr_flags(struct inode *inode, unsigned int flags)
++{
++ unsigned int oldflags, newflags;
++
++ oldflags = REISERFS_I(inode)->i_flags;
++ newflags = oldflags & ~(REISERFS_IMMUTABLE_FL |
++ REISERFS_IUNLINK_FL | REISERFS_BARRIER_FL);
++ if (flags & ATTR_FLAG_IMMUTABLE)
++ newflags |= REISERFS_IMMUTABLE_FL;
++ if (flags & ATTR_FLAG_IUNLINK)
++ newflags |= REISERFS_IUNLINK_FL;
++ if (flags & ATTR_FLAG_BARRIER)
++ newflags |= REISERFS_BARRIER_FL;
++
++ if (oldflags ^ newflags) {
++ REISERFS_I(inode)->i_flags = newflags;
++ inode->i_ctime = CURRENT_TIME;
++ }
++ return 0;
++}
++
+ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) {
+ struct inode *inode = dentry->d_inode ;
+ int error ;
+@@ -2789,9 +2836,14 @@ int reiserfs_setattr(struct dentry *dent
+ }
+
+ error = inode_change_ok(inode, attr) ;
++
++ if (!error && attr->ia_valid & ATTR_ATTR_FLAG)
++ reiserfs_setattr_flags(inode, attr->ia_attr_flags);
++
+ if (!error) {
+ if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
+- (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
++ (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid) ||
++ (ia_valid & ATTR_XID && attr->ia_xid != inode->i_xid)) {
+ error = reiserfs_chown_xattrs (inode, attr);
+
+ if (!error) {
+@@ -2810,6 +2862,8 @@ int reiserfs_setattr(struct dentry *dent
+ inode->i_uid = attr->ia_uid;
+ if (attr->ia_valid & ATTR_GID)
+ inode->i_gid = attr->ia_gid;
++ if ((attr->ia_valid & ATTR_XID) && IS_TAGXID(inode))
++ inode->i_xid = attr->ia_xid;
+ mark_inode_dirty(inode);
+ journal_end(&th, inode->i_sb, 4*REISERFS_QUOTA_INIT_BLOCKS+2);
+ }
+Index: linux-2.6.12/fs/reiserfs/ioctl.c
+===================================================================
+--- linux-2.6.12.orig/fs/reiserfs/ioctl.c
++++ linux-2.6.12/fs/reiserfs/ioctl.c
+@@ -22,7 +22,7 @@ static int reiserfs_unpack (struct inode
+ int reiserfs_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
+ unsigned long arg)
+ {
+- unsigned int flags;
++ unsigned int flags, oldflags;
+
+ switch (cmd) {
+ case REISERFS_IOC_UNPACK:
+@@ -38,6 +38,7 @@ int reiserfs_ioctl (struct inode * inode
+ case REISERFS_IOC_GETFLAGS:
+ flags = REISERFS_I(inode) -> i_attrs;
+ i_attrs_to_sd_attrs( inode, ( __u16 * ) &flags );
++ flags &= REISERFS_FL_USER_VISIBLE;
+ return put_user(flags, (int __user *) arg);
+ case REISERFS_IOC_SETFLAGS: {
+ if (IS_RDONLY(inode))
+@@ -49,8 +50,12 @@ int reiserfs_ioctl (struct inode * inode
+ if (get_user(flags, (int __user *) arg))
+ return -EFAULT;
+
+- if ( ( ( flags ^ REISERFS_I(inode) -> i_attrs) & ( REISERFS_IMMUTABLE_FL | REISERFS_APPEND_FL)) &&
+- !capable( CAP_LINUX_IMMUTABLE ) )
++ oldflags = REISERFS_I(inode) -> i_attrs;
++ if ( ( (oldflags & REISERFS_IMMUTABLE_FL) ||
++ ( (flags ^ oldflags) &
++ (REISERFS_IMMUTABLE_FL | REISERFS_IUNLINK_FL |
++ REISERFS_APPEND_FL) ) ) &&
++ !capable( CAP_LINUX_IMMUTABLE ) )
+ return -EPERM;
+
+ if( ( flags & REISERFS_NOTAIL_FL ) &&
+@@ -61,6 +66,9 @@ int reiserfs_ioctl (struct inode * inode
+ if( result )
+ return result;
+ }
++
++ flags = flags & REISERFS_FL_USER_MODIFYABLE;
++ flags |= oldflags & ~REISERFS_FL_USER_MODIFYABLE;
+ sd_attrs_to_i_attrs( flags, inode );
+ REISERFS_I(inode) -> i_attrs = flags;
+ inode->i_ctime = CURRENT_TIME_SEC;
+Index: linux-2.6.12/fs/reiserfs/namei.c
+===================================================================
+--- linux-2.6.12.orig/fs/reiserfs/namei.c
++++ linux-2.6.12/fs/reiserfs/namei.c
+@@ -19,6 +19,7 @@
+ #include <linux/reiserfs_xattr.h>
+ #include <linux/smp_lock.h>
+ #include <linux/quotaops.h>
++#include <linux/vserver/xid.h>
+
+ #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { i->i_nlink++; if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
+ #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) i->i_nlink--;
+@@ -350,6 +351,7 @@ static struct dentry * reiserfs_lookup (
+ reiserfs_write_unlock(dir->i_sb);
+ return ERR_PTR(-EACCES);
+ }
++ vx_propagate_xid(nd, inode);
+
+ /* Propogate the priv_object flag so we know we're in the priv tree */
+ if (is_reiserfs_priv_object (dir))
+@@ -576,6 +578,7 @@ static int new_inode_init(struct inode *
+ } else {
+ inode->i_gid = current->fsgid;
+ }
++ inode->i_xid = vx_current_fsxid(inode->i_sb);
+ DQUOT_INIT(inode);
+ return 0 ;
+ }
+Index: linux-2.6.12/fs/reiserfs/super.c
+===================================================================
+--- linux-2.6.12.orig/fs/reiserfs/super.c
++++ linux-2.6.12/fs/reiserfs/super.c
+@@ -850,6 +850,9 @@ static int reiserfs_parse_options (struc
+ {"user_xattr", .setmask = 1<<REISERFS_UNSUPPORTED_OPT},
+ {"nouser_xattr",.clrmask = 1<<REISERFS_UNSUPPORTED_OPT},
+ #endif
++#ifndef CONFIG_INOXID_NONE
++ {"tagxid", .setmask = 1<<REISERFS_TAGXID},
++#endif
+ #ifdef CONFIG_REISERFS_FS_POSIX_ACL
+ {"acl", .setmask = 1<<REISERFS_POSIXACL},
+ {"noacl", .clrmask = 1<<REISERFS_POSIXACL},
+@@ -1088,6 +1091,11 @@ static int reiserfs_remount (struct supe
+ return -EINVAL;
+ }
+
++ if ((mount_options & (1 << REISERFS_TAGXID)) && !(s->s_flags & MS_TAGXID)) {
++ reiserfs_warning(s, "reiserfs: tagxid not permitted on remount.");
++ return -EINVAL;
++ }
++
+ handle_attrs(s);
+
+ /* Add options that are safe here */
+@@ -1625,6 +1633,10 @@ static int reiserfs_fill_super (struct s
+ goto error;
+ }
+
++ /* map mount option tagxid */
++ if (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TAGXID))
++ s->s_flags |= MS_TAGXID ;
++
+ rs = SB_DISK_SUPER_BLOCK (s);
+ /* Let's do basic sanity check to verify that underlying device is not
+ smaller than the filesystem. If the check fails then abort and scream,
+Index: linux-2.6.12/fs/stat.c
+===================================================================
+--- linux-2.6.12.orig/fs/stat.c
++++ linux-2.6.12/fs/stat.c
+@@ -27,6 +27,7 @@ void generic_fillattr(struct inode *inod
+ stat->nlink = inode->i_nlink;
+ stat->uid = inode->i_uid;
+ stat->gid = inode->i_gid;
++ stat->xid = inode->i_xid;
+ stat->rdev = inode->i_rdev;
+ stat->atime = inode->i_atime;
+ stat->mtime = inode->i_mtime;
+Index: linux-2.6.12/fs/super.c
+===================================================================
+--- linux-2.6.12.orig/fs/super.c
++++ linux-2.6.12/fs/super.c
+@@ -37,6 +37,8 @@
+ #include <linux/writeback.h> /* for the emergency remount stuff */
+ #include <linux/idr.h>
+ #include <linux/kobject.h>
++#include <linux/devpts_fs.h>
++#include <linux/proc_fs.h>
+ #include <asm/uaccess.h>
+
+
+@@ -797,7 +799,7 @@ struct vfsmount *
+ do_kern_mount(const char *fstype, int flags, const char *name, void *data)
+ {
+ struct file_system_type *type = get_fs_type(fstype);
+- struct super_block *sb = ERR_PTR(-ENOMEM);
++ struct super_block *sb;
+ struct vfsmount *mnt;
+ int error;
+ char *secdata = NULL;
+@@ -805,6 +807,12 @@ do_kern_mount(const char *fstype, int fl
+ if (!type)
+ return ERR_PTR(-ENODEV);
+
++ sb = ERR_PTR(-EPERM);
++ if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++ !capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_BINARY_MOUNT))
++ goto out;
++
++ sb = ERR_PTR(-ENOMEM);
+ mnt = alloc_vfsmnt(name);
+ if (!mnt)
+ goto out;
+@@ -826,6 +834,13 @@ do_kern_mount(const char *fstype, int fl
+ sb = type->get_sb(type, flags, name, data);
+ if (IS_ERR(sb))
+ goto out_free_secdata;
++
++ error = -EPERM;
++ if (!capable(CAP_SYS_ADMIN) && !sb->s_bdev &&
++ (sb->s_magic != PROC_SUPER_MAGIC) &&
++ (sb->s_magic != DEVPTS_SUPER_MAGIC))
++ goto out_sb;
++
+ error = security_sb_kern_mount(sb, secdata);
+ if (error)
+ goto out_sb;
+Index: linux-2.6.12/fs/sysfs/mount.c
+===================================================================
+--- linux-2.6.12.orig/fs/sysfs/mount.c
++++ linux-2.6.12/fs/sysfs/mount.c
+@@ -11,8 +11,6 @@
+
+ #include "sysfs.h"
+
+-/* Random magic number */
+-#define SYSFS_MAGIC 0x62656572
+
+ struct vfsmount *sysfs_mount;
+ struct super_block * sysfs_sb = NULL;
+@@ -37,7 +35,7 @@ static int sysfs_fill_super(struct super
+
+ sb->s_blocksize = PAGE_CACHE_SIZE;
+ sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+- sb->s_magic = SYSFS_MAGIC;
++ sb->s_magic = SYSFS_SUPER_MAGIC;
+ sb->s_op = &sysfs_ops;
+ sb->s_time_gran = 1;
+ sysfs_sb = sb;
+Index: linux-2.6.12/fs/xfs/linux-2.6/xfs_ioctl.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/linux-2.6/xfs_ioctl.c
++++ linux-2.6.12/fs/xfs/linux-2.6/xfs_ioctl.c
+@@ -1107,6 +1107,8 @@ xfs_ioc_fsgeometry(
+ #define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */
+ #define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */
+ #define LINUX_XFLAG_NOATIME 0x00000080 /* do not update atime */
++#define LINUX_XFLAG_BARRIER 0x04000000 /* chroot() barrier */
++#define LINUX_XFLAG_IUNLINK 0x08000000 /* immutable unlink */
+
+ STATIC unsigned int
+ xfs_merge_ioc_xflags(
+@@ -1147,6 +1149,10 @@ xfs_di2lxflags(
+
+ if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ flags |= LINUX_XFLAG_IMMUTABLE;
++ if (di_flags & XFS_DIFLAG_IUNLINK)
++ flags |= LINUX_XFLAG_IUNLINK;
++ if (di_flags & XFS_DIFLAG_BARRIER)
++ flags |= LINUX_XFLAG_BARRIER;
+ if (di_flags & XFS_DIFLAG_APPEND)
+ flags |= LINUX_XFLAG_APPEND;
+ if (di_flags & XFS_DIFLAG_SYNC)
+Index: linux-2.6.12/fs/xfs/linux-2.6/xfs_iops.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/linux-2.6/xfs_iops.c
++++ linux-2.6.12/fs/xfs/linux-2.6/xfs_iops.c
+@@ -68,6 +68,7 @@
+
+ #include <linux/xattr.h>
+ #include <linux/namei.h>
++#include <linux/vserver/xid.h>
+
+
+ /*
+@@ -239,6 +240,7 @@ linvfs_lookup(
+ d_add(dentry, NULL);
+ return NULL;
+ }
++ vx_propagate_xid(nd, LINVFS_GET_IP(cvp));
+
+ return d_splice_alias(LINVFS_GET_IP(cvp), dentry);
+ }
+@@ -468,6 +470,28 @@ linvfs_getattr(
+ }
+
+ STATIC int
++linvfs_setattr_flags(
++ vattr_t *vap,
++ unsigned int flags)
++{
++ unsigned int oldflags, newflags;
++
++ oldflags = vap->va_xflags;
++ newflags = oldflags & ~(XFS_XFLAG_IMMUTABLE |
++ XFS_XFLAG_IUNLINK | XFS_XFLAG_BARRIER);
++ if (flags & ATTR_FLAG_IMMUTABLE)
++ newflags |= XFS_XFLAG_IMMUTABLE;
++ if (flags & ATTR_FLAG_IUNLINK)
++ newflags |= XFS_XFLAG_IUNLINK;
++ if (flags & ATTR_FLAG_BARRIER)
++ newflags |= XFS_XFLAG_BARRIER;
++
++ if (oldflags ^ newflags)
++ vap->va_xflags = newflags;
++ return 0;
++}
++
++STATIC int
+ linvfs_setattr(
+ struct dentry *dentry,
+ struct iattr *attr)
+@@ -479,6 +503,10 @@ linvfs_setattr(
+ int flags = 0;
+ int error;
+
++ error = inode_change_ok(inode, attr);
++ if (error)
++ return error;
++
+ memset(&vattr, 0, sizeof(vattr_t));
+ if (ia_valid & ATTR_UID) {
+ vattr.va_mask |= XFS_AT_UID;
+@@ -488,6 +516,10 @@ linvfs_setattr(
+ vattr.va_mask |= XFS_AT_GID;
+ vattr.va_gid = attr->ia_gid;
+ }
++ if ((ia_valid & ATTR_XID) && IS_TAGXID(inode)) {
++ vattr.va_mask |= XFS_AT_XID;
++ vattr.va_xid = attr->ia_xid;
++ }
+ if (ia_valid & ATTR_SIZE) {
+ vattr.va_mask |= XFS_AT_SIZE;
+ vattr.va_size = attr->ia_size;
+@@ -518,6 +550,11 @@ linvfs_setattr(
+ flags |= ATTR_NONBLOCK;
+ #endif
+
++ if (ia_valid & ATTR_ATTR_FLAG) {
++ vattr.va_mask |= XFS_AT_XFLAGS;
++ linvfs_setattr_flags(&vattr, attr->ia_attr_flags);
++ }
++
+ VOP_SETATTR(vp, &vattr, flags, NULL, error);
+ if (error)
+ return -error;
+Index: linux-2.6.12/fs/xfs/linux-2.6/xfs_linux.h
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/linux-2.6/xfs_linux.h
++++ linux-2.6.12/fs/xfs/linux-2.6/xfs_linux.h
+@@ -152,6 +152,7 @@ static inline void set_buffer_unwritten_
+ #define current_pid() (current->pid)
+ #define current_fsuid(cred) (current->fsuid)
+ #define current_fsgid(cred) (current->fsgid)
++#define current_fsxid(cred,vp) (vx_current_fsxid(LINVFS_GET_IP(vp)->i_sb))
+
+ #define NBPP PAGE_SIZE
+ #define DPPSHFT (PAGE_SHIFT - 9)
+Index: linux-2.6.12/fs/xfs/linux-2.6/xfs_super.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/linux-2.6/xfs_super.c
++++ linux-2.6.12/fs/xfs/linux-2.6/xfs_super.c
+@@ -171,6 +171,7 @@ xfs_revalidate_inode(
+ inode->i_nlink = ip->i_d.di_nlink;
+ inode->i_uid = ip->i_d.di_uid;
+ inode->i_gid = ip->i_d.di_gid;
++ inode->i_xid = ip->i_d.di_xid;
+ if (((1 << vp->v_type) & ((1<<VBLK) | (1<<VCHR))) == 0) {
+ inode->i_rdev = 0;
+ } else {
+@@ -192,6 +193,14 @@ xfs_revalidate_inode(
+ inode->i_flags |= S_IMMUTABLE;
+ else
+ inode->i_flags &= ~S_IMMUTABLE;
++ if (ip->i_d.di_flags & XFS_DIFLAG_IUNLINK)
++ inode->i_flags |= S_IUNLINK;
++ else
++ inode->i_flags &= ~S_IUNLINK;
++ if (ip->i_d.di_flags & XFS_DIFLAG_BARRIER)
++ inode->i_flags |= S_BARRIER;
++ else
++ inode->i_flags &= ~S_BARRIER;
+ if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
+ inode->i_flags |= S_APPEND;
+ else
+@@ -641,6 +650,12 @@ linvfs_remount(
+ int error;
+
+ VFS_PARSEARGS(vfsp, options, args, 1, error);
++ if ((args->flags & XFSMNT_TAGXID) &&
++ !(sb->s_flags & MS_TAGXID)) {
++ printk("XFS: %s: tagxid not permitted on remount.\n",
++ sb->s_id);
++ error = EINVAL;
++ }
+ if (!error)
+ VFS_MNTUPDATE(vfsp, flags, args, error);
+ kmem_free(args, sizeof(*args));
+Index: linux-2.6.12/fs/xfs/linux-2.6/xfs_sysctl.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/linux-2.6/xfs_sysctl.c
++++ linux-2.6.12/fs/xfs/linux-2.6/xfs_sysctl.c
+@@ -76,74 +76,74 @@ xfs_stats_clear_proc_handler(
+ STATIC ctl_table xfs_table[] = {
+ {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.restrict_chown.min, &xfs_params.restrict_chown.max},
+
+ {XFS_SGID_INHERIT, "irix_sgid_inherit", &xfs_params.sgid_inherit.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.sgid_inherit.min, &xfs_params.sgid_inherit.max},
+
+ {XFS_SYMLINK_MODE, "irix_symlink_mode", &xfs_params.symlink_mode.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.symlink_mode.min, &xfs_params.symlink_mode.max},
+
+ {XFS_PANIC_MASK, "panic_mask", &xfs_params.panic_mask.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.panic_mask.min, &xfs_params.panic_mask.max},
+
+ {XFS_ERRLEVEL, "error_level", &xfs_params.error_level.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.error_level.min, &xfs_params.error_level.max},
+
+ {XFS_SYNCD_TIMER, "xfssyncd_centisecs", &xfs_params.syncd_timer.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.syncd_timer.min, &xfs_params.syncd_timer.max},
+
+ {XFS_INHERIT_SYNC, "inherit_sync", &xfs_params.inherit_sync.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_sync.min, &xfs_params.inherit_sync.max},
+
+ {XFS_INHERIT_NODUMP, "inherit_nodump", &xfs_params.inherit_nodump.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_nodump.min, &xfs_params.inherit_nodump.max},
+
+ {XFS_INHERIT_NOATIME, "inherit_noatime", &xfs_params.inherit_noatim.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_noatim.min, &xfs_params.inherit_noatim.max},
+
+ {XFS_BUF_TIMER, "xfsbufd_centisecs", &xfs_params.xfs_buf_timer.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.xfs_buf_timer.min, &xfs_params.xfs_buf_timer.max},
+
+ {XFS_BUF_AGE, "age_buffer_centisecs", &xfs_params.xfs_buf_age.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.xfs_buf_age.min, &xfs_params.xfs_buf_age.max},
+
+ {XFS_INHERIT_NOSYM, "inherit_nosymlinks", &xfs_params.inherit_nosym.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.inherit_nosym.min, &xfs_params.inherit_nosym.max},
+
+ {XFS_ROTORSTEP, "rotorstep", &xfs_params.rotorstep.val,
+ sizeof(int), 0644, NULL, &proc_dointvec_minmax,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.rotorstep.min, &xfs_params.rotorstep.max},
+
+ /* please keep this the last entry */
+ #ifdef CONFIG_PROC_FS
+ {XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val,
+ sizeof(int), 0644, NULL, &xfs_stats_clear_proc_handler,
+- &sysctl_intvec, NULL,
++ NULL, &sysctl_intvec, NULL,
+ &xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
+ #endif /* CONFIG_PROC_FS */
+
+Index: linux-2.6.12/fs/xfs/linux-2.6/xfs_vnode.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/linux-2.6/xfs_vnode.c
++++ linux-2.6.12/fs/xfs/linux-2.6/xfs_vnode.c
+@@ -202,6 +202,7 @@ vn_revalidate_core(
+ inode->i_nlink = vap->va_nlink;
+ inode->i_uid = vap->va_uid;
+ inode->i_gid = vap->va_gid;
++ inode->i_xid = vap->va_xid;
+ inode->i_blocks = vap->va_nblocks;
+ inode->i_mtime = vap->va_mtime;
+ inode->i_ctime = vap->va_ctime;
+@@ -210,6 +211,14 @@ vn_revalidate_core(
+ inode->i_flags |= S_IMMUTABLE;
+ else
+ inode->i_flags &= ~S_IMMUTABLE;
++ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
++ inode->i_flags |= S_IUNLINK;
++ else
++ inode->i_flags &= ~S_IUNLINK;
++ if (vap->va_xflags & XFS_XFLAG_BARRIER)
++ inode->i_flags |= S_BARRIER;
++ else
++ inode->i_flags &= ~S_BARRIER;
+ if (vap->va_xflags & XFS_XFLAG_APPEND)
+ inode->i_flags |= S_APPEND;
+ else
+Index: linux-2.6.12/fs/xfs/linux-2.6/xfs_vnode.h
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/linux-2.6/xfs_vnode.h
++++ linux-2.6.12/fs/xfs/linux-2.6/xfs_vnode.h
+@@ -413,6 +413,7 @@ typedef struct vattr {
+ xfs_nlink_t va_nlink; /* number of references to file */
+ uid_t va_uid; /* owner user id */
+ gid_t va_gid; /* owner group id */
++ xid_t va_xid; /* owner group id */
+ xfs_ino_t va_nodeid; /* file id */
+ xfs_off_t va_size; /* file size in bytes */
+ u_long va_blocksize; /* blocksize preferred for i/o */
+@@ -461,13 +462,15 @@ typedef struct vattr {
+ #define XFS_AT_PROJID 0x04000000
+ #define XFS_AT_SIZE_NOPERM 0x08000000
+ #define XFS_AT_GENCOUNT 0x10000000
++#define XFS_AT_XID 0x20000000
+
+ #define XFS_AT_ALL (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
+ XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
+ XFS_AT_ATIME|XFS_AT_MTIME|XFS_AT_CTIME|XFS_AT_RDEV|\
+ XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|XFS_AT_MAC|\
+ XFS_AT_ACL|XFS_AT_CAP|XFS_AT_INF|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|\
+- XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT)
++ XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_PROJID|XFS_AT_GENCOUNT\
++ XFS_AT_XID)
+
+ #define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
+ XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
+Index: linux-2.6.12/fs/xfs/xfs_clnt.h
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_clnt.h
++++ linux-2.6.12/fs/xfs/xfs_clnt.h
+@@ -106,5 +106,6 @@ struct xfs_mount_args {
+ #define XFSMNT_IHASHSIZE 0x20000000 /* inode hash table size */
+ #define XFSMNT_DIRSYNC 0x40000000 /* sync creat,link,unlink,rename
+ * symlink,mkdir,rmdir,mknod */
++#define XFSMNT_TAGXID 0x80000000 /* context xid tagging */
+
+ #endif /* __XFS_CLNT_H__ */
+Index: linux-2.6.12/fs/xfs/xfs_dinode.h
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_dinode.h
++++ linux-2.6.12/fs/xfs/xfs_dinode.h
+@@ -72,7 +72,8 @@ typedef struct xfs_dinode_core
+ __uint32_t di_gid; /* owner's group id */
+ __uint32_t di_nlink; /* number of links to file */
+ __uint16_t di_projid; /* owner's project id */
+- __uint8_t di_pad[8]; /* unused, zeroed space */
++ __uint16_t di_xid; /* vserver context id */
++ __uint8_t di_pad[6]; /* unused, zeroed space */
+ __uint16_t di_flushiter; /* incremented on flush */
+ xfs_timestamp_t di_atime; /* time last accessed */
+ xfs_timestamp_t di_mtime; /* time last modified */
+@@ -397,6 +398,9 @@ xfs_dinode_t *xfs_buf_to_dinode(struct x
+ #define XFS_DIFLAG_RTINHERIT_BIT 8 /* create with realtime bit set */
+ #define XFS_DIFLAG_PROJINHERIT_BIT 9 /* create with parents projid */
+ #define XFS_DIFLAG_NOSYMLINKS_BIT 10 /* disallow symlink creation */
++#define XFS_DIFLAG_BARRIER_BIT 12 /* chroot() barrier */
++#define XFS_DIFLAG_IUNLINK_BIT 13 /* immutable unlink */
++
+ #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT)
+ #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT)
+ #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT)
+@@ -408,11 +412,15 @@ xfs_dinode_t *xfs_buf_to_dinode(struct x
+ #define XFS_DIFLAG_RTINHERIT (1 << XFS_DIFLAG_RTINHERIT_BIT)
+ #define XFS_DIFLAG_PROJINHERIT (1 << XFS_DIFLAG_PROJINHERIT_BIT)
+ #define XFS_DIFLAG_NOSYMLINKS (1 << XFS_DIFLAG_NOSYMLINKS_BIT)
++#define XFS_DIFLAG_BARRIER (1 << XFS_DIFLAG_BARRIER_BIT)
++#define XFS_DIFLAG_IUNLINK (1 << XFS_DIFLAG_IUNLINK_BIT)
++
+
+ #define XFS_DIFLAG_ANY \
+ (XFS_DIFLAG_REALTIME | XFS_DIFLAG_PREALLOC | XFS_DIFLAG_NEWRTBM | \
+ XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \
+ XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \
+- XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS)
++ XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | \
++ XFS_DIFLAG_BARRIER | XFS_DIFLAG_IUNLINK)
+
+ #endif /* __XFS_DINODE_H__ */
+Index: linux-2.6.12/fs/xfs/xfs_fs.h
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_fs.h
++++ linux-2.6.12/fs/xfs/xfs_fs.h
+@@ -79,6 +79,8 @@ struct fsxattr {
+ #define XFS_XFLAG_RTINHERIT 0x00000100 /* create with rt bit set */
+ #define XFS_XFLAG_PROJINHERIT 0x00000200 /* create with parents projid */
+ #define XFS_XFLAG_NOSYMLINKS 0x00000400 /* disallow symlink creation */
++#define XFS_XFLAG_BARRIER 0x00004000 /* chroot() barrier */
++#define XFS_XFLAG_IUNLINK 0x00008000 /* immutable unlink */
+ #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
+
+ /*
+@@ -306,7 +308,8 @@ typedef struct xfs_bstat {
+ __s32 bs_extents; /* number of extents */
+ __u32 bs_gen; /* generation count */
+ __u16 bs_projid; /* project id */
+- unsigned char bs_pad[14]; /* pad space, unused */
++ __u16 bs_xid; /* context id */
++ unsigned char bs_pad[12]; /* pad space, unused */
+ __u32 bs_dmevmask; /* DMIG event mask */
+ __u16 bs_dmstate; /* DMIG state info */
+ __u16 bs_aextents; /* attribute number of extents */
+Index: linux-2.6.12/fs/xfs/xfs_inode.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_inode.c
++++ linux-2.6.12/fs/xfs/xfs_inode.c
+@@ -67,6 +67,7 @@
+ #include "xfs_mac.h"
+ #include "xfs_acl.h"
+
++#include <linux/vserver/xid.h>
+
+ kmem_zone_t *xfs_ifork_zone;
+ kmem_zone_t *xfs_inode_zone;
+@@ -792,20 +793,35 @@ xfs_xlate_dinode_core(
+ xfs_dinode_core_t *buf_core = (xfs_dinode_core_t *)buf;
+ xfs_dinode_core_t *mem_core = (xfs_dinode_core_t *)dip;
+ xfs_arch_t arch = ARCH_CONVERT;
++ uint32_t uid = 0, gid = 0;
++ uint16_t xid = 0;
+
+ ASSERT(dir);
+
++ if (dir < 0) {
++ xid = mem_core->di_xid;
++ /* FIXME supposed to use superblock flag */
++ uid = XIDINO_UID(1, mem_core->di_uid, xid);
++ gid = XIDINO_GID(1, mem_core->di_gid, xid);
++ xid = XIDINO_XID(1, xid);
++ }
++
+ INT_XLATE(buf_core->di_magic, mem_core->di_magic, dir, arch);
+ INT_XLATE(buf_core->di_mode, mem_core->di_mode, dir, arch);
+ INT_XLATE(buf_core->di_version, mem_core->di_version, dir, arch);
+ INT_XLATE(buf_core->di_format, mem_core->di_format, dir, arch);
+ INT_XLATE(buf_core->di_onlink, mem_core->di_onlink, dir, arch);
+- INT_XLATE(buf_core->di_uid, mem_core->di_uid, dir, arch);
+- INT_XLATE(buf_core->di_gid, mem_core->di_gid, dir, arch);
++ INT_XLATE(buf_core->di_uid, uid, dir, arch);
++ INT_XLATE(buf_core->di_gid, gid, dir, arch);
++ INT_XLATE(buf_core->di_xid, xid, dir, arch);
+ INT_XLATE(buf_core->di_nlink, mem_core->di_nlink, dir, arch);
+ INT_XLATE(buf_core->di_projid, mem_core->di_projid, dir, arch);
+
+ if (dir > 0) {
++ /* FIXME supposed to use superblock flag */
++ mem_core->di_uid = INOXID_UID(1, uid, gid);
++ mem_core->di_gid = INOXID_GID(1, uid, gid);
++ mem_core->di_xid = INOXID_XID(1, uid, gid, xid);
+ memcpy(mem_core->di_pad, buf_core->di_pad,
+ sizeof(buf_core->di_pad));
+ } else {
+@@ -854,6 +870,10 @@ _xfs_dic2xflags(
+ flags |= XFS_XFLAG_PREALLOC;
+ if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ flags |= XFS_XFLAG_IMMUTABLE;
++ if (di_flags & XFS_DIFLAG_IUNLINK)
++ flags |= XFS_XFLAG_IUNLINK;
++ if (di_flags & XFS_DIFLAG_BARRIER)
++ flags |= XFS_XFLAG_BARRIER;
+ if (di_flags & XFS_DIFLAG_APPEND)
+ flags |= XFS_XFLAG_APPEND;
+ if (di_flags & XFS_DIFLAG_SYNC)
+@@ -1180,6 +1200,7 @@ xfs_ialloc(
+ ASSERT(ip->i_d.di_nlink == nlink);
+ ip->i_d.di_uid = current_fsuid(cr);
+ ip->i_d.di_gid = current_fsgid(cr);
++ ip->i_d.di_xid = current_fsxid(cr, vp);
+ ip->i_d.di_projid = prid;
+ memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
+
+Index: linux-2.6.12/fs/xfs/xfs_itable.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_itable.c
++++ linux-2.6.12/fs/xfs/xfs_itable.c
+@@ -97,6 +97,7 @@ xfs_bulkstat_one_iget(
+ buf->bs_mode = dic->di_mode;
+ buf->bs_uid = dic->di_uid;
+ buf->bs_gid = dic->di_gid;
++ buf->bs_xid = dic->di_xid;
+ buf->bs_size = dic->di_size;
+ buf->bs_atime.tv_sec = dic->di_atime.t_sec;
+ buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
+@@ -172,6 +173,7 @@ xfs_bulkstat_one_dinode(
+ buf->bs_mode = INT_GET(dic->di_mode, ARCH_CONVERT);
+ buf->bs_uid = INT_GET(dic->di_uid, ARCH_CONVERT);
+ buf->bs_gid = INT_GET(dic->di_gid, ARCH_CONVERT);
++ buf->bs_xid = INT_GET(dic->di_xid, ARCH_CONVERT);
+ buf->bs_size = INT_GET(dic->di_size, ARCH_CONVERT);
+ buf->bs_atime.tv_sec = INT_GET(dic->di_atime.t_sec, ARCH_CONVERT);
+ buf->bs_atime.tv_nsec = INT_GET(dic->di_atime.t_nsec, ARCH_CONVERT);
+Index: linux-2.6.12/fs/xfs/xfs_mount.h
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_mount.h
++++ linux-2.6.12/fs/xfs/xfs_mount.h
+@@ -421,6 +421,7 @@ typedef struct xfs_mount {
+ * allocation */
+ #define XFS_MOUNT_IHASHSIZE 0x00100000 /* inode hash table size */
+ #define XFS_MOUNT_DIRSYNC 0x00200000 /* synchronous directory ops */
++#define XFS_MOUNT_TAGXID 0x80000000 /* context xid tagging */
+
+ /*
+ * Default minimum read and write sizes.
+Index: linux-2.6.12/fs/xfs/xfs_vfsops.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_vfsops.c
++++ linux-2.6.12/fs/xfs/xfs_vfsops.c
+@@ -321,6 +321,8 @@ xfs_start_flags(
+
+ if (ap->flags & XFSMNT_NOUUID)
+ mp->m_flags |= XFS_MOUNT_NOUUID;
++ if (ap->flags & XFSMNT_TAGXID)
++ mp->m_flags |= XFS_MOUNT_TAGXID;
+ if (ap->flags & XFSMNT_NOLOGFLUSH)
+ mp->m_flags |= XFS_MOUNT_NOLOGFLUSH;
+
+@@ -403,6 +405,8 @@ xfs_finish_flags(
+ return XFS_ERROR(EINVAL);
+ }
+
++ if (ap->flags & XFSMNT_TAGXID)
++ vfs->vfs_super->s_flags |= MS_TAGXID;
+ return 0;
+ }
+
+@@ -1657,6 +1661,7 @@ xfs_vget(
+ #define MNTOPT_64BITINODE "inode64" /* inodes can be allocated anywhere */
+ #define MNTOPT_IKEEP "ikeep" /* do not free empty inode clusters */
+ #define MNTOPT_NOIKEEP "noikeep" /* free empty inode clusters */
++#define MNTOPT_TAGXID "tagxid" /* context xid tagging for inodes */
+
+ STATIC unsigned long
+ suffix_strtoul(const char *cp, char **endp, unsigned int base)
+@@ -1815,6 +1820,10 @@ xfs_parseargs(
+ args->flags &= ~XFSMNT_IDELETE;
+ } else if (!strcmp(this_char, MNTOPT_NOIKEEP)) {
+ args->flags |= XFSMNT_IDELETE;
++#ifndef CONFIG_INOXID_NONE
++ } else if (!strcmp(this_char, MNTOPT_TAGXID)) {
++ args->flags |= XFSMNT_TAGXID;
++#endif
+ } else if (!strcmp(this_char, "osyncisdsync")) {
+ /* no-op, this is now the default */
+ printk("XFS: osyncisdsync is now the default, option is deprecated.\n");
+Index: linux-2.6.12/fs/xfs/xfs_vnodeops.c
+===================================================================
+--- linux-2.6.12.orig/fs/xfs/xfs_vnodeops.c
++++ linux-2.6.12/fs/xfs/xfs_vnodeops.c
+@@ -167,6 +167,7 @@ xfs_getattr(
+ vap->va_mode = ip->i_d.di_mode & MODEMASK;
+ vap->va_uid = ip->i_d.di_uid;
+ vap->va_gid = ip->i_d.di_gid;
++ vap->va_xid = ip->i_d.di_xid;
+ vap->va_projid = ip->i_d.di_projid;
+
+ /*
+@@ -299,6 +300,7 @@ xfs_setattr(
+ uint commit_flags=0;
+ uid_t uid=0, iuid=0;
+ gid_t gid=0, igid=0;
++ xid_t xid=0, ixid=0;
+ int timeflags = 0;
+ vnode_t *vp;
+ xfs_prid_t projid=0, iprojid=0;
+@@ -354,6 +356,7 @@ xfs_setattr(
+ if (XFS_IS_QUOTA_ON(mp) && (mask & (XFS_AT_UID|XFS_AT_GID))) {
+ uint qflags = 0;
+
++ /* FIXME: handle xid? */
+ if (mask & XFS_AT_UID) {
+ uid = vap->va_uid;
+ qflags |= XFS_QMOPT_UQUOTA;
+@@ -427,6 +430,8 @@ xfs_setattr(
+ if (mask &
+ (XFS_AT_MODE|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_UID|
+ XFS_AT_GID|XFS_AT_PROJID)) {
++ /* FIXME: handle xid? */
++
+ /*
+ * CAP_FOWNER overrides the following restrictions:
+ *
+@@ -475,7 +480,7 @@ xfs_setattr(
+ * and can change the group id only to a group of which he
+ * or she is a member.
+ */
+- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
++ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_XID|XFS_AT_PROJID)) {
+ /*
+ * These IDs could have changed since we last looked at them.
+ * But, we're assured that if the ownership did change
+@@ -483,10 +488,12 @@ xfs_setattr(
+ * would have changed also.
+ */
+ iuid = ip->i_d.di_uid;
+- iprojid = ip->i_d.di_projid;
+ igid = ip->i_d.di_gid;
+- gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
++ ixid = ip->i_d.di_xid;
++ iprojid = ip->i_d.di_projid;
+ uid = (mask & XFS_AT_UID) ? vap->va_uid : iuid;
++ gid = (mask & XFS_AT_GID) ? vap->va_gid : igid;
++ xid = (mask & XFS_AT_XID) ? vap->va_xid : ixid;
+ projid = (mask & XFS_AT_PROJID) ? (xfs_prid_t)vap->va_projid :
+ iprojid;
+
+@@ -515,6 +522,7 @@ xfs_setattr(
+ */
+ if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
+ (XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
++ /* FIXME: handle xid? */
+ ASSERT(tp);
+ code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
+ capable(CAP_FOWNER) ?
+@@ -747,7 +755,7 @@ xfs_setattr(
+ * and can change the group id only to a group of which he
+ * or she is a member.
+ */
+- if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID)) {
++ if (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_XID|XFS_AT_PROJID)) {
+ /*
+ * CAP_FSETID overrides the following restrictions:
+ *
+@@ -763,6 +771,12 @@ xfs_setattr(
+ * Change the ownerships and register quota modifications
+ * in the transaction.
+ */
++ if (ixid != xid) {
++ if (XFS_IS_GQUOTA_ON(mp)) {
++ /* FIXME: handle xid quota? */
++ }
++ ip->i_d.di_xid = xid;
++ }
+ if (iuid != uid) {
+ if (XFS_IS_UQUOTA_ON(mp)) {
+ ASSERT(mask & XFS_AT_UID);
+@@ -835,6 +849,10 @@ xfs_setattr(
+ di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
+ if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
+ di_flags |= XFS_DIFLAG_IMMUTABLE;
++ if (vap->va_xflags & XFS_XFLAG_IUNLINK)
++ di_flags |= XFS_DIFLAG_IUNLINK;
++ if (vap->va_xflags & XFS_XFLAG_BARRIER)
++ di_flags |= XFS_DIFLAG_BARRIER;
+ if (vap->va_xflags & XFS_XFLAG_APPEND)
+ di_flags |= XFS_DIFLAG_APPEND;
+ if (vap->va_xflags & XFS_XFLAG_SYNC)
+Index: linux-2.6.12/include/asm-arm/tlb.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-arm/tlb.h
++++ linux-2.6.12/include/asm-arm/tlb.h
+@@ -20,6 +20,7 @@
+ #include <asm/cacheflush.h>
+ #include <asm/tlbflush.h>
+ #include <asm/pgalloc.h>
++#include <linux/vs_memory.h>
+
+ /*
+ * TLB handling. This allows us to remove pages from the page
+Index: linux-2.6.12/include/asm-arm26/tlb.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-arm26/tlb.h
++++ linux-2.6.12/include/asm-arm26/tlb.h
+@@ -3,6 +3,7 @@
+
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
++#include <linux/vs_memory.h>
+
+ /*
+ * TLB handling. This allows us to remove pages from the page
+Index: linux-2.6.12/include/asm-arm26/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-arm26/unistd.h
++++ linux-2.6.12/include/asm-arm26/unistd.h
+@@ -304,6 +304,8 @@
+ #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
+ #define __NR_waitid (__NR_SYSCALL_BASE+280)
+
++#define __NR_vserver (__NR_SYSCALL_BASE+313)
++
+ /*
+ * The following SWIs are ARM private. FIXME - make appropriate for arm26
+ */
+Index: linux-2.6.12/include/asm-generic/tlb.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-generic/tlb.h
++++ linux-2.6.12/include/asm-generic/tlb.h
+@@ -15,6 +15,7 @@
+
+ #include <linux/config.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+
+Index: linux-2.6.12/include/asm-i386/elf.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-i386/elf.h
++++ linux-2.6.12/include/asm-i386/elf.h
+@@ -70,7 +70,7 @@ typedef struct user_fxsr_struct elf_fpxr
+ the loader. We need to make sure that it is out of the way of the program
+ that it will "exec", and that there is sufficient room for the brk. */
+
+-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
++#define ELF_ET_DYN_BASE ((TASK_UNMAPPED_BASE) * 2)
+
+ /* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
+ now struct_user_regs, they are different) */
+Index: linux-2.6.12/include/asm-i386/page.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-i386/page.h
++++ linux-2.6.12/include/asm-i386/page.h
+@@ -121,16 +121,23 @@ extern int sysctl_legacy_va_layout;
+
+ #endif /* __ASSEMBLY__ */
+
+-#ifdef __ASSEMBLY__
++#if defined(CONFIG_SPLIT_3GB)
+ #define __PAGE_OFFSET (0xC0000000)
+-#else
+-#define __PAGE_OFFSET (0xC0000000UL)
++#elif defined(CONFIG_SPLIT_25GB)
++#define __PAGE_OFFSET (0xA0000000)
++#elif defined(CONFIG_SPLIT_2GB)
++#define __PAGE_OFFSET (0x80000000)
++#elif defined(CONFIG_SPLIT_15GB)
++#define __PAGE_OFFSET (0x60000000)
++#elif defined(CONFIG_SPLIT_1GB)
++#define __PAGE_OFFSET (0x40000000)
+ #endif
+
+-
+ #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
+ #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
+-#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)
++#define __MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)
++#define MAXMEM ((unsigned long)(-PAGE_OFFSET-VMALLOC_RESERVE))
++
+ #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
+ #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
+ #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
+Index: linux-2.6.12/include/asm-i386/param.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-i386/param.h
++++ linux-2.6.12/include/asm-i386/param.h
+@@ -1,8 +1,14 @@
+ #ifndef _ASMi386_PARAM_H
+ #define _ASMi386_PARAM_H
+
++#include <linux/config.h>
++
+ #ifdef __KERNEL__
+-# define HZ 1000 /* Internal kernel timer frequency */
++# ifdef CONFIG_KERNEL_HZ
++# define HZ CONFIG_KERNEL_HZ
++# else
++# define HZ 1000 /* Internal kernel timer frequency */
++# endif
+ # define USER_HZ 100 /* .. some user interfaces are in "ticks" */
+ # define CLOCKS_PER_SEC (USER_HZ) /* like times() */
+ #endif
+Index: linux-2.6.12/include/asm-i386/processor.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-i386/processor.h
++++ linux-2.6.12/include/asm-i386/processor.h
+@@ -309,9 +309,10 @@ extern unsigned int mca_pentium_flag;
+ extern int bootloader_type;
+
+ /*
+- * User space process size: 3GB (default).
++ * User space process size: (3GB default).
+ */
+-#define TASK_SIZE (PAGE_OFFSET)
++#define __TASK_SIZE (__PAGE_OFFSET)
++#define TASK_SIZE ((unsigned long)__TASK_SIZE)
+
+ /* This decides where the kernel will search for a free chunk of vm
+ * space during mmap's.
+Index: linux-2.6.12/include/asm-ia64/tlb.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-ia64/tlb.h
++++ linux-2.6.12/include/asm-ia64/tlb.h
+@@ -41,6 +41,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/pgalloc.h>
+ #include <asm/processor.h>
+Index: linux-2.6.12/include/asm-parisc/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-parisc/unistd.h
++++ linux-2.6.12/include/asm-parisc/unistd.h
+@@ -755,8 +755,9 @@
+ #define __NR_mbind (__NR_Linux + 260)
+ #define __NR_get_mempolicy (__NR_Linux + 261)
+ #define __NR_set_mempolicy (__NR_Linux + 262)
++#define __NR_vserver (__NR_Linux + 263)
+
+-#define __NR_Linux_syscalls 263
++#define __NR_Linux_syscalls 264
+
+ #define HPUX_GATEWAY_ADDR 0xC0000004
+ #define LINUX_GATEWAY_ADDR 0x100
+Index: linux-2.6.12/include/asm-ppc/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-ppc/unistd.h
++++ linux-2.6.12/include/asm-ppc/unistd.h
+@@ -261,7 +261,7 @@
+ #define __NR_fadvise64_64 254
+ #define __NR_rtas 255
+ #define __NR_sys_debug_setcontext 256
+-/* Number 257 is reserved for vserver */
++#define __NR_vserver 257
+ /* Number 258 is reserved for new sys_remap_file_pages */
+ /* Number 259 is reserved for new sys_mbind */
+ /* Number 260 is reserved for new sys_get_mempolicy */
+Index: linux-2.6.12/include/asm-ppc64/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-ppc64/unistd.h
++++ linux-2.6.12/include/asm-ppc64/unistd.h
+@@ -267,7 +267,7 @@
+ /* #define __NR_fadvise64_64 254 32bit only */
+ #define __NR_rtas 255
+ /* Number 256 is reserved for sys_debug_setcontext */
+-/* Number 257 is reserved for vserver */
++#define __NR_vserver 257
+ /* Number 258 is reserved for new sys_remap_file_pages */
+ #define __NR_mbind 259
+ #define __NR_get_mempolicy 260
+Index: linux-2.6.12/include/asm-s390/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-s390/unistd.h
++++ linux-2.6.12/include/asm-s390/unistd.h
+@@ -255,7 +255,7 @@
+ #define __NR_clock_gettime (__NR_timer_create+6)
+ #define __NR_clock_getres (__NR_timer_create+7)
+ #define __NR_clock_nanosleep (__NR_timer_create+8)
+-/* Number 263 is reserved for vserver */
++#define __NR_vserver 263
+ #define __NR_fadvise64_64 264
+ #define __NR_statfs64 265
+ #define __NR_fstatfs64 266
+Index: linux-2.6.12/include/asm-sparc/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-sparc/unistd.h
++++ linux-2.6.12/include/asm-sparc/unistd.h
+@@ -283,7 +283,7 @@
+ #define __NR_timer_getoverrun 264
+ #define __NR_timer_delete 265
+ #define __NR_timer_create 266
+-/* #define __NR_vserver 267 Reserved for VSERVER */
++#define __NR_vserver 267
+ #define __NR_io_setup 268
+ #define __NR_io_destroy 269
+ #define __NR_io_submit 270
+Index: linux-2.6.12/include/asm-sparc64/tlb.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-sparc64/tlb.h
++++ linux-2.6.12/include/asm-sparc64/tlb.h
+@@ -3,6 +3,7 @@
+
+ #include <linux/config.h>
+ #include <linux/swap.h>
++#include <linux/vs_memory.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+ #include <asm/mmu_context.h>
+Index: linux-2.6.12/include/asm-sparc64/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-sparc64/unistd.h
++++ linux-2.6.12/include/asm-sparc64/unistd.h
+@@ -285,7 +285,7 @@
+ #define __NR_timer_getoverrun 264
+ #define __NR_timer_delete 265
+ #define __NR_timer_create 266
+-/* #define __NR_vserver 267 Reserved for VSERVER */
++#define __NR_vserver 267
+ #define __NR_io_setup 268
+ #define __NR_io_destroy 269
+ #define __NR_io_submit 270
+Index: linux-2.6.12/include/asm-x86_64/unistd.h
+===================================================================
+--- linux-2.6.12.orig/include/asm-x86_64/unistd.h
++++ linux-2.6.12/include/asm-x86_64/unistd.h
+@@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
+ #define __NR_utimes 235
+ __SYSCALL(__NR_utimes, sys_utimes)
+ #define __NR_vserver 236
+-__SYSCALL(__NR_vserver, sys_ni_syscall)
++__SYSCALL(__NR_vserver, sys_vserver)
+ #define __NR_mbind 237
+ __SYSCALL(__NR_mbind, sys_mbind)
+ #define __NR_set_mempolicy 238
+Index: linux-2.6.12/include/linux/capability.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/capability.h
++++ linux-2.6.12/include/linux/capability.h
+@@ -233,6 +233,7 @@ typedef __u32 kernel_cap_t;
+ /* Allow enabling/disabling tagged queuing on SCSI controllers and sending
+ arbitrary SCSI commands */
+ /* Allow setting encryption key on loopback filesystem */
++/* Allow the selection of a security context */
+
+ #define CAP_SYS_ADMIN 21
+
+@@ -286,6 +287,11 @@ typedef __u32 kernel_cap_t;
+
+ #define CAP_AUDIT_CONTROL 30
+
++/* Allow context manipulations */
++/* Allow changing context info on files */
++
++#define CAP_CONTEXT 31
++
+ #ifdef __KERNEL__
+ /*
+ * Bounding set
+Index: linux-2.6.12/include/linux/cyclades.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/cyclades.h
++++ linux-2.6.12/include/linux/cyclades.h
+@@ -585,7 +585,7 @@ struct cyclades_port {
+ int custom_divisor;
+ int x_char; /* to be pushed out ASAP */
+ int close_delay;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ unsigned long event;
+ unsigned long last_active;
+ int count; /* # of fd on device */
+Index: linux-2.6.12/include/linux/devpts_fs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/devpts_fs.h
++++ linux-2.6.12/include/linux/devpts_fs.h
+@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
+
+ #endif
+
++#define DEVPTS_SUPER_MAGIC 0x00001cd1
++
+
+ #endif /* _LINUX_DEVPTS_FS_H */
+Index: linux-2.6.12/include/linux/dtlk.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/dtlk.h
++++ linux-2.6.12/include/linux/dtlk.h
+@@ -27,7 +27,7 @@
+
+ #define DTLK_CLEAR 0x18 /* stops speech */
+
+-#define DTLK_MAX_RETRIES (loops_per_jiffy/(10000/HZ))
++#define DTLK_MAX_RETRIES (HZ*(loops_per_jiffy >> 3)/1250)
+
+ /* TTS Port Status Flags */
+ #define TTS_READABLE 0x80 /* mask for bit which is nonzero if a
+Index: linux-2.6.12/include/linux/ext2_fs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/ext2_fs.h
++++ linux-2.6.12/include/linux/ext2_fs.h
+@@ -192,10 +192,17 @@ struct ext2_group_desc
+ #define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */
+ #define EXT2_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
+ #define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
++#define EXT2_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define EXT2_IUNLINK_FL 0x08000000 /* Immutable unlink */
+ #define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */
+
++#ifdef CONFIG_VSERVER_LEGACY
++#define EXT2_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */
++#define EXT2_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */
++#else
+ #define EXT2_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
+ #define EXT2_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
++#endif
+
+ /*
+ * ioctl commands
+@@ -240,7 +247,7 @@ struct ext2_inode {
+ struct {
+ __u8 l_i_frag; /* Fragment number */
+ __u8 l_i_fsize; /* Fragment size */
+- __u16 i_pad1;
++ __u16 l_i_xid; /* LRU Context */
+ __le16 l_i_uid_high; /* these 2 fields */
+ __le16 l_i_gid_high; /* were reserved2[0] */
+ __u32 l_i_reserved2;
+@@ -272,6 +279,7 @@ struct ext2_inode {
+ #define i_gid_low i_gid
+ #define i_uid_high osd2.linux2.l_i_uid_high
+ #define i_gid_high osd2.linux2.l_i_gid_high
++#define i_raw_xid osd2.linux2.l_i_xid
+ #define i_reserved2 osd2.linux2.l_i_reserved2
+ #endif
+
+@@ -312,6 +320,7 @@ struct ext2_inode {
+ #define EXT2_MOUNT_NO_UID32 0x0200 /* Disable 32-bit UIDs */
+ #define EXT2_MOUNT_XATTR_USER 0x4000 /* Extended user attributes */
+ #define EXT2_MOUNT_POSIX_ACL 0x8000 /* POSIX Access Control Lists */
++#define EXT2_MOUNT_TAGXID (1<<24) /* Enable Context Tags */
+
+ #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
+ #define set_opt(o, opt) o |= EXT2_MOUNT_##opt
+Index: linux-2.6.12/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/ext3_fs.h
++++ linux-2.6.12/include/linux/ext3_fs.h
+@@ -185,10 +185,20 @@ struct ext3_group_desc
+ #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
+ #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
+ #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
++#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */
++#define EXT3_IUNLINK_FL 0x08000000 /* Immutable unlink */
+ #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
+
++#ifdef CONFIG_VSERVER_LEGACY
++#define EXT3_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */
++#define EXT3_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */
++#else
+ #define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
+ #define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
++#endif
++#ifdef CONFIG_VSERVER_LEGACY
++#define EXT3_IOC_SETXID FIOC_SETXIDJ
++#endif
+
+ /*
+ * Inode dynamic state flags
+@@ -273,7 +283,7 @@ struct ext3_inode {
+ struct {
+ __u8 l_i_frag; /* Fragment number */
+ __u8 l_i_fsize; /* Fragment size */
+- __u16 i_pad1;
++ __u16 l_i_xid; /* LRU Context */
+ __le16 l_i_uid_high; /* these 2 fields */
+ __le16 l_i_gid_high; /* were reserved2[0] */
+ __u32 l_i_reserved2;
+@@ -307,6 +317,7 @@ struct ext3_inode {
+ #define i_gid_low i_gid
+ #define i_uid_high osd2.linux2.l_i_uid_high
+ #define i_gid_high osd2.linux2.l_i_gid_high
++#define i_raw_xid osd2.linux2.l_i_xid
+ #define i_reserved2 osd2.linux2.l_i_reserved2
+
+ #elif defined(__GNU__)
+@@ -358,6 +369,7 @@ struct ext3_inode {
+ #define EXT3_MOUNT_RESERVATION 0x10000 /* Preallocation */
+ #define EXT3_MOUNT_BARRIER 0x20000 /* Use block barriers */
+ #define EXT3_MOUNT_NOBH 0x40000 /* No bufferheads */
++#define EXT3_MOUNT_TAGXID (1<<24) /* Enable Context Tags */
+
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+Index: linux-2.6.12/include/linux/fs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/fs.h
++++ linux-2.6.12/include/linux/fs.h
+@@ -103,6 +103,8 @@ extern int dir_notify_enable;
+ #define MS_REC 16384
+ #define MS_VERBOSE 32768
+ #define MS_POSIXACL (1<<16) /* VFS does not apply the umask */
++#define MS_TAGXID (1<<24) /* tag inodes with context information */
++#define MS_XID (1<<25) /* use specific xid for this mount */
+ #define MS_ACTIVE (1<<30)
+ #define MS_NOUSER (1<<31)
+
+@@ -130,6 +132,8 @@ extern int dir_notify_enable;
+ #define S_NOCMTIME 128 /* Do not update file c/mtime */
+ #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */
+ #define S_PRIVATE 512 /* Inode is fs-internal */
++#define S_BARRIER 1024 /* Barrier for chroot() */
++#define S_IUNLINK 2048 /* Immutable unlink */
+
+ /*
+ * Note that nosuid etc flags are inode-specific: setting some file-system
+@@ -152,14 +156,18 @@ extern int dir_notify_enable;
+ #define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
+ ((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
+ #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
++#define IS_TAGXID(inode) __IS_FLG(inode, MS_TAGXID)
+
+ #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA)
+ #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
+ #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
++#define IS_IUNLINK(inode) ((inode)->i_flags & S_IUNLINK)
++#define IS_IXORUNLINK(inode) ((IS_IUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
+ #define IS_NOATIME(inode) (__IS_FLG(inode, MS_NOATIME) || ((inode)->i_flags & S_NOATIME))
+ #define IS_NODIRATIME(inode) __IS_FLG(inode, MS_NODIRATIME)
+ #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL)
+
++#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_flags & S_BARRIER))
+ #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
+ #define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME)
+ #define IS_SWAPFILE(inode) ((inode)->i_flags & S_SWAPFILE)
+@@ -260,6 +268,7 @@ typedef void (dio_iodone_t)(struct inode
+ #define ATTR_ATTR_FLAG 1024
+ #define ATTR_KILL_SUID 2048
+ #define ATTR_KILL_SGID 4096
++#define ATTR_XID 8192
+
+ /*
+ * This is the Inode Attributes structure, used for notify_change(). It
+@@ -275,6 +284,7 @@ struct iattr {
+ umode_t ia_mode;
+ uid_t ia_uid;
+ gid_t ia_gid;
++ xid_t ia_xid;
+ loff_t ia_size;
+ struct timespec ia_atime;
+ struct timespec ia_mtime;
+@@ -291,6 +301,9 @@ struct iattr {
+ #define ATTR_FLAG_IMMUTABLE 8 /* Immutable file */
+ #define ATTR_FLAG_NODIRATIME 16 /* Don't update atime for directory */
+
++#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */
++#define ATTR_FLAG_IUNLINK 1024 /* Immutable unlink */
++
+ /*
+ * Includes for diskquotas.
+ */
+@@ -435,6 +448,7 @@ struct inode {
+ unsigned int i_nlink;
+ uid_t i_uid;
+ gid_t i_gid;
++ xid_t i_xid;
+ dev_t i_rdev;
+ loff_t i_size;
+ struct timespec i_atime;
+@@ -591,6 +605,7 @@ struct file {
+ struct fown_struct f_owner;
+ unsigned int f_uid, f_gid;
+ struct file_ra_state f_ra;
++ xid_t f_xid;
+
+ size_t f_maxcount;
+ unsigned long f_version;
+@@ -671,6 +686,7 @@ struct file_lock {
+ unsigned char fl_type;
+ loff_t fl_start;
+ loff_t fl_end;
++ xid_t fl_xid;
+
+ struct fasync_struct * fl_fasync; /* for lease break notifications */
+ unsigned long fl_break_time; /* for nonblocking lease breaks */
+@@ -1584,6 +1600,7 @@ extern int dcache_dir_open(struct inode
+ extern int dcache_dir_close(struct inode *, struct file *);
+ extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
+ extern int dcache_readdir(struct file *, void *, filldir_t);
++extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *));
+ extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+ extern int simple_statfs(struct super_block *, struct kstatfs *);
+ extern int simple_link(struct dentry *, struct inode *, struct dentry *);
+Index: linux-2.6.12/include/linux/generic_serial.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/generic_serial.h
++++ linux-2.6.12/include/linux/generic_serial.h
+@@ -42,7 +42,7 @@ struct gs_port {
+ int blocked_open;
+ struct tty_struct *tty;
+ unsigned long event;
+- unsigned short closing_wait;
++ unsigned int closing_wait;
+ int close_delay;
+ struct real_driver *rd;
+ int wakeup_chars;
+Index: linux-2.6.12/include/linux/hayesesp.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/hayesesp.h
++++ linux-2.6.12/include/linux/hayesesp.h
+@@ -88,8 +88,8 @@ struct esp_struct {
+ int stat_flags;
+ int custom_divisor;
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2;
++ unsigned int closing_wait;
++ unsigned int closing_wait2;
+ int IER; /* Interrupt Enable Register */
+ int MCR; /* Modem control register */
+ unsigned long event;
+Index: linux-2.6.12/include/linux/init_task.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/init_task.h
++++ linux-2.6.12/include/linux/init_task.h
+@@ -111,6 +111,10 @@ extern struct group_info init_groups;
+ .switch_lock = SPIN_LOCK_UNLOCKED, \
+ .journal_info = NULL, \
+ .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
++ .xid = 0, \
++ .vx_info = NULL, \
++ .nid = 0, \
++ .nx_info = NULL, \
+ }
+
+
+Index: linux-2.6.12/include/linux/ip.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/ip.h
++++ linux-2.6.12/include/linux/ip.h
+@@ -118,6 +118,7 @@ struct inet_sock {
+ /* Socket demultiplex comparisons on incoming packets. */
+ __u32 daddr; /* Foreign IPv4 addr */
+ __u32 rcv_saddr; /* Bound local IPv4 addr */
++ __u32 rcv_saddr2; /* Second bound ipv4 addr, for ipv4root */
+ __u16 dport; /* Destination port */
+ __u16 num; /* Local port */
+ __u32 saddr; /* Sending source */
+Index: linux-2.6.12/include/linux/ipc.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/ipc.h
++++ linux-2.6.12/include/linux/ipc.h
+@@ -66,6 +66,7 @@ struct kern_ipc_perm
+ mode_t mode;
+ unsigned long seq;
+ void *security;
++ xid_t xid;
+ };
+
+ #endif /* __KERNEL__ */
+Index: linux-2.6.12/include/linux/jiffies.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/jiffies.h
++++ linux-2.6.12/include/linux/jiffies.h
+@@ -38,6 +38,14 @@
+ # define SHIFT_HZ 9
+ #elif HZ >= 768 && HZ < 1536
+ # define SHIFT_HZ 10
++#elif HZ >= 1536 && HZ < 3072
++# define SHIFT_HZ 11
++#elif HZ >= 3072 && HZ < 6144
++# define SHIFT_HZ 12
++#elif HZ >= 6144 && HZ < 12288
++# define SHIFT_HZ 13
++#elif HZ >= 12288 && HZ < 24576
++# define SHIFT_HZ 14
+ #else
+ # error You lose.
+ #endif
+Index: linux-2.6.12/include/linux/kernel.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/kernel.h
++++ linux-2.6.12/include/linux/kernel.h
+@@ -17,6 +17,7 @@
+ #include <asm/bug.h>
+
+ extern const char linux_banner[];
++extern const char vx_linux_banner[];
+
+ #define INT_MAX ((int)(~0U>>1))
+ #define INT_MIN (-INT_MAX - 1)
+Index: linux-2.6.12/include/linux/major.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/major.h
++++ linux-2.6.12/include/linux/major.h
+@@ -15,6 +15,7 @@
+ #define HD_MAJOR IDE0_MAJOR
+ #define PTY_SLAVE_MAJOR 3
+ #define TTY_MAJOR 4
++#define VROOT_MAJOR 4
+ #define TTYAUX_MAJOR 5
+ #define LP_MAJOR 6
+ #define VCS_MAJOR 7
+Index: linux-2.6.12/include/linux/mount.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/mount.h
++++ linux-2.6.12/include/linux/mount.h
+@@ -19,6 +19,7 @@
+ #define MNT_NOSUID 1
+ #define MNT_NODEV 2
+ #define MNT_NOEXEC 4
++#define MNT_XID 256
+
+ struct vfsmount
+ {
+@@ -36,6 +37,7 @@ struct vfsmount
+ struct list_head mnt_list;
+ struct list_head mnt_fslink; /* link in fs-specific expiry list */
+ struct namespace *mnt_namespace; /* containing namespace */
++ xid_t mnt_xid; /* xid tagging used for vfsmount */
+ };
+
+ static inline struct vfsmount *mntget(struct vfsmount *mnt)
+Index: linux-2.6.12/include/linux/namespace.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/namespace.h
++++ linux-2.6.12/include/linux/namespace.h
+@@ -13,6 +13,7 @@ struct namespace {
+ };
+
+ extern void umount_tree(struct vfsmount *);
++extern void umount_unused(struct vfsmount *, struct fs_struct *);
+ extern int copy_namespace(int, struct task_struct *);
+ extern void __put_namespace(struct namespace *namespace);
+
+Index: linux-2.6.12/include/linux/net.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/net.h
++++ linux-2.6.12/include/linux/net.h
+@@ -62,6 +62,7 @@ typedef enum {
+ #define SOCK_ASYNC_WAITDATA 1
+ #define SOCK_NOSPACE 2
+ #define SOCK_PASSCRED 3
++#define SOCK_USER_SOCKET 4
+
+ #ifndef ARCH_HAS_SOCKET_TYPES
+ /**
+Index: linux-2.6.12/include/linux/nfs_mount.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/nfs_mount.h
++++ linux-2.6.12/include/linux/nfs_mount.h
+@@ -60,6 +60,7 @@ struct nfs_mount_data {
+ #define NFS_MOUNT_BROKEN_SUID 0x0400 /* 4 */
+ #define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
+ #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
++#define NFS_MOUNT_TAGXID 0x8000 /* tagxid */
+ #define NFS_MOUNT_FLAGMASK 0xFFFF
+
+ #endif
+Index: linux-2.6.12/include/linux/percpu.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/percpu.h
++++ linux-2.6.12/include/linux/percpu.h
+@@ -8,7 +8,7 @@
+
+ /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
+ #ifndef PERCPU_ENOUGH_ROOM
+-#define PERCPU_ENOUGH_ROOM 32768
++#define PERCPU_ENOUGH_ROOM 65536
+ #endif
+
+ /* Must be an lvalue. */
+Index: linux-2.6.12/include/linux/proc_fs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/proc_fs.h
++++ linux-2.6.12/include/linux/proc_fs.h
+@@ -55,6 +55,7 @@ struct proc_dir_entry {
+ nlink_t nlink;
+ uid_t uid;
+ gid_t gid;
++ int vx_flags;
+ unsigned long size;
+ struct inode_operations * proc_iops;
+ struct file_operations * proc_fops;
+@@ -242,9 +243,11 @@ extern void kclist_add(struct kcore_list
+ struct proc_inode {
+ struct task_struct *task;
+ int type;
++ int vx_flags;
+ union {
+ int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);
+ int (*proc_read)(struct task_struct *task, char *page);
++ int (*proc_vid_read)(int vid, char *page);
+ } op;
+ struct proc_dir_entry *pde;
+ struct inode vfs_inode;
+Index: linux-2.6.12/include/linux/ptrace.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/ptrace.h
++++ linux-2.6.12/include/linux/ptrace.h
+@@ -75,6 +75,8 @@
+
+ #include <linux/compiler.h> /* For unlikely. */
+ #include <linux/sched.h> /* For struct task_struct. */
++#include <linux/vs_cvirt.h>
++#include <linux/vs_context.h>
+
+ extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
+ extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
+Index: linux-2.6.12/include/linux/reiserfs_fs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/reiserfs_fs.h
++++ linux-2.6.12/include/linux/reiserfs_fs.h
+@@ -850,6 +850,18 @@ struct stat_data_v1
+ #define REISERFS_COMPR_FL EXT2_COMPR_FL
+ #define REISERFS_NOTAIL_FL EXT2_NOTAIL_FL
+
++/* unfortunately reiserfs sdattr is only 16 bit */
++#define REISERFS_BARRIER_FL (EXT2_BARRIER_FL >> 16)
++#define REISERFS_IUNLINK_FL (EXT2_IUNLINK_FL >> 16)
++
++#ifdef CONFIG_VSERVER_LEGACY
++#define REISERFS_FL_USER_VISIBLE (REISERFS_IUNLINK_FL|0x80FF)
++#define REISERFS_FL_USER_MODIFYABLE (REISERFS_IUNLINK_FL|0x80FF)
++#else
++#define REISERFS_FL_USER_VISIBLE 0x80FF
++#define REISERFS_FL_USER_MODIFYABLE 0x80FF
++#endif
++
+ /* persistent flags that file inherits from the parent directory */
+ #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
+ REISERFS_SYNC_FL | \
+Index: linux-2.6.12/include/linux/reiserfs_fs_sb.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/reiserfs_fs_sb.h
++++ linux-2.6.12/include/linux/reiserfs_fs_sb.h
+@@ -461,6 +461,7 @@ enum reiserfs_mount_options {
+ REISERFS_POSIXACL,
+ REISERFS_BARRIER_NONE,
+ REISERFS_BARRIER_FLUSH,
++ REISERFS_TAGXID,
+
+ /* Actions on error */
+ REISERFS_ERROR_PANIC,
+Index: linux-2.6.12/include/linux/sched.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/sched.h
++++ linux-2.6.12/include/linux/sched.h
+@@ -34,6 +34,7 @@
+ #include <linux/percpu.h>
+ #include <linux/topology.h>
+ #include <linux/seccomp.h>
++#include <linux/vs_base.h>
+
+ struct exec_domain;
+
+@@ -112,6 +113,7 @@ extern unsigned long nr_iowait(void);
+ #define TASK_TRACED 8
+ #define EXIT_ZOMBIE 16
+ #define EXIT_DEAD 32
++#define TASK_ONHOLD 64
+
+ #define __set_task_state(tsk, state_value) \
+ do { (tsk)->state = (state_value); } while (0)
+@@ -204,11 +206,12 @@ arch_get_unmapped_area_topdown(struct fi
+ extern void arch_unmap_area(struct vm_area_struct *area);
+ extern void arch_unmap_area_topdown(struct vm_area_struct *area);
+
+-#define set_mm_counter(mm, member, value) (mm)->_##member = (value)
++#define __set_mm_counter(mm, member, value) (mm)->_##member = (value)
++#define set_mm_counter(mm, member, value) vx_ ## member ## pages_sub((mm), ((mm)->_##member - value))
+ #define get_mm_counter(mm, member) ((mm)->_##member)
+-#define add_mm_counter(mm, member, value) (mm)->_##member += (value)
+-#define inc_mm_counter(mm, member) (mm)->_##member++
+-#define dec_mm_counter(mm, member) (mm)->_##member--
++#define add_mm_counter(mm, member, value) vx_ ## member ## pages_add((mm), (value))
++#define inc_mm_counter(mm, member) vx_ ## member ## pages_inc((mm))
++#define dec_mm_counter(mm, member) vx_ ## member ## pages_dec((mm))
+ typedef unsigned long mm_counter_t;
+
+ struct mm_struct {
+@@ -250,6 +253,7 @@ struct mm_struct {
+
+ /* Architecture-specific MM context */
+ mm_context_t context;
++ struct vx_info *mm_vx_info;
+
+ /* Token based thrashing protection. */
+ unsigned long swap_token_time;
+@@ -420,9 +424,10 @@ struct user_struct {
+ /* Hash table maintenance information */
+ struct list_head uidhash_list;
+ uid_t uid;
++ xid_t xid;
+ };
+
+-extern struct user_struct *find_user(uid_t);
++extern struct user_struct *find_user(xid_t, uid_t);
+
+ extern struct user_struct root_user;
+ #define INIT_USER (&root_user)
+@@ -698,6 +703,14 @@ struct task_struct {
+ struct audit_context *audit_context;
+ seccomp_t seccomp;
+
++/* vserver context data */
++ xid_t xid;
++ struct vx_info *vx_info;
++
++/* vserver network data */
++ nid_t nid;
++ struct nx_info *nx_info;
++
+ /* Thread group tracking */
+ u32 parent_exec_id;
+ u32 self_exec_id;
+@@ -885,13 +898,19 @@ extern struct task_struct init_task;
+
+ extern struct mm_struct init_mm;
+
+-#define find_task_by_pid(nr) find_task_by_pid_type(PIDTYPE_PID, nr)
++
++#define find_task_by_real_pid(nr) \
++ find_task_by_pid_type(PIDTYPE_PID, nr)
++#define find_task_by_pid(nr) \
++ find_task_by_pid_type(PIDTYPE_PID, \
++ vx_rmap_pid(nr))
++
+ extern struct task_struct *find_task_by_pid_type(int type, int pid);
+ extern void set_special_pids(pid_t session, pid_t pgrp);
+ extern void __set_special_pids(pid_t session, pid_t pgrp);
+
+ /* per-UID process charging. */
+-extern struct user_struct * alloc_uid(uid_t);
++extern struct user_struct * alloc_uid(xid_t, uid_t);
+ static inline struct user_struct *get_uid(struct user_struct *u)
+ {
+ atomic_inc(&u->__count);
+@@ -984,15 +1003,28 @@ static inline int sas_ss_flags(unsigned
+ #ifdef CONFIG_SECURITY
+ /* code is in security.c */
+ extern int capable(int cap);
++extern int vx_capable(int cap, int ccap);
+ #else
+ static inline int capable(int cap)
+ {
++ if (vx_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
++ return 0;
+ if (cap_raised(current->cap_effective, cap)) {
+ current->flags |= PF_SUPERPRIV;
+ return 1;
+ }
+ return 0;
+ }
++
++static inline int vx_capable(int cap, int ccap)
++{
++ if (cap_raised(current->cap_effective, cap) &&
++ vx_ccaps(ccap)) {
++ current->flags |= PF_SUPERPRIV;
++ return 1;
++ }
++ return 0;
++}
+ #endif
+
+ /*
+Index: linux-2.6.12/include/linux/serial.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/serial.h
++++ linux-2.6.12/include/linux/serial.h
+@@ -39,12 +39,12 @@ struct serial_struct {
+ int xmit_fifo_size;
+ int custom_divisor;
+ int baud_base;
+- unsigned short close_delay;
++ unsigned int close_delay;
+ char io_type;
+ char reserved_char[1];
+ int hub6;
+- unsigned short closing_wait; /* time to wait before closing */
+- unsigned short closing_wait2; /* no longer used... */
++ unsigned int closing_wait; /* time to wait before closing */
++ unsigned int closing_wait2; /* no longer used... */
+ unsigned char *iomem_base;
+ unsigned short iomem_reg_shift;
+ unsigned int port_high;
+Index: linux-2.6.12/include/linux/serialP.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/serialP.h
++++ linux-2.6.12/include/linux/serialP.h
+@@ -42,8 +42,8 @@ struct serial_state {
+ int count;
+ u8 *iomem_base;
+ u16 iomem_reg_shift;
+- unsigned short close_delay;
+- unsigned short closing_wait; /* time to wait before closing */
++ unsigned int close_delay;
++ unsigned int closing_wait; /* time to wait before closing */
+ struct async_icount icount;
+ int io_type;
+ struct async_struct *info;
+@@ -64,8 +64,8 @@ struct async_struct {
+ int quot;
+ int x_char; /* xon/xoff character */
+ int close_delay;
+- unsigned short closing_wait;
+- unsigned short closing_wait2; /* obsolete */
++ unsigned int closing_wait;
++ unsigned int closing_wait2; /* obsolete */
+ int IER; /* Interrupt Enable Register */
+ int MCR; /* Modem control register */
+ int LCR; /* Line control register */
+Index: linux-2.6.12/include/linux/shmem_fs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/shmem_fs.h
++++ linux-2.6.12/include/linux/shmem_fs.h
+@@ -8,6 +8,9 @@
+
+ #define SHMEM_NR_DIRECT 16
+
++#define TMPFS_SUPER_MAGIC 0x01021994
++
++
+ struct shmem_inode_info {
+ spinlock_t lock;
+ unsigned long flags;
+Index: linux-2.6.12/include/linux/stat.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/stat.h
++++ linux-2.6.12/include/linux/stat.h
+@@ -63,6 +63,7 @@ struct kstat {
+ unsigned int nlink;
+ uid_t uid;
+ gid_t gid;
++ xid_t xid;
+ dev_t rdev;
+ loff_t size;
+ struct timespec atime;
+Index: linux-2.6.12/include/linux/sunrpc/auth.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/sunrpc/auth.h
++++ linux-2.6.12/include/linux/sunrpc/auth.h
+@@ -28,6 +28,7 @@
+ struct auth_cred {
+ uid_t uid;
+ gid_t gid;
++ xid_t xid;
+ struct group_info *group_info;
+ };
+
+Index: linux-2.6.12/include/linux/sunrpc/clnt.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/sunrpc/clnt.h
++++ linux-2.6.12/include/linux/sunrpc/clnt.h
+@@ -52,7 +52,8 @@ struct rpc_clnt {
+ cl_chatty : 1,/* be verbose */
+ cl_autobind : 1,/* use getport() */
+ cl_oneshot : 1,/* dispose after use */
+- cl_dead : 1;/* abandoned */
++ cl_dead : 1,/* abandoned */
++ cl_tagxid : 1;/* do xid tagging */
+
+ struct rpc_rtt * cl_rtt; /* RTO estimator data */
+ struct rpc_portmap * cl_pmap; /* port mapping */
+Index: linux-2.6.12/include/linux/sysctl.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/sysctl.h
++++ linux-2.6.12/include/linux/sysctl.h
+@@ -140,6 +140,7 @@ enum
+ #ifdef CONFIG_ALPHA_UAC_SYSCTL
+ KERN_UAC_POLICY=70, /* int: Alpha unaligned access control policy flags */
+ #endif /* CONFIG_ALPHA_UAC_SYSCTL */
++ KERN_VSHELPER=71, /* string: path to vshelper policy agent */
+ };
+
+
+@@ -810,6 +811,9 @@ typedef int ctl_handler (ctl_table *tabl
+ typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
+ void __user *buffer, size_t *lenp, loff_t *ppos);
+
++typedef int virt_handler (struct ctl_table *ctl, int write, xid_t xid,
++ void **datap, size_t *lenp);
++
+ extern int proc_dostring(ctl_table *, int, struct file *,
+ void __user *, size_t *, loff_t *);
+ extern int proc_dointvec(ctl_table *, int, struct file *,
+@@ -891,6 +895,7 @@ struct ctl_table
+ mode_t mode;
+ ctl_table *child;
+ proc_handler *proc_handler; /* Callback for text formatting */
++ virt_handler *virt_handler; /* Context virtualization */
+ ctl_handler *strategy; /* Callback function for all r/w */
+ struct proc_dir_entry *de; /* /proc control block */
+ void *extra1;
+Index: linux-2.6.12/include/linux/sysfs.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/sysfs.h
++++ linux-2.6.12/include/linux/sysfs.h
+@@ -12,6 +12,8 @@
+
+ #include <asm/atomic.h>
+
++#define SYSFS_SUPER_MAGIC 0x62656572
++
+ struct kobject;
+ struct module;
+
+Index: linux-2.6.12/include/linux/types.h
+===================================================================
+--- linux-2.6.12.orig/include/linux/types.h
++++ linux-2.6.12/include/linux/types.h
+@@ -36,6 +36,8 @@ typedef __kernel_uid32_t uid_t;
+ typedef __kernel_gid32_t gid_t;
+ typedef __kernel_uid16_t uid16_t;
+ typedef __kernel_gid16_t gid16_t;
++typedef unsigned int xid_t;
++typedef unsigned int nid_t;
+
+ #ifdef CONFIG_UID16
+ /* This is defined by include/asm-{arch}/posix_types.h */
+Index: linux-2.6.12/include/linux/vroot.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vroot.h
+@@ -0,0 +1,45 @@
++
++/*
++ * include/linux/vroot.h
++ *
++ * written by Herbert Ptzl, 9/11/2002
++ * ported to 2.6 by Herbert Ptzl, 30/12/2004
++ *
++ * Copyright (C) 2002-2005 by Herbert Ptzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ */
++
++#ifndef _LINUX_VROOT_H
++#define _LINUX_VROOT_H
++
++
++#ifdef __KERNEL__
++
++/* Possible states of device */
++enum {
++ Vr_unbound,
++ Vr_bound,
++};
++
++struct vroot_device {
++ int vr_number;
++ int vr_refcnt;
++
++ struct semaphore vr_ctl_mutex;
++ struct block_device *vr_device;
++ int vr_state;
++};
++
++#endif /* __KERNEL__ */
++
++#define MAX_VROOT_DEFAULT 8
++
++/*
++ * IOCTL commands --- we will commandeer 0x56 ('V')
++ */
++
++#define VROOT_SET_DEV 0x5600
++#define VROOT_CLR_DEV 0x5601
++
++#endif /* _LINUX_VROOT_H */
+Index: linux-2.6.12/include/linux/vs_base.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_base.h
+@@ -0,0 +1,104 @@
++#ifndef _VX_VS_BASE_H
++#define _VX_VS_BASE_H
++
++
++#include "vserver/context.h"
++
++
++#define vx_task_xid(t) ((t)->xid)
++
++#define vx_current_xid() vx_task_xid(current)
++
++#define vx_check(c,m) __vx_check(vx_current_xid(),c,m)
++
++#define vx_weak_check(c,m) ((m) ? vx_check(c,m) : 1)
++
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally agains supplied argument
++ */
++static inline int __vx_check(xid_t cid, xid_t id, unsigned int mode)
++{
++ if (mode & VX_ARG_MASK) {
++ if ((mode & VX_IDENT) &&
++ (id == cid))
++ return 1;
++ }
++ if (mode & VX_ATR_MASK) {
++ if ((mode & VX_DYNAMIC) &&
++ (id >= MIN_D_CONTEXT) &&
++ (id <= MAX_S_CONTEXT))
++ return 1;
++ if ((mode & VX_STATIC) &&
++ (id > 1) && (id < MIN_D_CONTEXT))
++ return 1;
++ }
++ return (((mode & VX_ADMIN) && (cid == 0)) ||
++ ((mode & VX_WATCH) && (cid == 1)) ||
++ ((mode & VX_HOSTID) && (id == 0)));
++}
++
++
++#define __vx_state(v) ((v) ? ((v)->vx_state) : 0)
++
++#define vx_info_state(v,m) (__vx_state(v) & (m))
++
++
++/* generic flag merging */
++
++#define vx_check_flags(v,m,f) (((v) & (m)) ^ (f))
++
++#define vx_mask_flags(v,f,m) (((v) & ~(m)) | ((f) & (m)))
++
++#define vx_mask_mask(v,f,m) (((v) & ~(m)) | ((v) & (f) & (m)))
++
++#define vx_check_bit(v,n) ((v) & (1LL << (n)))
++
++
++/* context flags */
++
++#define __vx_flags(v) ((v) ? (v)->vx_flags : 0)
++
++#define vx_current_flags() __vx_flags(current->vx_info)
++
++#define vx_info_flags(v,m,f) \
++ vx_check_flags(__vx_flags(v),(m),(f))
++
++#define task_vx_flags(t,m,f) \
++ ((t) && vx_info_flags((t)->vx_info, (m), (f)))
++
++#define vx_flags(m,f) vx_info_flags(current->vx_info,(m),(f))
++
++
++/* context caps */
++
++#define __vx_ccaps(v) ((v) ? (v)->vx_ccaps : 0)
++
++#define vx_current_ccaps() __vx_ccaps(current->vx_info)
++
++#define vx_info_ccaps(v,c) (__vx_ccaps(v) & (c))
++
++#define vx_ccaps(c) vx_info_ccaps(current->vx_info,(c))
++
++
++#define __vx_mcaps(v) ((v) ? (v)->vx_ccaps >> 32UL : ~0 )
++
++#define vx_info_mcaps(v,c) (__vx_mcaps(v) & (c))
++
++#define vx_mcaps(c) vx_info_mcaps(current->vx_info,(c))
++
++
++#define vx_current_bcaps() \
++ (((current->vx_info) && !vx_flags(VXF_STATE_SETUP, 0)) ? \
++ current->vx_info->vx_bcaps : cap_bset)
++
++
++#define vx_current_initpid(n) \
++ (current->vx_info && \
++ (current->vx_info->vx_initpid == (n)))
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_context.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_context.h
+@@ -0,0 +1,171 @@
++#ifndef _VX_VS_CONTEXT_H
++#define _VX_VS_CONTEXT_H
++
++
++#include <linux/kernel.h>
++#include "vserver/debug.h"
++
++
++#define get_vx_info(i) __get_vx_info(i,__FILE__,__LINE__)
++
++static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
++ const char *_file, int _line)
++{
++ if (!vxi)
++ return NULL;
++
++ vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ vxh_get_vx_info(vxi);
++
++ atomic_inc(&vxi->vx_usecnt);
++ return vxi;
++}
++
++
++extern void free_vx_info(struct vx_info *);
++
++#define put_vx_info(i) __put_vx_info(i,__FILE__,__LINE__)
++
++static inline void __put_vx_info(struct vx_info *vxi,
++ const char *_file, int _line)
++{
++ if (!vxi)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ vxh_put_vx_info(vxi);
++
++ if (atomic_dec_and_test(&vxi->vx_usecnt))
++ free_vx_info(vxi);
++}
++
++
++#define init_vx_info(p,i) __init_vx_info(p,i,__FILE__,__LINE__)
++
++static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++ const char *_file, int _line)
++{
++ if (vxi) {
++ vxlprintk(VXD_CBIT(xid, 3),
++ "init_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ vxh_init_vx_info(vxi, vxp);
++
++ atomic_inc(&vxi->vx_usecnt);
++ }
++ *vxp = vxi;
++}
++
++
++#define set_vx_info(p,i) __set_vx_info(p,i,__FILE__,__LINE__)
++
++static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++ const char *_file, int _line)
++{
++ struct vx_info *vxo;
++
++ if (!vxi)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 3), "set_vx_info(%p[#%d.%d])",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ _file, _line);
++ vxh_set_vx_info(vxi, vxp);
++
++ atomic_inc(&vxi->vx_usecnt);
++ vxo = xchg(vxp, vxi);
++ BUG_ON(vxo);
++}
++
++
++#define clr_vx_info(p) __clr_vx_info(p,__FILE__,__LINE__)
++
++static inline void __clr_vx_info(struct vx_info **vxp,
++ const char *_file, int _line)
++{
++ struct vx_info *vxo;
++
++ vxo = xchg(vxp, NULL);
++ if (!vxo)
++ return;
++
++ vxlprintk(VXD_CBIT(xid, 3), "clr_vx_info(%p[#%d.%d])",
++ vxo, vxo?vxo->vx_id:0,
++ vxo?atomic_read(&vxo->vx_usecnt):0,
++ _file, _line);
++ vxh_clr_vx_info(vxo, vxp);
++
++ if (atomic_dec_and_test(&vxo->vx_usecnt))
++ free_vx_info(vxo);
++}
++
++
++#define claim_vx_info(v,p) __claim_vx_info(v,p,__FILE__,__LINE__)
++
++static inline void __claim_vx_info(struct vx_info *vxi,
++ struct task_struct *task, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(xid, 3), "claim_vx_info(%p[#%d.%d.%d]) %p",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ vxi?atomic_read(&vxi->vx_tasks):0,
++ task, _file, _line);
++ vxh_claim_vx_info(vxi, task);
++
++ atomic_inc(&vxi->vx_tasks);
++}
++
++
++extern void unhash_vx_info(struct vx_info *);
++
++#define release_vx_info(v,p) __release_vx_info(v,p,__FILE__,__LINE__)
++
++static inline void __release_vx_info(struct vx_info *vxi,
++ struct task_struct *task, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(xid, 3), "release_vx_info(%p[#%d.%d.%d]) %p",
++ vxi, vxi?vxi->vx_id:0,
++ vxi?atomic_read(&vxi->vx_usecnt):0,
++ vxi?atomic_read(&vxi->vx_tasks):0,
++ task, _file, _line);
++ vxh_release_vx_info(vxi, task);
++
++ might_sleep();
++
++ if (atomic_dec_and_test(&vxi->vx_tasks))
++ unhash_vx_info(vxi);
++}
++
++
++#define task_get_vx_info(p) __task_get_vx_info(p,__FILE__,__LINE__)
++
++static __inline__ struct vx_info *__task_get_vx_info(struct task_struct *p,
++ const char *_file, int _line)
++{
++ struct vx_info *vxi;
++
++ task_lock(p);
++ vxlprintk(VXD_CBIT(xid, 5), "task_get_vx_info(%p)",
++ p, _file, _line);
++ vxi = __get_vx_info(p->vx_info, _file, _line);
++ task_unlock(p);
++ return vxi;
++}
++
++
++static inline void __wakeup_vx_info(struct vx_info *vxi)
++{
++ if (waitqueue_active(&vxi->vx_wait))
++ wake_up_interruptible(&vxi->vx_wait);
++}
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_cvirt.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_cvirt.h
+@@ -0,0 +1,109 @@
++#ifndef _VX_VS_CVIRT_H
++#define _VX_VS_CVIRT_H
++
++
++#include "vserver/cvirt.h"
++#include "vserver/debug.h"
++
++
++/* utsname virtualization */
++
++static inline struct new_utsname *vx_new_utsname(void)
++{
++ if (current->vx_info)
++ return &current->vx_info->cvirt.utsname;
++ return &system_utsname;
++}
++
++#define vx_new_uts(x) ((vx_new_utsname())->x)
++
++
++/* pid faking stuff */
++
++
++#define vx_info_map_pid(v,p) \
++ __vx_info_map_pid((v), (p), __FUNC__, __FILE__, __LINE__)
++#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p)
++#define vx_map_pid(p) vx_info_map_pid(current->vx_info, p)
++#define vx_map_tgid(p) vx_map_pid(p)
++
++static inline int __vx_info_map_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
++{
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_map_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid && pid == vxi->vx_initpid)?1:pid,
++ func, file, line);
++ if (pid == 0)
++ return 0;
++ if (pid == vxi->vx_initpid)
++ return 1;
++ }
++ return pid;
++}
++
++#define vx_info_rmap_pid(v,p) \
++ __vx_info_rmap_pid((v), (p), __FUNC__, __FILE__, __LINE__)
++#define vx_rmap_pid(p) vx_info_rmap_pid(current->vx_info, p)
++#define vx_rmap_tgid(p) vx_rmap_pid(p)
++
++static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid,
++ const char *func, const char *file, int line)
++{
++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) {
++ vxfprintk(VXD_CBIT(cvirt, 2),
++ "vx_rmap_tgid: %p/%llx: %d -> %d",
++ vxi, (long long)vxi->vx_flags, pid,
++ (pid == 1)?vxi->vx_initpid:pid,
++ func, file, line);
++ if ((pid == 1) && vxi->vx_initpid)
++ return vxi->vx_initpid;
++ if (pid == vxi->vx_initpid)
++ return ~0U;
++ }
++ return pid;
++}
++
++
++static inline void vx_activate_task(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info)) {
++ vx_update_load(vxi);
++ atomic_inc(&vxi->cvirt.nr_running);
++ }
++}
++
++static inline void vx_deactivate_task(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info)) {
++ vx_update_load(vxi);
++ atomic_dec(&vxi->cvirt.nr_running);
++ }
++}
++
++static inline void vx_uninterruptible_inc(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info))
++ atomic_inc(&vxi->cvirt.nr_uninterruptible);
++}
++
++static inline void vx_uninterruptible_dec(struct task_struct *p)
++{
++ struct vx_info *vxi;
++
++ if ((vxi = p->vx_info))
++ atomic_dec(&vxi->cvirt.nr_uninterruptible);
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_dlimit.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_dlimit.h
+@@ -0,0 +1,206 @@
++#ifndef _VX_VS_DLIMIT_H
++#define _VX_VS_DLIMIT_H
++
++
++#include "vserver/dlimit.h"
++#include "vserver/debug.h"
++
++
++#define get_dl_info(i) __get_dl_info(i,__FILE__,__LINE__)
++
++static inline struct dl_info *__get_dl_info(struct dl_info *dli,
++ const char *_file, int _line)
++{
++ if (!dli)
++ return NULL;
++ vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])",
++ dli, dli?dli->dl_xid:0, dli?atomic_read(&dli->dl_usecnt):0,
++ _file, _line);
++ atomic_inc(&dli->dl_usecnt);
++ return dli;
++}
++
++
++#define free_dl_info(i) \
++ call_rcu(&i->dl_rcu, rcu_free_dl_info);
++
++#define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__)
++
++static inline void __put_dl_info(struct dl_info *dli,
++ const char *_file, int _line)
++{
++ if (!dli)
++ return;
++ vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])",
++ dli, dli?dli->dl_xid:0, dli?atomic_read(&dli->dl_usecnt):0,
++ _file, _line);
++ if (atomic_dec_and_test(&dli->dl_usecnt))
++ free_dl_info(dli);
++}
++
++
++#define __dlimit_char(d) ((d)?'*':' ')
++
++static inline int __dl_alloc_space(struct super_block *sb,
++ xid_t xid, dlsize_t nr, const char *file, int line)
++{
++ struct dl_info *dli = NULL;
++ int ret = 0;
++
++ if (nr == 0)
++ goto out;
++ dli = locate_dl_info(sb, xid);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ ret = (dli->dl_space_used + nr > dli->dl_space_total);
++ if (!ret)
++ dli->dl_space_used += nr;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 1),
++ "ALLOC (%p,#%d)%c %lld bytes (%d)",
++ sb, xid, __dlimit_char(dli), (long long)nr,
++ ret, file, line);
++ return ret;
++}
++
++static inline void __dl_free_space(struct super_block *sb,
++ xid_t xid, dlsize_t nr, const char *_file, int _line)
++{
++ struct dl_info *dli = NULL;
++
++ if (nr == 0)
++ goto out;
++ dli = locate_dl_info(sb, xid);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ if (dli->dl_space_used > nr)
++ dli->dl_space_used -= nr;
++ else
++ dli->dl_space_used = 0;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 1),
++ "FREE (%p,#%d)%c %lld bytes",
++ sb, xid, __dlimit_char(dli), (long long)nr,
++ _file, _line);
++}
++
++static inline int __dl_alloc_inode(struct super_block *sb,
++ xid_t xid, const char *_file, int _line)
++{
++ struct dl_info *dli;
++ int ret = 0;
++
++ dli = locate_dl_info(sb, xid);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ ret = (dli->dl_inodes_used >= dli->dl_inodes_total);
++ if (!ret)
++ dli->dl_inodes_used++;
++#if 0
++ else
++ vxwprintk("DLIMIT hit (%p,#%d), inode %d>=%d @ %s:%d",
++ sb, xid,
++ dli->dl_inodes_used, dli->dl_inodes_total,
++ file, line);
++#endif
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 0),
++ "ALLOC (%p,#%d)%c inode (%d)",
++ sb, xid, __dlimit_char(dli), ret, _file, _line);
++ return ret;
++}
++
++static inline void __dl_free_inode(struct super_block *sb,
++ xid_t xid, const char *_file, int _line)
++{
++ struct dl_info *dli;
++
++ dli = locate_dl_info(sb, xid);
++ if (!dli)
++ goto out;
++
++ spin_lock(&dli->dl_lock);
++ if (dli->dl_inodes_used > 1)
++ dli->dl_inodes_used--;
++ else
++ dli->dl_inodes_used = 0;
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++out:
++ vxlprintk(VXD_CBIT(dlim, 0),
++ "FREE (%p,#%d)%c inode",
++ sb, xid, __dlimit_char(dli), _file, _line);
++}
++
++static inline void __dl_adjust_block(struct super_block *sb, xid_t xid,
++ unsigned int *free_blocks, unsigned int *root_blocks,
++ const char *_file, int _line)
++{
++ struct dl_info *dli;
++ uint64_t broot, bfree;
++
++ dli = locate_dl_info(sb, xid);
++ if (!dli)
++ return;
++
++ spin_lock(&dli->dl_lock);
++ broot = (dli->dl_space_total -
++ (dli->dl_space_total >> 10) * dli->dl_nrlmult)
++ >> sb->s_blocksize_bits;
++ bfree = (dli->dl_space_total - dli->dl_space_used)
++ >> sb->s_blocksize_bits;
++ spin_unlock(&dli->dl_lock);
++
++ vxlprintk(VXD_CBIT(dlim, 2),
++ "ADJUST: %lld,%lld on %d,%d [mult=%d]",
++ (long long)bfree, (long long)broot,
++ *free_blocks, *root_blocks, dli->dl_nrlmult,
++ _file, _line);
++ if (free_blocks) {
++ if (*free_blocks > bfree)
++ *free_blocks = bfree;
++ }
++ if (root_blocks) {
++ if (*root_blocks > broot)
++ *root_blocks = broot;
++ }
++ put_dl_info(dli);
++}
++
++
++#define DLIMIT_ALLOC_BLOCK(sb, xid, nr) \
++ __dl_alloc_space(sb, xid, \
++ ((dlsize_t)(nr)) << (sb)->s_blocksize_bits, \
++ __FILE__, __LINE__ )
++
++#define DLIMIT_FREE_BLOCK(sb, xid, nr) \
++ __dl_free_space(sb, xid, \
++ ((dlsize_t)(nr)) << (sb)->s_blocksize_bits, \
++ __FILE__, __LINE__ )
++
++#define DLIMIT_ALLOC_INODE(sb, xid) \
++ __dl_alloc_inode(sb, xid, __FILE__, __LINE__ )
++
++#define DLIMIT_FREE_INODE(sb, xid) \
++ __dl_free_inode(sb, xid, __FILE__, __LINE__ )
++
++
++#define DLIMIT_ADJUST_BLOCK(sb, xid, fb, rb) \
++ __dl_adjust_block(sb, xid, fb, rb, __FILE__, __LINE__ )
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_limit.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_limit.h
+@@ -0,0 +1,167 @@
++#ifndef _VX_VS_LIMIT_H
++#define _VX_VS_LIMIT_H
++
++
++#include "vserver/limit.h"
++#include "vserver/debug.h"
++
++
++#define vx_acc_cres(v,d,p,r) \
++ __vx_acc_cres(v, r, d, p, __FILE__, __LINE__)
++
++#define vx_acc_cres_cond(x,d,p,r) \
++ __vx_acc_cres(((x) == vx_current_xid()) ? current->vx_info : 0, \
++ r, d, p, __FILE__, __LINE__)
++
++static inline void __vx_acc_cres(struct vx_info *vxi,
++ int res, int dir, void *_data, char *_file, int _line)
++{
++ if (VXD_RLIMIT(res, RLIMIT_NOFILE) ||
++ VXD_RLIMIT(res, RLIMIT_NPROC) ||
++ VXD_RLIMIT(res, RLIMIT_LOCKS) ||
++ VXD_RLIMIT(res, VLIMIT_NSOCK) ||
++ VXD_RLIMIT(res, VLIMIT_OPENFD))
++ vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5d%s (%p)",
++ (vxi?vxi->vx_id:-1), vlimit_name[res], res,
++ (vxi?atomic_read(&vxi->limit.rcur[res]):0),
++ (dir>0)?"++":"--", _data, _file, _line);
++ if (vxi) {
++ if (dir > 0)
++ atomic_inc(&vxi->limit.rcur[res]);
++ else
++ atomic_dec(&vxi->limit.rcur[res]);
++ }
++}
++
++#define vx_add_cres(v,a,p,r) \
++ __vx_add_cres(v, r, a, p, __FILE__, __LINE__)
++#define vx_sub_cres(v,a,p,r) vx_add_cres(v,-(a),p,r)
++
++#define vx_add_cres_cond(x,a,p,r) \
++ __vx_add_cres(((x) == vx_current_xid()) ? current->vx_info : 0, \
++ r, a, p, __FILE__, __LINE__)
++#define vx_sub_cres_cond(x,a,p,r) vx_add_cres_cond(x,-(a),p,r)
++
++
++static inline void __vx_add_cres(struct vx_info *vxi,
++ int res, int amount, void *_data, char *_file, int _line)
++{
++ if (VXD_RLIMIT(res, RLIMIT_MSGQUEUE))
++ vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5d += %5d (%p)",
++ (vxi?vxi->vx_id:-1), vlimit_name[res], res,
++ (vxi?atomic_read(&vxi->limit.rcur[res]):0),
++ amount, _data, _file, _line);
++ if (amount == 0)
++ return;
++ if (vxi)
++ atomic_add(amount, &vxi->limit.rcur[res]);
++}
++
++
++/* process and file limits */
++
++#define vx_nproc_inc(p) \
++ vx_acc_cres((p)->vx_info, 1, p, RLIMIT_NPROC)
++
++#define vx_nproc_dec(p) \
++ vx_acc_cres((p)->vx_info,-1, p, RLIMIT_NPROC)
++
++#define vx_files_inc(f) \
++ vx_acc_cres_cond((f)->f_xid, 1, f, RLIMIT_NOFILE)
++
++#define vx_files_dec(f) \
++ vx_acc_cres_cond((f)->f_xid,-1, f, RLIMIT_NOFILE)
++
++#define vx_locks_inc(l) \
++ vx_acc_cres_cond((l)->fl_xid, 1, l, RLIMIT_LOCKS)
++
++#define vx_locks_dec(l) \
++ vx_acc_cres_cond((l)->fl_xid,-1, l, RLIMIT_LOCKS)
++
++#define vx_openfd_inc(f) \
++ vx_acc_cres(current->vx_info, 1, (void *)(long)(f), VLIMIT_OPENFD)
++
++#define vx_openfd_dec(f) \
++ vx_acc_cres(current->vx_info,-1, (void *)(long)(f), VLIMIT_OPENFD)
++
++
++#define vx_cres_avail(v,n,r) \
++ __vx_cres_avail(v, r, n, __FILE__, __LINE__)
++
++static inline int __vx_cres_avail(struct vx_info *vxi,
++ int res, int num, char *_file, int _line)
++{
++ unsigned long value;
++
++ if (VXD_RLIMIT(res, RLIMIT_NOFILE) ||
++ VXD_RLIMIT(res, RLIMIT_NPROC) ||
++ VXD_RLIMIT(res, VLIMIT_NSOCK) ||
++ VXD_RLIMIT(res, VLIMIT_OPENFD))
++ vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d",
++ (vxi?vxi->vx_id:-1), vlimit_name[res], res,
++ (vxi?vxi->limit.rlim[res]:1),
++ (vxi?atomic_read(&vxi->limit.rcur[res]):0),
++ num, _file, _line);
++ if (!vxi)
++ return 1;
++ value = atomic_read(&vxi->limit.rcur[res]);
++ if (value > vxi->limit.rmax[res])
++ vxi->limit.rmax[res] = value;
++ if (vxi->limit.rlim[res] == RLIM_INFINITY)
++ return 1;
++ if (value + num <= vxi->limit.rlim[res])
++ return 1;
++ atomic_inc(&vxi->limit.lhit[res]);
++ return 0;
++}
++
++#define vx_nproc_avail(n) \
++ vx_cres_avail(current->vx_info, n, RLIMIT_NPROC)
++
++#define vx_files_avail(n) \
++ vx_cres_avail(current->vx_info, n, RLIMIT_NOFILE)
++
++#define vx_locks_avail(n) \
++ vx_cres_avail(current->vx_info, n, RLIMIT_LOCKS)
++
++#define vx_openfd_avail(n) \
++ vx_cres_avail(current->vx_info, n, VLIMIT_OPENFD)
++
++
++/* socket limits */
++
++#define vx_sock_inc(s) \
++ vx_acc_cres((s)->sk_vx_info, 1, s, VLIMIT_NSOCK)
++
++#define vx_sock_dec(s) \
++ vx_acc_cres((s)->sk_vx_info,-1, s, VLIMIT_NSOCK)
++
++#define vx_sock_avail(n) \
++ vx_cres_avail(current->vx_info, n, VLIMIT_NSOCK)
++
++
++/* ipc resource limits */
++
++#define vx_ipcmsg_add(v,u,a) \
++ vx_add_cres(v, a, u, RLIMIT_MSGQUEUE)
++
++#define vx_ipcmsg_sub(v,u,a) \
++ vx_sub_cres(v, a, u, RLIMIT_MSGQUEUE)
++
++#define vx_ipcmsg_avail(v,a) \
++ vx_cres_avail(v, a, RLIMIT_MSGQUEUE)
++
++
++#define vx_ipcshm_add(v,k,a) \
++ vx_add_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
++
++#define vx_ipcshm_sub(v,k,a) \
++ vx_sub_cres(v, a, (void *)(long)(k), VLIMIT_SHMEM)
++
++#define vx_ipcshm_avail(v,a) \
++ vx_cres_avail(v, a, VLIMIT_SHMEM)
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_memory.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_memory.h
+@@ -0,0 +1,140 @@
++#ifndef _VX_VS_MEMORY_H
++#define _VX_VS_MEMORY_H
++
++
++#include "vserver/limit.h"
++#include "vserver/debug.h"
++
++
++#define vx_acc_page(m,d,v,r) \
++ __vx_acc_page(&(m->v), m->mm_vx_info, r, d, __FILE__, __LINE__)
++
++static inline void __vx_acc_page(unsigned long *v, struct vx_info *vxi,
++ int res, int dir, char *file, int line)
++{
++ if (VXD_RLIMIT(res, RLIMIT_RSS) ||
++ VXD_RLIMIT(res, VLIMIT_ANON) ||
++ VXD_RLIMIT(res, RLIMIT_AS) ||
++ VXD_RLIMIT(res, RLIMIT_MEMLOCK))
++ vxlprintk(1, "vx_acc_page[%5d,%s,%2d]: %5d%s",
++ (vxi?vxi->vx_id:-1), vlimit_name[res], res,
++ (vxi?atomic_read(&vxi->limit.rcur[res]):0),
++ (dir?"++":"--"), file, line);
++ if (v) {
++ if (dir > 0)
++ ++(*v);
++ else
++ --(*v);
++ }
++ if (vxi) {
++ if (dir > 0)
++ atomic_inc(&vxi->limit.rcur[res]);
++ else
++ atomic_dec(&vxi->limit.rcur[res]);
++ }
++}
++
++
++#define vx_acc_pages(m,p,v,r) \
++ __vx_acc_pages(&(m->v), m->mm_vx_info, r, p, __FILE__, __LINE__)
++
++static inline void __vx_acc_pages(unsigned long *v, struct vx_info *vxi,
++ int res, int pages, char *_file, int _line)
++{
++ if (VXD_RLIMIT(res, RLIMIT_RSS) ||
++ VXD_RLIMIT(res, VLIMIT_ANON) ||
++ VXD_RLIMIT(res, RLIMIT_AS) ||
++ VXD_RLIMIT(res, RLIMIT_MEMLOCK))
++ vxlprintk(1, "vx_acc_pages[%5d,%s,%2d]: %5d += %5d",
++ (vxi?vxi->vx_id:-1), vlimit_name[res], res,
++ (vxi?atomic_read(&vxi->limit.rcur[res]):0),
++ pages, _file, _line);
++ if (pages == 0)
++ return;
++ if (v)
++ *v += pages;
++ if (vxi)
++ atomic_add(pages, &vxi->limit.rcur[res]);
++}
++
++
++
++#define vx_acc_vmpage(m,d) \
++ vx_acc_page(m, d, total_vm, RLIMIT_AS)
++#define vx_acc_vmlpage(m,d) \
++ vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK)
++#define vx_acc_rsspage(m,d) \
++ vx_acc_page(m, d, _rss, RLIMIT_RSS)
++#define vx_acc_anon_rsspage(m,d) \
++ vx_acc_page(m, d, _anon_rss, VLIMIT_ANON)
++
++#define vx_acc_vmpages(m,p) \
++ vx_acc_pages(m, p, total_vm, RLIMIT_AS)
++#define vx_acc_vmlpages(m,p) \
++ vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK)
++#define vx_acc_rsspages(m,p) \
++ vx_acc_pages(m, p, _rss, RLIMIT_RSS)
++#define vx_acc_anon_rsspages(m,p) \
++ vx_acc_pages(m, p, _anon_rss, VLIMIT_ANON)
++
++#define vx_pages_add(s,r,p) __vx_acc_pages(0, s, r, p, __FILE__, __LINE__)
++#define vx_pages_sub(s,r,p) vx_pages_add(s, r, -(p))
++
++#define vx_vmpages_inc(m) vx_acc_vmpage(m, 1)
++#define vx_vmpages_dec(m) vx_acc_vmpage(m,-1)
++#define vx_vmpages_add(m,p) vx_acc_vmpages(m, p)
++#define vx_vmpages_sub(m,p) vx_acc_vmpages(m,-(p))
++
++#define vx_vmlocked_inc(m) vx_acc_vmlpage(m, 1)
++#define vx_vmlocked_dec(m) vx_acc_vmlpage(m,-1)
++#define vx_vmlocked_add(m,p) vx_acc_vmlpages(m, p)
++#define vx_vmlocked_sub(m,p) vx_acc_vmlpages(m,-(p))
++
++#define vx_rsspages_inc(m) vx_acc_rsspage(m, 1)
++#define vx_rsspages_dec(m) vx_acc_rsspage(m,-1)
++#define vx_rsspages_add(m,p) vx_acc_rsspages(m, p)
++#define vx_rsspages_sub(m,p) vx_acc_rsspages(m,-(p))
++
++#define vx_anon_rsspages_inc(m) vx_acc_anon_rsspage(m, 1)
++#define vx_anon_rsspages_dec(m) vx_acc_anon_rsspage(m,-1)
++#define vx_anon_rsspages_add(m,p) vx_acc_anon_rsspages(m, p)
++#define vx_anon_rsspages_sub(m,p) vx_acc_anon_rsspages(m,-(p))
++
++
++#define vx_pages_avail(m,p,r) \
++ __vx_pages_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
++
++static inline int __vx_pages_avail(struct vx_info *vxi,
++ int res, int pages, char *_file, int _line)
++{
++ unsigned long value;
++
++ if (VXD_RLIMIT(res, RLIMIT_RSS) ||
++ VXD_RLIMIT(res, RLIMIT_AS) ||
++ VXD_RLIMIT(res, RLIMIT_MEMLOCK))
++ vxlprintk(1, "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d",
++ (vxi?vxi->vx_id:-1), vlimit_name[res], res,
++ (vxi?vxi->limit.rlim[res]:1),
++ (vxi?atomic_read(&vxi->limit.rcur[res]):0),
++ pages, _file, _line);
++ if (!vxi)
++ return 1;
++ value = atomic_read(&vxi->limit.rcur[res]);
++ if (value > vxi->limit.rmax[res])
++ vxi->limit.rmax[res] = value;
++ if (vxi->limit.rlim[res] == RLIM_INFINITY)
++ return 1;
++ if (value + pages <= vxi->limit.rlim[res])
++ return 1;
++ atomic_inc(&vxi->limit.lhit[res]);
++ return 0;
++}
++
++#define vx_vmpages_avail(m,p) vx_pages_avail(m, p, RLIMIT_AS)
++#define vx_vmlocked_avail(m,p) vx_pages_avail(m, p, RLIMIT_MEMLOCK)
++#define vx_rsspages_avail(m,p) vx_pages_avail(m, p, RLIMIT_RSS)
++#define vx_anonpages_avail(m,p) vx_pages_avail(m, p, VLIMIT_ANON)
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_network.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_network.h
+@@ -0,0 +1,210 @@
++#ifndef _NX_VS_NETWORK_H
++#define _NX_VS_NETWORK_H
++
++
++#include "vserver/network.h"
++#include "vserver/debug.h"
++
++
++#define get_nx_info(i) __get_nx_info(i,__FILE__,__LINE__)
++
++static inline struct nx_info *__get_nx_info(struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ if (!nxi)
++ return NULL;
++
++ vxlprintk(VXD_CBIT(nid, 2), "get_nx_info(%p[#%d.%d])",
++ nxi, nxi?nxi->nx_id:0, nxi?atomic_read(&nxi->nx_usecnt):0,
++ _file, _line);
++
++ atomic_inc(&nxi->nx_usecnt);
++ return nxi;
++}
++
++
++extern void free_nx_info(struct nx_info *);
++
++#define put_nx_info(i) __put_nx_info(i,__FILE__,__LINE__)
++
++static inline void __put_nx_info(struct nx_info *nxi, const char *_file, int _line)
++{
++ if (!nxi)
++ return;
++
++ vxlprintk(VXD_CBIT(nid, 2), "put_nx_info(%p[#%d.%d])",
++ nxi, nxi?nxi->nx_id:0, nxi?atomic_read(&nxi->nx_usecnt):0,
++ _file, _line);
++
++ if (atomic_dec_and_test(&nxi->nx_usecnt))
++ free_nx_info(nxi);
++}
++
++
++#define init_nx_info(p,i) __init_nx_info(p,i,__FILE__,__LINE__)
++
++static inline void __init_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ if (nxi) {
++ vxlprintk(VXD_CBIT(nid, 3),
++ "init_nx_info(%p[#%d.%d])",
++ nxi, nxi?nxi->nx_id:0,
++ nxi?atomic_read(&nxi->nx_usecnt):0,
++ _file, _line);
++
++ atomic_inc(&nxi->nx_usecnt);
++ }
++ *nxp = nxi;
++}
++
++
++#define set_nx_info(p,i) __set_nx_info(p,i,__FILE__,__LINE__)
++
++static inline void __set_nx_info(struct nx_info **nxp, struct nx_info *nxi,
++ const char *_file, int _line)
++{
++ struct nx_info *nxo;
++
++ if (!nxi)
++ return;
++
++ vxlprintk(VXD_CBIT(nid, 3), "set_nx_info(%p[#%d.%d])",
++ nxi, nxi?nxi->nx_id:0,
++ nxi?atomic_read(&nxi->nx_usecnt):0,
++ _file, _line);
++
++ atomic_inc(&nxi->nx_usecnt);
++ nxo = xchg(nxp, nxi);
++ BUG_ON(nxo);
++}
++
++#define clr_nx_info(p) __clr_nx_info(p,__FILE__,__LINE__)
++
++static inline void __clr_nx_info(struct nx_info **nxp,
++ const char *_file, int _line)
++{
++ struct nx_info *nxo;
++
++ nxo = xchg(nxp, NULL);
++ if (!nxo)
++ return;
++
++ vxlprintk(VXD_CBIT(nid, 3), "clr_nx_info(%p[#%d.%d])",
++ nxo, nxo?nxo->nx_id:0,
++ nxo?atomic_read(&nxo->nx_usecnt):0,
++ _file, _line);
++
++ if (atomic_dec_and_test(&nxo->nx_usecnt))
++ free_nx_info(nxo);
++}
++
++
++#define claim_nx_info(v,p) __claim_nx_info(v,p,__FILE__,__LINE__)
++
++static inline void __claim_nx_info(struct nx_info *nxi,
++ struct task_struct *task, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(nid, 3), "claim_nx_info(%p[#%d.%d.%d]) %p",
++ nxi, nxi?nxi->nx_id:0,
++ nxi?atomic_read(&nxi->nx_usecnt):0,
++ nxi?atomic_read(&nxi->nx_tasks):0,
++ task, _file, _line);
++
++ atomic_inc(&nxi->nx_tasks);
++}
++
++
++extern void unhash_nx_info(struct nx_info *);
++
++#define release_nx_info(v,p) __release_nx_info(v,p,__FILE__,__LINE__)
++
++static inline void __release_nx_info(struct nx_info *nxi,
++ struct task_struct *task, const char *_file, int _line)
++{
++ vxlprintk(VXD_CBIT(nid, 3), "release_nx_info(%p[#%d.%d.%d]) %p",
++ nxi, nxi?nxi->nx_id:0,
++ nxi?atomic_read(&nxi->nx_usecnt):0,
++ nxi?atomic_read(&nxi->nx_tasks):0,
++ task, _file, _line);
++
++ might_sleep();
++
++ if (atomic_dec_and_test(&nxi->nx_tasks))
++ unhash_nx_info(nxi);
++}
++
++
++#define task_get_nx_info(i) __task_get_nx_info(i,__FILE__,__LINE__)
++
++static __inline__ struct nx_info *__task_get_nx_info(struct task_struct *p,
++ const char *_file, int _line)
++{
++ struct nx_info *nxi;
++
++ task_lock(p);
++ vxlprintk(VXD_CBIT(nid, 5), "task_get_nx_info(%p)",
++ p, _file, _line);
++ nxi = __get_nx_info(p->nx_info, _file, _line);
++ task_unlock(p);
++ return nxi;
++}
++
++
++#define nx_task_nid(t) ((t)->nid)
++
++#define nx_current_nid() nx_task_nid(current)
++
++#define nx_check(c,m) __nx_check(nx_current_nid(),c,m)
++
++#define nx_weak_check(c,m) ((m) ? nx_check(c,m) : 1)
++
++
++#define __nx_state(v) ((v) ? ((v)->nx_state) : 0)
++
++#define nx_info_state(v,m) (__nx_state(v) & (m))
++
++
++#define __nx_flags(v) ((v) ? (v)->nx_flags : 0)
++
++#define nx_current_flags() __nx_flags(current->nx_info)
++
++#define nx_info_flags(v,m,f) \
++ vx_check_flags(__nx_flags(v),(m),(f))
++
++#define task_nx_flags(t,m,f) \
++ ((t) && nx_info_flags((t)->nx_info, (m), (f)))
++
++#define nx_flags(m,f) nx_info_flags(current->nx_info,(m),(f))
++
++
++/* context caps */
++
++#define __nx_ncaps(v) ((v) ? (v)->nx_ncaps : 0)
++
++#define nx_current_ncaps() __nx_ncaps(current->nx_info)
++
++#define nx_info_ncaps(v,c) (__nx_ncaps(v) & (c))
++
++#define nx_ncaps(c) nx_info_ncaps(current->nx_info,(c))
++
++
++static inline int addr_in_nx_info(struct nx_info *nxi, uint32_t addr)
++{
++ int n,i;
++
++ if (!nxi)
++ return 1;
++
++ n = nxi->nbipv4;
++ for (i=0; i<n; i++) {
++ if (nxi->ipv4[i] == addr)
++ return 1;
++ }
++ return 0;
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_sched.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_sched.h
+@@ -0,0 +1,96 @@
++#ifndef _VX_VS_SCHED_H
++#define _VX_VS_SCHED_H
++
++#ifndef CONFIG_VSERVER
++#warning config options missing
++#endif
++
++#include "vserver/sched.h"
++
++
++#define VAVAVOOM_RATIO 50
++
++#define MAX_PRIO_BIAS 20
++#define MIN_PRIO_BIAS -20
++
++
++static inline int vx_tokens_avail(struct vx_info *vxi)
++{
++ return atomic_read(&vxi->sched.tokens);
++}
++
++static inline void vx_consume_token(struct vx_info *vxi)
++{
++ atomic_dec(&vxi->sched.tokens);
++}
++
++static inline int vx_need_resched(struct task_struct *p)
++{
++#ifdef CONFIG_VSERVER_HARDCPU
++ struct vx_info *vxi = p->vx_info;
++#endif
++ int slice = --p->time_slice;
++
++#ifdef CONFIG_VSERVER_HARDCPU
++ if (vxi) {
++ int tokens;
++
++ if ((tokens = vx_tokens_avail(vxi)) > 0)
++ vx_consume_token(vxi);
++ /* for tokens > 0, one token was consumed */
++ if (tokens < 2)
++ return 1;
++ }
++#endif
++ return (slice == 0);
++}
++
++
++static inline void vx_onhold_inc(struct vx_info *vxi)
++{
++ int onhold = atomic_read(&vxi->cvirt.nr_onhold);
++
++ atomic_inc(&vxi->cvirt.nr_onhold);
++ if (!onhold)
++ vxi->cvirt.onhold_last = jiffies;
++}
++
++static inline void __vx_onhold_update(struct vx_info *vxi)
++{
++ int cpu = smp_processor_id();
++ uint32_t now = jiffies;
++ uint32_t delta = now - vxi->cvirt.onhold_last;
++
++ vxi->cvirt.onhold_last = now;
++ vxi->sched.cpu[cpu].hold_ticks += delta;
++}
++
++static inline void vx_onhold_dec(struct vx_info *vxi)
++{
++ if (atomic_dec_and_test(&vxi->cvirt.nr_onhold))
++ __vx_onhold_update(vxi);
++}
++
++static inline void vx_account_user(struct vx_info *vxi,
++ cputime_t cputime, int nice)
++{
++ int cpu = smp_processor_id();
++
++ if (!vxi)
++ return;
++ vxi->sched.cpu[cpu].user_ticks += cputime;
++}
++
++static inline void vx_account_system(struct vx_info *vxi,
++ cputime_t cputime, int idle)
++{
++ int cpu = smp_processor_id();
++
++ if (!vxi)
++ return;
++ vxi->sched.cpu[cpu].sys_ticks += cputime;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vs_socket.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vs_socket.h
+@@ -0,0 +1,58 @@
++#ifndef _VX_VS_SOCKET_H
++#define _VX_VS_SOCKET_H
++
++
++#include "vserver/debug.h"
++
++
++/* socket accounting */
++
++#include <linux/socket.h>
++
++static inline int vx_sock_type(int family)
++{
++ int type = 4;
++
++ if (family > 0 && family < 3)
++ type = family;
++ else if (family == PF_INET6)
++ type = 3;
++ return type;
++}
++
++#define vx_acc_sock(v,f,p,s) \
++ __vx_acc_sock((v), (f), (p), (s), __FILE__, __LINE__)
++
++static inline void __vx_acc_sock(struct vx_info *vxi,
++ int family, int pos, int size, char *file, int line)
++{
++ if (vxi) {
++ int type = vx_sock_type(family);
++
++ atomic_inc(&vxi->cacct.sock[type][pos].count);
++ atomic_add(size, &vxi->cacct.sock[type][pos].total);
++ }
++}
++
++#define vx_sock_recv(sk,s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 0, (s))
++#define vx_sock_send(sk,s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 1, (s))
++#define vx_sock_fail(sk,s) \
++ vx_acc_sock((sk)->sk_vx_info, (sk)->sk_family, 2, (s))
++
++
++#define sock_vx_init(s) do { \
++ (s)->sk_xid = 0; \
++ (s)->sk_vx_info = NULL; \
++ } while (0)
++
++#define sock_nx_init(s) do { \
++ (s)->sk_nid = 0; \
++ (s)->sk_nx_info = NULL; \
++ } while (0)
++
++
++#else
++#warning duplicate inclusion
++#endif
+Index: linux-2.6.12/include/linux/vserver/context.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/context.h
+@@ -0,0 +1,161 @@
++#ifndef _VX_CONTEXT_H
++#define _VX_CONTEXT_H
++
++#include <linux/types.h>
++
++
++#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
++#define MIN_D_CONTEXT 49152 /* dynamic contexts start here */
++
++#define VX_DYNAMIC_ID ((uint32_t)-1) /* id for dynamic context */
++
++/* context flags */
++
++#define VXF_INFO_LOCK 0x00000001
++#define VXF_INFO_SCHED 0x00000002
++#define VXF_INFO_NPROC 0x00000004
++#define VXF_INFO_PRIVATE 0x00000008
++
++#define VXF_INFO_INIT 0x00000010
++#define VXF_INFO_HIDE 0x00000020
++#define VXF_INFO_ULIMIT 0x00000040
++#define VXF_INFO_NSPACE 0x00000080
++
++#define VXF_SCHED_HARD 0x00000100
++#define VXF_SCHED_PRIO 0x00000200
++#define VXF_SCHED_PAUSE 0x00000400
++
++#define VXF_VIRT_MEM 0x00010000
++#define VXF_VIRT_UPTIME 0x00020000
++#define VXF_VIRT_CPU 0x00040000
++#define VXF_VIRT_LOAD 0x00080000
++
++#define VXF_HIDE_MOUNT 0x01000000
++#define VXF_HIDE_NETIF 0x02000000
++
++#define VXF_STATE_SETUP (1ULL<<32)
++#define VXF_STATE_INIT (1ULL<<33)
++
++#define VXF_STATE_HELPER (1ULL<<36)
++
++#define VXF_FORK_RSS (1ULL<<48)
++#define VXF_PROLIFIC (1ULL<<49)
++
++#define VXF_IGNEG_NICE (1ULL<<52)
++
++#define VXF_ONE_TIME (0x0003ULL<<32)
++
++#define VXF_INIT_SET (VXF_STATE_SETUP|VXF_STATE_INIT)
++
++
++/* context caps */
++
++#define VXC_CAP_MASK 0x00000000
++
++#define VXC_SET_UTSNAME 0x00000001
++#define VXC_SET_RLIMIT 0x00000002
++
++#define VXC_RAW_ICMP 0x00000100
++#define VXC_SYSLOG 0x00001000
++
++#define VXC_SECURE_MOUNT 0x00010000
++#define VXC_SECURE_REMOUNT 0x00020000
++#define VXC_BINARY_MOUNT 0x00040000
++
++#define VXC_QUOTA_CTL 0x00100000
++
++
++/* context state changes */
++
++enum {
++ VSC_STARTUP = 1,
++ VSC_SHUTDOWN,
++
++ VSC_NETUP,
++ VSC_NETDOWN,
++};
++
++
++#ifdef __KERNEL__
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++
++#include "limit_def.h"
++#include "sched_def.h"
++#include "cvirt_def.h"
++
++struct vx_info {
++ struct hlist_node vx_hlist; /* linked list of contexts */
++ xid_t vx_id; /* context id */
++ atomic_t vx_usecnt; /* usage count */
++ atomic_t vx_tasks; /* tasks count */
++ struct vx_info *vx_parent; /* parent context */
++ int vx_state; /* context state */
++
++ struct namespace *vx_namespace; /* private namespace */
++ struct fs_struct *vx_fs; /* private namespace fs */
++ uint64_t vx_flags; /* context flags */
++ uint64_t vx_bcaps; /* bounding caps (system) */
++ uint64_t vx_ccaps; /* context caps (vserver) */
++
++ pid_t vx_initpid; /* PID of fake init process */
++
++ wait_queue_head_t vx_wait; /* context exit waitqueue */
++
++ struct _vx_limit limit; /* vserver limits */
++ struct _vx_sched sched; /* vserver scheduler */
++ struct _vx_cvirt cvirt; /* virtual/bias stuff */
++ struct _vx_cacct cacct; /* context accounting */
++
++ char vx_name[65]; /* vserver name */
++};
++
++
++/* status flags */
++
++#define VXS_HASHED 0x0001
++#define VXS_PAUSED 0x0010
++#define VXS_ONHOLD 0x0020
++#define VXS_SHUTDOWN 0x0100
++#define VXS_RELEASED 0x8000
++
++/* check conditions */
++
++#define VX_ADMIN 0x0001
++#define VX_WATCH 0x0002
++#define VX_HIDE 0x0004
++#define VX_HOSTID 0x0008
++
++#define VX_IDENT 0x0010
++#define VX_EQUIV 0x0020
++#define VX_PARENT 0x0040
++#define VX_CHILD 0x0080
++
++#define VX_ARG_MASK 0x00F0
++
++#define VX_DYNAMIC 0x0100
++#define VX_STATIC 0x0200
++
++#define VX_ATR_MASK 0x0F00
++
++
++extern void claim_vx_info(struct vx_info *, struct task_struct *);
++extern void release_vx_info(struct vx_info *, struct task_struct *);
++
++extern struct vx_info *locate_vx_info(int);
++extern struct vx_info *locate_or_create_vx_info(int);
++
++extern int get_xid_list(int, unsigned int *, int);
++extern int xid_is_hashed(xid_t);
++
++extern int vx_migrate_task(struct task_struct *, struct vx_info *);
++
++extern long vs_state_change(struct vx_info *, unsigned int);
++
++
++#endif /* __KERNEL__ */
++#else /* _VX_CONTEXT_H */
++#warning duplicate inclusion
++#endif /* _VX_CONTEXT_H */
+Index: linux-2.6.12/include/linux/vserver/context_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/context_cmd.h
+@@ -0,0 +1,79 @@
++#ifndef _VX_CONTEXT_CMD_H
++#define _VX_CONTEXT_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
++
++#ifdef __KERNEL__
++extern int vc_task_xid(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++#define VCMD_vx_info VC_CMD(VINFO, 5, 0)
++
++struct vcmd_vx_info_v0 {
++ uint32_t xid;
++ uint32_t initpid;
++ /* more to come */
++};
++
++#ifdef __KERNEL__
++extern int vc_vx_info(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++
++/* context commands */
++
++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
++
++struct vcmd_ctx_create {
++ uint64_t flagword;
++};
++
++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 0)
++
++#ifdef __KERNEL__
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++
++/* flag commands */
++
++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
++
++struct vcmd_ctx_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
++
++#ifdef __KERNEL__
++extern int vc_get_cflags(uint32_t, void __user *);
++extern int vc_set_cflags(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++
++/* context caps commands */
++
++#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 0)
++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 0)
++
++struct vcmd_ctx_caps_v0 {
++ uint64_t bcaps;
++ uint64_t ccaps;
++ uint64_t cmask;
++};
++
++#ifdef __KERNEL__
++extern int vc_get_ccaps(uint32_t, void __user *);
++extern int vc_set_ccaps(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_CONTEXT_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/cvirt.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/cvirt.h
+@@ -0,0 +1,25 @@
++#ifndef _VX_CVIRT_H
++#define _VX_CVIRT_H
++
++#ifdef __KERNEL__
++
++struct timespec;
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++int vx_uts_virt_handler(struct ctl_table *ctl, int write, xid_t xid,
++ void **datap, size_t *lenp);
++
++
++int vx_do_syslog(int, char __user *, int);
++
++#endif /* __KERNEL__ */
++#else /* _VX_CVIRT_H */
++#warning duplicate inclusion
++#endif /* _VX_CVIRT_H */
+Index: linux-2.6.12/include/linux/vserver/cvirt_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/cvirt_cmd.h
+@@ -0,0 +1,34 @@
++#ifndef _VX_CVIRT_CMD_H
++#define _VX_CVIRT_CMD_H
++
++/* virtual host info name commands */
++
++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0)
++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0)
++
++struct vcmd_vhi_name_v0 {
++ uint32_t field;
++ char name[65];
++};
++
++
++enum vhi_name_field {
++ VHIN_CONTEXT=0,
++ VHIN_SYSNAME,
++ VHIN_NODENAME,
++ VHIN_RELEASE,
++ VHIN_VERSION,
++ VHIN_MACHINE,
++ VHIN_DOMAINNAME,
++};
++
++
++#ifdef __KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_set_vhi_name(uint32_t, void __user *);
++extern int vc_get_vhi_name(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_CVIRT_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/cvirt_def.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/cvirt_def.h
+@@ -0,0 +1,77 @@
++#ifndef _VX_CVIRT_DEF_H
++#define _VX_CVIRT_DEF_H
++
++#include <linux/jiffies.h>
++#include <linux/utsname.h>
++#include <linux/spinlock.h>
++#include <linux/wait.h>
++#include <linux/time.h>
++#include <asm/atomic.h>
++
++
++struct _vx_usage_stat {
++ uint64_t user;
++ uint64_t nice;
++ uint64_t system;
++ uint64_t softirq;
++ uint64_t irq;
++ uint64_t idle;
++ uint64_t iowait;
++};
++
++struct _vx_syslog {
++ wait_queue_head_t log_wait;
++ spinlock_t logbuf_lock; /* lock for the log buffer */
++
++ unsigned long log_start; /* next char to be read by syslog() */
++ unsigned long con_start; /* next char to be sent to consoles */
++ unsigned long log_end; /* most-recently-written-char + 1 */
++ unsigned long logged_chars; /* #chars since last read+clear operation */
++
++ char log_buf[1024];
++};
++
++
++/* context sub struct */
++
++struct _vx_cvirt {
++ int max_threads; /* maximum allowed threads */
++ atomic_t nr_threads; /* number of current threads */
++ atomic_t nr_running; /* number of running threads */
++ atomic_t nr_uninterruptible; /* number of uninterruptible threads */
++
++ atomic_t nr_onhold; /* processes on hold */
++ uint32_t onhold_last; /* jiffies when put on hold */
++
++ struct timespec bias_idle;
++ struct timespec bias_uptime; /* context creation point */
++ uint64_t bias_clock; /* offset in clock_t */
++
++ struct new_utsname utsname;
++
++ spinlock_t load_lock; /* lock for the load averages */
++ atomic_t load_updates; /* nr of load updates done so far */
++ uint32_t load_last; /* last time load was cacled */
++ uint32_t load[3]; /* load averages 1,5,15 */
++
++ atomic_t total_forks; /* number of forks so far */
++
++ struct _vx_usage_stat cpustat[NR_CPUS];
++
++ struct _vx_syslog syslog;
++};
++
++struct _vx_sock_acc {
++ atomic_t count;
++ atomic_t total;
++};
++
++/* context sub struct */
++
++struct _vx_cacct {
++ unsigned long total_forks;
++
++ struct _vx_sock_acc sock[5][3];
++};
++
++#endif /* _VX_CVIRT_DEF_H */
+Index: linux-2.6.12/include/linux/vserver/debug.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/debug.h
+@@ -0,0 +1,272 @@
++#ifndef _VX_DEBUG_H
++#define _VX_DEBUG_H
++
++#ifndef CONFIG_VSERVER
++#warning config options missing
++#endif
++
++#define VXD_CBIT(n,m) (vx_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n,m) (vx_debug_ ## n > (m))
++#define VXD_MASK(n,m) (vx_debug_ ## n & (m))
++
++#define VXD_QPOS(v,p) (((uint32_t)(v) >> ((p)*8)) & 0xFF)
++#define VXD_QUAD(v) VXD_QPOS(v,0), VXD_QPOS(v,1), \
++ VXD_QPOS(v,2), VXD_QPOS(v,3)
++
++#define __FUNC__ __func__
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++extern unsigned int vx_debug_switch;
++extern unsigned int vx_debug_xid;
++extern unsigned int vx_debug_nid;
++extern unsigned int vx_debug_net;
++extern unsigned int vx_debug_limit;
++extern unsigned int vx_debug_dlim;
++extern unsigned int vx_debug_cvirt;
++
++
++#define VX_LOGLEVEL "vxD: "
++#define VX_WARNLEVEL KERN_WARNING "vxW: "
++
++#define vxdprintk(c,f,x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f "\n" , ##x); \
++ } while (0)
++
++#define vxlprintk(c,f,x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f " @%s:%d\n", x); \
++ } while (0)
++
++#define vxfprintk(c,f,x...) \
++ do { \
++ if (c) \
++ printk(VX_LOGLEVEL f " %s@%s:%d\n", x); \
++ } while (0)
++
++
++#define vxwprintk(c,f,x...) \
++ do { \
++ if (c) \
++ printk(VX_WARNLEVEL f "\n" , ##x); \
++ } while (0)
++
++
++#define vxd_path(d,m) \
++ ({ static char _buffer[PATH_MAX]; \
++ d_path((d), (m), _buffer, sizeof(_buffer)); })
++
++#else /* CONFIG_VSERVER_DEBUG */
++
++#define vx_debug_switch 0
++#define vx_debug_xid 0
++#define vx_debug_nid 0
++#define vx_debug_net 0
++#define vx_debug_limit 0
++#define vx_debug_dlim 0
++#define vx_debug_cvirt 0
++
++#define vxdprintk(x...) do { } while (0)
++#define vxlprintk(x...) do { } while (0)
++#define vxfprintk(x...) do { } while (0)
++#define vxwprintk(x...) do { } while (0)
++
++#define vxd_path "<none>"
++
++#endif /* CONFIG_VSERVER_DEBUG */
++
++
++/* history stuff */
++
++#ifdef CONFIG_VSERVER_HISTORY
++
++
++extern unsigned volatile int vxh_active;
++
++struct _vxhe_vxi {
++ struct vx_info *ptr;
++ unsigned xid;
++ unsigned usecnt;
++ unsigned tasks;
++};
++
++struct _vxhe_set_clr {
++ void *data;
++};
++
++struct _vxhe_loc_lookup {
++ unsigned arg;
++};
++
++enum {
++ VXH_UNUSED=0,
++ VXH_THROW_OOPS=1,
++
++ VXH_GET_VX_INFO,
++ VXH_PUT_VX_INFO,
++ VXH_INIT_VX_INFO,
++ VXH_SET_VX_INFO,
++ VXH_CLR_VX_INFO,
++ VXH_CLAIM_VX_INFO,
++ VXH_RELEASE_VX_INFO,
++ VXH_ALLOC_VX_INFO,
++ VXH_DEALLOC_VX_INFO,
++ VXH_HASH_VX_INFO,
++ VXH_UNHASH_VX_INFO,
++ VXH_LOC_VX_INFO,
++ VXH_LOOKUP_VX_INFO,
++ VXH_CREATE_VX_INFO,
++};
++
++struct _vx_hist_entry {
++ void *loc;
++ unsigned short seq;
++ unsigned short type;
++ struct _vxhe_vxi vxi;
++ union {
++ struct _vxhe_set_clr sc;
++ struct _vxhe_loc_lookup ll;
++ };
++};
++
++struct _vx_hist_entry *vxh_advance(void *loc);
++
++#define VXH_HERE(__type) \
++ ({ __label__ __vxh_##__type; \
++ __vxh_##__type:; \
++ &&__vxh_##__type; })
++
++
++
++static inline void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
++{
++ entry->vxi.ptr = vxi;
++ if (vxi) {
++ entry->vxi.usecnt = atomic_read(&vxi->vx_usecnt);
++ entry->vxi.tasks = atomic_read(&vxi->vx_tasks);
++ entry->vxi.xid = vxi->vx_id;
++ }
++}
++
++
++#define __VXH_BODY(__type, __data) \
++ struct _vx_hist_entry *entry; \
++ \
++ preempt_disable(); \
++ entry = vxh_advance(VXH_HERE(__type)); \
++ __data; \
++ entry->type = __type; \
++ preempt_enable();
++
++
++ /* pass vxi only */
++#define __VXH_SIMPLE \
++ __vxh_copy_vxi(entry, vxi)
++
++#define VXH_SIMPLE(__name, __type) \
++static inline void __name(struct vx_info *vxi) \
++{ \
++ __VXH_BODY(__type, __VXH_SIMPLE) \
++}
++
++ /* pass vxi and data (void *) */
++#define __VXH_DATA \
++ __vxh_copy_vxi(entry, vxi); \
++ entry->sc.data = data
++
++#define VXH_DATA(__name, __type) \
++static inline \
++void __name(struct vx_info *vxi, void *data) \
++{ \
++ __VXH_BODY(__type, __VXH_DATA) \
++}
++
++ /* pass vxi and arg (long) */
++#define __VXH_LARG \
++ __vxh_copy_vxi(entry, vxi); \
++ entry->ll.arg = arg
++
++#define VXH_LARG(__name, __type) \
++static inline \
++void __name(struct vx_info *vxi, long arg) \
++{ \
++ __VXH_BODY(__type, __VXH_LARG) \
++}
++
++
++static inline void vxh_throw_oops(void)
++{
++ __VXH_BODY(VXH_THROW_OOPS, {});
++ /* prevent further acquisition */
++ vxh_active = 0;
++}
++
++VXH_SIMPLE(vxh_get_vx_info, VXH_GET_VX_INFO);
++VXH_SIMPLE(vxh_put_vx_info, VXH_PUT_VX_INFO);
++
++VXH_DATA(vxh_init_vx_info, VXH_INIT_VX_INFO);
++VXH_DATA(vxh_set_vx_info, VXH_SET_VX_INFO);
++VXH_DATA(vxh_clr_vx_info, VXH_CLR_VX_INFO);
++
++VXH_DATA(vxh_claim_vx_info, VXH_CLAIM_VX_INFO);
++VXH_DATA(vxh_release_vx_info, VXH_RELEASE_VX_INFO);
++
++VXH_SIMPLE(vxh_alloc_vx_info, VXH_ALLOC_VX_INFO);
++VXH_SIMPLE(vxh_dealloc_vx_info, VXH_DEALLOC_VX_INFO);
++
++VXH_SIMPLE(vxh_hash_vx_info, VXH_HASH_VX_INFO);
++VXH_SIMPLE(vxh_unhash_vx_info, VXH_UNHASH_VX_INFO);
++
++VXH_LARG(vxh_loc_vx_info, VXH_LOC_VX_INFO);
++VXH_LARG(vxh_lookup_vx_info, VXH_LOOKUP_VX_INFO);
++VXH_LARG(vxh_create_vx_info, VXH_CREATE_VX_INFO);
++
++extern void vxh_dump_history(void);
++
++
++#else /* CONFIG_VSERVER_HISTORY */
++
++
++#define vxh_throw_oops() do { } while (0)
++
++#define vxh_get_vx_info(v) do { } while (0)
++#define vxh_put_vx_info(v) do { } while (0)
++
++#define vxh_init_vx_info(v,d) do { } while (0)
++#define vxh_set_vx_info(v,d) do { } while (0)
++#define vxh_clr_vx_info(v,d) do { } while (0)
++
++#define vxh_claim_vx_info(v,d) do { } while (0)
++#define vxh_release_vx_info(v,d) do { } while (0)
++
++#define vxh_alloc_vx_info(v) do { } while (0)
++#define vxh_dealloc_vx_info(v) do { } while (0)
++
++#define vxh_hash_vx_info(v) do { } while (0)
++#define vxh_unhash_vx_info(v) do { } while (0)
++
++#define vxh_loc_vx_info(a,v) do { } while (0)
++#define vxh_lookup_vx_info(a,v) do { } while (0)
++#define vxh_create_vx_info(a,v) do { } while (0)
++
++#define vxh_dump_history() do { } while (0)
++
++
++#endif /* CONFIG_VSERVER_HISTORY */
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++#define vxd_assert_lock(l) assert_spin_locked(l)
++#define vxd_assert(c,f,x...) vxlprintk(!(c), \
++ "assertion [" f "] failed.", ##x, __FILE__, __LINE__)
++#else
++#define vxd_assert_lock(l) do { } while (0)
++#define vxd_assert(c,f,x...) do { } while (0)
++#endif
++
++
++#endif /* _VX_DEBUG_H */
+Index: linux-2.6.12/include/linux/vserver/debug_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/debug_cmd.h
+@@ -0,0 +1,14 @@
++#ifndef _VX_DEBUG_CMD_H
++#define _VX_DEBUG_CMD_H
++
++
++/* debug commands */
++
++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0)
++
++#ifdef __KERNEL__
++
++extern int vc_dump_history(uint32_t);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_DEBUG_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/dlimit.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/dlimit.h
+@@ -0,0 +1,53 @@
++#ifndef _VX_DLIMIT_H
++#define _VX_DLIMIT_H
++
++#include "switch.h"
++
++#define CDLIM_UNSET (0ULL)
++#define CDLIM_INFINITY (~0ULL)
++#define CDLIM_KEEP (~1ULL)
++
++
++#ifdef __KERNEL__
++
++#include <linux/spinlock.h>
++
++struct super_block;
++
++struct dl_info {
++ struct hlist_node dl_hlist; /* linked list of contexts */
++ struct rcu_head dl_rcu; /* the rcu head */
++ xid_t dl_xid; /* context id */
++ atomic_t dl_usecnt; /* usage count */
++ atomic_t dl_refcnt; /* reference count */
++
++ struct super_block *dl_sb; /* associated superblock */
++
++ spinlock_t dl_lock; /* protect the values */
++
++ uint64_t dl_space_used; /* used space in bytes */
++ uint64_t dl_space_total; /* maximum space in bytes */
++ uint32_t dl_inodes_used; /* used inodes */
++ uint32_t dl_inodes_total; /* maximum inodes */
++
++ unsigned int dl_nrlmult; /* non root limit mult */
++};
++
++struct rcu_head;
++
++extern void rcu_free_dl_info(struct rcu_head *);
++extern void unhash_dl_info(struct dl_info *);
++
++extern struct dl_info *locate_dl_info(struct super_block *, xid_t);
++
++
++struct kstatfs;
++
++extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
++
++typedef uint64_t dlsize_t;
++
++#endif /* __KERNEL__ */
++#else /* _VX_DLIMIT_H */
++#warning duplicate inclusion
++#endif /* _VX_DLIMIT_H */
+Index: linux-2.6.12/include/linux/vserver/dlimit_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/dlimit_cmd.h
+@@ -0,0 +1,68 @@
++#ifndef _VX_DLIMIT_CMD_H
++#define _VX_DLIMIT_CMD_H
++
++/* dlimit vserver commands */
++
++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0)
++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0)
++
++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0)
++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0)
++
++struct vcmd_ctx_dlimit_base_v0 {
++ const char __user *name;
++ uint32_t flags;
++};
++
++struct vcmd_ctx_dlimit_v0 {
++ const char __user *name;
++ uint32_t space_used; /* used space in kbytes */
++ uint32_t space_total; /* maximum space in kbytes */
++ uint32_t inodes_used; /* used inodes */
++ uint32_t inodes_total; /* maximum inodes */
++ uint32_t reserved; /* reserved for root in % */
++ uint32_t flags;
++};
++
++
++#ifdef __KERNEL__
++
++#ifdef CONFIG_COMPAT
++
++struct vcmd_ctx_dlimit_base_v0_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t flags;
++};
++
++struct vcmd_ctx_dlimit_v0_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t space_used; /* used space in kbytes */
++ uint32_t space_total; /* maximum space in kbytes */
++ uint32_t inodes_used; /* used inodes */
++ uint32_t inodes_total; /* maximum inodes */
++ uint32_t reserved; /* reserved for root in % */
++ uint32_t flags;
++};
++
++#endif /* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_add_dlimit(uint32_t, void __user *);
++extern int vc_rem_dlimit(uint32_t, void __user *);
++
++extern int vc_set_dlimit(uint32_t, void __user *);
++extern int vc_get_dlimit(uint32_t, void __user *);
++
++#ifdef CONFIG_COMPAT
++
++extern int vc_add_dlimit_x32(uint32_t, void __user *);
++extern int vc_rem_dlimit_x32(uint32_t, void __user *);
++
++extern int vc_set_dlimit_x32(uint32_t, void __user *);
++extern int vc_get_dlimit_x32(uint32_t, void __user *);
++
++#endif /* CONFIG_COMPAT */
++
++#endif /* __KERNEL__ */
++#endif /* _VX_DLIMIT_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/inode.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/inode.h
+@@ -0,0 +1,41 @@
++#ifndef _VX_INODE_H
++#define _VX_INODE_H
++
++
++#define IATTR_XID 0x01000000
++
++#define IATTR_ADMIN 0x00000001
++#define IATTR_WATCH 0x00000002
++#define IATTR_HIDE 0x00000004
++#define IATTR_FLAGS 0x00000007
++
++#define IATTR_BARRIER 0x00010000
++#define IATTR_IUNLINK 0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++
++#ifdef __KERNEL__
++
++#ifndef CONFIG_VSERVER
++#warning config options missing
++#endif
++
++#ifdef CONFIG_VSERVER_PROC_SECURE
++#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
++#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
++#else
++#define IATTR_PROC_DEFAULT ( IATTR_ADMIN )
++#define IATTR_PROC_SYMLINK ( IATTR_ADMIN )
++#endif
++
++#define vx_hide_check(c,m) (((m) & IATTR_HIDE) ? vx_check(c,m) : 1)
++
++#endif /* __KERNEL__ */
++
++/* inode ioctls */
++
++#define FIOC_GETXFLG _IOR('x', 5, long)
++#define FIOC_SETXFLG _IOW('x', 6, long)
++
++#else /* _VX_INODE_H */
++#warning duplicate inclusion
++#endif /* _VX_INODE_H */
+Index: linux-2.6.12/include/linux/vserver/inode_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/inode_cmd.h
+@@ -0,0 +1,57 @@
++#ifndef _VX_INODE_CMD_H
++#define _VX_INODE_CMD_H
++
++/* inode vserver commands */
++
++#define VCMD_get_iattr_v0 VC_CMD(INODE, 1, 0)
++#define VCMD_set_iattr_v0 VC_CMD(INODE, 2, 0)
++
++#define VCMD_get_iattr VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr VC_CMD(INODE, 2, 1)
++
++struct vcmd_ctx_iattr_v0 {
++ /* device handle in id */
++ uint64_t ino;
++ uint32_t xid;
++ uint32_t flags;
++ uint32_t mask;
++};
++
++struct vcmd_ctx_iattr_v1 {
++ const char __user *name;
++ uint32_t xid;
++ uint32_t flags;
++ uint32_t mask;
++};
++
++
++#ifdef __KERNEL__
++
++#ifdef CONFIG_COMPAT
++
++struct vcmd_ctx_iattr_v1_x32 {
++ compat_uptr_t name_ptr;
++ uint32_t xid;
++ uint32_t flags;
++ uint32_t mask;
++};
++
++#endif /* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_get_iattr_v0(uint32_t, void __user *);
++extern int vc_set_iattr_v0(uint32_t, void __user *);
++
++extern int vc_get_iattr(uint32_t, void __user *);
++extern int vc_set_iattr(uint32_t, void __user *);
++
++#ifdef CONFIG_COMPAT
++
++extern int vc_get_iattr_x32(uint32_t, void __user *);
++extern int vc_set_iattr_x32(uint32_t, void __user *);
++
++#endif /* CONFIG_COMPAT */
++
++#endif /* __KERNEL__ */
++#endif /* _VX_INODE_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/legacy.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/legacy.h
+@@ -0,0 +1,48 @@
++#ifndef _VX_LEGACY_H
++#define _VX_LEGACY_H
++
++#include "switch.h"
++
++/* compatibiliy vserver commands */
++
++#define VCMD_new_s_context VC_CMD(COMPAT, 1, 1)
++#define VCMD_set_ipv4root VC_CMD(COMPAT, 2, 3)
++
++#define VCMD_create_context VC_CMD(VSETUP, 1, 0)
++
++/* compatibiliy vserver arguments */
++
++struct vcmd_new_s_context_v1 {
++ uint32_t remove_cap;
++ uint32_t flags;
++};
++
++struct vcmd_set_ipv4root_v3 {
++ /* number of pairs in id */
++ uint32_t broadcast;
++ struct {
++ uint32_t ip;
++ uint32_t mask;
++ } nx_mask_pair[NB_IPV4ROOT];
++};
++
++
++#define VX_INFO_LOCK 1 /* Can't request a new vx_id */
++#define VX_INFO_NPROC 4 /* Limit number of processes in a context */
++#define VX_INFO_PRIVATE 8 /* Noone can join this security context */
++#define VX_INFO_INIT 16 /* This process wants to become the */
++ /* logical process 1 of the security */
++ /* context */
++#define VX_INFO_HIDEINFO 32 /* Hide some information in /proc */
++#define VX_INFO_ULIMIT 64 /* Use ulimit of the current process */
++ /* to become the global limits */
++ /* of the context */
++#define VX_INFO_NAMESPACE 128 /* save private namespace */
++
++
++#ifdef __KERNEL__
++extern int vc_new_s_context(uint32_t, void __user *);
++extern int vc_set_ipv4root(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_LEGACY_H */
+Index: linux-2.6.12/include/linux/vserver/limit.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/limit.h
+@@ -0,0 +1,24 @@
++#ifndef _VX_LIMIT_H
++#define _VX_LIMIT_H
++
++
++#define VLIMIT_NSOCK 16
++#define VLIMIT_OPENFD 17
++#define VLIMIT_ANON 18
++#define VLIMIT_SHMEM 19
++
++#ifdef __KERNEL__
++
++struct sysinfo;
++
++void vx_vsi_meminfo(struct sysinfo *);
++void vx_vsi_swapinfo(struct sysinfo *);
++
++#define VXD_RLIMIT(r,l) (VXD_CBIT(limit, (l)) && ((r) == (l)))
++
++#define NUM_LIMITS 24
++
++extern const char *vlimit_name[NUM_LIMITS];
++
++#endif /* __KERNEL__ */
++#endif /* _VX_LIMIT_H */
+Index: linux-2.6.12/include/linux/vserver/limit_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/limit_cmd.h
+@@ -0,0 +1,36 @@
++#ifndef _VX_LIMIT_CMD_H
++#define _VX_LIMIT_CMD_H
++
++/* rlimit vserver commands */
++
++#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0)
++#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0)
++#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0)
++
++struct vcmd_ctx_rlimit_v0 {
++ uint32_t id;
++ uint64_t minimum;
++ uint64_t softlimit;
++ uint64_t maximum;
++};
++
++struct vcmd_ctx_rlimit_mask_v0 {
++ uint32_t minimum;
++ uint32_t softlimit;
++ uint32_t maximum;
++};
++
++#define CRLIM_UNSET (0ULL)
++#define CRLIM_INFINITY (~0ULL)
++#define CRLIM_KEEP (~1ULL)
++
++#ifdef __KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_get_rlimit(uint32_t, void __user *);
++extern int vc_set_rlimit(uint32_t, void __user *);
++extern int vc_get_rlimit_mask(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_LIMIT_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/limit_def.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/limit_def.h
+@@ -0,0 +1,21 @@
++#ifndef _VX_LIMIT_DEF_H
++#define _VX_LIMIT_DEF_H
++
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
++#include "limit.h"
++
++/* context sub struct */
++
++struct _vx_limit {
++ atomic_t ticks;
++
++ unsigned long rlim[NUM_LIMITS]; /* Context limit */
++ unsigned long rmax[NUM_LIMITS]; /* Context maximum */
++ atomic_t rcur[NUM_LIMITS]; /* Current value */
++ atomic_t lhit[NUM_LIMITS]; /* Limit hits */
++};
++
++
++#endif /* _VX_LIMIT_DEF_H */
+Index: linux-2.6.12/include/linux/vserver/namespace.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/namespace.h
+@@ -0,0 +1,14 @@
++#ifndef _VX_NAMESPACE_H
++#define _VX_NAMESPACE_H
++
++#include <linux/types.h>
++
++struct vx_info;
++struct namespace;
++struct fs_struct;
++
++extern int vx_set_namespace(struct vx_info *, struct namespace *, struct fs_struct *);
++
++#else /* _VX_NAMESPACE_H */
++#warning duplicate inclusion
++#endif /* _VX_NAMESPACE_H */
+Index: linux-2.6.12/include/linux/vserver/namespace_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/namespace_cmd.h
+@@ -0,0 +1,16 @@
++#ifndef _VX_NAMESPACE_CMD_H
++#define _VX_NAMESPACE_CMD_H
++
++#define VCMD_enter_namespace VC_CMD(PROCALT, 1, 0)
++#define VCMD_cleanup_namespace VC_CMD(PROCALT, 2, 0)
++#define VCMD_set_namespace VC_CMD(PROCALT, 3, 0)
++
++
++#ifdef __KERNEL__
++
++extern int vc_enter_namespace(uint32_t, void __user *);
++extern int vc_cleanup_namespace(uint32_t, void __user *);
++extern int vc_set_namespace(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_NAMESPACE_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/network.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/network.h
+@@ -0,0 +1,96 @@
++#ifndef _VX_NETWORK_H
++#define _VX_NETWORK_H
++
++#include <linux/types.h>
++
++
++#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
++
++#define NX_DYNAMIC_ID ((uint32_t)-1) /* id for dynamic context */
++
++#define NB_IPV4ROOT 16
++
++
++/* network flags */
++
++#define NXF_STATE_SETUP (1ULL<<32)
++
++#define NXF_STATE_HELPER (1ULL<<36)
++
++#define NXF_ONE_TIME (0x0001ULL<<32)
++
++#define NXF_INIT_SET (0)
++
++
++/* address types */
++
++#define NXA_TYPE_IPV4 1
++#define NXA_TYPE_IPV6 2
++
++#define NXA_MOD_BCAST (1<<8)
++
++#define NXA_TYPE_ANY (~0)
++
++
++#ifdef __KERNEL__
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <asm/atomic.h>
++
++
++struct nx_info {
++ struct hlist_node nx_hlist; /* linked list of nxinfos */
++ nid_t nx_id; /* vnet id */
++ atomic_t nx_usecnt; /* usage count */
++ atomic_t nx_tasks; /* tasks count */
++ int nx_state; /* context state */
++
++ uint64_t nx_flags; /* network flag word */
++ uint64_t nx_ncaps; /* network capabilities */
++
++ int nbipv4;
++ __u32 ipv4[NB_IPV4ROOT]; /* Process can only bind to these IPs */
++ /* The first one is used to connect */
++ /* and for bind any service */
++ /* The other must be used explicity */
++ __u32 mask[NB_IPV4ROOT]; /* Netmask for each ipv4 */
++ /* Used to select the proper source */
++ /* address for sockets */
++ __u32 v4_bcast; /* Broadcast address to receive UDP */
++
++ char nx_name[65]; /* network context name */
++};
++
++
++/* status flags */
++
++#define NXS_HASHED 0x0001
++#define NXS_SHUTDOWN 0x0100
++#define NXS_RELEASED 0x8000
++
++extern struct nx_info *locate_nx_info(int);
++extern struct nx_info *locate_or_create_nx_info(int);
++
++extern int get_nid_list(int, unsigned int *, int);
++extern int nid_is_hashed(nid_t);
++
++extern int nx_migrate_task(struct task_struct *, struct nx_info *);
++
++extern long vs_net_change(struct nx_info *, unsigned int);
++
++struct in_ifaddr;
++struct net_device;
++
++int ifa_in_nx_info(struct in_ifaddr *, struct nx_info *);
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++
++struct sock;
++
++int nx_addr_conflict(struct nx_info *, uint32_t, struct sock *);
++
++#endif /* __KERNEL__ */
++#else /* _VX_NETWORK_H */
++#warning duplicate inclusion
++#endif /* _VX_NETWORK_H */
+Index: linux-2.6.12/include/linux/vserver/network_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/network_cmd.h
+@@ -0,0 +1,89 @@
++#ifndef _VX_NETWORK_CMD_H
++#define _VX_NETWORK_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_nid VC_CMD(VINFO, 2, 0)
++
++#ifdef __KERNEL__
++extern int vc_task_nid(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++#define VCMD_nx_info VC_CMD(VINFO, 6, 0)
++
++struct vcmd_nx_info_v0 {
++ uint32_t nid;
++ /* more to come */
++};
++
++#ifdef __KERNEL__
++extern int vc_nx_info(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++#define VCMD_net_create_v0 VC_CMD(VNET, 1, 0)
++#define VCMD_net_create VC_CMD(VNET, 1, 1)
++
++struct vcmd_net_create {
++ uint64_t flagword;
++};
++
++#define VCMD_net_migrate VC_CMD(NETMIG, 1, 0)
++
++#define VCMD_net_add VC_CMD(NETALT, 1, 0)
++#define VCMD_net_remove VC_CMD(NETALT, 2, 0)
++
++struct vcmd_net_addr_v0 {
++ uint16_t type;
++ uint16_t count;
++ uint32_t ip[4];
++ uint32_t mask[4];
++ /* more to come */
++};
++
++
++#ifdef __KERNEL__
++extern int vc_net_create(uint32_t, void __user *);
++extern int vc_net_migrate(uint32_t, void __user *);
++
++extern int vc_net_add(uint32_t, void __user *);
++extern int vc_net_remove(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++
++/* flag commands */
++
++#define VCMD_get_nflags VC_CMD(FLAGS, 5, 0)
++#define VCMD_set_nflags VC_CMD(FLAGS, 6, 0)
++
++struct vcmd_net_flags_v0 {
++ uint64_t flagword;
++ uint64_t mask;
++};
++
++#ifdef __KERNEL__
++extern int vc_get_nflags(uint32_t, void __user *);
++extern int vc_set_nflags(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++
++
++/* network caps commands */
++
++#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
++#define VCMD_set_ncaps VC_CMD(FLAGS, 8, 0)
++
++struct vcmd_net_caps_v0 {
++ uint64_t ncaps;
++ uint64_t cmask;
++};
++
++#ifdef __KERNEL__
++extern int vc_get_ncaps(uint32_t, void __user *);
++extern int vc_set_ncaps(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_CONTEXT_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/sched.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/sched.h
+@@ -0,0 +1,25 @@
++#ifndef _VX_SCHED_H
++#define _VX_SCHED_H
++
++#ifdef __KERNEL__
++
++struct timespec;
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++struct task_struct;
++
++int vx_effective_vavavoom(struct vx_info *, int);
++
++int vx_tokens_recalc(struct vx_info *);
++
++#endif /* __KERNEL__ */
++#else /* _VX_SCHED_H */
++#warning duplicate inclusion
++#endif /* _VX_SCHED_H */
+Index: linux-2.6.12/include/linux/vserver/sched_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/sched_cmd.h
+@@ -0,0 +1,47 @@
++#ifndef _VX_SCHED_CMD_H
++#define _VX_SCHED_CMD_H
++
++/* sched vserver commands */
++
++#define VCMD_set_sched_v2 VC_CMD(SCHED, 1, 2)
++#define VCMD_set_sched VC_CMD(SCHED, 1, 3)
++
++struct vcmd_set_sched_v2 {
++ int32_t fill_rate;
++ int32_t interval;
++ int32_t tokens;
++ int32_t tokens_min;
++ int32_t tokens_max;
++ uint64_t cpu_mask;
++};
++
++struct vcmd_set_sched_v3 {
++ uint32_t set_mask;
++ int32_t fill_rate;
++ int32_t interval;
++ int32_t tokens;
++ int32_t tokens_min;
++ int32_t tokens_max;
++ int32_t priority_bias;
++};
++
++
++#define VXSM_FILL_RATE 0x0001
++#define VXSM_INTERVAL 0x0002
++#define VXSM_TOKENS 0x0010
++#define VXSM_TOKENS_MIN 0x0020
++#define VXSM_TOKENS_MAX 0x0040
++#define VXSM_PRIO_BIAS 0x0100
++
++#define SCHED_KEEP (-2)
++
++#ifdef __KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_set_sched_v1(uint32_t, void __user *);
++extern int vc_set_sched_v2(uint32_t, void __user *);
++extern int vc_set_sched(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_SCHED_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/sched_def.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/sched_def.h
+@@ -0,0 +1,38 @@
++#ifndef _VX_SCHED_DEF_H
++#define _VX_SCHED_DEF_H
++
++#include <linux/spinlock.h>
++#include <linux/jiffies.h>
++#include <linux/cpumask.h>
++#include <asm/atomic.h>
++#include <asm/param.h>
++
++
++struct _vx_ticks {
++ uint64_t user_ticks; /* token tick events */
++ uint64_t sys_ticks; /* token tick events */
++ uint64_t hold_ticks; /* token ticks paused */
++ uint64_t unused[5]; /* cacheline ? */
++};
++
++/* context sub struct */
++
++struct _vx_sched {
++ atomic_t tokens; /* number of CPU tokens */
++ spinlock_t tokens_lock; /* lock for token bucket */
++
++ int fill_rate; /* Fill rate: add X tokens... */
++ int interval; /* Divisor: per Y jiffies */
++ int tokens_min; /* Limit: minimum for unhold */
++ int tokens_max; /* Limit: no more than N tokens */
++ uint32_t jiffies; /* last time accounted */
++
++ int priority_bias; /* bias offset for priority */
++ int vavavoom; /* last calculated vavavoom */
++
++ cpumask_t cpus_allowed; /* cpu mask for context */
++
++ struct _vx_ticks cpu[NR_CPUS];
++};
++
++#endif /* _VX_SCHED_DEF_H */
+Index: linux-2.6.12/include/linux/vserver/signal_cmd.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/signal_cmd.h
+@@ -0,0 +1,25 @@
++#ifndef _VX_SIGNAL_CMD_H
++#define _VX_SIGNAL_CMD_H
++
++/* signalling vserver commands */
++
++#define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0)
++#define VCMD_wait_exit VC_CMD(EVENT, 99, 0)
++
++struct vcmd_ctx_kill_v0 {
++ int32_t pid;
++ int32_t sig;
++};
++
++struct vcmd_wait_exit_v0 {
++ int32_t a;
++ int32_t b;
++};
++
++#ifdef __KERNEL__
++
++extern int vc_ctx_kill(uint32_t, void __user *);
++extern int vc_wait_exit(uint32_t, void __user *);
++
++#endif /* __KERNEL__ */
++#endif /* _VX_SIGNAL_CMD_H */
+Index: linux-2.6.12/include/linux/vserver/switch.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/switch.h
+@@ -0,0 +1,97 @@
++#ifndef _VX_SWITCH_H
++#define _VX_SWITCH_H
++
++#include <linux/types.h>
++
++#define VC_CATEGORY(c) (((c) >> 24) & 0x3F)
++#define VC_COMMAND(c) (((c) >> 16) & 0xFF)
++#define VC_VERSION(c) ((c) & 0xFFF)
++
++#define VC_CMD(c,i,v) ((((VC_CAT_ ## c) & 0x3F) << 24) \
++ | (((i) & 0xFF) << 16) | ((v) & 0xFFF))
++
++/*
++
++ Syscall Matrix V2.8
++
++ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL|
++ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | |
++ |INFO |SETUP | |MOVE | | | | | |
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICES| |
++ HOST | 00| 01| 02| 03| 04| 05| | 06| 07|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | |
++ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ MEMORY | | | | | | | |SWAP | |
++ | 16| 17| 18| 19| 20| 21| | 22| 23|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | |
++ | 24| 25| 26| 27| 28| 29| | 30| 31|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ DISK | | | | |DLIMIT | | |INODE | |
++ VFS | 32| 33| 34| 35| 36| 37| | 38| 39|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ OTHER | | | | | | | |VINFO | |
++ | 40| 41| 42| 43| 44| 45| | 46| 47|
++ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
++ SPECIAL|EVENT | | | |FLAGS | | | | |
++ | 48| 49| 50| 51| 52| 53| | 54| 55|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT |
++ | 56| 57| 58| 59| 60|TEST 61| | 62| 63|
++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++
++*/
++
++#define VC_CAT_VERSION 0
++
++#define VC_CAT_VSETUP 1
++#define VC_CAT_VHOST 2
++
++#define VC_CAT_VPROC 9
++#define VC_CAT_PROCALT 10
++#define VC_CAT_PROCMIG 11
++#define VC_CAT_PROCTRL 12
++
++#define VC_CAT_SCHED 14
++
++#define VC_CAT_VNET 25
++#define VC_CAT_NETALT 26
++#define VC_CAT_NETMIG 27
++#define VC_CAT_NETCTRL 28
++
++#define VC_CAT_DLIMIT 36
++#define VC_CAT_INODE 38
++
++#define VC_CAT_VINFO 46
++#define VC_CAT_EVENT 48
++
++#define VC_CAT_FLAGS 52
++#define VC_CAT_DEBUG 56
++#define VC_CAT_RLIMIT 60
++
++#define VC_CAT_SYSTEST 61
++#define VC_CAT_COMPAT 63
++
++/* interface version */
++
++#define VCI_VERSION 0x00020001
++#define VCI_LEGACY_VERSION 0x000100FF
++
++/* query version */
++
++#define VCMD_get_version VC_CMD(VERSION, 0, 0)
++
++
++#ifdef __KERNEL__
++
++#include <linux/errno.h>
++
++
++#else /* __KERNEL__ */
++#define __user
++#endif /* __KERNEL__ */
++
++#endif /* _VX_SWITCH_H */
+Index: linux-2.6.12/include/linux/vserver/xid.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/include/linux/vserver/xid.h
+@@ -0,0 +1,147 @@
++#ifndef _VX_XID_H
++#define _VX_XID_H
++
++#ifndef CONFIG_VSERVER
++#warning config options missing
++#endif
++
++#define XID_TAG(in) (IS_TAGXID(in))
++
++
++#ifdef CONFIG_XID_TAG_NFSD
++#define XID_TAG_NFSD 1
++#else
++#define XID_TAG_NFSD 0
++#endif
++
++
++#ifdef CONFIG_INOXID_NONE
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOXID_XID(tag, uid, gid, xid) (0)
++
++#define XIDINO_UID(tag, uid, xid) (uid)
++#define XIDINO_GID(tag, gid, xid) (gid)
++
++#endif
++
++
++#ifdef CONFIG_INOXID_GID16
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0x0000FFFF
++
++#define INOXID_XID(tag, uid, gid, xid) \
++ ((tag) ? (((gid) >> 16) & 0xFFFF) : 0)
++
++#define XIDINO_UID(tag, uid, xid) (uid)
++#define XIDINO_GID(tag, gid, xid) \
++ ((tag) ? (((gid) & 0xFFFF) | ((xid) << 16)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_INOXID_UGID24
++
++#define MAX_UID 0x00FFFFFF
++#define MAX_GID 0x00FFFFFF
++
++#define INOXID_XID(tag, uid, gid, xid) \
++ ((tag) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++
++#define XIDINO_UID(tag, uid, xid) \
++ ((tag) ? (((uid) & 0xFFFFFF) | (((xid) & 0xFF00) << 16)) : (uid))
++#define XIDINO_GID(tag, gid, xid) \
++ ((tag) ? (((gid) & 0xFFFFFF) | (((xid) & 0x00FF) << 24)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_INOXID_UID16
++
++#define MAX_UID 0x0000FFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOXID_XID(tag, uid, gid, xid) \
++ ((tag) ? (((uid) >> 16) & 0xFFFF) : 0)
++
++#define XIDINO_UID(tag, uid, xid) \
++ ((tag) ? (((uid) & 0xFFFF) | ((xid) << 16)) : (uid))
++#define XIDINO_GID(tag, gid, xid) (gid)
++
++#endif
++
++
++#ifdef CONFIG_INOXID_INTERN
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOXID_XID(tag, uid, gid, xid) \
++ ((tag) ? (xid) : 0)
++
++#define XIDINO_UID(tag, uid, xid) (uid)
++#define XIDINO_GID(tag, gid, xid) (gid)
++
++#endif
++
++
++#ifdef CONFIG_INOXID_RUNTIME
++
++#define MAX_UID 0xFFFFFFFF
++#define MAX_GID 0xFFFFFFFF
++
++#define INOXID_XID(tag, uid, gid, xid) (0)
++
++#define XIDINO_UID(tag, uid, xid) (uid)
++#define XIDINO_GID(tag, gid, xid) (gid)
++
++#endif
++
++
++#ifndef CONFIG_INOXID_NONE
++#define vx_current_fsxid(sb) \
++ ((sb)->s_flags & MS_TAGXID ? current->xid : 0)
++#else
++#define vx_current_fsxid(sb) (0)
++#endif
++
++#ifndef CONFIG_INOXID_INTERN
++#define XIDINO_XID(tag, xid) (0)
++#else
++#define XIDINO_XID(tag, xid) ((tag) ? (xid) : 0)
++#endif
++
++#define INOXID_UID(tag, uid, gid) \
++ ((tag) ? ((uid) & MAX_UID) : (uid))
++#define INOXID_GID(tag, uid, gid) \
++ ((tag) ? ((gid) & MAX_GID) : (gid))
++
++
++static inline uid_t vx_map_uid(uid_t uid)
++{
++ if ((uid > MAX_UID) && (uid != -1))
++ uid = -2;
++ return (uid & MAX_UID);
++}
++
++static inline gid_t vx_map_gid(gid_t gid)
++{
++ if ((gid > MAX_GID) && (gid != -1))
++ gid = -2;
++ return (gid & MAX_GID);
++}
++
++
++#ifdef CONFIG_VSERVER_LEGACY
++#define FIOC_GETXID _IOR('x', 1, long)
++#define FIOC_SETXID _IOW('x', 2, long)
++#define FIOC_SETXIDJ _IOW('x', 3, long)
++#endif
++
++int vx_parse_xid(char *string, xid_t *xid, int remove);
++void vx_propagate_xid(struct nameidata *nd, struct inode *inode);
++
++#endif /* _VX_XID_H */
+Index: linux-2.6.12/include/net/af_unix.h
+===================================================================
+--- linux-2.6.12.orig/include/net/af_unix.h
++++ linux-2.6.12/include/net/af_unix.h
+@@ -11,9 +11,9 @@ extern rwlock_t unix_table_lock;
+
+ extern atomic_t unix_tot_inflight;
+
+-static inline struct sock *first_unix_socket(int *i)
++static inline struct sock *next_unix_socket_table(int *i)
+ {
+- for (*i = 0; *i <= UNIX_HASH_SIZE; (*i)++) {
++ for ((*i)++; *i <= UNIX_HASH_SIZE; (*i)++) {
+ if (!hlist_empty(&unix_socket_table[*i]))
+ return __sk_head(&unix_socket_table[*i]);
+ }
+@@ -22,16 +22,19 @@ static inline struct sock *first_unix_so
+
+ static inline struct sock *next_unix_socket(int *i, struct sock *s)
+ {
+- struct sock *next = sk_next(s);
+- /* More in this chain? */
+- if (next)
+- return next;
+- /* Look for next non-empty chain. */
+- for ((*i)++; *i <= UNIX_HASH_SIZE; (*i)++) {
+- if (!hlist_empty(&unix_socket_table[*i]))
+- return __sk_head(&unix_socket_table[*i]);
+- }
+- return NULL;
++ do {
++ if (s)
++ s = sk_next(s);
++ if (!s)
++ s = next_unix_socket_table(i);
++ } while (s && !vx_check(s->sk_xid, VX_IDENT|VX_WATCH));
++ return s;
++}
++
++static inline struct sock *first_unix_socket(int *i)
++{
++ *i = 0;
++ return next_unix_socket(i, NULL);
+ }
+
+ #define forall_unix_sockets(i, s) \
+Index: linux-2.6.12/include/net/irda/ircomm_tty.h
+===================================================================
+--- linux-2.6.12.orig/include/net/irda/ircomm_tty.h
++++ linux-2.6.12/include/net/irda/ircomm_tty.h
+@@ -102,8 +102,8 @@ struct ircomm_tty_cb {
+ struct timer_list watchdog_timer;
+ struct work_struct tqueue;
+
+- unsigned short close_delay;
+- unsigned short closing_wait; /* time to wait before closing */
++ unsigned int close_delay;
++ unsigned int closing_wait; /* time to wait before closing */
+
+ int open_count;
+ int blocked_open; /* # of blocked opens */
+Index: linux-2.6.12/include/net/route.h
+===================================================================
+--- linux-2.6.12.orig/include/net/route.h
++++ linux-2.6.12/include/net/route.h
+@@ -33,6 +33,7 @@
+ #include <linux/route.h>
+ #include <linux/ip.h>
+ #include <linux/cache.h>
++#include <linux/vs_network.h>
+
+ #ifndef __KERNEL__
+ #warning This file is not supposed to be used outside of kernel.
+@@ -145,6 +146,59 @@ static inline char rt_tos2priority(u8 to
+ return ip_tos2prio[IPTOS_TOS(tos)>>1];
+ }
+
++#define IPI_LOOPBACK 0x0100007f
++
++static inline int ip_find_src(struct nx_info *nxi, struct rtable **rp, struct flowi *fl)
++{
++ int err;
++ int i, n = nxi->nbipv4;
++ u32 ipv4root = nxi->ipv4[0];
++
++ if (ipv4root == 0)
++ return 0;
++
++ if (fl->fl4_src == 0) {
++ if (n > 1) {
++ u32 foundsrc;
++
++ err = __ip_route_output_key(rp, fl);
++ if (err) {
++ fl->fl4_src = ipv4root;
++ err = __ip_route_output_key(rp, fl);
++ }
++ if (err)
++ return err;
++
++ foundsrc = (*rp)->rt_src;
++ ip_rt_put(*rp);
++
++ for (i=0; i<n; i++){
++ u32 mask = nxi->mask[i];
++ u32 ipv4 = nxi->ipv4[i];
++ u32 net4 = ipv4 & mask;
++
++ if (foundsrc == ipv4) {
++ fl->fl4_src = ipv4;
++ break;
++ }
++ if (!fl->fl4_src && (foundsrc & mask) == net4)
++ fl->fl4_src = ipv4;
++ }
++ }
++ if (fl->fl4_src == 0)
++ fl->fl4_src = (fl->fl4_dst == IPI_LOOPBACK)
++ ? IPI_LOOPBACK : ipv4root;
++ } else {
++ for (i=0; i<n; i++) {
++ if (nxi->ipv4[i] == fl->fl4_src)
++ break;
++ }
++ if (i == n)
++ return -EPERM;
++ }
++ return 0;
++}
++
+ static inline int ip_route_connect(struct rtable **rp, u32 dst,
+ u32 src, u32 tos, int oif, u8 protocol,
+ u16 sport, u16 dport, struct sock *sk)
+@@ -159,7 +213,23 @@ static inline int ip_route_connect(struc
+ .dport = dport } } };
+
+ int err;
+- if (!dst || !src) {
++ struct nx_info *nx_info = current->nx_info;
++
++ if (sk)
++ nx_info = sk->sk_nx_info;
++ vxdprintk(VXD_CBIT(net, 4),
++ "ip_route_connect(%p) %p,%p;%lx",
++ sk, nx_info, sk->sk_socket,
++ (sk->sk_socket?sk->sk_socket->flags:0));
++
++ if (nx_info) {
++ err = ip_find_src(nx_info, rp, &fl);
++ if (err)
++ return err;
++ if (fl.fl4_dst == IPI_LOOPBACK && !vx_check(0, VX_ADMIN))
++ fl.fl4_dst = nx_info->ipv4[0];
++ }
++ if (!fl.fl4_dst || !fl.fl4_src) {
+ err = __ip_route_output_key(rp, &fl);
+ if (err)
+ return err;
+Index: linux-2.6.12/include/net/sock.h
+===================================================================
+--- linux-2.6.12.orig/include/net/sock.h
++++ linux-2.6.12/include/net/sock.h
+@@ -110,6 +110,10 @@ struct sock_common {
+ struct hlist_node skc_node;
+ struct hlist_node skc_bind_node;
+ atomic_t skc_refcnt;
++ xid_t skc_xid;
++ struct vx_info *skc_vx_info;
++ nid_t skc_nid;
++ struct nx_info *skc_nx_info;
+ };
+
+ /**
+@@ -184,6 +188,10 @@ struct sock {
+ #define sk_node __sk_common.skc_node
+ #define sk_bind_node __sk_common.skc_bind_node
+ #define sk_refcnt __sk_common.skc_refcnt
++#define sk_xid __sk_common.skc_xid
++#define sk_vx_info __sk_common.skc_vx_info
++#define sk_nid __sk_common.skc_nid
++#define sk_nx_info __sk_common.skc_nx_info
+ unsigned char sk_shutdown : 2,
+ sk_no_check : 2,
+ sk_userlocks : 4;
+Index: linux-2.6.12/include/net/tcp.h
+===================================================================
+--- linux-2.6.12.orig/include/net/tcp.h
++++ linux-2.6.12/include/net/tcp.h
+@@ -192,6 +192,10 @@ struct tcp_tw_bucket {
+ #define tw_node __tw_common.skc_node
+ #define tw_bind_node __tw_common.skc_bind_node
+ #define tw_refcnt __tw_common.skc_refcnt
++#define tw_xid __tw_common.skc_xid
++#define tw_vx_info __tw_common.skc_vx_info
++#define tw_nid __tw_common.skc_nid
++#define tw_nx_info __tw_common.skc_nx_info
+ volatile unsigned char tw_substate;
+ unsigned char tw_rcv_wscale;
+ __u16 tw_sport;
+@@ -485,8 +489,8 @@ static __inline__ int tcp_sk_listen_hash
+ so that we select tick to get range about 4 seconds.
+ */
+
+-#if HZ <= 16 || HZ > 4096
+-# error Unsupported: HZ <= 16 or HZ > 4096
++#if HZ <= 16 || HZ > 32768
++# error Unsupported: HZ <= 16 or HZ > 32768
+ #elif HZ <= 32
+ # define TCP_TW_RECYCLE_TICK (5+2-TCP_TW_RECYCLE_SLOTS_LOG)
+ #elif HZ <= 64
+@@ -501,8 +505,14 @@ static __inline__ int tcp_sk_listen_hash
+ # define TCP_TW_RECYCLE_TICK (10+2-TCP_TW_RECYCLE_SLOTS_LOG)
+ #elif HZ <= 2048
+ # define TCP_TW_RECYCLE_TICK (11+2-TCP_TW_RECYCLE_SLOTS_LOG)
+-#else
++#elif HZ <= 4096
+ # define TCP_TW_RECYCLE_TICK (12+2-TCP_TW_RECYCLE_SLOTS_LOG)
++#elif HZ <= 8192
++# define TCP_TW_RECYCLE_TICK (13+2-TCP_TW_RECYCLE_SLOTS_LOG)
++#elif HZ <= 16384
++# define TCP_TW_RECYCLE_TICK (14+2-TCP_TW_RECYCLE_SLOTS_LOG)
++#else
++# define TCP_TW_RECYCLE_TICK (15+2-TCP_TW_RECYCLE_SLOTS_LOG)
+ #endif
+
+ #define BICTCP_BETA_SCALE 1024 /* Scale factor beta calculation
+Index: linux-2.6.12/init/calibrate.c
+===================================================================
+--- linux-2.6.12.orig/init/calibrate.c
++++ linux-2.6.12/init/calibrate.c
+@@ -33,8 +33,8 @@ void __devinit calibrate_delay(void)
+ loops_per_jiffy = preset_lpj;
+ printk("Calibrating delay loop (skipped)... "
+ "%lu.%02lu BogoMIPS preset\n",
+- loops_per_jiffy/(500000/HZ),
+- (loops_per_jiffy/(5000/HZ)) % 100);
++ HZ*(loops_per_jiffy >> 3)/62500,
++ (HZ*(loops_per_jiffy >> 3)/625) % 100);
+ } else {
+ loops_per_jiffy = (1<<12);
+
+@@ -71,8 +71,8 @@ void __devinit calibrate_delay(void)
+
+ /* Round the value and print it */
+ printk("%lu.%02lu BogoMIPS (lpj=%lu)\n",
+- loops_per_jiffy/(500000/HZ),
+- (loops_per_jiffy/(5000/HZ)) % 100,
++ HZ*(loops_per_jiffy >> 3)/62500,
++ (HZ*(loops_per_jiffy >> 3)/625) % 100,
+ loops_per_jiffy);
+ }
+
+Index: linux-2.6.12/init/version.c
+===================================================================
+--- linux-2.6.12.orig/init/version.c
++++ linux-2.6.12/init/version.c
+@@ -31,3 +31,8 @@ EXPORT_SYMBOL(system_utsname);
+ const char linux_banner[] =
+ "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
+ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
++
++const char vx_linux_banner[] =
++ "Linux version %s (" LINUX_COMPILE_BY "@"
++ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n";
++
+Index: linux-2.6.12/ipc/mqueue.c
+===================================================================
+--- linux-2.6.12.orig/ipc/mqueue.c
++++ linux-2.6.12/ipc/mqueue.c
+@@ -24,6 +24,8 @@
+ #include <linux/netlink.h>
+ #include <linux/syscalls.h>
+ #include <linux/signal.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ #include <net/sock.h>
+ #include "util.h"
+
+@@ -147,17 +149,20 @@ static struct inode *mqueue_get_inode(st
+ spin_lock(&mq_lock);
+ if (u->mq_bytes + mq_bytes < u->mq_bytes ||
+ u->mq_bytes + mq_bytes >
+- p->signal->rlim[RLIMIT_MSGQUEUE].rlim_cur) {
++ p->signal->rlim[RLIMIT_MSGQUEUE].rlim_cur ||
++ !vx_ipcmsg_avail(p->vx_info, mq_bytes)) {
+ spin_unlock(&mq_lock);
+ goto out_inode;
+ }
+ u->mq_bytes += mq_bytes;
++ vx_ipcmsg_add(p->vx_info, u, mq_bytes);
+ spin_unlock(&mq_lock);
+
+ info->messages = kmalloc(mq_msg_tblsz, GFP_KERNEL);
+ if (!info->messages) {
+ spin_lock(&mq_lock);
+ u->mq_bytes -= mq_bytes;
++ vx_ipcmsg_sub(p->vx_info, u, mq_bytes);
+ spin_unlock(&mq_lock);
+ goto out_inode;
+ }
+@@ -255,10 +260,14 @@ static void mqueue_delete_inode(struct i
+ (info->attr.mq_maxmsg * info->attr.mq_msgsize));
+ user = info->user;
+ if (user) {
++ struct vx_info *vxi = locate_vx_info(user->xid);
++
+ spin_lock(&mq_lock);
+ user->mq_bytes -= mq_bytes;
++ vx_ipcmsg_sub(vxi, user, mq_bytes);
+ queues_count--;
+ spin_unlock(&mq_lock);
++ put_vx_info(vxi);
+ free_uid(user);
+ }
+ }
+Index: linux-2.6.12/ipc/msg.c
+===================================================================
+--- linux-2.6.12.orig/ipc/msg.c
++++ linux-2.6.12/ipc/msg.c
+@@ -98,6 +98,7 @@ static int newque (key_t key, int msgflg
+
+ msq->q_perm.mode = (msgflg & S_IRWXUGO);
+ msq->q_perm.key = key;
++ msq->q_perm.xid = vx_current_xid();
+
+ msq->q_perm.security = NULL;
+ retval = security_msg_queue_alloc(msq);
+@@ -820,7 +821,11 @@ static int sysvipc_msg_read_proc(char *b
+ for(i = 0; i <= msg_ids.max_id; i++) {
+ struct msg_queue * msq;
+ msq = msg_lock(i);
+- if(msq != NULL) {
++ if (msq) {
++ if (!vx_check(msq->q_perm.xid, VX_IDENT)) {
++ msg_unlock(msq);
++ continue;
++ }
+ len += sprintf(buffer + len, "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
+ msq->q_perm.key,
+ msg_buildid(i,msq->q_perm.seq),
+Index: linux-2.6.12/ipc/sem.c
+===================================================================
+--- linux-2.6.12.orig/ipc/sem.c
++++ linux-2.6.12/ipc/sem.c
+@@ -177,6 +177,7 @@ static int newary (key_t key, int nsems,
+
+ sma->sem_perm.mode = (semflg & S_IRWXUGO);
+ sma->sem_perm.key = key;
++ sma->sem_perm.xid = vx_current_xid();
+
+ sma->sem_perm.security = NULL;
+ retval = security_sem_alloc(sma);
+@@ -1347,7 +1348,11 @@ static int sysvipc_sem_read_proc(char *b
+ for(i = 0; i <= sem_ids.max_id; i++) {
+ struct sem_array *sma;
+ sma = sem_lock(i);
+- if(sma) {
++ if (sma) {
++ if (!vx_check(sma->sem_perm.xid, VX_IDENT)) {
++ sem_unlock(sma);
++ continue;
++ }
+ len += sprintf(buffer + len, "%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
+ sma->sem_perm.key,
+ sem_buildid(i,sma->sem_perm.seq),
+Index: linux-2.6.12/ipc/shm.c
+===================================================================
+--- linux-2.6.12.orig/ipc/shm.c
++++ linux-2.6.12/ipc/shm.c
+@@ -29,6 +29,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/audit.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_limit.h>
+
+ #include <asm/uaccess.h>
+
+@@ -114,7 +115,12 @@ static void shm_open (struct vm_area_str
+ */
+ static void shm_destroy (struct shmid_kernel *shp)
+ {
+- shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++ struct vx_info *vxi = locate_vx_info(shp->shm_perm.xid);
++ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++
++ vx_ipcshm_sub(vxi, shp, numpages);
++ shm_tot -= numpages;
++
+ shm_rmid (shp->id);
+ shm_unlock(shp);
+ if (!is_file_hugepages(shp->shm_file))
+@@ -124,6 +130,7 @@ static void shm_destroy (struct shmid_ke
+ shp->mlock_user);
+ fput (shp->shm_file);
+ security_shm_free(shp);
++ put_vx_info(vxi);
+ ipc_rcu_putref(shp);
+ }
+
+@@ -190,12 +197,15 @@ static int newseg (key_t key, int shmflg
+
+ if (shm_tot + numpages >= shm_ctlall)
+ return -ENOSPC;
++ if (!vx_ipcshm_avail(current->vx_info, numpages))
++ return -ENOSPC;
+
+ shp = ipc_rcu_alloc(sizeof(*shp));
+ if (!shp)
+ return -ENOMEM;
+
+ shp->shm_perm.key = key;
++ shp->shm_perm.xid = vx_current_xid();
+ shp->shm_flags = (shmflg & S_IRWXUGO);
+ shp->mlock_user = NULL;
+
+@@ -237,6 +247,7 @@ static int newseg (key_t key, int shmflg
+ else
+ file->f_op = &shm_file_operations;
+ shm_tot += numpages;
++ vx_ipcshm_add(current->vx_info, key, numpages);
+ shm_unlock(shp);
+ return shp->id;
+
+@@ -882,11 +893,15 @@ static int sysvipc_shm_read_proc(char *b
+ struct shmid_kernel* shp;
+
+ shp = shm_lock(i);
+- if(shp!=NULL) {
++ if (shp) {
+ #define SMALL_STRING "%10d %10d %4o %10u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
+ #define BIG_STRING "%10d %10d %4o %21u %5u %5u %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
+ char *format;
+
++ if (!vx_check(shp->shm_perm.xid, VX_IDENT)) {
++ shm_unlock(shp);
++ continue;
++ }
+ if (sizeof(size_t) <= sizeof(int))
+ format = SMALL_STRING;
+ else
+Index: linux-2.6.12/ipc/util.c
+===================================================================
+--- linux-2.6.12.orig/ipc/util.c
++++ linux-2.6.12/ipc/util.c
+@@ -107,7 +107,9 @@ int ipc_findkey(struct ipc_ids* ids, key
+ */
+ for (id = 0; id <= max_id; id++) {
+ p = ids->entries->p[id];
+- if(p==NULL)
++ if (p==NULL)
++ continue;
++ if (!vx_check(p->xid, VX_IDENT))
+ continue;
+ if (key == p->key)
+ return id;
+@@ -420,6 +422,8 @@ int ipcperms (struct kern_ipc_perm *ipcp
+ { /* flag will most probably be 0 or S_...UGO from <linux/stat.h> */
+ int requested_mode, granted_mode;
+
++ if (!vx_check(ipcp->xid, VX_ADMIN|VX_IDENT)) /* maybe just VX_IDENT? */
++ return -1;
+ requested_mode = (flag >> 6) | (flag >> 3) | flag;
+ granted_mode = ipcp->mode;
+ if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
+Index: linux-2.6.12/kernel/Makefile
+===================================================================
+--- linux-2.6.12.orig/kernel/Makefile
++++ linux-2.6.12/kernel/Makefile
+@@ -9,6 +9,9 @@ obj-y = sched.o fork.o exec_domain.o
+ rcupdate.o intermodule.o extable.o params.o posix-timers.o \
+ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o
+
++subdir-y += vserver
++obj-y += vserver/vserver.o
++
+ obj-$(CONFIG_FUTEX) += futex.o
+ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
+ obj-$(CONFIG_SMP) += cpu.o spinlock.o
+Index: linux-2.6.12/kernel/capability.c
+===================================================================
+--- linux-2.6.12.orig/kernel/capability.c
++++ linux-2.6.12/kernel/capability.c
+@@ -11,6 +11,7 @@
+ #include <linux/module.h>
+ #include <linux/security.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_cvirt.h>
+ #include <asm/uaccess.h>
+
+ unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
+Index: linux-2.6.12/kernel/cpuset.c
+===================================================================
+--- linux-2.6.12.orig/kernel/cpuset.c
++++ linux-2.6.12/kernel/cpuset.c
+@@ -48,6 +48,7 @@
+ #include <linux/time.h>
+ #include <linux/backing-dev.h>
+ #include <linux/sort.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/atomic.h>
+Index: linux-2.6.12/kernel/exit.c
+===================================================================
+--- linux-2.6.12.orig/kernel/exit.c
++++ linux-2.6.12/kernel/exit.c
+@@ -28,6 +28,8 @@
+ #include <linux/cpuset.h>
+ #include <linux/syscalls.h>
+ #include <linux/signal.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_network.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -44,6 +46,11 @@ static void exit_mm(struct task_struct *
+ static void __unhash_process(struct task_struct *p)
+ {
+ nr_threads--;
++ /* tasklist_lock is held */
++ if (p->vx_info) {
++ atomic_dec(&p->vx_info->cvirt.nr_threads);
++ vx_nproc_dec(p);
++ }
+ detach_pid(p, PIDTYPE_PID);
+ detach_pid(p, PIDTYPE_TGID);
+ if (thread_group_leader(p)) {
+@@ -100,6 +107,10 @@ repeat:
+ spin_unlock(&p->proc_lock);
+ proc_pid_flush(proc_dentry);
+ release_thread(p);
++ if (p->vx_info)
++ release_vx_info(p->vx_info, p);
++ if (p->nx_info)
++ release_nx_info(p->nx_info, p);
+ put_task_struct(p);
+
+ p = leader;
+@@ -230,6 +241,7 @@ static inline void reparent_to_init(void
+ ptrace_unlink(current);
+ /* Reparent to init */
+ REMOVE_LINKS(current);
++ /* FIXME handle vchild_reaper/initpid */
+ current->parent = child_reaper;
+ current->real_parent = child_reaper;
+ SET_LINKS(current);
+@@ -376,6 +388,7 @@ static inline void close_files(struct fi
+ struct file * file = xchg(&files->fd[i], NULL);
+ if (file)
+ filp_close(file, files);
++ vx_openfd_dec(i);
+ }
+ i++;
+ set >>= 1;
+@@ -592,6 +605,7 @@ static inline void forget_original_paren
+ struct task_struct *p, *reaper = father;
+ struct list_head *_p, *_n;
+
++ /* FIXME handle vchild_reaper/initpid */
+ do {
+ reaper = next_thread(reaper);
+ if (reaper == father) {
+Index: linux-2.6.12/kernel/fork.c
+===================================================================
+--- linux-2.6.12.orig/kernel/fork.c
++++ linux-2.6.12/kernel/fork.c
+@@ -41,6 +41,9 @@
+ #include <linux/profile.h>
+ #include <linux/rmap.h>
+ #include <linux/acct.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_memory.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/pgalloc.h>
+@@ -101,6 +104,8 @@ static kmem_cache_t *mm_cachep;
+ void free_task(struct task_struct *tsk)
+ {
+ free_thread_info(tsk->thread_info);
++ clr_vx_info(&tsk->vx_info);
++ clr_nx_info(&tsk->nx_info);
+ free_task_struct(tsk);
+ }
+ EXPORT_SYMBOL(free_task);
+@@ -195,8 +200,8 @@ static inline int dup_mmap(struct mm_str
+ mm->mmap_cache = NULL;
+ mm->free_area_cache = oldmm->mmap_base;
+ mm->map_count = 0;
+- set_mm_counter(mm, rss, 0);
+- set_mm_counter(mm, anon_rss, 0);
++ __set_mm_counter(mm, rss, 0);
++ __set_mm_counter(mm, anon_rss, 0);
+ cpus_clear(mm->cpu_vm_mask);
+ mm->mm_rb = RB_ROOT;
+ rb_link = &mm->mm_rb.rb_node;
+@@ -325,6 +330,7 @@ static struct mm_struct * mm_init(struct
+
+ if (likely(!mm_alloc_pgd(mm))) {
+ mm->def_flags = 0;
++ set_vx_info(&mm->mm_vx_info, current->vx_info);
+ return mm;
+ }
+ free_mm(mm);
+@@ -356,6 +362,7 @@ void fastcall __mmdrop(struct mm_struct
+ BUG_ON(mm == &init_mm);
+ mm_free_pgd(mm);
+ destroy_context(mm);
++ clr_vx_info(&mm->mm_vx_info);
+ free_mm(mm);
+ }
+
+@@ -482,6 +489,7 @@ static int copy_mm(unsigned long clone_f
+
+ /* Copy the current MM stuff.. */
+ memcpy(mm, oldmm, sizeof(*mm));
++ mm->mm_vx_info = NULL;
+ if (!mm_init(mm))
+ goto fail_nomem;
+
+@@ -510,6 +518,7 @@ fail_nocontext:
+ * If init_new_context() failed, we cannot use mmput() to free the mm
+ * because it calls destroy_context()
+ */
++ clr_vx_info(&mm->mm_vx_info);
+ mm_free_pgd(mm);
+ free_mm(mm);
+ return retval;
+@@ -650,6 +659,8 @@ static int copy_files(unsigned long clon
+ struct file *f = *old_fds++;
+ if (f) {
+ get_file(f);
++ /* FIXME sum it first for check and performance */
++ vx_openfd_inc(open_files - i);
+ } else {
+ /*
+ * The fd may be claimed in the fd bitmap but not yet
+@@ -845,6 +856,8 @@ static task_t *copy_process(unsigned lon
+ {
+ int retval;
+ struct task_struct *p = NULL;
++ struct vx_info *vxi;
++ struct nx_info *nxi;
+
+ if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
+ return ERR_PTR(-EINVAL);
+@@ -873,12 +886,30 @@ static task_t *copy_process(unsigned lon
+ if (!p)
+ goto fork_out;
+
++ init_vx_info(&p->vx_info, current->vx_info);
++ init_nx_info(&p->nx_info, current->nx_info);
++
++ /* check vserver memory */
++ if (p->mm && !(clone_flags & CLONE_VM)) {
++ if (vx_vmpages_avail(p->mm, p->mm->total_vm))
++ vx_pages_add(p->mm->mm_vx_info, RLIMIT_AS, p->mm->total_vm);
++ else
++ goto bad_fork_free;
++ }
++ if (p->mm && vx_flags(VXF_FORK_RSS, 0)) {
++ if (!vx_rsspages_avail(p->mm, get_mm_counter(p->mm, rss)))
++ goto bad_fork_cleanup_vm;
++ }
++
+ retval = -EAGAIN;
++ if (!vx_nproc_avail(1))
++ goto bad_fork_cleanup_vm;
++
+ if (atomic_read(&p->user->processes) >=
+ p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
+ if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+ p->user != &root_user)
+- goto bad_fork_free;
++ goto bad_fork_cleanup_vm;
+ }
+
+ atomic_inc(&p->user->__count);
+@@ -1101,6 +1132,18 @@ static task_t *copy_process(unsigned lon
+
+ nr_threads++;
+ total_forks++;
++
++ /* p is copy of current */
++ vxi = p->vx_info;
++ if (vxi) {
++ claim_vx_info(vxi, p);
++ atomic_inc(&vxi->cvirt.nr_threads);
++ atomic_inc(&vxi->cvirt.total_forks);
++ vx_nproc_inc(p);
++ }
++ nxi = p->nx_info;
++ if (nxi)
++ claim_nx_info(nxi, p);
+ write_unlock_irq(&tasklist_lock);
+ retval = 0;
+
+@@ -1143,6 +1186,9 @@ bad_fork_cleanup_count:
+ put_group_info(p->group_info);
+ atomic_dec(&p->user->processes);
+ free_uid(p->user);
++bad_fork_cleanup_vm:
++ if (p->mm && !(clone_flags & CLONE_VM))
++ vx_pages_sub(p->mm->mm_vx_info, RLIMIT_AS, p->mm->total_vm);
+ bad_fork_free:
+ free_task(p);
+ goto fork_out;
+Index: linux-2.6.12/kernel/kthread.c
+===================================================================
+--- linux-2.6.12.orig/kernel/kthread.c
++++ linux-2.6.12/kernel/kthread.c
+@@ -114,7 +114,7 @@ static void keventd_create_kthread(void
+ create->result = ERR_PTR(pid);
+ } else {
+ wait_for_completion(&create->started);
+- create->result = find_task_by_pid(pid);
++ create->result = find_task_by_real_pid(pid);
+ }
+ complete(&create->done);
+ }
+Index: linux-2.6.12/kernel/posix-cpu-timers.c
+===================================================================
+--- linux-2.6.12.orig/kernel/posix-cpu-timers.c
++++ linux-2.6.12/kernel/posix-cpu-timers.c
+@@ -6,6 +6,7 @@
+ #include <linux/posix-timers.h>
+ #include <asm/uaccess.h>
+ #include <linux/errno.h>
++#include <linux/vs_cvirt.h>
+
+ static int check_clock(clockid_t which_clock)
+ {
+Index: linux-2.6.12/kernel/posix-timers.c
+===================================================================
+--- linux-2.6.12.orig/kernel/posix-timers.c
++++ linux-2.6.12/kernel/posix-timers.c
+@@ -47,6 +47,7 @@
+ #include <linux/wait.h>
+ #include <linux/workqueue.h>
+ #include <linux/module.h>
++#include <linux/vs_cvirt.h>
+
+ #ifndef div_long_long_rem
+ #include <asm/div64.h>
+@@ -535,7 +536,7 @@ static inline struct task_struct * good_
+ struct task_struct *rtn = current->group_leader;
+
+ if ((event->sigev_notify & SIGEV_THREAD_ID ) &&
+- (!(rtn = find_task_by_pid(event->sigev_notify_thread_id)) ||
++ (!(rtn = find_task_by_real_pid(event->sigev_notify_thread_id)) ||
+ rtn->tgid != current->tgid ||
+ (event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
+ return NULL;
+Index: linux-2.6.12/kernel/printk.c
+===================================================================
+--- linux-2.6.12.orig/kernel/printk.c
++++ linux-2.6.12/kernel/printk.c
+@@ -31,6 +31,7 @@
+ #include <linux/security.h>
+ #include <linux/bootmem.h>
+ #include <linux/syscalls.h>
++#include <linux/vserver/cvirt.h>
+
+ #include <asm/uaccess.h>
+
+@@ -222,18 +223,13 @@ int do_syslog(int type, char __user * bu
+ unsigned long i, j, limit, count;
+ int do_clear = 0;
+ char c;
+- int error = 0;
++ int error;
+
+ error = security_syslog(type);
+ if (error)
+ return error;
+
+- switch (type) {
+- case 0: /* Close log */
+- break;
+- case 1: /* Open log */
+- break;
+- case 2: /* Read from log */
++ if ((type >= 2) && (type <= 4)) {
+ error = -EINVAL;
+ if (!buf || len < 0)
+ goto out;
+@@ -244,6 +240,16 @@ int do_syslog(int type, char __user * bu
+ error = -EFAULT;
+ goto out;
+ }
++ }
++ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ return vx_do_syslog(type, buf, len);
++
++ switch (type) {
++ case 0: /* Close log */
++ break;
++ case 1: /* Open log */
++ break;
++ case 2: /* Read from log */
+ error = wait_event_interruptible(log_wait, (log_start - log_end));
+ if (error)
+ goto out;
+@@ -267,16 +273,6 @@ int do_syslog(int type, char __user * bu
+ do_clear = 1;
+ /* FALL THRU */
+ case 3: /* Read last kernel messages */
+- error = -EINVAL;
+- if (!buf || len < 0)
+- goto out;
+- error = 0;
+- if (!len)
+- goto out;
+- if (!access_ok(VERIFY_WRITE, buf, len)) {
+- error = -EFAULT;
+- goto out;
+- }
+ count = len;
+ if (count > log_buf_len)
+ count = log_buf_len;
+@@ -514,6 +510,8 @@ asmlinkage int printk(const char *fmt, .
+ return r;
+ }
+
++static volatile int printk_cpu = -1;
++
+ asmlinkage int vprintk(const char *fmt, va_list args)
+ {
+ unsigned long flags;
+@@ -522,11 +520,12 @@ asmlinkage int vprintk(const char *fmt,
+ static char printk_buf[1024];
+ static int log_level_unknown = 1;
+
+- if (unlikely(oops_in_progress))
++ if (unlikely(oops_in_progress && printk_cpu == smp_processor_id()))
+ zap_locks();
+
+ /* This stops the holder of console_sem just where we want him */
+ spin_lock_irqsave(&logbuf_lock, flags);
++ printk_cpu = smp_processor_id();
+
+ /* Emit the output into the temporary buffer */
+ printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args);
+Index: linux-2.6.12/kernel/sched.c
+===================================================================
+--- linux-2.6.12.orig/kernel/sched.c
++++ linux-2.6.12/kernel/sched.c
+@@ -50,6 +50,9 @@
+ #include <asm/tlb.h>
+
+ #include <asm/unistd.h>
++#include <linux/vs_context.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vs_sched.h>
+
+ /*
+ * Convert user-nice values [ -20 ... 0 ... 19 ]
+@@ -236,6 +239,10 @@ struct runqueue {
+ task_t *migration_thread;
+ struct list_head migration_queue;
+ #endif
++#ifdef CONFIG_VSERVER_HARDCPU
++ struct list_head hold_queue;
++ int idle_tokens;
++#endif
+
+ #ifdef CONFIG_SCHEDSTATS
+ /* latency stats */
+@@ -541,6 +548,7 @@ static inline void sched_info_switch(tas
+ */
+ static void dequeue_task(struct task_struct *p, prio_array_t *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ array->nr_active--;
+ list_del(&p->run_list);
+ if (list_empty(array->queue + p->prio))
+@@ -549,6 +557,7 @@ static void dequeue_task(struct task_str
+
+ static void enqueue_task(struct task_struct *p, prio_array_t *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ sched_info_queued(p);
+ list_add_tail(&p->run_list, array->queue + p->prio);
+ __set_bit(p->prio, array->bitmap);
+@@ -562,11 +571,13 @@ static void enqueue_task(struct task_str
+ */
+ static void requeue_task(struct task_struct *p, prio_array_t *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ list_move_tail(&p->run_list, array->queue + p->prio);
+ }
+
+ static inline void enqueue_task_head(struct task_struct *p, prio_array_t *array)
+ {
++ BUG_ON(p->state & TASK_ONHOLD);
+ list_add(&p->run_list, array->queue + p->prio);
+ __set_bit(p->prio, array->bitmap);
+ array->nr_active++;
+@@ -590,6 +601,7 @@ static inline void enqueue_task_head(str
+ static int effective_prio(task_t *p)
+ {
+ int bonus, prio;
++ struct vx_info *vxi;
+
+ if (rt_task(p))
+ return p->prio;
+@@ -597,6 +609,11 @@ static int effective_prio(task_t *p)
+ bonus = CURRENT_BONUS(p) - MAX_BONUS / 2;
+
+ prio = p->static_prio - bonus;
++
++ if ((vxi = p->vx_info) &&
++ vx_info_flags(vxi, VXF_SCHED_PRIO, 0))
++ prio += vx_effective_vavavoom(vxi, MAX_USER_PRIO);
++
+ if (prio < MAX_RT_PRIO)
+ prio = MAX_RT_PRIO;
+ if (prio > MAX_PRIO-1)
+@@ -730,19 +747,77 @@ static void activate_task(task_t *p, run
+ }
+ p->timestamp = now;
+
++ vx_activate_task(p);
+ __activate_task(p, rq);
+ }
+
+ /*
+ * deactivate_task - remove a task from the runqueue.
+ */
+-static void deactivate_task(struct task_struct *p, runqueue_t *rq)
++static void __deactivate_task(struct task_struct *p, runqueue_t *rq)
+ {
+ rq->nr_running--;
+ dequeue_task(p, p->array);
+ p->array = NULL;
+ }
+
++static inline
++void deactivate_task(struct task_struct *p, runqueue_t *rq)
++{
++ vx_deactivate_task(p);
++ __deactivate_task(p, rq);
++}
++
++
++#ifdef CONFIG_VSERVER_HARDCPU
++/*
++ * vx_hold_task - put a task on the hold queue
++ */
++static inline
++void vx_hold_task(struct vx_info *vxi,
++ struct task_struct *p, runqueue_t *rq)
++{
++ __deactivate_task(p, rq);
++ p->state |= TASK_ONHOLD;
++ /* a new one on hold */
++ vx_onhold_inc(vxi);
++ list_add_tail(&p->run_list, &rq->hold_queue);
++}
++
++/*
++ * vx_unhold_task - put a task back to the runqueue
++ */
++static inline
++void vx_unhold_task(struct vx_info *vxi,
++ struct task_struct *p, runqueue_t *rq)
++{
++ list_del(&p->run_list);
++ /* one less waiting */
++ vx_onhold_dec(vxi);
++ p->state &= ~TASK_ONHOLD;
++ enqueue_task(p, rq->expired);
++ rq->nr_running++;
++
++ if (p->static_prio < rq->best_expired_prio)
++ rq->best_expired_prio = p->static_prio;
++}
++#else
++static inline
++void vx_hold_task(struct vx_info *vxi,
++ struct task_struct *p, runqueue_t *rq)
++{
++ return;
++}
++
++static inline
++void vx_unhold_task(struct vx_info *vxi,
++ struct task_struct *p, runqueue_t *rq)
++{
++ return;
++}
++#endif /* CONFIG_VSERVER_HARDCPU */
++
++
+ /*
+ * resched_task - mark a task 'to be rescheduled now'.
+ *
+@@ -973,6 +1048,12 @@ static int try_to_wake_up(task_t * p, un
+
+ rq = task_rq_lock(p, &flags);
+ old_state = p->state;
++
++ /* we need to unhold suspended tasks */
++ if (old_state & TASK_ONHOLD) {
++ vx_unhold_task(p->vx_info, p, rq);
++ old_state = p->state;
++ }
+ if (!(old_state & state))
+ goto out;
+
+@@ -1093,6 +1174,9 @@ out_activate:
+ * to be considered on this CPU.)
+ */
+ activate_task(p, rq, cpu == this_cpu);
++ /* this is to get the accounting behind the load update */
++ if (old_state == TASK_UNINTERRUPTIBLE)
++ vx_uninterruptible_dec(p);
+ if (!sync || cpu != this_cpu) {
+ if (TASK_PREEMPTS_CURR(p, rq))
+ resched_task(rq->curr);
+@@ -1212,6 +1296,7 @@ void fastcall wake_up_new_task(task_t *
+
+ p->prio = effective_prio(p);
+
++ vx_activate_task(p);
+ if (likely(cpu == this_cpu)) {
+ if (!(clone_flags & CLONE_VM)) {
+ /*
+@@ -1223,6 +1308,7 @@ void fastcall wake_up_new_task(task_t *
+ __activate_task(p, rq);
+ else {
+ p->prio = current->prio;
++ BUG_ON(p->state & TASK_ONHOLD);
+ list_add_tail(&p->run_list, &current->run_list);
+ p->array = current->array;
+ p->array->nr_active++;
+@@ -2278,13 +2364,16 @@ unsigned long long current_sched_time(co
+ void account_user_time(struct task_struct *p, cputime_t cputime)
+ {
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
+ cputime64_t tmp;
++ int nice = (TASK_NICE(p) > 0);
+
+ p->utime = cputime_add(p->utime, cputime);
++ vx_account_user(vxi, cputime, nice);
+
+ /* Add user time to cpustat. */
+ tmp = cputime_to_cputime64(cputime);
+- if (TASK_NICE(p) > 0)
++ if (nice)
+ cpustat->nice = cputime64_add(cpustat->nice, tmp);
+ else
+ cpustat->user = cputime64_add(cpustat->user, tmp);
+@@ -2300,10 +2389,12 @@ void account_system_time(struct task_str
+ cputime_t cputime)
+ {
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
++ struct vx_info *vxi = p->vx_info; /* p is _always_ current */
+ runqueue_t *rq = this_rq();
+ cputime64_t tmp;
+
+ p->stime = cputime_add(p->stime, cputime);
++ vx_account_system(vxi, cputime, (p == rq->idle));
+
+ /* Add system time to cpustat. */
+ tmp = cputime_to_cputime64(cputime);
+@@ -2365,6 +2456,10 @@ void scheduler_tick(void)
+ if (p == rq->idle) {
+ if (wake_priority_sleeper(rq))
+ goto out;
++#ifdef CONFIG_VSERVER_HARDCPU_IDLE
++ if (!--rq->idle_tokens && !list_empty(&rq->hold_queue))
++ set_need_resched();
++#endif
+ rebalance_tick(cpu, rq, SCHED_IDLE);
+ return;
+ }
+@@ -2397,7 +2492,7 @@ void scheduler_tick(void)
+ }
+ goto out_unlock;
+ }
+- if (!--p->time_slice) {
++ if (vx_need_resched(p)) {
+ dequeue_task(p, rq->active);
+ set_tsk_need_resched(p);
+ p->prio = effective_prio(p);
+@@ -2613,6 +2708,10 @@ asmlinkage void __sched schedule(void)
+ struct list_head *queue;
+ unsigned long long now;
+ unsigned long run_time;
++ struct vx_info *vxi;
++#ifdef CONFIG_VSERVER_HARDCPU
++ int maxidle = -HZ;
++#endif
+ int cpu, idx;
+
+ /*
+@@ -2673,12 +2772,41 @@ need_resched_nonpreemptible:
+ unlikely(signal_pending(prev))))
+ prev->state = TASK_RUNNING;
+ else {
+- if (prev->state == TASK_UNINTERRUPTIBLE)
++ if (prev->state == TASK_UNINTERRUPTIBLE) {
+ rq->nr_uninterruptible++;
++ vx_uninterruptible_inc(prev);
++ }
+ deactivate_task(prev, rq);
+ }
+ }
+
++#ifdef CONFIG_VSERVER_HARDCPU
++ if (!list_empty(&rq->hold_queue)) {
++ struct list_head *l, *n;
++ int ret;
++
++ vxi = NULL;
++ list_for_each_safe(l, n, &rq->hold_queue) {
++ next = list_entry(l, task_t, run_list);
++ if (vxi == next->vx_info)
++ continue;
++
++ vxi = next->vx_info;
++ ret = vx_tokens_recalc(vxi);
++
++ if (ret > 0) {
++ vx_unhold_task(vxi, next, rq);
++ break;
++ }
++ if ((ret < 0) && (maxidle < ret))
++ maxidle = ret;
++ }
++ }
++ rq->idle_tokens = -maxidle;
++
++pick_next:
++#endif
++
+ cpu = smp_processor_id();
+ if (unlikely(!rq->nr_running)) {
+ go_idle:
+@@ -2726,6 +2854,22 @@ go_idle:
+ queue = array->queue + idx;
+ next = list_entry(queue->next, task_t, run_list);
+
++ vxi = next->vx_info;
++#ifdef CONFIG_VSERVER_HARDCPU
++ if (vx_info_flags(vxi, VXF_SCHED_PAUSE|VXF_SCHED_HARD, 0)) {
++ int ret = vx_tokens_recalc(vxi);
++
++ if (unlikely(ret <= 0)) {
++ if (ret && (rq->idle_tokens > -ret))
++ rq->idle_tokens = -ret;
++ vx_hold_task(vxi, next, rq);
++ goto pick_next;
++ }
++ } else /* well, looks ugly but not as ugly as the ifdef-ed version */
++#endif
++ if (vx_info_flags(vxi, VXF_SCHED_PRIO, 0))
++ vx_tokens_recalc(vxi);
++
+ if (!rt_task(next) && next->activated > 0) {
+ unsigned long long delta = now - next->timestamp;
+ if (unlikely((long long)(now - next->timestamp) < 0))
+@@ -3268,7 +3412,7 @@ asmlinkage long sys_nice(int increment)
+ nice = 19;
+
+ if (increment < 0 && !can_nice(current, nice))
+- return -EPERM;
++ return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
+
+ retval = security_task_setnice(current, nice);
+ if (retval)
+@@ -3412,6 +3556,7 @@ recheck:
+ oldprio = p->prio;
+ __setscheduler(p, policy, param->sched_priority);
+ if (array) {
++ vx_activate_task(p);
+ __activate_task(p, rq);
+ /*
+ * Reschedule if we are currently running on this runqueue and
+@@ -4940,6 +5085,9 @@ void __init sched_init(void)
+ INIT_LIST_HEAD(&rq->migration_queue);
+ #endif
+ atomic_set(&rq->nr_iowait, 0);
++#ifdef CONFIG_VSERVER_HARDCPU
++ INIT_LIST_HEAD(&rq->hold_queue);
++#endif
+
+ for (j = 0; j < 2; j++) {
+ array = rq->arrays + j;
+@@ -5009,6 +5157,7 @@ void normalize_rt_tasks(void)
+ deactivate_task(p, task_rq(p));
+ __setscheduler(p, SCHED_NORMAL, 0);
+ if (array) {
++ vx_activate_task(p);
+ __activate_task(p, task_rq(p));
+ resched_task(rq->curr);
+ }
+Index: linux-2.6.12/kernel/signal.c
+===================================================================
+--- linux-2.6.12.orig/kernel/signal.c
++++ linux-2.6.12/kernel/signal.c
+@@ -656,17 +656,26 @@ static int check_kill_permission(int sig
+ struct task_struct *t)
+ {
+ int error = -EINVAL;
++ int user;
++
+ if (!valid_signal(sig))
+ return error;
++
++ user = (!info || ((unsigned long)info != 1 &&
++ (unsigned long)info != 2 && SI_FROMUSER(info)));
++
+ error = -EPERM;
+- if ((!info || ((unsigned long)info != 1 &&
+- (unsigned long)info != 2 && SI_FROMUSER(info)))
+- && ((sig != SIGCONT) ||
++ if (user && ((sig != SIGCONT) ||
+ (current->signal->session != t->signal->session))
+ && (current->euid ^ t->suid) && (current->euid ^ t->uid)
+ && (current->uid ^ t->suid) && (current->uid ^ t->uid)
+ && !capable(CAP_KILL))
+ return error;
++
++ error = -ESRCH;
++ if (user && !vx_check(vx_task_xid(t), VX_ADMIN|VX_IDENT))
++ return error;
++
+ return security_task_kill(t, info, sig);
+ }
+
+@@ -1908,6 +1917,11 @@ relock:
+ if (current->pid == 1)
+ continue;
+
++ /* virtual init is protected against user signals */
++ if ((info->si_code == SI_USER) &&
++ vx_current_initpid(current->pid))
++ continue;
++
+ if (sig_kernel_stop(signr)) {
+ /*
+ * The default action is to stop all threads in
+Index: linux-2.6.12/kernel/sys.c
+===================================================================
+--- linux-2.6.12.orig/kernel/sys.c
++++ linux-2.6.12/kernel/sys.c
+@@ -11,6 +11,7 @@
+ #include <linux/mman.h>
+ #include <linux/smp_lock.h>
+ #include <linux/notifier.h>
++#include <linux/kmod.h>
+ #include <linux/reboot.h>
+ #include <linux/prctl.h>
+ #include <linux/init.h>
+@@ -29,6 +30,7 @@
+
+ #include <linux/compat.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/io.h>
+@@ -229,7 +231,10 @@ static int set_one_prio(struct task_stru
+ goto out;
+ }
+ if (niceval < task_nice(p) && !can_nice(p, niceval)) {
+- error = -EACCES;
++ if (vx_flags(VXF_IGNEG_NICE, 0))
++ error = 0;
++ else
++ error = -EACCES;
+ goto out;
+ }
+ no_nice = security_task_setnice(p, niceval);
+@@ -281,7 +286,8 @@ asmlinkage long sys_setpriority(int whic
+ if (!who)
+ who = current->uid;
+ else
+- if ((who != current->uid) && !(user = find_user(who)))
++ if ((who != current->uid) &&
++ !(user = find_user(vx_current_xid(), who)))
+ goto out_unlock; /* No processes for this user */
+
+ do_each_thread(g, p)
+@@ -339,7 +345,8 @@ asmlinkage long sys_getpriority(int whic
+ if (!who)
+ who = current->uid;
+ else
+- if ((who != current->uid) && !(user = find_user(who)))
++ if ((who != current->uid) &&
++ !(user = find_user(vx_current_xid(), who)))
+ goto out_unlock; /* No processes for this user */
+
+ do_each_thread(g, p)
+@@ -359,6 +366,7 @@ out_unlock:
+ return retval;
+ }
+
++long vs_reboot(unsigned int, void *);
+
+ /*
+ * Reboot system call: for obvious reasons only root may call it,
+@@ -384,6 +392,9 @@ asmlinkage long sys_reboot(int magic1, i
+ magic2 != LINUX_REBOOT_MAGIC2C))
+ return -EINVAL;
+
++ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ return vs_reboot(cmd, arg);
++
+ lock_kernel();
+ switch (cmd) {
+ case LINUX_REBOOT_CMD_RESTART:
+@@ -581,7 +592,7 @@ static int set_user(uid_t new_ruid, int
+ {
+ struct user_struct *new_user;
+
+- new_user = alloc_uid(new_ruid);
++ new_user = alloc_uid(vx_current_xid(), new_ruid);
+ if (!new_user)
+ return -EAGAIN;
+
+@@ -950,14 +961,17 @@ asmlinkage long sys_setpgid(pid_t pid, p
+ {
+ struct task_struct *p;
+ int err = -EINVAL;
++ pid_t rpgid;
+
+ if (!pid)
+- pid = current->pid;
++ pid = vx_map_pid(current->pid);
+ if (!pgid)
+ pgid = pid;
+ if (pgid < 0)
+ return -EINVAL;
+
++ rpgid = vx_rmap_pid(pgid);
++
+ /* From this point forward we keep holding onto the tasklist lock
+ * so that our parent does not change from under us. -DaveM
+ */
+@@ -992,22 +1006,22 @@ asmlinkage long sys_setpgid(pid_t pid, p
+ if (pgid != pid) {
+ struct task_struct *p;
+
+- do_each_task_pid(pgid, PIDTYPE_PGID, p) {
++ do_each_task_pid(rpgid, PIDTYPE_PGID, p) {
+ if (p->signal->session == current->signal->session)
+ goto ok_pgid;
+- } while_each_task_pid(pgid, PIDTYPE_PGID, p);
++ } while_each_task_pid(rpgid, PIDTYPE_PGID, p);
+ goto out;
+ }
+
+ ok_pgid:
+- err = security_task_setpgid(p, pgid);
++ err = security_task_setpgid(p, rpgid);
+ if (err)
+ goto out;
+
+- if (process_group(p) != pgid) {
++ if (process_group(p) != rpgid) {
+ detach_pid(p, PIDTYPE_PGID);
+- p->signal->pgrp = pgid;
+- attach_pid(p, PIDTYPE_PGID, pgid);
++ p->signal->pgrp = rpgid;
++ attach_pid(p, PIDTYPE_PGID, rpgid);
+ }
+
+ err = 0;
+@@ -1020,7 +1034,7 @@ out:
+ asmlinkage long sys_getpgid(pid_t pid)
+ {
+ if (!pid) {
+- return process_group(current);
++ return vx_rmap_pid(process_group(current));
+ } else {
+ int retval;
+ struct task_struct *p;
+@@ -1032,7 +1046,7 @@ asmlinkage long sys_getpgid(pid_t pid)
+ if (p) {
+ retval = security_task_getpgid(p);
+ if (!retval)
+- retval = process_group(p);
++ retval = vx_rmap_pid(process_group(p));
+ }
+ read_unlock(&tasklist_lock);
+ return retval;
+@@ -1370,7 +1384,7 @@ asmlinkage long sys_newuname(struct new_
+ int errno = 0;
+
+ down_read(&uts_sem);
+- if (copy_to_user(name,&system_utsname,sizeof *name))
++ if (copy_to_user(name, vx_new_utsname(), sizeof *name))
+ errno = -EFAULT;
+ up_read(&uts_sem);
+ return errno;
+@@ -1381,15 +1395,17 @@ asmlinkage long sys_sethostname(char __u
+ int errno;
+ char tmp[__NEW_UTS_LEN];
+
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SET_UTSNAME))
+ return -EPERM;
+ if (len < 0 || len > __NEW_UTS_LEN)
+ return -EINVAL;
+ down_write(&uts_sem);
+ errno = -EFAULT;
+ if (!copy_from_user(tmp, name, len)) {
+- memcpy(system_utsname.nodename, tmp, len);
+- system_utsname.nodename[len] = 0;
++ char *ptr = vx_new_uts(nodename);
++
++ memcpy(ptr, tmp, len);
++ ptr[len] = 0;
+ errno = 0;
+ }
+ up_write(&uts_sem);
+@@ -1401,15 +1417,17 @@ asmlinkage long sys_sethostname(char __u
+ asmlinkage long sys_gethostname(char __user *name, int len)
+ {
+ int i, errno;
++ char *ptr;
+
+ if (len < 0)
+ return -EINVAL;
+ down_read(&uts_sem);
+- i = 1 + strlen(system_utsname.nodename);
++ ptr = vx_new_uts(nodename);
++ i = 1 + strlen(ptr);
+ if (i > len)
+ i = len;
+ errno = 0;
+- if (copy_to_user(name, system_utsname.nodename, i))
++ if (copy_to_user(name, ptr, i))
+ errno = -EFAULT;
+ up_read(&uts_sem);
+ return errno;
+@@ -1426,7 +1444,7 @@ asmlinkage long sys_setdomainname(char _
+ int errno;
+ char tmp[__NEW_UTS_LEN];
+
+- if (!capable(CAP_SYS_ADMIN))
++ if (!capable(CAP_SYS_ADMIN) && !vx_ccaps(VXC_SET_UTSNAME))
+ return -EPERM;
+ if (len < 0 || len > __NEW_UTS_LEN)
+ return -EINVAL;
+@@ -1434,8 +1452,10 @@ asmlinkage long sys_setdomainname(char _
+ down_write(&uts_sem);
+ errno = -EFAULT;
+ if (!copy_from_user(tmp, name, len)) {
+- memcpy(system_utsname.domainname, tmp, len);
+- system_utsname.domainname[len] = 0;
++ char *ptr = vx_new_uts(domainname);
++
++ memcpy(ptr, tmp, len);
++ ptr[len] = 0;
+ errno = 0;
+ }
+ up_write(&uts_sem);
+@@ -1492,7 +1512,7 @@ asmlinkage long sys_setrlimit(unsigned i
+ return -EINVAL;
+ old_rlim = current->signal->rlim + resource;
+ if ((new_rlim.rlim_max > old_rlim->rlim_max) &&
+- !capable(CAP_SYS_RESOURCE))
++ !capable(CAP_SYS_RESOURCE) && !vx_ccaps(VXC_SET_RLIMIT))
+ return -EPERM;
+ if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
+ return -EPERM;
+Index: linux-2.6.12/kernel/sysctl.c
+===================================================================
+--- linux-2.6.12.orig/kernel/sysctl.c
++++ linux-2.6.12/kernel/sysctl.c
+@@ -41,6 +41,7 @@
+ #include <linux/limits.h>
+ #include <linux/dcache.h>
+ #include <linux/syscalls.h>
++#include <linux/vserver/cvirt.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/processor.h>
+@@ -87,6 +88,7 @@ extern char hotplug_path[];
+ #ifdef CONFIG_FB_SPLASH
+ extern char fbsplash_path[];
+ #endif
++extern char vshelper_path[];
+ #ifdef CONFIG_CHR_DEV_SG
+ extern int sg_big_buff;
+ #endif
+@@ -242,6 +244,7 @@ static ctl_table kern_table[] = {
+ .maxlen = sizeof(system_utsname.sysname),
+ .mode = 0444,
+ .proc_handler = &proc_doutsstring,
++ .virt_handler = &vx_uts_virt_handler,
+ .strategy = &sysctl_string,
+ },
+ {
+@@ -251,6 +254,7 @@ static ctl_table kern_table[] = {
+ .maxlen = sizeof(system_utsname.release),
+ .mode = 0444,
+ .proc_handler = &proc_doutsstring,
++ .virt_handler = &vx_uts_virt_handler,
+ .strategy = &sysctl_string,
+ },
+ {
+@@ -260,6 +264,7 @@ static ctl_table kern_table[] = {
+ .maxlen = sizeof(system_utsname.version),
+ .mode = 0444,
+ .proc_handler = &proc_doutsstring,
++ .virt_handler = &vx_uts_virt_handler,
+ .strategy = &sysctl_string,
+ },
+ {
+@@ -269,6 +274,7 @@ static ctl_table kern_table[] = {
+ .maxlen = sizeof(system_utsname.nodename),
+ .mode = 0644,
+ .proc_handler = &proc_doutsstring,
++ .virt_handler = &vx_uts_virt_handler,
+ .strategy = &sysctl_string,
+ },
+ {
+@@ -278,6 +284,7 @@ static ctl_table kern_table[] = {
+ .maxlen = sizeof(system_utsname.domainname),
+ .mode = 0644,
+ .proc_handler = &proc_doutsstring,
++ .virt_handler = &vx_uts_virt_handler,
+ .strategy = &sysctl_string,
+ },
+ {
+@@ -425,6 +432,15 @@ static ctl_table kern_table[] = {
+ .strategy = &sysctl_string,
+ },
+ #endif
++ {
++ .ctl_name = KERN_VSHELPER,
++ .procname = "vshelper",
++ .data = &vshelper_path,
++ .maxlen = 256,
++ .mode = 0644,
++ .proc_handler = &proc_dostring,
++ .strategy = &sysctl_string,
++ },
+ #ifdef CONFIG_CHR_DEV_SG
+ {
+ .ctl_name = KERN_SG_BIG_BUFF,
+@@ -1416,16 +1432,20 @@ static ssize_t proc_writesys(struct file
+ int proc_dostring(ctl_table *table, int write, struct file *filp,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
+ {
+- size_t len;
++ size_t len, maxlen;
+ char __user *p;
+ char c;
++ void *data;
++
++ data = table->data;
++ maxlen = table->maxlen;
++
++ if (!data || !maxlen || !*lenp || (*ppos && !write))
++ return (*lenp = 0);
+
+- if (!table->data || !table->maxlen || !*lenp ||
+- (*ppos && !write)) {
+- *lenp = 0;
+- return 0;
+- }
+-
++ if (table->virt_handler)
++ table->virt_handler(table, write, filp->f_xid, &data, &maxlen);
++
+ if (write) {
+ len = 0;
+ p = buffer;
+@@ -1436,20 +1456,20 @@ int proc_dostring(ctl_table *table, int
+ break;
+ len++;
+ }
+- if (len >= table->maxlen)
+- len = table->maxlen-1;
+- if(copy_from_user(table->data, buffer, len))
++ if (len >= maxlen)
++ len = maxlen-1;
++ if(copy_from_user(data, buffer, len))
+ return -EFAULT;
+- ((char *) table->data)[len] = 0;
++ ((char *) data)[len] = 0;
+ *ppos += *lenp;
+ } else {
+- len = strlen(table->data);
+- if (len > table->maxlen)
+- len = table->maxlen;
++ len = strlen(data);
++ if (len > maxlen)
++ len = maxlen;
+ if (len > *lenp)
+ len = *lenp;
+ if (len)
+- if(copy_to_user(buffer, table->data, len))
++ if(copy_to_user(buffer, data, len))
+ return -EFAULT;
+ if (len < *lenp) {
+ if(put_user('\n', ((char __user *) buffer) + len))
+Index: linux-2.6.12/kernel/timer.c
+===================================================================
+--- linux-2.6.12.orig/kernel/timer.c
++++ linux-2.6.12/kernel/timer.c
+@@ -33,6 +33,8 @@
+ #include <linux/posix-timers.h>
+ #include <linux/cpu.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vserver/sched.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -686,7 +688,11 @@ static void second_overflow(void)
+ if (ltemp > (MAXPHASE / MINSEC) << SHIFT_UPDATE)
+ ltemp = (MAXPHASE / MINSEC) << SHIFT_UPDATE;
+ time_offset += ltemp;
++ #if SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE > 0
+ time_adj = -ltemp << (SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE);
++ #else
++ time_adj = -ltemp >> (SHIFT_HZ + SHIFT_UPDATE - SHIFT_SCALE);
++ #endif
+ } else {
+ ltemp = time_offset;
+ if (!(time_status & STA_FLL))
+@@ -694,7 +700,11 @@ static void second_overflow(void)
+ if (ltemp > (MAXPHASE / MINSEC) << SHIFT_UPDATE)
+ ltemp = (MAXPHASE / MINSEC) << SHIFT_UPDATE;
+ time_offset -= ltemp;
++ #if SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE > 0
+ time_adj = ltemp << (SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE);
++ #else
++ time_adj = ltemp >> (SHIFT_HZ + SHIFT_UPDATE - SHIFT_SCALE);
++ #endif
+ }
+
+ /*
+@@ -953,12 +963,6 @@ asmlinkage unsigned long sys_alarm(unsig
+
+ #endif
+
+-#ifndef __alpha__
+-
+-/*
+- * The Alpha uses getxpid, getxuid, and getxgid instead. Maybe this
+- * should be moved into arch/i386 instead?
+- */
+
+ /**
+ * sys_getpid - return the thread group id of the current process
+@@ -971,7 +975,7 @@ asmlinkage unsigned long sys_alarm(unsig
+ */
+ asmlinkage long sys_getpid(void)
+ {
+- return current->tgid;
++ return vx_map_tgid(current->tgid);
+ }
+
+ /*
+@@ -1015,9 +1019,23 @@ asmlinkage long sys_getppid(void)
+ #endif
+ break;
+ }
+- return pid;
++ return vx_map_pid(pid);
+ }
+
++#ifdef __alpha__
++
++/*
++ * The Alpha uses getxpid, getxuid, and getxgid instead.
++ */
++
++asmlinkage long do_getxpid(long *ppid)
++{
++ *ppid = sys_getppid();
++ return sys_getpid();
++}
++
++#else /* _alpha_ */
++
+ asmlinkage long sys_getuid(void)
+ {
+ /* Only we change this so SMP safe */
+@@ -1223,6 +1241,8 @@ asmlinkage long sys_sysinfo(struct sysin
+ tp.tv_nsec = tp.tv_nsec - NSEC_PER_SEC;
+ tp.tv_sec++;
+ }
++ if (vx_flags(VXF_VIRT_UPTIME, 0))
++ vx_vsi_uptime(&tp, NULL);
+ val.uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
+
+ val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
+Index: linux-2.6.12/kernel/user.c
+===================================================================
+--- linux-2.6.12.orig/kernel/user.c
++++ linux-2.6.12/kernel/user.c
+@@ -22,8 +22,8 @@
+ #define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8)
+ #define UIDHASH_SZ (1 << UIDHASH_BITS)
+ #define UIDHASH_MASK (UIDHASH_SZ - 1)
+-#define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK)
+-#define uidhashentry(uid) (uidhash_table + __uidhashfn((uid)))
++#define __uidhashfn(xid,uid) ((((uid) >> UIDHASH_BITS) + ((uid)^(xid))) & UIDHASH_MASK)
++#define uidhashentry(xid,uid) (uidhash_table + __uidhashfn((xid),(uid)))
+
+ static kmem_cache_t *uid_cachep;
+ static struct list_head uidhash_table[UIDHASH_SZ];
+@@ -55,7 +55,7 @@ static inline void uid_hash_remove(struc
+ list_del(&up->uidhash_list);
+ }
+
+-static inline struct user_struct *uid_hash_find(uid_t uid, struct list_head *hashent)
++static inline struct user_struct *uid_hash_find(xid_t xid, uid_t uid, struct list_head *hashent)
+ {
+ struct list_head *up;
+
+@@ -64,7 +64,7 @@ static inline struct user_struct *uid_ha
+
+ user = list_entry(up, struct user_struct, uidhash_list);
+
+- if(user->uid == uid) {
++ if(user->uid == uid && user->xid == xid) {
+ atomic_inc(&user->__count);
+ return user;
+ }
+@@ -79,12 +79,12 @@ static inline struct user_struct *uid_ha
+ *
+ * If the user_struct could not be found, return NULL.
+ */
+-struct user_struct *find_user(uid_t uid)
++struct user_struct *find_user(xid_t xid, uid_t uid)
+ {
+ struct user_struct *ret;
+
+ spin_lock(&uidhash_lock);
+- ret = uid_hash_find(uid, uidhashentry(uid));
++ ret = uid_hash_find(xid, uid, uidhashentry(xid, uid));
+ spin_unlock(&uidhash_lock);
+ return ret;
+ }
+@@ -100,13 +100,13 @@ void free_uid(struct user_struct *up)
+ }
+ }
+
+-struct user_struct * alloc_uid(uid_t uid)
++struct user_struct * alloc_uid(xid_t xid, uid_t uid)
+ {
+- struct list_head *hashent = uidhashentry(uid);
++ struct list_head *hashent = uidhashentry(xid, uid);
+ struct user_struct *up;
+
+ spin_lock(&uidhash_lock);
+- up = uid_hash_find(uid, hashent);
++ up = uid_hash_find(xid, uid, hashent);
+ spin_unlock(&uidhash_lock);
+
+ if (!up) {
+@@ -116,6 +116,7 @@ struct user_struct * alloc_uid(uid_t uid
+ if (!new)
+ return NULL;
+ new->uid = uid;
++ new->xid = xid;
+ atomic_set(&new->__count, 1);
+ atomic_set(&new->processes, 0);
+ atomic_set(&new->files, 0);
+@@ -138,7 +139,7 @@ struct user_struct * alloc_uid(uid_t uid
+ * on adding the same user already..
+ */
+ spin_lock(&uidhash_lock);
+- up = uid_hash_find(uid, hashent);
++ up = uid_hash_find(xid, uid, hashent);
+ if (up) {
+ key_put(new->uid_keyring);
+ key_put(new->session_keyring);
+@@ -184,7 +185,7 @@ static int __init uid_cache_init(void)
+
+ /* Insert the root user immediately (init already runs as root) */
+ spin_lock(&uidhash_lock);
+- uid_hash_insert(&root_user, uidhashentry(0));
++ uid_hash_insert(&root_user, uidhashentry(0,0));
+ spin_unlock(&uidhash_lock);
+
+ return 0;
+Index: linux-2.6.12/kernel/vserver/Kconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/Kconfig
+@@ -0,0 +1,179 @@
++#
++# Linux VServer configuration
++#
++
++config VSERVER
++ bool
++ default y
++
++config VSERVER_SECURITY
++ bool
++ depends on SECURITY
++ default y
++ select SECURITY_CAPABILITIES
++
++config VSERVER_LEGACYNET
++ bool
++ depends on !VSERVER_NGNET
++ default y
++
++menu "Linux VServer"
++
++config VSERVER_LEGACY
++ bool "Enable Legacy Kernel API"
++ default y
++ help
++ This enables the legacy API used in vs1.xx, maintaining
++ compatibility with older vserver tools, and guest images
++ that are configured using the legacy method. This is
++ probably a good idea for now, for migration purposes.
++
++ Note that some tools have not yet been altered to use
++ this API, so disabling this option may reduce some
++ functionality.
++
++config VSERVER_LEGACY_VERSION
++ bool "Show a Legacy Version ID"
++ depends on VSERVER_LEGACY
++ default n
++ help
++ This shows a special legacy version to very old tools
++ which do not handle the current version correctly.
++
++ This will probably disable some features of newer tools
++ so better avoid it, unless you really, really need it
++ for backwards compatibility.
++
++config VSERVER_NGNET
++ bool "Disable Legacy Networking Kernel API"
++ depends on EXPERIMENTAL
++ default n
++ help
++ This disables the legacy networking API which is required
++ by the chbind tool. Do not disable it unless you exactly
++ know what you are doing.
++
++config VSERVER_PROC_SECURE
++ bool "Enable Proc Security"
++ depends on PROC_FS
++ default y
++ help
++ This configures ProcFS security to initially hide
++ non-process entries for all contexts except the main and
++ spectator context (i.e. for all guests), which is a secure
++ default.
++
++ (note: on 1.2x the entries were visible by default)
++
++config VSERVER_HARDCPU
++ bool "Enable Hard CPU Limits"
++ depends on EXPERIMENTAL
++ default n
++ help
++ Activate the Hard CPU Limits
++
++ This will compile in code that allows the Token Bucket
++ Scheduler to put processes on hold when a context's
++ tokens are depleted (provided that its per-context
++ sched_hard flag is set).
++
++ Processes belonging to that context will not be able
++ to consume CPU resources again until a per-context
++ configured minimum of tokens has been reached.
++
++config VSERVER_HARDCPU_IDLE
++ bool "Limit the IDLE task"
++ depends on VSERVER_HARDCPU
++ default n
++ help
++ Limit the idle slices, so the the next context
++ will be scheduled as soon as possible.
++
++ This might improve interactivity and latency, but
++ will also marginally increase scheduling overhead.
++
++choice
++ prompt "Persistent Inode Context Tagging"
++ default INOXID_UGID24
++ help
++ This adds persistent context information to filesystems
++ mounted with the tagxid option. Tagging is a requirement
++ for per-context disk limits and per-context quota.
++
++
++config INOXID_NONE
++ bool "Disabled"
++ help
++ do not store per-context information in inodes.
++
++config INOXID_UID16
++ bool "UID16/GID32"
++ help
++ reduces UID to 16 bit, but leaves GID at 32 bit.
++
++config INOXID_GID16
++ bool "UID32/GID16"
++ help
++ reduces GID to 16 bit, but leaves UID at 32 bit.
++
++config INOXID_UGID24
++ bool "UID24/GID24"
++ help
++ uses the upper 8bit from UID and GID for XID tagging
++ which leaves 24bit for UID/GID each, which should be
++ more than sufficient for normal use.
++
++config INOXID_INTERN
++ bool "UID32/GID32"
++ help
++ this uses otherwise reserved inode fields in the on
++ disk representation, which limits the use to a few
++ filesystems (currently ext2 and ext3)
++
++config INOXID_RUNTIME
++ bool "Runtime"
++ depends on EXPERIMENTAL
++ help
++ inodes are tagged when first accessed, this doesn't
++ require any persistant information, but might give
++ funny results for mixed access.
++
++endchoice
++
++config XID_TAG_NFSD
++ bool "Tag NFSD User Auth and Files"
++ default n
++ help
++ Enable this if you do want the in-kernel NFS
++ Server to use the xid tagging specified above.
++ (will require patched clients too)
++
++config VSERVER_DEBUG
++ bool "VServer Debugging Code"
++ default n
++ help
++ Set this to yes if you want to be able to activate
++ debugging output at runtime. It adds a probably small
++ overhead to all vserver related functions and
++ increases the kernel size by about 20k.
++
++config VSERVER_HISTORY
++ bool "VServer History Tracing"
++ depends on VSERVER_DEBUG
++ default n
++ help
++ Set this to yes if you want to record the history of
++ linux-vserver activities, so they can be replayed in
++ the event of a kernel panic or oops.
++
++config VSERVER_HISTORY_SIZE
++ int "Per-CPU History Size (32-65536)"
++ depends on VSERVER_HISTORY
++ range 32 65536
++ default 64
++ help
++ This allows you to specify the number of entries in
++ the per-CPU history buffer.
++
++endmenu
++
+Index: linux-2.6.12/kernel/vserver/Makefile
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/Makefile
+@@ -0,0 +1,16 @@
++#
++# Makefile for the Linux vserver routines.
++#
++
++
++obj-y += vserver.o
++
++vserver-y := switch.o context.o namespace.o sched.o network.o inode.o \
++ limit.o cvirt.o signal.o helper.o init.o dlimit.o
++
++vserver-$(CONFIG_PROC_FS) += proc.o
++vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o
++vserver-$(CONFIG_VSERVER_LEGACY) += legacy.o
++vserver-$(CONFIG_VSERVER_LEGACYNET) += legacynet.o
++vserver-$(CONFIG_VSERVER_HISTORY) += history.o
++
+Index: linux-2.6.12/kernel/vserver/context.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/context.c
+@@ -0,0 +1,803 @@
++/*
++ * linux/kernel/vserver/context.c
++ *
++ * Virtual Server: Context Support
++ *
++ * Copyright (C) 2003-2005 Herbert Ptzl
++ *
++ * V0.01 context helper
++ * V0.02 vx_ctx_kill syscall command
++ * V0.03 replaced context_info calls
++ * V0.04 redesign of struct (de)alloc
++ * V0.05 rlimit basic implementation
++ * V0.06 task_xid and info commands
++ * V0.07 context flags and caps
++ * V0.08 switch to RCU based hash
++ * V0.09 revert to non RCU for now
++ * V0.10 and back to working RCU hash
++ * V0.11 and back to locking again
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <linux/namespace.h>
++
++#include <linux/sched.h>
++#include <linux/vserver/network.h>
++#include <linux/vserver/legacy.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/debug.h>
++
++#include <linux/vs_context.h>
++#include <linux/vserver/context_cmd.h>
++
++#include <linux/err.h>
++#include <asm/errno.h>
++
++#include "cvirt_init.h"
++#include "limit_init.h"
++#include "sched_init.h"
++
++
++/* __alloc_vx_info()
++
++ * allocate an initialized vx_info struct
++ * doesn't make it visible (hash) */
++
++static struct vx_info *__alloc_vx_info(xid_t xid)
++{
++ struct vx_info *new = NULL;
++
++ vxdprintk(VXD_CBIT(xid, 0), "alloc_vx_info(%d)*", xid);
++
++ /* would this benefit from a slab cache? */
++ new = kmalloc(sizeof(struct vx_info), GFP_KERNEL);
++ if (!new)
++ return 0;
++
++ memset (new, 0, sizeof(struct vx_info));
++ new->vx_id = xid;
++ INIT_HLIST_NODE(&new->vx_hlist);
++ atomic_set(&new->vx_usecnt, 0);
++ atomic_set(&new->vx_tasks, 0);
++ new->vx_parent = NULL;
++ new->vx_state = 0;
++ init_waitqueue_head(&new->vx_wait);
++
++ /* rest of init goes here */
++ vx_info_init_limit(&new->limit);
++ vx_info_init_sched(&new->sched);
++ vx_info_init_cvirt(&new->cvirt);
++ vx_info_init_cacct(&new->cacct);
++
++ new->vx_flags = VXF_INIT_SET;
++ new->vx_bcaps = CAP_INIT_EFF_SET;
++ new->vx_ccaps = 0;
++
++ vxdprintk(VXD_CBIT(xid, 0),
++ "alloc_vx_info(%d) = %p", xid, new);
++ vxh_alloc_vx_info(new);
++ return new;
++}
++
++/* __dealloc_vx_info()
++
++ * final disposal of vx_info */
++
++static void __dealloc_vx_info(struct vx_info *vxi)
++{
++ vxdprintk(VXD_CBIT(xid, 0),
++ "dealloc_vx_info(%p)", vxi);
++ vxh_dealloc_vx_info(vxi);
++
++ vxi->vx_hlist.next = LIST_POISON1;
++ vxi->vx_id = -1;
++
++ vx_info_exit_limit(&vxi->limit);
++ vx_info_exit_sched(&vxi->sched);
++ vx_info_exit_cvirt(&vxi->cvirt);
++ vx_info_exit_cacct(&vxi->cacct);
++
++ vxi->vx_state |= VXS_RELEASED;
++ kfree(vxi);
++}
++
++static void __shutdown_vx_info(struct vx_info *vxi)
++{
++ struct namespace *namespace;
++ struct fs_struct *fs;
++
++ might_sleep();
++
++ vxi->vx_state |= VXS_SHUTDOWN;
++ vs_state_change(vxi, VSC_SHUTDOWN);
++
++ namespace = xchg(&vxi->vx_namespace, NULL);
++ if (namespace)
++ put_namespace(namespace);
++
++ fs = xchg(&vxi->vx_fs, NULL);
++ if (fs)
++ put_fs_struct(fs);
++}
++
++/* exported stuff */
++
++void free_vx_info(struct vx_info *vxi)
++{
++ /* context shutdown is mandatory */
++ BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
++
++ BUG_ON(atomic_read(&vxi->vx_usecnt));
++ BUG_ON(atomic_read(&vxi->vx_tasks));
++
++ BUG_ON(vx_info_state(vxi, VXS_HASHED));
++
++ BUG_ON(vxi->vx_namespace);
++ BUG_ON(vxi->vx_fs);
++
++ __dealloc_vx_info(vxi);
++}
++
++
++/* hash table for vx_info hash */
++
++#define VX_HASH_SIZE 13
++
++struct hlist_head vx_info_hash[VX_HASH_SIZE];
++
++static spinlock_t vx_info_hash_lock = SPIN_LOCK_UNLOCKED;
++
++
++static inline unsigned int __hashval(xid_t xid)
++{
++ return (xid % VX_HASH_SIZE);
++}
++
++
++
++/* __hash_vx_info()
++
++ * add the vxi to the global hash table
++ * requires the hash_lock to be held */
++
++static inline void __hash_vx_info(struct vx_info *vxi)
++{
++ struct hlist_head *head;
++
++ vxd_assert_lock(&vx_info_hash_lock);
++ vxdprintk(VXD_CBIT(xid, 4),
++ "__hash_vx_info: %p[#%d]", vxi, vxi->vx_id);
++ vxh_hash_vx_info(vxi);
++
++ /* context must not be hashed */
++ BUG_ON(vx_info_state(vxi, VXS_HASHED));
++
++ vxi->vx_state |= VXS_HASHED;
++ head = &vx_info_hash[__hashval(vxi->vx_id)];
++ hlist_add_head(&vxi->vx_hlist, head);
++}
++
++/* __unhash_vx_info()
++
++ * remove the vxi from the global hash table
++ * requires the hash_lock to be held */
++
++static inline void __unhash_vx_info(struct vx_info *vxi)
++{
++ vxd_assert_lock(&vx_info_hash_lock);
++ vxdprintk(VXD_CBIT(xid, 4),
++ "__unhash_vx_info: %p[#%d]", vxi, vxi->vx_id);
++ vxh_unhash_vx_info(vxi);
++
++ /* context must be hashed */
++ BUG_ON(!vx_info_state(vxi, VXS_HASHED));
++
++ vxi->vx_state &= ~VXS_HASHED;
++ hlist_del(&vxi->vx_hlist);
++}
++
++
++/* __lookup_vx_info()
++
++ * requires the hash_lock to be held
++ * doesn't increment the vx_refcnt */
++
++static inline struct vx_info *__lookup_vx_info(xid_t xid)
++{
++ struct hlist_head *head = &vx_info_hash[__hashval(xid)];
++ struct hlist_node *pos;
++ struct vx_info *vxi;
++
++ vxd_assert_lock(&vx_info_hash_lock);
++ hlist_for_each(pos, head) {
++ vxi = hlist_entry(pos, struct vx_info, vx_hlist);
++
++ if (vxi->vx_id == xid)
++ goto found;
++ }
++ vxi = NULL;
++found:
++ vxdprintk(VXD_CBIT(xid, 0),
++ "__lookup_vx_info(#%u): %p[#%u]",
++ xid, vxi, vxi?vxi->vx_id:0);
++ vxh_lookup_vx_info(vxi, xid);
++ return vxi;
++}
++
++
++/* __vx_dynamic_id()
++
++ * find unused dynamic xid
++ * requires the hash_lock to be held */
++
++static inline xid_t __vx_dynamic_id(void)
++{
++ static xid_t seq = MAX_S_CONTEXT;
++ xid_t barrier = seq;
++
++ vxd_assert_lock(&vx_info_hash_lock);
++ do {
++ if (++seq > MAX_S_CONTEXT)
++ seq = MIN_D_CONTEXT;
++ if (!__lookup_vx_info(seq)) {
++ vxdprintk(VXD_CBIT(xid, 4),
++ "__vx_dynamic_id: [#%d]", seq);
++ return seq;
++ }
++ } while (barrier != seq);
++ return 0;
++}
++
++#ifdef CONFIG_VSERVER_LEGACY
++
++/* __loc_vx_info()
++
++ * locate or create the requested context
++ * get() it and if new hash it */
++
++static struct vx_info * __loc_vx_info(int id, int *err)
++{
++ struct vx_info *new, *vxi = NULL;
++
++ vxdprintk(VXD_CBIT(xid, 1), "loc_vx_info(%d)*", id);
++
++ if (!(new = __alloc_vx_info(id))) {
++ *err = -ENOMEM;
++ return NULL;
++ }
++
++ /* required to make dynamic xids unique */
++ spin_lock(&vx_info_hash_lock);
++
++ /* dynamic context requested */
++ if (id == VX_DYNAMIC_ID) {
++ id = __vx_dynamic_id();
++ if (!id) {
++ printk(KERN_ERR "no dynamic context available.\n");
++ goto out_unlock;
++ }
++ new->vx_id = id;
++ }
++ /* existing context requested */
++ else if ((vxi = __lookup_vx_info(id))) {
++ /* context in setup is not available */
++ if (vxi->vx_flags & VXF_STATE_SETUP) {
++ vxdprintk(VXD_CBIT(xid, 0),
++ "loc_vx_info(%d) = %p (not available)", id, vxi);
++ vxi = NULL;
++ *err = -EBUSY;
++ } else {
++ vxdprintk(VXD_CBIT(xid, 0),
++ "loc_vx_info(%d) = %p (found)", id, vxi);
++ get_vx_info(vxi);
++ *err = 0;
++ }
++ goto out_unlock;
++ }
++
++ /* new context requested */
++ vxdprintk(VXD_CBIT(xid, 0),
++ "loc_vx_info(%d) = %p (new)", id, new);
++ __hash_vx_info(get_vx_info(new));
++ vxi = new, new = NULL;
++ *err = 1;
++
++out_unlock:
++ spin_unlock(&vx_info_hash_lock);
++ vxh_loc_vx_info(vxi, id);
++ if (new)
++ __dealloc_vx_info(new);
++ return vxi;
++}
++
++#endif
++
++/* __create_vx_info()
++
++ * create the requested context
++ * get() and hash it */
++
++static struct vx_info * __create_vx_info(int id)
++{
++ struct vx_info *new, *vxi = NULL;
++
++ vxdprintk(VXD_CBIT(xid, 1), "create_vx_info(%d)*", id);
++
++ if (!(new = __alloc_vx_info(id)))
++ return ERR_PTR(-ENOMEM);
++
++ /* required to make dynamic xids unique */
++ spin_lock(&vx_info_hash_lock);
++
++ /* dynamic context requested */
++ if (id == VX_DYNAMIC_ID) {
++ id = __vx_dynamic_id();
++ if (!id) {
++ printk(KERN_ERR "no dynamic context available.\n");
++ vxi = ERR_PTR(-EAGAIN);
++ goto out_unlock;
++ }
++ new->vx_id = id;
++ }
++ /* static context requested */
++ else if ((vxi = __lookup_vx_info(id))) {
++ vxdprintk(VXD_CBIT(xid, 0),
++ "create_vx_info(%d) = %p (already there)", id, vxi);
++ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0))
++ vxi = ERR_PTR(-EBUSY);
++ else
++ vxi = ERR_PTR(-EEXIST);
++ goto out_unlock;
++ }
++ /* dynamic xid creation blocker */
++ else if (id >= MIN_D_CONTEXT) {
++ vxdprintk(VXD_CBIT(xid, 0),
++ "create_vx_info(%d) (dynamic rejected)", id);
++ vxi = ERR_PTR(-EINVAL);
++ goto out_unlock;
++ }
++
++ /* new context */
++ vxdprintk(VXD_CBIT(xid, 0),
++ "create_vx_info(%d) = %p (new)", id, new);
++ __hash_vx_info(get_vx_info(new));
++ vxi = new, new = NULL;
++
++out_unlock:
++ spin_unlock(&vx_info_hash_lock);
++ vxh_create_vx_info(IS_ERR(vxi)?NULL:vxi, id);
++ if (new)
++ __dealloc_vx_info(new);
++ return vxi;
++}
++
++
++/* exported stuff */
++
++
++void unhash_vx_info(struct vx_info *vxi)
++{
++ __shutdown_vx_info(vxi);
++ spin_lock(&vx_info_hash_lock);
++ __unhash_vx_info(vxi);
++ spin_unlock(&vx_info_hash_lock);
++ __wakeup_vx_info(vxi);
++}
++
++
++/* locate_vx_info()
++
++ * search for a vx_info and get() it
++ * negative id means current */
++
++struct vx_info *locate_vx_info(int id)
++{
++ struct vx_info *vxi = NULL;
++
++ if (id < 0) {
++ vxi = get_vx_info(current->vx_info);
++ } else if (id > 1) {
++ spin_lock(&vx_info_hash_lock);
++ vxi = get_vx_info(__lookup_vx_info(id));
++ spin_unlock(&vx_info_hash_lock);
++ }
++ return vxi;
++}
++
++/* xid_is_hashed()
++
++ * verify that xid is still hashed */
++
++int xid_is_hashed(xid_t xid)
++{
++ int hashed;
++
++ spin_lock(&vx_info_hash_lock);
++ hashed = (__lookup_vx_info(xid) != NULL);
++ spin_unlock(&vx_info_hash_lock);
++ return hashed;
++}
++
++#ifdef CONFIG_VSERVER_LEGACY
++
++struct vx_info *locate_or_create_vx_info(int id)
++{
++ int err;
++
++ return __loc_vx_info(id, &err);
++}
++
++#endif
++
++#ifdef CONFIG_PROC_FS
++
++int get_xid_list(int index, unsigned int *xids, int size)
++{
++ int hindex, nr_xids = 0;
++
++ for (hindex = 0; hindex < VX_HASH_SIZE; hindex++) {
++ struct hlist_head *head = &vx_info_hash[hindex];
++ struct hlist_node *pos;
++
++ spin_lock(&vx_info_hash_lock);
++ hlist_for_each(pos, head) {
++ struct vx_info *vxi;
++
++ if (--index > 0)
++ continue;
++
++ vxi = hlist_entry(pos, struct vx_info, vx_hlist);
++ xids[nr_xids] = vxi->vx_id;
++ if (++nr_xids >= size) {
++ spin_unlock(&vx_info_hash_lock);
++ goto out;
++ }
++ }
++ /* keep the lock time short */
++ spin_unlock(&vx_info_hash_lock);
++ }
++out:
++ return nr_xids;
++}
++#endif
++
++
++int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
++{
++ struct user_struct *new_user, *old_user;
++
++ if (!p || !vxi)
++ BUG();
++ new_user = alloc_uid(vxi->vx_id, p->uid);
++ if (!new_user)
++ return -ENOMEM;
++
++ old_user = p->user;
++ if (new_user != old_user) {
++ atomic_inc(&new_user->processes);
++ atomic_dec(&old_user->processes);
++ p->user = new_user;
++ }
++ free_uid(old_user);
++ return 0;
++}
++
++void vx_mask_bcaps(struct task_struct *p)
++{
++ struct vx_info *vxi = p->vx_info;
++
++ p->cap_effective &= vxi->vx_bcaps;
++ p->cap_inheritable &= vxi->vx_bcaps;
++ p->cap_permitted &= vxi->vx_bcaps;
++}
++
++
++#include <linux/file.h>
++
++static int vx_openfd_task(struct task_struct *tsk)
++{
++ struct files_struct *files = tsk->files;
++ const unsigned long *bptr;
++ int count, total;
++
++ spin_lock(&files->file_lock);
++ bptr = files->open_fds->fds_bits;
++ count = files->max_fds / (sizeof(unsigned long) * 8);
++ for (total = 0; count > 0; count--) {
++ if (*bptr)
++ total += hweight_long(*bptr);
++ bptr++;
++ }
++ spin_unlock(&files->file_lock);
++ return total;
++}
++
++/*
++ * migrate task to new context
++ * gets vxi, puts old_vxi on change
++ */
++
++int vx_migrate_task(struct task_struct *p, struct vx_info *vxi)
++{
++ struct vx_info *old_vxi;
++ int ret = 0;
++
++ if (!p || !vxi)
++ BUG();
++
++ old_vxi = task_get_vx_info(p);
++ if (old_vxi == vxi)
++ goto out;
++
++ vxdprintk(VXD_CBIT(xid, 5),
++ "vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
++ vxi->vx_id, atomic_read(&vxi->vx_usecnt));
++
++ if (!(ret = vx_migrate_user(p, vxi))) {
++ int openfd;
++
++ task_lock(p);
++ openfd = vx_openfd_task(p);
++
++ if (old_vxi) {
++ atomic_dec(&old_vxi->cvirt.nr_threads);
++ atomic_dec(&old_vxi->cvirt.nr_running);
++ atomic_dec(&old_vxi->limit.rcur[RLIMIT_NPROC]);
++ /* FIXME: what about the struct files here? */
++ atomic_sub(openfd, &old_vxi->limit.rcur[VLIMIT_OPENFD]);
++ }
++ atomic_inc(&vxi->cvirt.nr_threads);
++ atomic_inc(&vxi->cvirt.nr_running);
++ atomic_inc(&vxi->limit.rcur[RLIMIT_NPROC]);
++ /* FIXME: what about the struct files here? */
++ atomic_add(openfd, &vxi->limit.rcur[VLIMIT_OPENFD]);
++
++ if (old_vxi) {
++ release_vx_info(old_vxi, p);
++ clr_vx_info(&p->vx_info);
++ }
++ claim_vx_info(vxi, p);
++ set_vx_info(&p->vx_info, vxi);
++ p->xid = vxi->vx_id;
++
++ vxdprintk(VXD_CBIT(xid, 5),
++ "moved task %p into vxi:%p[#%d]",
++ p, vxi, vxi->vx_id);
++
++ vx_mask_bcaps(p);
++ task_unlock(p);
++ }
++out:
++ put_vx_info(old_vxi);
++ return ret;
++}
++
++int vx_set_init(struct vx_info *vxi, struct task_struct *p)
++{
++ if (!vxi)
++ return -EINVAL;
++ if (vxi->vx_initpid)
++ return -EPERM;
++
++ vxdprintk(VXD_CBIT(xid, 6),
++ "vx_set_init(%p[#%d],%p[#%d,%d,%d])",
++ vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
++
++ vxi->vx_initpid = p->tgid;
++ return 0;
++}
++
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++#include <asm/uaccess.h>
++
++
++int vc_task_xid(uint32_t id, void __user *data)
++{
++ xid_t xid;
++
++ if (id) {
++ struct task_struct *tsk;
++
++ if (!vx_check(0, VX_ADMIN|VX_WATCH))
++ return -EPERM;
++
++ read_lock(&tasklist_lock);
++ tsk = find_task_by_real_pid(id);
++ xid = (tsk) ? tsk->xid : -ESRCH;
++ read_unlock(&tasklist_lock);
++ }
++ else
++ xid = vx_current_xid();
++ return xid;
++}
++
++
++int vc_vx_info(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_vx_info_v0 vc_data;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
++ return -EPERM;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ vc_data.xid = vxi->vx_id;
++ vc_data.initpid = vxi->vx_initpid;
++ put_vx_info(vxi);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++
++/* context functions */
++
++int vc_ctx_create(uint32_t xid, void __user *data)
++{
++ struct vcmd_ctx_create vc_data = { .flagword = VXF_INIT_SET };
++ struct vx_info *new_vxi;
++ int ret;
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++ if (data && copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ if ((xid > MAX_S_CONTEXT) && (xid != VX_DYNAMIC_ID))
++ return -EINVAL;
++ if (xid < 2)
++ return -EINVAL;
++
++ new_vxi = __create_vx_info(xid);
++ if (IS_ERR(new_vxi))
++ return PTR_ERR(new_vxi);
++
++ /* initial flags */
++ new_vxi->vx_flags = vc_data.flagword;
++
++ vs_state_change(new_vxi, VSC_STARTUP);
++ ret = new_vxi->vx_id;
++ vx_migrate_task(current, new_vxi);
++ /* if this fails, we might end up with a hashed vx_info */
++ put_vx_info(new_vxi);
++ return ret;
++}
++
++
++int vc_ctx_migrate(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++
++ /* dirty hack until Spectator becomes a cap */
++ if (id == 1) {
++ current->xid = 1;
++ return 0;
++ }
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++ vx_migrate_task(current, vxi);
++ put_vx_info(vxi);
++ return 0;
++}
++
++
++int vc_get_cflags(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_ctx_flags_v0 vc_data;
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ vc_data.flagword = vxi->vx_flags;
++
++ /* special STATE flag handling */
++ vc_data.mask = vx_mask_flags(~0UL, vxi->vx_flags, VXF_ONE_TIME);
++
++ put_vx_info(vxi);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++int vc_set_cflags(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_ctx_flags_v0 vc_data;
++ uint64_t mask, trigger;
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ /* special STATE flag handling */
++ mask = vx_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
++ trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
++
++ if (trigger & VXF_STATE_SETUP)
++ vx_mask_bcaps(current);
++ if (trigger & VXF_STATE_INIT)
++ if (vxi == current->vx_info)
++ vx_set_init(vxi, current);
++
++ vxi->vx_flags = vx_mask_flags(vxi->vx_flags,
++ vc_data.flagword, mask);
++ put_vx_info(vxi);
++ return 0;
++}
++
++int vc_get_ccaps(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_ctx_caps_v0 vc_data;
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ vc_data.bcaps = vxi->vx_bcaps;
++ vc_data.ccaps = vxi->vx_ccaps;
++ vc_data.cmask = ~0UL;
++ put_vx_info(vxi);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++int vc_set_ccaps(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_ctx_caps_v0 vc_data;
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ vxi->vx_bcaps &= vc_data.bcaps;
++ vxi->vx_ccaps = vx_mask_flags(vxi->vx_ccaps,
++ vc_data.ccaps, vc_data.cmask);
++ put_vx_info(vxi);
++ return 0;
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(free_vx_info);
++
+Index: linux-2.6.12/kernel/vserver/cvirt.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/cvirt.c
+@@ -0,0 +1,260 @@
++/*
++ * linux/kernel/vserver/cvirt.c
++ *
++ * Virtual Server: Context Virtualization
++ *
++ * Copyright (C) 2004-2005 Herbert Ptzl
++ *
++ * V0.01 broken out from limit.c
++ * V0.02 added utsname stuff
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/sched.h>
++#include <linux/sysctl.h>
++#include <linux/types.h>
++#include <linux/vs_context.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vserver/switch.h>
++#include <linux/vserver/cvirt_cmd.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++void vx_vsi_uptime(struct timespec *uptime, struct timespec *idle)
++{
++ struct vx_info *vxi = current->vx_info;
++
++ set_normalized_timespec(uptime,
++ uptime->tv_sec - vxi->cvirt.bias_uptime.tv_sec,
++ uptime->tv_nsec - vxi->cvirt.bias_uptime.tv_nsec);
++ if (!idle)
++ return;
++ set_normalized_timespec(idle,
++ idle->tv_sec - vxi->cvirt.bias_idle.tv_sec,
++ idle->tv_nsec - vxi->cvirt.bias_idle.tv_nsec);
++ return;
++}
++
++uint64_t vx_idle_jiffies(void)
++{
++ return init_task.utime + init_task.stime;
++}
++
++
++
++static inline uint32_t __update_loadavg(uint32_t load,
++ int wsize, int delta, int n)
++{
++ unsigned long long calc, prev;
++
++ /* just set it to n */
++ if (unlikely(delta >= wsize))
++ return (n << FSHIFT);
++
++ calc = delta * n;
++ calc <<= FSHIFT;
++ prev = (wsize - delta);
++ prev *= load;
++ calc += prev;
++ do_div(calc, wsize);
++ return calc;
++}
++
++
++void vx_update_load(struct vx_info *vxi)
++{
++ uint32_t now, last, delta;
++ unsigned int nr_running, nr_uninterruptible;
++ unsigned int total;
++
++ spin_lock(&vxi->cvirt.load_lock);
++
++ now = jiffies;
++ last = vxi->cvirt.load_last;
++ delta = now - last;
++
++ if (delta < 5*HZ)
++ goto out;
++
++ nr_running = atomic_read(&vxi->cvirt.nr_running);
++ nr_uninterruptible = atomic_read(&vxi->cvirt.nr_uninterruptible);
++ total = nr_running + nr_uninterruptible;
++
++ vxi->cvirt.load[0] = __update_loadavg(vxi->cvirt.load[0],
++ 60*HZ, delta, total);
++ vxi->cvirt.load[1] = __update_loadavg(vxi->cvirt.load[1],
++ 5*60*HZ, delta, total);
++ vxi->cvirt.load[2] = __update_loadavg(vxi->cvirt.load[2],
++ 15*60*HZ, delta, total);
++
++ vxi->cvirt.load_last = now;
++out:
++ atomic_inc(&vxi->cvirt.load_updates);
++ spin_unlock(&vxi->cvirt.load_lock);
++}
++
++
++int vx_uts_virt_handler(struct ctl_table *ctl, int write, xid_t xid,
++ void **datap, size_t *lenp)
++{
++ switch (ctl->ctl_name) {
++ case KERN_OSTYPE:
++ *datap = vx_new_uts(sysname);
++ break;
++ case KERN_OSRELEASE:
++ *datap = vx_new_uts(release);
++ break;
++ case KERN_VERSION:
++ *datap = vx_new_uts(version);
++ break;
++ case KERN_NODENAME:
++ *datap = vx_new_uts(nodename);
++ break;
++ case KERN_DOMAINNAME:
++ *datap = vx_new_uts(domainname);
++ break;
++ }
++
++ return 0;
++}
++
++
++
++/*
++ * Commands to do_syslog:
++ *
++ * 0 -- Close the log. Currently a NOP.
++ * 1 -- Open the log. Currently a NOP.
++ * 2 -- Read from the log.
++ * 3 -- Read all messages remaining in the ring buffer.
++ * 4 -- Read and clear all messages remaining in the ring buffer
++ * 5 -- Clear ring buffer.
++ * 6 -- Disable printk's to console
++ * 7 -- Enable printk's to console
++ * 8 -- Set level of messages printed to console
++ * 9 -- Return number of unread characters in the log buffer
++ * 10 -- Return size of the log buffer
++ */
++int vx_do_syslog(int type, char __user *buf, int len)
++{
++ int error = 0;
++ int do_clear = 0;
++ struct vx_info *vxi = current->vx_info;
++ struct _vx_syslog *log;
++
++ if (!vxi)
++ return -EINVAL;
++ log = &vxi->cvirt.syslog;
++
++ switch (type) {
++ case 0: /* Close log */
++ case 1: /* Open log */
++ break;
++ case 2: /* Read from log */
++ error = wait_event_interruptible(log->log_wait,
++ (log->log_start - log->log_end));
++ if (error)
++ break;
++ spin_lock_irq(&log->logbuf_lock);
++ spin_unlock_irq(&log->logbuf_lock);
++ break;
++ case 4: /* Read/clear last kernel messages */
++ do_clear = 1;
++ /* fall through */
++ case 3: /* Read last kernel messages */
++ return 0;
++
++ case 5: /* Clear ring buffer */
++ return 0;
++
++ case 6: /* Disable logging to console */
++ case 7: /* Enable logging to console */
++ case 8: /* Set level of messages printed to console */
++ break;
++
++ case 9: /* Number of chars in the log buffer */
++ return 0;
++ case 10: /* Size of the log buffer */
++ return 0;
++ default:
++ error = -EINVAL;
++ break;
++ }
++ return error;
++}
++
++
++/* virtual host info names */
++
++static char * vx_vhi_name(struct vx_info *vxi, int id)
++{
++ switch (id) {
++ case VHIN_CONTEXT:
++ return vxi->vx_name;
++ case VHIN_SYSNAME:
++ return vxi->cvirt.utsname.sysname;
++ case VHIN_NODENAME:
++ return vxi->cvirt.utsname.nodename;
++ case VHIN_RELEASE:
++ return vxi->cvirt.utsname.release;
++ case VHIN_VERSION:
++ return vxi->cvirt.utsname.version;
++ case VHIN_MACHINE:
++ return vxi->cvirt.utsname.machine;
++ case VHIN_DOMAINNAME:
++ return vxi->cvirt.utsname.domainname;
++ default:
++ return NULL;
++ }
++ return NULL;
++}
++
++int vc_set_vhi_name(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_vhi_name_v0 vc_data;
++ char *name;
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ name = vx_vhi_name(vxi, vc_data.field);
++ if (name)
++ memcpy(name, vc_data.name, 65);
++ put_vx_info(vxi);
++ return (name ? 0 : -EFAULT);
++}
++
++int vc_get_vhi_name(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_vhi_name_v0 vc_data;
++ char *name;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ name = vx_vhi_name(vxi, vc_data.field);
++ if (!name)
++ goto out_put;
++
++ memcpy(vc_data.name, name, 65);
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++out_put:
++ put_vx_info(vxi);
++ return (name ? 0 : -EFAULT);
++}
+Index: linux-2.6.12/kernel/vserver/cvirt_init.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/cvirt_init.h
+@@ -0,0 +1,77 @@
++
++extern uint64_t vx_idle_jiffies(void);
++
++static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
++{
++ uint64_t idle_jiffies = vx_idle_jiffies();
++ uint64_t nsuptime;
++
++ do_posix_clock_monotonic_gettime(&cvirt->bias_uptime);
++ nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec
++ * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec;
++ cvirt->bias_clock = nsec_to_clock_t(nsuptime);
++
++ jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle);
++ atomic_set(&cvirt->nr_threads, 0);
++ atomic_set(&cvirt->nr_running, 0);
++ atomic_set(&cvirt->nr_uninterruptible, 0);
++ atomic_set(&cvirt->nr_onhold, 0);
++
++ down_read(&uts_sem);
++ cvirt->utsname = system_utsname;
++ up_read(&uts_sem);
++
++ spin_lock_init(&cvirt->load_lock);
++ cvirt->load_last = jiffies;
++ atomic_set(&cvirt->load_updates, 0);
++ cvirt->load[0] = 0;
++ cvirt->load[1] = 0;
++ cvirt->load[2] = 0;
++
++ atomic_set(&cvirt->total_forks, 0);
++ spin_lock_init(&cvirt->syslog.logbuf_lock);
++ init_waitqueue_head(&cvirt->syslog.log_wait);
++ cvirt->syslog.log_start = 0;
++ cvirt->syslog.log_end = 0;
++ cvirt->syslog.con_start = 0;
++ cvirt->syslog.logged_chars = 0;
++}
++
++static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
++{
++#ifdef CONFIG_VSERVER_DEBUG
++ int value;
++
++ vxwprintk((value = atomic_read(&cvirt->nr_threads)),
++ "!!! cvirt: %p[nr_threads] = %d on exit.",
++ cvirt, value);
++ vxwprintk((value = atomic_read(&cvirt->nr_running)),
++ "!!! cvirt: %p[nr_running] = %d on exit.",
++ cvirt, value);
++ vxwprintk((value = atomic_read(&cvirt->nr_uninterruptible)),
++ "!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
++ cvirt, value);
++ vxwprintk((value = atomic_read(&cvirt->nr_onhold)),
++ "!!! cvirt: %p[nr_onhold] = %d on exit.",
++ cvirt, value);
++#endif
++ return;
++}
++
++static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
++{
++ int i,j;
++
++ for (i=0; i<5; i++) {
++ for (j=0; j<3; j++) {
++ atomic_set(&cacct->sock[i][j].count, 0);
++ atomic_set(&cacct->sock[i][j].total, 0);
++ }
++ }
++}
++
++static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
++{
++ return;
++}
++
+Index: linux-2.6.12/kernel/vserver/cvirt_proc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/cvirt_proc.h
+@@ -0,0 +1,92 @@
++#ifndef _VX_CVIRT_PROC_H
++#define _VX_CVIRT_PROC_H
++
++#include <linux/sched.h>
++
++
++#define LOAD_INT(x) ((x) >> FSHIFT)
++#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
++
++static inline int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
++{
++ int length = 0;
++ int a, b, c;
++
++ length += sprintf(buffer + length,
++ "BiasUptime:\t%lu.%02lu\n",
++ (unsigned long)cvirt->bias_uptime.tv_sec,
++ (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100)));
++ length += sprintf(buffer + length,
++ "SysName:\t%.*s\n"
++ "NodeName:\t%.*s\n"
++ "Release:\t%.*s\n"
++ "Version:\t%.*s\n"
++ "Machine:\t%.*s\n"
++ "DomainName:\t%.*s\n"
++ ,__NEW_UTS_LEN, cvirt->utsname.sysname
++ ,__NEW_UTS_LEN, cvirt->utsname.nodename
++ ,__NEW_UTS_LEN, cvirt->utsname.release
++ ,__NEW_UTS_LEN, cvirt->utsname.version
++ ,__NEW_UTS_LEN, cvirt->utsname.machine
++ ,__NEW_UTS_LEN, cvirt->utsname.domainname
++ );
++
++ a = cvirt->load[0] + (FIXED_1/200);
++ b = cvirt->load[1] + (FIXED_1/200);
++ c = cvirt->load[2] + (FIXED_1/200);
++ length += sprintf(buffer + length,
++ "nr_threads:\t%d\n"
++ "nr_running:\t%d\n"
++ "nr_unintr:\t%d\n"
++ "nr_onhold:\t%d\n"
++ "load_updates:\t%d\n"
++ "loadavg:\t%d.%02d %d.%02d %d.%02d\n"
++ "total_forks:\t%d\n"
++ ,atomic_read(&cvirt->nr_threads)
++ ,atomic_read(&cvirt->nr_running)
++ ,atomic_read(&cvirt->nr_uninterruptible)
++ ,atomic_read(&cvirt->nr_onhold)
++ ,atomic_read(&cvirt->load_updates)
++ ,LOAD_INT(a), LOAD_FRAC(a)
++ ,LOAD_INT(b), LOAD_FRAC(b)
++ ,LOAD_INT(c), LOAD_FRAC(c)
++ ,atomic_read(&cvirt->total_forks)
++ );
++ return length;
++}
++
++
++static inline long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_read(&cacct->sock[type][pos].count);
++}
++
++
++static inline long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++{
++ return atomic_read(&cacct->sock[type][pos].total);
++}
++
++static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
++{
++ int i,j, length = 0;
++ static char *type[] = { "UNSPEC", "UNIX", "INET", "INET6", "OTHER" };
++
++ for (i=0; i<5; i++) {
++ length += sprintf(buffer + length,
++ "%s:", type[i]);
++ for (j=0; j<3; j++) {
++ length += sprintf(buffer + length,
++ "\t%12lu/%-12lu"
++ ,vx_sock_count(cacct, i, j)
++ ,vx_sock_total(cacct, i, j)
++ );
++ }
++ buffer[length++] = '\n';
++ }
++ length += sprintf(buffer + length,
++ "forks:\t%lu\n", cacct->total_forks);
++ return length;
++}
++
++#endif /* _VX_CVIRT_PROC_H */
+Index: linux-2.6.12/kernel/vserver/dlimit.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/dlimit.c
+@@ -0,0 +1,544 @@
++/*
++ * linux/kernel/vserver/dlimit.c
++ *
++ * Virtual Server: Context Disk Limits
++ *
++ * Copyright (C) 2004-2005 Herbert Ptzl
++ *
++ * V0.01 initial version
++ * V0.02 compat32 splitup
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/fs.h>
++#include <linux/namespace.h>
++#include <linux/namei.h>
++#include <linux/statfs.h>
++#include <linux/compat.h>
++#include <linux/vserver/switch.h>
++#include <linux/vs_context.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vserver/dlimit_cmd.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++/* __alloc_dl_info()
++
++ * allocate an initialized dl_info struct
++ * doesn't make it visible (hash) */
++
++static struct dl_info *__alloc_dl_info(struct super_block *sb, xid_t xid)
++{
++ struct dl_info *new = NULL;
++
++ vxdprintk(VXD_CBIT(dlim, 5),
++ "alloc_dl_info(%p,%d)*", sb, xid);
++
++ /* would this benefit from a slab cache? */
++ new = kmalloc(sizeof(struct dl_info), GFP_KERNEL);
++ if (!new)
++ return 0;
++
++ memset (new, 0, sizeof(struct dl_info));
++ new->dl_xid = xid;
++ new->dl_sb = sb;
++ INIT_RCU_HEAD(&new->dl_rcu);
++ INIT_HLIST_NODE(&new->dl_hlist);
++ spin_lock_init(&new->dl_lock);
++ atomic_set(&new->dl_refcnt, 0);
++ atomic_set(&new->dl_usecnt, 0);
++
++ /* rest of init goes here */
++
++ vxdprintk(VXD_CBIT(dlim, 4),
++ "alloc_dl_info(%p,%d) = %p", sb, xid, new);
++ return new;
++}
++
++/* __dealloc_dl_info()
++
++ * final disposal of dl_info */
++
++static void __dealloc_dl_info(struct dl_info *dli)
++{
++ vxdprintk(VXD_CBIT(dlim, 4),
++ "dealloc_dl_info(%p)", dli);
++
++ dli->dl_hlist.next = LIST_POISON1;
++ dli->dl_xid = -1;
++ dli->dl_sb = 0;
++
++ BUG_ON(atomic_read(&dli->dl_usecnt));
++ BUG_ON(atomic_read(&dli->dl_refcnt));
++
++ kfree(dli);
++}
++
++
++/* hash table for dl_info hash */
++
++#define DL_HASH_SIZE 13
++
++struct hlist_head dl_info_hash[DL_HASH_SIZE];
++
++static spinlock_t dl_info_hash_lock = SPIN_LOCK_UNLOCKED;
++
++
++static inline unsigned int __hashval(struct super_block *sb, xid_t xid)
++{
++ return ((xid ^ (unsigned long)sb) % DL_HASH_SIZE);
++}
++
++
++
++/* __hash_dl_info()
++
++ * add the dli to the global hash table
++ * requires the hash_lock to be held */
++
++static inline void __hash_dl_info(struct dl_info *dli)
++{
++ struct hlist_head *head;
++
++ vxdprintk(VXD_CBIT(dlim, 6),
++ "__hash_dl_info: %p[#%d]", dli, dli->dl_xid);
++ get_dl_info(dli);
++ head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_xid)];
++ hlist_add_head_rcu(&dli->dl_hlist, head);
++}
++
++/* __unhash_dl_info()
++
++ * remove the dli from the global hash table
++ * requires the hash_lock to be held */
++
++static inline void __unhash_dl_info(struct dl_info *dli)
++{
++ vxdprintk(VXD_CBIT(dlim, 6),
++ "__unhash_dl_info: %p[#%d]", dli, dli->dl_xid);
++ hlist_del_rcu(&dli->dl_hlist);
++ put_dl_info(dli);
++}
++
++
++/* __lookup_dl_info()
++
++ * requires the rcu_read_lock()
++ * doesn't increment the dl_refcnt */
++
++static inline struct dl_info *__lookup_dl_info(struct super_block *sb, xid_t xid)
++{
++ struct hlist_head *head = &dl_info_hash[__hashval(sb, xid)];
++ struct hlist_node *pos;
++
++ hlist_for_each_rcu(pos, head) {
++ struct dl_info *dli =
++ hlist_entry(pos, struct dl_info, dl_hlist);
++
++ if (dli->dl_xid == xid && dli->dl_sb == sb) {
++ return dli;
++ }
++ }
++ return NULL;
++}
++
++
++struct dl_info *locate_dl_info(struct super_block *sb, xid_t xid)
++{
++ struct dl_info *dli;
++
++ rcu_read_lock();
++ dli = get_dl_info(__lookup_dl_info(sb, xid));
++ vxdprintk(VXD_CBIT(dlim, 7),
++ "locate_dl_info(%p,#%d) = %p", sb, xid, dli);
++ rcu_read_unlock();
++ return dli;
++}
++
++void rcu_free_dl_info(struct rcu_head *head)
++{
++ struct dl_info *dli = container_of(head, struct dl_info, dl_rcu);
++ int usecnt, refcnt;
++
++ BUG_ON(!dli || !head);
++
++ usecnt = atomic_read(&dli->dl_usecnt);
++ BUG_ON(usecnt < 0);
++
++ refcnt = atomic_read(&dli->dl_refcnt);
++ BUG_ON(refcnt < 0);
++
++ vxdprintk(VXD_CBIT(dlim, 3),
++ "rcu_free_dl_info(%p)", dli);
++ if (!usecnt)
++ __dealloc_dl_info(dli);
++ else
++ printk("!!! rcu didn't free\n");
++}
++
++
++
++
++int do_addrem_dlimit(uint32_t id, const char __user *name,
++ uint32_t flags, int add)
++{
++ struct nameidata nd;
++ int ret;
++
++ ret = user_path_walk_link(name, &nd);
++ if (!ret) {
++ struct super_block *sb;
++ struct dl_info *dli;
++
++ ret = -EINVAL;
++ if (!nd.dentry->d_inode)
++ goto out_release;
++ if (!(sb = nd.dentry->d_inode->i_sb))
++ goto out_release;
++
++ if (add) {
++ dli = __alloc_dl_info(sb, id);
++ spin_lock(&dl_info_hash_lock);
++
++ ret = -EEXIST;
++ if (__lookup_dl_info(sb, id))
++ goto out_unlock;
++ __hash_dl_info(dli);
++ dli = NULL;
++ } else {
++ spin_lock(&dl_info_hash_lock);
++ dli = __lookup_dl_info(sb, id);
++
++ ret = -ESRCH;
++ if (!dli)
++ goto out_unlock;
++ __unhash_dl_info(dli);
++ }
++ ret = 0;
++ out_unlock:
++ spin_unlock(&dl_info_hash_lock);
++ if (add && dli)
++ __dealloc_dl_info(dli);
++ out_release:
++ path_release(&nd);
++ }
++ return ret;
++}
++
++int vc_add_dlimit(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_base_v0 vc_data;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 1);
++}
++
++int vc_rem_dlimit(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_base_v0 vc_data;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_addrem_dlimit(id, vc_data.name, vc_data.flags, 0);
++}
++
++#ifdef CONFIG_COMPAT
++
++int vc_add_dlimit_x32(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_addrem_dlimit(id,
++ compat_ptr(vc_data.name_ptr), vc_data.flags, 1);
++}
++
++int vc_rem_dlimit_x32(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_base_v0_x32 vc_data;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_addrem_dlimit(id,
++ compat_ptr(vc_data.name_ptr), vc_data.flags, 0);
++}
++
++#endif /* CONFIG_COMPAT */
++
++
++static inline
++int do_set_dlimit(uint32_t id, const char __user *name,
++ uint32_t space_used, uint32_t space_total,
++ uint32_t inodes_used, uint32_t inodes_total,
++ uint32_t reserved, uint32_t flags)
++{
++ struct nameidata nd;
++ int ret;
++
++ ret = user_path_walk_link(name, &nd);
++ if (!ret) {
++ struct super_block *sb;
++ struct dl_info *dli;
++
++ ret = -EINVAL;
++ if (!nd.dentry->d_inode)
++ goto out_release;
++ if (!(sb = nd.dentry->d_inode->i_sb))
++ goto out_release;
++ if ((reserved != (uint32_t)CDLIM_KEEP &&
++ reserved > 100) ||
++ (inodes_used != (uint32_t)CDLIM_KEEP &&
++ inodes_used > inodes_total) ||
++ (space_used != (uint32_t)CDLIM_KEEP &&
++ space_used > space_total))
++ goto out_release;
++
++ ret = -ESRCH;
++ dli = locate_dl_info(sb, id);
++ if (!dli)
++ goto out_release;
++
++ spin_lock(&dli->dl_lock);
++
++ if (inodes_used != (uint32_t)CDLIM_KEEP)
++ dli->dl_inodes_used = inodes_used;
++ if (inodes_total != (uint32_t)CDLIM_KEEP)
++ dli->dl_inodes_total = inodes_total;
++ if (space_used != (uint32_t)CDLIM_KEEP) {
++ dli->dl_space_used = space_used;
++ dli->dl_space_used <<= 10;
++ }
++ if (space_total == (uint32_t)CDLIM_INFINITY)
++ dli->dl_space_total = (uint64_t)CDLIM_INFINITY;
++ else if (space_total != (uint32_t)CDLIM_KEEP) {
++ dli->dl_space_total = space_total;
++ dli->dl_space_total <<= 10;
++ }
++ if (reserved != (uint32_t)CDLIM_KEEP)
++ dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
++
++ spin_unlock(&dli->dl_lock);
++
++ put_dl_info(dli);
++ ret = 0;
++
++ out_release:
++ path_release(&nd);
++ }
++ return ret;
++}
++
++int vc_set_dlimit(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_v0 vc_data;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_set_dlimit(id, vc_data.name,
++ vc_data.space_used, vc_data.space_total,
++ vc_data.inodes_used, vc_data.inodes_total,
++ vc_data.reserved, vc_data.flags);
++}
++
++#ifdef CONFIG_COMPAT
++
++int vc_set_dlimit_x32(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_v0_x32 vc_data;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ return do_set_dlimit(id, compat_ptr(vc_data.name_ptr),
++ vc_data.space_used, vc_data.space_total,
++ vc_data.inodes_used, vc_data.inodes_total,
++ vc_data.reserved, vc_data.flags);
++}
++
++#endif /* CONFIG_COMPAT */
++
++
++static inline
++int do_get_dlimit(uint32_t id, const char __user *name,
++ uint32_t *space_used, uint32_t *space_total,
++ uint32_t *inodes_used, uint32_t *inodes_total,
++ uint32_t *reserved, uint32_t *flags)
++{
++ struct nameidata nd;
++ int ret;
++
++ ret = user_path_walk_link(name, &nd);
++ if (!ret) {
++ struct super_block *sb;
++ struct dl_info *dli;
++
++ ret = -EINVAL;
++ if (!nd.dentry->d_inode)
++ goto out_release;
++ if (!(sb = nd.dentry->d_inode->i_sb))
++ goto out_release;
++
++ ret = -ESRCH;
++ dli = locate_dl_info(sb, id);
++ if (!dli)
++ goto out_release;
++
++ spin_lock(&dli->dl_lock);
++ *inodes_used = dli->dl_inodes_used;
++ *inodes_total = dli->dl_inodes_total;
++ *space_used = dli->dl_space_used >> 10;
++ if (dli->dl_space_total == (uint64_t)CDLIM_INFINITY)
++ *space_total = (uint32_t)CDLIM_INFINITY;
++ else
++ *space_total = dli->dl_space_total >> 10;
++
++ *reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
++ spin_unlock(&dli->dl_lock);
++
++ put_dl_info(dli);
++ ret = -EFAULT;
++
++ ret = 0;
++ out_release:
++ path_release(&nd);
++ }
++ return ret;
++}
++
++
++int vc_get_dlimit(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_v0 vc_data;
++ int ret;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = do_get_dlimit(id, vc_data.name,
++ &vc_data.space_used, &vc_data.space_total,
++ &vc_data.inodes_used, &vc_data.inodes_total,
++ &vc_data.reserved, &vc_data.flags);
++ if (ret)
++ return ret;
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++#ifdef CONFIG_COMPAT
++
++int vc_get_dlimit_x32(uint32_t id, void __user *data)
++{
++ struct vcmd_ctx_dlimit_v0_x32 vc_data;
++ int ret;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = do_get_dlimit(id, compat_ptr(vc_data.name_ptr),
++ &vc_data.space_used, &vc_data.space_total,
++ &vc_data.inodes_used, &vc_data.inodes_total,
++ &vc_data.reserved, &vc_data.flags);
++ if (ret)
++ return ret;
++
++ if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++#endif /* CONFIG_COMPAT */
++
++
++void vx_vsi_statfs(struct super_block *sb, struct kstatfs *buf)
++{
++ struct dl_info *dli;
++ __u64 blimit, bfree, bavail;
++ __u32 ifree;
++
++ dli = locate_dl_info(sb, vx_current_xid());
++ if (!dli)
++ return;
++
++ spin_lock(&dli->dl_lock);
++ if (dli->dl_inodes_total == (uint32_t)CDLIM_INFINITY)
++ goto no_ilim;
++
++ /* reduce max inodes available to limit */
++ if (buf->f_files > dli->dl_inodes_total)
++ buf->f_files = dli->dl_inodes_total;
++
++ ifree = dli->dl_inodes_total - dli->dl_inodes_used;
++ /* reduce free inodes to min */
++ if (ifree < buf->f_ffree)
++ buf->f_ffree = ifree;
++
++no_ilim:
++ if (dli->dl_space_total == (uint64_t)CDLIM_INFINITY)
++ goto no_blim;
++
++ blimit = dli->dl_space_total >> sb->s_blocksize_bits;
++
++ if (dli->dl_space_total < dli->dl_space_used)
++ bfree = 0;
++ else
++ bfree = (dli->dl_space_total - dli->dl_space_used)
++ >> sb->s_blocksize_bits;
++
++ bavail = ((dli->dl_space_total >> 10) * dli->dl_nrlmult);
++ if (bavail < dli->dl_space_used)
++ bavail = 0;
++ else
++ bavail = (bavail - dli->dl_space_used)
++ >> sb->s_blocksize_bits;
++
++ /* reduce max space available to limit */
++ if (buf->f_blocks > blimit)
++ buf->f_blocks = blimit;
++
++ /* reduce free space to min */
++ if (bfree < buf->f_bfree)
++ buf->f_bfree = bfree;
++
++ /* reduce avail space to min */
++ if (bavail < buf->f_bavail)
++ buf->f_bavail = bavail;
++
++no_blim:
++ spin_unlock(&dli->dl_lock);
++ put_dl_info(dli);
++
++ return;
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(locate_dl_info);
++EXPORT_SYMBOL_GPL(rcu_free_dl_info);
++
+Index: linux-2.6.12/kernel/vserver/helper.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/helper.c
+@@ -0,0 +1,174 @@
++/*
++ * linux/kernel/vserver/helper.c
++ *
++ * Virtual Context Support
++ *
++ * Copyright (C) 2004-2005 Herbert Ptzl
++ *
++ * V0.01 basic helper
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/errno.h>
++#include <linux/reboot.h>
++#include <linux/kmod.h>
++#include <linux/sched.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++
++#include <asm/uaccess.h>
++#include <asm/unistd.h>
++
++
++char vshelper_path[255] = "/sbin/vshelper";
++
++
++int do_vshelper(char *name, char *argv[], char *envp[], int sync)
++{
++ int ret;
++
++ if ((ret = call_usermodehelper(name, argv, envp, sync))) {
++ printk( KERN_WARNING
++ "%s: (%s %s) returned %s with %d\n",
++ name, argv[1], argv[2],
++ sync?"sync":"async", ret);
++ }
++ vxdprintk(VXD_CBIT(switch, 4),
++ "%s: (%s %s) returned %s with %d",
++ name, argv[1], argv[2], sync?"sync":"async", ret);
++ return ret;
++}
++
++/*
++ * vshelper path is set via /proc/sys
++ * invoked by vserver sys_reboot(), with
++ * the following arguments
++ *
++ * argv [0] = vshelper_path;
++ * argv [1] = action: "restart", "halt", "poweroff", ...
++ * argv [2] = context identifier
++ *
++ * envp [*] = type-specific parameters
++ */
++
++long vs_reboot(unsigned int cmd, void * arg)
++{
++ char id_buf[8], cmd_buf[16];
++ char uid_buf[16], pid_buf[16];
++ int ret;
++
++ char *argv[] = {vshelper_path, NULL, id_buf, 0};
++ char *envp[] = {"HOME=/", "TERM=linux",
++ "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
++ uid_buf, pid_buf, cmd_buf, 0};
++
++ snprintf(id_buf, sizeof(id_buf)-1, "%d", vx_current_xid());
++
++ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
++ snprintf(uid_buf, sizeof(uid_buf)-1, "VS_UID=%d", current->uid);
++ snprintf(pid_buf, sizeof(pid_buf)-1, "VS_PID=%d", current->pid);
++
++ switch (cmd) {
++ case LINUX_REBOOT_CMD_RESTART:
++ argv[1] = "restart";
++ break;
++
++ case LINUX_REBOOT_CMD_HALT:
++ argv[1] = "halt";
++ break;
++
++ case LINUX_REBOOT_CMD_POWER_OFF:
++ argv[1] = "poweroff";
++ break;
++
++ case LINUX_REBOOT_CMD_SW_SUSPEND:
++ argv[1] = "swsusp";
++ break;
++
++ default:
++ return 0;
++ }
++
++#ifndef CONFIG_VSERVER_LEGACY
++ ret = do_vshelper(vshelper_path, argv, envp, 1);
++#else
++ ret = do_vshelper(vshelper_path, argv, envp, 0);
++#endif
++ return (ret) ? -EPERM : 0;
++}
++
++
++/*
++ * argv [0] = vshelper_path;
++ * argv [1] = action: "startup", "shutdown"
++ * argv [2] = context identifier
++ *
++ * envp [*] = type-specific parameters
++ */
++
++long vs_state_change(struct vx_info *vxi, unsigned int cmd)
++{
++ char id_buf[8], cmd_buf[16];
++ char *argv[] = {vshelper_path, NULL, id_buf, 0};
++ char *envp[] = {"HOME=/", "TERM=linux",
++ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
++
++ if (!vx_info_flags(vxi, VXF_STATE_HELPER, 0))
++ return 0;
++
++ snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id);
++ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
++
++ switch (cmd) {
++ case VSC_STARTUP:
++ argv[1] = "startup";
++ break;
++ case VSC_SHUTDOWN:
++ argv[1] = "shutdown";
++ break;
++ default:
++ return 0;
++ }
++
++ do_vshelper(vshelper_path, argv, envp, 1);
++ return 0;
++}
++
++
++/*
++ * argv [0] = vshelper_path;
++ * argv [1] = action: "netup", "netdown"
++ * argv [2] = context identifier
++ *
++ * envp [*] = type-specific parameters
++ */
++
++long vs_net_change(struct nx_info *nxi, unsigned int cmd)
++{
++ char id_buf[8], cmd_buf[16];
++ char *argv[] = {vshelper_path, NULL, id_buf, 0};
++ char *envp[] = {"HOME=/", "TERM=linux",
++ "PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
++
++ if (!nx_info_flags(nxi, NXF_STATE_HELPER, 0))
++ return 0;
++
++ snprintf(id_buf, sizeof(id_buf)-1, "%d", nxi->nx_id);
++ snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
++
++ switch (cmd) {
++ case VSC_NETUP:
++ argv[1] = "netup";
++ break;
++ case VSC_NETDOWN:
++ argv[1] = "netdown";
++ break;
++ default:
++ return 0;
++ }
++
++ do_vshelper(vshelper_path, argv, envp, 1);
++ return 0;
++}
++
+Index: linux-2.6.12/kernel/vserver/history.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/history.c
+@@ -0,0 +1,184 @@
++/*
++ * kernel/vserver/history.c
++ *
++ * Virtual Context History Backtrace
++ *
++ * Copyright (C) 2004-2005 Herbert Ptzl
++ *
++ * V0.01 basic structure
++ * V0.02 hash/unhash and trace
++ * V0.03 preemption fixes
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/errno.h>
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/ctype.h>
++
++#include <asm/uaccess.h>
++#include <asm/atomic.h>
++#include <asm/unistd.h>
++
++#include <linux/vserver/debug.h>
++
++
++#ifdef CONFIG_VSERVER_HISTORY
++#define VXH_SIZE CONFIG_VSERVER_HISTORY_SIZE
++#else
++#define VXH_SIZE 64
++#endif
++
++struct _vx_history {
++ unsigned int counter;
++
++ struct _vx_hist_entry entry[VXH_SIZE+1];
++};
++
++
++DEFINE_PER_CPU(struct _vx_history, vx_history_buffer);
++
++unsigned volatile int vxh_active = 1;
++
++static atomic_t sequence = ATOMIC_INIT(0);
++
++
++/* vxh_advance()
++
++ * requires disabled preemption */
++
++struct _vx_hist_entry *vxh_advance(void *loc)
++{
++ unsigned int cpu = smp_processor_id();
++ struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
++ struct _vx_hist_entry *entry;
++ unsigned int index;
++
++ index = vxh_active ? (hist->counter++ % VXH_SIZE) : VXH_SIZE;
++ entry = &hist->entry[index];
++
++ entry->seq = atomic_inc_return(&sequence);
++ entry->loc = loc;
++ return entry;
++}
++
++
++#define VXH_LOC_FMTS "(#%04x,*%d):%p"
++
++#define VXH_LOC_ARGS(e) (e)->seq, cpu, (e)->loc
++
++
++#define VXH_VXI_FMTS "%p[#%d,%d.%d]"
++
++#define VXH_VXI_ARGS(e) (e)->vxi.ptr, \
++ (e)->vxi.ptr?(e)->vxi.xid:0, \
++ (e)->vxi.ptr?(e)->vxi.usecnt:0, \
++ (e)->vxi.ptr?(e)->vxi.tasks:0
++
++void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu)
++{
++ switch (e->type) {
++ case VXH_THROW_OOPS:
++ printk( VXH_LOC_FMTS " oops \n", VXH_LOC_ARGS(e));
++ break;
++
++ case VXH_GET_VX_INFO:
++ case VXH_PUT_VX_INFO:
++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
++ VXH_LOC_ARGS(e),
++ (e->type==VXH_GET_VX_INFO)?"get":"put",
++ VXH_VXI_ARGS(e));
++ break;
++
++ case VXH_INIT_VX_INFO:
++ case VXH_SET_VX_INFO:
++ case VXH_CLR_VX_INFO:
++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
++ VXH_LOC_ARGS(e),
++ (e->type==VXH_INIT_VX_INFO)?"init":
++ ((e->type==VXH_SET_VX_INFO)?"set":"clr"),
++ VXH_VXI_ARGS(e), e->sc.data);
++ break;
++
++ case VXH_CLAIM_VX_INFO:
++ case VXH_RELEASE_VX_INFO:
++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS " @%p\n",
++ VXH_LOC_ARGS(e),
++ (e->type==VXH_CLAIM_VX_INFO)?"claim":"release",
++ VXH_VXI_ARGS(e), e->sc.data);
++ break;
++
++ case VXH_ALLOC_VX_INFO:
++ case VXH_DEALLOC_VX_INFO:
++ printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n",
++ VXH_LOC_ARGS(e),
++ (e->type==VXH_ALLOC_VX_INFO)?"alloc":"dealloc",
++ VXH_VXI_ARGS(e));
++ break;
++
++ case VXH_HASH_VX_INFO:
++ case VXH_UNHASH_VX_INFO:
++ printk( VXH_LOC_FMTS " __%s_vx_info " VXH_VXI_FMTS "\n",
++ VXH_LOC_ARGS(e),
++ (e->type==VXH_HASH_VX_INFO)?"hash":"unhash",
++ VXH_VXI_ARGS(e));
++ break;
++
++ case VXH_LOC_VX_INFO:
++ case VXH_LOOKUP_VX_INFO:
++ case VXH_CREATE_VX_INFO:
++ printk( VXH_LOC_FMTS " __%s_vx_info [#%d] -> " VXH_VXI_FMTS "\n",
++ VXH_LOC_ARGS(e),
++ (e->type==VXH_CREATE_VX_INFO)?"create":
++ ((e->type==VXH_LOC_VX_INFO)?"loc":"lookup"),
++ e->ll.arg, VXH_VXI_ARGS(e));
++ break;
++ }
++}
++
++static void __vxh_dump_history(void)
++{
++ unsigned int i,j;
++
++ printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
++ atomic_read(&sequence), NR_CPUS);
++
++ for (i=0; i < VXH_SIZE; i++) {
++ for (j=0; j < NR_CPUS; j++) {
++ struct _vx_history *hist =
++ &per_cpu(vx_history_buffer, j);
++ unsigned int index = (hist->counter-i) % VXH_SIZE;
++ struct _vx_hist_entry *entry = &hist->entry[index];
++
++ vxh_dump_entry(entry, j);
++ }
++ }
++}
++
++void vxh_dump_history(void)
++{
++ vxh_active = 0;
++#ifdef CONFIG_SMP
++ local_irq_enable();
++ smp_send_stop();
++ local_irq_disable();
++#endif
++ __vxh_dump_history();
++}
++
++
++/* vserver syscall commands below here */
++
++
++int vc_dump_history(uint32_t id)
++{
++ vxh_active = 0;
++ __vxh_dump_history();
++ vxh_active = 1;
++
++ return 0;
++}
++
++EXPORT_SYMBOL_GPL(vxh_advance);
++
+Index: linux-2.6.12/kernel/vserver/init.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/init.c
+@@ -0,0 +1,44 @@
++/*
++ * linux/kernel/init.c
++ *
++ * Virtual Server Init
++ *
++ * Copyright (C) 2004-2005 Herbert Ptzl
++ *
++ * V0.01 basic structure
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/module.h>
++
++int vserver_register_sysctl(void);
++void vserver_unregister_sysctl(void);
++
++
++static int __init init_vserver(void)
++{
++ int ret = 0;
++
++#ifdef CONFIG_VSERVER_DEBUG
++ vserver_register_sysctl();
++#endif
++ return ret;
++}
++
++
++static void __exit exit_vserver(void)
++{
++
++#ifdef CONFIG_VSERVER_DEBUG
++ vserver_unregister_sysctl();
++#endif
++ return;
++}
++
++
++module_init(init_vserver);
++module_exit(exit_vserver);
++
+Index: linux-2.6.12/kernel/vserver/inode.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/inode.c
+@@ -0,0 +1,369 @@
++/*
++ * linux/kernel/vserver/inode.c
++ *
++ * Virtual Server: File System Support
++ *
++ * Copyright (C) 2004-2005 Herbert Ptzl
++ *
++ * V0.01 separated from vcontext V0.05
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/vs_context.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/namei.h>
++#include <linux/mount.h>
++#include <linux/parser.h>
++#include <linux/compat.h>
++#include <linux/vserver/inode.h>
++#include <linux/vserver/inode_cmd.h>
++#include <linux/vserver/xid.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++static int __vc_get_iattr(struct inode *in, uint32_t *xid, uint32_t *flags, uint32_t *mask)
++{
++ struct proc_dir_entry *entry;
++
++ if (!in || !in->i_sb)
++ return -ESRCH;
++
++ *flags = IATTR_XID
++ | (IS_BARRIER(in) ? IATTR_BARRIER : 0)
++ | (IS_IUNLINK(in) ? IATTR_IUNLINK : 0)
++ | (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0);
++ *mask = IATTR_IUNLINK | IATTR_IMMUTABLE;
++
++ if (S_ISDIR(in->i_mode))
++ *mask |= IATTR_BARRIER;
++
++ if (IS_TAGXID(in)) {
++ *xid = in->i_xid;
++ *mask |= IATTR_XID;
++ }
++
++ switch (in->i_sb->s_magic) {
++ case PROC_SUPER_MAGIC:
++ entry = PROC_I(in)->pde;
++
++ /* check for specific inodes? */
++ if (entry)
++ *mask |= IATTR_FLAGS;
++ if (entry)
++ *flags |= (entry->vx_flags & IATTR_FLAGS);
++ else
++ *flags |= (PROC_I(in)->vx_flags & IATTR_FLAGS);
++ break;
++
++ case DEVPTS_SUPER_MAGIC:
++ *xid = in->i_xid;
++ *mask |= IATTR_XID;
++ break;
++
++ default:
++ break;
++ }
++ return 0;
++}
++
++int vc_get_iattr(uint32_t id, void __user *data)
++{
++ struct nameidata nd;
++ struct vcmd_ctx_iattr_v1 vc_data = { .xid = -1 };
++ int ret;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = user_path_walk_link(vc_data.name, &nd);
++ if (!ret) {
++ ret = __vc_get_iattr(nd.dentry->d_inode,
++ &vc_data.xid, &vc_data.flags, &vc_data.mask);
++ path_release(&nd);
++ }
++ if (ret)
++ return ret;
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ ret = -EFAULT;
++ return ret;
++}
++
++#ifdef CONFIG_COMPAT
++
++int vc_get_iattr_x32(uint32_t id, void __user *data)
++{
++ struct nameidata nd;
++ struct vcmd_ctx_iattr_v1_x32 vc_data = { .xid = -1 };
++ int ret;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd);
++ if (!ret) {
++ ret = __vc_get_iattr(nd.dentry->d_inode,
++ &vc_data.xid, &vc_data.flags, &vc_data.mask);
++ path_release(&nd);
++ }
++ if (ret)
++ return ret;
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ ret = -EFAULT;
++ return ret;
++}
++
++#endif /* CONFIG_COMPAT */
++
++
++static int __vc_set_iattr(struct dentry *de, uint32_t *xid, uint32_t *flags, uint32_t *mask)
++{
++ struct inode *in = de->d_inode;
++ int error = 0, is_proc = 0, has_xid = 0;
++ struct iattr attr = { 0 };
++
++ if (!in || !in->i_sb)
++ return -ESRCH;
++
++ is_proc = (in->i_sb->s_magic == PROC_SUPER_MAGIC);
++ if ((*mask & IATTR_FLAGS) && !is_proc)
++ return -EINVAL;
++
++ has_xid = IS_TAGXID(in) ||
++ (in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
++ if ((*mask & IATTR_XID) && !has_xid)
++ return -EINVAL;
++
++ down(&in->i_sem);
++ if (*mask & IATTR_XID) {
++ attr.ia_xid = *xid;
++ attr.ia_valid |= ATTR_XID;
++ }
++
++ if (*mask & IATTR_FLAGS) {
++ struct proc_dir_entry *entry = PROC_I(in)->pde;
++ unsigned int iflags = PROC_I(in)->vx_flags;
++
++ iflags = (iflags & ~(*mask & IATTR_FLAGS))
++ | (*flags & IATTR_FLAGS);
++ PROC_I(in)->vx_flags = iflags;
++ if (entry)
++ entry->vx_flags = iflags;
++ }
++
++ if (*mask & (IATTR_BARRIER | IATTR_IUNLINK | IATTR_IMMUTABLE)) {
++
++ attr.ia_valid |= ATTR_ATTR_FLAG;
++ attr.ia_attr_flags =
++ (IS_IMMUTABLE(in) ? ATTR_FLAG_IMMUTABLE : 0) |
++ (IS_IUNLINK(in) ? ATTR_FLAG_IUNLINK : 0) |
++ (IS_BARRIER(in) ? ATTR_FLAG_BARRIER : 0);
++
++ if (*mask & IATTR_IMMUTABLE) {
++ if (*flags & IATTR_IMMUTABLE)
++ attr.ia_attr_flags |= ATTR_FLAG_IMMUTABLE;
++ else
++ attr.ia_attr_flags &= ~ATTR_FLAG_IMMUTABLE;
++ }
++ if (*mask & IATTR_IUNLINK) {
++ if (*flags & IATTR_IUNLINK)
++ attr.ia_attr_flags |= ATTR_FLAG_IUNLINK;
++ else
++ attr.ia_attr_flags &= ~ATTR_FLAG_IUNLINK;
++ }
++ if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
++ if (*flags & IATTR_BARRIER)
++ attr.ia_attr_flags |= ATTR_FLAG_BARRIER;
++ else
++ attr.ia_attr_flags &= ~ATTR_FLAG_BARRIER;
++ }
++ }
++
++ if (attr.ia_valid) {
++ if (in->i_op && in->i_op->setattr)
++ error = in->i_op->setattr(de, &attr);
++ else {
++ error = inode_change_ok(in, &attr);
++ if (!error)
++ error = inode_setattr(in, &attr);
++ }
++ }
++
++ up(&in->i_sem);
++ return 0;
++}
++
++int vc_set_iattr(uint32_t id, void __user *data)
++{
++ struct nameidata nd;
++ struct vcmd_ctx_iattr_v1 vc_data;
++ int ret;
++
++ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_LINUX_IMMUTABLE))
++ return -EPERM;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = user_path_walk_link(vc_data.name, &nd);
++ if (!ret) {
++ ret = __vc_set_iattr(nd.dentry,
++ &vc_data.xid, &vc_data.flags, &vc_data.mask);
++ path_release(&nd);
++ }
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ ret = -EFAULT;
++ return ret;
++}
++
++#ifdef CONFIG_COMPAT
++
++int vc_set_iattr_x32(uint32_t id, void __user *data)
++{
++ struct nameidata nd;
++ struct vcmd_ctx_iattr_v1_x32 vc_data;
++ int ret;
++
++ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_LINUX_IMMUTABLE))
++ return -EPERM;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ ret = user_path_walk_link(compat_ptr(vc_data.name_ptr), &nd);
++ if (!ret) {
++ ret = __vc_set_iattr(nd.dentry,
++ &vc_data.xid, &vc_data.flags, &vc_data.mask);
++ path_release(&nd);
++ }
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ ret = -EFAULT;
++ return ret;
++}
++
++#endif /* CONFIG_COMPAT */
++
++#ifdef CONFIG_VSERVER_LEGACY
++
++#define PROC_DYNAMIC_FIRST 0xF0000000UL
++
++int vx_proc_ioctl(struct inode * inode, struct file * filp,
++ unsigned int cmd, unsigned long arg)
++{
++ struct proc_dir_entry *entry;
++ int error = 0;
++ int flags;
++
++ if (inode->i_ino < PROC_DYNAMIC_FIRST)
++ return -ENOTTY;
++
++ entry = PROC_I(inode)->pde;
++ if (!entry)
++ return -ENOTTY;
++
++ switch(cmd) {
++ case FIOC_GETXFLG: {
++ /* fixme: if stealth, return -ENOTTY */
++ error = -EPERM;
++ flags = entry->vx_flags;
++ if (capable(CAP_CONTEXT))
++ error = put_user(flags, (int *) arg);
++ break;
++ }
++ case FIOC_SETXFLG: {
++ /* fixme: if stealth, return -ENOTTY */
++ error = -EPERM;
++ if (!capable(CAP_CONTEXT))
++ break;
++ error = -EROFS;
++ if (IS_RDONLY(inode))
++ break;
++ error = -EFAULT;
++ if (get_user(flags, (int *) arg))
++ break;
++ error = 0;
++ entry->vx_flags = flags;
++ break;
++ }
++ default:
++ return -ENOTTY;
++ }
++ return error;
++}
++#endif
++
++
++int vx_parse_xid(char *string, xid_t *xid, int remove)
++{
++ static match_table_t tokens = {
++ {1, "xid=%u"},
++ {0, NULL}
++ };
++ substring_t args[MAX_OPT_ARGS];
++ int token, option = 0;
++
++ if (!string)
++ return 0;
++
++ token = match_token(string, tokens, args);
++ if (token && xid && !match_int(args, &option))
++ *xid = option;
++
++ vxdprintk(VXD_CBIT(xid, 7),
++ "vx_parse_xid(%s): %d:#%d",
++ string, token, option);
++
++ if (token && remove) {
++ char *p = strstr(string, "xid=");
++ char *q = p;
++
++ if (p) {
++ while (*q != '\0' && *q != ',')
++ q++;
++ while (*q)
++ *p++ = *q++;
++ while (*p)
++ *p++ = '\0';
++ }
++ }
++ return token;
++}
++
++void vx_propagate_xid(struct nameidata *nd, struct inode *inode)
++{
++ xid_t new_xid = 0;
++ struct vfsmount *mnt;
++ int propagate;
++
++ if (!nd)
++ return;
++ mnt = nd->mnt;
++ if (!mnt)
++ return;
++
++ propagate = (mnt->mnt_flags & MNT_XID);
++ if (propagate)
++ new_xid = mnt->mnt_xid;
++
++ vxdprintk(VXD_CBIT(xid, 7),
++ "vx_propagate_xid(%p[#%lu.%d]): %d,%d",
++ inode, inode->i_ino, inode->i_xid,
++ new_xid, (propagate)?1:0);
++
++ if (propagate)
++ inode->i_xid = new_xid;
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(vx_propagate_xid);
++
+Index: linux-2.6.12/kernel/vserver/legacy.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/legacy.c
+@@ -0,0 +1,109 @@
++/*
++ * linux/kernel/vserver/legacy.c
++ *
++ * Virtual Server: Legacy Funtions
++ *
++ * Copyright (C) 2001-2003 Jacques Gelinas
++ * Copyright (C) 2003-2005 Herbert Ptzl
++ *
++ * V0.01 broken out from vcontext.c V0.05
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/sched.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/legacy.h>
++#include <linux/vserver/namespace.h>
++#include <linux/namespace.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++
++static int vx_set_initpid(struct vx_info *vxi, int pid)
++{
++ if (vxi->vx_initpid)
++ return -EPERM;
++
++ vxi->vx_initpid = pid;
++ return 0;
++}
++
++int vc_new_s_context(uint32_t ctx, void __user *data)
++{
++ int ret = -ENOMEM;
++ struct vcmd_new_s_context_v1 vc_data;
++ struct vx_info *new_vxi;
++
++ if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ /* legacy hack, will be removed soon */
++ if (ctx == -2) {
++ /* assign flags and initpid */
++ if (!current->vx_info)
++ return -EINVAL;
++ ret = 0;
++ if (vc_data.flags & VX_INFO_INIT)
++ ret = vx_set_initpid(current->vx_info, current->tgid);
++ if (ret == 0) {
++ /* We keep the same vx_id, but lower the capabilities */
++ current->vx_info->vx_bcaps &= (~vc_data.remove_cap);
++ ret = vx_current_xid();
++ current->vx_info->vx_flags |= vc_data.flags;
++ }
++ return ret;
++ }
++
++ if (!vx_check(0, VX_ADMIN) || !capable(CAP_SYS_ADMIN)
++ /* might make sense in the future, or not ... */
++ || vx_flags(VX_INFO_LOCK, 0))
++ return -EPERM;
++
++ /* ugly hack for Spectator */
++ if (ctx == 1) {
++ current->xid = 1;
++ return 0;
++ }
++
++ if (((ctx > MAX_S_CONTEXT) && (ctx != VX_DYNAMIC_ID)) ||
++ (ctx == 0))
++ return -EINVAL;
++
++ if ((ctx == VX_DYNAMIC_ID) || (ctx < MIN_D_CONTEXT))
++ new_vxi = locate_or_create_vx_info(ctx);
++ else
++ new_vxi = locate_vx_info(ctx);
++
++ if (!new_vxi)
++ return -EINVAL;
++
++ ret = -EPERM;
++ if (!vx_info_flags(new_vxi, VXF_STATE_SETUP, 0) &&
++ vx_info_flags(new_vxi, VX_INFO_PRIVATE, 0))
++ goto out_put;
++
++ new_vxi->vx_flags &= ~(VXF_STATE_SETUP|VXF_STATE_INIT);
++
++ ret = vx_migrate_task(current, new_vxi);
++ if (ret == 0) {
++ current->vx_info->vx_bcaps &= (~vc_data.remove_cap);
++ new_vxi->vx_flags |= vc_data.flags;
++ if (vc_data.flags & VX_INFO_INIT)
++ vx_set_initpid(new_vxi, current->tgid);
++ if (vc_data.flags & VX_INFO_NAMESPACE)
++ vx_set_namespace(new_vxi,
++ current->namespace, current->fs);
++ if (vc_data.flags & VX_INFO_NPROC)
++ new_vxi->limit.rlim[RLIMIT_NPROC] =
++ current->signal->rlim[RLIMIT_NPROC].rlim_max;
++ ret = new_vxi->vx_id;
++ }
++out_put:
++ put_vx_info(new_vxi);
++ return ret;
++}
++
+Index: linux-2.6.12/kernel/vserver/legacynet.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/legacynet.c
+@@ -0,0 +1,86 @@
++
++/*
++ * linux/kernel/vserver/legacynet.c
++ *
++ * Virtual Server: Legacy Network Funtions
++ *
++ * Copyright (C) 2001-2003 Jacques Gelinas
++ * Copyright (C) 2003-2005 Herbert Ptzl
++ *
++ * V0.01 broken out from legacy.c
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/sched.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/legacy.h>
++// #include <linux/vserver/namespace.h>
++#include <linux/namespace.h>
++#include <linux/err.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++extern struct nx_info *create_nx_info(void);
++
++/* set ipv4 root (syscall) */
++
++int vc_set_ipv4root(uint32_t nbip, void __user *data)
++{
++ int i, err = -EPERM;
++ struct vcmd_set_ipv4root_v3 vc_data;
++ struct nx_info *new_nxi, *nxi = current->nx_info;
++
++ if (nbip < 0 || nbip > NB_IPV4ROOT)
++ return -EINVAL;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++
++ if (!nxi || nxi->ipv4[0] == 0 || capable(CAP_NET_ADMIN))
++ /* We are allowed to change everything */
++ err = 0;
++ else if (nxi) {
++ int found = 0;
++
++ /* We are allowed to select a subset of the currently
++ installed IP numbers. No new one are allowed
++ We can't change the broadcast address though */
++ for (i=0; i<nbip; i++) {
++ int j;
++ __u32 nxip = vc_data.nx_mask_pair[i].ip;
++ for (j=0; j<nxi->nbipv4; j++) {
++ if (nxip == nxi->ipv4[j]) {
++ found++;
++ break;
++ }
++ }
++ }
++ if ((found == nbip) &&
++ (vc_data.broadcast == nxi->v4_bcast))
++ err = 0;
++ }
++ if (err)
++ return err;
++
++ new_nxi = create_nx_info();
++ if (IS_ERR(new_nxi))
++ return -EINVAL;
++
++ new_nxi->nbipv4 = nbip;
++ for (i=0; i<nbip; i++) {
++ new_nxi->ipv4[i] = vc_data.nx_mask_pair[i].ip;
++ new_nxi->mask[i] = vc_data.nx_mask_pair[i].mask;
++ }
++ new_nxi->v4_bcast = vc_data.broadcast;
++ if (nxi)
++ printk("!!! switching nx_info %p->%p\n", nxi, new_nxi);
++
++ nx_migrate_task(current, new_nxi);
++ put_nx_info(new_nxi);
++ return 0;
++}
++
++
+Index: linux-2.6.12/kernel/vserver/limit.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/limit.c
+@@ -0,0 +1,178 @@
++/*
++ * linux/kernel/vserver/limit.c
++ *
++ * Virtual Server: Context Limits
++ *
++ * Copyright (C) 2004-2005 Herbert Ptzl
++ *
++ * V0.01 broken out from vcontext V0.05
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/switch.h>
++#include <linux/vserver/limit_cmd.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++const char *vlimit_name[NUM_LIMITS] = {
++ [RLIMIT_CPU] = "CPU",
++ [RLIMIT_RSS] = "RSS",
++ [RLIMIT_NPROC] = "NPROC",
++ [RLIMIT_NOFILE] = "NOFILE",
++ [RLIMIT_MEMLOCK] = "VML",
++ [RLIMIT_AS] = "VM",
++ [RLIMIT_LOCKS] = "LOCKS",
++ [RLIMIT_SIGPENDING] = "SIGP",
++ [RLIMIT_MSGQUEUE] = "MSGQ",
++
++ [VLIMIT_NSOCK] = "NSOCK",
++ [VLIMIT_OPENFD] = "OPENFD",
++ [VLIMIT_ANON] = "ANON",
++ [VLIMIT_SHMEM] = "SHMEM",
++};
++
++EXPORT_SYMBOL_GPL(vlimit_name);
++
++
++static int is_valid_rlimit(int id)
++{
++ int valid = 0;
++
++ switch (id) {
++ case RLIMIT_RSS:
++ case RLIMIT_NPROC:
++ case RLIMIT_NOFILE:
++ case RLIMIT_MEMLOCK:
++ case RLIMIT_AS:
++
++ case VLIMIT_NSOCK:
++ case VLIMIT_OPENFD:
++ case VLIMIT_ANON:
++ case VLIMIT_SHMEM:
++ valid = 1;
++ break;
++ }
++ return valid;
++}
++
++static inline uint64_t vc_get_rlim(struct vx_info *vxi, int id)
++{
++ unsigned long limit;
++
++ limit = vxi->limit.rlim[id];
++ if (limit == RLIM_INFINITY)
++ return CRLIM_INFINITY;
++ return limit;
++}
++
++int vc_get_rlimit(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_ctx_rlimit_v0 vc_data;
++
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++ if (!is_valid_rlimit(vc_data.id))
++ return -ENOTSUPP;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ vc_data.maximum = vc_get_rlim(vxi, vc_data.id);
++ vc_data.minimum = CRLIM_UNSET;
++ vc_data.softlimit = CRLIM_UNSET;
++ put_vx_info(vxi);
++
++ if (copy_to_user (data, &vc_data, sizeof(vc_data)))
++ return -EFAULT;
++ return 0;
++}
++
++int vc_set_rlimit(uint32_t id, void __user *data)
++{
++ struct vx_info *vxi;
++ struct vcmd_ctx_rlimit_v0 vc_data;
++
++ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
++ return -EPERM;
++ if (copy_from_user (&vc_data, data, sizeof(vc_data)))
++ return -EFAULT;
++ if (!is_valid_rlimit(vc_data.id))
++ return -ENOTSUPP;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ if (vc_data.maximum != CRLIM_KEEP)
++ vxi->limit.rlim[vc_data.id] = vc_data.maximum;
++ put_vx_info(vxi);
++
++ return 0;
++}
++
++int vc_get_rlimit_mask(uint32_t id, void __user *data)
++{
++ static struct vcmd_ctx_rlimit_mask_v0 mask = {
++ /* minimum */
++ 0
++ , /* softlimit */
++ 0
++ , /* maximum */
++ (1 << RLIMIT_RSS) |
++ (1 << RLIMIT_NPROC) |
++ (1 << RLIMIT_NOFILE) |
++ (1 << RLIMIT_MEMLOCK) |
++ (1 << RLIMIT_LOCKS) |
++ (1 << RLIMIT_AS) |
++ (1 << VLIMIT_ANON) |
++ 0
++ };
++
++ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
++ return -EPERM;
++ if (copy_to_user(data, &mask, sizeof(mask)))
++ return -EFAULT;
++ return 0;
++}
++
++
++void vx_vsi_meminfo(struct sysinfo *val)
++{
++ struct vx_info *vxi = current->vx_info;
++ unsigned long v;
++
++ v = vxi->limit.rlim[RLIMIT_RSS];
++ if (v != RLIM_INFINITY)
++ val->totalram = min(val->totalram, v);
++ v = atomic_read(&vxi->limit.rcur[RLIMIT_RSS]);
++ val->freeram = (v < val->totalram) ? val->totalram - v : 0;
++ val->bufferram = 0;
++ val->totalhigh = 0;
++ val->freehigh = 0;
++ return;
++}
++
++void vx_vsi_swapinfo(struct sysinfo *val)
++{
++ struct vx_info *vxi = current->vx_info;
++ unsigned long v, w;
++
++ v = vxi->limit.rlim[RLIMIT_RSS];
++ w = vxi->limit.rlim[RLIMIT_AS];
++ if (w != RLIM_INFINITY)
++ val->totalswap = min(val->totalswap, w -
++ ((v != RLIM_INFINITY) ? v : 0));
++ w = atomic_read(&vxi->limit.rcur[RLIMIT_AS]);
++ val->freeswap = (w < val->totalswap) ? val->totalswap - w : 0;
++ return;
++}
++
+Index: linux-2.6.12/kernel/vserver/limit_init.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/limit_init.h
+@@ -0,0 +1,28 @@
++
++static inline void vx_info_init_limit(struct _vx_limit *limit)
++{
++ int lim;
++
++ for (lim=0; lim<NUM_LIMITS; lim++) {
++ limit->rlim[lim] = RLIM_INFINITY;
++ limit->rmax[lim] = 0;
++ atomic_set(&limit->rcur[lim], 0);
++ atomic_set(&limit->lhit[lim], 0);
++ }
++}
++
++static inline void vx_info_exit_limit(struct _vx_limit *limit)
++{
++#ifdef CONFIG_VSERVER_DEBUG
++ unsigned long value;
++ unsigned int lim;
++
++ for (lim=0; lim<NUM_LIMITS; lim++) {
++ value = atomic_read(&limit->rcur[lim]);
++ vxwprintk(value,
++ "!!! limit: %p[%s,%d] = %ld on exit.",
++ limit, vlimit_name[lim], lim, value);
++ }
++#endif
++}
++
+Index: linux-2.6.12/kernel/vserver/limit_proc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/limit_proc.h
+@@ -0,0 +1,58 @@
++#ifndef _VX_LIMIT_PROC_H
++#define _VX_LIMIT_PROC_H
++
++
++static inline void vx_limit_fixup(struct _vx_limit *limit)
++{
++ unsigned long value;
++ unsigned int lim;
++
++ for (lim=0; lim<NUM_LIMITS; lim++) {
++ value = atomic_read(&limit->rcur[lim]);
++ if (value > limit->rmax[lim])
++ limit->rmax[lim] = value;
++ if (limit->rmax[lim] > limit->rlim[lim])
++ limit->rmax[lim] = limit->rlim[lim];
++ }
++}
++
++#define VX_LIMIT_FMT ":\t%10d\t%10ld\t%10ld\t%6d\n"
++
++#define VX_LIMIT_ARG(r) \
++ ,atomic_read(&limit->rcur[r]) \
++ ,limit->rmax[r] \
++ ,limit->rlim[r] \
++ ,atomic_read(&limit->lhit[r])
++
++static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
++{
++ vx_limit_fixup(limit);
++ return sprintf(buffer,
++ "PROC" VX_LIMIT_FMT
++ "VM" VX_LIMIT_FMT
++ "VML" VX_LIMIT_FMT
++ "RSS" VX_LIMIT_FMT
++ "ANON" VX_LIMIT_FMT
++ "FILES" VX_LIMIT_FMT
++ "OFD" VX_LIMIT_FMT
++ "LOCKS" VX_LIMIT_FMT
++ "SOCK" VX_LIMIT_FMT
++ "MSGQ" VX_LIMIT_FMT
++ "SHM" VX_LIMIT_FMT
++ VX_LIMIT_ARG(RLIMIT_NPROC)
++ VX_LIMIT_ARG(RLIMIT_AS)
++ VX_LIMIT_ARG(RLIMIT_MEMLOCK)
++ VX_LIMIT_ARG(RLIMIT_RSS)
++ VX_LIMIT_ARG(VLIMIT_ANON)
++ VX_LIMIT_ARG(RLIMIT_NOFILE)
++ VX_LIMIT_ARG(VLIMIT_OPENFD)
++ VX_LIMIT_ARG(RLIMIT_LOCKS)
++ VX_LIMIT_ARG(VLIMIT_NSOCK)
++ VX_LIMIT_ARG(RLIMIT_MSGQUEUE)
++ VX_LIMIT_ARG(VLIMIT_SHMEM)
++ );
++}
++
++#endif /* _VX_LIMIT_PROC_H */
++
++
+Index: linux-2.6.12/kernel/vserver/namespace.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/namespace.c
+@@ -0,0 +1,124 @@
++/*
++ * linux/kernel/vserver/namespace.c
++ *
++ * Virtual Server: Context Namespace Support
++ *
++ * Copyright (C) 2003-2005 Herbert Ptzl
++ *
++ * V0.01 broken out from context.c 0.07
++ * V0.02 added task locking for namespace
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/utsname.h>
++#include <linux/sched.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/namespace.h>
++#include <linux/vserver/namespace_cmd.h>
++#include <linux/dcache.h>
++#include <linux/mount.h>
++#include <linux/fs.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++/* namespace functions */
++
++#include <linux/namespace.h>
++
++int vx_set_namespace(struct vx_info *vxi, struct namespace *ns, struct fs_struct *fs)
++{
++ struct fs_struct *fs_copy;
++
++ if (vxi->vx_namespace)
++ return -EPERM;
++ if (!ns || !fs)
++ return -EINVAL;
++
++ fs_copy = copy_fs_struct(fs);
++ if (!fs_copy)
++ return -ENOMEM;
++
++ get_namespace(ns);
++ vxi->vx_namespace = ns;
++ vxi->vx_fs = fs_copy;
++ return 0;
++}
++
++int vc_enter_namespace(uint32_t id, void *data)
++{
++ struct vx_info *vxi;
++ struct fs_struct *old_fs, *fs;
++ struct namespace *old_ns;
++ int ret = 0;
++
++ if (!vx_check(0, VX_ADMIN))
++ return -ENOSYS;
++
++ vxi = locate_vx_info(id);
++ if (!vxi)
++ return -ESRCH;
++
++ ret = -EINVAL;
++ if (!vxi->vx_namespace)
++ goto out_put;
++
++ ret = -ENOMEM;
++ fs = copy_fs_struct(vxi->vx_fs);
++ if (!fs)
++ goto out_put;
++
++ ret = 0;
++ task_lock(current);
++ old_ns = current->namespace;
++ old_fs = current->fs;
++ get_namespace(vxi->vx_namespace);
++ current->namespace = vxi->vx_namespace;
++ current->fs = fs;
++ task_unlock(current);
++
++ put_namespace(old_ns);
++ put_fs_struct(old_fs);
++out_put:
++ put_vx_info(vxi);
++ return ret;
++}
++
++int vc_cleanup_namespace(uint32_t id, void *data)
++{
++ down_write(&current->namespace->sem);
++ spin_lock(&vfsmount_lock);
++ umount_unused(current->namespace->root, current->fs);
++ spin_unlock(&vfsmount_lock);
++ up_write(&current->namespace->sem);
++ return 0;
++}
++
++int vc_set_namespace(uint32_t id, void __user *data)
++{
++ struct fs_struct *fs;
++ struct namespace *ns;
++ struct vx_info *vxi;
++ int ret;
++
++ if (vx_check(0, VX_ADMIN|VX_WATCH))
++ return -ENOSYS;
++
++ task_lock(current);
++ vxi = get_vx_info(current->vx_info);
++ fs = current->fs;
++ atomic_inc(&fs->count);
++ ns = current->namespace;
++ get_namespace(current->namespace);
++ task_unlock(current);
++
++ ret = vx_set_namespace(vxi, ns, fs);
++
++ put_namespace(ns);
++ put_fs_struct(fs);
++ put_vx_info(vxi);
++ return ret;
++}
++
+Index: linux-2.6.12/kernel/vserver/network.c
+===================================================================
+--- /dev/null
++++ linux-2.6.12/kernel/vserver/network.c
+@@ -0,0 +1,757 @@
++/*
++ * linux/kernel/vserver/network.c
++ *
++ * Virtual Server: Network Support
++ *
++ * Copyright (C) 2003-2005 Herbert Ptzl
++ *
++ * V0.01 broken out from vcontext V0.05
++ * V0.02 cleaned up implementation
++ * V0.03 added equiv nx commands
++ * V0.04 switch to RCU based hash
++ * V0.05 and back to locking again
++ *
++ */
++
++#include <linux/config.h>
++#include <linux/slab.h>
++#include <linux/vserver/network_cmd.h>
++#include <linux/rcupdate.h>
++#include <net/tcp.h>
++
++#include <asm/errno.h>
++
++
++/* __alloc_nx_info()
++
++ * allocate an initialized nx_info struct
++ * doesn't make it visible (hash) */
++
++static struct nx_info *__alloc_nx_info(nid_t nid)
++{
++ struct nx_info *new = NULL;
++
++ vxdprintk(VXD_CBIT(nid, 1), "alloc_nx_info(%d)*", nid);
++
++ /* would this benefit from a slab cache? */
++ new = kmalloc(sizeof(struct nx_info), GFP_KERNEL);
++ if (!new)
++ return 0;
++
++ memset (new, 0, sizeof(struct nx_info));
++ new->nx_id = nid;
++ INIT_HLIST_NODE(&new->nx_hlist);
++ atomic_set(&new->nx_usecnt, 0);
++ atomic_set(&new->nx_tasks, 0);
++ new->nx_state = 0;
++
++ new->nx_flags = NXF_INIT_SET;
++
++ /* rest of init goes here */
++
++ vxdprintk(VXD_CBIT(nid, 0),
++ "alloc_nx_info(%d) = %p", nid, new);
++ return new;
++}
++
++/* __dealloc_nx_info()
++
++ * final disposal of nx_info */
++
++static void __dealloc_nx_info(struct nx_info *nxi)
++{
++ vxdprintk(VXD_CBIT(nid, 0),
++ "dealloc_nx_info(%p)", nxi);
++
++ nxi->nx_hlist.next = LIST_POISON1;
++ nxi->nx_id = -1;
++
++ BUG_ON(atomic_read(&nxi->nx_usecnt));
++ BUG_ON(atomic_read(&nxi->nx_tasks));
++
++ nxi->nx_state |= NXS_RELEASED;
++ kfree(nxi);
++}
++
++static void __shutdown_nx_info(struct nx_info *nxi)
++{
++ nxi->nx_state |= NXS_SHUTDOWN;
++ vs_net_change(nxi, VSC_NETDOWN);
++}
++
++/* exported stuff */
++
++void free_nx_info(struct nx_info *nxi)
++{
++ /* context shutdown is mandatory */
++ BUG_ON(nxi->nx_state != NXS_SHUTDOWN);
++
++ /* context must not be hashed */
++ BUG_ON(nxi->nx_state & NXS_HASHED);
++
++ BUG_ON(atomic_read(&nxi->nx_usecnt));
++ BUG_ON(atomic_