main/linux-vserver: temp commit

9 files changed, 102346 insertions, 1699 deletions

diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 2939f7cf7..24c8fa9b9 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,9 +2,9 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=3.6.11
-pkgrel=3
-_vsver=vs2.3.4.6
+pkgver=3.4.45
+pkgrel=0
+_vsver=vs2.3.3.9
 
 if [ "${pkgver##*.*.*}" = "$pkgver" ]; then
 	_kernver=$pkgver
@@ -21,7 +21,6 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
 	http://www.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
-	patch-3.6.11-al4.patch
 	patch-$pkgver-$_vsver.diff
 	kernelconfig.x86
 	kernelconfig.x86_64
@@ -136,21 +135,18 @@ dev() {
 		"$subpkgdir"/lib/modules/${_abi_release}/build
 }
 
-md5sums="1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-bd4bba74093405887d521309a74c19e9  patch-3.6.11.xz
-fa0ca65fb8e9f9d08c04f06ae5c316ec  patch-3.6.11-al4.patch
-27809872b8bc0dffce4e383d68d1c989  patch-3.6.11-vs2.3.4.6.diff
-b28263bb0d529a80d4f13fbdd76520b2  kernelconfig.x86
-1e9e12d5bd63552127331b875a554992  kernelconfig.x86_64"
-sha256sums="4ab9a6ef1c1735713f9f659d67f92efa7c1dfbffb2a2ad544005b30f9791784f  linux-3.6.tar.xz
-4bdc3822571a4a765bf6f347aad8b899730acef549ae4236813fd17f254f4327  patch-3.6.11.xz
-897ed38d778dfd76256f065f81ad02f16d126dc2e67631253520b8fe0685b444  patch-3.6.11-al4.patch
-31184cf84567765be061a8ad43e82c7a24e2dadbb514c6e42a19d750118658f2  patch-3.6.11-vs2.3.4.6.diff
-596d797f0e57414d3a887bcb1f302f5831e148d486eb82bc3c871710691af4c4  kernelconfig.x86
-ee8bdb887f8890f1a3457267b8595b3f61043bae0feb86933870d2c6f9139b82  kernelconfig.x86_64"
-sha512sums="6e3354184d1799228a2d33b92e4a6b743cc24352b8ccc1fd487fab07ab97be2aa03ba87b8406a177581692db1fd40674fbd4e213a782cbe0a6a969b10c4c17a1  linux-3.6.tar.xz
-08423f145ee7aef49f50d95032595ee79250135b6ecfa72f802502a277f215b63c4dc04ed149fe4ed7cdaa5ef063b8003b7f72f41d8417e45efbe7e30e621387  patch-3.6.11.xz
-477ee6c8bdf8884355efafc29e58810c097a4b1e3ecd84890bf582cf513510266d85a26e38d05ae463429ccfe9dd84cedc2fb1ed0a5fcf662a8a489ca30e6495  patch-3.6.11-al4.patch
-23acb52b46175dc3de27cdf1cde620190f32d77e1b3bb1169efd83f6e8a307113e7b08bc1e0652ad080ff5af25262c972368ac4871bba10c1122732e51f9b186  patch-3.6.11-vs2.3.4.6.diff
-ea766a9c24aba7320f57d9afa51f64e45de31ef38f19f4144994b22cae92689c2f7351cb31646123b1aedd1f2a65ccf84f2261e65cb7586bd8e21c3c0cd15b26  kernelconfig.x86
-440ac34e9fac04d5b7a417ad49e05c80ab19f9828b61a2dd4491a79da2ac0764dfbf9f0d854e56213e7fe2899af9e81a73d1c62ef599096fbce38688ddfc130a  kernelconfig.x86_64"
+md5sums="967f72983655e2479f951195953e8480  linux-3.4.tar.xz
+adb183c04b48eb1276abcae46858dc29  patch-3.4.45.xz
+45c7f894c242dfb02c9d9485b252a98f  patch-3.4.45-vs2.3.3.9.diff
+649127b1069b08ef21e1a7715c7cb705  kernelconfig.x86
+ff92bfcd41969fd521cb7c69625fa950  kernelconfig.x86_64"
+sha256sums="ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6  linux-3.4.tar.xz
+1eee23dc5a2f6a2448030e4d89e8d2883037c10cfd38eb1d59ee1d8848202ca4  patch-3.4.45.xz
+ab0de3bf5e4c381fb55d7494426bbf4a32a56d5002e6cf99c8a9451e4b0a0a6e  patch-3.4.45-vs2.3.3.9.diff
+35737c48772d202b6ce4b5c7271aaa16b60c7eb753cac2d8d51725729c1a6d77  kernelconfig.x86
+8dc1cb9cb72de54fedb7148c934b1915220baa78d3a40e21548ad550372e624a  kernelconfig.x86_64"
+sha512sums="1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c  linux-3.4.tar.xz
+3a7abeae48a6731d76165071f76e83f67a88705de0f6fef88d1dd901e50e8776406d610256aab91f2650176f46ec3fef6e25196c9b25b969b8ba0293728d0b36  patch-3.4.45.xz
+8c3b9d0d93abdd9821595a849a7fae070147ed5013e2b6f31e8a659642586affef5f038fbed5696e447e145a5b0c2a339e7a2479b8579ea953766b9b712df8be  patch-3.4.45-vs2.3.3.9.diff
+7c9187f9a6791f15123ccc4ae5eadd2a9446d5286eba0c06aa6d0406e577ca034dfe338ac1c287f3eda6504584228bd3440ae55e9518e8fc1c6fd490717ef474  kernelconfig.x86
+4cae6988c0b00e959db25f4f68f650460fa6a9f155af8ea88a840571f5d8ccadeef1e4ba93be7ca547b9819e710a223f4ed9222698c714ef552d78b4473f233f  kernelconfig.x86_64"
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index a445394dd..e5bac84a7 100644
--- a/main/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
@@ -22,7 +22,9 @@ CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -114,7 +116,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TREE_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
@@ -129,7 +130,9 @@ CONFIG_CGROUP_DEVICE=y
 # CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -144,6 +147,7 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -182,6 +186,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
@@ -209,7 +214,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -313,6 +317,11 @@ CONFIG_FREEZER=y
 # Processor type and features
 #
 CONFIG_ZONE_DMA=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_BIGSMP=y
@@ -489,8 +498,6 @@ CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -572,7 +579,6 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -616,23 +622,7 @@ CONFIG_ALIX=y
 # CONFIG_NET5501 is not set
 # CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_PCCARD is not set
 CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
@@ -665,7 +655,6 @@ CONFIG_PACKET=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
@@ -695,7 +684,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -789,7 +777,6 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -810,7 +797,6 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -971,6 +957,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1043,6 +1030,7 @@ CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1074,11 +1062,11 @@ CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
 CONFIG_X25=m
 CONFIG_LAPB=m
+# CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
+# CONFIG_PHONET is not set
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1102,8 +1090,6 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_PLUG=m
 
@@ -1129,7 +1115,6 @@ CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
@@ -1236,14 +1221,9 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
-# CONFIG_BT_HCIUART_3WIRE is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
@@ -1263,11 +1243,11 @@ CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1284,7 +1264,6 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1395,8 +1374,6 @@ CONFIG_MTD_SCB2_FLASH=m
 CONFIG_MTD_NETtel=m
 CONFIG_MTD_L440GX=m
 CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
 # CONFIG_MTD_GPIO_ADDR is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
@@ -1471,12 +1448,12 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 # CONFIG_PARPORT_PC_FIFO is not set
 # CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_AX88796=m
 # CONFIG_PARPORT_1284 is not set
@@ -1551,8 +1528,7 @@ CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
+CONFIG_BMP085=m
 CONFIG_PCH_PHUB=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 CONFIG_C2PORT=m
@@ -1570,6 +1546,9 @@ CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1581,7 +1560,6 @@ CONFIG_SENSORS_LIS3_I2C=m
 # Altera FPGA firmware download module
 #
 # CONFIG_ALTERA_STAPL is not set
-# CONFIG_INTEL_MEI is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1611,6 +1589,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1705,7 +1684,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1822,7 +1800,6 @@ CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PLATFORM=m
 CONFIG_PATA_RZ1000=m
 
@@ -1851,6 +1828,7 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1869,7 +1847,6 @@ CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1905,14 +1882,10 @@ CONFIG_EQUALIZER=m
 CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -1934,7 +1907,6 @@ CONFIG_ARCNET_COM90xxIO=m
 CONFIG_ARCNET_RIM_I=m
 CONFIG_ARCNET_COM20020=m
 CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
 CONFIG_ATM_DRIVERS=y
 CONFIG_ATM_DUMMY=m
 CONFIG_ATM_TCP=m
@@ -1972,8 +1944,6 @@ CONFIG_ATM_SOLOS=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -1984,7 +1954,6 @@ CONFIG_ACENIC=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -2023,7 +1992,6 @@ CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_DE600=m
 CONFIG_DE620=m
@@ -2036,8 +2004,6 @@ CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
@@ -2046,13 +2012,10 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGB_DCA=y
-# CONFIG_IGB_PTP is not set
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
-# CONFIG_IXGBE_PTP is not set
 # CONFIG_IXGBEVF is not set
 CONFIG_NET_VENDOR_I825XX=y
 # CONFIG_ZNET is not set
@@ -2084,9 +2047,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -2122,7 +2083,6 @@ CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
@@ -2146,14 +2106,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -2176,7 +2128,6 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -2204,6 +2155,7 @@ CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_TR is not set
 
 #
 # USB Network Adapters
@@ -2238,22 +2190,17 @@ CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_NET_QMI_WWAN=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
 CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
@@ -2275,6 +2222,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DFS_CERTIFIED is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2290,7 +2238,6 @@ CONFIG_B43=m
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
@@ -2316,7 +2263,6 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG is not set
@@ -2329,7 +2275,6 @@ CONFIG_IPW2200_QOS=y
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
 
 #
 # Debugging Options
@@ -2345,9 +2290,10 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_DEBUG is not set
@@ -2358,8 +2304,6 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -2375,7 +2319,6 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 # CONFIG_RT2800PCI_RT35XX is not set
 CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -2398,28 +2341,27 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
 
 #
 # WiMAX Wireless Broadband devices
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_WAN=y
 CONFIG_LANMEDIA=m
@@ -2449,56 +2391,7 @@ CONFIG_SBNI=m
 CONFIG_SBNI_MULTILINE=y
 CONFIG_VMXNET3=m
 CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-CONFIG_ISDN_CAPI=m
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
+# CONFIG_ISDN is not set
 
 #
 # Input device support
@@ -2507,7 +2400,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_MATRIXKMAP is not set
 
 #
 # Userland interfaces
@@ -2536,7 +2428,6 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
@@ -2585,15 +2476,12 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2603,6 +2491,7 @@ CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_MC13783 is not set
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2633,6 +2522,7 @@ CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 # CONFIG_INPUT_BMA150 is not set
 CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_MC13783_PWRBUTTON is not set
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
@@ -2709,7 +2599,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -2783,6 +2672,7 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2875,7 +2765,6 @@ CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=y
 CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_PCI=m
@@ -2915,7 +2804,6 @@ CONFIG_GPIO_MAX730X=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
 CONFIG_GPIO_VX855=m
 
 #
@@ -2931,8 +2819,7 @@ CONFIG_GPIO_ADP5588=m
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_BT8XX=m
-CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_LANGWELL is not set
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
@@ -2974,7 +2861,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
-# CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3015,7 +2901,6 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
-# CONFIG_SENSORS_HIH6130 is not set
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -3082,7 +2967,6 @@ CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_INA2XX is not set
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP401=m
@@ -3102,6 +2986,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
+# CONFIG_SENSORS_MC13783_ADC is not set
 
 #
 # ACPI drivers
@@ -3131,7 +3016,6 @@ CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
@@ -3176,8 +3060,6 @@ CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
@@ -3199,7 +3081,6 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
-# CONFIG_MFD_LM3533 is not set
 # CONFIG_TPS6105X is not set
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
@@ -3208,515 +3089,25 @@ CONFIG_TPS6507X=m
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM8400=m
 # CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
 CONFIG_ABX500_CORE=y
 # CONFIG_EZX_PCAP is not set
+# CONFIG_AB8500_CORE is not set
 CONFIG_MFD_CS5535=m
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_VX855=m
 CONFIG_MFD_WL1273_CORE=m
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-
-#
-# Media drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-# CONFIG_LIRC is not set
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-# CONFIG_VIDEO_SR030PC30 is not set
-CONFIG_VIDEO_NOON010PC30=m
-# CONFIG_VIDEO_M5MOLS is not set
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_AS3645A is not set
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_V4L_USB_DRIVERS=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-# CONFIG_USB_GSPCA_SQ930X is not set
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-
-#
-# Webcam and/or TV USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-# CONFIG_SMS_USB_DRV is not set
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -3760,14 +3151,10 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 # CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_STUB_POULSBO is not set
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3878,7 +3265,6 @@ CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
-# CONFIG_FB_AUO_K190X is not set
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3896,7 +3282,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_APPLE is not set
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
@@ -3967,7 +3352,6 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -4014,9 +3398,7 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
@@ -4026,6 +3408,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INPUT_JACK=y
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -4077,14 +3460,10 @@ CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_WM_HUBS=m
-CONFIG_SND_SOC_AB8500_CODEC=m
 CONFIG_SND_SOC_AD1836=m
 CONFIG_SND_SOC_AD193X=m
 CONFIG_SND_SOC_AD73311=m
@@ -4099,7 +3478,6 @@ CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
@@ -4107,10 +3485,7 @@ CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_JZ4740_CODEC=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_DA7210=m
-CONFIG_SND_SOC_DA732X=m
 CONFIG_SND_SOC_DFBMCS320=m
-CONFIG_SND_SOC_ISABELLE=m
-CONFIG_SND_SOC_LM49453=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX9850=m
@@ -4120,7 +3495,6 @@ CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA529=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC26=m
 CONFIG_SND_SOC_TLV320AIC32X4=m
@@ -4133,6 +3507,7 @@ CONFIG_SND_SOC_WM1250_EV1=m
 CONFIG_SND_SOC_WM2000=m
 CONFIG_SND_SOC_WM2200=m
 CONFIG_SND_SOC_WM5100=m
+CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8580=m
@@ -4172,19 +3547,25 @@ CONFIG_SND_SOC_WM9090=m
 CONFIG_SND_SOC_LM4857=m
 CONFIG_SND_SOC_MAX9768=m
 CONFIG_SND_SOC_MAX9877=m
-CONFIG_SND_SOC_ML26124=m
 CONFIG_SND_SOC_TPA6130A2=m
-CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
 
 #
-# HID support
+# USB Input Devices
 #
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
 
 #
 # Special HID drivers
@@ -4192,7 +3573,6 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
 CONFIG_HID_APPLE=m
-# CONFIG_HID_AUREAL is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
@@ -4211,7 +3591,6 @@ CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
 CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
 # CONFIG_HID_LOGITECH is not set
 CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MICROSOFT is not set
@@ -4243,19 +3622,6 @@ CONFIG_HID_HYPERV_MOUSE=m
 # CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_ZEROPLUS is not set
 CONFIG_HID_ZYDACRON=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4269,11 +3635,12 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
 
@@ -4301,12 +3668,7 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB Device Class drivers
@@ -4338,7 +3700,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -4406,7 +3767,6 @@ CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
 CONFIG_USB_SERIAL_ZIO=m
 # CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -4433,11 +3793,6 @@ CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 # CONFIG_USB_YUREX is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_ISP1301 is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -4451,10 +3806,7 @@ CONFIG_USB_XUSBATM=m
 CONFIG_USB_OTG_UTILS=y
 CONFIG_USB_GPIO_VBUS=m
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
+# CONFIG_UWB is not set
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
@@ -4519,17 +3871,15 @@ CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
+# CONFIG_LEDS_MC13783 is not set
 # CONFIG_LEDS_TCA6507 is not set
-CONFIG_LEDS_LM3556=m
 # CONFIG_LEDS_OT200 is not set
-CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4538,7 +3888,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_ACCESSIBILITY=y
 # CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_INFINIBAND=m
@@ -4556,7 +3905,6 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
-# CONFIG_INFINIBAND_OCRDMA is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -4637,6 +3985,7 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 # on-CPU RTC drivers
 #
+# CONFIG_RTC_DRV_MC13XXX is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -4670,9 +4019,6 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 # CONFIG_UIO_PCI_GENERIC is not set
 CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_RING=m
 
@@ -4682,7 +4028,6 @@ CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -4692,10 +4037,7 @@ CONFIG_HYPERV_UTILS=m
 CONFIG_STAGING=y
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
+# CONFIG_USBIP_CORE is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
@@ -4704,11 +4046,7 @@ CONFIG_USBIP_HOST=m
 # CONFIG_PANEL is not set
 # CONFIG_R8187SE is not set
 # CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
+# CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
 # CONFIG_RTS_PSTOR is not set
 # CONFIG_RTS5139 is not set
@@ -4716,12 +4054,14 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
+# CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
+# CONFIG_IIO is not set
+# CONFIG_ZRAM is not set
 # CONFIG_ZSMALLOC is not set
-# CONFIG_WLAGS49_H2 is not set
-# CONFIG_WLAGS49_H25 is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
 # CONFIG_CXT1E1 is not set
@@ -4738,6 +4078,7 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_INTEL_MEI is not set
 # CONFIG_STAGING_MEDIA is not set
 
 #
@@ -4825,16 +4166,6 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 #
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
 
 #
 # Firmware Drivers
@@ -4992,9 +4323,11 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_JFFS2_CMODE_SIZE is not set
 # CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
@@ -5017,8 +4350,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -5028,11 +4359,9 @@ CONFIG_EXOFS_FS=m
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
+CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4=y
 # CONFIG_NFS_V4_1 is not set
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5107,17 +4436,6 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
@@ -5133,7 +4451,6 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -5146,8 +4463,6 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
@@ -5193,7 +4508,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_LKDTM is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -5270,7 +4585,6 @@ CONFIG_VSERVER_CONTEXTS=256
 CONFIG_VSERVER_WARN=y
 CONFIG_VSERVER_WARN_DEVPTS=y
 # CONFIG_VSERVER_DEBUG is not set
-# CONFIG_VSERVER_EXTRA_MNT_CHECK is not set
 CONFIG_QUOTES_ISO8859=y
 # CONFIG_QUOTES_UTF8 is not set
 # CONFIG_QUOTES_ASCII is not set
@@ -5333,8 +4647,6 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5448,8 +4760,6 @@ CONFIG_TCM_VHOST=m
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -5487,8 +4797,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
@@ -5502,8 +4810,6 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
-CONFIG_DDR=y
diff --git a/main/linux-vserver/kernelconfig.x86.orig b/main/linux-vserver/kernelconfig.x86.orig
new file mode 100644
index 000000000..a445394dd
--- /dev/null
+++ b/main/linux-vserver/kernelconfig.x86.orig
@@ -0,0 +1,5509 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.6.10-vs2.3.4.6 Kernel Configuration
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_32_LAZY_GS=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+# CONFIG_CPUSETS is not set
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_MEMCG is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+# CONFIG_JUMP_LABEL is not set
+CONFIG_OPTPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+CONFIG_X86_BIGSMP=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+CONFIG_X86_WANT_INTEL_MID=y
+# CONFIG_X86_MDFLD is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_32_NON_STANDARD is not set
+# CONFIG_X86_32_IRIS is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_PARAVIRT_GUEST=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
+# CONFIG_LGUEST_GUEST is not set
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_XADD=y
+# CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_DEBUGCTLMSR=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_NR_CPUS=32
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+# CONFIG_X86_MCE is not set
+CONFIG_VM86=y
+# CONFIG_TOSHIBA is not set
+CONFIG_I8K=m
+# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
+CONFIG_NEED_NODE_MEMMAP_SIZE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
+# CONFIG_HIGHPTE is not set
+# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+# CONFIG_EFI is not set
+# CONFIG_SECCOMP is not set
+# CONFIG_CC_STACKPROTECTOR is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=m
+CONFIG_ACPI_APEI=y
+# CONFIG_ACPI_APEI_GHES is not set
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=y
+# CONFIG_SFI is not set
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_STAT=m
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# x86 CPU frequency scaling drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+# CONFIG_X86_POWERNOW_K6 is not set
+# CONFIG_X86_POWERNOW_K7 is not set
+CONFIG_X86_POWERNOW_K8=m
+# CONFIG_X86_GX_SUSPMOD is not set
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+# CONFIG_X86_SPEEDSTEP_ICH is not set
+# CONFIG_X86_SPEEDSTEP_SMI is not set
+CONFIG_X86_P4_CLOCKMOD=m
+# CONFIG_X86_CPUFREQ_NFORCE2 is not set
+# CONFIG_X86_LONGRUN is not set
+# CONFIG_X86_LONGHAUL is not set
+# CONFIG_X86_E_POWERSAVER is not set
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_INTEL_IDLE=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_CNB20LE_QUIRK=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=m
+# CONFIG_PCIEAER is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+# CONFIG_PCI_IOV is not set
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_SCx200 is not set
+# CONFIG_OLPC is not set
+CONFIG_ALIX=y
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI_FAKE=m
+# CONFIG_HOTPLUG_PCI_COMPAQ is not set
+# CONFIG_HOTPLUG_PCI_IBM is not set
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+# CONFIG_IP_PIMSM_V1 is not set
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_NET_DCCPPROBE is not set
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+CONFIG_SCTP_HMAC_SHA1=y
+# CONFIG_SCTP_HMAC_MD5 is not set
+CONFIG_RDS=m
+# CONFIG_RDS_RDMA is not set
+# CONFIG_RDS_TCP is not set
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_DECNET=m
+CONFIG_DECNET_ROUTER=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_WAN_ROUTER=m
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+# CONFIG_TOSHIBA_FIR is not set
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+# CONFIG_BT_HCIUART_3WIRE is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
+CONFIG_MAC80211_RC_DEFAULT="pid"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL_INPUT is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+# CONFIG_NFC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER=m
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+CONFIG_DEBUG_DEVRES=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_CMA is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_HAVE_MTD_OTP=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_LATCH_ADDR is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+CONFIG_MTD_M25P80=m
+CONFIG_M25PXX_USE_FAST_READ=y
+# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
+# CONFIG_MTD_DOCG3 is not set
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
+# CONFIG_MTD_DOCPROBE_HIGH is not set
+# CONFIG_MTD_DOCPROBE_55AA is not set
+CONFIG_MTD_NAND_ECC=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
+CONFIG_MTD_SM_COMMON=m
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_CS553X is not set
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_ONENAND=m
+# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
+# CONFIG_MTD_ONENAND_GENERIC is not set
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+# CONFIG_PARPORT_1284 is not set
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_VROOT=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_UB=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_RBD is not set
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+# CONFIG_INTEL_MID_PTI is not set
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_TI_DAC7512=m
+CONFIG_VMWARE_BALLOON=m
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+CONFIG_PCH_PHUB=m
+# CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_INTEL_MEI is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
+CONFIG_AIC79XX_DEBUG_ENABLE=y
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_DEBUG=y
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+# CONFIG_SCSI_NSP32 is not set
+CONFIG_SCSI_DEBUG=m
+# CONFIG_SCSI_PMCRAID is not set
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+# CONFIG_SCSI_BFA_FC is not set
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+# CONFIG_PATA_CS5535 is not set
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_UEVENT is not set
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_MII=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_AT86RF230 is not set
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_CALXEDA_XGMAC=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+# CONFIG_IGB_PTP is not set
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+# CONFIG_IXGBE_PTP is not set
+# CONFIG_IXGBEVF is not set
+CONFIG_NET_VENDOR_I825XX=y
+# CONFIG_ZNET is not set
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_SEEQ8005=m
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_PCI is not set
+# CONFIG_STMMAC_DEBUG_FS is not set
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_RING=y
+# CONFIG_STMMAC_CHAINED is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+CONFIG_ATH6KL_DEBUG=y
+CONFIG_B43=m
+CONFIG_B43_SSB=y
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+# CONFIG_BRCMFMAC is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_P2P is not set
+# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+# CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_WANXL_BUILD_FIRMWARE is not set
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+CONFIG_DSCC4_PCI_RST=y
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_SBNI=m
+CONFIG_SBNI_MULTILINE=y
+CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+# CONFIG_ISDN_I4L is not set
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_CAPI_TRACE is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+# CONFIG_MISDN_SPEEDFAX is not set
+# CONFIG_MISDN_INFINEON is not set
+# CONFIG_MISDN_W6692 is not set
+# CONFIG_MISDN_NETJET is not set
+CONFIG_MISDN_IPAC=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+# CONFIG_INPUT_MATRIXKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+# CONFIG_INPUT_BMA150 is not set
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_WISTRON_BTNS is not set
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_STALDRV=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX3107=m
+CONFIG_SERIAL_MRST_MAX3110=m
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_IFX6X60=m
+CONFIG_SERIAL_PCH_UART=m
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+# CONFIG_SONYPI is not set
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+CONFIG_I2C_EG20T=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_SCx200_ACB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=y
+CONFIG_SPI_TOPCLIFF_PCH=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_BT8XX=m
+CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_LANGWELL is not set
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_TIMBERDALE=y
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MCP23S08=m
+# CONFIG_GPIO_MC33880 is not set
+CONFIG_GPIO_74X164=m
+
+#
+# AC97 GPIO expanders:
+#
+# CONFIG_GPIO_UCB1400 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_AVS is not set
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+# CONFIG_SENSORS_HIH6130 is not set
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+CONFIG_SENSORS_W83795_FANCTRL=y
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+# CONFIG_HP_WATCHDOG is not set
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+# CONFIG_SBC7240_WDT is not set
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+CONFIG_MFD_SM501=m
+# CONFIG_MFD_SM501_GPIO is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_UCB1400_CORE=m
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM831X_SPI is not set
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+CONFIG_ABX500_CORE=y
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_LPC_ICH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+
+#
+# Media drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+# CONFIG_LIRC is not set
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_AK881X=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_TCM825X=m
+# CONFIG_VIDEO_SR030PC30 is not set
+CONFIG_VIDEO_NOON010PC30=m
+# CONFIG_VIDEO_M5MOLS is not set
+CONFIG_VIDEO_S5K6AA=m
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_AS3645A is not set
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_VIVI is not set
+CONFIG_V4L_USB_DRIVERS=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+# CONFIG_USB_GSPCA_KONICA is not set
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+# CONFIG_USB_GSPCA_SPCA1528 is not set
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+# CONFIG_USB_GSPCA_SQ930X is not set
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
+CONFIG_USB_GSPCA_ZC3XX=m
+# CONFIG_USB_PWC is not set
+# CONFIG_VIDEO_CPIA2 is not set
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_USB_SN9C102=m
+
+#
+# Webcam and/or TV USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+# CONFIG_VIDEO_EM28XX_DVB is not set
+CONFIG_VIDEO_EM28XX_RC=m
+# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+# CONFIG_SMS_USB_DRV is not set
+# CONFIG_SMS_SDIO_DRV is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported ddbridge ('Octopus') Adapters
+#
+CONFIG_DVB_DDBRIDGE=m
+
+#
+# Supported DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+# CONFIG_AGP_NVIDIA is not set
+CONFIG_AGP_SIS=m
+# CONFIG_AGP_SWORKS is not set
+CONFIG_AGP_VIA=m
+# CONFIG_AGP_EFFICEON is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_KMS is not set
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+# CONFIG_DRM_UDL is not set
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_STUB_POULSBO is not set
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=m
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_DDC=m
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_I810 is not set
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_SM501=m
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_BROADSHEET=m
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_S6E63M0=m
+# CONFIG_LCD_LD9040 is not set
+CONFIG_LCD_AMS369FG06=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_APPLE is not set
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+# CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+# CONFIG_SND_ALOOP is not set
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_TEA575X=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+# CONFIG_SND_FM801_TEA575X_BOOL is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_HWDEP=y
+# CONFIG_SND_HDA_RECONFIG is not set
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_INPUT_JACK=y
+# CONFIG_SND_HDA_PATCH_LOADER is not set
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+# CONFIG_SND_SIS7019 is not set
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+# CONFIG_SND_USB_CAIAQ_INPUT is not set
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AB8500_CODEC=m
+CONFIG_SND_SOC_AD1836=m
+CONFIG_SND_SOC_AD193X=m
+CONFIG_SND_SOC_AD73311=m
+CONFIG_SND_SOC_ADAU1373=m
+CONFIG_SND_SOC_ADAV80X=m
+CONFIG_SND_SOC_ADS117X=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4535=m
+CONFIG_SND_SOC_AK4641=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK4671=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_ALC5632=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CX20442=m
+CONFIG_SND_SOC_JZ4740_CODEC=m
+CONFIG_SND_SOC_L3=m
+CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_DA732X=m
+CONFIG_SND_SOC_DFBMCS320=m
+CONFIG_SND_SOC_ISABELLE=m
+CONFIG_SND_SOC_LM49453=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98095=m
+CONFIG_SND_SOC_MAX9850=m
+CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA529=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC26=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320DAC33=m
+CONFIG_SND_SOC_UDA134X=m
+CONFIG_SND_SOC_UDA1380=m
+CONFIG_SND_SOC_WL1273=m
+CONFIG_SND_SOC_WM1250_EV1=m
+CONFIG_SND_SOC_WM2000=m
+CONFIG_SND_SOC_WM2200=m
+CONFIG_SND_SOC_WM5100=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8727=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8900=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8955=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8971=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8983=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WM8988=m
+CONFIG_SND_SOC_WM8990=m
+CONFIG_SND_SOC_WM8991=m
+CONFIG_SND_SOC_WM8993=m
+CONFIG_SND_SOC_WM8995=m
+CONFIG_SND_SOC_WM8996=m
+CONFIG_SND_SOC_WM9081=m
+CONFIG_SND_SOC_WM9090=m
+CONFIG_SND_SOC_LM4857=m
+CONFIG_SND_SOC_MAX9768=m
+CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_ML26124=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACRUX is not set
+CONFIG_HID_APPLE=m
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+CONFIG_HID_PRODIKEYS=m
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_HOLTEK is not set
+CONFIG_HID_KEYTOUCH=m
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
+# CONFIG_HID_LOGITECH is not set
+CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NTRIG is not set
+CONFIG_HID_ORTEK=m
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_GREENASIA is not set
+CONFIG_HID_HYPERV_MOUSE=m
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_ZEROPLUS is not set
+CONFIG_HID_ZYDACRON=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_CHIPIDEA is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+# CONFIG_USB_SERIAL_F81232 is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_METRO is not set
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+# CONFIG_USB_SERIAL_SSU100 is not set
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+# CONFIG_USB_LEGOTOWER is not set
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+# CONFIG_USB_TRANCEVIBRATOR is not set
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+# CONFIG_USB_YUREX is not set
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+# CONFIG_MMC_USHC is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA9633 is not set
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+# CONFIG_LEDS_TCA6507 is not set
+CONFIG_LEDS_LM3556=m
+# CONFIG_LEDS_OT200 is not set
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_ACCESSIBILITY=y
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+# CONFIG_INFINIBAND_OCRDMA is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+# CONFIG_RTC_DRV_DS3232 is not set
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+# CONFIG_RTC_DRV_ISL12022 is not set
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_PCF2123=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+# CONFIG_INTEL_MID_DMAC is not set
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_PCI_GENERIC is not set
+CONFIG_UIO_NETX=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_STAGING=y
+# CONFIG_ET131X is not set
+# CONFIG_SLICOSS is not set
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_R8187SE is not set
+# CONFIG_RTL8192U is not set
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+# CONFIG_RTL8192E is not set
+# CONFIG_R8712U is not set
+# CONFIG_RTS_PSTOR is not set
+# CONFIG_RTS5139 is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_ZSMALLOC is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_FB_XGI is not set
+# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_SBE_2T3E3 is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# CONFIG_PHONE is not set
+# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_IPACK_BUS is not set
+CONFIG_WIMAX_GDM72XX=m
+# CONFIG_WIMAX_GDM72XX_QOS is not set
+# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+# CONFIG_CSR_WIFI is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+# CONFIG_FUJITSU_TABLET is not set
+CONFIG_AMILO_RFKILL=m
+# CONFIG_TC1100_WMI is not set
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+# CONFIG_TOPSTAR_LAPTOP is not set
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+# CONFIG_INTEL_IPS is not set
+# CONFIG_IBM_RTL is not set
+CONFIG_XO15_EBOOK=m
+# CONFIG_SAMSUNG_LAPTOP is not set
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+# CONFIG_SAMSUNG_Q10 is not set
+# CONFIG_APPLE_GMUX is not set
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+
+#
+# Remoteproc drivers (EXPERIMENTAL)
+#
+
+#
+# Rpmsg drivers (EXPERIMENTAL)
+#
+CONFIG_VIRT_DRIVERS=y
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
+# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_EXT3_FS=m
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_FS_XIP=y
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+# CONFIG_REISERFS_FS_SECURITY is not set
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+# CONFIG_XFS_FS is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_FSCACHE is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_CEPH_FS=m
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_FSCACHE is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_LKDTM is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_LATENCYTOP=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+CONFIG_TEST_KSTRTOX=m
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_DEBUG_SET_MODULE_RONX=y
+CONFIG_DEBUG_NX_TEST=m
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_X86_DECODER_SELFTEST=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+CONFIG_DEBUG_BOOT_PARAMS=y
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_OPTIMIZE_INLINING is not set
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_DEBUG_NMI_SELFTEST=y
+
+#
+# Linux VServer
+#
+CONFIG_VSERVER_AUTO_LBACK=y
+CONFIG_VSERVER_AUTO_SINGLE=y
+# CONFIG_VSERVER_COWBL is not set
+# CONFIG_VSERVER_VTIME is not set
+# CONFIG_VSERVER_DEVICE is not set
+CONFIG_VSERVER_PROC_SECURE=y
+# CONFIG_TAGGING_NONE is not set
+# CONFIG_TAGGING_UID16 is not set
+# CONFIG_TAGGING_GID16 is not set
+CONFIG_TAGGING_ID24=y
+# CONFIG_TAGGING_INTERN is not set
+# CONFIG_TAG_NFSD is not set
+CONFIG_VSERVER_PRIVACY=y
+CONFIG_VSERVER_CONTEXTS=256
+CONFIG_VSERVER_WARN=y
+CONFIG_VSERVER_WARN_DEVPTS=y
+# CONFIG_VSERVER_DEBUG is not set
+# CONFIG_VSERVER_EXTRA_MNT_CHECK is not set
+CONFIG_QUOTES_ISO8859=y
+# CONFIG_QUOTES_UTF8 is not set
+# CONFIG_QUOTES_ASCII is not set
+CONFIG_VSERVER=y
+CONFIG_VSERVER_SECURITY=y
+# CONFIG_VSERVER_DISABLED is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+# CONFIG_SECURITY_NETWORK is not set
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
+CONFIG_TCM_VHOST=m
+# CONFIG_LGUEST is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+CONFIG_CORDIC=m
+CONFIG_DDR=y
diff --git a/main/linux-vserver/kernelconfig.x86.rej b/main/linux-vserver/kernelconfig.x86.rej
new file mode 100644
index 000000000..da4f89a9d
--- /dev/null
+++ b/main/linux-vserver/kernelconfig.x86.rej
@@ -0,0 +1,324 @@
+--- kernelconfig.x86_64
++++ kernelconfig.x86_64
+@@ -1,6 +1,6 @@
+ #
+ # Automatically generated file; DO NOT EDIT.
+-# Linux/x86_64 3.6.10-vs2.3.4.6 Kernel Configuration
++# Linux/x86_64 3.4.45-vs2.3.3.9 Kernel Configuration
+ #
+ CONFIG_64BIT=y
+ # CONFIG_X86_32 is not set
+@@ -9,6 +9,11 @@
+ CONFIG_INSTRUCTION_DECODER=y
+ CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
++CONFIG_GENERIC_CMOS_UPDATE=y
++CONFIG_CLOCKSOURCE_WATCHDOG=y
++CONFIG_GENERIC_CLOCKEVENTS=y
++CONFIG_ARCH_CLOCKSOURCE_DATA=y
++CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+ CONFIG_LOCKDEP_SUPPORT=y
+ CONFIG_STACKTRACE_SUPPORT=y
+ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+@@ -43,12 +50,11 @@
+ CONFIG_X86_64_SMP=y
+ CONFIG_X86_HT=y
+ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
++# CONFIG_KTIME_SCALAR is not set
+ CONFIG_ARCH_CPU_PROBE_RELEASE=y
+-CONFIG_ARCH_SUPPORTS_UPROBES=y
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+ CONFIG_HAVE_IRQ_WORK=y
+ CONFIG_IRQ_WORK=y
+-CONFIG_BUILDTIME_EXTABLE_SORT=y
+ 
+ #
+ # General setup
+@@ -91,25 +97,8 @@
+ CONFIG_GENERIC_IRQ_SHOW=y
+ CONFIG_GENERIC_PENDING_IRQ=y
+ CONFIG_GENERIC_IRQ_CHIP=y
+-CONFIG_IRQ_DOMAIN=y
+-# CONFIG_IRQ_DOMAIN_DEBUG is not set
+ CONFIG_IRQ_FORCED_THREADING=y
+ CONFIG_SPARSE_IRQ=y
+-CONFIG_CLOCKSOURCE_WATCHDOG=y
+-CONFIG_ARCH_CLOCKSOURCE_DATA=y
+-CONFIG_GENERIC_TIME_VSYSCALL=y
+-CONFIG_GENERIC_CLOCKEVENTS=y
+-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+-CONFIG_GENERIC_CMOS_UPDATE=y
+-
+-#
+-# Timers subsystem
+-#
+-CONFIG_TICK_ONESHOT=y
+-CONFIG_NO_HZ=y
+-CONFIG_HIGH_RES_TIMERS=y
+ 
+ #
+ # RCU Subsystem
+@@ -226,9 +217,7 @@
+ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+ CONFIG_HAVE_CMPXCHG_LOCAL=y
+ CONFIG_HAVE_CMPXCHG_DOUBLE=y
+-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+ 
+ #
+ # GCOV-based kernel profiling
+@@ -426,9 +420,7 @@
+ CONFIG_TRANSPARENT_HUGEPAGE=y
+ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+ # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+-CONFIG_CROSS_MEMORY_ATTACH=y
+ # CONFIG_CLEANCACHE is not set
+-# CONFIG_FRONTSWAP is not set
+ # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+ CONFIG_X86_RESERVE_LOW=64
+ CONFIG_MTRR=y
+@@ -604,7 +577,6 @@
+ CONFIG_SYSVIPC_COMPAT=y
+ CONFIG_KEYS_COMPAT=y
+ CONFIG_HAVE_TEXT_POKE_SMP=y
+-CONFIG_X86_DEV_DMA_OPS=y
+ CONFIG_NET=y
+ CONFIG_COMPAT_NETLINK_MESSAGES=y
+ 
+@@ -1097,6 +1064,7 @@
+ CONFIG_XPS=y
+ CONFIG_NETPRIO_CGROUP=m
+ CONFIG_BQL=y
++CONFIG_HAVE_BPF_JIT=y
+ CONFIG_BPF_JIT=y
+ 
+ #
+@@ -1106,69 +1074,13 @@
+ CONFIG_NET_TCPPROBE=m
+ # CONFIG_HAMRADIO is not set
+ # CONFIG_CAN is not set
+-CONFIG_IRDA=m
+-
+-#
+-# IrDA protocols
+-#
+-CONFIG_IRLAN=m
+-CONFIG_IRNET=m
+-CONFIG_IRCOMM=m
+-CONFIG_IRDA_ULTRA=y
+-
+-#
+-# IrDA options
+-#
+-CONFIG_IRDA_CACHE_LAST_LSAP=y
+-CONFIG_IRDA_FAST_RR=y
+-# CONFIG_IRDA_DEBUG is not set
+-
+-#
+-# Infrared-port device drivers
+-#
+-
+-#
+-# SIR device drivers
+-#
+-CONFIG_IRTTY_SIR=m
+-
+-#
+-# Dongle support
+-#
+-CONFIG_DONGLE=y
+-CONFIG_ESI_DONGLE=m
+-CONFIG_ACTISYS_DONGLE=m
+-CONFIG_TEKRAM_DONGLE=m
+-CONFIG_TOIM3232_DONGLE=m
+-CONFIG_LITELINK_DONGLE=m
+-CONFIG_MA600_DONGLE=m
+-CONFIG_GIRBIL_DONGLE=m
+-CONFIG_MCP2120_DONGLE=m
+-CONFIG_OLD_BELKIN_DONGLE=m
+-CONFIG_ACT200L_DONGLE=m
+-CONFIG_KINGSUN_DONGLE=m
+-CONFIG_KSDAZZLE_DONGLE=m
+-CONFIG_KS959_DONGLE=m
+-
+-#
+-# FIR device drivers
+-#
+-CONFIG_USB_IRDA=m
+-CONFIG_SIGMATEL_FIR=m
+-CONFIG_NSC_FIR=m
+-CONFIG_WINBOND_FIR=m
+-CONFIG_SMC_IRCC_FIR=m
+-CONFIG_ALI_FIR=m
+-CONFIG_VLSI_FIR=m
+-CONFIG_VIA_FIR=m
+-CONFIG_MCS_FIR=m
++# CONFIG_IRDA is not set
+ CONFIG_BT=m
+ CONFIG_BT_RFCOMM=m
+ CONFIG_BT_RFCOMM_TTY=y
+ CONFIG_BT_BNEP=m
+ CONFIG_BT_BNEP_MC_FILTER=y
+ CONFIG_BT_BNEP_PROTO_FILTER=y
+-CONFIG_BT_CMTP=m
+ CONFIG_BT_HIDP=m
+ 
+ #
+@@ -1239,7 +1145,6 @@
+ # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+ # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+ # CONFIG_NFC is not set
+-CONFIG_HAVE_BPF_JIT=y
+ 
+ #
+ # Device Drivers
+@@ -1655,7 +1559,6 @@
+ CONFIG_SCSI_SRP=m
+ # CONFIG_SCSI_BFA_FC is not set
+ CONFIG_SCSI_VIRTIO=m
+-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+ CONFIG_SCSI_DH=m
+ CONFIG_SCSI_DH_RDAC=m
+ CONFIG_SCSI_DH_HP_SW=m
+@@ -2607,14 +2421,6 @@
+ CONFIG_NVRAM=m
+ CONFIG_R3964=m
+ CONFIG_APPLICOM=m
+-
+-#
+-# PCMCIA character devices
+-#
+-CONFIG_SYNCLINK_CS=m
+-CONFIG_CARDMAN_4000=m
+-CONFIG_CARDMAN_4040=m
+-CONFIG_IPWIRELESS=m
+ CONFIG_MWAVE=m
+ CONFIG_RAW_DRIVER=m
+ CONFIG_MAX_RAW_DEVS=256
+@@ -3778,7 +3047,6 @@
+ CONFIG_MMC_WBSD=m
+ CONFIG_MMC_TIFM_SD=m
+ # CONFIG_MMC_SPI is not set
+-CONFIG_MMC_SDRICOH_CS=m
+ CONFIG_MMC_CB710=m
+ CONFIG_MMC_VIA_SDMMC=m
+ CONFIG_MMC_VUB300=m
+@@ -4055,58 +3312,42 @@
+ # CONFIG_ANDROID is not set
+ # CONFIG_PHONE is not set
+ # CONFIG_USB_WPAN_HCD is not set
+-# CONFIG_IPACK_BUS is not set
+-CONFIG_WIMAX_GDM72XX=m
+-# CONFIG_WIMAX_GDM72XX_QOS is not set
+-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
+-# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
+-CONFIG_WIMAX_GDM72XX_USB=y
+-# CONFIG_WIMAX_GDM72XX_SDIO is not set
+-# CONFIG_CSR_WIFI is not set
+ CONFIG_X86_PLATFORM_DEVICES=y
+-CONFIG_ACER_WMI=m
+-CONFIG_ACERHDF=m
+-CONFIG_ASUS_LAPTOP=m
+-CONFIG_DELL_LAPTOP=m
++# CONFIG_ACER_WMI is not set
++# CONFIG_ACERHDF is not set
++# CONFIG_ASUS_LAPTOP is not set
++# CONFIG_DELL_LAPTOP is not set
+ CONFIG_DELL_WMI=m
+ CONFIG_DELL_WMI_AIO=m
+-CONFIG_FUJITSU_LAPTOP=m
+-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
++# CONFIG_FUJITSU_LAPTOP is not set
+ # CONFIG_FUJITSU_TABLET is not set
+-CONFIG_AMILO_RFKILL=m
+-CONFIG_HP_ACCEL=m
++# CONFIG_AMILO_RFKILL is not set
++# CONFIG_HP_ACCEL is not set
+ CONFIG_HP_WMI=m
+-CONFIG_MSI_LAPTOP=m
+-CONFIG_PANASONIC_LAPTOP=m
+-CONFIG_COMPAL_LAPTOP=m
+-CONFIG_SONY_LAPTOP=m
+-# CONFIG_SONYPI_COMPAT is not set
+-CONFIG_IDEAPAD_LAPTOP=m
+-CONFIG_THINKPAD_ACPI=m
+-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+-# CONFIG_THINKPAD_ACPI_DEBUG is not set
+-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+-CONFIG_THINKPAD_ACPI_VIDEO=y
+-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
++# CONFIG_MSI_LAPTOP is not set
++# CONFIG_PANASONIC_LAPTOP is not set
++# CONFIG_COMPAL_LAPTOP is not set
++# CONFIG_SONY_LAPTOP is not set
++# CONFIG_IDEAPAD_LAPTOP is not set
++# CONFIG_THINKPAD_ACPI is not set
+ CONFIG_SENSORS_HDAPS=m
+ CONFIG_INTEL_MENLOW=m
+-CONFIG_EEEPC_LAPTOP=m
++# CONFIG_EEEPC_LAPTOP is not set
+ CONFIG_ASUS_WMI=m
+-CONFIG_ASUS_NB_WMI=m
+-CONFIG_EEEPC_WMI=m
++# CONFIG_ASUS_NB_WMI is not set
++# CONFIG_EEEPC_WMI is not set
+ CONFIG_ACPI_WMI=m
+ CONFIG_MSI_WMI=m
+ # CONFIG_TOPSTAR_LAPTOP is not set
+-CONFIG_ACPI_TOSHIBA=m
+-CONFIG_TOSHIBA_BT_RFKILL=m
+-CONFIG_ACPI_CMPC=m
++# CONFIG_ACPI_TOSHIBA is not set
++# CONFIG_TOSHIBA_BT_RFKILL is not set
++# CONFIG_ACPI_CMPC is not set
+ # CONFIG_INTEL_IPS is not set
+ # CONFIG_IBM_RTL is not set
+-CONFIG_XO15_EBOOK=m
++# CONFIG_XO15_EBOOK is not set
+ # CONFIG_SAMSUNG_LAPTOP is not set
+ CONFIG_MXM_WMI=m
+-CONFIG_INTEL_OAKTRAIL=m
++# CONFIG_INTEL_OAKTRAIL is not set
+ # CONFIG_SAMSUNG_Q10 is not set
+ # CONFIG_APPLE_GMUX is not set
+ 
+@@ -4515,7 +3730,6 @@
+ # CONFIG_DEBUG_RODATA_TEST is not set
+ CONFIG_DEBUG_SET_MODULE_RONX=y
+ CONFIG_DEBUG_NX_TEST=m
+-# CONFIG_DEBUG_TLBFLUSH is not set
+ # CONFIG_IOMMU_DEBUG is not set
+ # CONFIG_IOMMU_STRESS is not set
+ CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+@@ -4687,13 +3898,11 @@
+ CONFIG_CRYPTO_SEED=m
+ CONFIG_CRYPTO_SERPENT=m
+ CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+ CONFIG_CRYPTO_TEA=m
+ CONFIG_CRYPTO_TWOFISH=m
+ CONFIG_CRYPTO_TWOFISH_COMMON=m
+ CONFIG_CRYPTO_TWOFISH_X86_64=m
+ CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+ 
+ #
+ # Compression
+@@ -4719,13 +3928,11 @@
+ CONFIG_KVM_APIC_ARCHITECTURE=y
+ CONFIG_KVM_MMIO=y
+ CONFIG_KVM_ASYNC_PF=y
+-CONFIG_HAVE_KVM_MSI=y
+ CONFIG_VIRTUALIZATION=y
+ CONFIG_KVM=m
+ CONFIG_KVM_INTEL=m
+ CONFIG_KVM_AMD=m
+ CONFIG_VHOST_NET=m
+-CONFIG_TCM_VHOST=m
+ # CONFIG_BINARY_PRINTF is not set
+ 
+ #
diff --git a/main/linux-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64
index 83ecfcb22..eead96462 100644
--- a/main/linux-vserver/kernelconfig.x86_64
+++ b/main/linux-vserver/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.10-vs2.3.4.6 Kernel Configuration
+# Linux/x86_64 3.4.45-vs2.3.3.9 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -9,6 +9,11 @@ CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -23,7 +28,9 @@ CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -41,12 +48,11 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+# CONFIG_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
@@ -89,25 +95,8 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 
 #
 # RCU Subsystem
@@ -115,7 +104,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TREE_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RCU_FANOUT=32
-CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
@@ -131,7 +119,9 @@ CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -146,6 +136,7 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -184,6 +175,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# CONFIG_PERF_COUNTERS is not set
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_PCI_QUIRKS=y
@@ -210,7 +202,6 @@ CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -222,9 +213,7 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 
 #
 # GCOV-based kernel profiling
@@ -315,6 +304,11 @@ CONFIG_FREEZER=y
 # Processor type and features
 #
 CONFIG_ZONE_DMA=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
@@ -417,9 +411,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
@@ -457,8 +449,6 @@ CONFIG_HIBERNATE_CALLBACKS=y
 # CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -529,7 +519,6 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -570,23 +559,7 @@ CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_PCCARD is not set
 CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_ACPI=m
@@ -614,7 +587,6 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 
@@ -625,7 +597,6 @@ CONFIG_PACKET=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
@@ -655,7 +626,6 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -749,7 +719,6 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -770,7 +739,6 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -931,6 +899,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1003,6 +972,7 @@ CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_TIPC=m
 # CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1034,11 +1004,11 @@ CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
 CONFIG_X25=m
 CONFIG_LAPB=m
+# CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
-CONFIG_PHONET=m
+# CONFIG_PHONET is not set
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1062,8 +1032,6 @@ CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_PLUG=m
 
@@ -1089,7 +1057,6 @@ CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
@@ -1112,6 +1079,7 @@ CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
 CONFIG_BQL=y
+CONFIG_HAVE_BPF_JIT=y
 CONFIG_BPF_JIT=y
 
 #
@@ -1121,69 +1089,13 @@ CONFIG_NET_PKTGEN=m
 CONFIG_NET_TCPPROBE=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
+# CONFIG_IRDA is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 
 #
@@ -1196,14 +1108,9 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
-# CONFIG_BT_HCIUART_3WIRE is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
@@ -1223,11 +1130,11 @@ CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1244,7 +1151,6 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1260,7 +1166,6 @@ CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
 # CONFIG_NFC is not set
-CONFIG_HAVE_BPF_JIT=y
 
 #
 # Device Drivers
@@ -1355,8 +1260,6 @@ CONFIG_MTD_SCB2_FLASH=m
 CONFIG_MTD_NETtel=m
 CONFIG_MTD_L440GX=m
 CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
 # CONFIG_MTD_GPIO_ADDR is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
@@ -1430,12 +1333,12 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 # CONFIG_PARPORT_PC_FIFO is not set
 # CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_AX88796=m
 # CONFIG_PARPORT_1284 is not set
@@ -1512,8 +1415,7 @@ CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
+CONFIG_BMP085=m
 CONFIG_PCH_PHUB=m
 # CONFIG_USB_SWITCH_FSA9480 is not set
 CONFIG_C2PORT=m
@@ -1531,6 +1433,9 @@ CONFIG_EEPROM_93XX46=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1542,7 +1447,6 @@ CONFIG_SENSORS_LIS3_I2C=m
 # Altera FPGA firmware download module
 #
 # CONFIG_ALTERA_STAPL is not set
-# CONFIG_INTEL_MEI is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1572,6 +1476,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1665,7 +1570,6 @@ CONFIG_SCSI_IPR_TRACE=y
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -1677,7 +1581,6 @@ CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_SRP=m
 # CONFIG_SCSI_BFA_FC is not set
 CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
@@ -1775,7 +1678,6 @@ CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PLATFORM=m
 CONFIG_PATA_RZ1000=m
 
@@ -1804,6 +1706,7 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1822,7 +1725,6 @@ CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1859,14 +1761,10 @@ CONFIG_EQUALIZER=m
 CONFIG_MII=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
@@ -1888,7 +1786,6 @@ CONFIG_ARCNET_COM90xxIO=m
 CONFIG_ARCNET_RIM_I=m
 CONFIG_ARCNET_COM20020=m
 CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
 CONFIG_ATM_DRIVERS=y
 CONFIG_ATM_DUMMY=m
 CONFIG_ATM_TCP=m
@@ -1926,8 +1823,6 @@ CONFIG_ATM_SOLOS=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -1938,7 +1833,6 @@ CONFIG_ACENIC=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -1977,7 +1871,6 @@ CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_DE600=m
 CONFIG_DE620=m
@@ -1990,8 +1883,6 @@ CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
@@ -2000,13 +1891,10 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGB_DCA=y
-# CONFIG_IGB_PTP is not set
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
-# CONFIG_IXGBE_PTP is not set
 # CONFIG_IXGBEVF is not set
 CONFIG_NET_VENDOR_I825XX=y
 # CONFIG_ZNET is not set
@@ -2038,9 +1926,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -2077,7 +1963,6 @@ CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_SRIOV=y
 CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
@@ -2101,14 +1986,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -2131,7 +2008,6 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -2159,6 +2035,7 @@ CONFIG_SLHC=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_TR is not set
 
 #
 # USB Network Adapters
@@ -2193,22 +2070,17 @@ CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_NET_QMI_WWAN=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
 CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
@@ -2230,6 +2102,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DFS_CERTIFIED is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2245,7 +2118,6 @@ CONFIG_B43=m
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
@@ -2271,7 +2143,6 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG is not set
@@ -2284,7 +2155,6 @@ CONFIG_IPW2200_QOS=y
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
-CONFIG_IWLDVM=m
 
 #
 # Debugging Options
@@ -2300,9 +2170,10 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWM=m
+# CONFIG_IWM_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_DEBUG is not set
@@ -2313,8 +2184,6 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -2330,7 +2199,6 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 # CONFIG_RT2800PCI_RT35XX is not set
 CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -2353,28 +2221,27 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
 
 #
 # WiMAX Wireless Broadband devices
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_SDIO=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_WAN=y
 CONFIG_LANMEDIA=m
@@ -2406,56 +2273,7 @@ CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
 CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
-CONFIG_ISDN_CAPI=m
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_CAPI_TRACE is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
+# CONFIG_ISDN is not set
 
 #
 # Input device support
@@ -2464,7 +2282,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_MATRIXKMAP is not set
 
 #
 # Userland interfaces
@@ -2493,7 +2310,6 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
@@ -2542,15 +2358,12 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2560,6 +2373,7 @@ CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_MC13783 is not set
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2590,6 +2404,7 @@ CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
 # CONFIG_INPUT_BMA150 is not set
 CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_MC13783_PWRBUTTON is not set
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
@@ -2666,7 +2481,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -2718,14 +2532,6 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
 CONFIG_MWAVE=m
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
@@ -2739,6 +2545,7 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
+CONFIG_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2829,7 +2636,6 @@ CONFIG_SPI_LM70_LLP=m
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_PCI=m
@@ -2869,7 +2675,6 @@ CONFIG_GPIO_MAX730X=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
 CONFIG_GPIO_VX855=m
 
 #
@@ -2885,8 +2690,7 @@ CONFIG_GPIO_ADP5588=m
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_BT8XX=m
-CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_LANGWELL is not set
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
@@ -2928,7 +2732,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
-# CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2969,7 +2772,6 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
-# CONFIG_SENSORS_HIH6130 is not set
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -3036,7 +2838,6 @@ CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_INA2XX is not set
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP401=m
@@ -3056,6 +2857,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
+# CONFIG_SENSORS_MC13783_ADC is not set
 
 #
 # ACPI drivers
@@ -3085,7 +2887,6 @@ CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
@@ -3130,8 +2931,6 @@ CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_SILENT is not set
@@ -3153,7 +2952,6 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
-# CONFIG_MFD_LM3533 is not set
 # CONFIG_TPS6105X is not set
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
@@ -3162,515 +2960,25 @@ CONFIG_TPS6507X=m
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM8400=m
 # CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
 CONFIG_ABX500_CORE=y
 # CONFIG_EZX_PCAP is not set
+# CONFIG_AB8500_CORE is not set
 CONFIG_MFD_CS5535=m
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_VX855=m
 CONFIG_MFD_WL1273_CORE=m
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-
-#
-# Media drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-# CONFIG_LIRC is not set
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGUANA=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_ADV7183=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-# CONFIG_VIDEO_SR030PC30 is not set
-CONFIG_VIDEO_NOON010PC30=m
-# CONFIG_VIDEO_M5MOLS is not set
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_AS3645A is not set
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_V4L_USB_DRIVERS=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-# CONFIG_USB_GSPCA_SQ930X is not set
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-
-#
-# Webcam and/or TV USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-# CONFIG_SMS_USB_DRV is not set
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_DIB8000=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
@@ -3708,14 +3016,10 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 # CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_STUB_POULSBO is not set
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -3826,7 +3130,6 @@ CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
-# CONFIG_FB_AUO_K190X is not set
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3844,7 +3147,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_APPLE is not set
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
@@ -3915,7 +3217,6 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3962,9 +3263,7 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
@@ -3974,6 +3273,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0
 CONFIG_SND_HDA_INPUT_JACK=y
 # CONFIG_SND_HDA_PATCH_LOADER is not set
 CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
@@ -4024,14 +3324,10 @@ CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_WM_HUBS=m
-CONFIG_SND_SOC_AB8500_CODEC=m
 CONFIG_SND_SOC_AD1836=m
 CONFIG_SND_SOC_AD193X=m
 CONFIG_SND_SOC_AD73311=m
@@ -4046,7 +3342,6 @@ CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_CS42L51=m
-CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
@@ -4054,10 +3349,7 @@ CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_JZ4740_CODEC=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_DA7210=m
-CONFIG_SND_SOC_DA732X=m
 CONFIG_SND_SOC_DFBMCS320=m
-CONFIG_SND_SOC_ISABELLE=m
-CONFIG_SND_SOC_LM49453=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX9850=m
@@ -4067,7 +3359,6 @@ CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_STA32X=m
-CONFIG_SND_SOC_STA529=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC26=m
 CONFIG_SND_SOC_TLV320AIC32X4=m
@@ -4080,6 +3371,7 @@ CONFIG_SND_SOC_WM1250_EV1=m
 CONFIG_SND_SOC_WM2000=m
 CONFIG_SND_SOC_WM2200=m
 CONFIG_SND_SOC_WM5100=m
+CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8580=m
@@ -4119,19 +3411,25 @@ CONFIG_SND_SOC_WM9090=m
 CONFIG_SND_SOC_LM4857=m
 CONFIG_SND_SOC_MAX9768=m
 CONFIG_SND_SOC_MAX9877=m
-CONFIG_SND_SOC_ML26124=m
 CONFIG_SND_SOC_TPA6130A2=m
-CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
 
 #
-# HID support
+# USB Input Devices
 #
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
 
 #
 # Special HID drivers
@@ -4139,7 +3437,6 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
 CONFIG_HID_APPLE=m
-# CONFIG_HID_AUREAL is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
@@ -4158,7 +3455,6 @@ CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
 CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
 # CONFIG_HID_LOGITECH is not set
 CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MICROSOFT is not set
@@ -4190,19 +3486,6 @@ CONFIG_HID_HYPERV_MOUSE=m
 # CONFIG_HID_WIIMOTE is not set
 # CONFIG_HID_ZEROPLUS is not set
 CONFIG_HID_ZYDACRON=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
@@ -4216,11 +3499,12 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
 
@@ -4248,12 +3532,7 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB Device Class drivers
@@ -4285,7 +3564,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -4353,7 +3631,6 @@ CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
 CONFIG_USB_SERIAL_ZIO=m
 # CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -4380,11 +3657,6 @@ CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 # CONFIG_USB_YUREX is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_ISP1301 is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -4398,10 +3670,7 @@ CONFIG_USB_XUSBATM=m
 CONFIG_USB_OTG_UTILS=y
 CONFIG_USB_GPIO_VBUS=m
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
+# CONFIG_UWB is not set
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
@@ -4426,7 +3695,6 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
 # CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
@@ -4467,17 +3735,15 @@ CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
+# CONFIG_LEDS_MC13783 is not set
 # CONFIG_LEDS_TCA6507 is not set
-CONFIG_LEDS_LM3556=m
 # CONFIG_LEDS_OT200 is not set
-CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4486,7 +3752,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_ACCESSIBILITY=y
 # CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_INFINIBAND=m
@@ -4506,7 +3771,6 @@ CONFIG_INFINIBAND_CXGB4=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
-# CONFIG_INFINIBAND_OCRDMA is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -4587,6 +3851,7 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 # on-CPU RTC drivers
 #
+# CONFIG_RTC_DRV_MC13XXX is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -4620,9 +3885,6 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_RING=m
 
@@ -4632,7 +3894,6 @@ CONFIG_VIRTIO_RING=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -4660,10 +3921,7 @@ CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_STAGING=y
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
+# CONFIG_USBIP_CORE is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
@@ -4672,11 +3930,7 @@ CONFIG_USBIP_HOST=m
 # CONFIG_PANEL is not set
 # CONFIG_R8187SE is not set
 # CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
+# CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
 # CONFIG_RTS_PSTOR is not set
 # CONFIG_RTS5139 is not set
@@ -4684,12 +3938,14 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
+# CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
+# CONFIG_IIO is not set
+# CONFIG_ZRAM is not set
 # CONFIG_ZSMALLOC is not set
-# CONFIG_WLAGS49_H2 is not set
-# CONFIG_WLAGS49_H25 is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
 # CONFIG_CXT1E1 is not set
@@ -4706,6 +3962,7 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_INTEL_MEI is not set
 # CONFIG_STAGING_MEDIA is not set
 
 #
@@ -4714,58 +3971,42 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
-# CONFIG_IPACK_BUS is not set
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-# CONFIG_CSR_WIFI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
+# CONFIG_ACER_WMI is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_DELL_LAPTOP is not set
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+# CONFIG_FUJITSU_LAPTOP is not set
 # CONFIG_FUJITSU_TABLET is not set
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_HP_ACCEL is not set
 CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+# CONFIG_MSI_LAPTOP is not set
+# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_IDEAPAD_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
 CONFIG_SENSORS_HDAPS=m
 CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
+# CONFIG_EEEPC_LAPTOP is not set
 CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
+# CONFIG_ASUS_NB_WMI is not set
+# CONFIG_EEEPC_WMI is not set
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
 # CONFIG_TOPSTAR_LAPTOP is not set
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
+# CONFIG_ACPI_TOSHIBA is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_ACPI_CMPC is not set
 # CONFIG_INTEL_IPS is not set
 # CONFIG_IBM_RTL is not set
-CONFIG_XO15_EBOOK=m
+# CONFIG_XO15_EBOOK is not set
 # CONFIG_SAMSUNG_LAPTOP is not set
 CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
+# CONFIG_INTEL_OAKTRAIL is not set
 # CONFIG_SAMSUNG_Q10 is not set
 # CONFIG_APPLE_GMUX is not set
 
@@ -4795,16 +4036,6 @@ CONFIG_IRQ_REMAP=y
 #
 CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
 
 #
 # Firmware Drivers
@@ -4963,9 +4194,11 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
 # CONFIG_JFFS2_CMODE_SIZE is not set
 # CONFIG_JFFS2_CMODE_FAVOURLZO is not set
 CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
@@ -4988,8 +4221,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -4999,11 +4230,9 @@ CONFIG_EXOFS_FS=m
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
+CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4=y
 # CONFIG_NFS_V4_1 is not set
 # CONFIG_NFS_FSCACHE is not set
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5078,17 +4307,6 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
@@ -5104,7 +4322,6 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
@@ -5117,8 +4334,6 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
@@ -5163,7 +4378,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_LKDTM is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_LATENCYTOP=y
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -5200,7 +4415,6 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_DEBUG_NX_TEST=m
-# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -5240,7 +4454,6 @@ CONFIG_VSERVER_CONTEXTS=768
 CONFIG_VSERVER_WARN=y
 CONFIG_VSERVER_WARN_DEVPTS=y
 # CONFIG_VSERVER_DEBUG is not set
-# CONFIG_VSERVER_EXTRA_MNT_CHECK is not set
 CONFIG_QUOTES_ISO8859=y
 # CONFIG_QUOTES_UTF8 is not set
 # CONFIG_QUOTES_ASCII is not set
@@ -5303,8 +4516,6 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5375,13 +4586,11 @@ CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
 #
 # Compression
@@ -5407,13 +4616,11 @@ CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
 # CONFIG_BINARY_PRINTF is not set
 
 #
@@ -5421,8 +4628,6 @@ CONFIG_TCM_VHOST=m
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -5460,8 +4665,6 @@ CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
@@ -5475,8 +4678,6 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
-CONFIG_DDR=y
diff --git a/main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff b/main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff
new file mode 100644
index 000000000..4d74b9b22
--- /dev/null
+++ b/main/linux-vserver/patch-3.4.45-vs2.3.3.9.diff
@@ -0,0 +1,26166 @@
+diff -NurpP --minimal linux-3.4.45/Documentation/vserver/debug.txt linux-3.4.45-vs2.3.3.9/Documentation/vserver/debug.txt
+--- linux-3.4.45/Documentation/vserver/debug.txt	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/Documentation/vserver/debug.txt	2012-05-21 16:15:04.000000000 +0000
+@@ -0,0 +1,154 @@
++
++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 %ld,%ld [mult=%d]"
++ 3   8	"ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
++	"ext3_has_free_blocks(%p): free=%lu, root=%lu"
++	"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_misc:
++
++ 0   1	"destroy_dqhash: %p [#0x%08x] c=%d"
++	"new_dqhash: %p [#0x%08x]"
++	"vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
++	"vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
++	"vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
++	"vroot_get_real_bdev not set"
++ 1   2	"cow_break_link(»%s«)"
++	"temp copy »%s«"
++ 2   4	"dentry_open(new): %p"
++	"dentry_open(old): %p"
++	"lookup_create(new): %p"
++	"old path »%s«"
++	"path_lookup(old): %d"
++	"vfs_create(new): %d"
++	"vfs_rename: %d"
++	"vfs_sendfile: %d"
++ 3   8	"fput(new_file=%p[#%d])"
++	"fput(old_file=%p[#%d])"
++ 4  10	"vx_info_kill(%p[#%d],%d,%d) = %d"
++	"vx_info_kill(%p[#%d],%d,%d)*"
++ 5  20	"vs_reboot(%p[#%d],%d)"
++ 6  40	"dropping task %p[#%u,%u] for %p[#%u,%u]"
++
++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.%d.%d]"
++ 5  20	"moved task %p into nxi:%p[#%d]"
++	"nx_migrate_task(%p,%p[#%d.%d.%d])"
++	"task_get_nx_info(%p)"
++ 6  40	"nx_clear_persistent(%p[#%d])"
++
++debug_quota:
++
++ 0   1	"quota_sync_dqh(%p,%d) discard inode %p"
++ 1   2	"quota_sync_dqh(%p,%d)"
++	"sync_dquots(%p,%d)"
++	"sync_dquots_dqh(%p,%d)"
++ 3   8	"do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
++
++debug_switch:
++
++ 0   1	"vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
++ 1   2	"vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
++ 4  10	"%s: (%s %s) returned %s with %d"
++
++debug_tag:
++
++ 7  80	"dx_parse_tag(»%s«): %d:#%d"
++	"dx_propagate_tag(%p[#%lu.%d]): %d,%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)"
++	"loc_vx_info(%d) = %p (found)"
++	"loc_vx_info(%d) = %p (new)"
++	"loc_vx_info(%d) = %p (not available)"
++ 1   2	"create_vx_info(%d)*"
++	"loc_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.%d.%d]"
++	"__vx_dynamic_id: [#%d]"
++ 5  20	"enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
++	"leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
++	"moved task %p into vxi:%p[#%d]"
++	"task_get_vx_info(%p)"
++	"vx_migrate_task(%p,%p[#%d.%d])"
++ 6  40	"vx_clear_persistent(%p[#%d])"
++	"vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
++	"vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++	"vx_set_persistent(%p[#%d])"
++	"vx_set_reaper(%p[#%d],%p[#%d,%d])"
++ 7  80	"vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
++
++
++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"
+diff -NurpP --minimal linux-3.4.45/Makefile linux-3.4.45-vs2.3.3.9/Makefile
+--- linux-3.4.45/Makefile	2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/Makefile	2013-05-13 18:41:34.000000000 +0000
+@@ -1,7 +1,7 @@
+ VERSION = 3
+ PATCHLEVEL = 4
+ SUBLEVEL = 45
+-EXTRAVERSION =
++EXTRAVERSION = -vs2.3.3.9
+ NAME = Saber-toothed Squirrel
+ 
+ # *DOCUMENTATION*
+diff -NurpP --minimal linux-3.4.45/arch/alpha/Kconfig linux-3.4.45-vs2.3.3.9/arch/alpha/Kconfig
+--- linux-3.4.45/arch/alpha/Kconfig	2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
+ 	depends on VGA_HOSE
+ 	default y
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/entry.S linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/entry.S
+--- linux-3.4.45/arch/alpha/kernel/entry.S	2010-10-21 11:06:45.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/entry.S	2012-05-21 16:15:04.000000000 +0000
+@@ -860,24 +860,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_GROUP_LEADER($2)
+-	ldq	$4, TASK_REAL_PARENT($3)
+-	ldl	$0, TASK_TGID($2)
+-1:	ldl	$1, TASK_TGID($4)
+-#ifdef CONFIG_SMP
+-	mov	$4, $5
+-	mb
+-	ldq	$3, TASK_GROUP_LEADER($2)
+-	ldq	$4, TASK_REAL_PARENT($3)
+-	cmpeq	$4, $5, $5
+-	beq	$5, 1b
+-#endif
+-	stq	$1, 80($sp)
++	lda	$16, 96($sp)
++	jsr	$26, do_getxpid
++	ldq	$26, 0($sp)
++
++	lda	$sp, 16($sp)
+ 	ret
+ .end sys_getxpid
+ 
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/ptrace.c
+--- linux-3.4.45/arch/alpha/kernel/ptrace.c	2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/ptrace.c	2012-05-21 16:15:04.000000000 +0000
+@@ -13,6 +13,7 @@
+ #include <linux/user.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/systbls.S linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/systbls.S
+--- linux-3.4.45/arch/alpha/kernel/systbls.S	2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/systbls.S	2012-05-21 16:15:04.000000000 +0000
+@@ -446,7 +446,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 */
+diff -NurpP --minimal linux-3.4.45/arch/alpha/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/traps.c
+--- linux-3.4.45/arch/alpha/kernel/traps.c	2012-05-21 16:06:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/alpha/kernel/traps.c	2012-05-21 16:15:04.000000000 +0000
+@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
+ #ifdef CONFIG_SMP
+ 	printk("CPU %d ", hard_smp_processor_id());
+ #endif
+-	printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
++	printk("%s(%d[#%u]): %s %ld\n", current->comm,
++		task_pid_nr(current), current->xid, str, err);
+ 	dik_show_regs(regs, r9_15);
+ 	add_taint(TAINT_DIE);
+ 	dik_show_trace((unsigned long *)(regs+1));
+diff -NurpP --minimal linux-3.4.45/arch/arm/Kconfig linux-3.4.45-vs2.3.3.9/arch/arm/Kconfig
+--- linux-3.4.45/arch/arm/Kconfig	2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/Kconfig	2012-12-11 11:42:38.000000000 +0000
+@@ -2311,6 +2311,8 @@ source "fs/Kconfig"
+ 
+ source "arch/arm/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/calls.S linux-3.4.45-vs2.3.3.9/arch/arm/kernel/calls.S
+--- linux-3.4.45/arch/arm/kernel/calls.S	2012-01-09 15:13:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/kernel/calls.S	2012-05-21 16:15:04.000000000 +0000
+@@ -322,7 +322,7 @@
+ /* 310 */	CALL(sys_request_key)
+ 		CALL(sys_keyctl)
+ 		CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
+-/* vserver */	CALL(sys_ni_syscall)
++		CALL(sys_vserver)
+ 		CALL(sys_ioprio_set)
+ /* 315 */	CALL(sys_ioprio_get)
+ 		CALL(sys_inotify_init)
+diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/arm/kernel/process.c
+--- linux-3.4.45/arch/arm/kernel/process.c	2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/kernel/process.c	2012-09-01 08:50:48.000000000 +0000
+@@ -357,7 +357,8 @@ void __show_regs(struct pt_regs *regs)
+ void show_regs(struct pt_regs * regs)
+ {
+ 	printk("\n");
+-	printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
++	printk("Pid: %d[#%u], comm: %20s\n",
++		task_pid_nr(current), current->xid, current->comm);
+ 	__show_regs(regs);
+ 	dump_stack();
+ }
+diff -NurpP --minimal linux-3.4.45/arch/arm/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/arm/kernel/traps.c
+--- linux-3.4.45/arch/arm/kernel/traps.c	2013-05-13 17:36:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/arm/kernel/traps.c	2012-10-22 13:09:53.000000000 +0000
+@@ -249,8 +249,8 @@ static int __die(const char *str, int er
+ 
+ 	print_modules();
+ 	__show_regs(regs);
+-	printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
+-		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
++	printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
++		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+ 		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
+diff -NurpP --minimal linux-3.4.45/arch/cris/Kconfig linux-3.4.45-vs2.3.3.9/arch/cris/Kconfig
+--- linux-3.4.45/arch/cris/Kconfig	2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/cris/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -675,6 +675,8 @@ source "drivers/staging/Kconfig"
+ 
+ source "arch/cris/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/frv/kernel/kernel_thread.S linux-3.4.45-vs2.3.3.9/arch/frv/kernel/kernel_thread.S
+--- linux-3.4.45/arch/frv/kernel/kernel_thread.S	2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/frv/kernel/kernel_thread.S	2012-05-21 16:15:04.000000000 +0000
+@@ -37,7 +37,7 @@ kernel_thread:
+ 
+ 	# start by forking the current process, but with shared VM
+ 	setlos.p	#__NR_clone,gr7		; syscall number
+-	ori		gr10,#CLONE_VM,gr8	; first syscall arg	[clone_flags]
++	ori		gr10,#CLONE_KT,gr8	; first syscall arg	[clone_flags]
+ 	sethi.p		#0xe4e4,gr9		; second syscall arg	[newsp]
+ 	setlo		#0xe4e4,gr9
+ 	setlos.p	#0,gr10			; third syscall arg	[parent_tidptr]
+diff -NurpP --minimal linux-3.4.45/arch/h8300/Kconfig linux-3.4.45-vs2.3.3.9/arch/h8300/Kconfig
+--- linux-3.4.45/arch/h8300/Kconfig	2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/h8300/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -214,6 +214,8 @@ source "fs/Kconfig"
+ 
+ source "arch/h8300/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/ia64/Kconfig linux-3.4.45-vs2.3.3.9/arch/ia64/Kconfig
+--- linux-3.4.45/arch/ia64/Kconfig	2012-03-19 18:46:39.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -654,6 +654,8 @@ source "fs/Kconfig"
+ 
+ source "arch/ia64/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/entry.S linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/entry.S
+--- linux-3.4.45/arch/ia64/kernel/entry.S	2012-03-19 18:46:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/entry.S	2012-05-21 16:15:04.000000000 +0000
+@@ -1714,7 +1714,7 @@ sys_call_table:
+ 	data8 sys_mq_notify
+ 	data8 sys_mq_getsetattr
+ 	data8 sys_kexec_load
+-	data8 sys_ni_syscall			// reserved for vserver
++	data8 sys_vserver
+ 	data8 sys_waitid			// 1270
+ 	data8 sys_add_key
+ 	data8 sys_request_key
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/process.c
+--- linux-3.4.45/arch/ia64/kernel/process.c	2013-05-13 17:36:17.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/process.c	2012-10-22 13:09:53.000000000 +0000
+@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs)
+ 	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
+ 
+ 	print_modules();
+-	printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
+-			smp_processor_id(), current->comm);
++	printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
++			current->xid, smp_processor_id(), current->comm);
+ 	printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
+ 	       regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
+ 	       init_utsname()->release);
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/ptrace.c
+--- linux-3.4.45/arch/ia64/kernel/ptrace.c	2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/ptrace.c	2012-05-21 16:15:04.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/regset.h>
+ #include <linux/elf.h>
+ #include <linux/tracehook.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+diff -NurpP --minimal linux-3.4.45/arch/ia64/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/traps.c
+--- linux-3.4.45/arch/ia64/kernel/traps.c	2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/ia64/kernel/traps.c	2012-05-21 16:15:04.000000000 +0000
+@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
+ 	put_cpu();
+ 
+ 	if (++die.lock_owner_depth < 3) {
+-		printk("%s[%d]: %s %ld [%d]\n",
+-		current->comm, task_pid_nr(current), str, err, ++die_counter);
++		printk("%s[%d[#%u]]: %s %ld [%d]\n",
++			current->comm, task_pid_nr(current), current->xid,
++			str, err, ++die_counter);
+ 		if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
+ 	            != NOTIFY_STOP)
+ 			show_regs(regs);
+@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
+ 			if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
+ 				last.time = current_jiffies + 5 * HZ;
+ 				printk(KERN_WARNING
+-		       			"%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+-		       			current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
++					"%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
++					current->comm, task_pid_nr(current), current->xid,
++					regs->cr_iip + ia64_psr(regs)->ri, isr);
+ 			}
+ 		}
+ 	}
+diff -NurpP --minimal linux-3.4.45/arch/m32r/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/m32r/kernel/traps.c
+--- linux-3.4.45/arch/m32r/kernel/traps.c	2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/m32r/kernel/traps.c	2012-05-21 16:15:04.000000000 +0000
+@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
+ 	} else {
+ 		printk("SPI: %08lx\n", sp);
+ 	}
+-	printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
+-		current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
++	printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
++		current->comm, task_pid_nr(current), current->xid,
++		0xffff & i, 4096+(unsigned long)current);
+ 
+ 	/*
+ 	 * When in-kernel, we also print out the stack and code at the
+diff -NurpP --minimal linux-3.4.45/arch/m68k/Kconfig linux-3.4.45-vs2.3.3.9/arch/m68k/Kconfig
+--- linux-3.4.45/arch/m68k/Kconfig	2012-05-21 16:06:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/m68k/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -146,6 +146,8 @@ source "fs/Kconfig"
+ 
+ source "arch/m68k/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/mips/Kconfig linux-3.4.45-vs2.3.3.9/arch/mips/Kconfig
+--- linux-3.4.45/arch/mips/Kconfig	2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -2516,6 +2516,8 @@ source "fs/Kconfig"
+ 
+ source "arch/mips/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/mips/kernel/ptrace.c
+--- linux-3.4.45/arch/mips/kernel/ptrace.c	2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/ptrace.c	2012-05-21 16:15:04.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/security.h>
+ #include <linux/audit.h>
+ #include <linux/seccomp.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/byteorder.h>
+ #include <asm/cpu.h>
+@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi
+ 	void __user *datavp = (void __user *) data;
+ 	unsigned long __user *datalp = (void __user *) data;
+ 
++	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
++		goto out;
++
+ 	switch (request) {
+ 	/* when I and D space are separate, these will need to be fixed. */
+ 	case PTRACE_PEEKTEXT: /* read word at location addr. */
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall32-o32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall32-o32.S
+--- linux-3.4.45/arch/mips/kernel/scall32-o32.S	2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall32-o32.S	2012-05-21 16:15:04.000000000 +0000
+@@ -523,7 +523,7 @@ einval:	li	v0, -ENOSYS
+ 	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		5
+ 	sys	sys_ni_syscall		0	/* available, was setaltroot */
+ 	sys	sys_add_key		5	/* 4280 */
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-64.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-64.S
+--- linux-3.4.45/arch/mips/kernel/scall64-64.S	2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-64.S	2012-05-21 16:15:04.000000000 +0000
+@@ -362,7 +362,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
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-n32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-n32.S
+--- linux-3.4.45/arch/mips/kernel/scall64-n32.S	2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-n32.S	2012-05-21 16:15:04.000000000 +0000
+@@ -361,7 +361,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	compat_sys_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/scall64-o32.S linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-o32.S
+--- linux-3.4.45/arch/mips/kernel/scall64-o32.S	2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/scall64-o32.S	2012-05-21 16:15:04.000000000 +0000
+@@ -480,7 +480,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_32_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key			/* 4280 */
+diff -NurpP --minimal linux-3.4.45/arch/mips/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/mips/kernel/traps.c
+--- linux-3.4.45/arch/mips/kernel/traps.c	2012-05-21 16:06:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/mips/kernel/traps.c	2012-05-21 16:15:04.000000000 +0000
+@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
+ 
+ 	__show_regs(regs);
+ 	print_modules();
+-	printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
+-	       current->comm, current->pid, current_thread_info(), current,
+-	      field, current_thread_info()->tp_value);
++	printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
++		current->comm, task_pid_nr(current), current->xid,
++		current_thread_info(), current,
++		field, current_thread_info()->tp_value);
+ 	if (cpu_has_userlocal) {
+ 		unsigned long tls;
+ 
+diff -NurpP --minimal linux-3.4.45/arch/parisc/Kconfig linux-3.4.45-vs2.3.3.9/arch/parisc/Kconfig
+--- linux-3.4.45/arch/parisc/Kconfig	2012-03-19 18:46:44.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -279,6 +279,8 @@ source "fs/Kconfig"
+ 
+ source "arch/parisc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/parisc/kernel/syscall_table.S linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/syscall_table.S
+--- linux-3.4.45/arch/parisc/kernel/syscall_table.S	2011-10-24 16:45:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/syscall_table.S	2012-05-21 16:15:04.000000000 +0000
+@@ -361,7 +361,7 @@
+ 	ENTRY_COMP(mbind)		/* 260 */
+ 	ENTRY_COMP(get_mempolicy)
+ 	ENTRY_COMP(set_mempolicy)
+-	ENTRY_SAME(ni_syscall)	/* 263: reserved for vserver */
++	ENTRY_DIFF(vserver)
+ 	ENTRY_SAME(add_key)
+ 	ENTRY_SAME(request_key)		/* 265 */
+ 	ENTRY_SAME(keyctl)
+diff -NurpP --minimal linux-3.4.45/arch/parisc/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/traps.c
+--- linux-3.4.45/arch/parisc/kernel/traps.c	2012-05-21 16:06:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/kernel/traps.c	2012-05-21 16:15:04.000000000 +0000
+@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
+ 		if (err == 0)
+ 			return; /* STFU */
+ 
+-		printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
+-			current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
++		printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
++			current->comm, task_pid_nr(current), current->xid,
++			str, err, regs->iaoq[0]);
+ #ifdef PRINT_USER_FAULTS
+ 		/* XXX for debugging only */
+ 		show_regs(regs);
+@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_
+ 		pdc_console_restart();
+ 	
+ 	if (err)
+-		printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
+-			current->comm, task_pid_nr(current), str, err);
++		printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
++			current->comm, task_pid_nr(current), current->xid, str, err);
+ 
+ 	/* Wot's wrong wif bein' racy? */
+ 	if (current->thread.flags & PARISC_KERNEL_DEATH) {
+diff -NurpP --minimal linux-3.4.45/arch/parisc/mm/fault.c linux-3.4.45-vs2.3.3.9/arch/parisc/mm/fault.c
+--- linux-3.4.45/arch/parisc/mm/fault.c	2010-08-02 14:52:06.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/parisc/mm/fault.c	2012-05-21 16:15:04.000000000 +0000
+@@ -237,8 +237,9 @@ bad_area:
+ 
+ #ifdef PRINT_USER_FAULTS
+ 		printk(KERN_DEBUG "\n");
+-		printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
+-		    task_pid_nr(tsk), tsk->comm, code, address);
++		printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
++		    "command='%s' type=%lu address=0x%08lx\n",
++		    task_pid_nr(tsk), tsk->xid, tsk->comm, code, address);
+ 		if (vma) {
+ 			printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
+ 					vma->vm_start, vma->vm_end);
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/Kconfig linux-3.4.45-vs2.3.3.9/arch/powerpc/Kconfig
+--- linux-3.4.45/arch/powerpc/Kconfig	2012-05-21 16:06:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -1002,6 +1002,8 @@ source "lib/Kconfig"
+ 
+ source "arch/powerpc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ config KEYS_COMPAT
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/powerpc/include/asm/unistd.h
+--- linux-3.4.45/arch/powerpc/include/asm/unistd.h	2012-01-09 15:14:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/include/asm/unistd.h	2012-05-21 16:15:04.000000000 +0000
+@@ -275,7 +275,7 @@
+ #endif
+ #define __NR_rtas		255
+ #define __NR_sys_debug_setcontext 256
+-/* Number 257 is reserved for vserver */
++#define __NR_vserver		257
+ #define __NR_migrate_pages	258
+ #define __NR_mbind		259
+ #define __NR_get_mempolicy	260
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/process.c linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/process.c
+--- linux-3.4.45/arch/powerpc/kernel/process.c	2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/process.c	2012-09-16 18:49:11.000000000 +0000
+@@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs)
+ #else
+ 		printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
+ #endif
+-	printk("TASK = %p[%d] '%s' THREAD: %p",
+-	       current, task_pid_nr(current), current->comm, task_thread_info(current));
++	printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
++	       current, task_pid_nr(current), current->xid,
++	       current->comm, task_thread_info(current));
+ 
+ #ifdef CONFIG_SMP
+ 	printk(" CPU: %d", raw_smp_processor_id());
+diff -NurpP --minimal linux-3.4.45/arch/powerpc/kernel/traps.c linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/traps.c
+--- linux-3.4.45/arch/powerpc/kernel/traps.c	2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/powerpc/kernel/traps.c	2013-05-13 18:16:08.000000000 +0000
+@@ -1125,8 +1125,9 @@ void nonrecoverable_exception(struct pt_
+ 
+ void trace_syscall(struct pt_regs *regs)
+ {
+-	printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld    %s\n",
+-	       current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
++	printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld    %s\n",
++	       current, task_pid_nr(current), current->xid,
++	       regs->nip, regs->link, regs->gpr[0],
+ 	       regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/arch/s390/Kconfig linux-3.4.45-vs2.3.3.9/arch/s390/Kconfig
+--- linux-3.4.45/arch/s390/Kconfig	2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -639,6 +639,8 @@ source "fs/Kconfig"
+ 
+ source "arch/s390/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/tlb.h linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/tlb.h
+--- linux-3.4.45/arch/s390/include/asm/tlb.h	2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/tlb.h	2012-05-21 16:15:04.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++
+ #include <asm/processor.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+diff -NurpP --minimal linux-3.4.45/arch/s390/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/unistd.h
+--- linux-3.4.45/arch/s390/include/asm/unistd.h	2012-03-19 18:46:48.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/include/asm/unistd.h	2012-05-21 16:15:04.000000000 +0000
+@@ -202,7 +202,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_statfs64		265
+ #define __NR_fstatfs64		266
+ #define __NR_remap_file_pages	267
+diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/arch/s390/kernel/ptrace.c
+--- linux-3.4.45/arch/s390/kernel/ptrace.c	2012-05-21 16:06:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/kernel/ptrace.c	2012-05-21 16:15:04.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/tracehook.h>
+ #include <linux/seccomp.h>
+ #include <linux/compat.h>
++#include <linux/vs_base.h>
+ #include <trace/syscall.h>
+ #include <asm/segment.h>
+ #include <asm/page.h>
+diff -NurpP --minimal linux-3.4.45/arch/s390/kernel/syscalls.S linux-3.4.45-vs2.3.3.9/arch/s390/kernel/syscalls.S
+--- linux-3.4.45/arch/s390/kernel/syscalls.S	2012-01-09 15:14:06.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/s390/kernel/syscalls.S	2012-05-21 16:15:04.000000000 +0000
+@@ -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(sys_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)
+diff -NurpP --minimal linux-3.4.45/arch/sh/Kconfig linux-3.4.45-vs2.3.3.9/arch/sh/Kconfig
+--- linux-3.4.45/arch/sh/Kconfig	2012-05-21 16:06:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sh/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -905,6 +905,8 @@ source "fs/Kconfig"
+ 
+ source "arch/sh/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/sh/kernel/irq.c linux-3.4.45-vs2.3.3.9/arch/sh/kernel/irq.c
+--- linux-3.4.45/arch/sh/kernel/irq.c	2011-07-22 09:17:41.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sh/kernel/irq.c	2012-05-21 16:15:04.000000000 +0000
+@@ -14,6 +14,7 @@
+ #include <linux/ftrace.h>
+ #include <linux/delay.h>
+ #include <linux/ratelimit.h>
++// #include <linux/vs_context.h>
+ #include <asm/processor.h>
+ #include <asm/machvec.h>
+ #include <asm/uaccess.h>
+diff -NurpP --minimal linux-3.4.45/arch/sparc/Kconfig linux-3.4.45-vs2.3.3.9/arch/sparc/Kconfig
+--- linux-3.4.45/arch/sparc/Kconfig	2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/Kconfig	2012-06-08 13:57:24.000000000 +0000
+@@ -599,6 +599,8 @@ source "fs/Kconfig"
+ 
+ source "arch/sparc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/sparc/include/asm/unistd.h linux-3.4.45-vs2.3.3.9/arch/sparc/include/asm/unistd.h
+--- linux-3.4.45/arch/sparc/include/asm/unistd.h	2012-01-09 15:14:07.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/include/asm/unistd.h	2012-05-21 16:15:04.000000000 +0000
+@@ -335,7 +335,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
+diff -NurpP --minimal linux-3.4.45/arch/sparc/kernel/systbls_32.S linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_32.S
+--- linux-3.4.45/arch/sparc/kernel/systbls_32.S	2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_32.S	2012-05-21 16:15:04.000000000 +0000
+@@ -70,7 +70,7 @@ sys_call_table:
+ /*250*/	.long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
+ /*255*/	.long sys_sync_file_range, 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_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
+diff -NurpP --minimal linux-3.4.45/arch/sparc/kernel/systbls_64.S linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_64.S
+--- linux-3.4.45/arch/sparc/kernel/systbls_64.S	2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/sparc/kernel/systbls_64.S	2012-06-08 13:57:24.000000000 +0000
+@@ -71,7 +71,7 @@ sys_call_table32:
+ /*250*/	.word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
+ 	.word sys32_sync_file_range, compat_sys_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, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
++	.word sys_timer_delete, compat_sys_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 sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat
+@@ -148,7 +148,7 @@ sys_call_table:
+ /*250*/	.word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
+ 	.word sys_sync_file_range, 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_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
+diff -NurpP --minimal linux-3.4.45/arch/um/Kconfig.rest linux-3.4.45-vs2.3.3.9/arch/um/Kconfig.rest
+--- linux-3.4.45/arch/um/Kconfig.rest	2012-01-09 15:14:09.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/um/Kconfig.rest	2012-05-21 16:15:04.000000000 +0000
+@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
+ 
+ source "fs/Kconfig"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/um/include/shared/kern_constants.h linux-3.4.45-vs2.3.3.9/arch/um/include/shared/kern_constants.h
+--- linux-3.4.45/arch/um/include/shared/kern_constants.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/um/include/shared/kern_constants.h	2012-05-21 16:15:04.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../include/generated/asm-offsets.h"
+diff -NurpP --minimal linux-3.4.45/arch/um/include/shared/user_constants.h linux-3.4.45-vs2.3.3.9/arch/um/include/shared/user_constants.h
+--- linux-3.4.45/arch/um/include/shared/user_constants.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/um/include/shared/user_constants.h	2012-05-21 16:15:04.000000000 +0000
+@@ -0,0 +1,40 @@
++/*
++ * DO NOT MODIFY.
++ *
++ * This file was generated by arch/um/Makefile
++ *
++ */
++
++#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2)	# */
++#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err)	# */
++#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno)	# */
++#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long)	# */
++#define HOST_RBX 5 /* RBX	# */
++#define HOST_RCX 11 /* RCX	# */
++#define HOST_RDI 14 /* RDI	# */
++#define HOST_RSI 13 /* RSI	# */
++#define HOST_RDX 12 /* RDX	# */
++#define HOST_RBP 4 /* RBP	# */
++#define HOST_RAX 10 /* RAX	# */
++#define HOST_R8 9 /* R8	# */
++#define HOST_R9 8 /* R9	# */
++#define HOST_R10 7 /* R10	# */
++#define HOST_R11 6 /* R11	# */
++#define HOST_R12 3 /* R12	# */
++#define HOST_R13 2 /* R13	# */
++#define HOST_R14 1 /* R14	# */
++#define HOST_R15 0 /* R15	# */
++#define HOST_ORIG_RAX 15 /* ORIG_RAX	# */
++#define HOST_CS 17 /* CS	# */
++#define HOST_SS 20 /* SS	# */
++#define HOST_EFLAGS 18 /* EFLAGS	# */
++#define HOST_IP 16 /* RIP	# */
++#define HOST_SP 19 /* RSP	# */
++#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct)	# */
++#define UM_POLLIN 1 /* POLLIN	# */
++#define UM_POLLPRI 2 /* POLLPRI	# */
++#define UM_POLLOUT 4 /* POLLOUT	# */
++#define UM_PROT_READ 1 /* PROT_READ	# */
++#define UM_PROT_WRITE 2 /* PROT_WRITE	# */
++#define UM_PROT_EXEC 4 /* PROT_EXEC	# */
++
+diff -NurpP --minimal linux-3.4.45/arch/x86/Kconfig linux-3.4.45-vs2.3.3.9/arch/x86/Kconfig
+--- linux-3.4.45/arch/x86/Kconfig	2013-05-13 17:36:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/x86/Kconfig	2013-03-02 15:26:44.000000000 +0000
+@@ -2221,6 +2221,8 @@ source "fs/Kconfig"
+ 
+ source "arch/x86/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.4.45/arch/x86/syscalls/syscall_32.tbl linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.4.45/arch/x86/syscalls/syscall_32.tbl	2012-05-21 16:06:42.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_32.tbl	2012-05-21 16:15:04.000000000 +0000
+@@ -279,7 +279,7 @@
+ 270	i386	tgkill			sys_tgkill
+ 271	i386	utimes			sys_utimes			compat_sys_utimes
+ 272	i386	fadvise64_64		sys_fadvise64_64		sys32_fadvise64_64
+-273	i386	vserver
++273	i386	vserver			sys_vserver			sys32_vserver
+ 274	i386	mbind			sys_mbind
+ 275	i386	get_mempolicy		sys_get_mempolicy		compat_sys_get_mempolicy
+ 276	i386	set_mempolicy		sys_set_mempolicy
+diff -NurpP --minimal linux-3.4.45/arch/x86/syscalls/syscall_64.tbl linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.4.45/arch/x86/syscalls/syscall_64.tbl	2013-05-13 17:36:19.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/arch/x86/syscalls/syscall_64.tbl	2012-09-16 18:49:11.000000000 +0000
+@@ -242,7 +242,7 @@
+ 233	common	epoll_ctl		sys_epoll_ctl
+ 234	common	tgkill			sys_tgkill
+ 235	common	utimes			sys_utimes
+-236	64	vserver
++236	64	vserver			sys_vserver
+ 237	common	mbind			sys_mbind
+ 238	common	set_mempolicy		sys_set_mempolicy
+ 239	common	get_mempolicy		sys_get_mempolicy
+diff -NurpP --minimal linux-3.4.45/drivers/block/Kconfig linux-3.4.45-vs2.3.3.9/drivers/block/Kconfig
+--- linux-3.4.45/drivers/block/Kconfig	2012-05-21 16:06:43.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP
+ 
+ source "drivers/block/drbd/Kconfig"
+ 
++config BLK_DEV_VROOT
++	tristate "Virtual Root device support"
++	depends on QUOTACTL
++	---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
+diff -NurpP --minimal linux-3.4.45/drivers/block/Makefile linux-3.4.45-vs2.3.3.9/drivers/block/Makefile
+--- linux-3.4.45/drivers/block/Makefile	2012-03-19 18:46:52.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/Makefile	2012-05-21 16:15:04.000000000 +0000
+@@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD)		+= viodasd.o
+ obj-$(CONFIG_BLK_DEV_SX8)	+= sx8.o
+ obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
+ obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
++obj-$(CONFIG_BLK_DEV_VROOT)	+= vroot.o
+ 
+ obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
+ obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/
+diff -NurpP --minimal linux-3.4.45/drivers/block/loop.c linux-3.4.45-vs2.3.3.9/drivers/block/loop.c
+--- linux-3.4.45/drivers/block/loop.c	2013-05-13 17:36:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/loop.c	2013-05-13 18:16:08.000000000 +0000
+@@ -76,6 +76,7 @@
+ #include <linux/sysfs.h>
+ #include <linux/miscdevice.h>
+ #include <linux/falloc.h>
++#include <linux/vs_context.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_devic
+ 	lo->lo_blocksize = lo_blocksize;
+ 	lo->lo_device = bdev;
+ 	lo->lo_flags = lo_flags;
++	lo->lo_xid = vx_current_xid();
+ 	lo->lo_backing_file = file;
+ 	lo->transfer = transfer_none;
+ 	lo->ioctl = NULL;
+@@ -1006,6 +1008,7 @@ static int loop_clr_fd(struct loop_devic
+ 	lo->lo_sizelimit = 0;
+ 	lo->lo_encrypt_key_size = 0;
+ 	lo->lo_thread = NULL;
++	lo->lo_xid = 0;
+ 	memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
+ 	memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
+ 	memset(lo->lo_file_name, 0, LO_NAME_SIZE);
+@@ -1049,7 +1052,7 @@ loop_set_status(struct loop_device *lo,
+ 
+ 	if (lo->lo_encrypt_key_size &&
+ 	    lo->lo_key_owner != uid &&
+-	    !capable(CAP_SYS_ADMIN))
++	    !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
+ 		return -EPERM;
+ 	if (lo->lo_state != Lo_bound)
+ 		return -ENXIO;
+@@ -1139,7 +1142,8 @@ loop_get_status(struct loop_device *lo,
+ 	memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
+ 	info->lo_encrypt_type =
+ 		lo->lo_encryption ? lo->lo_encryption->number : 0;
+-	if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
++	if (lo->lo_encrypt_key_size &&
++		vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
+ 		info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
+ 		memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
+ 		       lo->lo_encrypt_key_size);
+@@ -1497,6 +1501,11 @@ static int lo_open(struct block_device *
+ 		goto out;
+ 	}
+ 
++	if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
++		err = -EACCES;
++		goto out;
++	}
++
+ 	mutex_lock(&lo->lo_ctl_mutex);
+ 	lo->lo_refcnt++;
+ 	mutex_unlock(&lo->lo_ctl_mutex);
+diff -NurpP --minimal linux-3.4.45/drivers/block/vroot.c linux-3.4.45-vs2.3.3.9/drivers/block/vroot.c
+--- linux-3.4.45/drivers/block/vroot.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/block/vroot.c	2012-05-21 16:15:04.000000000 +0000
+@@ -0,0 +1,291 @@
++/*
++ *  linux/drivers/block/vroot.c
++ *
++ *  written by Herbert Pötzl, 9/11/2002
++ *  ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ *
++ *  based on the loop.c code by Theodore Ts'o.
++ *
++ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/file.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
++#include <linux/slab.h>
++
++#include <linux/vroot.h>
++#include <linux/vs_context.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 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(VXD_CBIT(misc, 0),
++		"vroot[%d]_set_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	vr->vr_state = Vr_bound;
++	error = 0;
++
++ out_fput:
++	fput(file);
++ out:
++	return error;
++}
++
++static int vroot_clr_dev(
++	struct vroot_device *vr,
++	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(VXD_CBIT(misc, 0),
++		"vroot[%d]_clr_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	bdput(real_bdev);
++	vr->vr_state = Vr_unbound;
++	vr->vr_device = NULL;
++	return 0;
++}
++
++
++static int vr_ioctl(struct block_device *bdev, fmode_t mode,
++	unsigned int cmd, unsigned long arg)
++{
++	struct vroot_device *vr = bdev->bd_disk->private_data;
++	int err;
++
++	down(&vr->vr_ctl_mutex);
++	switch (cmd) {
++	case VROOT_SET_DEV:
++		err = vroot_set_dev(vr, bdev, arg);
++		break;
++	case VROOT_CLR_DEV:
++		err = vroot_clr_dev(vr, bdev);
++		break;
++	default:
++		err = -EINVAL;
++		break;
++	}
++	up(&vr->vr_ctl_mutex);
++	return err;
++}
++
++static int vr_open(struct block_device *bdev, fmode_t mode)
++{
++	struct vroot_device *vr = 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 gendisk *disk, fmode_t mode)
++{
++	struct vroot_device *vr = 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,
++};
++
++static void vroot_make_request(struct request_queue *q, struct bio *bio)
++{
++	printk("vroot_make_request %p, %p\n", q, bio);
++	bio_io_error(bio);
++}
++
++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(VXD_CBIT(misc, 0),
++		"vroot[%d]_get_real_bdev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	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 Pötzl");
++MODULE_DESCRIPTION ("Virtual Root Device Mapper");
++
++
++int __init vroot_init(void)
++{
++	int err, 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;
++
++	err = -ENOMEM;
++	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;
++		disks[i]->queue = blk_alloc_queue(GFP_KERNEL);
++		if (!disks[i]->queue)
++			goto out_mem3;
++		blk_queue_make_request(disks[i]->queue, vroot_make_request);
++	}
++
++	for (i = 0; i < max_vroot; i++) {
++		struct vroot_device *vr = &vroot_dev[i];
++		struct gendisk *disk = disks[i];
++
++		memset(vr, 0, sizeof(*vr));
++		sema_init(&vr->vr_ctl_mutex, 1);
++		vr->vr_number = i;
++		disk->major = VROOT_MAJOR;
++		disk->first_minor = i;
++		disk->fops = &vr_fops;
++		sprintf(disk->disk_name, "vroot%d", i);
++		disk->private_data = vr;
++	}
++
++	err = register_vroot_grb(&__vroot_get_real_bdev);
++	if (err)
++		goto out_mem3;
++
++	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 err;
++}
++
++void vroot_exit(void)
++{
++	int i;
++
++	if (unregister_vroot_grb(&__vroot_get_real_bdev))
++		printk(KERN_WARNING "vroot: cannot unregister grb\n");
++
++	for (i = 0; i < max_vroot; i++) {
++		del_gendisk(disks[i]);
++		put_disk(disks[i]);
++	}
++	unregister_blkdev(VROOT_MAJOR, "vroot");
++
++	kfree(disks);
++	kfree(vroot_dev);
++}
++
++module_init(vroot_init);
++module_exit(vroot_exit);
++
++#ifndef MODULE
++
++static int __init max_vroot_setup(char *str)
++{
++	max_vroot = simple_strtol(str, NULL, 0);
++	return 1;
++}
++
++__setup("max_vroot=", max_vroot_setup);
++
++#endif
++
+diff -NurpP --minimal linux-3.4.45/drivers/infiniband/Kconfig linux-3.4.45-vs2.3.3.9/drivers/infiniband/Kconfig
+--- linux-3.4.45/drivers/infiniband/Kconfig	2012-03-19 18:46:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/infiniband/Kconfig	2012-05-21 16:15:04.000000000 +0000
+@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
+ config INFINIBAND_ADDR_TRANS
+ 	bool
+ 	depends on INET
+-	depends on !(INFINIBAND = y && IPV6 = m)
++	depends on !(INFINIBAND = y && IPV6 = y)
+ 	default y
+ 
+ source "drivers/infiniband/hw/mthca/Kconfig"
+diff -NurpP --minimal linux-3.4.45/drivers/infiniband/core/addr.c linux-3.4.45-vs2.3.3.9/drivers/infiniband/core/addr.c
+--- linux-3.4.45/drivers/infiniband/core/addr.c	2012-05-21 16:06:46.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/infiniband/core/addr.c	2012-05-21 16:15:04.000000000 +0000
+@@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr
+ 
+ 	if (ipv6_addr_any(&fl6.saddr)) {
+ 		ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
+-					 &fl6.daddr, 0, &fl6.saddr);
++					 &fl6.daddr, 0, &fl6.saddr, NULL);
+ 		if (ret)
+ 			goto put;
+ 
+diff -NurpP --minimal linux-3.4.45/drivers/md/dm-ioctl.c linux-3.4.45-vs2.3.3.9/drivers/md/dm-ioctl.c
+--- linux-3.4.45/drivers/md/dm-ioctl.c	2013-05-13 17:36:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/md/dm-ioctl.c	2013-02-11 23:37:30.000000000 +0000
+@@ -16,6 +16,7 @@
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
+ #include <linux/compat.h>
++#include <linux/vs_context.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell
+ 	unsigned int h = hash_str(str);
+ 
+ 	list_for_each_entry (hc, _name_buckets + h, name_list)
+-		if (!strcmp(hc->name, str)) {
++		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++			!strcmp(hc->name, str)) {
+ 			dm_get(hc->md);
+ 			return hc;
+ 		}
+@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell
+ 	unsigned int h = hash_str(str);
+ 
+ 	list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
+-		if (!strcmp(hc->uuid, str)) {
++		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++			!strcmp(hc->uuid, str)) {
+ 			dm_get(hc->md);
+ 			return hc;
+ 		}
+@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell
+ static struct hash_cell *__get_dev_cell(uint64_t dev)
+ {
+ 	struct mapped_device *md;
+-	struct hash_cell *hc;
++	struct hash_cell *hc = NULL;
+ 
+ 	md = dm_get_md(huge_decode_dev(dev));
+ 	if (!md)
+ 		return NULL;
+ 
+-	hc = dm_get_mdptr(md);
++	if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
++		hc = dm_get_mdptr(md);
++
+ 	if (!hc) {
+ 		dm_put(md);
+ 		return NULL;
+@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+ 
+ static int remove_all(struct dm_ioctl *param, size_t param_size)
+ {
++	if (!vx_check(0, VS_ADMIN))
++		return -EPERM;
++
+ 	dm_hash_remove_all(1);
+ 	param->data_size = 0;
+ 	return 0;
+@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl
+ 	 */
+ 	for (i = 0; i < NUM_BUCKETS; i++) {
+ 		list_for_each_entry (hc, _name_buckets + i, name_list) {
++			if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++				continue;
+ 			needed += sizeof(struct dm_name_list);
+ 			needed += strlen(hc->name) + 1;
+ 			needed += ALIGN_MASK;
+@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl
+ 	 */
+ 	for (i = 0; i < NUM_BUCKETS; i++) {
+ 		list_for_each_entry (hc, _name_buckets + i, name_list) {
++			if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (old_nl)
+ 				old_nl->next = (uint32_t) ((void *) nl -
+ 							   (void *) old_nl);
+@@ -1624,8 +1636,8 @@ static int ctl_ioctl(uint command, struc
+ 	ioctl_fn fn = NULL;
+ 	size_t input_param_size;
+ 
+-	/* only root can play with this */
+-	if (!capable(CAP_SYS_ADMIN))
++	/* only root and certain contexts can play with this */
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
+ 		return -EACCES;
+ 
+ 	if (_IOC_TYPE(command) != DM_IOCTL)
+diff -NurpP --minimal linux-3.4.45/drivers/md/dm.c linux-3.4.45-vs2.3.3.9/drivers/md/dm.c
+--- linux-3.4.45/drivers/md/dm.c	2013-05-13 17:36:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/md/dm.c	2012-12-08 00:53:53.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <linux/idr.h>
+ #include <linux/hdreg.h>
+ #include <linux/delay.h>
++#include <linux/vs_base.h>
+ 
+ #include <trace/events/block.h>
+ 
+@@ -131,6 +132,7 @@ struct mapped_device {
+ 	rwlock_t map_lock;
+ 	atomic_t holders;
+ 	atomic_t open_count;
++	xid_t xid;
+ 
+ 	unsigned long flags;
+ 
+@@ -343,6 +345,7 @@ int dm_deleting_md(struct mapped_device
+ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
+ {
+ 	struct mapped_device *md;
++	int ret = -ENXIO;
+ 
+ 	spin_lock(&_minor_lock);
+ 
+@@ -351,18 +354,19 @@ static int dm_blk_open(struct block_devi
+ 		goto out;
+ 
+ 	if (test_bit(DMF_FREEING, &md->flags) ||
+-	    dm_deleting_md(md)) {
+-		md = NULL;
++	    dm_deleting_md(md))
++		goto out;
++
++	ret = -EACCES;
++	if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
+ 		goto out;
+-	}
+ 
+ 	dm_get(md);
+ 	atomic_inc(&md->open_count);
+-
++	ret = 0;
+ out:
+ 	spin_unlock(&_minor_lock);
+-
+-	return md ? 0 : -ENXIO;
++	return ret;
+ }
+ 
+ static int dm_blk_close(struct gendisk *disk, fmode_t mode)
+@@ -583,6 +587,14 @@ int dm_set_geometry(struct mapped_device
+ 	return 0;
+ }
+ 
++/*
++ * Get the xid associated with a dm device
++ */
++xid_t dm_get_xid(struct mapped_device *md)
++{
++	return md->xid;
++}
++
+ /*-----------------------------------------------------------------
+  * CRUD START:
+  *   A more elegant soln is in the works that uses the queue
+@@ -1876,6 +1888,7 @@ static struct mapped_device *alloc_dev(i
+ 	INIT_LIST_HEAD(&md->uevent_list);
+ 	spin_lock_init(&md->uevent_lock);
+ 
++	md->xid = vx_current_xid();
+ 	md->queue = blk_alloc_queue(GFP_KERNEL);
+ 	if (!md->queue)
+ 		goto bad_queue;
+diff -NurpP --minimal linux-3.4.45/drivers/md/dm.h linux-3.4.45-vs2.3.3.9/drivers/md/dm.h
+--- linux-3.4.45/drivers/md/dm.h	2012-01-09 15:14:21.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/md/dm.h	2012-05-21 16:15:04.000000000 +0000
+@@ -41,6 +41,8 @@ struct dm_dev_internal {
+ struct dm_table;
+ struct dm_md_mempools;
+ 
++xid_t dm_get_xid(struct mapped_device *md);
++
+ /*-----------------------------------------------------------------
+  * Internal table functions.
+  *---------------------------------------------------------------*/
+diff -NurpP --minimal linux-3.4.45/drivers/net/tun.c linux-3.4.45-vs2.3.3.9/drivers/net/tun.c
+--- linux-3.4.45/drivers/net/tun.c	2013-05-13 17:36:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/net/tun.c	2013-03-30 21:29:17.000000000 +0000
+@@ -64,6 +64,7 @@
+ #include <linux/nsproxy.h>
+ #include <linux/virtio_net.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_network.h>
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
+ #include <net/rtnetlink.h>
+@@ -120,6 +121,7 @@ struct tun_struct {
+ 	unsigned int 		flags;
+ 	uid_t			owner;
+ 	gid_t			group;
++	nid_t			nid;
+ 
+ 	struct net_device	*dev;
+ 	netdev_features_t	set_features;
+@@ -912,6 +914,7 @@ static void tun_setup(struct net_device
+ 
+ 	tun->owner = -1;
+ 	tun->group = -1;
++	tun->nid = current->nid;
+ 
+ 	dev->ethtool_ops = &tun_ethtool_ops;
+ 	dev->destructor = tun_free_netdev;
+@@ -1070,7 +1073,7 @@ static int tun_set_iff(struct net *net,
+ 
+ 		if (((tun->owner != -1 && cred->euid != tun->owner) ||
+ 		     (tun->group != -1 && !in_egroup_p(tun->group))) &&
+-		    !capable(CAP_NET_ADMIN))
++		!cap_raised(current_cap(), CAP_NET_ADMIN))
+ 			return -EPERM;
+ 		err = security_tun_dev_attach(tun->socket.sk);
+ 		if (err < 0)
+@@ -1084,7 +1087,7 @@ static int tun_set_iff(struct net *net,
+ 		char *name;
+ 		unsigned long flags = 0;
+ 
+-		if (!capable(CAP_NET_ADMIN))
++		if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE))
+ 			return -EPERM;
+ 		err = security_tun_dev_create();
+ 		if (err < 0)
+@@ -1154,6 +1157,9 @@ static int tun_set_iff(struct net *net,
+ 
+ 		sk->sk_destruct = tun_sock_destruct;
+ 
++		if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P))
++			return -EPERM;
++
+ 		err = tun_attach(tun, file);
+ 		if (err < 0)
+ 			goto failed;
+@@ -1337,6 +1343,16 @@ static long __tun_chr_ioctl(struct file
+ 		tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
+ 		break;
+ 
++	case TUNSETNID:
++		if (!capable(CAP_CONTEXT))
++			return -EPERM;
++
++		/* Set nid owner of the device */
++		tun->nid = (nid_t) arg;
++
++		tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid);
++		break;
++
+ 	case TUNSETLINK:
+ 		/* Only allow setting the type when the interface is down */
+ 		if (tun->dev->flags & IFF_UP) {
+diff -NurpP --minimal linux-3.4.45/drivers/tty/sysrq.c linux-3.4.45-vs2.3.3.9/drivers/tty/sysrq.c
+--- linux-3.4.45/drivers/tty/sysrq.c	2012-05-21 16:07:16.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/tty/sysrq.c	2012-05-21 16:15:04.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/slab.h>
+ #include <linux/input.h>
+ #include <linux/uaccess.h>
++#include <linux/vserver/debug.h>
+ 
+ #include <asm/ptrace.h>
+ #include <asm/irq_regs.h>
+@@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op
+ 	.enable_mask	= SYSRQ_ENABLE_RTNICE,
+ };
+ 
++
++#ifdef CONFIG_VSERVER_DEBUG
++static void sysrq_handle_vxinfo(int key)
++{
++	dump_vx_info_inactive((key == 'x') ? 0 : 1);
++}
++
++static struct sysrq_key_op sysrq_showvxinfo_op = {
++	.handler	= sysrq_handle_vxinfo,
++	.help_msg	= "conteXt",
++	.action_msg	= "Show Context Info",
++	.enable_mask	= SYSRQ_ENABLE_DUMP,
++};
++#endif
++
+ /* Key Operations table and lock */
+ static DEFINE_SPINLOCK(sysrq_key_table_lock);
+ 
+@@ -452,7 +468,11 @@ static struct sysrq_key_op *sysrq_key_ta
+ 	NULL,				/* v */
+ 	&sysrq_showstate_blocked_op,	/* w */
+ 	/* x: May be registered on ppc/powerpc for xmon */
++#ifdef CONFIG_VSERVER_DEBUG
++	&sysrq_showvxinfo_op,		/* x */
++#else
+ 	NULL,				/* x */
++#endif
+ 	/* y: May be registered on sparc64 for global register dump */
+ 	NULL,				/* y */
+ 	&sysrq_ftrace_dump_op,		/* z */
+@@ -467,6 +487,8 @@ static int sysrq_key_table_key2index(int
+ 		retval = key - '0';
+ 	else if ((key >= 'a') && (key <= 'z'))
+ 		retval = key + 10 - 'a';
++	else if ((key >= 'A') && (key <= 'Z'))
++		retval = key + 10 - 'A';
+ 	else
+ 		retval = -1;
+ 	return retval;
+diff -NurpP --minimal linux-3.4.45/drivers/tty/tty_io.c linux-3.4.45-vs2.3.3.9/drivers/tty/tty_io.c
+--- linux-3.4.45/drivers/tty/tty_io.c	2013-05-13 17:36:30.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/drivers/tty/tty_io.c	2013-05-13 18:16:08.000000000 +0000
+@@ -104,6 +104,7 @@
+ 
+ #include <linux/kmod.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_pid.h>
+ 
+ #undef TTY_DEBUG_HANGUP
+ 
+@@ -2128,7 +2129,8 @@ static int tiocsti(struct tty_struct *tt
+ 	char ch, mbz = 0;
+ 	struct tty_ldisc *ld;
+ 
+-	if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
++	if (((current->signal->tty != tty) &&
++		!vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
+ 		return -EPERM;
+ 	if (get_user(ch, p))
+ 		return -EFAULT;
+@@ -2416,6 +2418,7 @@ static int tiocspgrp(struct tty_struct *
+ 		return -ENOTTY;
+ 	if (get_user(pgrp_nr, p))
+ 		return -EFAULT;
++	pgrp_nr = vx_rmap_pid(pgrp_nr);
+ 	if (pgrp_nr < 0)
+ 		return -EINVAL;
+ 	rcu_read_lock();
+diff -NurpP --minimal linux-3.4.45/fs/attr.c linux-3.4.45-vs2.3.3.9/fs/attr.c
+--- linux-3.4.45/fs/attr.c	2013-05-13 17:36:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/attr.c	2012-06-28 14:45:07.000000000 +0000
+@@ -14,6 +14,9 @@
+ #include <linux/fcntl.h>
+ #include <linux/security.h>
+ #include <linux/evm.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/vs_tag.h>
+ 
+ /**
+  * inode_change_ok - check if attribute changes to an inode are allowed
+@@ -74,6 +77,10 @@ int inode_change_ok(const struct inode *
+ 			return -EPERM;
+ 	}
+ 
++	/* check for inode tag permission */
++	if (dx_permission(inode, MAY_WRITE))
++		return -EACCES;
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(inode_change_ok);
+@@ -144,6 +151,8 @@ void setattr_copy(struct inode *inode, c
+ 		inode->i_uid = attr->ia_uid;
+ 	if (ia_valid & ATTR_GID)
+ 		inode->i_gid = attr->ia_gid;
++	if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++		inode->i_tag = attr->ia_tag;
+ 	if (ia_valid & ATTR_ATIME)
+ 		inode->i_atime = timespec_trunc(attr->ia_atime,
+ 						inode->i_sb->s_time_gran);
+@@ -171,7 +180,8 @@ int notify_change(struct dentry * dentry
+ 	struct timespec now;
+ 	unsigned int ia_valid = attr->ia_valid;
+ 
+-	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
++	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
++		ATTR_TAG | ATTR_TIMES_SET)) {
+ 		if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 			return -EPERM;
+ 	}
+diff -NurpP --minimal linux-3.4.45/fs/block_dev.c linux-3.4.45-vs2.3.3.9/fs/block_dev.c
+--- linux-3.4.45/fs/block_dev.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/block_dev.c	2013-05-13 18:16:08.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <linux/namei.h>
+ #include <linux/log2.h>
+ #include <linux/cleancache.h>
++#include <linux/vs_device.h>
+ #include <asm/uaccess.h>
+ #include "internal.h"
+ 
+@@ -581,6 +582,7 @@ struct block_device *bdget(dev_t dev)
+ 		bdev->bd_invalidated = 0;
+ 		inode->i_mode = S_IFBLK;
+ 		inode->i_rdev = dev;
++		inode->i_mdev = dev;
+ 		inode->i_bdev = bdev;
+ 		inode->i_data.a_ops = &def_blk_aops;
+ 		mapping_set_gfp_mask(&inode->i_data, GFP_USER);
+@@ -628,6 +630,11 @@ EXPORT_SYMBOL(bdput);
+ static struct block_device *bd_acquire(struct inode *inode)
+ {
+ 	struct block_device *bdev;
++	dev_t mdev;
++
++	if (!vs_map_blkdev(inode->i_rdev, &mdev, DATTR_OPEN))
++		return NULL;
++	inode->i_mdev = mdev;
+ 
+ 	spin_lock(&bdev_lock);
+ 	bdev = inode->i_bdev;
+@@ -638,7 +645,7 @@ static struct block_device *bd_acquire(s
+ 	}
+ 	spin_unlock(&bdev_lock);
+ 
+-	bdev = bdget(inode->i_rdev);
++	bdev = bdget(mdev);
+ 	if (bdev) {
+ 		spin_lock(&bdev_lock);
+ 		if (!inode->i_bdev) {
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/ctree.h linux-3.4.45-vs2.3.3.9/fs/btrfs/ctree.h
+--- linux-3.4.45/fs/btrfs/ctree.h	2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/ctree.h	2012-05-21 16:15:04.000000000 +0000
+@@ -668,11 +668,14 @@ struct btrfs_inode_item {
+ 	/* modification sequence number for NFS */
+ 	__le64 sequence;
+ 
++	__le16 tag;
+ 	/*
+ 	 * a little future expansion, for more than this we can
+ 	 * just grow the inode item and version it
+ 	 */
+-	__le64 reserved[4];
++	__le16 reserved16;
++	__le32 reserved32;
++	__le64 reserved[3];
+ 	struct btrfs_timespec atime;
+ 	struct btrfs_timespec ctime;
+ 	struct btrfs_timespec mtime;
+@@ -1542,6 +1545,8 @@ struct btrfs_ioctl_defrag_range_args {
+ #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
+ #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	(1 << 22)
+ 
++#define BTRFS_MOUNT_TAGGED		(1 << 24)
++
+ #define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)
+ #define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)
+ #define btrfs_test_opt(root, opt)	((root)->fs_info->mount_opt & \
+@@ -1762,6 +1767,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+ BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
+ BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
+ BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
++BTRFS_SETGET_FUNCS(inode_tag, struct btrfs_inode_item, tag, 16);
+ BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
+ BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
+ BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
+@@ -1815,6 +1821,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+ 
+ BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
+ 
++#define BTRFS_INODE_IXUNLINK		(1 << 24)
++#define BTRFS_INODE_BARRIER		(1 << 25)
++#define BTRFS_INODE_COW			(1 << 26)
++
+ 
+ BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
+ 
+@@ -2959,6 +2969,7 @@ extern const struct dentry_operations bt
+ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+ void btrfs_update_iflags(struct inode *inode);
+ void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
++int btrfs_sync_flags(struct inode *inode, int, int);
+ int btrfs_defrag_file(struct inode *inode, struct file *file,
+ 		      struct btrfs_ioctl_defrag_range_args *range,
+ 		      u64 newer_than, unsigned long max_pages);
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/disk-io.c linux-3.4.45-vs2.3.3.9/fs/btrfs/disk-io.c
+--- linux-3.4.45/fs/btrfs/disk-io.c	2012-05-21 16:07:18.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/disk-io.c	2012-05-21 16:15:04.000000000 +0000
+@@ -2083,6 +2083,9 @@ int open_ctree(struct super_block *sb,
+ 		goto fail_alloc;
+ 	}
+ 
++	if (btrfs_test_opt(tree_root, TAGGED))
++		sb->s_flags |= MS_TAGGED;
++
+ 	features = btrfs_super_incompat_flags(disk_super) &
+ 		~BTRFS_FEATURE_INCOMPAT_SUPP;
+ 	if (features) {
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/inode.c linux-3.4.45-vs2.3.3.9/fs/btrfs/inode.c
+--- linux-3.4.45/fs/btrfs/inode.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/inode.c	2013-05-13 18:16:08.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <linux/slab.h>
+ #include <linux/ratelimit.h>
+ #include <linux/mount.h>
++#include <linux/vs_tag.h>
+ #include "compat.h"
+ #include "ctree.h"
+ #include "disk-io.h"
+@@ -2482,6 +2483,8 @@ static void btrfs_read_locked_inode(stru
+ 	struct btrfs_key location;
+ 	int maybe_acls;
+ 	u32 rdev;
++	uid_t uid;
++	gid_t gid;
+ 	int ret;
+ 	bool filled = false;
+ 
+@@ -2509,8 +2512,13 @@ static void btrfs_read_locked_inode(stru
+ 				    struct btrfs_inode_item);
+ 	inode->i_mode = btrfs_inode_mode(leaf, inode_item);
+ 	set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
+-	inode->i_uid = btrfs_inode_uid(leaf, inode_item);
+-	inode->i_gid = btrfs_inode_gid(leaf, inode_item);
++
++	uid = btrfs_inode_uid(leaf, inode_item);
++	gid = btrfs_inode_gid(leaf, inode_item);
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
++		btrfs_inode_tag(leaf, inode_item));
+ 	btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
+ 
+ 	tspec = btrfs_inode_atime(inode_item);
+@@ -2588,8 +2596,14 @@ static void fill_inode_item(struct btrfs
+ 			    struct btrfs_inode_item *item,
+ 			    struct inode *inode)
+ {
+-	btrfs_set_inode_uid(leaf, item, inode->i_uid);
+-	btrfs_set_inode_gid(leaf, item, inode->i_gid);
++	uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
++
++	btrfs_set_inode_uid(leaf, item, uid);
++	btrfs_set_inode_gid(leaf, item, gid);
++#ifdef CONFIG_TAGGING_INTERN
++	btrfs_set_inode_tag(leaf, item, inode->i_tag);
++#endif
+ 	btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
+ 	btrfs_set_inode_mode(leaf, item, inode->i_mode);
+ 	btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
+@@ -7590,11 +7604,13 @@ static const struct inode_operations btr
+ 	.listxattr	= btrfs_listxattr,
+ 	.removexattr	= btrfs_removexattr,
+ 	.permission	= btrfs_permission,
++	.sync_flags	= btrfs_sync_flags,
+ 	.get_acl	= btrfs_get_acl,
+ };
+ static const struct inode_operations btrfs_dir_ro_inode_operations = {
+ 	.lookup		= btrfs_lookup,
+ 	.permission	= btrfs_permission,
++	.sync_flags	= btrfs_sync_flags,
+ 	.get_acl	= btrfs_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/btrfs/ioctl.c
+--- linux-3.4.45/fs/btrfs/ioctl.c	2012-05-21 16:07:19.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/ioctl.c	2012-05-21 16:15:04.000000000 +0000
+@@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl
+ {
+ 	unsigned int iflags = 0;
+ 
+-	if (flags & BTRFS_INODE_SYNC)
+-		iflags |= FS_SYNC_FL;
+ 	if (flags & BTRFS_INODE_IMMUTABLE)
+ 		iflags |= FS_IMMUTABLE_FL;
++	if (flags & BTRFS_INODE_IXUNLINK)
++		iflags |= FS_IXUNLINK_FL;
++
++	if (flags & BTRFS_INODE_SYNC)
++		iflags |= FS_SYNC_FL;
+ 	if (flags & BTRFS_INODE_APPEND)
+ 		iflags |= FS_APPEND_FL;
+ 	if (flags & BTRFS_INODE_NODUMP)
+@@ -91,28 +94,78 @@ static unsigned int btrfs_flags_to_ioctl
+ 	else if (flags & BTRFS_INODE_NOCOMPRESS)
+ 		iflags |= FS_NOCOMP_FL;
+ 
++	if (flags & BTRFS_INODE_BARRIER)
++		iflags |= FS_BARRIER_FL;
++	if (flags & BTRFS_INODE_COW)
++		iflags |= FS_COW_FL;
+ 	return iflags;
+ }
+ 
+ /*
+- * Update inode->i_flags based on the btrfs internal flags.
++ * Update inode->i_(v)flags based on the btrfs internal flags.
+  */
+ void btrfs_update_iflags(struct inode *inode)
+ {
+ 	struct btrfs_inode *ip = BTRFS_I(inode);
+ 
+-	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+-	if (ip->flags & BTRFS_INODE_SYNC)
+-		inode->i_flags |= S_SYNC;
+ 	if (ip->flags & BTRFS_INODE_IMMUTABLE)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (ip->flags & BTRFS_INODE_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++
++	if (ip->flags & BTRFS_INODE_SYNC)
++		inode->i_flags |= S_SYNC;
+ 	if (ip->flags & BTRFS_INODE_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	if (ip->flags & BTRFS_INODE_NOATIME)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (ip->flags & BTRFS_INODE_DIRSYNC)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (ip->flags & BTRFS_INODE_BARRIER)
++		inode->i_vflags |= V_BARRIER;
++	if (ip->flags & BTRFS_INODE_COW)
++		inode->i_vflags |= V_COW;
++}
++
++/*
++ * Update btrfs internal flags from inode->i_(v)flags.
++ */
++void btrfs_update_flags(struct inode *inode)
++{
++	struct btrfs_inode *ip = BTRFS_I(inode);
++
++	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	ip->flags &= ~(BTRFS_INODE_SYNC | BTRFS_INODE_APPEND |
++			BTRFS_INODE_IMMUTABLE | BTRFS_INODE_IXUNLINK |
++			BTRFS_INODE_NOATIME | BTRFS_INODE_DIRSYNC |
++			BTRFS_INODE_BARRIER | BTRFS_INODE_COW);
++
++	if (flags & S_IMMUTABLE)
++		ip->flags |= BTRFS_INODE_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->flags |= BTRFS_INODE_IXUNLINK;
++
++	if (flags & S_SYNC)
++		ip->flags |= BTRFS_INODE_SYNC;
++	if (flags & S_APPEND)
++		ip->flags |= BTRFS_INODE_APPEND;
++	if (flags & S_NOATIME)
++		ip->flags |= BTRFS_INODE_NOATIME;
++	if (flags & S_DIRSYNC)
++		ip->flags |= BTRFS_INODE_DIRSYNC;
++
++	if (vflags & V_BARRIER)
++		ip->flags |= BTRFS_INODE_BARRIER;
++	if (vflags & V_COW)
++		ip->flags |= BTRFS_INODE_COW;
+ }
+ 
+ /*
+@@ -128,6 +181,7 @@ void btrfs_inherit_iflags(struct inode *
+ 		return;
+ 
+ 	flags = BTRFS_I(dir)->flags;
++	flags &= ~BTRFS_INODE_BARRIER;
+ 
+ 	if (flags & BTRFS_INODE_NOCOMPRESS) {
+ 		BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
+@@ -143,6 +197,30 @@ void btrfs_inherit_iflags(struct inode *
+ 	btrfs_update_iflags(inode);
+ }
+ 
++int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct btrfs_inode *ip = BTRFS_I(inode);
++	struct btrfs_root *root = ip->root;
++	struct btrfs_trans_handle *trans;
++	int ret;
++
++	trans = btrfs_join_transaction(root);
++	BUG_ON(!trans);
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	btrfs_update_flags(inode);
++
++	ret = btrfs_update_inode(trans, root, inode);
++	BUG_ON(ret);
++
++	btrfs_update_iflags(inode);
++	inode->i_ctime = CURRENT_TIME;
++	btrfs_end_transaction(trans, root);
++
++	return 0;
++}
++
+ static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
+ {
+ 	struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
+@@ -199,7 +277,8 @@ static int btrfs_ioctl_setflags(struct f
+ 
+ 	flags = btrfs_mask_flags(inode->i_mode, flags);
+ 	oldflags = btrfs_flags_to_ioctl(ip->flags);
+-	if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
++	if ((flags ^ oldflags) & (FS_APPEND_FL |
++		FS_IMMUTABLE_FL | FS_IXUNLINK_FL)) {
+ 		if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 			ret = -EPERM;
+ 			goto out_unlock;
+@@ -210,14 +289,19 @@ static int btrfs_ioctl_setflags(struct f
+ 	if (ret)
+ 		goto out_unlock;
+ 
+-	if (flags & FS_SYNC_FL)
+-		ip->flags |= BTRFS_INODE_SYNC;
+-	else
+-		ip->flags &= ~BTRFS_INODE_SYNC;
+ 	if (flags & FS_IMMUTABLE_FL)
+ 		ip->flags |= BTRFS_INODE_IMMUTABLE;
+ 	else
+ 		ip->flags &= ~BTRFS_INODE_IMMUTABLE;
++	if (flags & FS_IXUNLINK_FL)
++		ip->flags |= BTRFS_INODE_IXUNLINK;
++	else
++		ip->flags &= ~BTRFS_INODE_IXUNLINK;
++
++	if (flags & FS_SYNC_FL)
++		ip->flags |= BTRFS_INODE_SYNC;
++	else
++		ip->flags &= ~BTRFS_INODE_SYNC;
+ 	if (flags & FS_APPEND_FL)
+ 		ip->flags |= BTRFS_INODE_APPEND;
+ 	else
+diff -NurpP --minimal linux-3.4.45/fs/btrfs/super.c linux-3.4.45-vs2.3.3.9/fs/btrfs/super.c
+--- linux-3.4.45/fs/btrfs/super.c	2012-05-21 16:07:19.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/btrfs/super.c	2012-05-21 16:15:04.000000000 +0000
+@@ -279,7 +279,7 @@ enum {
+ 	Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
+ 	Opt_check_integrity, Opt_check_integrity_including_extent_data,
+ 	Opt_check_integrity_print_mask, Opt_fatal_errors,
+-	Opt_err,
++	Opt_tag, Opt_notag, Opt_tagid, Opt_err,
+ };
+ 
+ static match_table_t tokens = {
+@@ -319,6 +319,9 @@ static match_table_t tokens = {
+ 	{Opt_check_integrity_including_extent_data, "check_int_data"},
+ 	{Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
+ 	{Opt_fatal_errors, "fatal_errors=%s"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -564,6 +567,22 @@ int btrfs_parse_options(struct btrfs_roo
+ 				goto out;
+ 			}
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			printk(KERN_INFO "btrfs: use tagging\n");
++			btrfs_set_opt(info->mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			printk(KERN_INFO "btrfs: disabled tagging\n");
++			btrfs_clear_opt(info->mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			btrfs_set_opt(info->mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_err:
+ 			printk(KERN_INFO "btrfs: unrecognized mount option "
+ 			       "'%s'\n", p);
+@@ -1137,6 +1156,12 @@ static int btrfs_remount(struct super_bl
+ 		goto restore;
+ 	}
+ 
++	if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++		printk("btrfs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		return -EINVAL;
++	}
++
+ 	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+ 		return 0;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/char_dev.c linux-3.4.45-vs2.3.3.9/fs/char_dev.c
+--- linux-3.4.45/fs/char_dev.c	2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/char_dev.c	2012-05-21 16:15:04.000000000 +0000
+@@ -21,6 +21,8 @@
+ #include <linux/mutex.h>
+ #include <linux/backing-dev.h>
+ #include <linux/tty.h>
++#include <linux/vs_context.h>
++#include <linux/vs_device.h>
+ 
+ #include "internal.h"
+ 
+@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino
+ 	struct cdev *p;
+ 	struct cdev *new = NULL;
+ 	int ret = 0;
++	dev_t mdev;
++
++	if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
++		return -EPERM;
++	inode->i_mdev = mdev;
+ 
+ 	spin_lock(&cdev_lock);
+ 	p = inode->i_cdev;
+ 	if (!p) {
+ 		struct kobject *kobj;
+ 		int idx;
++
+ 		spin_unlock(&cdev_lock);
+-		kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
++
++		kobj = kobj_lookup(cdev_map, mdev, &idx);
+ 		if (!kobj)
+ 			return -ENXIO;
+ 		new = container_of(kobj, struct cdev, kobj);
+diff -NurpP --minimal linux-3.4.45/fs/dcache.c linux-3.4.45-vs2.3.3.9/fs/dcache.c
+--- linux-3.4.45/fs/dcache.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/dcache.c	2013-05-13 18:16:08.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/rculist_bl.h>
+ #include <linux/prefetch.h>
+ #include <linux/ratelimit.h>
++#include <linux/vs_limit.h>
+ #include "internal.h"
+ #include "mount.h"
+ 
+@@ -601,6 +602,8 @@ int d_invalidate(struct dentry * dentry)
+ 		spin_lock(&dentry->d_lock);
+ 	}
+ 
++	vx_dentry_dec(dentry);
++
+ 	/*
+ 	 * Somebody else still using it?
+ 	 *
+@@ -630,6 +633,7 @@ EXPORT_SYMBOL(d_invalidate);
+ static inline void __dget_dlock(struct dentry *dentry)
+ {
+ 	dentry->d_count++;
++	vx_dentry_inc(dentry);
+ }
+ 
+ static inline void __dget(struct dentry *dentry)
+@@ -1260,6 +1264,9 @@ struct dentry *__d_alloc(struct super_bl
+ 	struct dentry *dentry;
+ 	char *dname;
+ 
++	if (!vx_dentry_avail(1))
++		return NULL;
++
+ 	dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
+ 	if (!dentry)
+ 		return NULL;
+@@ -1282,6 +1289,7 @@ struct dentry *__d_alloc(struct super_bl
+ 
+ 	dentry->d_count = 1;
+ 	dentry->d_flags = 0;
++	vx_dentry_inc(dentry);
+ 	spin_lock_init(&dentry->d_lock);
+ 	seqcount_init(&dentry->d_seq);
+ 	dentry->d_inode = NULL;
+@@ -1943,6 +1951,7 @@ struct dentry *__d_lookup(struct dentry
+ 		}
+ 
+ 		dentry->d_count++;
++		vx_dentry_inc(dentry);
+ 		found = dentry;
+ 		spin_unlock(&dentry->d_lock);
+ 		break;
+diff -NurpP --minimal linux-3.4.45/fs/devpts/inode.c linux-3.4.45-vs2.3.3.9/fs/devpts/inode.c
+--- linux-3.4.45/fs/devpts/inode.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/devpts/inode.c	2012-05-21 16:15:04.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/parser.h>
+ #include <linux/fsnotify.h>
+ #include <linux/seq_file.h>
++#include <linux/vs_base.h>
+ 
+ #define DEVPTS_DEFAULT_MODE 0600
+ /*
+@@ -36,6 +37,21 @@
+ #define DEVPTS_DEFAULT_PTMX_MODE 0000
+ #define PTMX_MINOR	2
+ 
++static int devpts_permission(struct inode *inode, int mask)
++{
++	int ret = -EACCES;
++
++	/* devpts is xid tagged */
++	if (vx_check((xid_t)inode->i_tag, VS_WATCH_P | VS_IDENT))
++		ret = generic_permission(inode, mask);
++	return ret;
++}
++
++static struct inode_operations devpts_file_inode_operations = {
++	.permission     = devpts_permission,
++};
++
++
+ /*
+  * sysctl support for setting limits on the number of Unix98 ptys allocated.
+  * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
+@@ -328,6 +344,34 @@ static int devpts_show_options(struct se
+ 	return 0;
+ }
+ 
++static int devpts_filter(struct dentry *de)
++{
++	xid_t xid = 0;
++
++	/* devpts is xid tagged */
++	if (de && de->d_inode)
++		xid = (xid_t)de->d_inode->i_tag;
++#ifdef CONFIG_VSERVER_WARN_DEVPTS
++	else
++		vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
++			de->d_name.len, de->d_name.name);
++#endif
++	return vx_check(xid, VS_WATCH_P | VS_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 const struct super_operations devpts_sops = {
+ 	.statfs		= simple_statfs,
+ 	.remount_fs	= devpts_remount,
+@@ -371,8 +415,10 @@ devpts_fill_super(struct super_block *s,
+ 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ 	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;
+ 	set_nlink(inode, 2);
++	/* devpts is xid tagged */
++	inode->i_tag = (tag_t)vx_current_xid();
+ 
+ 	s->s_root = d_make_root(inode);
+ 	if (s->s_root)
+@@ -564,6 +610,9 @@ int devpts_pty_new(struct inode *ptmx_in
+ 	inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
+ 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ 	init_special_inode(inode, S_IFCHR|opts->mode, device);
++	/* devpts is xid tagged */
++	inode->i_tag = (tag_t)vx_current_xid();
++	inode->i_op = &devpts_file_inode_operations;
+ 	inode->i_private = tty;
+ 	tty->driver_data = inode;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext2/balloc.c linux-3.4.45-vs2.3.3.9/fs/ext2/balloc.c
+--- linux-3.4.45/fs/ext2/balloc.c	2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/balloc.c	2012-05-21 16:15:04.000000000 +0000
+@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
+ 			start = 0;
+ 		end = EXT2_BLOCKS_PER_GROUP(sb);
+ 	}
+-
+ 	BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
+ 
+ repeat:
+diff -NurpP --minimal linux-3.4.45/fs/ext2/ext2.h linux-3.4.45-vs2.3.3.9/fs/ext2/ext2.h
+--- linux-3.4.45/fs/ext2/ext2.h	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/ext2.h	2012-05-21 16:15:05.000000000 +0000
+@@ -244,8 +244,12 @@ struct ext2_group_desc
+ #define EXT2_NOTAIL_FL			FS_NOTAIL_FL	/* file tail should not be merged */
+ #define EXT2_DIRSYNC_FL			FS_DIRSYNC_FL	/* dirsync behaviour (directories only) */
+ #define EXT2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
++#define EXT2_IXUNLINK_FL		FS_IXUNLINK_FL	/* Immutable invert on unlink */
+ #define EXT2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
+ 
++#define EXT2_BARRIER_FL			FS_BARRIER_FL	/* Barrier for chroot() */
++#define EXT2_COW_FL			FS_COW_FL	/* Copy on Write marker */
++
+ #define EXT2_FL_USER_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
+ #define EXT2_FL_USER_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
+ 
+@@ -329,7 +333,8 @@ struct ext2_inode {
+ 			__u16	i_pad1;
+ 			__le16	l_i_uid_high;	/* these 2 fields    */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+-			__u32	l_i_reserved2;
++			__le16	l_i_tag;	/* Context Tag */
++			__u16	l_i_reserved2;
+ 		} linux2;
+ 		struct {
+ 			__u8	h_i_frag;	/* Fragment number */
+@@ -357,6 +362,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_tag	osd2.linux2.l_i_tag
+ #define i_reserved2	osd2.linux2.l_i_reserved2
+ 
+ /*
+@@ -384,6 +390,7 @@ struct ext2_inode {
+ #define EXT2_MOUNT_USRQUOTA		0x020000  /* user quota */
+ #define EXT2_MOUNT_GRPQUOTA		0x040000  /* group quota */
+ #define EXT2_MOUNT_RESERVATION		0x080000  /* Preallocation */
++#define EXT2_MOUNT_TAGGED		(1<<24)	  /* Enable Context Tags */
+ 
+ 
+ #define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt
+@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct
+ extern void ext2_get_inode_flags(struct ext2_inode_info *);
+ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		       u64 start, u64 len);
++extern int ext2_sync_flags(struct inode *, int, int);
+ 
+ /* ioctl.c */
+ extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
+diff -NurpP --minimal linux-3.4.45/fs/ext2/file.c linux-3.4.45-vs2.3.3.9/fs/ext2/file.c
+--- linux-3.4.45/fs/ext2/file.c	2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/file.c	2012-05-21 16:15:05.000000000 +0000
+@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
+ 	.setattr	= ext2_setattr,
+ 	.get_acl	= ext2_get_acl,
+ 	.fiemap		= ext2_fiemap,
++	.sync_flags	= ext2_sync_flags,
+ };
+diff -NurpP --minimal linux-3.4.45/fs/ext2/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext2/ialloc.c
+--- linux-3.4.45/fs/ext2/ialloc.c	2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/ialloc.c	2012-05-21 16:15:05.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/buffer_head.h>
+ #include <linux/random.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -549,6 +550,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext2/inode.c linux-3.4.45-vs2.3.3.9/fs/ext2/inode.c
+--- linux-3.4.45/fs/ext2/inode.c	2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/inode.c	2012-05-21 16:15:05.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <linux/mpage.h>
+ #include <linux/fiemap.h>
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "acl.h"
+ #include "xip.h"
+@@ -1162,7 +1163,7 @@ static void ext2_truncate_blocks(struct
+ 		return;
+ 	if (ext2_inode_is_fast_symlink(inode))
+ 		return;
+-	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++	if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ 		return;
+ 	__ext2_truncate_blocks(inode, offset);
+ }
+@@ -1253,36 +1254,61 @@ void ext2_set_inode_flags(struct 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_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++
++	if (flags & EXT2_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT2_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	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_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT2_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT2_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT2_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */
+ void ext2_get_inode_flags(struct ext2_inode_info *ei)
+ {
+ 	unsigned int flags = ei->vfs_inode.i_flags;
++	unsigned int vflags = ei->vfs_inode.i_vflags;
++
++	ei->i_flags &= ~(EXT2_SYNC_FL | EXT2_APPEND_FL |
++			EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL |
++			EXT2_NOATIME_FL | EXT2_DIRSYNC_FL |
++			EXT2_BARRIER_FL | EXT2_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		ei->i_flags |= EXT2_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		ei->i_flags |= EXT2_IXUNLINK_FL;
+ 
+-	ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL|
+-			EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		ei->i_flags |= EXT2_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		ei->i_flags |= EXT2_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		ei->i_flags |= EXT2_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		ei->i_flags |= EXT2_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		ei->i_flags |= EXT2_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		ei->i_flags |= EXT2_BARRIER_FL;
++	if (vflags & V_COW)
++		ei->i_flags |= EXT2_COW_FL;
+ }
+ 
+ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
+@@ -1292,6 +1318,8 @@ struct inode *ext2_iget (struct super_bl
+ 	struct ext2_inode *raw_inode;
+ 	struct inode *inode;
+ 	long ret = -EIO;
++	uid_t uid;
++	gid_t gid;
+ 	int n;
+ 
+ 	inode = iget_locked(sb, ino);
+@@ -1310,12 +1338,16 @@ struct inode *ext2_iget (struct super_bl
+ 	}
+ 
+ 	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 = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
++		le16_to_cpu(raw_inode->i_raw_tag));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 	inode->i_size = le32_to_cpu(raw_inode->i_size);
+ 	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
+@@ -1413,8 +1445,8 @@ static int __ext2_write_inode(struct ino
+ 	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 = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+ 	struct buffer_head * bh;
+ 	struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
+ 	int n;
+@@ -1450,6 +1482,9 @@ static int __ext2_write_inode(struct ino
+ 		raw_inode->i_uid_high = 0;
+ 		raw_inode->i_gid_high = 0;
+ 	}
++#ifdef CONFIG_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
++#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);
+@@ -1530,7 +1565,8 @@ int ext2_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, iattr))
+ 		dquot_initialize(inode);
+ 	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_TAG && iattr->ia_tag != inode->i_tag)) {
+ 		error = dquot_transfer(inode, iattr);
+ 		if (error)
+ 			return error;
+diff -NurpP --minimal linux-3.4.45/fs/ext2/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext2/ioctl.c
+--- linux-3.4.45/fs/ext2/ioctl.c	2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/ioctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -17,6 +17,16 @@
+ #include <asm/uaccess.h>
+ 
+ 
++int ext2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext2_get_inode_flags(EXT2_I(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++	mark_inode_dirty(inode);
++	return 0;
++}
++
+ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext2_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		mutex_lock(&inode->i_mutex);
+ 		/* Is it quota file? Do not allow user to mess with it */
+ 		if (IS_NOQUOTA(inode)) {
+@@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * 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_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				ret = -EPERM;
+@@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
+ 			}
+ 		}
+ 
+-		flags = flags & EXT2_FL_USER_MODIFIABLE;
++		flags &= EXT2_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
+ 		ei->i_flags = flags;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext2/namei.c linux-3.4.45-vs2.3.3.9/fs/ext2/namei.c
+--- linux-3.4.45/fs/ext2/namei.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/namei.c	2012-05-21 16:15:05.000000000 +0000
+@@ -32,6 +32,7 @@
+ 
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct
+ 					(unsigned long) ino);
+ 			return ERR_PTR(-EIO);
+ 		}
++		dx_propagate_tag(nd, inode);
+ 	}
+ 	return d_splice_alias(inode, dentry);
+ }
+@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i
+ 	.removexattr	= generic_removexattr,
+ #endif
+ 	.setattr	= ext2_setattr,
++	.sync_flags	= ext2_sync_flags,
+ 	.get_acl	= ext2_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext2/super.c linux-3.4.45-vs2.3.3.9/fs/ext2/super.c
+--- linux-3.4.45/fs/ext2/super.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext2/super.c	2012-05-21 16:15:05.000000000 +0000
+@@ -393,7 +393,8 @@ enum {
+ 	Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
+ 	Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
+ 	Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
+-	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
++	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -421,6 +422,9 @@ static const match_table_t tokens = {
+ 	{Opt_acl, "acl"},
+ 	{Opt_noacl, "noacl"},
+ 	{Opt_xip, "xip"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_grpquota, "grpquota"},
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_quota, "quota"},
+@@ -491,6 +495,20 @@ static int parse_options(char *options,
+ 		case Opt_nouid32:
+ 			set_opt (sbi->s_mount_opt, NO_UID32);
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			clear_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_nocheck:
+ 			clear_opt (sbi->s_mount_opt, CHECK);
+ 			break;
+@@ -849,6 +867,8 @@ static int ext2_fill_super(struct super_
+ 	if (!parse_options((char *) data, sb))
+ 		goto failed_mount;
+ 
++	if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
+ 		 MS_POSIXACL : 0);
+@@ -1222,6 +1242,14 @@ static int ext2_remount (struct super_bl
+ 		err = -EINVAL;
+ 		goto restore_opts;
+ 	}
++
++	if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT2-fs: %s: tagging not permitted on remount.\n",
++		       sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
+ 
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+diff -NurpP --minimal linux-3.4.45/fs/ext3/ext3.h linux-3.4.45-vs2.3.3.9/fs/ext3/ext3.h
+--- linux-3.4.45/fs/ext3/ext3.h	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/ext3.h	2012-05-21 17:13:31.000000000 +0000
+@@ -151,10 +151,14 @@ 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_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ #define EXT3_RESERVED_FL		0x80000000 /* reserved for ext3 lib */
+ 
+-#define EXT3_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+-#define EXT3_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
++#define EXT3_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define EXT3_COW_FL			0x20000000 /* Copy on Write marker */
++
++#define EXT3_FL_USER_VISIBLE		0x0103DFFF /* User visible flags */
++#define EXT3_FL_USER_MODIFIABLE		0x010380FF /* User modifiable flags */
+ 
+ /* Flags that should be inherited by new inodes from their parent. */
+ #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
+@@ -290,7 +294,8 @@ struct ext3_inode {
+ 			__u16	i_pad1;
+ 			__le16	l_i_uid_high;	/* these 2 fields    */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+-			__u32	l_i_reserved2;
++			__le16	l_i_tag;	/* Context Tag */
++			__u16	l_i_reserved2;
+ 		} linux2;
+ 		struct {
+ 			__u8	h_i_frag;	/* Fragment number */
+@@ -320,6 +325,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_tag	osd2.linux2.l_i_tag
+ #define i_reserved2	osd2.linux2.l_i_reserved2
+ 
+ /*
+@@ -364,6 +370,7 @@ struct ext3_inode {
+ #define EXT3_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */
+ #define EXT3_MOUNT_DATA_ERR_ABORT	0x400000 /* Abort on file data write
+ 						  * error in ordered mode */
++#define EXT3_MOUNT_TAGGED		(1<<24) /* Enable Context Tags */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+@@ -1057,6 +1064,7 @@ extern void ext3_get_inode_flags(struct
+ extern void ext3_set_aops(struct inode *inode);
+ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		       u64 start, u64 len);
++extern int ext3_sync_flags(struct inode *, int, int);
+ 
+ /* ioctl.c */
+ extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
+diff -NurpP --minimal linux-3.4.45/fs/ext3/file.c linux-3.4.45-vs2.3.3.9/fs/ext3/file.c
+--- linux-3.4.45/fs/ext3/file.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/file.c	2012-05-21 16:15:05.000000000 +0000
+@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
+ #endif
+ 	.get_acl	= ext3_get_acl,
+ 	.fiemap		= ext3_fiemap,
++	.sync_flags	= ext3_sync_flags,
+ };
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext3/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext3/ialloc.c
+--- linux-3.4.45/fs/ext3/ialloc.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/ialloc.c	2012-05-21 16:15:05.000000000 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <linux/quotaops.h>
+ #include <linux/random.h>
++#include <linux/vs_tag.h>
+ 
+ #include "ext3.h"
+ #include "xattr.h"
+@@ -485,6 +486,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext3/inode.c linux-3.4.45-vs2.3.3.9/fs/ext3/inode.c
+--- linux-3.4.45/fs/ext3/inode.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/inode.c	2012-09-16 18:49:11.000000000 +0000
+@@ -27,6 +27,8 @@
+ #include <linux/writeback.h>
+ #include <linux/mpage.h>
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
++
+ #include "ext3.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -2848,36 +2850,60 @@ void ext3_set_inode_flags(struct 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_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++	if (flags & EXT3_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT3_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	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_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT3_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT3_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT3_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT3_I(inode)->i_flags */
+ void ext3_get_inode_flags(struct ext3_inode_info *ei)
+ {
+ 	unsigned int flags = ei->vfs_inode.i_flags;
++	unsigned int vflags = ei->vfs_inode.i_vflags;
++
++	ei->i_flags &= ~(EXT3_SYNC_FL | EXT3_APPEND_FL |
++			EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL |
++			EXT3_NOATIME_FL | EXT3_DIRSYNC_FL |
++			EXT3_BARRIER_FL | EXT3_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		ei->i_flags |= EXT3_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		ei->i_flags |= EXT3_IXUNLINK_FL;
+ 
+-	ei->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL|
+-			EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		ei->i_flags |= EXT3_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		ei->i_flags |= EXT3_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		ei->i_flags |= EXT3_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		ei->i_flags |= EXT3_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		ei->i_flags |= EXT3_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		ei->i_flags |= EXT3_BARRIER_FL;
++	if (vflags & V_COW)
++		ei->i_flags |= EXT3_COW_FL;
+ }
+ 
+ struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
+@@ -2891,6 +2917,8 @@ struct inode *ext3_iget(struct super_blo
+ 	transaction_t *transaction;
+ 	long ret;
+ 	int block;
++	uid_t uid;
++	gid_t gid;
+ 
+ 	inode = iget_locked(sb, ino);
+ 	if (!inode)
+@@ -2907,12 +2935,16 @@ struct inode *ext3_iget(struct super_blo
+ 	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 = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
++		le16_to_cpu(raw_inode->i_raw_tag));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 	inode->i_size = le32_to_cpu(raw_inode->i_size);
+ 	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
+@@ -3067,6 +3099,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 = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+ 	int err = 0, rc, block;
+ 	int need_datasync = 0;
+ 	__le32 disksize;
+@@ -3083,29 +3117,32 @@ again:
+ 	ext3_get_inode_flags(ei);
+ 	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_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
++#endif
+ 	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ 	disksize = cpu_to_le32(ei->i_disksize);
+ 	if (disksize != raw_inode->i_size) {
+@@ -3274,7 +3311,8 @@ int ext3_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, attr))
+ 		dquot_initialize(inode);
+ 	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_TAG && attr->ia_tag != inode->i_tag)) {
+ 		handle_t *handle;
+ 
+ 		/* (user+group)*(old+new) structure, inode write (sb,
+@@ -3296,6 +3334,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_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		error = ext3_mark_inode_dirty(handle, inode);
+ 		ext3_journal_stop(handle);
+ 	}
+diff -NurpP --minimal linux-3.4.45/fs/ext3/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext3/ioctl.c
+--- linux-3.4.45/fs/ext3/ioctl.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/ioctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -12,6 +12,34 @@
+ #include <asm/uaccess.h>
+ #include "ext3.h"
+ 
++
++int ext3_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	handle_t *handle = NULL;
++	struct ext3_iloc iloc;
++	int err;
++
++	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;
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext3_get_inode_flags(EXT3_I(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++
++	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++	ext3_journal_stop(handle);
++	return err;
++}
++
+ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext3_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		mutex_lock(&inode->i_mutex);
+ 
+ 		/* Is it quota file? Do not allow user to mess with it */
+@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * 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_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE))
+ 				goto flags_out;
+ 		}
+@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig
+ 		if (err)
+ 			goto flags_err;
+ 
+-		flags = flags & EXT3_FL_USER_MODIFIABLE;
++		flags &= EXT3_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
+ 		ei->i_flags = flags;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext3/namei.c linux-3.4.45-vs2.3.3.9/fs/ext3/namei.c
+--- linux-3.4.45/fs/ext3/namei.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/namei.c	2012-05-21 16:15:05.000000000 +0000
+@@ -25,6 +25,8 @@
+  */
+ 
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
++
+ #include "ext3.h"
+ #include "namei.h"
+ #include "xattr.h"
+@@ -915,6 +917,7 @@ restart:
+ 					submit_bh(READ | REQ_META | REQ_PRIO,
+ 						  bh);
+ 				}
++		dx_propagate_tag(nd, inode);
+ 			}
+ 		}
+ 		if ((bh = bh_use[ra_ptr++]) == NULL)
+@@ -2526,6 +2529,7 @@ const struct inode_operations ext3_dir_i
+ 	.listxattr	= ext3_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext3_sync_flags,
+ 	.get_acl	= ext3_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext3/super.c linux-3.4.45-vs2.3.3.9/fs/ext3/super.c
+--- linux-3.4.45/fs/ext3/super.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext3/super.c	2013-03-30 21:29:17.000000000 +0000
+@@ -820,7 +820,8 @@ enum {
+ 	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
+ 	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
+ 	Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
+-	Opt_resize, Opt_usrquota, Opt_grpquota
++	Opt_resize, Opt_usrquota, Opt_grpquota,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -877,6 +878,9 @@ static const match_table_t tokens = {
+ 	{Opt_barrier, "barrier"},
+ 	{Opt_nobarrier, "nobarrier"},
+ 	{Opt_resize, "resize"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1029,6 +1033,20 @@ static int parse_options (char *options,
+ 		case Opt_nouid32:
+ 			set_opt (sbi->s_mount_opt, NO_UID32);
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			clear_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_nocheck:
+ 			clear_opt (sbi->s_mount_opt, CHECK);
+ 			break;
+@@ -1727,6 +1745,9 @@ static int ext3_fill_super (struct super
+ 			    NULL, 0))
+ 		goto failed_mount;
+ 
++	if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -2608,6 +2629,14 @@ static int ext3_remount (struct super_bl
+ 	if (test_opt(sb, ABORT))
+ 		ext3_abort(sb, __func__, "Abort forced by user");
+ 
++	if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT3-fs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext4/ext4.h linux-3.4.45-vs2.3.3.9/fs/ext4/ext4.h
+--- linux-3.4.45/fs/ext4/ext4.h	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/ext4.h	2013-05-13 18:16:08.000000000 +0000
+@@ -380,8 +380,12 @@ struct flex_groups {
+ #define EXT4_EXTENTS_FL			0x00080000 /* Inode uses extents */
+ #define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
+ #define EXT4_EOFBLOCKS_FL		0x00400000 /* Blocks allocated beyond EOF */
++#define EXT4_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ #define EXT4_RESERVED_FL		0x80000000 /* reserved for ext4 lib */
+ 
++#define EXT4_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define EXT4_COW_FL			0x20000000 /* Copy on Write marker */
++
+ #define EXT4_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
+ #define EXT4_FL_USER_MODIFIABLE		0x004B80FF /* User modifiable flags */
+ 
+@@ -650,7 +654,8 @@ struct ext4_inode {
+ 			__le16	l_i_file_acl_high;
+ 			__le16	l_i_uid_high;	/* these 2 fields */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+-			__u32	l_i_reserved2;
++			__le16	l_i_tag;	/* Context Tag */
++			__u16	l_i_reserved2;
+ 		} linux2;
+ 		struct {
+ 			__le16	h_i_reserved1;	/* Obsoleted fragment number/size which are removed in ext4 */
+@@ -768,6 +773,7 @@ do {									       \
+ #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_tag	osd2.linux2.l_i_tag
+ #define i_reserved2	osd2.linux2.l_i_reserved2
+ 
+ #elif defined(__GNU__)
+@@ -945,6 +951,7 @@ struct ext4_inode_info {
+ #define EXT4_MOUNT_POSIX_ACL		0x08000	/* POSIX Access Control Lists */
+ #define EXT4_MOUNT_NO_AUTO_DA_ALLOC	0x10000	/* No auto delalloc mapping */
+ #define EXT4_MOUNT_BARRIER		0x20000 /* Use block barriers */
++#define EXT4_MOUNT_TAGGED		0x40000 /* Enable Context Tags */
+ #define EXT4_MOUNT_QUOTA		0x80000 /* Some quota option set */
+ #define EXT4_MOUNT_USRQUOTA		0x100000 /* "old" user quota */
+ #define EXT4_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */
+@@ -2294,6 +2301,7 @@ extern int ext4_map_blocks(handle_t *han
+ 			   struct ext4_map_blocks *map, int flags);
+ extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 			__u64 start, __u64 len);
++extern int ext4_sync_flags(struct inode *, int, int);
+ /* move_extent.c */
+ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
+ 			     __u64 start_orig, __u64 start_donor,
+diff -NurpP --minimal linux-3.4.45/fs/ext4/file.c linux-3.4.45-vs2.3.3.9/fs/ext4/file.c
+--- linux-3.4.45/fs/ext4/file.c	2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/file.c	2012-05-21 16:15:05.000000000 +0000
+@@ -258,5 +258,6 @@ const struct inode_operations ext4_file_
+ #endif
+ 	.get_acl	= ext4_get_acl,
+ 	.fiemap		= ext4_fiemap,
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext4/ialloc.c linux-3.4.45-vs2.3.3.9/fs/ext4/ialloc.c
+--- linux-3.4.45/fs/ext4/ialloc.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/ialloc.c	2013-05-13 18:16:08.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/random.h>
+ #include <linux/bitops.h>
+ #include <linux/blkdev.h>
++#include <linux/vs_tag.h>
+ #include <asm/byteorder.h>
+ 
+ #include "ext4.h"
+@@ -815,6 +816,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ext4/inode.c linux-3.4.45-vs2.3.3.9/fs/ext4/inode.c
+--- linux-3.4.45/fs/ext4/inode.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/inode.c	2013-03-30 21:29:17.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/printk.h>
+ #include <linux/slab.h>
+ #include <linux/ratelimit.h>
++#include <linux/vs_tag.h>
+ 
+ #include "ext4_jbd2.h"
+ #include "xattr.h"
+@@ -3585,41 +3586,64 @@ void ext4_set_inode_flags(struct inode *
+ {
+ 	unsigned int flags = EXT4_I(inode)->i_flags;
+ 
+-	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++	if (flags & EXT4_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT4_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	if (flags & EXT4_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+ 	if (flags & EXT4_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+-	if (flags & EXT4_IMMUTABLE_FL)
+-		inode->i_flags |= S_IMMUTABLE;
+ 	if (flags & EXT4_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT4_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT4_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT4_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
+ void ext4_get_inode_flags(struct ext4_inode_info *ei)
+ {
+-	unsigned int vfs_fl;
++	unsigned int vfs_fl, vfs_vf;
+ 	unsigned long old_fl, new_fl;
+ 
+ 	do {
+ 		vfs_fl = ei->vfs_inode.i_flags;
++		vfs_vf = ei->vfs_inode.i_vflags;
+ 		old_fl = ei->i_flags;
+ 		new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
+ 				EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
+-				EXT4_DIRSYNC_FL);
++				EXT4_DIRSYNC_FL|EXT4_BARRIER_FL|
++				EXT4_COW_FL);
++
++		if (vfs_fl & S_IMMUTABLE)
++			new_fl |= EXT4_IMMUTABLE_FL;
++		if (vfs_fl & S_IXUNLINK)
++			new_fl |= EXT4_IXUNLINK_FL;
++
+ 		if (vfs_fl & S_SYNC)
+ 			new_fl |= EXT4_SYNC_FL;
+ 		if (vfs_fl & S_APPEND)
+ 			new_fl |= EXT4_APPEND_FL;
+-		if (vfs_fl & S_IMMUTABLE)
+-			new_fl |= EXT4_IMMUTABLE_FL;
+ 		if (vfs_fl & S_NOATIME)
+ 			new_fl |= EXT4_NOATIME_FL;
+ 		if (vfs_fl & S_DIRSYNC)
+ 			new_fl |= EXT4_DIRSYNC_FL;
++
++		if (vfs_vf & V_BARRIER)
++			new_fl |= EXT4_BARRIER_FL;
++		if (vfs_vf & V_COW)
++			new_fl |= EXT4_COW_FL;
+ 	} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
+ }
+ 
+@@ -3655,6 +3679,8 @@ struct inode *ext4_iget(struct super_blo
+ 	journal_t *journal = EXT4_SB(sb)->s_journal;
+ 	long ret;
+ 	int block;
++	uid_t uid;
++	gid_t gid;
+ 
+ 	inode = iget_locked(sb, ino);
+ 	if (!inode)
+@@ -3670,12 +3696,16 @@ struct inode *ext4_iget(struct super_blo
+ 		goto bad_inode;
+ 	raw_inode = ext4_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 = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
++		le16_to_cpu(raw_inode->i_raw_tag));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 
+ 	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */
+@@ -3894,6 +3924,8 @@ static int ext4_do_update_inode(handle_t
+ 	struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
+ 	struct ext4_inode_info *ei = EXT4_I(inode);
+ 	struct buffer_head *bh = iloc->bh;
++	uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+ 	int err = 0, rc, block;
+ 	int need_datasync = 0;
+ 
+@@ -3905,29 +3937,32 @@ static int ext4_do_update_inode(handle_t
+ 	ext4_get_inode_flags(ei);
+ 	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_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
++#endif
+ 	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ 
+ 	EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
+@@ -4114,7 +4149,8 @@ int ext4_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, attr))
+ 		dquot_initialize(inode);
+ 	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_TAG && attr->ia_tag != inode->i_tag)) {
+ 		handle_t *handle;
+ 
+ 		/* (user+group)*(old+new) structure, inode write (sb,
+@@ -4136,6 +4172,8 @@ int ext4_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_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		error = ext4_mark_inode_dirty(handle, inode);
+ 		ext4_journal_stop(handle);
+ 	}
+diff -NurpP --minimal linux-3.4.45/fs/ext4/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ext4/ioctl.c
+--- linux-3.4.45/fs/ext4/ioctl.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/ioctl.c	2012-09-01 08:50:49.000000000 +0000
+@@ -14,12 +14,40 @@
+ #include <linux/compat.h>
+ #include <linux/mount.h>
+ #include <linux/file.h>
++#include <linux/vs_tag.h>
+ #include <asm/uaccess.h>
+ #include "ext4_jbd2.h"
+ #include "ext4.h"
+ 
+ #define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1)
+ 
++int ext4_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	handle_t *handle = NULL;
++	struct ext4_iloc iloc;
++	int err;
++
++	handle = ext4_journal_start(inode, 1);
++	if (IS_ERR(handle))
++		return PTR_ERR(handle);
++
++	if (IS_SYNC(inode))
++		ext4_handle_sync(handle);
++	err = ext4_reserve_inode_write(handle, inode, &iloc);
++	if (err)
++		goto flags_err;
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext4_get_inode_flags(EXT4_I(inode));
++	inode->i_ctime = ext4_current_time(inode);
++
++	err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++	ext4_journal_stop(handle);
++	return err;
++}
++
+ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext4_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		err = -EPERM;
+ 		mutex_lock(&inode->i_mutex);
+ 		/* Is it quota file? Do not allow user to mess with it */
+@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * This test looks nicer. Thanks to Pauline Middelink
+ 		 */
+-		if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
++		if ((oldflags & EXT4_IMMUTABLE_FL) ||
++			((flags ^ oldflags) & (EXT4_APPEND_FL |
++			EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE))
+ 				goto flags_out;
+ 		}
+diff -NurpP --minimal linux-3.4.45/fs/ext4/namei.c linux-3.4.45-vs2.3.3.9/fs/ext4/namei.c
+--- linux-3.4.45/fs/ext4/namei.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/namei.c	2012-10-22 13:09:53.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/buffer_head.h>
+ #include <linux/bio.h>
++#include <linux/vs_tag.h>
+ #include "ext4.h"
+ #include "ext4_jbd2.h"
+ 
+@@ -925,6 +926,7 @@ restart:
+ 					ll_rw_block(READ | REQ_META | REQ_PRIO,
+ 						    1, &bh);
+ 			}
++		dx_propagate_tag(nd, inode);
+ 		}
+ 		if ((bh = bh_use[ra_ptr++]) == NULL)
+ 			goto next;
+@@ -2591,6 +2593,7 @@ const struct inode_operations ext4_dir_i
+ #endif
+ 	.get_acl	= ext4_get_acl,
+ 	.fiemap         = ext4_fiemap,
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+ const struct inode_operations ext4_special_inode_operations = {
+diff -NurpP --minimal linux-3.4.45/fs/ext4/super.c linux-3.4.45-vs2.3.3.9/fs/ext4/super.c
+--- linux-3.4.45/fs/ext4/super.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ext4/super.c	2013-05-13 18:16:08.000000000 +0000
+@@ -1191,6 +1191,7 @@ enum {
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1269,6 +1270,9 @@ static const match_table_t tokens = {
+ 	{Opt_removed, "reservation"},	/* mount option from ext2/3 */
+ 	{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
+ 	{Opt_removed, "journal=%u"},	/* mount option from ext2/3 */
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1503,6 +1507,20 @@ static int handle_mount_opt(struct super
+ 			return -1;
+ 		*journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
+ 		return 1;
++#ifndef CONFIG_TAGGING_NONE
++	case Opt_tag:
++		set_opt(sb, TAGGED);
++		return 1;
++	case Opt_notag:
++		clear_opt(sb, TAGGED);
++		return 1;
++#endif
++#ifdef CONFIG_PROPAGATE
++	case Opt_tagid:
++		/* use args[0] */
++		set_opt(sb, TAGGED);
++		return 1;
++#endif
+ 	}
+ 
+ 	for (m = ext4_mount_opts; m->token != Opt_err; m++) {
+@@ -3239,6 +3257,9 @@ static int ext4_fill_super(struct super_
+ 			clear_opt(sb, DELALLOC);
+ 	}
+ 
++	if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -4400,6 +4421,14 @@ static int ext4_remount(struct super_blo
+ 	if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
+ 		ext4_abort(sb, "Abort forced by user");
+ 
++	if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT4-fs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/fcntl.c linux-3.4.45-vs2.3.3.9/fs/fcntl.c
+--- linux-3.4.45/fs/fcntl.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/fcntl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/signal.h>
+ #include <linux/rcupdate.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/poll.h>
+ #include <asm/siginfo.h>
+@@ -103,6 +104,8 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldf
+ 
+ 	if (tofree)
+ 		filp_close(tofree, files);
++	else
++		vx_openfd_inc(newfd);	/* fd was unused */
+ 
+ 	return newfd;
+ 
+@@ -447,6 +450,8 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
+ 	filp = fget_raw(fd);
+ 	if (!filp)
+ 		goto out;
++	if (!vx_files_avail(1))
++		goto out;
+ 
+ 	if (unlikely(filp->f_mode & FMODE_PATH)) {
+ 		if (!check_fcntl_cmd(cmd)) {
+diff -NurpP --minimal linux-3.4.45/fs/file.c linux-3.4.45-vs2.3.3.9/fs/file.c
+--- linux-3.4.45/fs/file.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/file.c	2012-05-21 16:15:05.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/rcupdate.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
+ 
+ struct fdtable_defer {
+ 	spinlock_t lock;
+@@ -358,6 +359,8 @@ struct files_struct *dup_fd(struct files
+ 		struct file *f = *old_fds++;
+ 		if (f) {
+ 			get_file(f);
++			/* TODO: 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
+@@ -464,6 +467,7 @@ repeat:
+ 	else
+ 		__clear_close_on_exec(fd, fdt);
+ 	error = fd;
++	vx_openfd_inc(fd);
+ #if 1
+ 	/* Sanity check */
+ 	if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
+diff -NurpP --minimal linux-3.4.45/fs/file_table.c linux-3.4.45-vs2.3.3.9/fs/file_table.c
+--- linux-3.4.45/fs/file_table.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/file_table.c	2012-05-21 16:15:05.000000000 +0000
+@@ -24,6 +24,8 @@
+ #include <linux/percpu_counter.h>
+ #include <linux/percpu.h>
+ #include <linux/ima.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
+ 
+ #include <linux/atomic.h>
+ 
+@@ -135,6 +137,8 @@ struct file *get_empty_filp(void)
+ 	spin_lock_init(&f->f_lock);
+ 	eventpoll_init_file(f);
+ 	/* f->f_version: 0 */
++	f->f_xid = vx_current_xid();
++	vx_files_inc(f);
+ 	return f;
+ 
+ over:
+@@ -252,6 +256,8 @@ static void __fput(struct file *file)
+ 	}
+ 	fops_put(file->f_op);
+ 	put_pid(file->f_owner.pid);
++	vx_files_dec(file);
++	file->f_xid = 0;
+ 	file_sb_list_del(file);
+ 	if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
+ 		i_readcount_dec(inode);
+@@ -382,6 +388,8 @@ void put_filp(struct file *file)
+ {
+ 	if (atomic_long_dec_and_test(&file->f_count)) {
+ 		security_file_free(file);
++		vx_files_dec(file);
++		file->f_xid = 0;
+ 		file_sb_list_del(file);
+ 		file_free(file);
+ 	}
+diff -NurpP --minimal linux-3.4.45/fs/fs_struct.c linux-3.4.45-vs2.3.3.9/fs/fs_struct.c
+--- linux-3.4.45/fs/fs_struct.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/fs_struct.c	2012-05-21 16:15:05.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/vserver/global.h>
+ #include "internal.h"
+ 
+ static inline void path_get_longterm(struct path *path)
+@@ -99,6 +100,7 @@ void free_fs_struct(struct fs_struct *fs
+ {
+ 	path_put_longterm(&fs->root);
+ 	path_put_longterm(&fs->pwd);
++	atomic_dec(&vs_global_fs);
+ 	kmem_cache_free(fs_cachep, fs);
+ }
+ 
+@@ -136,6 +138,7 @@ struct fs_struct *copy_fs_struct(struct
+ 		fs->pwd = old->pwd;
+ 		path_get_longterm(&fs->pwd);
+ 		spin_unlock(&old->lock);
++		atomic_inc(&vs_global_fs);
+ 	}
+ 	return fs;
+ }
+diff -NurpP --minimal linux-3.4.45/fs/gfs2/file.c linux-3.4.45-vs2.3.3.9/fs/gfs2/file.c
+--- linux-3.4.45/fs/gfs2/file.c	2012-05-21 16:07:20.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/gfs2/file.c	2012-05-21 16:15:05.000000000 +0000
+@@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = {
+ 	[7] = GFS2_DIF_NOATIME,
+ 	[12] = GFS2_DIF_EXHASH,
+ 	[14] = GFS2_DIF_INHERIT_JDATA,
++	[27] = GFS2_DIF_IXUNLINK,
++	[26] = GFS2_DIF_BARRIER,
++	[29] = GFS2_DIF_COW,
+ };
+ 
+ static const u32 gfs2_to_fsflags[32] = {
+@@ -151,6 +154,9 @@ static const u32 gfs2_to_fsflags[32] = {
+ 	[gfs2fl_NoAtime] = FS_NOATIME_FL,
+ 	[gfs2fl_ExHash] = FS_INDEX_FL,
+ 	[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
++	[gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
++	[gfs2fl_Barrier] = FS_BARRIER_FL,
++	[gfs2fl_Cow] = FS_COW_FL,
+ };
+ 
+ static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
+@@ -181,12 +187,18 @@ void gfs2_set_inode_flags(struct inode *
+ {
+ 	struct gfs2_inode *ip = GFS2_I(inode);
+ 	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
+ 
+-	flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
+ 	if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
+ 		inode->i_flags |= S_NOSEC;
+ 	if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
+ 		flags |= S_IMMUTABLE;
++	if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
++		flags |= S_IXUNLINK;
++
+ 	if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
+ 		flags |= S_APPEND;
+ 	if (ip->i_diskflags & GFS2_DIF_NOATIME)
+@@ -194,6 +206,43 @@ void gfs2_set_inode_flags(struct inode *
+ 	if (ip->i_diskflags & GFS2_DIF_SYNC)
+ 		flags |= S_SYNC;
+ 	inode->i_flags = flags;
++
++	vflags &= ~(V_BARRIER | V_COW);
++
++	if (ip->i_diskflags & GFS2_DIF_BARRIER)
++		vflags |= V_BARRIER;
++	if (ip->i_diskflags & GFS2_DIF_COW)
++		vflags |= V_COW;
++	inode->i_vflags = vflags;
++}
++
++void gfs2_get_inode_flags(struct inode *inode)
++{
++	struct gfs2_inode *ip = GFS2_I(inode);
++	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	ip->i_diskflags &= ~(GFS2_DIF_APPENDONLY |
++			GFS2_DIF_NOATIME | GFS2_DIF_SYNC |
++			GFS2_DIF_IMMUTABLE | GFS2_DIF_IXUNLINK |
++			GFS2_DIF_BARRIER | GFS2_DIF_COW);
++
++	if (flags & S_IMMUTABLE)
++		ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->i_diskflags |= GFS2_DIF_IXUNLINK;
++
++	if (flags & S_APPEND)
++		ip->i_diskflags |= GFS2_DIF_APPENDONLY;
++	if (flags & S_NOATIME)
++		ip->i_diskflags |= GFS2_DIF_NOATIME;
++	if (flags & S_SYNC)
++		ip->i_diskflags |= GFS2_DIF_SYNC;
++
++	if (vflags & V_BARRIER)
++		ip->i_diskflags |= GFS2_DIF_BARRIER;
++	if (vflags & V_COW)
++		ip->i_diskflags |= GFS2_DIF_COW;
+ }
+ 
+ /* Flags that can be set by user space */
+@@ -305,6 +354,37 @@ static int gfs2_set_flags(struct file *f
+ 	return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
+ }
+ 
++int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct gfs2_inode *ip = GFS2_I(inode);
++	struct gfs2_sbd *sdp = GFS2_SB(inode);
++	struct buffer_head *bh;
++	struct gfs2_holder gh;
++	int error;
++
++	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
++	if (error)
++		return error;
++	error = gfs2_trans_begin(sdp, RES_DINODE, 0);
++	if (error)
++		goto out;
++	error = gfs2_meta_inode_buffer(ip, &bh);
++	if (error)
++		goto out_trans_end;
++	gfs2_trans_add_bh(ip->i_gl, bh, 1);
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	gfs2_get_inode_flags(inode);
++	gfs2_dinode_out(ip, bh->b_data);
++	brelse(bh);
++	gfs2_set_aops(inode);
++out_trans_end:
++	gfs2_trans_end(sdp);
++out:
++	gfs2_glock_dq_uninit(&gh);
++	return error;
++}
++
+ static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	switch(cmd) {
+diff -NurpP --minimal linux-3.4.45/fs/gfs2/inode.h linux-3.4.45-vs2.3.3.9/fs/gfs2/inode.h
+--- linux-3.4.45/fs/gfs2/inode.h	2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/gfs2/inode.h	2012-05-21 16:15:05.000000000 +0000
+@@ -120,6 +120,7 @@ extern const struct file_operations gfs2
+ extern const struct file_operations gfs2_dir_fops_nolock;
+ 
+ extern void gfs2_set_inode_flags(struct inode *inode);
++extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
+  
+ #ifdef CONFIG_GFS2_FS_LOCKING_DLM
+ extern const struct file_operations gfs2_file_fops;
+diff -NurpP --minimal linux-3.4.45/fs/inode.c linux-3.4.45-vs2.3.3.9/fs/inode.c
+--- linux-3.4.45/fs/inode.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/inode.c	2013-05-13 18:16:08.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/prefetch.h>
+ #include <linux/buffer_head.h> /* for inode_has_buffers */
+ #include <linux/ratelimit.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
+ 
+ /*
+@@ -128,6 +129,9 @@ int inode_init_always(struct super_block
+ 	struct address_space *const mapping = &inode->i_data;
+ 
+ 	inode->i_sb = sb;
++
++	/* essential because of inode slab reuse */
++	inode->i_tag = 0;
+ 	inode->i_blkbits = sb->s_blocksize_bits;
+ 	inode->i_flags = 0;
+ 	atomic_set(&inode->i_count, 1);
+@@ -149,6 +153,7 @@ int inode_init_always(struct super_block
+ 	inode->i_bdev = NULL;
+ 	inode->i_cdev = NULL;
+ 	inode->i_rdev = 0;
++	inode->i_mdev = 0;
+ 	inode->dirtied_when = 0;
+ 
+ 	if (security_inode_alloc(inode))
+@@ -470,6 +475,8 @@ void __insert_inode_hash(struct inode *i
+ }
+ EXPORT_SYMBOL(__insert_inode_hash);
+ 
++EXPORT_SYMBOL_GPL(__iget);
++
+ /**
+  *	__remove_inode_hash - remove an inode from the hash
+  *	@inode: inode to unhash
+@@ -1689,9 +1696,11 @@ void init_special_inode(struct inode *in
+ 	if (S_ISCHR(mode)) {
+ 		inode->i_fop = &def_chr_fops;
+ 		inode->i_rdev = rdev;
++		inode->i_mdev = rdev;
+ 	} else if (S_ISBLK(mode)) {
+ 		inode->i_fop = &def_blk_fops;
+ 		inode->i_rdev = rdev;
++		inode->i_mdev = rdev;
+ 	} else if (S_ISFIFO(mode))
+ 		inode->i_fop = &def_fifo_fops;
+ 	else if (S_ISSOCK(mode))
+@@ -1720,6 +1729,7 @@ void inode_init_owner(struct inode *inod
+ 	} else
+ 		inode->i_gid = current_fsgid();
+ 	inode->i_mode = mode;
++	inode->i_tag = dx_current_fstag(inode->i_sb);
+ }
+ EXPORT_SYMBOL(inode_init_owner);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ioctl.c
+--- linux-3.4.45/fs/ioctl.c	2012-05-21 16:07:24.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ioctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -15,6 +15,9 @@
+ #include <linux/writeback.h>
+ #include <linux/buffer_head.h>
+ #include <linux/falloc.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/ioctls.h>
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ioprio.c linux-3.4.45-vs2.3.3.9/fs/ioprio.c
+--- linux-3.4.45/fs/ioprio.c	2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ioprio.c	2012-05-21 16:15:05.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/security.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_base.h>
+ 
+ int set_task_ioprio(struct task_struct *task, int ioprio)
+ {
+@@ -104,6 +105,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
+ 			else
+ 				pgrp = find_vpid(who);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				ret = set_task_ioprio(p, ioprio);
+ 				if (ret)
+ 					break;
+@@ -193,6 +196,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+ 			else
+ 				pgrp = find_vpid(who);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				tmpio = get_task_ioprio(p);
+ 				if (tmpio < 0)
+ 					continue;
+diff -NurpP --minimal linux-3.4.45/fs/jfs/file.c linux-3.4.45-vs2.3.3.9/fs/jfs/file.c
+--- linux-3.4.45/fs/jfs/file.c	2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/file.c	2012-05-21 16:15:05.000000000 +0000
+@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
+ 	if (is_quota_modification(inode, iattr))
+ 		dquot_initialize(inode);
+ 	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_TAG && iattr->ia_tag != inode->i_tag)) {
+ 		rc = dquot_transfer(inode, iattr);
+ 		if (rc)
+ 			return rc;
+@@ -142,6 +143,7 @@ const struct inode_operations jfs_file_i
+ #ifdef CONFIG_JFS_POSIX_ACL
+ 	.get_acl	= jfs_get_acl,
+ #endif
++	.sync_flags	= jfs_sync_flags,
+ };
+ 
+ const struct file_operations jfs_file_operations = {
+diff -NurpP --minimal linux-3.4.45/fs/jfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/jfs/ioctl.c
+--- linux-3.4.45/fs/jfs/ioctl.c	2012-03-19 18:47:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/ioctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -11,6 +11,7 @@
+ #include <linux/mount.h>
+ #include <linux/time.h>
+ #include <linux/sched.h>
++#include <linux/mount.h>
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+ 
+@@ -52,6 +53,16 @@ static long jfs_map_ext2(unsigned long f
+ }
+ 
+ 
++int jfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	jfs_get_inode_flags(JFS_IP(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++	mark_inode_dirty(inode);
++	return 0;
++}
++
+ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -85,6 +96,11 @@ long jfs_ioctl(struct file *filp, unsign
+ 		if (!S_ISDIR(inode->i_mode))
+ 			flags &= ~JFS_DIRSYNC_FL;
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		/* Is it quota file? Do not allow user to mess with it */
+ 		if (IS_NOQUOTA(inode)) {
+ 			err = -EPERM;
+@@ -102,8 +118,8 @@ long jfs_ioctl(struct file *filp, unsign
+ 		 * the relevant capability.
+ 		 */
+ 		if ((oldflags & JFS_IMMUTABLE_FL) ||
+-			((flags ^ oldflags) &
+-			(JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
++			((flags ^ oldflags) & (JFS_APPEND_FL |
++			JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				err = -EPERM;
+@@ -111,7 +127,7 @@ long jfs_ioctl(struct file *filp, unsign
+ 			}
+ 		}
+ 
+-		flags = flags & JFS_FL_USER_MODIFIABLE;
++		flags &= JFS_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
+ 		jfs_inode->mode2 = flags;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_dinode.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_dinode.h
+--- linux-3.4.45/fs/jfs/jfs_dinode.h	2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_dinode.h	2012-05-21 16:15:05.000000000 +0000
+@@ -161,9 +161,13 @@ struct dinode {
+ 
+ #define JFS_APPEND_FL		0x01000000 /* writes to file may only append */
+ #define JFS_IMMUTABLE_FL	0x02000000 /* Immutable file */
++#define JFS_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ 
+-#define JFS_FL_USER_VISIBLE	0x03F80000
+-#define JFS_FL_USER_MODIFIABLE	0x03F80000
++#define JFS_BARRIER_FL		0x04000000 /* Barrier for chroot() */
++#define JFS_COW_FL		0x20000000 /* Copy on Write marker */
++
++#define JFS_FL_USER_VISIBLE	0x07F80000
++#define JFS_FL_USER_MODIFIABLE	0x07F80000
+ #define JFS_FL_INHERIT		0x03C80000
+ 
+ /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_filsys.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_filsys.h
+--- linux-3.4.45/fs/jfs/jfs_filsys.h	2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_filsys.h	2012-05-21 16:15:05.000000000 +0000
+@@ -263,6 +263,7 @@
+ #define JFS_NAME_MAX	255
+ #define JFS_PATH_MAX	BPSIZE
+ 
++#define JFS_TAGGED		0x00800000	/* Context Tagging */
+ 
+ /*
+  *	file system state (superblock state)
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_imap.c linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_imap.c
+--- linux-3.4.45/fs/jfs/jfs_imap.c	2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_imap.c	2012-05-21 16:15:05.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+ 
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod
+ {
+ 	struct jfs_inode_info *jfs_ip = JFS_IP(ip);
+ 	struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
++	uid_t uid;
++	gid_t gid;
+ 
+ 	jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
+ 	jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
+@@ -3078,14 +3081,18 @@ static int copy_from_dinode(struct dinod
+ 	}
+ 	set_nlink(ip, le32_to_cpu(dip->di_nlink));
+ 
+-	jfs_ip->saved_uid = le32_to_cpu(dip->di_uid);
++	uid = le32_to_cpu(dip->di_uid);
++	gid = le32_to_cpu(dip->di_gid);
++	ip->i_tag = INOTAG_TAG(DX_TAG(ip), uid, gid, 0);
++
++	jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid);
+ 	if (sbi->uid == -1)
+ 		ip->i_uid = jfs_ip->saved_uid;
+ 	else {
+ 		ip->i_uid = sbi->uid;
+ 	}
+ 
+-	jfs_ip->saved_gid = le32_to_cpu(dip->di_gid);
++	jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid);
+ 	if (sbi->gid == -1)
+ 		ip->i_gid = jfs_ip->saved_gid;
+ 	else {
+@@ -3150,14 +3157,12 @@ 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);
+-	if (sbi->uid == -1)
+-		dip->di_uid = cpu_to_le32(ip->i_uid);
+-	else
+-		dip->di_uid = cpu_to_le32(jfs_ip->saved_uid);
+-	if (sbi->gid == -1)
+-		dip->di_gid = cpu_to_le32(ip->i_gid);
+-	else
+-		dip->di_gid = cpu_to_le32(jfs_ip->saved_gid);
++
++	dip->di_uid = cpu_to_le32(TAGINO_UID(DX_TAG(ip),
++		(sbi->uid == -1) ? ip->i_uid : jfs_ip->saved_uid, ip->i_tag));
++	dip->di_gid = cpu_to_le32(TAGINO_GID(DX_TAG(ip),
++		(sbi->gid == -1) ? ip->i_gid : jfs_ip->saved_gid, ip->i_tag));
++
+ 	jfs_get_inode_flags(jfs_ip);
+ 	/*
+ 	 * mode2 is only needed for storing the higher order bits.
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_inode.c linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.c
+--- linux-3.4.45/fs/jfs/jfs_inode.c	2012-01-09 15:14:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.c	2012-05-21 16:15:05.000000000 +0000
+@@ -18,6 +18,7 @@
+ 
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+ #include "jfs_filsys.h"
+@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i
+ {
+ 	unsigned int flags = JFS_IP(inode)->mode2;
+ 
+-	inode->i_flags &= ~(S_IMMUTABLE | S_APPEND |
+-		S_NOATIME | S_DIRSYNC | S_SYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+ 	if (flags & JFS_IMMUTABLE_FL)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (flags & JFS_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
++	if (flags & JFS_SYNC_FL)
++		inode->i_flags |= S_SYNC;
+ 	if (flags & JFS_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+ 	if (flags & JFS_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & JFS_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
+-	if (flags & JFS_SYNC_FL)
+-		inode->i_flags |= S_SYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & JFS_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & JFS_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
+ {
+ 	unsigned int flags = jfs_ip->vfs_inode.i_flags;
++	unsigned int vflags = jfs_ip->vfs_inode.i_vflags;
++
++	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL |
++			   JFS_APPEND_FL | JFS_NOATIME_FL |
++			   JFS_DIRSYNC_FL | JFS_SYNC_FL |
++			   JFS_BARRIER_FL | JFS_COW_FL);
+ 
+-	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |
+-			   JFS_DIRSYNC_FL | JFS_SYNC_FL);
+ 	if (flags & S_IMMUTABLE)
+ 		jfs_ip->mode2 |= JFS_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		jfs_ip->mode2 |= JFS_IXUNLINK_FL;
++
+ 	if (flags & S_APPEND)
+ 		jfs_ip->mode2 |= JFS_APPEND_FL;
+ 	if (flags & S_NOATIME)
+@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod
+ 		jfs_ip->mode2 |= JFS_DIRSYNC_FL;
+ 	if (flags & S_SYNC)
+ 		jfs_ip->mode2 |= JFS_SYNC_FL;
++
++	if (vflags & V_BARRIER)
++		jfs_ip->mode2 |= JFS_BARRIER_FL;
++	if (vflags & V_COW)
++		jfs_ip->mode2 |= JFS_COW_FL;
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.4.45/fs/jfs/jfs_inode.h linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.h
+--- linux-3.4.45/fs/jfs/jfs_inode.h	2011-10-24 16:45:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/jfs_inode.h	2012-05-21 16:15:05.000000000 +0000
+@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
+ extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
+ 	int fh_len, int fh_type);
+ extern void jfs_set_inode_flags(struct inode *);
++extern int jfs_sync_flags(struct inode *, int, int);
+ extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
+ extern int jfs_setattr(struct dentry *, struct iattr *);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/jfs/namei.c linux-3.4.45-vs2.3.3.9/fs/jfs/namei.c
+--- linux-3.4.45/fs/jfs/namei.c	2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/namei.c	2012-05-21 16:15:05.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/ctype.h>
+ #include <linux/quotaops.h>
+ #include <linux/exportfs.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_inode.h"
+@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
+ 			jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
+ 	}
+ 
++	dx_propagate_tag(nd, ip);
+ 	return d_splice_alias(ip, dentry);
+ }
+ 
+@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in
+ #ifdef CONFIG_JFS_POSIX_ACL
+ 	.get_acl	= jfs_get_acl,
+ #endif
++	.sync_flags	= jfs_sync_flags,
+ };
+ 
+ const struct file_operations jfs_dir_operations = {
+diff -NurpP --minimal linux-3.4.45/fs/jfs/super.c linux-3.4.45-vs2.3.3.9/fs/jfs/super.c
+--- linux-3.4.45/fs/jfs/super.c	2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/jfs/super.c	2012-05-21 16:15:05.000000000 +0000
+@@ -197,7 +197,8 @@ 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_quota,
+-	Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask
++	Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -207,6 +208,10 @@ static const match_table_t tokens = {
+ 	{Opt_resize, "resize=%u"},
+ 	{Opt_resize_nosize, "resize"},
+ 	{Opt_errors, "errors=%s"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
++	{Opt_tag, "tagxid"},
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_ignore, "quota"},
+ 	{Opt_usrquota, "usrquota"},
+@@ -341,6 +346,20 @@ static int parse_options(char *options,
+ 			}
+ 			break;
+ 		}
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			*flag |= JFS_TAGGED;
++			break;
++		case Opt_notag:
++			*flag &= JFS_TAGGED;
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			*flag |= JFS_TAGGED;
++			break;
++#endif
+ 		default:
+ 			printk("jfs: Unrecognized mount option \"%s\" "
+ 					" or missing value\n", p);
+@@ -372,6 +391,12 @@ static int jfs_remount(struct super_bloc
+ 		return -EINVAL;
+ 	}
+ 
++	if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++		printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		return -EINVAL;
++	}
++
+ 	if (newLVSize) {
+ 		if (sb->s_flags & MS_RDONLY) {
+ 			printk(KERN_ERR
+@@ -455,6 +480,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_TAGGED)
++		sb->s_flags |= MS_TAGGED;
+ 
+ 	if (newLVSize) {
+ 		printk(KERN_ERR "resize option for remount only\n");
+diff -NurpP --minimal linux-3.4.45/fs/libfs.c linux-3.4.45-vs2.3.3.9/fs/libfs.c
+--- linux-3.4.45/fs/libfs.c	2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/libfs.c	2012-05-21 16:15:05.000000000 +0000
+@@ -135,7 +135,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_path.dentry;
+ 	struct dentry *cursor = filp->private_data;
+@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v
+ 			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
+ 				struct dentry *next;
+ 				next = list_entry(p, struct dentry, d_u.d_child);
++				if (filter && !filter(next))
++					continue;
+ 				spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
+ 				if (!simple_positive(next)) {
+ 					spin_unlock(&next->d_lock);
+@@ -192,6 +195,17 @@ 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;
+@@ -983,6 +997,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(mount_pseudo);
+ EXPORT_SYMBOL(simple_write_begin);
+diff -NurpP --minimal linux-3.4.45/fs/locks.c linux-3.4.45-vs2.3.3.9/fs/locks.c
+--- linux-3.4.45/fs/locks.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/locks.c	2012-09-01 08:50:49.000000000 +0000
+@@ -126,6 +126,8 @@
+ #include <linux/time.h>
+ #include <linux/rcupdate.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct
+ /* Allocate an empty lock structure. */
+ struct file_lock *locks_alloc_lock(void)
+ {
+-	struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++	struct file_lock *fl;
+ 
+-	if (fl)
+-		locks_init_lock_heads(fl);
++	if (!vx_locks_avail(1))
++		return NULL;
+ 
++	fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++
++	if (fl) {
++		locks_init_lock_heads(fl);
++		fl->fl_xid = -1;
++	}
+ 	return fl;
+ }
+ EXPORT_SYMBOL_GPL(locks_alloc_lock);
+@@ -216,6 +224,7 @@ void locks_free_lock(struct file_lock *f
+ 	BUG_ON(!list_empty(&fl->fl_block));
+ 	BUG_ON(!list_empty(&fl->fl_link));
+ 
++	vx_locks_dec(fl);
+ 	locks_release_private(fl);
+ 	kmem_cache_free(filelock_cache, fl);
+ }
+@@ -225,6 +234,7 @@ void locks_init_lock(struct file_lock *f
+ {
+ 	memset(fl, 0, sizeof(struct file_lock));
+ 	locks_init_lock_heads(fl);
++	fl->fl_xid = -1;
+ }
+ 
+ EXPORT_SYMBOL(locks_init_lock);
+@@ -265,6 +275,7 @@ void locks_copy_lock(struct file_lock *n
+ 	new->fl_file = fl->fl_file;
+ 	new->fl_ops = fl->fl_ops;
+ 	new->fl_lmops = fl->fl_lmops;
++	new->fl_xid = fl->fl_xid;
+ 
+ 	locks_copy_private(new, fl);
+ }
+@@ -303,6 +314,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;
+@@ -452,6 +468,7 @@ static int lease_init(struct file *filp,
+ 
+ 	fl->fl_owner = current->files;
+ 	fl->fl_pid = current->tgid;
++	fl->fl_xid = vx_current_xid();
+ 
+ 	fl->fl_file = filp;
+ 	fl->fl_flags = FL_LEASE;
+@@ -471,6 +488,11 @@ static struct file_lock *lease_alloc(str
+ 	if (fl == NULL)
+ 		return ERR_PTR(error);
+ 
++	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) {
+ 		locks_free_lock(fl);
+@@ -773,6 +795,7 @@ static int flock_lock_file(struct file *
+ 		lock_flocks();
+ 	}
+ 
++	new_fl->fl_xid = -1;
+ find_conflict:
+ 	for_each_lock(inode, before) {
+ 		struct file_lock *fl = *before;
+@@ -793,6 +816,7 @@ find_conflict:
+ 		goto out;
+ 	locks_copy_lock(new_fl, request);
+ 	locks_insert_lock(before, new_fl);
++	vx_locks_inc(new_fl);
+ 	new_fl = NULL;
+ 	error = 0;
+ 
+@@ -803,7 +827,8 @@ out:
+ 	return error;
+ }
+ 
+-static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
++static int __posix_lock_file(struct inode *inode, struct file_lock *request,
++	struct file_lock *conflock, xid_t xid)
+ {
+ 	struct file_lock *fl;
+ 	struct file_lock *new_fl = NULL;
+@@ -813,6 +838,8 @@ 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.
+@@ -823,7 +850,11 @@ static int __posix_lock_file(struct inod
+ 	    (request->fl_type != F_UNLCK ||
+ 	     request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
+ 		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_flocks();
+@@ -1022,7 +1053,8 @@ static int __posix_lock_file(struct inod
+ int posix_lock_file(struct file *filp, struct file_lock *fl,
+ 			struct file_lock *conflock)
+ {
+-	return __posix_lock_file(filp->f_path.dentry->d_inode, fl, conflock);
++	return __posix_lock_file(filp->f_path.dentry->d_inode,
++		fl, conflock, filp->f_xid);
+ }
+ EXPORT_SYMBOL(posix_lock_file);
+ 
+@@ -1112,7 +1144,7 @@ int locks_mandatory_area(int read_write,
+ 	fl.fl_end = offset + count - 1;
+ 
+ 	for (;;) {
+-		error = __posix_lock_file(inode, &fl, NULL);
++		error = __posix_lock_file(inode, &fl, NULL, filp->f_xid);
+ 		if (error != FILE_LOCK_DEFERRED)
+ 			break;
+ 		error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
+@@ -1407,6 +1439,7 @@ int generic_add_lease(struct file *filp,
+ 		goto out;
+ 
+ 	locks_insert_lock(before, lease);
++	vx_locks_inc(lease);
+ 	return 0;
+ 
+ out:
+@@ -1847,6 +1880,11 @@ int fcntl_setlk(unsigned int fd, struct
+ 	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.
+ 	 */
+@@ -1965,6 +2003,11 @@ int fcntl_setlk64(unsigned int fd, struc
+ 	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.
+ 	 */
+@@ -2230,8 +2273,11 @@ static int locks_show(struct seq_file *f
+ 
+ 	lock_get_status(f, fl, *((loff_t *)f->private), "");
+ 
+-	list_for_each_entry(bfl, &fl->fl_block, fl_block)
++	list_for_each_entry(bfl, &fl->fl_block, fl_block) {
++		if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		lock_get_status(f, bfl, *((loff_t *)f->private), " ->");
++	}
+ 
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.4.45/fs/mount.h linux-3.4.45-vs2.3.3.9/fs/mount.h
+--- linux-3.4.45/fs/mount.h	2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/mount.h	2012-05-21 16:15:05.000000000 +0000
+@@ -47,6 +47,7 @@ struct mount {
+ 	int mnt_expiry_mark;		/* true if marked for expiry */
+ 	int mnt_pinned;
+ 	int mnt_ghosts;
++	tag_t mnt_tag;			/* tagging used for vfsmount */
+ };
+ 
+ static inline struct mount *real_mount(struct vfsmount *mnt)
+diff -NurpP --minimal linux-3.4.45/fs/namei.c linux-3.4.45-vs2.3.3.9/fs/namei.c
+--- linux-3.4.45/fs/namei.c	2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/namei.c	2012-05-21 16:15:05.000000000 +0000
+@@ -33,6 +33,14 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/fs_struct.h>
+ #include <linux/posix_acl.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vs_device.h>
++#include <linux/vs_context.h>
++#include <linux/pid_namespace.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+@@ -221,6 +229,89 @@ static int check_acl(struct inode *inode
+ 	return -EAGAIN;
+ }
+ 
++static inline int dx_barrier(const struct inode *inode)
++{
++	if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
++		vxwprintk_task(1, "did hit the barrier.");
++		return 1;
++	}
++	return 0;
++}
++
++static int __dx_permission(const struct inode *inode, int mask)
++{
++	if (dx_barrier(inode))
++		return -EACCES;
++
++	if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
++		/* devpts is xid tagged */
++		if (S_ISDIR(inode->i_mode) ||
++		    vx_check((xid_t)inode->i_tag, VS_IDENT | VS_WATCH_P))
++			return 0;
++
++		/* just pretend we didn't find anything */
++		return -ENOENT;
++	}
++	else 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 out;
++
++		if ((mask & (MAY_WRITE | MAY_APPEND))) {
++			struct pid *pid;
++			struct task_struct *tsk;
++
++			if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
++			    vx_flags(VXF_STATE_SETUP, 0))
++				return 0;
++
++			pid = PROC_I(inode)->pid;
++			if (!pid)
++				goto out;
++
++			rcu_read_lock();
++			tsk = pid_task(pid, PIDTYPE_PID);
++			vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]",
++				  tsk, (tsk ? vx_task_xid(tsk) : 0));
++			if (tsk &&
++				vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) {
++				rcu_read_unlock();
++				return 0;
++			}
++			rcu_read_unlock();
++		}
++		else {
++			/* FIXME: Should we block some entries here? */
++			return 0;
++		}
++	}
++	else {
++		if (dx_notagcheck(inode->i_sb) ||
++		    dx_check(inode->i_tag, DX_HOSTID | DX_ADMIN | DX_WATCH |
++			     DX_IDENT))
++			return 0;
++	}
++
++out:
++	return -EACCES;
++}
++
++int dx_permission(const struct inode *inode, int mask)
++{
++	int ret = __dx_permission(inode, mask);
++	if (unlikely(ret)) {
++#ifndef	CONFIG_VSERVER_WARN_DEVPTS
++		if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC)
++#endif
++		    vxwprintk_task(1,
++			"denied [0x%x] access to inode %s:%p[#%d,%lu]",
++			mask, inode->i_sb->s_id, inode, inode->i_tag,
++			inode->i_ino);
++	}
++	return ret;
++}
++
+ /*
+  * This does the basic permission checking
+  */
+@@ -356,10 +447,14 @@ int inode_permission(struct inode *inode
+ 		/*
+ 		 * Nobody gets write access to an immutable file.
+ 		 */
+-		if (IS_IMMUTABLE(inode))
++		if (IS_IMMUTABLE(inode) && !IS_COW(inode))
+ 			return -EACCES;
+ 	}
+ 
++	retval = dx_permission(inode, mask);
++	if (retval)
++		return retval;
++
+ 	retval = do_inode_permission(inode, mask);
+ 	if (retval)
+ 		return retval;
+@@ -1038,7 +1133,8 @@ static void follow_dotdot(struct nameida
+ 
+ 		if (nd->path.dentry == nd->root.dentry &&
+ 		    nd->path.mnt == nd->root.mnt) {
+-			break;
++			/* for sane '/' avoid follow_mount() */
++			return;
+ 		}
+ 		if (nd->path.dentry != nd->path.mnt->mnt_root) {
+ 			/* rare case of legitimate dget_parent()... */
+@@ -1174,6 +1270,9 @@ static int do_lookup(struct nameidata *n
+ 				goto unlazy;
+ 			}
+ 		}
++
++		/* FIXME: check dx permission */
++
+ 		path->mnt = mnt;
+ 		path->dentry = dentry;
+ 		if (unlikely(!__follow_mount_rcu(nd, path, inode)))
+@@ -1208,6 +1307,9 @@ unlazy:
+ 			goto need_lookup;
+ 		}
+ 	}
++
++	/* FIXME: check dx permission */
++
+ done:
+ 	path->mnt = mnt;
+ 	path->dentry = dentry;
+@@ -1981,7 +2083,7 @@ static int may_delete(struct inode *dir,
+ 	if (IS_APPEND(dir))
+ 		return -EPERM;
+ 	if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
+-	    IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
++		IS_IXORUNLINK(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
+ 		return -EPERM;
+ 	if (isdir) {
+ 		if (!S_ISDIR(victim->d_inode->i_mode))
+@@ -2061,19 +2163,25 @@ int vfs_create(struct inode *dir, struct
+ {
+ 	int error = may_create(dir, dentry);
+ 
+-	if (error)
++	if (error) {
++		vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
+ 		return error;
++	}
+ 
+ 	if (!dir->i_op->create)
+ 		return -EACCES;	/* shouldn't it be ENOSYS? */
+ 	mode &= S_IALLUGO;
+ 	mode |= S_IFREG;
+ 	error = security_inode_create(dir, dentry, mode);
+-	if (error)
++	if (error) {
++		vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
+ 		return error;
++	}
+ 	error = dir->i_op->create(dir, dentry, mode, nd);
+ 	if (!error)
+ 		fsnotify_create(dir, dentry);
++	else
++		vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error);
+ 	return error;
+ }
+ 
+@@ -2108,6 +2216,15 @@ static int may_open(struct path *path, i
+ 		break;
+ 	}
+ 
++#ifdef	CONFIG_VSERVER_COWBL
++	if (IS_COW(inode) &&
++		((flag & O_ACCMODE) != O_RDONLY)) {
++		if (IS_COW_LINK(inode))
++			return -EMLINK;
++		inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
++		mark_inode_dirty(inode);
++	}
++#endif
+ 	error = inode_permission(inode, acc_mode);
+ 	if (error)
+ 		return error;
+@@ -2332,6 +2449,16 @@ ok:
+ 	}
+ common:
+ 	error = may_open(&nd->path, acc_mode, open_flag);
++#ifdef	CONFIG_VSERVER_COWBL
++	if (error == -EMLINK) {
++		struct dentry *dentry;
++		dentry = cow_break_link(pathname);
++		if (IS_ERR(dentry))
++			error = PTR_ERR(dentry);
++		else
++			dput(dentry);
++	}
++#endif
+ 	if (error)
+ 		goto exit;
+ 	filp = nameidata_to_filp(nd);
+@@ -2374,6 +2501,7 @@ static struct file *path_openat(int dfd,
+ 	struct path path;
+ 	int error;
+ 
++restart:
+ 	filp = get_empty_filp();
+ 	if (!filp)
+ 		return ERR_PTR(-ENFILE);
+@@ -2411,6 +2539,17 @@ static struct file *path_openat(int dfd,
+ 			filp = do_last(nd, &path, op, pathname);
+ 		put_link(nd, &link, cookie);
+ 	}
++
++#ifdef	CONFIG_VSERVER_COWBL
++	if (filp == ERR_PTR(-EMLINK)) {
++		if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
++			path_put(&nd->root);
++		if (base)
++			fput(base);
++		release_open_intent(nd);
++		goto restart;
++	}
++#endif
+ out:
+ 	if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
+ 		path_put(&nd->root);
+@@ -2500,6 +2639,11 @@ struct dentry *kern_path_create(int dfd,
+ 		goto fail;
+ 	}
+ 	*path = nd.path;
++	vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
++		path->dentry, path->dentry->d_name.len,
++		path->dentry->d_name.name, dentry,
++		dentry->d_name.len, dentry->d_name.name,
++		path->dentry->d_inode);
+ 	return dentry;
+ eexist:
+ 	dput(dentry);
+@@ -2986,7 +3130,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->link)
+ 		return -EPERM;
+@@ -3375,6 +3519,253 @@ int vfs_follow_link(struct nameidata *nd
+ 	return __vfs_follow_link(nd, link);
+ }
+ 
++
++#ifdef	CONFIG_VSERVER_COWBL
++
++static inline
++long do_cow_splice(struct file *in, struct file *out, size_t len)
++{
++	loff_t ppos = 0;
++
++	return do_splice_direct(in, &ppos, out, len, 0);
++}
++
++extern unsigned int mnt_get_count(struct mount *mnt);
++
++struct dentry *cow_break_link(const char *pathname)
++{
++	int ret, mode, pathlen, redo = 0;
++	struct nameidata old_nd, dir_nd;
++	struct path old_path, dir_path;
++	struct dentry *dir, *old_dentry, *new_dentry = NULL;
++	struct file *old_file;
++	struct file *new_file;
++	char *to, *path, pad='\251';
++	loff_t size;
++
++	vxdprintk(VXD_CBIT(misc, 1),
++		"cow_break_link(" VS_Q("%s") ")", pathname);
++	path = kmalloc(PATH_MAX, GFP_KERNEL);
++	ret = -ENOMEM;
++	if (!path)
++		goto out;
++
++	/* old_nd will have refs to dentry and mnt */
++	ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"do_path_lookup(old): %d [r=%d]",
++		ret, mnt_get_count(real_mount(old_nd.path.mnt)));
++	if (ret < 0)
++		goto out_free_path;
++
++	old_path = old_nd.path;
++	old_dentry = old_path.dentry;
++	mode = old_dentry->d_inode->i_mode;
++
++	to = d_path(&old_path, path, PATH_MAX-2);
++	pathlen = strlen(to);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to,
++		old_dentry,
++		old_dentry->d_name.len, old_dentry->d_name.name,
++		old_dentry->d_name.len);
++
++	to[pathlen + 1] = 0;
++retry:
++	new_dentry = NULL;
++	to[pathlen] = pad--;
++	ret = -ELOOP;
++	if (pad <= '\240')
++		goto out_rel_old;
++
++	vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
++	/* dir_nd will have refs to dentry and mnt */
++	ret = do_path_lookup(AT_FDCWD, to,
++		LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
++	vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret);
++	if (ret < 0)
++		goto retry;
++
++	/* this puppy downs the dir inode mutex if successful */
++	new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0);
++	if (!new_dentry || IS_ERR(new_dentry)) {
++		path_put(&dir_nd.path);
++		vxdprintk(VXD_CBIT(misc, 2),
++			"kern_path_create(new) failed with %ld",
++			PTR_ERR(new_dentry));
++		goto retry;
++	}
++	path_put(&dir_path);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"kern_path_create(new): %p [" VS_Q("%.*s") ":%d]",
++		new_dentry,
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len);
++
++	dir = dir_nd.path.dentry;
++
++	ret = vfs_create(dir->d_inode, new_dentry, mode, &dir_nd);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"vfs_create(new): %d", ret);
++	if (ret == -EEXIST) {
++		mutex_unlock(&dir->d_inode->i_mutex);
++		path_put(&dir_nd.path);
++		dput(new_dentry);
++		goto retry;
++	}
++	else if (ret < 0)
++		goto out_unlock_new;
++
++	/* drop out early, ret passes ENOENT */
++	ret = -ENOENT;
++	if ((redo = d_unhashed(old_dentry)))
++		goto out_unlock_new;
++
++	path_get(&old_path);
++	/* this one cleans up the dentry/mnt in case of failure */
++	old_file = dentry_open(old_dentry, old_path.mnt,
++		O_RDONLY, current_cred());
++	vxdprintk(VXD_CBIT(misc, 2),
++		"dentry_open(old): %p", old_file);
++	if (IS_ERR(old_file)) {
++		ret = PTR_ERR(old_file);
++		goto out_unlock_new;
++	}
++
++	dget(new_dentry);
++	mntget(old_path.mnt);
++	/* this one cleans up the dentry/mnt in case of failure */
++	new_file = dentry_open(new_dentry, old_path.mnt,
++		O_WRONLY, current_cred());
++	vxdprintk(VXD_CBIT(misc, 2),
++		"dentry_open(new): %p", new_file);
++	if (IS_ERR(new_file)) {
++		ret = PTR_ERR(new_file);
++		goto out_fput_old;
++	}
++
++	size = i_size_read(old_file->f_dentry->d_inode);
++	ret = do_cow_splice(old_file, new_file, size);
++	vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
++	if (ret < 0) {
++		goto out_fput_both;
++	} else if (ret < size) {
++		ret = -ENOSPC;
++		goto out_fput_both;
++	} else {
++		struct inode *old_inode = old_dentry->d_inode;
++		struct inode *new_inode = new_dentry->d_inode;
++		struct iattr attr = {
++			.ia_uid = old_inode->i_uid,
++			.ia_gid = old_inode->i_gid,
++			.ia_valid = ATTR_UID | ATTR_GID
++			};
++
++		setattr_copy(new_inode, &attr);
++		mark_inode_dirty(new_inode);
++	}
++
++	mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++	/* drop out late */
++	ret = -ENOENT;
++	if ((redo = d_unhashed(old_dentry)))
++		goto out_unlock;
++
++	vxdprintk(VXD_CBIT(misc, 2),
++		"vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]",
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len,
++		old_dentry->d_name.len, old_dentry->d_name.name,
++		old_dentry->d_name.len);
++	ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry,
++		old_dentry->d_parent->d_inode, old_dentry);
++	vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
++
++out_unlock:
++	mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++out_fput_both:
++	vxdprintk(VXD_CBIT(misc, 3),
++		"fput(new_file=%p[#%ld])", new_file,
++		atomic_long_read(&new_file->f_count));
++	fput(new_file);
++
++out_fput_old:
++	vxdprintk(VXD_CBIT(misc, 3),
++		"fput(old_file=%p[#%ld])", old_file,
++		atomic_long_read(&old_file->f_count));
++	fput(old_file);
++
++out_unlock_new:
++	mutex_unlock(&dir->d_inode->i_mutex);
++	if (!ret)
++		goto out_redo;
++
++	/* error path cleanup */
++	vfs_unlink(dir->d_inode, new_dentry);
++
++out_redo:
++	if (!redo)
++		goto out_rel_both;
++	/* lookup dentry once again */
++	/* old_nd.path is freed as old_path in out_rel_old */
++	ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++	if (ret)
++		goto out_rel_both;
++
++	dput(new_dentry);
++	new_dentry = old_nd.path.dentry;
++	vxdprintk(VXD_CBIT(misc, 2),
++		"do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
++		new_dentry,
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len);
++	dget(new_dentry);
++
++out_rel_both:
++	path_put(&dir_nd.path);
++out_rel_old:
++	path_put(&old_path);
++out_free_path:
++	kfree(path);
++out:
++	if (ret) {
++		dput(new_dentry);
++		new_dentry = ERR_PTR(ret);
++	}
++	vxdprintk(VXD_CBIT(misc, 3),
++		"cow_break_link returning with %p [r=%d]",
++		new_dentry, mnt_get_count(real_mount(old_nd.path.mnt)));
++	return new_dentry;
++}
++
++#endif
++
++int	vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer)
++{
++	struct path path;
++	struct vfsmount *vmnt;
++	char *pstr, *root;
++	int length = 0;
++
++	pstr = kmalloc(PATH_MAX, GFP_KERNEL);
++	if (!pstr)
++		return 0;
++
++	vmnt = &ns->root->mnt;
++	path.mnt = vmnt;
++	path.dentry = vmnt->mnt_root;
++	root = d_path(&path, pstr, PATH_MAX - 2);
++	length = sprintf(buffer + length,
++		"Namespace:\t%p [#%u]\n"
++		"RootPath:\t%s\n",
++		ns, atomic_read(&ns->count),
++		root);
++	kfree(pstr);
++	return length;
++}
++
+ /* get the link contents into pagecache */
+ static char *page_getlink(struct dentry * dentry, struct page **ppage)
+ {
+@@ -3499,3 +3890,4 @@ EXPORT_SYMBOL(vfs_symlink);
+ EXPORT_SYMBOL(vfs_unlink);
+ EXPORT_SYMBOL(dentry_unhash);
+ EXPORT_SYMBOL(generic_readlink);
++EXPORT_SYMBOL(vx_info_mnt_namespace);
+diff -NurpP --minimal linux-3.4.45/fs/namespace.c linux-3.4.45-vs2.3.3.9/fs/namespace.c
+--- linux-3.4.45/fs/namespace.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/namespace.c	2012-06-28 14:45:07.000000000 +0000
+@@ -20,6 +20,11 @@
+ #include <linux/fs_struct.h>	/* get_fs_root et.al. */
+ #include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_context.h>
++#include <linux/vs_tag.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/global.h>
+ #include "pnode.h"
+ #include "internal.h"
+ 
+@@ -697,6 +702,10 @@ vfs_kern_mount(struct file_system_type *
+ 	if (!type)
+ 		return ERR_PTR(-ENODEV);
+ 
++	if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++		!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
++		return ERR_PTR(-EPERM);
++
+ 	mnt = alloc_vfsmnt(name);
+ 	if (!mnt)
+ 		return ERR_PTR(-ENOMEM);
+@@ -745,6 +754,7 @@ static struct mount *clone_mnt(struct mo
+ 		mnt->mnt.mnt_root = dget(root);
+ 		mnt->mnt_mountpoint = mnt->mnt.mnt_root;
+ 		mnt->mnt_parent = mnt;
++		mnt->mnt_tag = old->mnt_tag;
+ 		br_write_lock(vfsmount_lock);
+ 		list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
+ 		br_write_unlock(vfsmount_lock);
+@@ -1210,7 +1220,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+ 		goto dput_and_out;
+ 
+ 	retval = -EPERM;
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		goto dput_and_out;
+ 
+ 	retval = do_umount(mnt, flags);
+@@ -1236,7 +1246,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+ 
+ static int mount_is_safe(struct path *path)
+ {
+-	if (capable(CAP_SYS_ADMIN))
++	if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return 0;
+ 	return -EPERM;
+ #ifdef notyet
+@@ -1549,7 +1559,7 @@ static int do_change_type(struct path *p
+ 	int type;
+ 	int err = 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE))
+ 		return -EPERM;
+ 
+ 	if (path->dentry != path->mnt->mnt_root)
+@@ -1565,6 +1575,7 @@ static int do_change_type(struct path *p
+ 		if (err)
+ 			goto out_unlock;
+ 	}
++	// mnt->mnt_flags = mnt_flags;
+ 
+ 	br_write_lock(vfsmount_lock);
+ 	for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
+@@ -1580,12 +1591,14 @@ static int do_change_type(struct path *p
+  * do loopback mount.
+  */
+ static int do_loopback(struct path *path, char *old_name,
+-				int recurse)
++	tag_t tag, unsigned long flags, int mnt_flags)
+ {
+ 	LIST_HEAD(umount_list);
+ 	struct path old_path;
+ 	struct mount *mnt = NULL, *old;
+ 	int err = mount_is_safe(path);
++	int recurse = flags & MS_REC;
++
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+@@ -1653,13 +1666,13 @@ static int change_mount_flags(struct vfs
+  * on it - tough luck.
+  */
+ static int do_remount(struct path *path, int flags, int mnt_flags,
+-		      void *data)
++	void *data, xid_t xid)
+ {
+ 	int err;
+ 	struct super_block *sb = path->mnt->mnt_sb;
+ 	struct mount *mnt = real_mount(path->mnt);
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
+ 		return -EPERM;
+ 
+ 	if (!check_mnt(mnt))
+@@ -1708,7 +1721,7 @@ static int do_move_mount(struct path *pa
+ 	struct mount *p;
+ 	struct mount *old;
+ 	int err = 0;
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return -EPERM;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+@@ -1859,7 +1872,7 @@ static int do_new_mount(struct path *pat
+ 		return -EINVAL;
+ 
+ 	/* we need capabilities... */
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return -EPERM;
+ 
+ 	mnt = do_kern_mount(type, flags, name, data);
+@@ -2129,6 +2142,7 @@ long do_mount(char *dev_name, char *dir_
+ 	struct path path;
+ 	int retval = 0;
+ 	int mnt_flags = 0;
++	tag_t tag = 0;
+ 
+ 	/* Discard magic */
+ 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+@@ -2156,6 +2170,12 @@ long do_mount(char *dev_name, char *dir_
+ 	if (!(flags & MS_NOATIME))
+ 		mnt_flags |= MNT_RELATIME;
+ 
++	if (dx_parse_tag(data_page, &tag, 1, &mnt_flags, &flags)) {
++		/* FIXME: bind and re-mounts get the tag flag? */
++		if (flags & (MS_BIND|MS_REMOUNT))
++			flags |= MS_TAGID;
++	}
++
+ 	/* Separate the per-mountpoint flags */
+ 	if (flags & MS_NOSUID)
+ 		mnt_flags |= MNT_NOSUID;
+@@ -2172,15 +2192,17 @@ long do_mount(char *dev_name, char *dir_
+ 	if (flags & MS_RDONLY)
+ 		mnt_flags |= MNT_READONLY;
+ 
++	if (!capable(CAP_SYS_ADMIN))
++		mnt_flags |= MNT_NODEV;
+ 	flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN |
+ 		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
+ 		   MS_STRICTATIME);
+ 
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
+-				    data_page);
++				    data_page, tag);
+ 	else if (flags & MS_BIND)
+-		retval = do_loopback(&path, dev_name, flags & MS_REC);
++		retval = do_loopback(&path, dev_name, tag, flags, mnt_flags);
+ 	else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
+ 		retval = do_change_type(&path, flags);
+ 	else if (flags & MS_MOVE)
+@@ -2283,6 +2305,7 @@ static struct mnt_namespace *dup_mnt_ns(
+ 		q = next_mnt(q, new);
+ 	}
+ 	up_write(&namespace_sem);
++	atomic_inc(&vs_global_mnt_ns);
+ 
+ 	if (rootmnt)
+ 		mntput(rootmnt);
+@@ -2479,9 +2502,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+ 	error = -EINVAL;
+ 	new_mnt = real_mount(new.mnt);
+ 	root_mnt = real_mount(root.mnt);
+-	if (IS_MNT_SHARED(real_mount(old.mnt)) ||
++	if ((IS_MNT_SHARED(real_mount(old.mnt)) ||
+ 		IS_MNT_SHARED(new_mnt->mnt_parent) ||
+-		IS_MNT_SHARED(root_mnt->mnt_parent))
++		IS_MNT_SHARED(root_mnt->mnt_parent)) &&
++		!vx_flags(VXF_STATE_SETUP, 0))
+ 		goto out4;
+ 	if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
+ 		goto out4;
+@@ -2602,6 +2626,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+ 	br_write_unlock(vfsmount_lock);
+ 	up_write(&namespace_sem);
+ 	release_mounts(&umount_list);
++	atomic_dec(&vs_global_mnt_ns);
+ 	kfree(ns);
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/fs/nfs/client.c linux-3.4.45-vs2.3.3.9/fs/nfs/client.c
+--- linux-3.4.45/fs/nfs/client.c	2013-05-13 17:36:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/client.c	2013-01-16 00:15:57.000000000 +0000
+@@ -801,6 +801,9 @@ static int nfs_init_server_rpcclient(str
+ 	if (server->flags & NFS_MOUNT_SOFT)
+ 		server->client->cl_softrtry = 1;
+ 
++	server->client->cl_tag = 0;
++	if (server->flags & NFS_MOUNT_TAGGED)
++		server->client->cl_tag = 1;
+ 	return 0;
+ }
+ 
+@@ -976,6 +979,10 @@ static void nfs_server_set_fsinfo(struct
+ 		server->acdirmin = server->acdirmax = 0;
+ 	}
+ 
++	/* FIXME: needs fsinfo
++	if (server->flags & NFS_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;	*/
++
+ 	server->maxfilesize = fsinfo->maxfilesize;
+ 
+ 	server->time_delta = fsinfo->time_delta;
+diff -NurpP --minimal linux-3.4.45/fs/nfs/dir.c linux-3.4.45-vs2.3.3.9/fs/nfs/dir.c
+--- linux-3.4.45/fs/nfs/dir.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/dir.c	2013-01-16 00:15:57.000000000 +0000
+@@ -35,6 +35,7 @@
+ #include <linux/sched.h>
+ #include <linux/kmemleak.h>
+ #include <linux/xattr.h>
++#include <linux/vs_tag.h>
+ 
+ #include "delegation.h"
+ #include "iostat.h"
+@@ -1314,6 +1315,7 @@ static struct dentry *nfs_lookup(struct
+ 	if (IS_ERR(res))
+ 		goto out_unblock_sillyrename;
+ 
++	dx_propagate_tag(nd, inode);
+ no_entry:
+ 	res = d_materialise_unique(dentry, inode);
+ 	if (res != NULL) {
+diff -NurpP --minimal linux-3.4.45/fs/nfs/inode.c linux-3.4.45-vs2.3.3.9/fs/nfs/inode.c
+--- linux-3.4.45/fs/nfs/inode.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/inode.c	2012-10-22 13:09:53.000000000 +0000
+@@ -40,6 +40,7 @@
+ #include <linux/compat.h>
+ #include <linux/freezer.h>
+ #include <linux/crc32.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -275,6 +276,8 @@ nfs_fhget(struct super_block *sb, struct
+ 	if (inode->i_state & I_NEW) {
+ 		struct nfs_inode *nfsi = NFS_I(inode);
+ 		unsigned long now = jiffies;
++		uid_t uid;
++		gid_t gid;
+ 
+ 		/* We set i_ino for the few things that still rely on it,
+ 		 * such as stat(2) */
+@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct
+ 		inode->i_version = 0;
+ 		inode->i_size = 0;
+ 		clear_nlink(inode);
+-		inode->i_uid = -2;
+-		inode->i_gid = -2;
++		uid = -2;
++		gid = -2;
+ 		inode->i_blocks = 0;
+ 		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
+ 
+@@ -361,13 +364,13 @@ nfs_fhget(struct super_block *sb, struct
+ 		else if (nfs_server_capable(inode, NFS_CAP_NLINK))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_OWNER)
+-			inode->i_uid = fattr->uid;
++			uid = fattr->uid;
+ 		else if (nfs_server_capable(inode, NFS_CAP_OWNER))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR
+ 				| NFS_INO_INVALID_ACCESS
+ 				| NFS_INO_INVALID_ACL;
+ 		if (fattr->valid & NFS_ATTR_FATTR_GROUP)
+-			inode->i_gid = fattr->gid;
++			gid = fattr->gid;
+ 		else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR
+ 				| NFS_INO_INVALID_ACCESS
+@@ -380,6 +383,11 @@ nfs_fhget(struct super_block *sb, struct
+ 			 */
+ 			inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
+ 		}
++		inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++		inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++		inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0);
++				/* maybe fattr->xid someday */
++
+ 		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
+ 		nfsi->attrtimeo_timestamp = now;
+ 		nfsi->access_cache = RB_ROOT;
+@@ -497,6 +505,8 @@ void nfs_setattr_update_inode(struct ino
+ 			inode->i_uid = attr->ia_uid;
+ 		if ((attr->ia_valid & ATTR_GID) != 0)
+ 			inode->i_gid = attr->ia_gid;
++		if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+ 		spin_unlock(&inode->i_lock);
+ 	}
+@@ -946,6 +956,9 @@ static int nfs_check_inode_attributes(st
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	loff_t cur_size, new_isize;
+ 	unsigned long invalid = 0;
++	uid_t uid;
++	gid_t gid;
++	tag_t tag;
+ 
+ 
+ 	/* Has the inode gone and changed behind our back? */
+@@ -969,13 +982,18 @@ static int nfs_check_inode_attributes(st
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
+ 	}
+ 
++	uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
++	gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
++	tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
++
+ 	/* Have any file permissions changed? */
+ 	if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO))
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+-	if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid)
++	if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid)
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+-	if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid)
++	if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid)
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
++		/* maybe check for tag too? */
+ 
+ 	/* Has the link count changed? */
+ 	if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
+@@ -1273,6 +1291,9 @@ static int nfs_update_inode(struct inode
+ 	unsigned long invalid = 0;
+ 	unsigned long now = jiffies;
+ 	unsigned long save_cache_validity;
++	uid_t uid;
++	gid_t gid;
++	tag_t tag;
+ 
+ 	dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
+ 			__func__, inode->i_sb->s_id, inode->i_ino,
+@@ -1381,6 +1402,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_PAGECACHE
+ 				| NFS_INO_REVAL_FORCED);
+ 
++	uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
++	tag = inode->i_tag;
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_ATIME)
+ 		memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
+@@ -1402,9 +1426,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_FORCED);
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
+-		if (inode->i_uid != fattr->uid) {
++		if (uid != fattr->uid) {
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+-			inode->i_uid = fattr->uid;
++			uid = fattr->uid;
+ 		}
+ 	} else if (server->caps & NFS_CAP_OWNER)
+ 		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1413,9 +1437,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_FORCED);
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
+-		if (inode->i_gid != fattr->gid) {
++		if (gid != fattr->gid) {
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+-			inode->i_gid = fattr->gid;
++			gid = fattr->gid;
+ 		}
+ 	} else if (server->caps & NFS_CAP_OWNER_GROUP)
+ 		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1423,6 +1447,10 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_INVALID_ACL
+ 				| NFS_INO_REVAL_FORCED);
+ 
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag);
++
+ 	if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
+ 		if (inode->i_nlink != fattr->nlink) {
+ 			invalid |= NFS_INO_INVALID_ATTR;
+diff -NurpP --minimal linux-3.4.45/fs/nfs/nfs3xdr.c linux-3.4.45-vs2.3.3.9/fs/nfs/nfs3xdr.c
+--- linux-3.4.45/fs/nfs/nfs3xdr.c	2012-05-21 16:07:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/nfs3xdr.c	2012-05-21 16:15:05.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/nfs3.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/nfsacl.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
+ 
+ #define NFSDBG_FACILITY		NFSDBG_XDR
+@@ -562,7 +563,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+  *		set_mtime	mtime;
+  *	};
+  */
+-static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr)
++static void encode_sattr3(struct xdr_stream *xdr,
++	const struct iattr *attr, int tag)
+ {
+ 	u32 nbytes;
+ 	__be32 *p;
+@@ -594,15 +596,19 @@ static void encode_sattr3(struct xdr_str
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+-	if (attr->ia_valid & ATTR_UID) {
++	if (attr->ia_valid & ATTR_UID ||
++		(tag && (attr->ia_valid & ATTR_TAG))) {
+ 		*p++ = xdr_one;
+-		*p++ = cpu_to_be32(attr->ia_uid);
++		*p++ = cpu_to_be32(TAGINO_UID(tag,
++			attr->ia_uid, attr->ia_tag));
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+-	if (attr->ia_valid & ATTR_GID) {
++	if (attr->ia_valid & ATTR_GID ||
++		(tag && (attr->ia_valid & ATTR_TAG))) {
+ 		*p++ = xdr_one;
+-		*p++ = cpu_to_be32(attr->ia_gid);
++		*p++ = cpu_to_be32(TAGINO_GID(tag,
++			attr->ia_gid, attr->ia_tag));
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+@@ -878,7 +884,7 @@ static void nfs3_xdr_enc_setattr3args(st
+ 				      const struct nfs3_sattrargs *args)
+ {
+ 	encode_nfs_fh3(xdr, args->fh);
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
+ 	encode_sattrguard3(xdr, args);
+ }
+ 
+@@ -1028,13 +1034,13 @@ static void nfs3_xdr_enc_write3args(stru
+  *	};
+  */
+ static void encode_createhow3(struct xdr_stream *xdr,
+-			      const struct nfs3_createargs *args)
++	const struct nfs3_createargs *args, int tag)
+ {
+ 	encode_uint32(xdr, args->createmode);
+ 	switch (args->createmode) {
+ 	case NFS3_CREATE_UNCHECKED:
+ 	case NFS3_CREATE_GUARDED:
+-		encode_sattr3(xdr, args->sattr);
++		encode_sattr3(xdr, args->sattr, tag);
+ 		break;
+ 	case NFS3_CREATE_EXCLUSIVE:
+ 		encode_createverf3(xdr, args->verifier);
+@@ -1049,7 +1055,7 @@ static void nfs3_xdr_enc_create3args(str
+ 				     const struct nfs3_createargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_createhow3(xdr, args);
++	encode_createhow3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1065,7 +1071,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+ 				    const struct nfs3_mkdirargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1082,9 +1088,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+  *	};
+  */
+ static void encode_symlinkdata3(struct xdr_stream *xdr,
+-				const struct nfs3_symlinkargs *args)
++	const struct nfs3_symlinkargs *args, int tag)
+ {
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, tag);
+ 	encode_nfspath3(xdr, args->pages, args->pathlen);
+ }
+ 
+@@ -1093,7 +1099,7 @@ static void nfs3_xdr_enc_symlink3args(st
+ 				      const struct nfs3_symlinkargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
+-	encode_symlinkdata3(xdr, args);
++	encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1121,24 +1127,24 @@ static void nfs3_xdr_enc_symlink3args(st
+  *	};
+  */
+ static void encode_devicedata3(struct xdr_stream *xdr,
+-			       const struct nfs3_mknodargs *args)
++	const struct nfs3_mknodargs *args, int tag)
+ {
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, tag);
+ 	encode_specdata3(xdr, args->rdev);
+ }
+ 
+ static void encode_mknoddata3(struct xdr_stream *xdr,
+-			      const struct nfs3_mknodargs *args)
++	const struct nfs3_mknodargs *args, int tag)
+ {
+ 	encode_ftype3(xdr, args->type);
+ 	switch (args->type) {
+ 	case NF3CHR:
+ 	case NF3BLK:
+-		encode_devicedata3(xdr, args);
++		encode_devicedata3(xdr, args, tag);
+ 		break;
+ 	case NF3SOCK:
+ 	case NF3FIFO:
+-		encode_sattr3(xdr, args->sattr);
++		encode_sattr3(xdr, args->sattr, tag);
+ 		break;
+ 	case NF3REG:
+ 	case NF3DIR:
+@@ -1153,7 +1159,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+ 				    const struct nfs3_mknodargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_mknoddata3(xdr, args);
++	encode_mknoddata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.4.45/fs/nfs/super.c linux-3.4.45-vs2.3.3.9/fs/nfs/super.c
+--- linux-3.4.45/fs/nfs/super.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfs/super.c	2013-01-16 00:15:57.000000000 +0000
+@@ -54,6 +54,7 @@
+ #include <linux/parser.h>
+ #include <linux/nsproxy.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -86,6 +87,7 @@ enum {
+ 	Opt_sharecache, Opt_nosharecache,
+ 	Opt_resvport, Opt_noresvport,
+ 	Opt_fscache, Opt_nofscache,
++	Opt_tag, Opt_notag,
+ 
+ 	/* Mount options that take integer arguments */
+ 	Opt_port,
+@@ -98,6 +100,7 @@ enum {
+ 	Opt_mountport,
+ 	Opt_mountvers,
+ 	Opt_minorversion,
++	Opt_tagid,
+ 
+ 	/* Mount options that take string arguments */
+ 	Opt_nfsvers,
+@@ -180,6 +183,10 @@ static const match_table_t nfs_mount_opt
+ 	/* The following needs to be listed after all other options */
+ 	{ Opt_nfsvers, "v%s" },
+ 
++	{ Opt_tag, "tag" },
++	{ Opt_notag, "notag" },
++	{ Opt_tagid, "tagid=%u" },
++
+ 	{ Opt_err, NULL }
+ };
+ 
+@@ -674,6 +681,7 @@ static void nfs_show_mount_options(struc
+ 		{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
+ 		{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
+ 		{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
++		{ NFS_MOUNT_TAGGED, ",tag", "" },
+ 		{ 0, NULL, NULL }
+ 	};
+ 	const struct proc_nfs_info *nfs_infop;
+@@ -1286,6 +1294,14 @@ static int nfs_parse_mount_options(char
+ 			kfree(mnt->fscache_uniq);
+ 			mnt->fscache_uniq = NULL;
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			mnt->flags |= NFS_MOUNT_TAGGED;
++			break;
++		case Opt_notag:
++			mnt->flags &= ~NFS_MOUNT_TAGGED;
++			break;
++#endif
+ 
+ 		/*
+ 		 * options that take numeric values
+@@ -1372,6 +1388,12 @@ static int nfs_parse_mount_options(char
+ 				goto out_invalid_value;
+ 			mnt->minorversion = option;
+ 			break;
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			nfs_data.flags |= NFS_MOUNT_TAGGED;
++			break;
++#endif
+ 
+ 		/*
+ 		 * options that take text values
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/auth.c linux-3.4.45-vs2.3.3.9/fs/nfsd/auth.c
+--- linux-3.4.45/fs/nfsd/auth.c	2010-02-25 10:52:05.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/auth.c	2012-05-21 16:15:05.000000000 +0000
+@@ -1,6 +1,7 @@
+ /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
+ 
+ #include <linux/sched.h>
++#include <linux/vs_tag.h>
+ #include "nfsd.h"
+ #include "auth.h"
+ 
+@@ -36,6 +37,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+ 
+ 	new->fsuid = rqstp->rq_cred.cr_uid;
+ 	new->fsgid = rqstp->rq_cred.cr_gid;
++	/* FIXME: this desperately needs a tag :)
++	new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
++			*/
+ 
+ 	rqgi = rqstp->rq_cred.cr_group_info;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs3xdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs3xdr.c
+--- linux-3.4.45/fs/nfsd/nfs3xdr.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs3xdr.c	2012-05-21 16:15:05.000000000 +0000
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
+ #include "xdr3.h"
+ #include "auth.h"
+ 
+@@ -95,6 +96,8 @@ static __be32 *
+ decode_sattr3(__be32 *p, struct iattr *iap)
+ {
+ 	u32	tmp;
++	uid_t	uid = 0;
++	gid_t	gid = 0;
+ 
+ 	iap->ia_valid = 0;
+ 
+@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i
+ 	}
+ 	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 = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++	iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++	iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ 	if (*p++) {
+ 		u64	newsize;
+ 
+@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
+ 	*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,
++		TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
++		stat->uid, stat->tag)));
++	*p++ = htonl((u32) nfsd_rgid(rqstp,
++		TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
++		stat->gid, stat->tag)));
+ 	if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
+ 		p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
+ 	} else {
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfs4xdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs4xdr.c
+--- linux-3.4.45/fs/nfsd/nfs4xdr.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/nfs4xdr.c	2013-05-13 18:16:08.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include <linux/utsname.h>
+ #include <linux/pagemap.h>
+ #include <linux/sunrpc/svcauth_gss.h>
++#include <linux/vs_tag.h>
+ 
+ #include "idmap.h"
+ #include "acl.h"
+@@ -2319,14 +2320,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,
++			TAGINO_UID(DX_TAG(dentry->d_inode),
++			stat.uid, stat.tag), &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,
++			TAGINO_GID(DX_TAG(dentry->d_inode),
++			stat.gid, stat.tag), &p, &buflen);
+ 		if (status == nfserr_resource)
+ 			goto out_resource;
+ 		if (status)
+diff -NurpP --minimal linux-3.4.45/fs/nfsd/nfsxdr.c linux-3.4.45-vs2.3.3.9/fs/nfsd/nfsxdr.c
+--- linux-3.4.45/fs/nfsd/nfsxdr.c	2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/nfsd/nfsxdr.c	2012-05-21 16:15:05.000000000 +0000
+@@ -6,6 +6,7 @@
+ 
+ #include "xdr.h"
+ #include "auth.h"
++#include <linux/vs_tag.h>
+ 
+ #define NFSDDBG_FACILITY		NFSDDBG_XDR
+ 
+@@ -88,6 +89,8 @@ static __be32 *
+ decode_sattr(__be32 *p, struct iattr *iap)
+ {
+ 	u32	tmp, tmp1;
++	uid_t	uid = 0;
++	gid_t	gid = 0;
+ 
+ 	iap->ia_valid = 0;
+ 
+@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia
+ 	}
+ 	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 = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++	iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++	iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ 	if ((tmp = ntohl(*p++)) != (u32)-1) {
+ 		iap->ia_valid |= ATTR_SIZE;
+ 		iap->ia_size = tmp;
+@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
+ 	*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,
++		TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
++	*p++ = htonl((u32) nfsd_rgid(rqstp,
++		TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
+ 
+ 	if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
+ 		*p++ = htonl(NFS_MAXPATHLEN);
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/dlmglue.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.c
+--- linux-3.4.45/fs/ocfs2/dlmglue.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.c	2013-03-02 15:26:44.000000000 +0000
+@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+ 	lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
+ 	lvb->lvb_iuid      = cpu_to_be32(inode->i_uid);
+ 	lvb->lvb_igid      = cpu_to_be32(inode->i_gid);
++	lvb->lvb_itag      = cpu_to_be16(inode->i_tag);
+ 	lvb->lvb_imode     = cpu_to_be16(inode->i_mode);
+ 	lvb->lvb_inlink    = cpu_to_be16(inode->i_nlink);
+ 	lvb->lvb_iatime_packed  =
+@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb
+ 
+ 	inode->i_uid     = be32_to_cpu(lvb->lvb_iuid);
+ 	inode->i_gid     = be32_to_cpu(lvb->lvb_igid);
++	inode->i_tag     = be16_to_cpu(lvb->lvb_itag);
+ 	inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
+ 	set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
+ 	ocfs2_unpack_timespec(&inode->i_atime,
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/dlmglue.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.h
+--- linux-3.4.45/fs/ocfs2/dlmglue.h	2010-10-21 11:07:50.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/dlmglue.h	2012-05-21 16:15:05.000000000 +0000
+@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
+ 	__be16       lvb_inlink;
+ 	__be32       lvb_iattr;
+ 	__be32       lvb_igeneration;
+-	__be32       lvb_reserved2;
++	__be16       lvb_itag;
++	__be16       lvb_reserved2;
+ };
+ 
+ #define OCFS2_QINFO_LVB_VERSION 1
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/file.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/file.c
+--- linux-3.4.45/fs/ocfs2/file.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/file.c	2012-07-17 22:29:43.000000000 +0000
+@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
+ 		attr->ia_valid &= ~ATTR_SIZE;
+ 
+ #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
+-			   | ATTR_GID | ATTR_UID | ATTR_MODE)
++			   | ATTR_GID | ATTR_UID | ATTR_TAG | ATTR_MODE)
+ 	if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
+ 		return 0;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/inode.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.c
+--- linux-3.4.45/fs/ocfs2/inode.c	2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.c	2012-05-21 16:15:05.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <linux/highmem.h>
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/byteorder.h>
+ 
+@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
+ {
+ 	unsigned int flags = OCFS2_I(inode)->ip_attr;
+ 
+-	inode->i_flags &= ~(S_IMMUTABLE |
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
+ 		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+ 	if (flags & OCFS2_IMMUTABLE_FL)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (flags & OCFS2_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
+ 
+ 	if (flags & OCFS2_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & OCFS2_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & OCFS2_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & OCFS2_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to OCFS2_I(inode)->ip_attr */
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi)
+ {
+ 	unsigned int flags = oi->vfs_inode.i_flags;
++	unsigned int vflags = oi->vfs_inode.i_vflags;
++
++	oi->ip_attr &= ~(OCFS2_SYNC_FL | OCFS2_APPEND_FL |
++			OCFS2_IMMUTABLE_FL | OCFS2_IXUNLINK_FL |
++			OCFS2_NOATIME_FL | OCFS2_DIRSYNC_FL |
++			OCFS2_BARRIER_FL | OCFS2_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		oi->ip_attr |= OCFS2_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		oi->ip_attr |= OCFS2_IXUNLINK_FL;
+ 
+-	oi->ip_attr &= ~(OCFS2_SYNC_FL|OCFS2_APPEND_FL|
+-			OCFS2_IMMUTABLE_FL|OCFS2_NOATIME_FL|OCFS2_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		oi->ip_attr |= OCFS2_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		oi->ip_attr |= OCFS2_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		oi->ip_attr |= OCFS2_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		oi->ip_attr |= OCFS2_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		oi->ip_attr |= OCFS2_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		oi->ip_attr |= OCFS2_BARRIER_FL;
++	if (vflags & V_COW)
++		oi->ip_attr |= OCFS2_COW_FL;
+ }
+ 
+ struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
+@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode *
+ 	struct super_block *sb;
+ 	struct ocfs2_super *osb;
+ 	int use_plocks = 1;
++	uid_t uid;
++	gid_t gid;
+ 
+ 	sb = inode->i_sb;
+ 	osb = OCFS2_SB(sb);
+@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode *
+ 	inode->i_generation = le32_to_cpu(fe->i_generation);
+ 	inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
+ 	inode->i_mode = le16_to_cpu(fe->i_mode);
+-	inode->i_uid = le32_to_cpu(fe->i_uid);
+-	inode->i_gid = le32_to_cpu(fe->i_gid);
++	uid = le32_to_cpu(fe->i_uid);
++	gid = le32_to_cpu(fe->i_gid);
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
++		/* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
+ 
+ 	/* Fast symlinks will have i_size but no allocated clusters. */
+ 	if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/inode.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.h
+--- linux-3.4.45/fs/ocfs2/inode.h	2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/inode.h	2012-05-21 16:15:05.000000000 +0000
+@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
+ 
+ void ocfs2_set_inode_flags(struct inode *inode);
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
++int ocfs2_sync_flags(struct inode *inode, int, int);
+ 
+ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
+ {
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ioctl.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/ioctl.c
+--- linux-3.4.45/fs/ocfs2/ioctl.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/ioctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
+ 	return status;
+ }
+ 
+-static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
++int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++	struct buffer_head *bh = NULL;
++	handle_t *handle = NULL;
++	int status;
++
++	status = ocfs2_inode_lock(inode, &bh, 1);
++	if (status < 0) {
++		mlog_errno(status);
++		return status;
++	}
++	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
++	if (IS_ERR(handle)) {
++		status = PTR_ERR(handle);
++		mlog_errno(status);
++		goto bail_unlock;
++	}
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ocfs2_get_inode_flags(OCFS2_I(inode));
++
++	status = ocfs2_mark_inode_dirty(handle, inode, bh);
++	if (status < 0)
++		mlog_errno(status);
++
++	ocfs2_commit_trans(osb, handle);
++bail_unlock:
++	ocfs2_inode_unlock(inode, 1);
++	brelse(bh);
++	return status;
++}
++
++int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
+ 				unsigned mask)
+ {
+ 	struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
+@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i
+ 	if (!S_ISDIR(inode->i_mode))
+ 		flags &= ~OCFS2_DIRSYNC_FL;
+ 
++	if (IS_BARRIER(inode)) {
++		vxwprintk_task(1, "messing with the barrier.");
++		goto bail_unlock;
++	}
++
+ 	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
+ 	if (IS_ERR(handle)) {
+ 		status = PTR_ERR(handle);
+@@ -879,6 +918,7 @@ bail:
+ 	return status;
+ }
+ 
++
+ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_path.dentry->d_inode;
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/namei.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/namei.c
+--- linux-3.4.45/fs/ocfs2/namei.c	2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/namei.c	2012-05-21 16:15:05.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/slab.h>
+ #include <linux/highmem.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ 
+ #include <cluster/masklog.h>
+ 
+@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i
+ 	struct ocfs2_dinode *fe = NULL;
+ 	struct ocfs2_extent_list *fel;
+ 	u16 feat;
++	tag_t tag;
+ 
+ 	*new_fe_bh = NULL;
+ 
+@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i
+ 	fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
+ 	fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
+ 	fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
+-	fe->i_uid = cpu_to_le32(inode->i_uid);
+-	fe->i_gid = cpu_to_le32(inode->i_gid);
++
++	tag = dx_current_fstag(osb->sb);
++	fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), inode->i_uid, tag));
++	fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), inode->i_gid, tag));
++	inode->i_tag = tag;
+ 	fe->i_mode = cpu_to_le16(inode->i_mode);
+ 	if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+ 		fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ocfs2.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2.h
+--- linux-3.4.45/fs/ocfs2/ocfs2.h	2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2.h	2012-05-21 16:15:05.000000000 +0000
+@@ -272,6 +272,7 @@ enum ocfs2_mount_options
+ 						     writes */
+ 	OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
+ 	OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
++	OCFS2_MOUNT_TAGGED = 1 << 15, /* use tagging */
+ };
+ 
+ #define OCFS2_OSB_SOFT_RO			0x0001
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/ocfs2_fs.h linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h
+--- linux-3.4.45/fs/ocfs2/ocfs2_fs.h	2011-05-22 14:17:53.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/ocfs2_fs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -266,6 +266,11 @@
+ #define OCFS2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
+ #define OCFS2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
+ 
++#define OCFS2_IXUNLINK_FL		FS_IXUNLINK_FL	/* Immutable invert on unlink */
++
++#define OCFS2_BARRIER_FL		FS_BARRIER_FL	/* Barrier for chroot() */
++#define OCFS2_COW_FL			FS_COW_FL	/* Copy on Write marker */
++
+ #define OCFS2_FL_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
+ #define OCFS2_FL_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
+ 
+diff -NurpP --minimal linux-3.4.45/fs/ocfs2/super.c linux-3.4.45-vs2.3.3.9/fs/ocfs2/super.c
+--- linux-3.4.45/fs/ocfs2/super.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/ocfs2/super.c	2012-05-21 16:15:05.000000000 +0000
+@@ -185,6 +185,7 @@ enum {
+ 	Opt_coherency_full,
+ 	Opt_resv_level,
+ 	Opt_dir_resv_level,
++	Opt_tag, Opt_notag, Opt_tagid,
+ 	Opt_err,
+ };
+ 
+@@ -216,6 +217,9 @@ static const match_table_t tokens = {
+ 	{Opt_coherency_full, "coherency=full"},
+ 	{Opt_resv_level, "resv_level=%u"},
+ 	{Opt_dir_resv_level, "dir_resv_level=%u"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL}
+ };
+ 
+@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl
+ 		goto out;
+ 	}
+ 
++	if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
++	    (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
++		ret = -EINVAL;
++		mlog(ML_ERROR, "Cannot change tagging on remount\n");
++		goto out;
++	}
++
+ 	/* We're going to/from readonly mode. */
+ 	if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+ 		/* Disable quota accounting before remounting RO */
+@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super
+ 
+ 	ocfs2_complete_mount_recovery(osb);
+ 
++	if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	if (ocfs2_mount_local(osb))
+ 		snprintf(nodestr, sizeof(nodestr), "local");
+ 	else
+@@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct su
+ 			    option < OCFS2_MAX_RESV_LEVEL)
+ 				mopt->dir_resv_level = option;
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++			break;
++		case Opt_notag:
++			mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++			break;
++#endif
+ 		default:
+ 			mlog(ML_ERROR,
+ 			     "Unrecognized mount option \"%s\" "
+diff -NurpP --minimal linux-3.4.45/fs/open.c linux-3.4.45-vs2.3.3.9/fs/open.c
+--- linux-3.4.45/fs/open.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/open.c	2012-09-16 18:49:11.000000000 +0000
+@@ -30,6 +30,11 @@
+ #include <linux/fs_struct.h>
+ #include <linux/ima.h>
+ #include <linux/dnotify.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vserver/dlimit.h>
+ 
+ #include "internal.h"
+ 
+@@ -74,6 +79,12 @@ static long do_sys_truncate(const char _
+ 	error = user_path(pathname, &path);
+ 	if (error)
+ 		goto out;
++
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (error)
++		goto dput_and_out;
++#endif
+ 	inode = path.dentry->d_inode;
+ 
+ 	/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
+@@ -489,6 +500,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+ 
+ 	error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
+ 	if (!error) {
++#ifdef CONFIG_VSERVER_COWBL
++		error = cow_check_and_break(&path);
++		if (!error)
++#endif
+ 		error = chmod_common(&path, mode);
+ 		path_put(&path);
+ 	}
+@@ -509,11 +524,11 @@ static int chown_common(struct path *pat
+ 	newattrs.ia_valid =  ATTR_CTIME;
+ 	if (user != (uid_t) -1) {
+ 		newattrs.ia_valid |= ATTR_UID;
+-		newattrs.ia_uid = user;
++		newattrs.ia_uid = dx_map_uid(user);
+ 	}
+ 	if (group != (gid_t) -1) {
+ 		newattrs.ia_valid |= ATTR_GID;
+-		newattrs.ia_gid = group;
++		newattrs.ia_gid = dx_map_gid(group);
+ 	}
+ 	if (!S_ISDIR(inode->i_mode))
+ 		newattrs.ia_valid |=
+@@ -538,6 +553,10 @@ SYSCALL_DEFINE3(chown, const char __user
+ 	error = mnt_want_write(path.mnt);
+ 	if (error)
+ 		goto out_release;
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
+ 	error = chown_common(&path, user, group);
+ 	mnt_drop_write(path.mnt);
+ out_release:
+@@ -565,6 +584,10 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+ 	error = mnt_want_write(path.mnt);
+ 	if (error)
+ 		goto out_release;
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
+ 	error = chown_common(&path, user, group);
+ 	mnt_drop_write(path.mnt);
+ out_release:
+@@ -584,6 +607,10 @@ SYSCALL_DEFINE3(lchown, const char __use
+ 	error = mnt_want_write(path.mnt);
+ 	if (error)
+ 		goto out_release;
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
+ 	error = chown_common(&path, user, group);
+ 	mnt_drop_write(path.mnt);
+ out_release:
+@@ -839,6 +866,7 @@ static void __put_unused_fd(struct files
+ 	__clear_open_fd(fd, fdt);
+ 	if (fd < files->next_fd)
+ 		files->next_fd = fd;
++	vx_openfd_dec(fd);
+ }
+ 
+ void put_unused_fd(unsigned int fd)
+diff -NurpP --minimal linux-3.4.45/fs/proc/array.c linux-3.4.45-vs2.3.3.9/fs/proc/array.c
+--- linux-3.4.45/fs/proc/array.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/array.c	2012-05-21 16:15:05.000000000 +0000
+@@ -81,6 +81,8 @@
+ #include <linux/pid_namespace.h>
+ #include <linux/ptrace.h>
+ #include <linux/tracehook.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+@@ -170,6 +172,9 @@ static inline void task_state(struct seq
+ 	rcu_read_lock();
+ 	ppid = pid_alive(p) ?
+ 		task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
++	if (unlikely(vx_current_initpid(p->pid)))
++		ppid = 0;
++
+ 	tpid = 0;
+ 	if (pid_alive(p)) {
+ 		struct task_struct *tracer = ptrace_parent(p);
+@@ -287,7 +292,7 @@ static inline void task_sig(struct seq_f
+ }
+ 
+ static void render_cap_t(struct seq_file *m, const char *header,
+-			kernel_cap_t *a)
++			struct vx_info *vxi, kernel_cap_t *a)
+ {
+ 	unsigned __capi;
+ 
+@@ -312,10 +317,11 @@ static inline void task_cap(struct seq_f
+ 	cap_bset	= cred->cap_bset;
+ 	rcu_read_unlock();
+ 
+-	render_cap_t(m, "CapInh:\t", &cap_inheritable);
+-	render_cap_t(m, "CapPrm:\t", &cap_permitted);
+-	render_cap_t(m, "CapEff:\t", &cap_effective);
+-	render_cap_t(m, "CapBnd:\t", &cap_bset);
++	/* FIXME: maybe move the p->vx_info masking to __task_cred() ? */
++	render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable);
++	render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted);
++	render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective);
++	render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
+ }
+ 
+ static inline void task_context_switch_counts(struct seq_file *m,
+@@ -337,6 +343,42 @@ static void task_cpus_allowed(struct seq
+ 	seq_putc(m, '\n');
+ }
+ 
++int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++			struct pid *pid, struct task_struct *task)
++{
++	seq_printf(m,	"Proxy:\t%p(%c)\n"
++			"Count:\t%u\n"
++			"uts:\t%p(%c)\n"
++			"ipc:\t%p(%c)\n"
++			"mnt:\t%p(%c)\n"
++			"pid:\t%p(%c)\n"
++			"net:\t%p(%c)\n",
++			task->nsproxy,
++			(task->nsproxy == init_task.nsproxy ? 'I' : '-'),
++			atomic_read(&task->nsproxy->count),
++			task->nsproxy->uts_ns,
++			(task->nsproxy->uts_ns == init_task.nsproxy->uts_ns ? 'I' : '-'),
++			task->nsproxy->ipc_ns,
++			(task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'),
++			task->nsproxy->mnt_ns,
++			(task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'),
++			task->nsproxy->pid_ns,
++			(task->nsproxy->pid_ns == init_task.nsproxy->pid_ns ? 'I' : '-'),
++			task->nsproxy->net_ns,
++			(task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-'));
++	return 0;
++}
++
++void task_vs_id(struct seq_file *m, struct task_struct *task)
++{
++	if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
++		return;
++
++	seq_printf(m, "VxID: %d\n", vx_task_xid(task));
++	seq_printf(m, "NxID: %d\n", nx_task_nid(task));
++}
++
++
+ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+ 			struct pid *pid, struct task_struct *task)
+ {
+@@ -353,6 +395,7 @@ int proc_pid_status(struct seq_file *m,
+ 	task_cap(m, task);
+ 	task_cpus_allowed(m, task);
+ 	cpuset_task_status_allowed(m, task);
++	task_vs_id(m, task);
+ 	task_context_switch_counts(m, task);
+ 	return 0;
+ }
+@@ -462,6 +505,17 @@ static int do_task_stat(struct seq_file
+ 	/* 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;
++	}
++
+ 	seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
+ 	seq_put_decimal_ll(m, ' ', ppid);
+ 	seq_put_decimal_ll(m, ' ', pgid);
+diff -NurpP --minimal linux-3.4.45/fs/proc/base.c linux-3.4.45-vs2.3.3.9/fs/proc/base.c
+--- linux-3.4.45/fs/proc/base.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/base.c	2012-06-28 14:45:07.000000000 +0000
+@@ -84,6 +84,8 @@
+ #include <linux/fs_struct.h>
+ #include <linux/slab.h>
+ #include <linux/flex_array.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ #ifdef CONFIG_HARDWALL
+ #include <asm/hardwall.h>
+ #endif
+@@ -937,11 +939,16 @@ static ssize_t oom_adjust_write(struct f
+ 		goto err_task_lock;
+ 	}
+ 
+-	if (oom_adjust < task->signal->oom_adj && !capable(CAP_SYS_RESOURCE)) {
++	if (oom_adjust < task->signal->oom_adj &&
++		!vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
+ 		err = -EACCES;
+ 		goto err_sighand;
+ 	}
+ 
++	/* prevent guest processes from circumventing the oom killer */
++	if (vx_current_xid() && (oom_adjust == OOM_DISABLE))
++		oom_adjust = OOM_ADJUST_MIN;
++
+ 	/*
+ 	 * Warn that /proc/pid/oom_adj is deprecated, see
+ 	 * Documentation/feature-removal-schedule.txt.
+@@ -1541,6 +1548,8 @@ struct inode *proc_pid_make_inode(struct
+ 		inode->i_gid = cred->egid;
+ 		rcu_read_unlock();
+ 	}
++	/* procfs is xid tagged */
++	inode->i_tag = (tag_t)vx_task_xid(task);
+ 	security_task_to_inode(task, inode);
+ 
+ out:
+@@ -1586,6 +1595,8 @@ int pid_getattr(struct vfsmount *mnt, st
+ 
+ /* dentry stuff */
+ 
++static unsigned name_to_int(struct dentry *dentry);
++
+ /*
+  *	Exceptional case: normally we are not allowed to unhash a busy
+  * directory. In this case, however, we can do it - no aliasing problems
+@@ -1614,6 +1625,12 @@ int pid_revalidate(struct dentry *dentry
+ 	task = get_proc_task(inode);
+ 
+ 	if (task) {
++		unsigned pid = name_to_int(dentry);
++
++		if (pid != ~0U && pid != vx_map_pid(task->pid)) {
++			put_task_struct(task);
++			goto drop;
++		}
+ 		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
+ 		    task_dumpable(task)) {
+ 			rcu_read_lock();
+@@ -1630,6 +1647,7 @@ int pid_revalidate(struct dentry *dentry
+ 		put_task_struct(task);
+ 		return 1;
+ 	}
++drop:
+ 	d_drop(dentry);
+ 	return 0;
+ }
+@@ -2452,6 +2470,13 @@ static struct dentry *proc_pident_lookup
+ 	if (!task)
+ 		goto out_no_task;
+ 
++	/* TODO: maybe we can come up with a generic approach? */
++	if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
++		(dentry->d_name.len == 5) &&
++		(!memcmp(dentry->d_name.name, "vinfo", 5) ||
++		!memcmp(dentry->d_name.name, "ninfo", 5)))
++		goto out;
++
+ 	/*
+ 	 * Yes, it does not scale. And it should not. Don't add
+ 	 * new entries into /proc/<tgid>/ without very good reasons.
+@@ -2837,7 +2862,7 @@ out_iput:
+ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
+ {
+ 	struct dentry *error;
+-	struct task_struct *task = get_proc_task(dir);
++	struct task_struct *task = get_proc_task_real(dir);
+ 	const struct pid_entry *p, *last;
+ 
+ 	error = ERR_PTR(-ENOENT);
+@@ -2944,6 +2969,9 @@ static int proc_pid_personality(struct s
+ static const struct file_operations proc_task_operations;
+ static const struct inode_operations proc_task_inode_operations;
+ 
++extern int proc_pid_vx_info(struct task_struct *, char *);
++extern int proc_pid_nx_info(struct task_struct *, char *);
++
+ static const struct pid_entry tgid_base_stuff[] = {
+ 	DIR("task",       S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
+ 	DIR("fd",         S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
+@@ -3010,6 +3038,8 @@ static const struct pid_entry tgid_base_
+ #ifdef CONFIG_CGROUPS
+ 	REG("cgroup",  S_IRUGO, proc_cgroup_operations),
+ #endif
++	INF("vinfo",      S_IRUGO, proc_pid_vx_info),
++	INF("ninfo",	  S_IRUGO, proc_pid_nx_info),
+ 	INF("oom_score",  S_IRUGO, proc_oom_score),
+ 	REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
+ 	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
+@@ -3029,6 +3059,7 @@ static const struct pid_entry tgid_base_
+ #ifdef CONFIG_HARDWALL
+ 	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
+ #endif
++	ONE("nsproxy",	S_IRUGO, proc_pid_nsproxy),
+ };
+ 
+ static int proc_tgid_base_readdir(struct file * filp,
+@@ -3222,7 +3253,7 @@ retry:
+ 	iter.task = NULL;
+ 	pid = find_ge_pid(iter.tgid, ns);
+ 	if (pid) {
+-		iter.tgid = pid_nr_ns(pid, ns);
++		iter.tgid = pid_unmapped_nr_ns(pid, ns);
+ 		iter.task = pid_task(pid, PIDTYPE_PID);
+ 		/* What we to know is if the pid we have find is the
+ 		 * pid of a thread_group_leader.  Testing for task
+@@ -3252,7 +3283,7 @@ static int proc_pid_fill_cache(struct fi
+ 	struct tgid_iter iter)
+ {
+ 	char name[PROC_NUMBUF];
+-	int len = snprintf(name, sizeof(name), "%d", iter.tgid);
++	int len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid));
+ 	return proc_fill_cache(filp, dirent, filldir, name, len,
+ 				proc_pid_instantiate, iter.task, NULL);
+ }
+@@ -3276,7 +3307,7 @@ int proc_pid_readdir(struct file * filp,
+ 		goto out_no_task;
+ 	nr = filp->f_pos - FIRST_PROCESS_ENTRY;
+ 
+-	reaper = get_proc_task(filp->f_path.dentry->d_inode);
++	reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
+ 	if (!reaper)
+ 		goto out_no_task;
+ 
+@@ -3298,6 +3329,8 @@ int proc_pid_readdir(struct file * filp,
+ 			__filldir = fake_filldir;
+ 
+ 		filp->f_pos = iter.tgid + TGID_OFFSET;
++		if (!vx_proc_task_visible(iter.task))
++			continue;
+ 		if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
+ 			put_task_struct(iter.task);
+ 			goto out;
+@@ -3451,6 +3484,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;
+ 
+ 	ns = dentry->d_sb->s_fs_info;
+ 	rcu_read_lock();
+diff -NurpP --minimal linux-3.4.45/fs/proc/generic.c linux-3.4.45-vs2.3.3.9/fs/proc/generic.c
+--- linux-3.4.45/fs/proc/generic.c	2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/generic.c	2012-05-21 16:15:05.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/bitops.h>
+ #include <linux/spinlock.h>
+ #include <linux/completion.h>
++#include <linux/vserver/inode.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro
+ 	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)) {
+ 			pde_get(de);
+ 			spin_unlock(&proc_subdir_lock);
+ 			error = -EINVAL;
+ 			inode = proc_get_inode(dir->i_sb, de);
++			/* generic proc entries belong to the host */
++			inode->i_tag = 0;
+ 			goto out_unlock;
+ 		}
+ 	}
+@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr
+ 
+ 				/* filldir passes info to user space */
+ 				pde_get(de);
++				if (!vx_hide_check(0, de->vx_flags))
++					goto skip;
+ 				spin_unlock(&proc_subdir_lock);
+ 				if (filldir(dirent, de->name, de->namelen, filp->f_pos,
+ 					    de->low_ino, de->mode >> 12) < 0) {
+@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr
+ 					goto out;
+ 				}
+ 				spin_lock(&proc_subdir_lock);
++			skip:
+ 				filp->f_pos++;
+ 				next = de->next;
+ 				pde_put(de);
+@@ -626,6 +634,7 @@ static struct proc_dir_entry *__proc_cre
+ 	ent->nlink = nlink;
+ 	atomic_set(&ent->count, 1);
+ 	ent->pde_users = 0;
++	ent->vx_flags = IATTR_PROC_DEFAULT;
+ 	spin_lock_init(&ent->pde_unload_lock);
+ 	ent->pde_unload_completion = NULL;
+ 	INIT_LIST_HEAD(&ent->pde_openers);
+@@ -649,7 +658,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;
+diff -NurpP --minimal linux-3.4.45/fs/proc/inode.c linux-3.4.45-vs2.3.3.9/fs/proc/inode.c
+--- linux-3.4.45/fs/proc/inode.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/inode.c	2012-05-21 16:15:05.000000000 +0000
+@@ -458,6 +458,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)
+diff -NurpP --minimal linux-3.4.45/fs/proc/internal.h linux-3.4.45-vs2.3.3.9/fs/proc/internal.h
+--- linux-3.4.45/fs/proc/internal.h	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/internal.h	2012-05-21 16:15:05.000000000 +0000
+@@ -10,6 +10,8 @@
+  */
+ 
+ #include <linux/proc_fs.h>
++#include <linux/vs_pid.h>
++
+ struct  ctl_table_header;
+ 
+ extern struct proc_dir_entry proc_root;
+@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi
+ 				struct pid *pid, struct task_struct *task);
+ extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+ 				struct pid *pid, struct task_struct *task);
++extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++				struct pid *pid, struct task_struct *task);
++
+ extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
+ 
+ extern const struct file_operations proc_pid_maps_operations;
+@@ -82,11 +87,16 @@ static inline struct pid *proc_pid(struc
+ 	return PROC_I(inode)->pid;
+ }
+ 
+-static inline struct task_struct *get_proc_task(struct inode *inode)
++static inline struct task_struct *get_proc_task_real(struct inode *inode)
+ {
+ 	return get_pid_task(proc_pid(inode), PIDTYPE_PID);
+ }
+ 
++static inline struct task_struct *get_proc_task(struct inode *inode)
++{
++	return vx_get_proc_task(inode, proc_pid(inode));
++}
++
+ static inline int proc_fd(struct inode *inode)
+ {
+ 	return PROC_I(inode)->fd;
+diff -NurpP --minimal linux-3.4.45/fs/proc/loadavg.c linux-3.4.45-vs2.3.3.9/fs/proc/loadavg.c
+--- linux-3.4.45/fs/proc/loadavg.c	2009-09-10 13:26:23.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/loadavg.c	2012-05-21 16:15:05.000000000 +0000
+@@ -12,15 +12,27 @@
+ 
+ static int loadavg_proc_show(struct seq_file *m, void *v)
+ {
++	unsigned long running;
++	unsigned int threads;
+ 	unsigned long avnrun[3];
+ 
+ 	get_avenrun(avnrun, FIXED_1/200, 0);
+ 
++	if (vx_flags(VXF_VIRT_LOAD, 0)) {
++		struct vx_info *vxi = current_vx_info();
++
++		running = atomic_read(&vxi->cvirt.nr_running);
++		threads = atomic_read(&vxi->cvirt.nr_threads);
++	} else {
++		running = nr_running();
++		threads = nr_threads;
++	}
++
+ 	seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
+ 		LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
+ 		LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
+ 		LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
+-		nr_running(), nr_threads,
++		running, threads,
+ 		task_active_pid_ns(current)->last_pid);
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.4.45/fs/proc/meminfo.c linux-3.4.45-vs2.3.3.9/fs/proc/meminfo.c
+--- linux-3.4.45/fs/proc/meminfo.c	2012-01-09 15:14:55.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/meminfo.c	2012-05-21 16:15:05.000000000 +0000
+@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
+ 	allowed = ((totalram_pages - hugetlb_total_pages())
+ 		* sysctl_overcommit_ratio / 100) + total_swap_pages;
+ 
+-	cached = global_page_state(NR_FILE_PAGES) -
++	cached = vx_flags(VXF_VIRT_MEM, 0) ?
++		vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) -
+ 			total_swapcache_pages - i.bufferram;
+ 	if (cached < 0)
+ 		cached = 0;
+diff -NurpP --minimal linux-3.4.45/fs/proc/root.c linux-3.4.45-vs2.3.3.9/fs/proc/root.c
+--- linux-3.4.45/fs/proc/root.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/root.c	2012-05-21 16:15:05.000000000 +0000
+@@ -19,9 +19,14 @@
+ #include <linux/mount.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/parser.h>
++#include <linux/vserver/inode.h>
+ 
+ #include "internal.h"
+ 
++struct proc_dir_entry *proc_virtual;
++
++extern void proc_vx_init(void);
++
+ static int proc_test_super(struct super_block *sb, void *data)
+ {
+ 	return sb->s_fs_info == data;
+@@ -190,6 +195,7 @@ void __init proc_root_init(void)
+ #endif
+ 	proc_mkdir("bus", NULL);
+ 	proc_sys_init();
++	proc_vx_init();
+ }
+ 
+ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
+@@ -257,6 +263,7 @@ struct proc_dir_entry proc_root = {
+ 	.proc_iops	= &proc_root_inode_operations, 
+ 	.proc_fops	= &proc_root_operations,
+ 	.parent		= &proc_root,
++	.vx_flags	= IATTR_ADMIN | IATTR_WATCH,
+ 	.name		= "/proc",
+ };
+ 
+diff -NurpP --minimal linux-3.4.45/fs/proc/stat.c linux-3.4.45-vs2.3.3.9/fs/proc/stat.c
+--- linux-3.4.45/fs/proc/stat.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/stat.c	2012-11-06 17:02:35.000000000 +0000
+@@ -9,6 +9,7 @@
+ #include <linux/slab.h>
+ #include <linux/time.h>
+ #include <linux/irqnr.h>
++#include <linux/vserver/cvirt.h>
+ #include <asm/cputime.h>
+ #include <linux/tick.h>
+ 
+@@ -92,6 +93,10 @@ static int show_stat(struct seq_file *p,
+ 		irq = softirq = steal = 0;
+ 	guest = guest_nice = 0;
+ 	getboottime(&boottime);
++
++	if (vx_flags(VXF_VIRT_UPTIME, 0))
++		vx_vsi_boottime(&boottime);
++
+ 	jif = boottime.tv_sec;
+ 
+ 	for_each_possible_cpu(i) {
+diff -NurpP --minimal linux-3.4.45/fs/proc/uptime.c linux-3.4.45-vs2.3.3.9/fs/proc/uptime.c
+--- linux-3.4.45/fs/proc/uptime.c	2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc/uptime.c	2012-05-21 16:15:05.000000000 +0000
+@@ -5,6 +5,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/time.h>
+ #include <linux/kernel_stat.h>
++#include <linux/vserver/cvirt.h>
+ #include <asm/cputime.h>
+ 
+ static int uptime_proc_show(struct seq_file *m, void *v)
+@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f
+ 	nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
+ 	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
+ 	idle.tv_nsec = rem;
++
++	if (vx_flags(VXF_VIRT_UPTIME, 0))
++		vx_vsi_uptime(&uptime, &idle);
++
+ 	seq_printf(m, "%lu.%02lu %lu.%02lu\n",
+ 			(unsigned long) uptime.tv_sec,
+ 			(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
+diff -NurpP --minimal linux-3.4.45/fs/proc_namespace.c linux-3.4.45-vs2.3.3.9/fs/proc_namespace.c
+--- linux-3.4.45/fs/proc_namespace.c	2012-03-19 18:47:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/proc_namespace.c	2012-05-21 16:15:05.000000000 +0000
+@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
+ 		{ MS_SYNCHRONOUS, ",sync" },
+ 		{ MS_DIRSYNC, ",dirsync" },
+ 		{ MS_MANDLOCK, ",mand" },
++		{ MS_TAGGED, ",tag" },
++		{ MS_NOTAGCHECK, ",notagcheck" },
+ 		{ 0, NULL }
+ 	};
+ 	const struct proc_fs_info *fs_infop;
+@@ -80,6 +82,34 @@ static inline void mangle(struct seq_fil
+ 	seq_escape(m, s, " \t\n\\");
+ }
+ 
++static int mnt_is_reachable(struct vfsmount *vfsmnt)
++{
++	struct path root;
++	struct dentry *point;
++	struct mount *mnt = real_mount(vfsmnt);
++	struct mount *root_mnt;
++	int ret;
++
++	if (mnt == mnt->mnt_ns->root)
++		return 1;
++
++	br_read_lock(vfsmount_lock);
++	root = current->fs->root;
++	root_mnt = real_mount(root.mnt);
++	point = root.dentry;
++
++	while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
++		point = mnt->mnt_mountpoint;
++		mnt = mnt->mnt_parent;
++	}
++
++	ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
++
++	br_read_unlock(vfsmount_lock);
++
++	return ret;
++}
++
+ static void show_type(struct seq_file *m, struct super_block *sb)
+ {
+ 	mangle(m, sb->s_type->name);
+@@ -96,6 +126,17 @@ static int show_vfsmnt(struct seq_file *
+ 	struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
+ 	struct super_block *sb = mnt_path.dentry->d_sb;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
++	if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++		mnt == current->fs->root.mnt) {
++		seq_puts(m, "/dev/root / ");
++		goto type;
++	}
++
+ 	if (sb->s_op->show_devname) {
+ 		err = sb->s_op->show_devname(m, mnt_path.dentry);
+ 		if (err)
+@@ -106,6 +147,7 @@ static int show_vfsmnt(struct seq_file *
+ 	seq_putc(m, ' ');
+ 	seq_path(m, &mnt_path, " \t\n\\");
+ 	seq_putc(m, ' ');
++type:
+ 	show_type(m, sb);
+ 	seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
+ 	err = show_sb_opts(m, sb);
+@@ -128,6 +170,11 @@ static int show_mountinfo(struct seq_fil
+ 	struct path root = p->root;
+ 	int err = 0;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
+ 	seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
+ 		   MAJOR(sb->s_dev), MINOR(sb->s_dev));
+ 	if (sb->s_op->show_path)
+@@ -187,6 +234,17 @@ static int show_vfsstat(struct seq_file
+ 	struct super_block *sb = mnt_path.dentry->d_sb;
+ 	int err = 0;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
++	if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++		mnt == current->fs->root.mnt) {
++		seq_puts(m, "device /dev/root mounted on / ");
++		goto type;
++	}
++
+ 	/* device */
+ 	if (sb->s_op->show_devname) {
+ 		seq_puts(m, "device ");
+@@ -203,7 +261,7 @@ static int show_vfsstat(struct seq_file
+ 	seq_puts(m, " mounted on ");
+ 	seq_path(m, &mnt_path, " \t\n\\");
+ 	seq_putc(m, ' ');
+-
++type:
+ 	/* file system type */
+ 	seq_puts(m, "with fstype ");
+ 	show_type(m, sb);
+diff -NurpP --minimal linux-3.4.45/fs/quota/dquot.c linux-3.4.45-vs2.3.3.9/fs/quota/dquot.c
+--- linux-3.4.45/fs/quota/dquot.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/quota/dquot.c	2012-05-21 16:15:05.000000000 +0000
+@@ -1563,6 +1563,9 @@ int __dquot_alloc_space(struct inode *in
+ 	struct dquot **dquots = inode->i_dquot;
+ 	int reserve = flags & DQUOT_SPACE_RESERVE;
+ 
++	if ((ret = dl_alloc_space(inode, number)))
++		return ret;
++
+ 	/*
+ 	 * First test before acquiring mutex - solves deadlocks when we
+ 	 * re-enter the quota code and are already holding the mutex
+@@ -1618,6 +1621,9 @@ int dquot_alloc_inode(const struct inode
+ 	struct dquot_warn warn[MAXQUOTAS];
+ 	struct dquot * const *dquots = inode->i_dquot;
+ 
++	if ((ret = dl_alloc_inode(inode)))
++		return ret;
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode))
+@@ -1689,6 +1695,8 @@ void __dquot_free_space(struct inode *in
+ 	struct dquot **dquots = inode->i_dquot;
+ 	int reserve = flags & DQUOT_SPACE_RESERVE;
+ 
++	dl_free_space(inode, number);
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode)) {
+@@ -1733,6 +1741,8 @@ void dquot_free_inode(const struct inode
+ 	struct dquot_warn warn[MAXQUOTAS];
+ 	struct dquot * const *dquots = inode->i_dquot;
+ 
++	dl_free_inode(inode);
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode))
+diff -NurpP --minimal linux-3.4.45/fs/quota/quota.c linux-3.4.45-vs2.3.3.9/fs/quota/quota.c
+--- linux-3.4.45/fs/quota/quota.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/quota/quota.c	2012-05-21 16:15:05.000000000 +0000
+@@ -8,6 +8,7 @@
+ #include <linux/fs.h>
+ #include <linux/namei.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+ #include <linux/kernel.h>
+@@ -37,7 +38,7 @@ static int check_quotactl_permission(str
+ 			break;
+ 		/*FALLTHROUGH*/
+ 	default:
+-		if (!capable(CAP_SYS_ADMIN))
++		if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ 			return -EPERM;
+ 	}
+ 
+@@ -291,6 +292,46 @@ static int do_quotactl(struct super_bloc
+ 	}
+ }
+ 
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++
++#include <linux/vroot.h>
++#include <linux/major.h>
++#include <linux/module.h>
++#include <linux/kallsyms.h>
++#include <linux/vserver/debug.h>
++
++static vroot_grb_func *vroot_get_real_bdev = NULL;
++
++static DEFINE_SPINLOCK(vroot_grb_lock);
++
++int register_vroot_grb(vroot_grb_func *func) {
++	int ret = -EBUSY;
++
++	spin_lock(&vroot_grb_lock);
++	if (!vroot_get_real_bdev) {
++		vroot_get_real_bdev = func;
++		ret = 0;
++	}
++	spin_unlock(&vroot_grb_lock);
++	return ret;
++}
++EXPORT_SYMBOL(register_vroot_grb);
++
++int unregister_vroot_grb(vroot_grb_func *func) {
++	int ret = -EINVAL;
++
++	spin_lock(&vroot_grb_lock);
++	if (vroot_get_real_bdev) {
++		vroot_get_real_bdev = NULL;
++		ret = 0;
++	}
++	spin_unlock(&vroot_grb_lock);
++	return ret;
++}
++EXPORT_SYMBOL(unregister_vroot_grb);
++
++#endif
++
+ /* Return 1 if 'cmd' will block on frozen filesystem */
+ static int quotactl_cmd_write(int cmd)
+ {
+@@ -323,6 +364,22 @@ static struct super_block *quotactl_bloc
+ 	putname(tmp);
+ 	if (IS_ERR(bdev))
+ 		return ERR_CAST(bdev);
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++	if (bdev && bdev->bd_inode &&
++			imajor(bdev->bd_inode) == VROOT_MAJOR) {
++		struct block_device *bdnew = (void *)-EINVAL;
++
++		if (vroot_get_real_bdev)
++			bdnew = vroot_get_real_bdev(bdev);
++		else
++			vxdprintk(VXD_CBIT(misc, 0),
++					"vroot_get_real_bdev not set");
++		bdput(bdev);
++		if (IS_ERR(bdnew))
++			return ERR_PTR(PTR_ERR(bdnew));
++		bdev = bdnew;
++	}
++#endif
+ 	if (quotactl_cmd_write(cmd))
+ 		sb = get_super_thawed(bdev);
+ 	else
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/file.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/file.c
+--- linux-3.4.45/fs/reiserfs/file.c	2012-05-21 16:07:26.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/file.c	2012-05-21 16:15:05.000000000 +0000
+@@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f
+ 	.listxattr = reiserfs_listxattr,
+ 	.removexattr = reiserfs_removexattr,
+ 	.permission = reiserfs_permission,
++	.sync_flags = reiserfs_sync_flags,
+ 	.get_acl = reiserfs_get_acl,
+ };
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/inode.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/inode.c
+--- linux-3.4.45/fs/reiserfs/inode.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/inode.c	2012-12-08 00:53:53.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <linux/writeback.h>
+ #include <linux/quotaops.h>
+ #include <linux/swap.h>
++#include <linux/vs_tag.h>
+ 
+ int reiserfs_commit_write(struct file *f, struct page *page,
+ 			  unsigned from, unsigned to);
+@@ -1131,6 +1132,8 @@ static void init_inode(struct inode *ino
+ 	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);
+@@ -1151,12 +1154,13 @@ static void init_inode(struct inode *ino
+ 		    (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);
+ 		set_nlink(inode, 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);
+@@ -1198,11 +1202,12 @@ static void init_inode(struct inode *ino
+ 		// (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);
+ 		set_nlink(inode, 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);
+@@ -1232,6 +1237,10 @@ static void init_inode(struct inode *ino
+ 		sd_attrs_to_i_attrs(sd_v2_attrs(sd), inode);
+ 	}
+ 
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0);
++
+ 	pathrelse(path);
+ 	if (S_ISREG(inode->i_mode)) {
+ 		inode->i_op = &reiserfs_file_inode_operations;
+@@ -1254,13 +1263,15 @@ static void init_inode(struct inode *ino
+ static void inode2sd(void *sd, struct inode *inode, loff_t size)
+ {
+ 	struct stat_data *sd_v2 = (struct stat_data *)sd;
++	uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
+ 	__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);
+@@ -2875,14 +2886,19 @@ int reiserfs_commit_write(struct file *f
+ void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
+ {
+ 	if (reiserfs_attrs(inode->i_sb)) {
+-		if (sd_attrs & REISERFS_SYNC_FL)
+-			inode->i_flags |= S_SYNC;
+-		else
+-			inode->i_flags &= ~S_SYNC;
+ 		if (sd_attrs & REISERFS_IMMUTABLE_FL)
+ 			inode->i_flags |= S_IMMUTABLE;
+ 		else
+ 			inode->i_flags &= ~S_IMMUTABLE;
++		if (sd_attrs & REISERFS_IXUNLINK_FL)
++			inode->i_flags |= S_IXUNLINK;
++		else
++			inode->i_flags &= ~S_IXUNLINK;
++
++		if (sd_attrs & REISERFS_SYNC_FL)
++			inode->i_flags |= S_SYNC;
++		else
++			inode->i_flags &= ~S_SYNC;
+ 		if (sd_attrs & REISERFS_APPEND_FL)
+ 			inode->i_flags |= S_APPEND;
+ 		else
+@@ -2895,6 +2911,15 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs,
+ 			REISERFS_I(inode)->i_flags |= i_nopack_mask;
+ 		else
+ 			REISERFS_I(inode)->i_flags &= ~i_nopack_mask;
++
++		if (sd_attrs & REISERFS_BARRIER_FL)
++			inode->i_vflags |= V_BARRIER;
++		else
++			inode->i_vflags &= ~V_BARRIER;
++		if (sd_attrs & REISERFS_COW_FL)
++			inode->i_vflags |= V_COW;
++		else
++			inode->i_vflags &= ~V_COW;
+ 	}
+ }
+ 
+@@ -2905,6 +2930,11 @@ void i_attrs_to_sd_attrs(struct inode *i
+ 			*sd_attrs |= REISERFS_IMMUTABLE_FL;
+ 		else
+ 			*sd_attrs &= ~REISERFS_IMMUTABLE_FL;
++		if (inode->i_flags & S_IXUNLINK)
++			*sd_attrs |= REISERFS_IXUNLINK_FL;
++		else
++			*sd_attrs &= ~REISERFS_IXUNLINK_FL;
++
+ 		if (inode->i_flags & S_SYNC)
+ 			*sd_attrs |= REISERFS_SYNC_FL;
+ 		else
+@@ -2917,6 +2947,15 @@ void i_attrs_to_sd_attrs(struct inode *i
+ 			*sd_attrs |= REISERFS_NOTAIL_FL;
+ 		else
+ 			*sd_attrs &= ~REISERFS_NOTAIL_FL;
++
++		if (inode->i_vflags & V_BARRIER)
++			*sd_attrs |= REISERFS_BARRIER_FL;
++		else
++			*sd_attrs &= ~REISERFS_BARRIER_FL;
++		if (inode->i_vflags & V_COW)
++			*sd_attrs |= REISERFS_COW_FL;
++		else
++			*sd_attrs &= ~REISERFS_COW_FL;
+ 	}
+ }
+ 
+@@ -3161,7 +3200,8 @@ int reiserfs_setattr(struct dentry *dent
+ 	}
+ 
+ 	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_TAG && attr->ia_tag != inode->i_tag)) {
+ 		struct reiserfs_transaction_handle th;
+ 		int jbegin_count =
+ 		    2 *
+@@ -3192,6 +3232,9 @@ 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_TAG) &&
++					IS_TAGGED(inode))
++					inode->i_tag = attr->ia_tag;
+ 		mark_inode_dirty(inode);
+ 		error = journal_end(&th, inode->i_sb, jbegin_count);
+ 		if (error)
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/ioctl.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/ioctl.c
+--- linux-3.4.45/fs/reiserfs/ioctl.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/ioctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -11,6 +11,21 @@
+ #include <linux/pagemap.h>
+ #include <linux/compat.h>
+ 
++
++int reiserfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	__u16 sd_attrs = 0;
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++
++	i_attrs_to_sd_attrs(inode, &sd_attrs);
++	REISERFS_I(inode)->i_attrs = sd_attrs;
++	inode->i_ctime = CURRENT_TIME_SEC;
++	mark_inode_dirty(inode);
++	return 0;
++}
++
+ /*
+  * reiserfs_ioctl - handler for ioctl for inode
+  * supported commands:
+@@ -22,7 +37,7 @@
+ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_path.dentry->d_inode;
+-	unsigned int flags;
++	unsigned int flags, oldflags;
+ 	int err = 0;
+ 
+ 	reiserfs_write_lock(inode->i_sb);
+@@ -47,6 +62,7 @@ long reiserfs_ioctl(struct file *filp, u
+ 
+ 		flags = REISERFS_I(inode)->i_attrs;
+ 		i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
++		flags &= REISERFS_FL_USER_VISIBLE;
+ 		err = put_user(flags, (int __user *)arg);
+ 		break;
+ 	case REISERFS_IOC_SETFLAGS:{
+@@ -67,6 +83,10 @@ long reiserfs_ioctl(struct file *filp, u
+ 				err = -EFAULT;
+ 				goto setflags_out;
+ 			}
++			if (IS_BARRIER(inode)) {
++				vxwprintk_task(1, "messing with the barrier.");
++				return -EACCES;
++			}
+ 			/*
+ 			 * Is it quota file? Do not allow user to mess with it
+ 			 */
+@@ -91,6 +111,10 @@ long reiserfs_ioctl(struct file *filp, u
+ 					goto setflags_out;
+ 				}
+ 			}
++
++			oldflags = REISERFS_I(inode)->i_attrs;
++			flags &= REISERFS_FL_USER_MODIFIABLE;
++			flags |= oldflags & ~REISERFS_FL_USER_MODIFIABLE;
+ 			sd_attrs_to_i_attrs(flags, inode);
+ 			REISERFS_I(inode)->i_attrs = flags;
+ 			inode->i_ctime = CURRENT_TIME_SEC;
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/namei.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/namei.c
+--- linux-3.4.45/fs/reiserfs/namei.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/namei.c	2012-05-21 16:15:05.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include "acl.h"
+ #include "xattr.h"
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ 
+ #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) set_nlink(i, 1); }
+ #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
+@@ -362,6 +363,7 @@ static struct dentry *reiserfs_lookup(st
+ 	if (retval == IO_ERROR) {
+ 		return ERR_PTR(-EIO);
+ 	}
++		dx_propagate_tag(nd, inode);
+ 
+ 	return d_splice_alias(inode, dentry);
+ }
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/reiserfs.h linux-3.4.45-vs2.3.3.9/fs/reiserfs/reiserfs.h
+--- linux-3.4.45/fs/reiserfs/reiserfs.h	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/reiserfs.h	2012-05-21 17:19:33.000000000 +0000
+@@ -544,6 +544,7 @@ enum reiserfs_mount_options {
+ 	REISERFS_EXPOSE_PRIVROOT,
+ 	REISERFS_BARRIER_NONE,
+ 	REISERFS_BARRIER_FLUSH,
++	REISERFS_TAGGED,
+ 
+ 	/* Actions on error */
+ 	REISERFS_ERROR_PANIC,
+@@ -1543,6 +1544,11 @@ struct stat_data_v1 {
+ #define REISERFS_COMPR_FL     FS_COMPR_FL
+ #define REISERFS_NOTAIL_FL    FS_NOTAIL_FL
+ 
++/* unfortunately reiserfs sdattr is only 16 bit */
++#define REISERFS_IXUNLINK_FL  (FS_IXUNLINK_FL >> 16)
++#define REISERFS_BARRIER_FL   (FS_BARRIER_FL >> 16)
++#define REISERFS_COW_FL       (FS_COW_FL >> 16)
++
+ /* persistent flags that file inherits from the parent directory */
+ #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL |	\
+ 				REISERFS_SYNC_FL |	\
+@@ -1552,6 +1558,9 @@ struct stat_data_v1 {
+ 				REISERFS_COMPR_FL |	\
+ 				REISERFS_NOTAIL_FL )
+ 
++#define REISERFS_FL_USER_VISIBLE	0x80FF
++#define REISERFS_FL_USER_MODIFIABLE	0x80FF
++
+ /* Stat Data on disk (reiserfs version of UFS disk inode minus the
+    address blocks) */
+ struct stat_data {
+@@ -2641,6 +2650,7 @@ static inline void reiserfs_update_sd(st
+ void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
+ void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
+ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
++int reiserfs_sync_flags(struct inode *inode, int, int);
+ 
+ int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
+ 
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/super.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/super.c
+--- linux-3.4.45/fs/reiserfs/super.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/super.c	2012-12-08 00:53:53.000000000 +0000
+@@ -982,6 +982,14 @@ static int reiserfs_parse_options(struct
+ 		{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
+ 		{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
+ #endif
++#ifndef CONFIG_TAGGING_NONE
++		{"tagxid",.setmask = 1 << REISERFS_TAGGED},
++		{"tag",.setmask = 1 << REISERFS_TAGGED},
++		{"notag",.clrmask = 1 << REISERFS_TAGGED},
++#endif
++#ifdef CONFIG_PROPAGATE
++		{"tag",.arg_required = 'T',.values = NULL},
++#endif
+ #ifdef CONFIG_REISERFS_FS_POSIX_ACL
+ 		{"acl",.setmask = 1 << REISERFS_POSIXACL},
+ 		{"noacl",.clrmask = 1 << REISERFS_POSIXACL},
+@@ -1300,6 +1308,14 @@ static int reiserfs_remount(struct super
+ 	handle_quota_files(s, qf_names, &qfmt);
+ #endif
+ 
++	if ((mount_options & (1 << REISERFS_TAGGED)) &&
++		!(s->s_flags & MS_TAGGED)) {
++		reiserfs_warning(s, "super-vs01",
++			"reiserfs: tagging not permitted on remount.");
++		err = -EINVAL;
++		goto out_err;
++	}
++
+ 	handle_attrs(s);
+ 
+ 	/* Add options that are safe here */
+@@ -1792,6 +1808,10 @@ static int reiserfs_fill_super(struct su
+ 		goto error_unlocked;
+ 	}
+ 
++	/* map mount option tagxid */
++	if (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TAGGED))
++		s->s_flags |= MS_TAGGED;
++
+ 	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,
+diff -NurpP --minimal linux-3.4.45/fs/reiserfs/xattr.c linux-3.4.45-vs2.3.3.9/fs/reiserfs/xattr.c
+--- linux-3.4.45/fs/reiserfs/xattr.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/reiserfs/xattr.c	2013-05-13 18:16:08.000000000 +0000
+@@ -40,6 +40,7 @@
+ #include <linux/errno.h>
+ #include <linux/gfp.h>
+ #include <linux/fs.h>
++#include <linux/mount.h>
+ #include <linux/file.h>
+ #include <linux/pagemap.h>
+ #include <linux/xattr.h>
+diff -NurpP --minimal linux-3.4.45/fs/stat.c linux-3.4.45-vs2.3.3.9/fs/stat.c
+--- linux-3.4.45/fs/stat.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/stat.c	2012-10-22 13:09:53.000000000 +0000
+@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
+ 	stat->nlink = inode->i_nlink;
+ 	stat->uid = inode->i_uid;
+ 	stat->gid = inode->i_gid;
++	stat->tag = inode->i_tag;
+ 	stat->rdev = inode->i_rdev;
+ 	stat->size = i_size_read(inode);
+ 	stat->atime = inode->i_atime;
+diff -NurpP --minimal linux-3.4.45/fs/statfs.c linux-3.4.45-vs2.3.3.9/fs/statfs.c
+--- linux-3.4.45/fs/statfs.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/statfs.c	2012-05-21 16:15:05.000000000 +0000
+@@ -7,6 +7,8 @@
+ #include <linux/statfs.h>
+ #include <linux/security.h>
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_dlimit.h>
+ #include "internal.h"
+ 
+ static int flags_by_mnt(int mnt_flags)
+@@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr
+ 	retval = dentry->d_sb->s_op->statfs(dentry, buf);
+ 	if (retval == 0 && buf->f_frsize == 0)
+ 		buf->f_frsize = buf->f_bsize;
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		vx_vsi_statfs(dentry->d_sb, buf);
+ 	return retval;
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/fs/super.c linux-3.4.45-vs2.3.3.9/fs/super.c
+--- linux-3.4.45/fs/super.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/super.c	2012-05-21 16:59:38.000000000 +0000
+@@ -33,6 +33,8 @@
+ #include <linux/rculist_bl.h>
+ #include <linux/cleancache.h>
+ #include <linux/fsnotify.h>
++#include <linux/magic.h>
++#include <linux/vs_context.h>
+ #include "internal.h"
+ 
+ 
+@@ -1138,6 +1140,13 @@ mount_fs(struct file_system_type *type,
+ 	WARN_ON(sb->s_bdi == &default_backing_dev_info);
+ 	sb->s_flags |= MS_BORN;
+ 
++	error = -EPERM;
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) &&
++		!sb->s_bdev &&
++		(sb->s_magic != PROC_SUPER_MAGIC) &&
++		(sb->s_magic != DEVPTS_SUPER_MAGIC))
++		goto out_sb;
++
+ 	error = security_sb_kern_mount(sb, flags, secdata);
+ 	if (error)
+ 		goto out_sb;
+diff -NurpP --minimal linux-3.4.45/fs/sysfs/mount.c linux-3.4.45-vs2.3.3.9/fs/sysfs/mount.c
+--- linux-3.4.45/fs/sysfs/mount.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/sysfs/mount.c	2012-05-21 16:15:05.000000000 +0000
+@@ -47,7 +47,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;
+ 
+diff -NurpP --minimal linux-3.4.45/fs/utimes.c linux-3.4.45-vs2.3.3.9/fs/utimes.c
+--- linux-3.4.45/fs/utimes.c	2011-05-22 14:17:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/utimes.c	2012-05-21 16:15:05.000000000 +0000
+@@ -8,6 +8,8 @@
+ #include <linux/stat.h>
+ #include <linux/utime.h>
+ #include <linux/syscalls.h>
++#include <linux/mount.h>
++#include <linux/vs_cowbl.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+ 
+@@ -52,12 +54,18 @@ static int utimes_common(struct path *pa
+ {
+ 	int error;
+ 	struct iattr newattrs;
+-	struct inode *inode = path->dentry->d_inode;
++	struct inode *inode;
+ 
+ 	error = mnt_want_write(path->mnt);
+ 	if (error)
+ 		goto out;
+ 
++	error = cow_check_and_break(path);
++	if (error)
++		goto mnt_drop_write_and_out;
++
++	inode = path->dentry->d_inode;
++
+ 	if (times && times[0].tv_nsec == UTIME_NOW &&
+ 		     times[1].tv_nsec == UTIME_NOW)
+ 		times = NULL;
+diff -NurpP --minimal linux-3.4.45/fs/xattr.c linux-3.4.45-vs2.3.3.9/fs/xattr.c
+--- linux-3.4.45/fs/xattr.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xattr.c	2012-05-21 16:15:05.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/fsnotify.h>
+ #include <linux/audit.h>
+ #include <linux/vmalloc.h>
++#include <linux/mount.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -51,7 +52,7 @@ xattr_permission(struct inode *inode, co
+ 	 * The trusted.* namespace can only be accessed by privileged users.
+ 	 */
+ 	if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) {
+-		if (!capable(CAP_SYS_ADMIN))
++		if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED))
+ 			return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
+ 		return 0;
+ 	}
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_dinode.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_dinode.h
+--- linux-3.4.45/fs/xfs/xfs_dinode.h	2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_dinode.h	2012-05-21 16:15:05.000000000 +0000
+@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
+ 	__be32		di_nlink;	/* number of links to file */
+ 	__be16		di_projid_lo;	/* lower part of owner's project id */
+ 	__be16		di_projid_hi;	/* higher part owner's project id */
+-	__u8		di_pad[6];	/* unused, zeroed space */
++	__u8		di_pad[2];	/* unused, zeroed space */
++	__be16		di_tag;		/* context tagging */
++	__be16		di_vflags;	/* vserver specific flags */
+ 	__be16		di_flushiter;	/* incremented on flush */
+ 	xfs_timestamp_t	di_atime;	/* time last accessed */
+ 	xfs_timestamp_t	di_mtime;	/* time last modified */
+@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s
+ #define XFS_DIFLAG_EXTSZINHERIT_BIT 12	/* inherit inode extent size */
+ #define XFS_DIFLAG_NODEFRAG_BIT     13	/* do not reorganize/defragment */
+ #define XFS_DIFLAG_FILESTREAM_BIT   14  /* use filestream allocator */
++#define XFS_DIFLAG_IXUNLINK_BIT     15	/* Immutable inver on 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)
+@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s
+ #define XFS_DIFLAG_EXTSZINHERIT  (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
+ #define XFS_DIFLAG_NODEFRAG      (1 << XFS_DIFLAG_NODEFRAG_BIT)
+ #define XFS_DIFLAG_FILESTREAM    (1 << XFS_DIFLAG_FILESTREAM_BIT)
++#define XFS_DIFLAG_IXUNLINK      (1 << XFS_DIFLAG_IXUNLINK_BIT)
+ 
+ #ifdef CONFIG_XFS_RT
+ #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
+@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s
+ 	 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_EXTSIZE | \
+-	 XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM)
++	 XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \
++	 XFS_DIFLAG_IXUNLINK)
++
++#define XFS_DIVFLAG_BARRIER	0x01
++#define XFS_DIVFLAG_COW		0x02
+ 
+ #endif	/* __XFS_DINODE_H__ */
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_fs.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_fs.h
+--- linux-3.4.45/fs/xfs/xfs_fs.h	2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_fs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -67,6 +67,9 @@ struct fsxattr {
+ #define XFS_XFLAG_EXTSZINHERIT	0x00001000	/* inherit inode extent size */
+ #define XFS_XFLAG_NODEFRAG	0x00002000  	/* do not defragment */
+ #define XFS_XFLAG_FILESTREAM	0x00004000	/* use filestream allocator */
++#define XFS_XFLAG_IXUNLINK	0x00008000	/* immutable invert on unlink */
++#define XFS_XFLAG_BARRIER	0x10000000	/* chroot() barrier */
++#define XFS_XFLAG_COW		0x20000000	/* copy on write mark */
+ #define XFS_XFLAG_HASATTR	0x80000000	/* no DIFLAG for this	*/
+ 
+ /*
+@@ -302,7 +305,8 @@ typedef struct xfs_bstat {
+ #define	bs_projid	bs_projid_lo	/* (previously just bs_projid)	*/
+ 	__u16		bs_forkoff;	/* inode fork offset in bytes	*/
+ 	__u16		bs_projid_hi;	/* higher part of project id	*/
+-	unsigned char	bs_pad[10];	/* pad space, unused		*/
++	unsigned char	bs_pad[8];	/* pad space, unused		*/
++	__u16		bs_tag;		/* context tagging		*/
+ 	__u32		bs_dmevmask;	/* DMIG event mask		*/
+ 	__u16		bs_dmstate;	/* DMIG state info		*/
+ 	__u16		bs_aextents;	/* attribute number of extents	*/
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ialloc.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ialloc.c
+--- linux-3.4.45/fs/xfs/xfs_ialloc.c	2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ialloc.c	2012-05-21 16:15:05.000000000 +0000
+@@ -37,7 +37,6 @@
+ #include "xfs_error.h"
+ #include "xfs_bmap.h"
+ 
+-
+ /*
+  * Allocation group level functions.
+  */
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_inode.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.c
+--- linux-3.4.45/fs/xfs/xfs_inode.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.c	2012-05-21 16:15:05.000000000 +0000
+@@ -236,6 +236,7 @@ xfs_inotobp(
+ 	return 0;
+ }
+ 
++#include <linux/vs_tag.h>
+ 
+ /*
+  * This routine is called to map an inode to the buffer containing
+@@ -631,15 +632,25 @@ xfs_iformat_btree(
+ STATIC void
+ xfs_dinode_from_disk(
+ 	xfs_icdinode_t		*to,
+-	xfs_dinode_t		*from)
++	xfs_dinode_t		*from,
++	int tagged)
+ {
++	uint32_t uid, gid, tag;
++
+ 	to->di_magic = be16_to_cpu(from->di_magic);
+ 	to->di_mode = be16_to_cpu(from->di_mode);
+ 	to->di_version = from ->di_version;
+ 	to->di_format = from->di_format;
+ 	to->di_onlink = be16_to_cpu(from->di_onlink);
+-	to->di_uid = be32_to_cpu(from->di_uid);
+-	to->di_gid = be32_to_cpu(from->di_gid);
++
++	uid = be32_to_cpu(from->di_uid);
++	gid = be32_to_cpu(from->di_gid);
++	tag = be16_to_cpu(from->di_tag);
++
++	to->di_uid = INOTAG_UID(tagged, uid, gid);
++	to->di_gid = INOTAG_GID(tagged, uid, gid);
++	to->di_tag = INOTAG_TAG(tagged, uid, gid, tag);
++
+ 	to->di_nlink = be32_to_cpu(from->di_nlink);
+ 	to->di_projid_lo = be16_to_cpu(from->di_projid_lo);
+ 	to->di_projid_hi = be16_to_cpu(from->di_projid_hi);
+@@ -661,21 +672,26 @@ xfs_dinode_from_disk(
+ 	to->di_dmevmask	= be32_to_cpu(from->di_dmevmask);
+ 	to->di_dmstate	= be16_to_cpu(from->di_dmstate);
+ 	to->di_flags	= be16_to_cpu(from->di_flags);
++	to->di_vflags	= be16_to_cpu(from->di_vflags);
+ 	to->di_gen	= be32_to_cpu(from->di_gen);
+ }
+ 
+ void
+ xfs_dinode_to_disk(
+ 	xfs_dinode_t		*to,
+-	xfs_icdinode_t		*from)
++	xfs_icdinode_t		*from,
++	int tagged)
+ {
+ 	to->di_magic = cpu_to_be16(from->di_magic);
+ 	to->di_mode = cpu_to_be16(from->di_mode);
+ 	to->di_version = from ->di_version;
+ 	to->di_format = from->di_format;
+ 	to->di_onlink = cpu_to_be16(from->di_onlink);
+-	to->di_uid = cpu_to_be32(from->di_uid);
+-	to->di_gid = cpu_to_be32(from->di_gid);
++
++	to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag));
++	to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag));
++	to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag));
++
+ 	to->di_nlink = cpu_to_be32(from->di_nlink);
+ 	to->di_projid_lo = cpu_to_be16(from->di_projid_lo);
+ 	to->di_projid_hi = cpu_to_be16(from->di_projid_hi);
+@@ -697,12 +713,14 @@ xfs_dinode_to_disk(
+ 	to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
+ 	to->di_dmstate = cpu_to_be16(from->di_dmstate);
+ 	to->di_flags = cpu_to_be16(from->di_flags);
++	to->di_vflags = cpu_to_be16(from->di_vflags);
+ 	to->di_gen = cpu_to_be32(from->di_gen);
+ }
+ 
+ STATIC uint
+ _xfs_dic2xflags(
+-	__uint16_t		di_flags)
++	__uint16_t		di_flags,
++	__uint16_t		di_vflags)
+ {
+ 	uint			flags = 0;
+ 
+@@ -713,6 +731,8 @@ _xfs_dic2xflags(
+ 			flags |= XFS_XFLAG_PREALLOC;
+ 		if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ 			flags |= XFS_XFLAG_IMMUTABLE;
++		if (di_flags & XFS_DIFLAG_IXUNLINK)
++			flags |= XFS_XFLAG_IXUNLINK;
+ 		if (di_flags & XFS_DIFLAG_APPEND)
+ 			flags |= XFS_XFLAG_APPEND;
+ 		if (di_flags & XFS_DIFLAG_SYNC)
+@@ -737,6 +757,10 @@ _xfs_dic2xflags(
+ 			flags |= XFS_XFLAG_FILESTREAM;
+ 	}
+ 
++	if (di_vflags & XFS_DIVFLAG_BARRIER)
++		flags |= FS_BARRIER_FL;
++	if (di_vflags & XFS_DIVFLAG_COW)
++		flags |= FS_COW_FL;
+ 	return flags;
+ }
+ 
+@@ -746,7 +770,7 @@ xfs_ip2xflags(
+ {
+ 	xfs_icdinode_t		*dic = &ip->i_d;
+ 
+-	return _xfs_dic2xflags(dic->di_flags) |
++	return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) |
+ 				(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
+ }
+ 
+@@ -754,7 +778,8 @@ uint
+ xfs_dic2xflags(
+ 	xfs_dinode_t		*dip)
+ {
+-	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) |
++	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags),
++				be16_to_cpu(dip->di_vflags)) |
+ 				(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
+ }
+ 
+@@ -787,7 +812,6 @@ xfs_iread(
+ 	if (error)
+ 		return error;
+ 	dip = (xfs_dinode_t *)xfs_buf_offset(bp, ip->i_imap.im_boffset);
+-
+ 	/*
+ 	 * If we got something that isn't an inode it means someone
+ 	 * (nfs or dmi) has a stale handle.
+@@ -810,7 +834,8 @@ xfs_iread(
+ 	 * Otherwise, just get the truly permanent information.
+ 	 */
+ 	if (dip->di_mode) {
+-		xfs_dinode_from_disk(&ip->i_d, dip);
++		xfs_dinode_from_disk(&ip->i_d, dip,
++			mp->m_flags & XFS_MOUNT_TAGGED);
+ 		error = xfs_iformat(ip, dip);
+ 		if (error)  {
+ #ifdef DEBUG
+@@ -998,6 +1023,7 @@ xfs_ialloc(
+ 	ASSERT(ip->i_d.di_nlink == nlink);
+ 	ip->i_d.di_uid = current_fsuid();
+ 	ip->i_d.di_gid = current_fsgid();
++	ip->i_d.di_tag = current_fstag(&ip->i_vnode);
+ 	xfs_set_projid(ip, prid);
+ 	memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
+ 
+@@ -1057,6 +1083,7 @@ xfs_ialloc(
+ 	ip->i_d.di_dmevmask = 0;
+ 	ip->i_d.di_dmstate = 0;
+ 	ip->i_d.di_flags = 0;
++	ip->i_d.di_vflags = 0;
+ 	flags = XFS_ILOG_CORE;
+ 	switch (mode & S_IFMT) {
+ 	case S_IFIFO:
+@@ -1725,6 +1752,7 @@ xfs_ifree(
+ 	}
+ 	ip->i_d.di_mode = 0;		/* mark incore inode as free */
+ 	ip->i_d.di_flags = 0;
++	ip->i_d.di_vflags = 0;
+ 	ip->i_d.di_dmevmask = 0;
+ 	ip->i_d.di_forkoff = 0;		/* mark the attr fork not in use */
+ 	ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
+@@ -2598,7 +2626,8 @@ xfs_iflush_int(
+ 	 * because if the inode is dirty at all the core must
+ 	 * be.
+ 	 */
+-	xfs_dinode_to_disk(dip, &ip->i_d);
++	xfs_dinode_to_disk(dip, &ip->i_d,
++		mp->m_flags & XFS_MOUNT_TAGGED);
+ 
+ 	/* Wrap, we never let the log put out DI_MAX_FLUSH */
+ 	if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_inode.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.h
+--- linux-3.4.45/fs/xfs/xfs_inode.h	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_inode.h	2012-05-21 16:15:05.000000000 +0000
+@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
+ 	__uint32_t	di_nlink;	/* number of links to file */
+ 	__uint16_t	di_projid_lo;	/* lower part of owner's project id */
+ 	__uint16_t	di_projid_hi;	/* higher part of owner's project id */
+-	__uint8_t	di_pad[6];	/* unused, zeroed space */
++	__uint8_t	di_pad[2];	/* unused, zeroed space */
++	__uint16_t	di_tag;		/* context tagging */
++	__uint16_t	di_vflags;	/* vserver specific flags */
+ 	__uint16_t	di_flushiter;	/* incremented on flush */
+ 	xfs_ictimestamp_t di_atime;	/* time last accessed */
+ 	xfs_ictimestamp_t di_mtime;	/* time last modified */
+@@ -565,7 +567,7 @@ int		xfs_itobp(struct xfs_mount *, struc
+ int		xfs_iread(struct xfs_mount *, struct xfs_trans *,
+ 			  struct xfs_inode *, uint);
+ void		xfs_dinode_to_disk(struct xfs_dinode *,
+-				   struct xfs_icdinode *);
++				   struct xfs_icdinode *, int);
+ void		xfs_idestroy_fork(struct xfs_inode *, int);
+ void		xfs_idata_realloc(struct xfs_inode *, int, int);
+ void		xfs_iroot_realloc(struct xfs_inode *, int, int);
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ioctl.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.c
+--- linux-3.4.45/fs/xfs/xfs_ioctl.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -28,7 +28,7 @@
+ #include "xfs_bmap_btree.h"
+ #include "xfs_dinode.h"
+ #include "xfs_inode.h"
+-#include "xfs_ioctl.h"
++// #include "xfs_ioctl.h"
+ #include "xfs_rtalloc.h"
+ #include "xfs_itable.h"
+ #include "xfs_error.h"
+@@ -750,6 +750,10 @@ xfs_merge_ioc_xflags(
+ 		xflags |= XFS_XFLAG_IMMUTABLE;
+ 	else
+ 		xflags &= ~XFS_XFLAG_IMMUTABLE;
++	if (flags & FS_IXUNLINK_FL)
++		xflags |= XFS_XFLAG_IXUNLINK;
++	else
++		xflags &= ~XFS_XFLAG_IXUNLINK;
+ 	if (flags & FS_APPEND_FL)
+ 		xflags |= XFS_XFLAG_APPEND;
+ 	else
+@@ -778,6 +782,8 @@ xfs_di2lxflags(
+ 
+ 	if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ 		flags |= FS_IMMUTABLE_FL;
++	if (di_flags & XFS_DIFLAG_IXUNLINK)
++		flags |= FS_IXUNLINK_FL;
+ 	if (di_flags & XFS_DIFLAG_APPEND)
+ 		flags |= FS_APPEND_FL;
+ 	if (di_flags & XFS_DIFLAG_SYNC)
+@@ -838,6 +844,8 @@ xfs_set_diflags(
+ 	di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
+ 	if (xflags & XFS_XFLAG_IMMUTABLE)
+ 		di_flags |= XFS_DIFLAG_IMMUTABLE;
++	if (xflags & XFS_XFLAG_IXUNLINK)
++		di_flags |= XFS_DIFLAG_IXUNLINK;
+ 	if (xflags & XFS_XFLAG_APPEND)
+ 		di_flags |= XFS_DIFLAG_APPEND;
+ 	if (xflags & XFS_XFLAG_SYNC)
+@@ -880,6 +888,10 @@ xfs_diflags_to_linux(
+ 		inode->i_flags |= S_IMMUTABLE;
+ 	else
+ 		inode->i_flags &= ~S_IMMUTABLE;
++	if (xflags & XFS_XFLAG_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++	else
++		inode->i_flags &= ~S_IXUNLINK;
+ 	if (xflags & XFS_XFLAG_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	else
+@@ -1372,10 +1384,18 @@ xfs_file_ioctl(
+ 	case XFS_IOC_FSGETXATTRA:
+ 		return xfs_ioc_fsgetxattr(ip, 1, arg);
+ 	case XFS_IOC_FSSETXATTR:
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -XFS_ERROR(EACCES);
++		}
+ 		return xfs_ioc_fssetxattr(ip, filp, arg);
+ 	case XFS_IOC_GETXFLAGS:
+ 		return xfs_ioc_getxflags(ip, arg);
+ 	case XFS_IOC_SETXFLAGS:
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -XFS_ERROR(EACCES);
++		}
+ 		return xfs_ioc_setxflags(ip, filp, arg);
+ 
+ 	case XFS_IOC_FSSETDM: {
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_ioctl.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.h
+--- linux-3.4.45/fs/xfs/xfs_ioctl.h	2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_ioctl.h	2012-05-21 16:15:05.000000000 +0000
+@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
+ 	void __user		*uhandle,
+ 	u32			hlen);
+ 
++extern int
++xfs_sync_flags(
++	struct inode		*inode,
++	int			flags,
++	int			vflags);
++
+ extern long
+ xfs_file_ioctl(
+ 	struct file		*filp,
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_iops.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_iops.c
+--- linux-3.4.45/fs/xfs/xfs_iops.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_iops.c	2012-05-21 16:15:05.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include "xfs_bmap_btree.h"
+ #include "xfs_dinode.h"
+ #include "xfs_inode.h"
++#include "xfs_ioctl.h"
+ #include "xfs_bmap.h"
+ #include "xfs_rtalloc.h"
+ #include "xfs_error.h"
+@@ -49,6 +50,7 @@
+ #include <linux/security.h>
+ #include <linux/fiemap.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+ 
+ static int
+ xfs_initxattrs(
+@@ -424,6 +426,7 @@ xfs_vn_getattr(
+ 	stat->nlink = ip->i_d.di_nlink;
+ 	stat->uid = ip->i_d.di_uid;
+ 	stat->gid = ip->i_d.di_gid;
++	stat->tag = ip->i_d.di_tag;
+ 	stat->ino = ip->i_ino;
+ 	stat->atime = inode->i_atime;
+ 	stat->mtime = inode->i_mtime;
+@@ -996,6 +999,7 @@ static const struct inode_operations xfs
+ 	.removexattr		= generic_removexattr,
+ 	.listxattr		= xfs_vn_listxattr,
+ 	.fiemap			= xfs_vn_fiemap,
++	.sync_flags		= xfs_sync_flags,
+ };
+ 
+ static const struct inode_operations xfs_dir_inode_operations = {
+@@ -1021,6 +1025,7 @@ static const struct inode_operations xfs
+ 	.getxattr		= generic_getxattr,
+ 	.removexattr		= generic_removexattr,
+ 	.listxattr		= xfs_vn_listxattr,
++	.sync_flags		= xfs_sync_flags,
+ };
+ 
+ static const struct inode_operations xfs_dir_ci_inode_operations = {
+@@ -1070,6 +1075,10 @@ xfs_diflags_to_iflags(
+ 		inode->i_flags |= S_IMMUTABLE;
+ 	else
+ 		inode->i_flags &= ~S_IMMUTABLE;
++	if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++	else
++		inode->i_flags &= ~S_IXUNLINK;
+ 	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	else
+@@ -1082,6 +1091,15 @@ xfs_diflags_to_iflags(
+ 		inode->i_flags |= S_NOATIME;
+ 	else
+ 		inode->i_flags &= ~S_NOATIME;
++
++	if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER)
++		inode->i_vflags |= V_BARRIER;
++	else
++		inode->i_vflags &= ~V_BARRIER;
++	if (ip->i_d.di_vflags & XFS_DIVFLAG_COW)
++		inode->i_vflags |= V_COW;
++	else
++		inode->i_vflags &= ~V_COW;
+ }
+ 
+ /*
+@@ -1113,6 +1131,7 @@ xfs_setup_inode(
+ 	set_nlink(inode, ip->i_d.di_nlink);
+ 	inode->i_uid	= ip->i_d.di_uid;
+ 	inode->i_gid	= ip->i_d.di_gid;
++	inode->i_tag    = ip->i_d.di_tag;
+ 
+ 	switch (inode->i_mode & S_IFMT) {
+ 	case S_IFBLK:
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_itable.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_itable.c
+--- linux-3.4.45/fs/xfs/xfs_itable.c	2012-05-21 16:07:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_itable.c	2012-05-21 16:15:05.000000000 +0000
+@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
+ 	buf->bs_mode = dic->di_mode;
+ 	buf->bs_uid = dic->di_uid;
+ 	buf->bs_gid = dic->di_gid;
++	buf->bs_tag = dic->di_tag;
+ 	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;
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_linux.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_linux.h
+--- linux-3.4.45/fs/xfs/xfs_linux.h	2011-10-24 16:45:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_linux.h	2012-05-21 16:15:05.000000000 +0000
+@@ -121,6 +121,7 @@
+ 
+ #define current_cpu()		(raw_smp_processor_id())
+ #define current_pid()		(current->pid)
++#define current_fstag(vp)	(dx_current_fstag((vp)->i_sb))
+ #define current_test_flags(f)	(current->flags & (f))
+ #define current_set_flags_nested(sp, f)		\
+ 		(*(sp) = current->flags, current->flags |= (f))
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_log_recover.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_log_recover.c
+--- linux-3.4.45/fs/xfs/xfs_log_recover.c	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_log_recover.c	2012-11-18 23:52:29.000000000 +0000
+@@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2(
+ 	}
+ 
+ 	/* The core is in in-core format */
+-	xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr);
++	xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr,
++		mp->m_flags & XFS_MOUNT_TAGGED);
+ 
+ 	/* the rest is in on-disk format */
+ 	if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_mount.h linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_mount.h
+--- linux-3.4.45/fs/xfs/xfs_mount.h	2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_mount.h	2012-05-21 16:15:05.000000000 +0000
+@@ -251,6 +251,7 @@ typedef struct xfs_mount {
+ 						   allocator */
+ #define XFS_MOUNT_NOATTR2	(1ULL << 25)	/* disable use of attr2 format */
+ 
++#define XFS_MOUNT_TAGGED	(1ULL << 31)	/* context tagging */
+ 
+ /*
+  * Default minimum read and write sizes.
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_super.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_super.c
+--- linux-3.4.45/fs/xfs/xfs_super.c	2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_super.c	2012-05-21 16:15:05.000000000 +0000
+@@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool;
+ #define MNTOPT_NODELAYLOG  "nodelaylog"	/* Delayed logging disabled */
+ #define MNTOPT_DISCARD	   "discard"	/* Discard unused blocks */
+ #define MNTOPT_NODISCARD   "nodiscard"	/* Do not discard unused blocks */
++#define MNTOPT_TAGXID	"tagxid"	/* context tagging for inodes */
++#define MNTOPT_TAGGED	"tag"		/* context tagging for inodes */
++#define MNTOPT_NOTAGTAG	"notag"		/* do not use context tagging */
+ 
+ /*
+  * Table driven mount option parser.
+@@ -121,10 +124,14 @@ mempool_t *xfs_ioend_pool;
+  * in the future, too.
+  */
+ enum {
++	Opt_tag, Opt_notag,
+ 	Opt_barrier, Opt_nobarrier, Opt_err
+ };
+ 
+ static const match_table_t tokens = {
++	{Opt_tag, "tagxid"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
+ 	{Opt_barrier, "barrier"},
+ 	{Opt_nobarrier, "nobarrier"},
+ 	{Opt_err, NULL}
+@@ -372,6 +379,19 @@ xfs_parseargs(
+ 		} else if (!strcmp(this_char, "irixsgid")) {
+ 			xfs_warn(mp,
+ 	"irixsgid is now a sysctl(2) variable, option is deprecated.");
++#ifndef CONFIG_TAGGING_NONE
++		} else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++		} else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) {
++			mp->m_flags &= ~XFS_MOUNT_TAGGED;
++		} else if (!strcmp(this_char, MNTOPT_TAGXID)) {
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++#endif
++#ifdef CONFIG_PROPAGATE
++		} else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++			/* use value */
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++#endif
+ 		} else {
+ 			xfs_warn(mp, "unknown mount option [%s].", this_char);
+ 			return EINVAL;
+@@ -1127,6 +1147,16 @@ xfs_fs_remount(
+ 		case Opt_nobarrier:
+ 			mp->m_flags &= ~XFS_MOUNT_BARRIER;
+ 			break;
++		case Opt_tag:
++			if (!(sb->s_flags & MS_TAGGED)) {
++				printk(KERN_INFO
++					"XFS: %s: tagging not permitted on remount.\n",
++					sb->s_id);
++				return -EINVAL;
++			}
++			break;
++		case Opt_notag:
++			break;
+ 		default:
+ 			/*
+ 			 * Logically we would return an error here to prevent
+@@ -1346,6 +1376,9 @@ xfs_fs_fill_super(
+ 	if (error)
+ 		goto out_free_sb;
+ 
++	if (mp->m_flags & XFS_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	/*
+ 	 * we must configure the block size in the superblock before we run the
+ 	 * full mount process as the mount process can lookup and cache inodes.
+diff -NurpP --minimal linux-3.4.45/fs/xfs/xfs_vnodeops.c linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_vnodeops.c
+--- linux-3.4.45/fs/xfs/xfs_vnodeops.c	2012-05-21 16:07:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/fs/xfs/xfs_vnodeops.c	2012-05-21 16:15:05.000000000 +0000
+@@ -106,6 +106,77 @@ xfs_readlink_bmap(
+ 	return error;
+ }
+ 
++
++STATIC void
++xfs_get_inode_flags(
++	xfs_inode_t	*ip)
++{
++	struct inode 	*inode = VFS_I(ip);
++	unsigned int 	flags = inode->i_flags;
++	unsigned int 	vflags = inode->i_vflags;
++
++	if (flags & S_IMMUTABLE)
++		ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE;
++	else
++		ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK;
++	else
++		ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK;
++
++	if (vflags & V_BARRIER)
++		ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER;
++	else
++		ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER;
++	if (vflags & V_COW)
++		ip->i_d.di_vflags |= XFS_DIVFLAG_COW;
++	else
++		ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW;
++}
++
++int
++xfs_sync_flags(
++	struct inode		*inode,
++	int			flags,
++	int			vflags)
++{
++	struct xfs_inode	*ip = XFS_I(inode);
++	struct xfs_mount	*mp = ip->i_mount;
++	struct xfs_trans        *tp;
++	unsigned int		lock_flags = 0;
++	int			code;
++
++	tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE);
++	code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0);
++	if (code)
++		goto error_out;
++
++	xfs_ilock(ip, XFS_ILOCK_EXCL);
++	xfs_trans_ijoin(tp, ip, 0);
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	xfs_get_inode_flags(ip);
++
++	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
++	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
++
++	XFS_STATS_INC(xs_ig_attrchg);
++
++	if (mp->m_flags & XFS_MOUNT_WSYNC)
++		xfs_trans_set_sync(tp);
++	code = xfs_trans_commit(tp, 0);
++	xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	return code;
++
++error_out:
++	xfs_trans_cancel(tp, 0);
++	if (lock_flags)
++		xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	return code;
++}
++
++
+ int
+ xfs_readlink(
+ 	xfs_inode_t     *ip,
+diff -NurpP --minimal linux-3.4.45/include/linux/Kbuild linux-3.4.45-vs2.3.3.9/include/linux/Kbuild
+--- linux-3.4.45/include/linux/Kbuild	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/Kbuild	2012-07-24 09:52:30.000000000 +0000
+@@ -18,6 +18,7 @@ header-y += netfilter_bridge/
+ header-y += netfilter_ipv4/
+ header-y += netfilter_ipv6/
+ header-y += usb/
++header-y += vserver/
+ header-y += wimax/
+ 
+ objhdr-y += version.h
+diff -NurpP --minimal linux-3.4.45/include/linux/capability.h linux-3.4.45-vs2.3.3.9/include/linux/capability.h
+--- linux-3.4.45/include/linux/capability.h	2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/capability.h	2012-05-21 16:15:05.000000000 +0000
+@@ -280,6 +280,7 @@ struct cpu_vfs_cap_data {
+    arbitrary SCSI commands */
+ /* Allow setting encryption key on loopback filesystem */
+ /* Allow setting zone reclaim policy */
++/* Allow the selection of a security context */
+ 
+ #define CAP_SYS_ADMIN        21
+ 
+@@ -363,7 +364,12 @@ struct cpu_vfs_cap_data {
+ 
+ #define CAP_LAST_CAP         CAP_WAKE_ALARM
+ 
+-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
++/* Allow context manipulations */
++/* Allow changing context info on files */
++
++#define CAP_CONTEXT	     63
++
++#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
+ 
+ /*
+  * Bit location of each capability (used by user-space library and kernel)
+diff -NurpP --minimal linux-3.4.45/include/linux/cred.h linux-3.4.45-vs2.3.3.9/include/linux/cred.h
+--- linux-3.4.45/include/linux/cred.h	2012-03-19 18:47:27.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/cred.h	2012-05-21 16:15:05.000000000 +0000
+@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
+ extern int copy_creds(struct task_struct *, unsigned long);
+ extern const struct cred *get_task_cred(struct task_struct *);
+ extern struct cred *cred_alloc_blank(void);
++extern struct cred *__prepare_creds(const struct cred *);
+ extern struct cred *prepare_creds(void);
+ extern struct cred *prepare_exec_creds(void);
+ extern int commit_creds(struct cred *);
+@@ -209,6 +210,31 @@ static inline void validate_process_cred
+ }
+ #endif
+ 
++static inline void set_cred_subscribers(struct cred *cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	atomic_set(&cred->subscribers, n);
++#endif
++}
++
++static inline int read_cred_subscribers(const struct cred *cred)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	return atomic_read(&cred->subscribers);
++#else
++	return 0;
++#endif
++}
++
++static inline void alter_cred_subscribers(const struct cred *_cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	struct cred *cred = (struct cred *) _cred;
++
++	atomic_add(n, &cred->subscribers);
++#endif
++}
++
+ /**
+  * get_new_cred - Get a reference on a new set of credentials
+  * @cred: The new credentials to reference
+diff -NurpP --minimal linux-3.4.45/include/linux/devpts_fs.h linux-3.4.45-vs2.3.3.9/include/linux/devpts_fs.h
+--- linux-3.4.45/include/linux/devpts_fs.h	2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/devpts_fs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
+ 
+ #endif
+ 
+-
+ #endif /* _LINUX_DEVPTS_FS_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/fs.h linux-3.4.45-vs2.3.3.9/include/linux/fs.h
+--- linux-3.4.45/include/linux/fs.h	2012-05-21 16:07:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/fs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -214,6 +214,9 @@ struct inodes_stat_t {
+ #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
+ #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
+ #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
++#define MS_TAGGED	(1<<25) /* use generic inode tagging */
++#define MS_TAGID	(1<<26) /* use specific tag for this mount */
++#define MS_NOTAGCHECK	(1<<27) /* don't check tags */
+ #define MS_NOSEC	(1<<28)
+ #define MS_BORN		(1<<29)
+ #define MS_ACTIVE	(1<<30)
+@@ -245,6 +248,14 @@ struct inodes_stat_t {
+ #define S_IMA		1024	/* Inode has an associated IMA struct */
+ #define S_AUTOMOUNT	2048	/* Automount/referral quasi-directory */
+ #define S_NOSEC		4096	/* no suid or xattr security attributes */
++#define S_IXUNLINK	8192	/* Immutable Invert on unlink */
++
++/* Linux-VServer related Inode flags */
++
++#define V_VALID		1
++#define V_XATTR		2
++#define V_BARRIER	4	/* Barrier for chroot() */
++#define V_COW		8	/* Copy on Write */
+ 
+ /*
+  * Note that nosuid etc flags are inode-specific: setting some file-system
+@@ -267,12 +278,15 @@ struct inodes_stat_t {
+ #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_NOATIME(inode)   __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
+-#define IS_I_VERSION(inode)   __IS_FLG(inode, MS_I_VERSION)
++#define IS_NOATIME(inode)	__IS_FLG(inode, MS_RDONLY|MS_NOATIME)
++#define IS_I_VERSION(inode)	__IS_FLG(inode, MS_I_VERSION)
++#define IS_TAGGED(inode)	__IS_FLG(inode, MS_TAGGED)
+ 
+ #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_IXUNLINK(inode)	((inode)->i_flags & S_IXUNLINK)
++#define IS_IXORUNLINK(inode)	((IS_IXUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
+ #define IS_POSIXACL(inode)	__IS_FLG(inode, MS_POSIXACL)
+ 
+ #define IS_DEADDIR(inode)	((inode)->i_flags & S_DEAD)
+@@ -283,6 +297,16 @@ struct inodes_stat_t {
+ #define IS_AUTOMOUNT(inode)	((inode)->i_flags & S_AUTOMOUNT)
+ #define IS_NOSEC(inode)		((inode)->i_flags & S_NOSEC)
+ 
++#define IS_BARRIER(inode)	(S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER))
++
++#ifdef CONFIG_VSERVER_COWBL
++#  define IS_COW(inode)		(IS_IXUNLINK(inode) && IS_IMMUTABLE(inode))
++#  define IS_COW_LINK(inode)	(S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
++#else
++#  define IS_COW(inode)		(0)
++#  define IS_COW_LINK(inode)	(0)
++#endif
++
+ /* the read-only stuff doesn't really belong here, but any other place is
+    probably as bad and I don't want to create yet another include file. */
+ 
+@@ -369,11 +393,14 @@ struct inodes_stat_t {
+ #define FS_EXTENT_FL			0x00080000 /* Extents */
+ #define FS_DIRECTIO_FL			0x00100000 /* Use direct i/o */
+ #define FS_NOCOW_FL			0x00800000 /* Do not cow file */
++#define FS_IXUNLINK_FL			0x08000000 /* Immutable invert on unlink */
+ #define FS_RESERVED_FL			0x80000000 /* reserved for ext2 lib */
+ 
+-#define FS_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+-#define FS_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
++#define FS_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define FS_COW_FL			0x20000000 /* Copy on Write marker */
+ 
++#define FS_FL_USER_VISIBLE		0x0103DFFF /* User visible flags */
++#define FS_FL_USER_MODIFIABLE		0x010380FF /* User modifiable flags */
+ 
+ #define SYNC_FILE_RANGE_WAIT_BEFORE	1
+ #define SYNC_FILE_RANGE_WRITE		2
+@@ -456,6 +483,7 @@ typedef void (dio_iodone_t)(struct kiocb
+ #define ATTR_KILL_PRIV	(1 << 14)
+ #define ATTR_OPEN	(1 << 15) /* Truncating from open(O_TRUNC) */
+ #define ATTR_TIMES_SET	(1 << 16)
++#define ATTR_TAG	(1 << 17)
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -471,6 +499,7 @@ struct iattr {
+ 	umode_t		ia_mode;
+ 	uid_t		ia_uid;
+ 	gid_t		ia_gid;
++	tag_t		ia_tag;
+ 	loff_t		ia_size;
+ 	struct timespec	ia_atime;
+ 	struct timespec	ia_mtime;
+@@ -484,6 +513,9 @@ struct iattr {
+ 	struct file	*ia_file;
+ };
+ 
++#define ATTR_FLAG_BARRIER	512	/* Barrier for chroot() */
++#define ATTR_FLAG_IXUNLINK	1024	/* Immutable invert on unlink */
++
+ /*
+  * Includes for diskquotas.
+  */
+@@ -763,7 +795,9 @@ struct inode {
+ 	unsigned short		i_opflags;
+ 	uid_t			i_uid;
+ 	gid_t			i_gid;
+-	unsigned int		i_flags;
++	tag_t			i_tag;
++	unsigned short		i_flags;
++	unsigned short		i_vflags;
+ 
+ #ifdef CONFIG_FS_POSIX_ACL
+ 	struct posix_acl	*i_acl;
+@@ -792,6 +826,7 @@ struct inode {
+ 		unsigned int __i_nlink;
+ 	};
+ 	dev_t			i_rdev;
++	dev_t			i_mdev;
+ 	struct timespec		i_atime;
+ 	struct timespec		i_mtime;
+ 	struct timespec		i_ctime;
+@@ -929,12 +964,12 @@ static inline void i_size_write(struct i
+ 
+ static inline unsigned iminor(const struct inode *inode)
+ {
+-	return MINOR(inode->i_rdev);
++	return MINOR(inode->i_mdev);
+ }
+ 
+ static inline unsigned imajor(const struct inode *inode)
+ {
+-	return MAJOR(inode->i_rdev);
++	return MAJOR(inode->i_mdev);
+ }
+ 
+ extern struct block_device *I_BDEV(struct inode *inode);
+@@ -1001,6 +1036,7 @@ struct file {
+ 	loff_t			f_pos;
+ 	struct fown_struct	f_owner;
+ 	const struct cred	*f_cred;
++	xid_t			f_xid;
+ 	struct file_ra_state	f_ra;
+ 
+ 	u64			f_version;
+@@ -1148,6 +1184,7 @@ struct file_lock {
+ 	struct file *fl_file;
+ 	loff_t fl_start;
+ 	loff_t fl_end;
++	xid_t fl_xid;
+ 
+ 	struct fasync_struct *	fl_fasync; /* for lease break notifications */
+ 	/* for lease breaks: */
+@@ -1661,6 +1698,7 @@ struct inode_operations {
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ 	int (*removexattr) (struct dentry *, const char *);
++	int (*sync_flags) (struct inode *, int, int);
+ 	void (*truncate_range)(struct inode *, loff_t, loff_t);
+ 	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
+ 		      u64 len);
+@@ -1680,6 +1718,7 @@ extern ssize_t vfs_readv(struct file *,
+ 		unsigned long, loff_t *);
+ extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
+ 		unsigned long, loff_t *);
++ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
+ 
+ struct super_operations {
+    	struct inode *(*alloc_inode)(struct super_block *sb);
+@@ -2509,6 +2548,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_setattr(struct dentry *, struct iattr *);
+ extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+ extern int simple_statfs(struct dentry *, struct kstatfs *);
+diff -NurpP --minimal linux-3.4.45/include/linux/gfs2_ondisk.h linux-3.4.45-vs2.3.3.9/include/linux/gfs2_ondisk.h
+--- linux-3.4.45/include/linux/gfs2_ondisk.h	2012-05-21 16:07:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/gfs2_ondisk.h	2012-05-21 16:15:05.000000000 +0000
+@@ -214,6 +214,9 @@ enum {
+ 	gfs2fl_NoAtime		= 7,
+ 	gfs2fl_Sync		= 8,
+ 	gfs2fl_System		= 9,
++	gfs2fl_IXUnlink		= 16,
++	gfs2fl_Barrier		= 17,
++	gfs2fl_Cow		= 18,
+ 	gfs2fl_TruncInProg	= 29,
+ 	gfs2fl_InheritDirectio	= 30,
+ 	gfs2fl_InheritJdata	= 31,
+@@ -230,6 +233,9 @@ enum {
+ #define GFS2_DIF_NOATIME		0x00000080
+ #define GFS2_DIF_SYNC			0x00000100
+ #define GFS2_DIF_SYSTEM			0x00000200 /* New in gfs2 */
++#define GFS2_DIF_IXUNLINK		0x00010000
++#define GFS2_DIF_BARRIER		0x00020000
++#define GFS2_DIF_COW			0x00040000
+ #define GFS2_DIF_TRUNC_IN_PROG		0x20000000 /* New in gfs2 */
+ #define GFS2_DIF_INHERIT_DIRECTIO	0x40000000
+ #define GFS2_DIF_INHERIT_JDATA		0x80000000
+diff -NurpP --minimal linux-3.4.45/include/linux/if_tun.h linux-3.4.45-vs2.3.3.9/include/linux/if_tun.h
+--- linux-3.4.45/include/linux/if_tun.h	2010-08-02 14:52:54.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/if_tun.h	2012-05-21 16:15:05.000000000 +0000
+@@ -53,6 +53,7 @@
+ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
+ #define TUNGETVNETHDRSZ _IOR('T', 215, int)
+ #define TUNSETVNETHDRSZ _IOW('T', 216, int)
++#define TUNSETNID     _IOW('T', 217, int)
+ 
+ /* TUNSETIFF ifr flags */
+ #define IFF_TUN		0x0001
+diff -NurpP --minimal linux-3.4.45/include/linux/init_task.h linux-3.4.45-vs2.3.3.9/include/linux/init_task.h
+--- linux-3.4.45/include/linux/init_task.h	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/init_task.h	2012-10-22 13:09:53.000000000 +0000
+@@ -210,6 +210,10 @@ extern struct task_group root_task_group
+ 	INIT_TRACE_RECURSION						\
+ 	INIT_TASK_RCU_PREEMPT(tsk)					\
+ 	INIT_CPUSET_SEQ							\
++	.xid		= 0,						\
++	.vx_info	= NULL,						\
++	.nid		= 0,						\
++	.nx_info	= NULL,						\
+ }
+ 
+ 
+diff -NurpP --minimal linux-3.4.45/include/linux/ipc.h linux-3.4.45-vs2.3.3.9/include/linux/ipc.h
+--- linux-3.4.45/include/linux/ipc.h	2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/ipc.h	2012-05-21 16:15:05.000000000 +0000
+@@ -91,6 +91,7 @@ struct kern_ipc_perm
+ 	key_t		key;
+ 	uid_t		uid;
+ 	gid_t		gid;
++	xid_t		xid;
+ 	uid_t		cuid;
+ 	gid_t		cgid;
+ 	umode_t		mode; 
+diff -NurpP --minimal linux-3.4.45/include/linux/ipc_namespace.h linux-3.4.45-vs2.3.3.9/include/linux/ipc_namespace.h
+--- linux-3.4.45/include/linux/ipc_namespace.h	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/ipc_namespace.h	2013-05-13 18:16:08.000000000 +0000
+@@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_
+ 
+ #if defined(CONFIG_IPC_NS)
+ extern struct ipc_namespace *copy_ipcs(unsigned long flags,
+-				       struct task_struct *tsk);
++				       struct ipc_namespace *old_ns,
++				       struct user_namespace *user_ns);
+ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
+ {
+ 	if (ns)
+@@ -112,12 +113,13 @@ static inline struct ipc_namespace *get_
+ extern void put_ipc_ns(struct ipc_namespace *ns);
+ #else
+ static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
+-					      struct task_struct *tsk)
++					      struct ipc_namespace *old_ns,
++					      struct user_namespace *user_ns)
+ {
+ 	if (flags & CLONE_NEWIPC)
+ 		return ERR_PTR(-EINVAL);
+ 
+-	return tsk->nsproxy->ipc_ns;
++	return old_ns;
+ }
+ 
+ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
+diff -NurpP --minimal linux-3.4.45/include/linux/loop.h linux-3.4.45-vs2.3.3.9/include/linux/loop.h
+--- linux-3.4.45/include/linux/loop.h	2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/loop.h	2012-05-21 16:15:05.000000000 +0000
+@@ -45,6 +45,7 @@ struct loop_device {
+ 	struct loop_func_table *lo_encryption;
+ 	__u32           lo_init[2];
+ 	uid_t		lo_key_owner;	/* Who set the key */
++	xid_t		lo_xid;
+ 	int		(*ioctl)(struct loop_device *, int cmd, 
+ 				 unsigned long arg); 
+ 
+diff -NurpP --minimal linux-3.4.45/include/linux/magic.h linux-3.4.45-vs2.3.3.9/include/linux/magic.h
+--- linux-3.4.45/include/linux/magic.h	2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/magic.h	2012-05-21 16:15:05.000000000 +0000
+@@ -3,7 +3,7 @@
+ 
+ #define ADFS_SUPER_MAGIC	0xadf5
+ #define AFFS_SUPER_MAGIC	0xadff
+-#define AFS_SUPER_MAGIC                0x5346414F
++#define AFS_SUPER_MAGIC		0x5346414F
+ #define AUTOFS_SUPER_MAGIC	0x0187
+ #define CODA_SUPER_MAGIC	0x73757245
+ #define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
+diff -NurpP --minimal linux-3.4.45/include/linux/major.h linux-3.4.45-vs2.3.3.9/include/linux/major.h
+--- linux-3.4.45/include/linux/major.h	2009-09-10 13:26:25.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/major.h	2012-05-21 16:15:05.000000000 +0000
+@@ -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
+diff -NurpP --minimal linux-3.4.45/include/linux/memcontrol.h linux-3.4.45-vs2.3.3.9/include/linux/memcontrol.h
+--- linux-3.4.45/include/linux/memcontrol.h	2012-05-21 16:07:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/memcontrol.h	2012-05-21 16:15:05.000000000 +0000
+@@ -88,6 +88,13 @@ extern struct mem_cgroup *try_get_mem_cg
+ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
+ extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
+ 
++extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member);
++extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member);
++
++extern s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem);
++
+ static inline
+ int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
+ {
+diff -NurpP --minimal linux-3.4.45/include/linux/mm_types.h linux-3.4.45-vs2.3.3.9/include/linux/mm_types.h
+--- linux-3.4.45/include/linux/mm_types.h	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/mm_types.h	2012-07-17 22:29:43.000000000 +0000
+@@ -353,6 +353,7 @@ struct mm_struct {
+ 
+ 	/* Architecture-specific MM context */
+ 	mm_context_t context;
++	struct vx_info *mm_vx_info;
+ 
+ 	/* Swap token stuff */
+ 	/*
+diff -NurpP --minimal linux-3.4.45/include/linux/mmzone.h linux-3.4.45-vs2.3.3.9/include/linux/mmzone.h
+--- linux-3.4.45/include/linux/mmzone.h	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/mmzone.h	2012-07-17 22:29:43.000000000 +0000
+@@ -684,6 +684,13 @@ typedef struct pglist_data {
+ 	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
+ })
+ 
++#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)
++
++#define node_end_pfn(nid) ({\
++	pg_data_t *__pgdat = NODE_DATA(nid);\
++	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
++})
++
+ #include <linux/memory_hotplug.h>
+ 
+ extern struct mutex zonelists_mutex;
+diff -NurpP --minimal linux-3.4.45/include/linux/mount.h linux-3.4.45-vs2.3.3.9/include/linux/mount.h
+--- linux-3.4.45/include/linux/mount.h	2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/mount.h	2012-05-21 16:15:05.000000000 +0000
+@@ -47,6 +47,9 @@ struct mnt_namespace;
+ 
+ #define MNT_INTERNAL	0x4000
+ 
++#define MNT_TAGID	0x10000
++#define MNT_NOTAG	0x20000
++
+ struct vfsmount {
+ 	struct dentry *mnt_root;	/* root of the mounted tree */
+ 	struct super_block *mnt_sb;	/* pointer to superblock */
+diff -NurpP --minimal linux-3.4.45/include/linux/net.h linux-3.4.45-vs2.3.3.9/include/linux/net.h
+--- linux-3.4.45/include/linux/net.h	2013-05-13 17:36:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/net.h	2012-09-01 08:51:18.000000000 +0000
+@@ -73,6 +73,7 @@ struct net;
+ #define SOCK_PASSCRED		3
+ #define SOCK_PASSSEC		4
+ #define SOCK_EXTERNALLY_ALLOCATED 5
++#define SOCK_USER_SOCKET	6
+ 
+ #ifndef ARCH_HAS_SOCKET_TYPES
+ /**
+diff -NurpP --minimal linux-3.4.45/include/linux/netdevice.h linux-3.4.45-vs2.3.3.9/include/linux/netdevice.h
+--- linux-3.4.45/include/linux/netdevice.h	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/netdevice.h	2013-05-13 18:16:08.000000000 +0000
+@@ -1624,6 +1624,7 @@ extern void		netdev_resync_ops(struct ne
+ 
+ extern struct net_device	*dev_get_by_index(struct net *net, int ifindex);
+ extern struct net_device	*__dev_get_by_index(struct net *net, int ifindex);
++extern struct net_device	*dev_get_by_index_real_rcu(struct net *net, int ifindex);
+ extern struct net_device	*dev_get_by_index_rcu(struct net *net, int ifindex);
+ extern int		dev_restart(struct net_device *dev);
+ #ifdef CONFIG_NETPOLL_TRAP
+diff -NurpP --minimal linux-3.4.45/include/linux/nfs_mount.h linux-3.4.45-vs2.3.3.9/include/linux/nfs_mount.h
+--- linux-3.4.45/include/linux/nfs_mount.h	2011-01-05 20:50:31.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/nfs_mount.h	2012-05-21 16:15:05.000000000 +0000
+@@ -63,7 +63,8 @@ struct nfs_mount_data {
+ #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+ #define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
+ #define NFS_MOUNT_UNSHARED	0x8000	/* 5 */
+-#define NFS_MOUNT_FLAGMASK	0xFFFF
++#define NFS_MOUNT_TAGGED	0x10000	/* context tagging */
++#define NFS_MOUNT_FLAGMASK	0x1FFFF
+ 
+ /* The following are for internal use only */
+ #define NFS_MOUNT_LOOKUP_CACHE_NONEG	0x10000
+diff -NurpP --minimal linux-3.4.45/include/linux/nsproxy.h linux-3.4.45-vs2.3.3.9/include/linux/nsproxy.h
+--- linux-3.4.45/include/linux/nsproxy.h	2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/nsproxy.h	2012-05-21 16:15:05.000000000 +0000
+@@ -3,6 +3,7 @@
+ 
+ #include <linux/spinlock.h>
+ #include <linux/sched.h>
++#include <linux/vserver/debug.h>
+ 
+ struct mnt_namespace;
+ struct uts_namespace;
+@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro
+ }
+ 
+ int copy_namespaces(unsigned long flags, struct task_struct *tsk);
++struct nsproxy *copy_nsproxy(struct nsproxy *orig);
+ void exit_task_namespaces(struct task_struct *tsk);
+ void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
+ void free_nsproxy(struct nsproxy *ns);
+@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned
+ 	struct fs_struct *);
+ int __init nsproxy_cache_init(void);
+ 
+-static inline void put_nsproxy(struct nsproxy *ns)
++#define	get_nsproxy(n)	__get_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __get_nsproxy(struct nsproxy *ns,
++	const char *_file, int _line)
+ {
+-	if (atomic_dec_and_test(&ns->count)) {
+-		free_nsproxy(ns);
+-	}
++	vxlprintk(VXD_CBIT(space, 0), "get_nsproxy(%p[%u])",
++		ns, atomic_read(&ns->count), _file, _line);
++	atomic_inc(&ns->count);
+ }
+ 
+-static inline void get_nsproxy(struct nsproxy *ns)
++#define	put_nsproxy(n)	__put_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __put_nsproxy(struct nsproxy *ns,
++	const char *_file, int _line)
+ {
+-	atomic_inc(&ns->count);
++	vxlprintk(VXD_CBIT(space, 0), "put_nsproxy(%p[%u])",
++		ns, atomic_read(&ns->count), _file, _line);
++	if (atomic_dec_and_test(&ns->count)) {
++		free_nsproxy(ns);
++	}
+ }
+ 
+ #endif
+diff -NurpP --minimal linux-3.4.45/include/linux/pid.h linux-3.4.45-vs2.3.3.9/include/linux/pid.h
+--- linux-3.4.45/include/linux/pid.h	2011-07-22 09:18:11.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/pid.h	2012-05-21 16:15:05.000000000 +0000
+@@ -8,7 +8,8 @@ enum pid_type
+ 	PIDTYPE_PID,
+ 	PIDTYPE_PGID,
+ 	PIDTYPE_SID,
+-	PIDTYPE_MAX
++	PIDTYPE_MAX,
++	PIDTYPE_REALPID
+ };
+ 
+ /*
+@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p
+ }
+ 
+ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns);
+ pid_t pid_vnr(struct pid *pid);
+ 
+ #define do_each_pid_task(pid, type, task)				\
+diff -NurpP --minimal linux-3.4.45/include/linux/proc_fs.h linux-3.4.45-vs2.3.3.9/include/linux/proc_fs.h
+--- linux-3.4.45/include/linux/proc_fs.h	2012-03-19 18:47:28.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/proc_fs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -54,6 +54,7 @@ struct proc_dir_entry {
+ 	nlink_t nlink;
+ 	uid_t uid;
+ 	gid_t gid;
++	int vx_flags;
+ 	loff_t size;
+ 	const struct inode_operations *proc_iops;
+ 	/*
+@@ -252,12 +253,18 @@ extern const struct proc_ns_operations n
+ extern const struct proc_ns_operations utsns_operations;
+ extern const struct proc_ns_operations ipcns_operations;
+ 
++struct vx_info;
++struct nx_info;
++
+ union proc_op {
+ 	int (*proc_get_link)(struct dentry *, struct path *);
+ 	int (*proc_read)(struct task_struct *task, char *page);
+ 	int (*proc_show)(struct seq_file *m,
+ 		struct pid_namespace *ns, struct pid *pid,
+ 		struct task_struct *task);
++	int (*proc_vs_read)(char *page);
++	int (*proc_vxi_read)(struct vx_info *vxi, char *page);
++	int (*proc_nxi_read)(struct nx_info *nxi, char *page);
+ };
+ 
+ struct ctl_table_header;
+@@ -265,6 +272,7 @@ struct ctl_table;
+ 
+ struct proc_inode {
+ 	struct pid *pid;
++	int vx_flags;
+ 	int fd;
+ 	union proc_op op;
+ 	struct proc_dir_entry *pde;
+diff -NurpP --minimal linux-3.4.45/include/linux/quotaops.h linux-3.4.45-vs2.3.3.9/include/linux/quotaops.h
+--- linux-3.4.45/include/linux/quotaops.h	2012-01-09 15:14:58.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/quotaops.h	2012-05-21 16:15:05.000000000 +0000
+@@ -8,6 +8,7 @@
+ #define _LINUX_QUOTAOPS_
+ 
+ #include <linux/fs.h>
++#include <linux/vs_dlimit.h>
+ 
+ #define DQUOT_SPACE_WARN	0x1
+ #define DQUOT_SPACE_RESERVE	0x2
+@@ -204,11 +205,12 @@ static inline void dquot_drop(struct ino
+ 
+ static inline int dquot_alloc_inode(const struct inode *inode)
+ {
+-	return 0;
++	return dl_alloc_inode(inode);
+ }
+ 
+ static inline void dquot_free_inode(const struct inode *inode)
+ {
++	dl_free_inode(inode);
+ }
+ 
+ static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
+@@ -219,6 +221,10 @@ static inline int dquot_transfer(struct
+ static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
+ 		int flags)
+ {
++	int ret = 0;
++
++	if ((ret = dl_alloc_space(inode, number)))
++		return ret;
+ 	if (!(flags & DQUOT_SPACE_RESERVE))
+ 		inode_add_bytes(inode, number);
+ 	return 0;
+@@ -229,6 +235,7 @@ static inline void __dquot_free_space(st
+ {
+ 	if (!(flags & DQUOT_SPACE_RESERVE))
+ 		inode_sub_bytes(inode, number);
++	dl_free_space(inode, number);
+ }
+ 
+ static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
+diff -NurpP --minimal linux-3.4.45/include/linux/reboot.h linux-3.4.45-vs2.3.3.9/include/linux/reboot.h
+--- linux-3.4.45/include/linux/reboot.h	2011-10-24 16:45:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/reboot.h	2012-05-21 16:15:05.000000000 +0000
+@@ -33,6 +33,7 @@
+ #define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
+ #define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
+ #define	LINUX_REBOOT_CMD_KEXEC		0x45584543
++#define	LINUX_REBOOT_CMD_OOM		0xDEADBEEF
+ 
+ 
+ #ifdef __KERNEL__
+diff -NurpP --minimal linux-3.4.45/include/linux/sched.h linux-3.4.45-vs2.3.3.9/include/linux/sched.h
+--- linux-3.4.45/include/linux/sched.h	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sched.h	2013-02-11 23:37:30.000000000 +0000
+@@ -1455,6 +1455,14 @@ struct task_struct {
+ #endif
+ 	seccomp_t seccomp;
+ 
++/* vserver context data */
++	struct vx_info *vx_info;
++	struct nx_info *nx_info;
++
++	xid_t xid;
++	nid_t nid;
++	tag_t tag;
++
+ /* Thread group tracking */
+    	u32 parent_exec_id;
+    	u32 self_exec_id;
+@@ -1699,6 +1707,11 @@ struct pid_namespace;
+ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
+ 			struct pid_namespace *ns);
+ 
++#include <linux/vserver/base.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/pid.h>
++
+ static inline pid_t task_pid_nr(struct task_struct *tsk)
+ {
+ 	return tsk->pid;
+@@ -1712,7 +1725,8 @@ static inline pid_t task_pid_nr_ns(struc
+ 
+ static inline pid_t task_pid_vnr(struct task_struct *tsk)
+ {
+-	return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++	// return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++	return vx_map_pid(__task_pid_nr_ns(tsk, PIDTYPE_PID, NULL));
+ }
+ 
+ 
+@@ -1725,7 +1739,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+ 
+ static inline pid_t task_tgid_vnr(struct task_struct *tsk)
+ {
+-	return pid_vnr(task_tgid(tsk));
++	return vx_map_tgid(pid_vnr(task_tgid(tsk)));
+ }
+ 
+ 
+diff -NurpP --minimal linux-3.4.45/include/linux/shmem_fs.h linux-3.4.45-vs2.3.3.9/include/linux/shmem_fs.h
+--- linux-3.4.45/include/linux/shmem_fs.h	2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/shmem_fs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -8,6 +8,9 @@
+ 
+ /* inode in-kernel data */
+ 
++#define TMPFS_SUPER_MAGIC	0x01021994
++
++
+ struct shmem_inode_info {
+ 	spinlock_t		lock;
+ 	unsigned long		flags;
+diff -NurpP --minimal linux-3.4.45/include/linux/stat.h linux-3.4.45-vs2.3.3.9/include/linux/stat.h
+--- linux-3.4.45/include/linux/stat.h	2008-12-24 23:26:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/stat.h	2012-05-21 16:15:05.000000000 +0000
+@@ -66,6 +66,7 @@ struct kstat {
+ 	unsigned int	nlink;
+ 	uid_t		uid;
+ 	gid_t		gid;
++	tag_t		tag;
+ 	dev_t		rdev;
+ 	loff_t		size;
+ 	struct timespec  atime;
+diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/auth.h linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/auth.h
+--- linux-3.4.45/include/linux/sunrpc/auth.h	2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/auth.h	2012-05-21 16:15:05.000000000 +0000
+@@ -25,6 +25,7 @@
+ struct auth_cred {
+ 	uid_t	uid;
+ 	gid_t	gid;
++	tag_t	tag;
+ 	struct group_info *group_info;
+ 	const char *principal;
+ 	unsigned char machine_cred : 1;
+diff -NurpP --minimal linux-3.4.45/include/linux/sunrpc/clnt.h linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/clnt.h
+--- linux-3.4.45/include/linux/sunrpc/clnt.h	2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sunrpc/clnt.h	2012-05-21 16:15:05.000000000 +0000
+@@ -49,7 +49,8 @@ struct rpc_clnt {
+ 	unsigned int		cl_softrtry : 1,/* soft timeouts */
+ 				cl_discrtry : 1,/* disconnect before retry */
+ 				cl_autobind : 1,/* use getport() */
+-				cl_chatty   : 1;/* be verbose */
++				cl_chatty   : 1,/* be verbose */
++				cl_tag      : 1;/* context tagging */
+ 
+ 	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */
+ 	const struct rpc_timeout *cl_timeout;	/* Timeout strategy */
+diff -NurpP --minimal linux-3.4.45/include/linux/sysctl.h linux-3.4.45-vs2.3.3.9/include/linux/sysctl.h
+--- linux-3.4.45/include/linux/sysctl.h	2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sysctl.h	2012-05-21 16:15:05.000000000 +0000
+@@ -60,6 +60,7 @@ enum
+ 	CTL_ABI=9,		/* Binary emulation */
+ 	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
+ 	CTL_ARLAN=254,		/* arlan wireless driver */
++	CTL_VSERVER=4242,	/* Linux-VServer debug */
+ 	CTL_S390DBF=5677,	/* s390 debug */
+ 	CTL_SUNRPC=7249,	/* sunrpc debug */
+ 	CTL_PM=9899,		/* frv power management */
+@@ -94,6 +95,7 @@ enum
+ 
+ 	KERN_PANIC=15,		/* int: panic timeout */
+ 	KERN_REALROOTDEV=16,	/* real root device to mount after initrd */
++	KERN_VSHELPER=17,	/* string: path to vshelper policy agent */
+ 
+ 	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
+ 	KERN_CTLALTDEL=22,	/* int: allow ctl-alt-del to reboot */
+diff -NurpP --minimal linux-3.4.45/include/linux/sysfs.h linux-3.4.45-vs2.3.3.9/include/linux/sysfs.h
+--- linux-3.4.45/include/linux/sysfs.h	2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/sysfs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -19,6 +19,8 @@
+ #include <linux/kobject_ns.h>
+ #include <linux/atomic.h>
+ 
++#define SYSFS_SUPER_MAGIC	0x62656572
++
+ struct kobject;
+ struct module;
+ enum kobj_ns_type;
+diff -NurpP --minimal linux-3.4.45/include/linux/time.h linux-3.4.45-vs2.3.3.9/include/linux/time.h
+--- linux-3.4.45/include/linux/time.h	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/time.h	2012-10-22 13:09:53.000000000 +0000
+@@ -281,6 +281,8 @@ static __always_inline void timespec_add
+ 	a->tv_nsec = ns;
+ }
+ 
++#include <linux/vs_time.h>
++
+ #endif /* __KERNEL__ */
+ 
+ /*
+diff -NurpP --minimal linux-3.4.45/include/linux/types.h linux-3.4.45-vs2.3.3.9/include/linux/types.h
+--- linux-3.4.45/include/linux/types.h	2012-05-21 16:07:32.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/types.h	2012-05-21 16:15:05.000000000 +0000
+@@ -41,6 +41,9 @@ 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;
++typedef unsigned int		tag_t;
+ 
+ typedef unsigned long		uintptr_t;
+ 
+diff -NurpP --minimal linux-3.4.45/include/linux/utsname.h linux-3.4.45-vs2.3.3.9/include/linux/utsname.h
+--- linux-3.4.45/include/linux/utsname.h	2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/utsname.h	2012-05-21 16:15:05.000000000 +0000
+@@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts
+ }
+ 
+ extern struct uts_namespace *copy_utsname(unsigned long flags,
+-					  struct task_struct *tsk);
++					  struct uts_namespace *old_ns,
++					  struct user_namespace *user_ns);
+ extern void free_uts_ns(struct kref *kref);
+ 
+ static inline void put_uts_ns(struct uts_namespace *ns)
+@@ -79,12 +80,13 @@ static inline void put_uts_ns(struct uts
+ }
+ 
+ static inline struct uts_namespace *copy_utsname(unsigned long flags,
+-						 struct task_struct *tsk)
++						 struct uts_namespace *old_ns,
++						 struct user_namespace *user_ns)
+ {
+ 	if (flags & CLONE_NEWUTS)
+ 		return ERR_PTR(-EINVAL);
+ 
+-	return tsk->nsproxy->uts_ns;
++	return old_ns;
+ }
+ #endif
+ 
+diff -NurpP --minimal linux-3.4.45/include/linux/vroot.h linux-3.4.45-vs2.3.3.9/include/linux/vroot.h
+--- linux-3.4.45/include/linux/vroot.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vroot.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,51 @@
++
++/*
++ * include/linux/vroot.h
++ *
++ * written by Herbert Pötzl, 9/11/2002
++ * ported to 2.6 by Herbert Pötzl, 30/12/2004
++ *
++ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * 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;
++};
++
++
++typedef struct block_device *(vroot_grb_func)(struct block_device *);
++
++extern int register_vroot_grb(vroot_grb_func *);
++extern int unregister_vroot_grb(vroot_grb_func *);
++
++#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 */
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_base.h linux-3.4.45-vs2.3.3.9/include/linux/vs_base.h
+--- linux-3.4.45/include/linux/vs_base.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_base.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VS_BASE_H
++#define _VS_BASE_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_context.h linux-3.4.45-vs2.3.3.9/include/linux/vs_context.h
+--- linux-3.4.45/include/linux/vs_context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_context.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,242 @@
++#ifndef _VS_CONTEXT_H
++#define _VS_CONTEXT_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/history.h"
++#include "vserver/debug.h"
++
++#include <linux/sched.h>
++
++
++#define get_vx_info(i) __get_vx_info(i, __FILE__, __LINE__, __HERE__)
++
++static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __put_vx_info(struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++		atomic_inc(&vxi->vx_usecnt);
++	}
++	*vxp = vxi;
++}
++
++
++#define set_vx_info(p, i) \
++	__set_vx_info(p, i, __FILE__, __LINE__, __HERE__)
++
++static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	atomic_inc(&vxi->vx_usecnt);
++	vxo = xchg(vxp, vxi);
++	BUG_ON(vxo);
++}
++
++
++#define clr_vx_info(p) __clr_vx_info(p, __FILE__, __LINE__, __HERE__)
++
++static inline void __clr_vx_info(struct vx_info **vxp,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __claim_vx_info(struct vx_info *vxi,
++	struct task_struct *task,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __release_vx_info(struct vx_info *vxi,
++	struct task_struct *task,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++	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);
++}
++
++
++#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__)
++
++static inline void __enter_vx_info(struct vx_info *vxi,
++	struct vx_info_save *vxis, const char *_file, int _line)
++{
++	vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
++		vxi, vxi ? vxi->vx_id : 0, vxis, current,
++		current->xid, current->vx_info, _file, _line);
++	vxis->vxi = xchg(&current->vx_info, vxi);
++	vxis->xid = current->xid;
++	current->xid = vxi ? vxi->vx_id : 0;
++}
++
++#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__)
++
++static inline void __leave_vx_info(struct vx_info_save *vxis,
++	const char *_file, int _line)
++{
++	vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
++		vxis, vxis->xid, vxis->vxi, current,
++		current->xid, current->vx_info, _file, _line);
++	(void)xchg(&current->vx_info, vxis->vxi);
++	current->xid = vxis->xid;
++}
++
++
++static inline void __enter_vx_admin(struct vx_info_save *vxis)
++{
++	vxis->vxi = xchg(&current->vx_info, NULL);
++	vxis->xid = xchg(&current->xid, (xid_t)0);
++}
++
++static inline void __leave_vx_admin(struct vx_info_save *vxis)
++{
++	(void)xchg(&current->xid, vxis->xid);
++	(void)xchg(&current->vx_info, vxis->vxi);
++}
++
++#define task_is_init(p) \
++	__task_is_init(p, __FILE__, __LINE__, __HERE__)
++
++static inline int __task_is_init(struct task_struct *p,
++	const char *_file, int _line, void *_here)
++{
++	int is_init = is_global_init(p);
++
++	task_lock(p);
++	if (p->vx_info)
++		is_init = p->vx_info->vx_initpid == p->pid;
++	task_unlock(p);
++	return is_init;
++}
++
++extern void exit_vx_info(struct task_struct *, int);
++extern void exit_vx_info_early(struct task_struct *, int);
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_cowbl.h linux-3.4.45-vs2.3.3.9/include/linux/vs_cowbl.h
+--- linux-3.4.45/include/linux/vs_cowbl.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_cowbl.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,48 @@
++#ifndef _VS_COWBL_H
++#define _VS_COWBL_H
++
++#include <linux/fs.h>
++#include <linux/dcache.h>
++#include <linux/namei.h>
++#include <linux/slab.h>
++
++extern struct dentry *cow_break_link(const char *pathname);
++
++static inline int cow_check_and_break(struct path *path)
++{
++	struct inode *inode = path->dentry->d_inode;
++	int error = 0;
++
++	/* do we need this check? */
++	if (IS_RDONLY(inode))
++		return -EROFS;
++
++	if (IS_COW(inode)) {
++		if (IS_COW_LINK(inode)) {
++			struct dentry *new_dentry, *old_dentry = path->dentry;
++			char *pp, *buf;
++
++			buf = kmalloc(PATH_MAX, GFP_KERNEL);
++			if (!buf) {
++				return -ENOMEM;
++			}
++			pp = d_path(path, buf, PATH_MAX);
++			new_dentry = cow_break_link(pp);
++			kfree(buf);
++			if (!IS_ERR(new_dentry)) {
++				path->dentry = new_dentry;
++				dput(old_dentry);
++			} else
++				error = PTR_ERR(new_dentry);
++		} else {
++			inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
++			inode->i_ctime = CURRENT_TIME;
++			mark_inode_dirty(inode);
++		}
++	}
++	return error;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_cvirt.h linux-3.4.45-vs2.3.3.9/include/linux/vs_cvirt.h
+--- linux-3.4.45/include/linux/vs_cvirt.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_cvirt.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,50 @@
++#ifndef _VS_CVIRT_H
++#define _VS_CVIRT_H
++
++#include "vserver/cvirt.h"
++#include "vserver/context.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++
++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
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_device.h linux-3.4.45-vs2.3.3.9/include/linux/vs_device.h
+--- linux-3.4.45/include/linux/vs_device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_device.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,45 @@
++#ifndef _VS_DEVICE_H
++#define _VS_DEVICE_H
++
++#include "vserver/base.h"
++#include "vserver/device.h"
++#include "vserver/debug.h"
++
++
++#ifdef CONFIG_VSERVER_DEVICE
++
++int vs_map_device(struct vx_info *, dev_t, dev_t *, umode_t);
++
++#define vs_device_perm(v, d, m, p) \
++	((vs_map_device(current_vx_info(), d, NULL, m) & (p)) == (p))
++
++#else
++
++static inline
++int vs_map_device(struct vx_info *vxi,
++	dev_t device, dev_t *target, umode_t mode)
++{
++	if (target)
++		*target = device;
++	return ~0;
++}
++
++#define vs_device_perm(v, d, m, p) ((p) == (p))
++
++#endif
++
++
++#define vs_map_chrdev(d, t, p) \
++	((vs_map_device(current_vx_info(), d, t, S_IFCHR) & (p)) == (p))
++#define vs_map_blkdev(d, t, p) \
++	((vs_map_device(current_vx_info(), d, t, S_IFBLK) & (p)) == (p))
++
++#define vs_chrdev_perm(d, p) \
++	vs_device_perm(current_vx_info(), d, S_IFCHR, p)
++#define vs_blkdev_perm(d, p) \
++	vs_device_perm(current_vx_info(), d, S_IFBLK, p)
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_dlimit.h linux-3.4.45-vs2.3.3.9/include/linux/vs_dlimit.h
+--- linux-3.4.45/include/linux/vs_dlimit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_dlimit.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,215 @@
++#ifndef _VS_DLIMIT_H
++#define _VS_DLIMIT_H
++
++#include <linux/fs.h>
++
++#include "vserver/dlimit.h"
++#include "vserver/base.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_tag : 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_tag : 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,
++	tag_t tag, 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, tag);
++	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, tag, __dlimit_char(dli), (long long)nr,
++		ret, file, line);
++	return ret ? -ENOSPC : 0;
++}
++
++static inline void __dl_free_space(struct super_block *sb,
++	tag_t tag, dlsize_t nr, const char *_file, int _line)
++{
++	struct dl_info *dli = NULL;
++
++	if (nr == 0)
++		goto out;
++	dli = locate_dl_info(sb, tag);
++	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, tag, __dlimit_char(dli), (long long)nr,
++		_file, _line);
++}
++
++static inline int __dl_alloc_inode(struct super_block *sb,
++	tag_t tag, const char *_file, int _line)
++{
++	struct dl_info *dli;
++	int ret = 0;
++
++	dli = locate_dl_info(sb, tag);
++	if (!dli)
++		goto out;
++
++	spin_lock(&dli->dl_lock);
++	dli->dl_inodes_used++;
++	ret = (dli->dl_inodes_used > dli->dl_inodes_total);
++	spin_unlock(&dli->dl_lock);
++	put_dl_info(dli);
++out:
++	vxlprintk(VXD_CBIT(dlim, 0),
++		"ALLOC (%p,#%d)%c inode (%d)",
++		sb, tag, __dlimit_char(dli), ret, _file, _line);
++	return ret ? -ENOSPC : 0;
++}
++
++static inline void __dl_free_inode(struct super_block *sb,
++	tag_t tag, const char *_file, int _line)
++{
++	struct dl_info *dli;
++
++	dli = locate_dl_info(sb, tag);
++	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, tag, __dlimit_char(dli), _file, _line);
++}
++
++static inline void __dl_adjust_block(struct super_block *sb, tag_t tag,
++	unsigned long long *free_blocks, unsigned long long *root_blocks,
++	const char *_file, int _line)
++{
++	struct dl_info *dli;
++	uint64_t broot, bfree;
++
++	dli = locate_dl_info(sb, tag);
++	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 %lld,%lld [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 dl_prealloc_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_alloc_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_reserve_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_claim_space(in, bytes) (0)
++
++#define dl_release_space(in, bytes) \
++	__dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_free_space(in, bytes) \
++	__dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++
++
++#define dl_alloc_inode(in) \
++	__dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++
++#define dl_free_inode(in) \
++	__dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ )
++
++
++#define dl_adjust_block(sb, tag, fb, rb) \
++	__dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet.h linux-3.4.45-vs2.3.3.9/include/linux/vs_inet.h
+--- linux-3.4.45/include/linux/vs_inet.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_inet.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,353 @@
++#ifndef _VS_INET_H
++#define _VS_INET_H
++
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
++
++#define IPI_LOOPBACK	htonl(INADDR_LOOPBACK)
++
++#define NXAV4(a)	NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
++			NIPQUAD((a)->mask), (a)->type
++#define NXAV4_FMT	"[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
++
++#define NIPQUAD(addr) \
++	((unsigned char *)&addr)[0], \
++	((unsigned char *)&addr)[1], \
++	((unsigned char *)&addr)[2], \
++	((unsigned char *)&addr)[3]
++
++#define NIPQUAD_FMT "%u.%u.%u.%u"
++
++
++static inline
++int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
++{
++	__be32 ip = nxa->ip[0].s_addr;
++	__be32 mask = nxa->mask.s_addr;
++	__be32 bcast = ip | ~mask;
++	int ret = 0;
++
++	switch (nxa->type & tmask) {
++	case NXA_TYPE_MASK:
++		ret = (ip == (addr & mask));
++		break;
++	case NXA_TYPE_ADDR:
++		ret = 3;
++		if (addr == ip)
++			break;
++		/* fall through to broadcast */
++	case NXA_MOD_BCAST:
++		ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
++		break;
++	case NXA_TYPE_RANGE:
++		ret = ((nxa->ip[0].s_addr <= addr) &&
++			(nxa->ip[1].s_addr > addr));
++		break;
++	case NXA_TYPE_ANY:
++		ret = 2;
++		break;
++	}
++
++	vxdprintk(VXD_CBIT(net, 0),
++		"v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
++		nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
++	return ret;
++}
++
++static inline
++int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
++{
++	struct nx_addr_v4 *nxa;
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++
++	ret = 2;
++	/* allow 127.0.0.1 when remapping lback */
++	if ((tmask & NXA_LOOPBACK) &&
++		(addr == IPI_LOOPBACK) &&
++		nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++		goto out;
++	ret = 3;
++	/* check for lback address */
++	if ((tmask & NXA_MOD_LBACK) &&
++		(nxi->v4_lback.s_addr == addr))
++		goto out;
++	ret = 4;
++	/* check for broadcast address */
++	if ((tmask & NXA_MOD_BCAST) &&
++		(nxi->v4_bcast.s_addr == addr))
++		goto out;
++	ret = 5;
++	/* check for v4 addresses */
++	for (nxa = &nxi->v4; nxa; nxa = nxa->next)
++		if (v4_addr_match(nxa, addr, tmask))
++			goto out;
++	ret = 0;
++out:
++	vxdprintk(VXD_CBIT(net, 0),
++		"v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
++		nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
++	return ret;
++}
++
++static inline
++int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
++{
++	/* FIXME: needs full range checks */
++	return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
++}
++
++static inline
++int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
++{
++	struct nx_addr_v4 *ptr;
++
++	for (ptr = &nxi->v4; ptr; ptr = ptr->next)
++		if (v4_nx_addr_match(ptr, nxa, mask))
++			return 1;
++	return 0;
++}
++
++#include <net/inet_sock.h>
++
++/*
++ *	Check if a given address matches for a socket
++ *
++ *	nxi:		the socket's nx_info if any
++ *	addr:		to be verified address
++ */
++static inline
++int v4_sock_addr_match (
++	struct nx_info *nxi,
++	struct inet_sock *inet,
++	__be32 addr)
++{
++	__be32 saddr = inet->inet_rcv_saddr;
++	__be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
++
++	if (addr && (saddr == addr || bcast == addr))
++		return 1;
++	if (!saddr)
++		return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
++	return 0;
++}
++
++
++/* inet related checks and helpers */
++
++
++struct in_ifaddr;
++struct net_device;
++struct sock;
++
++#ifdef CONFIG_INET
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_sock.h>
++#include <net/inet_timewait_sock.h>
++
++
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
++
++
++/*
++ *	check if address is covered by socket
++ *
++ *	sk:	the socket to check against
++ *	addr:	the address in question (must be != 0)
++ */
++
++static inline
++int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
++{
++	struct nx_info *nxi = sk->sk_nx_info;
++	__be32 saddr = sk_rcv_saddr(sk);
++
++	vxdprintk(VXD_CBIT(net, 5),
++		"__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
++		sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
++		(sk->sk_socket?sk->sk_socket->flags:0));
++
++	if (saddr) {		/* direct address match */
++		return v4_addr_match(nxa, saddr, -1);
++	} else if (nxi) {	/* match against nx_info */
++		return v4_nx_addr_in_nx_info(nxi, nxa, -1);
++	} else {		/* unrestricted any socket */
++		return 1;
++	}
++}
++
++
++
++static inline
++int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
++{
++	vxdprintk(VXD_CBIT(net, 1),
++		"nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d",
++		nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
++		nxi ? dev_in_nx_info(dev, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (dev_in_nx_info(dev, nxi))
++		return 1;
++	return 0;
++}
++
++
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (!ifa)
++		return 0;
++	return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
++}
++
++static inline
++int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
++{
++	vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
++		nxi, nxi ? nxi->nx_id : 0, ifa,
++		nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (v4_ifa_in_nx_info(ifa, nxi))
++		return 1;
++	return 0;
++}
++
++
++struct nx_v4_sock_addr {
++	__be32 saddr;	/* Address used for validation */
++	__be32 baddr;	/* Address used for socket bind */
++};
++
++static inline
++int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
++	struct nx_v4_sock_addr *nsa)
++{
++	struct sock *sk = &inet->sk;
++	struct nx_info *nxi = sk->sk_nx_info;
++	__be32 saddr = addr->sin_addr.s_addr;
++	__be32 baddr = saddr;
++
++	vxdprintk(VXD_CBIT(net, 3),
++		"inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
++		sk, sk->sk_nx_info, sk->sk_socket,
++		(sk->sk_socket ? sk->sk_socket->flags : 0),
++		NIPQUAD(saddr));
++
++	if (nxi) {
++		if (saddr == INADDR_ANY) {
++			if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
++				baddr = nxi->v4.ip[0].s_addr;
++		} else if (saddr == IPI_LOOPBACK) {
++			if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++				baddr = nxi->v4_lback.s_addr;
++		} else if (!ipv4_is_multicast(saddr) ||
++			!nx_info_ncaps(nxi, NXC_MULTICAST)) {
++			/* normal address bind */
++			if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
++				return -EADDRNOTAVAIL;
++		}
++	}
++
++	vxdprintk(VXD_CBIT(net, 3),
++		"inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
++		sk, NIPQUAD(saddr), NIPQUAD(baddr));
++
++	nsa->saddr = saddr;
++	nsa->baddr = baddr;
++	return 0;
++}
++
++static inline
++void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
++{
++	inet->inet_saddr = nsa->baddr;
++	inet->inet_rcv_saddr = nsa->baddr;
++}
++
++
++/*
++ *      helper to simplify inet_lookup_listener
++ *
++ *      nxi:	the socket's nx_info if any
++ *      addr:	to be verified address
++ *      saddr:	socket address
++ */
++static inline int v4_inet_addr_match (
++	struct nx_info *nxi,
++	__be32 addr,
++	__be32 saddr)
++{
++	if (addr && (saddr == addr))
++		return 1;
++	if (!saddr)
++		return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
++	return 0;
++}
++
++static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
++{
++	if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
++		(addr == nxi->v4_lback.s_addr))
++		return IPI_LOOPBACK;
++	return addr;
++}
++
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (NX_IPV4(nxi))
++		return 1;
++	if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++		return 1;
++	return 0;
++}
++
++#else /* CONFIG_INET */
++
++static inline
++int nx_dev_visible(struct nx_info *n, struct net_device *d)
++{
++	return 1;
++}
++
++static inline
++int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++	return 1;
++}
++
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++	return 1;
++}
++
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++	return 0;
++}
++
++#endif /* CONFIG_INET */
++
++#define current_nx_info_has_v4() \
++	nx_info_has_v4(current_nx_info())
++
++#else
++// #warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_inet6.h linux-3.4.45-vs2.3.3.9/include/linux/vs_inet6.h
+--- linux-3.4.45/include/linux/vs_inet6.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_inet6.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,246 @@
++#ifndef _VS_INET6_H
++#define _VS_INET6_H
++
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
++
++#include <net/ipv6.h>
++
++#define NXAV6(a)	&(a)->ip, &(a)->mask, (a)->prefix, (a)->type
++#define NXAV6_FMT	"[%pI6/%pI6/%d:%04x]"
++
++
++#ifdef	CONFIG_IPV6
++
++static inline
++int v6_addr_match(struct nx_addr_v6 *nxa,
++	const struct in6_addr *addr, uint16_t mask)
++{
++	int ret = 0;
++
++	switch (nxa->type & mask) {
++	case NXA_TYPE_MASK:
++		ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
++		break;
++	case NXA_TYPE_ADDR:
++		ret = ipv6_addr_equal(&nxa->ip, addr);
++		break;
++	case NXA_TYPE_ANY:
++		ret = 1;
++		break;
++	}
++	vxdprintk(VXD_CBIT(net, 0),
++		"v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
++		nxa, NXAV6(nxa), addr, mask, ret);
++	return ret;
++}
++
++static inline
++int v6_addr_in_nx_info(struct nx_info *nxi,
++	const struct in6_addr *addr, uint16_t mask)
++{
++	struct nx_addr_v6 *nxa;
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++	for (nxa = &nxi->v6; nxa; nxa = nxa->next)
++		if (v6_addr_match(nxa, addr, mask))
++			goto out;
++	ret = 0;
++out:
++	vxdprintk(VXD_CBIT(net, 0),
++		"v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
++		nxi, nxi ? nxi->nx_id : 0, addr, mask, ret);
++	return ret;
++}
++
++static inline
++int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
++{
++	/* FIXME: needs full range checks */
++	return v6_addr_match(nxa, &addr->ip, mask);
++}
++
++static inline
++int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
++{
++	struct nx_addr_v6 *ptr;
++
++	for (ptr = &nxi->v6; ptr; ptr = ptr->next)
++		if (v6_nx_addr_match(ptr, nxa, mask))
++			return 1;
++	return 0;
++}
++
++
++/*
++ *	Check if a given address matches for a socket
++ *
++ *	nxi:		the socket's nx_info if any
++ *	addr:		to be verified address
++ */
++static inline
++int v6_sock_addr_match (
++	struct nx_info *nxi,
++	struct inet_sock *inet,
++	struct in6_addr *addr)
++{
++	struct sock *sk = &inet->sk;
++	struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	if (!ipv6_addr_any(addr) &&
++		ipv6_addr_equal(saddr, addr))
++		return 1;
++	if (ipv6_addr_any(saddr))
++		return v6_addr_in_nx_info(nxi, addr, -1);
++	return 0;
++}
++
++/*
++ *	check if address is covered by socket
++ *
++ *	sk:	the socket to check against
++ *	addr:	the address in question (must be != 0)
++ */
++
++static inline
++int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
++{
++	struct nx_info *nxi = sk->sk_nx_info;
++	struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	vxdprintk(VXD_CBIT(net, 5),
++		"__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
++		sk, NXAV6(nxa), nxi, saddr, sk->sk_socket,
++		(sk->sk_socket?sk->sk_socket->flags:0));
++
++	if (!ipv6_addr_any(saddr)) {	/* direct address match */
++		return v6_addr_match(nxa, saddr, -1);
++	} else if (nxi) {		/* match against nx_info */
++		return v6_nx_addr_in_nx_info(nxi, nxa, -1);
++	} else {			/* unrestricted any socket */
++		return 1;
++	}
++}
++
++
++/* inet related checks and helpers */
++
++
++struct in_ifaddr;
++struct net_device;
++struct sock;
++
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_timewait_sock.h>
++
++
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
++
++
++
++static inline
++int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (!ifa)
++		return 0;
++	return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
++}
++
++static inline
++int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
++{
++	vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d",
++		nxi, nxi ? nxi->nx_id : 0, ifa,
++		nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (v6_ifa_in_nx_info(ifa, nxi))
++		return 1;
++	return 0;
++}
++
++
++struct nx_v6_sock_addr {
++	struct in6_addr saddr;	/* Address used for validation */
++	struct in6_addr baddr;	/* Address used for socket bind */
++};
++
++static inline
++int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
++	struct nx_v6_sock_addr *nsa)
++{
++	// struct sock *sk = &inet->sk;
++	// struct nx_info *nxi = sk->sk_nx_info;
++	struct in6_addr saddr = addr->sin6_addr;
++	struct in6_addr baddr = saddr;
++
++	nsa->saddr = saddr;
++	nsa->baddr = baddr;
++	return 0;
++}
++
++static inline
++void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
++{
++	// struct sock *sk = &inet->sk;
++	// struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	// *saddr = nsa->baddr;
++	// inet->inet_saddr = nsa->baddr;
++}
++
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (NX_IPV6(nxi))
++		return 1;
++	return 0;
++}
++
++#else /* CONFIG_IPV6 */
++
++static inline
++int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
++{
++	return 1;
++}
++
++
++static inline
++int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++	return 1;
++}
++
++static inline
++int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++	return 1;
++}
++
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++	return 0;
++}
++
++#endif /* CONFIG_IPV6 */
++
++#define current_nx_info_has_v6() \
++	nx_info_has_v6(current_nx_info())
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_limit.h linux-3.4.45-vs2.3.3.9/include/linux/vs_limit.h
+--- linux-3.4.45/include/linux/vs_limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_limit.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,140 @@
++#ifndef _VS_LIMIT_H
++#define _VS_LIMIT_H
++
++#include "vserver/limit.h"
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/context.h"
++#include "vserver/limit_int.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__)
++
++
++#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)
++
++
++/* 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__)
++
++
++#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)
++
++
++/* dentry limits */
++
++#define vx_dentry_inc(d) do {						\
++	if ((d)->d_count == 1)						\
++		vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY);	\
++	} while (0)
++
++#define vx_dentry_dec(d) do {						\
++	if ((d)->d_count == 0)						\
++		vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY);	\
++	} while (0)
++
++#define vx_dentry_avail(n) \
++	vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
++
++
++/* 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)
++
++
++#define vx_semary_inc(a) \
++	vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
++
++#define vx_semary_dec(a) \
++	vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
++
++
++#define vx_nsems_add(a,n) \
++	vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++
++#define vx_nsems_sub(a,n) \
++	vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_network.h linux-3.4.45-vs2.3.3.9/include/linux/vs_network.h
+--- linux-3.4.45/include/linux/vs_network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_network.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,169 @@
++#ifndef _NX_VS_NETWORK_H
++#define _NX_VS_NETWORK_H
++
++#include "vserver/context.h"
++#include "vserver/network.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++#include <linux/sched.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;
++}
++
++
++static inline void exit_nx_info(struct task_struct *p)
++{
++	if (p->nx_info)
++		release_nx_info(p->nx_info, p);
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_pid.h linux-3.4.45-vs2.3.3.9/include/linux/vs_pid.h
+--- linux-3.4.45/include/linux/vs_pid.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_pid.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,50 @@
++#ifndef _VS_PID_H
++#define _VS_PID_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/pid.h"
++#include <linux/pid_namespace.h>
++
++
++#define VXF_FAKE_INIT	(VXF_INFO_INIT | VXF_STATE_INIT)
++
++static inline
++int vx_proc_task_visible(struct task_struct *task)
++{
++	if ((task->pid == 1) &&
++		!vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
++		/* show a blend through init */
++		goto visible;
++	if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
++		goto visible;
++	return 0;
++visible:
++	return 1;
++}
++
++#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
++
++
++static inline
++struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
++{
++	struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
++
++	if (task && !vx_proc_task_visible(task)) {
++		vxdprintk(VXD_CBIT(misc, 6),
++			"dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
++			task, task->xid, task->pid,
++			current, current->xid, current->pid);
++		put_task_struct(task);
++		task = NULL;
++	}
++	return task;
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_sched.h linux-3.4.45-vs2.3.3.9/include/linux/vs_sched.h
+--- linux-3.4.45/include/linux/vs_sched.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_sched.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,40 @@
++#ifndef _VS_SCHED_H
++#define _VS_SCHED_H
++
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/sched.h"
++
++
++#define MAX_PRIO_BIAS		 20
++#define MIN_PRIO_BIAS		-20
++
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi)
++		prio += vx_cpu(vxi, sched_pc).prio_bias;
++	return prio;
++}
++
++static inline void vx_account_user(struct vx_info *vxi,
++	cputime_t cputime, int nice)
++{
++	if (!vxi)
++		return;
++	vx_cpu(vxi, sched_pc).user_ticks += cputime;
++}
++
++static inline void vx_account_system(struct vx_info *vxi,
++	cputime_t cputime, int idle)
++{
++	if (!vxi)
++		return;
++	vx_cpu(vxi, sched_pc).sys_ticks += cputime;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_socket.h linux-3.4.45-vs2.3.3.9/include/linux/vs_socket.h
+--- linux-3.4.45/include/linux/vs_socket.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_socket.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,67 @@
++#ifndef _VS_SOCKET_H
++#define _VS_SOCKET_H
++
++#include "vserver/debug.h"
++#include "vserver/base.h"
++#include "vserver/cacct.h"
++#include "vserver/context.h"
++#include "vserver/tag.h"
++
++
++/* socket accounting */
++
++#include <linux/socket.h>
++
++static inline int vx_sock_type(int family)
++{
++	switch (family) {
++	case PF_UNSPEC:
++		return VXA_SOCK_UNSPEC;
++	case PF_UNIX:
++		return VXA_SOCK_UNIX;
++	case PF_INET:
++		return VXA_SOCK_INET;
++	case PF_INET6:
++		return VXA_SOCK_INET6;
++	case PF_PACKET:
++		return VXA_SOCK_PACKET;
++	default:
++		return VXA_SOCK_OTHER;
++	}
++}
++
++#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_long_inc(&vxi->cacct.sock[type][pos].count);
++		atomic_long_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
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_tag.h linux-3.4.45-vs2.3.3.9/include/linux/vs_tag.h
+--- linux-3.4.45/include/linux/vs_tag.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_tag.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,47 @@
++#ifndef _VS_TAG_H
++#define _VS_TAG_H
++
++#include <linux/vserver/tag.h>
++
++/* check conditions */
++
++#define DX_ADMIN	0x0001
++#define DX_WATCH	0x0002
++#define DX_HOSTID	0x0008
++
++#define DX_IDENT	0x0010
++
++#define DX_ARG_MASK	0x0010
++
++
++#define dx_task_tag(t)	((t)->tag)
++
++#define dx_current_tag() dx_task_tag(current)
++
++#define dx_check(c, m)	__dx_check(dx_current_tag(), c, m)
++
++#define dx_weak_check(c, m)	((m) ? dx_check(c, m) : 1)
++
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++{
++	if (mode & DX_ARG_MASK) {
++		if ((mode & DX_IDENT) && (id == cid))
++			return 1;
++	}
++	return (((mode & DX_ADMIN) && (cid == 0)) ||
++		((mode & DX_WATCH) && (cid == 1)) ||
++		((mode & DX_HOSTID) && (id == 0)));
++}
++
++struct inode;
++int dx_permission(const struct inode *inode, int mask);
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vs_time.h linux-3.4.45-vs2.3.3.9/include/linux/vs_time.h
+--- linux-3.4.45/include/linux/vs_time.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vs_time.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VS_TIME_H
++#define _VS_TIME_H
++
++
++/* time faking stuff */
++
++#ifdef CONFIG_VSERVER_VTIME
++
++extern void vx_adjust_timespec(struct timespec *ts);
++extern int vx_settimeofday(const struct timespec *ts);
++
++#else
++#define	vx_adjust_timespec(t)	do { } while (0)
++#define	vx_settimeofday(t)	do_settimeofday(t)
++#endif
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/Kbuild linux-3.4.45-vs2.3.3.9/include/linux/vserver/Kbuild
+--- linux-3.4.45/include/linux/vserver/Kbuild	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/Kbuild	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,8 @@
++
++header-y += context_cmd.h network_cmd.h space_cmd.h \
++	cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
++	inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
++	debug_cmd.h device_cmd.h
++
++header-y += switch.h network.h monitor.h inode.h device.h
++
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/base.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/base.h
+--- linux-3.4.45/include/linux/vserver/base.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/base.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,178 @@
++#ifndef _VX_BASE_H
++#define _VX_BASE_H
++
++
++/* context state changes */
++
++enum {
++	VSC_STARTUP = 1,
++	VSC_SHUTDOWN,
++
++	VSC_NETUP,
++	VSC_NETDOWN,
++};
++
++
++
++#define vx_task_xid(t)	((t)->xid)
++
++#define vx_current_xid() vx_task_xid(current)
++
++#define current_vx_info() (current->vx_info)
++
++
++#define nx_task_nid(t)	((t)->nid)
++
++#define nx_current_nid() nx_task_nid(current)
++
++#define current_nx_info() (current->nx_info)
++
++
++/* generic flag merging */
++
++#define vs_check_flags(v, m, f)	(((v) & (m)) ^ (f))
++
++#define vs_mask_flags(v, f, m)	(((v) & ~(m)) | ((f) & (m)))
++
++#define vs_mask_mask(v, f, m)	(((v) & ~(m)) | ((v) & (f) & (m)))
++
++#define vs_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) \
++	vs_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))
++
++
++
++/* network flags */
++
++#define __nx_flags(n)	((n) ? (n)->nx_flags : 0)
++
++#define nx_current_flags()	__nx_flags(current_nx_info())
++
++#define nx_info_flags(n, m, f) \
++	vs_check_flags(__nx_flags(n), 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)
++
++
++/* network caps */
++
++#define __nx_ncaps(n)	((n) ? (n)->nx_ncaps : 0)
++
++#define nx_current_ncaps()	__nx_ncaps(current_nx_info())
++
++#define nx_info_ncaps(n, c)	(__nx_ncaps(n) & (c))
++
++#define nx_ncaps(c)	nx_info_ncaps(current_nx_info(), c)
++
++
++/* context mask capabilities */
++
++#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)
++
++
++/* context bcap mask */
++
++#define __vx_bcaps(v)		((v)->vx_bcaps)
++
++#define vx_current_bcaps()	__vx_bcaps(current_vx_info())
++
++
++/* mask given bcaps */
++
++#define vx_info_mbcaps(v, c)	((v) ? cap_intersect(__vx_bcaps(v), c) : c)
++
++#define vx_mbcaps(c)		vx_info_mbcaps(current_vx_info(), c)
++
++
++/* masked cap_bset */
++
++#define vx_info_cap_bset(v)	vx_info_mbcaps(v, current->cap_bset)
++
++#define vx_current_cap_bset()	vx_info_cap_bset(current_vx_info())
++
++#if 0
++#define vx_info_mbcap(v, b) \
++	(!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
++	vx_info_bcaps(v, b) : (b))
++
++#define task_vx_mbcap(t, b) \
++	vx_info_mbcap((t)->vx_info, (t)->b)
++
++#define vx_mbcap(b)	task_vx_mbcap(current, b)
++#endif
++
++#define vx_cap_raised(v, c, f)	cap_raised(vx_info_mbcaps(v, c), f)
++
++#define vx_capable(b, c) (capable(b) || \
++	(cap_raised(current_cap(), b) && vx_ccaps(c)))
++
++#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \
++	(cap_raised(current_cap(), b) && vx_ccaps(c)))
++
++#define nx_capable(b, c) (capable(b) || \
++	(cap_raised(current_cap(), b) && nx_ncaps(c)))
++
++#define vx_task_initpid(t, n) \
++	((t)->vx_info && \
++	((t)->vx_info->vx_initpid == (n)))
++
++#define vx_current_initpid(n)	vx_task_initpid(current, n)
++
++
++/* context unshare mask */
++
++#define __vx_umask(v)		((v)->vx_umask)
++
++#define vx_current_umask()	__vx_umask(current_vx_info())
++
++#define vx_can_unshare(b, f) (capable(b) || \
++	(cap_raised(current_cap(), b) && \
++	!((f) & ~vx_current_umask())))
++
++
++#define __vx_wmask(v)		((v)->vx_wmask)
++
++#define vx_current_wmask()	__vx_wmask(current_vx_info())
++
++
++#define __vx_state(v)	((v) ? ((v)->vx_state) : 0)
++
++#define vx_info_state(v, m)	(__vx_state(v) & (m))
++
++
++#define __nx_state(n)	((n) ? ((n)->nx_state) : 0)
++
++#define nx_info_state(n, m)	(__nx_state(n) & (m))
++
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct.h
+--- linux-3.4.45/include/linux/vserver/cacct.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,15 @@
++#ifndef _VX_CACCT_H
++#define _VX_CACCT_H
++
++
++enum sock_acc_field {
++	VXA_SOCK_UNSPEC = 0,
++	VXA_SOCK_UNIX,
++	VXA_SOCK_INET,
++	VXA_SOCK_INET6,
++	VXA_SOCK_PACKET,
++	VXA_SOCK_OTHER,
++	VXA_SOCK_SIZE	/* array size */
++};
++
++#endif	/* _VX_CACCT_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_cmd.h
+--- linux-3.4.45/include/linux/vserver/cacct_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _VX_CACCT_CMD_H
++#define _VX_CACCT_CMD_H
++
++
++/* virtual host info name commands */
++
++#define VCMD_sock_stat		VC_CMD(VSTAT, 5, 0)
++
++struct	vcmd_sock_stat_v0 {
++	uint32_t field;
++	uint32_t count[3];
++	uint64_t total[3];
++};
++
++
++#ifdef	__KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_sock_stat(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_def.h
+--- linux-3.4.45/include/linux/vserver/cacct_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_def.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,43 @@
++#ifndef _VX_CACCT_DEF_H
++#define _VX_CACCT_DEF_H
++
++#include <asm/atomic.h>
++#include <linux/vserver/cacct.h>
++
++
++struct _vx_sock_acc {
++	atomic_long_t count;
++	atomic_long_t total;
++};
++
++/* context sub struct */
++
++struct _vx_cacct {
++	struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
++	atomic_t slab[8];
++	atomic_t page[6][8];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++{
++	int i, j;
++
++	printk("\t_vx_cacct:");
++	for (i = 0; i < 6; i++) {
++		struct _vx_sock_acc *ptr = cacct->sock[i];
++
++		printk("\t [%d] =", i);
++		for (j = 0; j < 3; j++) {
++			printk(" [%d] = %8lu, %8lu", j,
++				atomic_long_read(&ptr[j].count),
++				atomic_long_read(&ptr[j].total));
++		}
++		printk("\n");
++	}
++}
++
++#endif
++
++#endif	/* _VX_CACCT_DEF_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cacct_int.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_int.h
+--- linux-3.4.45/include/linux/vserver/cacct_int.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cacct_int.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,21 @@
++#ifndef _VX_CACCT_INT_H
++#define _VX_CACCT_INT_H
++
++
++#ifdef	__KERNEL__
++
++static inline
++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++	return atomic_long_read(&cacct->sock[type][pos].count);
++}
++
++
++static inline
++unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++{
++	return atomic_long_read(&cacct->sock[type][pos].total);
++}
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CACCT_INT_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/check.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/check.h
+--- linux-3.4.45/include/linux/vserver/check.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/check.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,89 @@
++#ifndef _VS_CHECK_H
++#define _VS_CHECK_H
++
++
++#define MAX_S_CONTEXT	65535	/* Arbitrary limit */
++
++#ifdef	CONFIG_VSERVER_DYNAMIC_IDS
++#define MIN_D_CONTEXT	49152	/* dynamic contexts start here */
++#else
++#define MIN_D_CONTEXT	65536
++#endif
++
++/* check conditions */
++
++#define VS_ADMIN	0x0001
++#define VS_WATCH	0x0002
++#define VS_HIDE		0x0004
++#define VS_HOSTID	0x0008
++
++#define VS_IDENT	0x0010
++#define VS_EQUIV	0x0020
++#define VS_PARENT	0x0040
++#define VS_CHILD	0x0080
++
++#define VS_ARG_MASK	0x00F0
++
++#define VS_DYNAMIC	0x0100
++#define VS_STATIC	0x0200
++
++#define VS_ATR_MASK	0x0F00
++
++#ifdef	CONFIG_VSERVER_PRIVACY
++#define VS_ADMIN_P	(0)
++#define VS_WATCH_P	(0)
++#else
++#define VS_ADMIN_P	VS_ADMIN
++#define VS_WATCH_P	VS_WATCH
++#endif
++
++#define VS_HARDIRQ	0x1000
++#define VS_SOFTIRQ	0x2000
++#define VS_IRQ		0x4000
++
++#define VS_IRQ_MASK	0xF000
++
++#include <linux/hardirq.h>
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __vs_check(int cid, int id, unsigned int mode)
++{
++	if (mode & VS_ARG_MASK) {
++		if ((mode & VS_IDENT) && (id == cid))
++			return 1;
++	}
++	if (mode & VS_ATR_MASK) {
++		if ((mode & VS_DYNAMIC) &&
++			(id >= MIN_D_CONTEXT) &&
++			(id <= MAX_S_CONTEXT))
++			return 1;
++		if ((mode & VS_STATIC) &&
++			(id > 1) && (id < MIN_D_CONTEXT))
++			return 1;
++	}
++	if (mode & VS_IRQ_MASK) {
++		if ((mode & VS_IRQ) && unlikely(in_interrupt()))
++			return 1;
++		if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
++			return 1;
++		if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
++			return 1;
++	}
++	return (((mode & VS_ADMIN) && (cid == 0)) ||
++		((mode & VS_WATCH) && (cid == 1)) ||
++		((mode & VS_HOSTID) && (id == 0)));
++}
++
++#define vx_check(c, m)	__vs_check(vx_current_xid(), c, (m) | VS_IRQ)
++
++#define vx_weak_check(c, m)	((m) ? vx_check(c, m) : 1)
++
++
++#define nx_check(c, m)	__vs_check(nx_current_nid(), c, m)
++
++#define nx_weak_check(c, m)	((m) ? nx_check(c, m) : 1)
++
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/context.h
+--- linux-3.4.45/include/linux/vserver/context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/context.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,188 @@
++#ifndef _VX_CONTEXT_H
++#define _VX_CONTEXT_H
++
++#include <linux/types.h>
++#include <linux/capability.h>
++
++
++/* context flags */
++
++#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_VIRT_TIME		0x00100000
++
++#define VXF_HIDE_MOUNT		0x01000000
++/* was	VXF_HIDE_NETIF		0x02000000 */
++#define VXF_HIDE_VINFO		0x04000000
++
++#define VXF_STATE_SETUP		(1ULL << 32)
++#define VXF_STATE_INIT		(1ULL << 33)
++#define VXF_STATE_ADMIN		(1ULL << 34)
++
++#define VXF_SC_HELPER		(1ULL << 36)
++#define VXF_REBOOT_KILL		(1ULL << 37)
++#define VXF_PERSISTENT		(1ULL << 38)
++
++#define VXF_FORK_RSS		(1ULL << 48)
++#define VXF_PROLIFIC		(1ULL << 49)
++
++#define VXF_IGNEG_NICE		(1ULL << 52)
++
++#define VXF_ONE_TIME		(0x0007ULL << 32)
++
++#define VXF_INIT_SET		(VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
++
++
++/* context migration */
++
++#define VXM_SET_INIT		0x00000001
++#define VXM_SET_REAPER		0x00000002
++
++/* context caps */
++
++#define VXC_SET_UTSNAME		0x00000001
++#define VXC_SET_RLIMIT		0x00000002
++#define VXC_FS_SECURITY		0x00000004
++#define VXC_FS_TRUSTED		0x00000008
++#define VXC_TIOCSTI		0x00000010
++
++/* was	VXC_RAW_ICMP		0x00000100 */
++#define VXC_SYSLOG		0x00001000
++#define VXC_OOM_ADJUST		0x00002000
++#define VXC_AUDIT_CONTROL	0x00004000
++
++#define VXC_SECURE_MOUNT	0x00010000
++#define VXC_SECURE_REMOUNT	0x00020000
++#define VXC_BINARY_MOUNT	0x00040000
++
++#define VXC_QUOTA_CTL		0x00100000
++#define VXC_ADMIN_MAPPER	0x00200000
++#define VXC_ADMIN_CLOOP		0x00400000
++
++#define VXC_KTHREAD		0x01000000
++#define VXC_NAMESPACE		0x02000000
++
++
++#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"
++#include "cacct_def.h"
++#include "device_def.h"
++
++#define VX_SPACES	2
++
++struct _vx_info_pc {
++	struct _vx_sched_pc sched_pc;
++	struct _vx_cvirt_pc cvirt_pc;
++};
++
++struct _vx_space {
++	unsigned long vx_nsmask;		/* assignment mask */
++	struct nsproxy *vx_nsproxy;             /* private namespaces */
++	struct fs_struct *vx_fs;                /* private namespace fs */
++	const struct cred *vx_cred;             /* task credentials */
++};
++
++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 _vx_space space[VX_SPACES];	/* namespace store */
++
++	uint64_t vx_flags;			/* context flags */
++	uint64_t vx_ccaps;			/* context caps (vserver) */
++	uint64_t vx_umask;			/* unshare mask (guest) */
++	uint64_t vx_wmask;			/* warn mask (guest) */
++	kernel_cap_t vx_bcaps;			/* bounding caps (system) */
++
++	struct task_struct *vx_reaper;		/* guest reaper process */
++	pid_t vx_initpid;			/* PID of guest init */
++	int64_t vx_badness_bias;		/* OOM points bias */
++
++	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 */
++
++	struct _vx_device dmap;			/* default device map targets */
++
++#ifndef CONFIG_SMP
++	struct _vx_info_pc info_pc;		/* per cpu data */
++#else
++	struct _vx_info_pc *ptr_pc;		/* per cpu array */
++#endif
++
++	wait_queue_head_t vx_wait;		/* context exit waitqueue */
++	int reboot_cmd;				/* last sys_reboot() cmd */
++	int exit_code;				/* last process exit code */
++
++	char vx_name[65];			/* vserver name */
++};
++
++#ifndef CONFIG_SMP
++#define	vx_ptr_pc(vxi)		(&(vxi)->info_pc)
++#define	vx_per_cpu(vxi, v, id)	vx_ptr_pc(vxi)->v
++#else
++#define	vx_ptr_pc(vxi)		((vxi)->ptr_pc)
++#define	vx_per_cpu(vxi, v, id)	per_cpu_ptr(vx_ptr_pc(vxi), id)->v
++#endif
++
++#define	vx_cpu(vxi, v)		vx_per_cpu(vxi, v, smp_processor_id())
++
++
++struct vx_info_save {
++	struct vx_info *vxi;
++	xid_t xid;
++};
++
++
++/* status flags */
++
++#define VXS_HASHED	0x0001
++#define VXS_PAUSED	0x0010
++#define VXS_SHUTDOWN	0x0100
++#define VXS_HELPER	0x1000
++#define VXS_RELEASED	0x8000
++
++
++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 *lookup_vx_info(int);
++extern struct vx_info *lookup_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 *, int);
++
++extern long vs_state_change(struct vx_info *, unsigned int);
++
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CONTEXT_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/context_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/context_cmd.h
+--- linux-3.4.45/include/linux/vserver/context_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/context_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,162 @@
++#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);
++
++#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(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++#define VCMD_ctx_stat		VC_CMD(VSTAT, 0, 0)
++
++struct	vcmd_ctx_stat_v0 {
++	uint32_t usecnt;
++	uint32_t tasks;
++	/* more to come */
++};
++
++#ifdef	__KERNEL__
++extern int vc_ctx_stat(struct vx_info *, 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_v0	VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate	VC_CMD(PROCMIG, 1, 1)
++
++struct	vcmd_ctx_migrate {
++	uint64_t flagword;
++};
++
++#ifdef	__KERNEL__
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, 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(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++
++/* context caps commands */
++
++#define VCMD_get_ccaps		VC_CMD(FLAGS, 3, 1)
++#define VCMD_set_ccaps		VC_CMD(FLAGS, 4, 1)
++
++struct	vcmd_ctx_caps_v1 {
++	uint64_t ccaps;
++	uint64_t cmask;
++};
++
++#ifdef	__KERNEL__
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++
++/* bcaps commands */
++
++#define VCMD_get_bcaps		VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps		VC_CMD(FLAGS, 10, 0)
++
++struct	vcmd_bcaps {
++	uint64_t bcaps;
++	uint64_t bmask;
++};
++
++#ifdef	__KERNEL__
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++
++/* umask commands */
++
++#define VCMD_get_umask		VC_CMD(FLAGS, 13, 0)
++#define VCMD_set_umask		VC_CMD(FLAGS, 14, 0)
++
++struct	vcmd_umask {
++	uint64_t umask;
++	uint64_t mask;
++};
++
++#ifdef	__KERNEL__
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++
++/* wmask commands */
++
++#define VCMD_get_wmask		VC_CMD(FLAGS, 15, 0)
++#define VCMD_set_wmask		VC_CMD(FLAGS, 16, 0)
++
++struct	vcmd_wmask {
++	uint64_t wmask;
++	uint64_t mask;
++};
++
++#ifdef	__KERNEL__
++extern int vc_get_wmask(struct vx_info *, void __user *);
++extern int vc_set_wmask(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++
++/* OOM badness */
++
++#define VCMD_get_badness	VC_CMD(MEMCTRL, 5, 0)
++#define VCMD_set_badness	VC_CMD(MEMCTRL, 6, 0)
++
++struct	vcmd_badness_v0 {
++	int64_t bias;
++};
++
++#ifdef	__KERNEL__
++extern int vc_get_badness(struct vx_info *, void __user *);
++extern int vc_set_badness(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt.h
+--- linux-3.4.45/include/linux/vserver/cvirt.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,22 @@
++#ifndef _VX_CVIRT_H
++#define _VX_CVIRT_H
++
++
++#ifdef	__KERNEL__
++
++struct timespec;
++
++void vx_vsi_boottime(struct timespec *);
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++int vx_do_syslog(int, char __user *, int);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CVIRT_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h
+--- linux-3.4.45/include/linux/vserver/cvirt_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,53 @@
++#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(struct vx_info *, void __user *);
++extern int vc_get_vhi_name(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++#define VCMD_virt_stat		VC_CMD(VSTAT, 3, 0)
++
++struct	vcmd_virt_stat_v0 {
++	uint64_t offset;
++	uint64_t uptime;
++	uint32_t nr_threads;
++	uint32_t nr_running;
++	uint32_t nr_uninterruptible;
++	uint32_t nr_onhold;
++	uint32_t nr_forks;
++	uint32_t load[3];
++};
++
++#ifdef	__KERNEL__
++extern int vc_virt_stat(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/cvirt_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_def.h
+--- linux-3.4.45/include/linux/vserver/cvirt_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/cvirt_def.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,80 @@
++#ifndef _VX_CVIRT_DEF_H
++#define _VX_CVIRT_DEF_H
++
++#include <linux/jiffies.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 {
++	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_ts;	/* time offset to the host */
++	struct timespec bias_idle;
++	struct timespec bias_uptime;	/* context creation point */
++	uint64_t bias_clock;		/* offset in clock_t */
++
++	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 calculated */
++	uint32_t load[3];		/* load averages 1,5,15 */
++
++	atomic_t total_forks;		/* number of forks so far */
++
++	struct _vx_syslog syslog;
++};
++
++struct _vx_cvirt_pc {
++	struct _vx_usage_stat cpustat;
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
++{
++	printk("\t_vx_cvirt:\n");
++	printk("\t threads: %4d, %4d, %4d, %4d\n",
++		atomic_read(&cvirt->nr_threads),
++		atomic_read(&cvirt->nr_running),
++		atomic_read(&cvirt->nr_uninterruptible),
++		atomic_read(&cvirt->nr_onhold));
++	/* add rest here */
++	printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
++}
++
++#endif
++
++#endif	/* _VX_CVIRT_DEF_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug.h
+--- linux-3.4.45/include/linux/vserver/debug.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,145 @@
++#ifndef _VX_DEBUG_H
++#define _VX_DEBUG_H
++
++
++#define VXD_CBIT(n, m)	(vs_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n, m)	(vs_debug_ ## n > (m))
++#define VXD_MASK(n, m)	(vs_debug_ ## n & (m))
++
++#define VXD_DEV(d)	(d), (d)->bd_inode->i_ino,		\
++			imajor((d)->bd_inode), iminor((d)->bd_inode)
++#define VXF_DEV		"%p[%lu,%d:%d]"
++
++#if	defined(CONFIG_QUOTES_UTF8)
++#define	VS_Q_LQM	"\xc2\xbb"
++#define	VS_Q_RQM	"\xc2\xab"
++#elif	defined(CONFIG_QUOTES_ASCII)
++#define	VS_Q_LQM	"\x27"
++#define	VS_Q_RQM	"\x27"
++#else
++#define	VS_Q_LQM	"\xbb"
++#define	VS_Q_RQM	"\xab"
++#endif
++
++#define	VS_Q(f)		VS_Q_LQM f VS_Q_RQM
++
++
++#define vxd_path(p)						\
++	({ static char _buffer[PATH_MAX];			\
++	   d_path(p, _buffer, sizeof(_buffer)); })
++
++#define vxd_cond_path(n)					\
++	((n) ? vxd_path(&(n)->path) : "<null>" )
++
++
++#ifdef	CONFIG_VSERVER_DEBUG
++
++extern unsigned int vs_debug_switch;
++extern unsigned int vs_debug_xid;
++extern unsigned int vs_debug_nid;
++extern unsigned int vs_debug_tag;
++extern unsigned int vs_debug_net;
++extern unsigned int vs_debug_limit;
++extern unsigned int vs_debug_cres;
++extern unsigned int vs_debug_dlim;
++extern unsigned int vs_debug_quota;
++extern unsigned int vs_debug_cvirt;
++extern unsigned int vs_debug_space;
++extern unsigned int vs_debug_perm;
++extern unsigned int vs_debug_misc;
++
++
++#define VX_LOGLEVEL	"vxD: "
++#define VX_PROC_FMT	"%p: "
++#define VX_PROCESS	current
++
++#define vxdprintk(c, f, x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_LOGLEVEL VX_PROC_FMT f "\n",	\
++				VX_PROCESS , ##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)
++
++
++struct vx_info;
++
++void dump_vx_info(struct vx_info *, int);
++void dump_vx_info_inactive(int);
++
++#else	/* CONFIG_VSERVER_DEBUG */
++
++#define vs_debug_switch	0
++#define vs_debug_xid	0
++#define vs_debug_nid	0
++#define vs_debug_tag	0
++#define vs_debug_net	0
++#define vs_debug_limit	0
++#define vs_debug_cres	0
++#define vs_debug_dlim	0
++#define vs_debug_quota	0
++#define vs_debug_cvirt	0
++#define vs_debug_space	0
++#define vs_debug_perm	0
++#define vs_debug_misc	0
++
++#define vxdprintk(x...) do { } while (0)
++#define vxlprintk(x...) do { } while (0)
++#define vxfprintk(x...) do { } while (0)
++
++#endif	/* CONFIG_VSERVER_DEBUG */
++
++
++#ifdef	CONFIG_VSERVER_WARN
++
++#define VX_WARNLEVEL	KERN_WARNING "vxW: "
++#define VX_WARN_TASK	"[" VS_Q("%s") ",%u:#%u|%u|%u] "
++#define VX_WARN_XID	"[xid #%u] "
++#define VX_WARN_NID	"[nid #%u] "
++#define VX_WARN_TAG	"[tag #%u] "
++
++#define vxwprintk(c, f, x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_WARNLEVEL f "\n", ##x);	\
++	} while (0)
++
++#else	/* CONFIG_VSERVER_WARN */
++
++#define vxwprintk(x...) do { } while (0)
++
++#endif	/* CONFIG_VSERVER_WARN */
++
++#define vxwprintk_task(c, f, x...)				\
++	vxwprintk(c, VX_WARN_TASK f,				\
++		current->comm, current->pid,			\
++		current->xid, current->nid, current->tag, ##x)
++#define vxwprintk_xid(c, f, x...)				\
++	vxwprintk(c, VX_WARN_XID f, current->xid, x)
++#define vxwprintk_nid(c, f, x...)				\
++	vxwprintk(c, VX_WARN_NID f, current->nid, x)
++#define vxwprintk_tag(c, f, x...)				\
++	vxwprintk(c, VX_WARN_TAG f, current->tag, x)
++
++#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 */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/debug_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug_cmd.h
+--- linux-3.4.45/include/linux/vserver/debug_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/debug_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,58 @@
++#ifndef _VX_DEBUG_CMD_H
++#define _VX_DEBUG_CMD_H
++
++
++/* debug commands */
++
++#define VCMD_dump_history	VC_CMD(DEBUG, 1, 0)
++
++#define VCMD_read_history	VC_CMD(DEBUG, 5, 0)
++#define VCMD_read_monitor	VC_CMD(DEBUG, 6, 0)
++
++struct  vcmd_read_history_v0 {
++	uint32_t index;
++	uint32_t count;
++	char __user *data;
++};
++
++struct  vcmd_read_monitor_v0 {
++	uint32_t index;
++	uint32_t count;
++	char __user *data;
++};
++
++
++#ifdef	__KERNEL__
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_read_history_v0_x32 {
++	uint32_t index;
++	uint32_t count;
++	compat_uptr_t data_ptr;
++};
++
++struct	vcmd_read_monitor_v0_x32 {
++	uint32_t index;
++	uint32_t count;
++	compat_uptr_t data_ptr;
++};
++
++#endif  /* CONFIG_COMPAT */
++
++extern int vc_dump_history(uint32_t);
++
++extern int vc_read_history(uint32_t, void __user *);
++extern int vc_read_monitor(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_read_history_x32(uint32_t, void __user *);
++extern int vc_read_monitor_x32(uint32_t, void __user *);
++
++#endif  /* CONFIG_COMPAT */
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_DEBUG_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device.h
+--- linux-3.4.45/include/linux/vserver/device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/device.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,15 @@
++#ifndef _VX_DEVICE_H
++#define _VX_DEVICE_H
++
++
++#define DATTR_CREATE	0x00000001
++#define DATTR_OPEN	0x00000002
++
++#define DATTR_REMAP	0x00000010
++
++#define DATTR_MASK	0x00000013
++
++
++#else	/* _VX_DEVICE_H */
++#warning duplicate inclusion
++#endif	/* _VX_DEVICE_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_cmd.h
+--- linux-3.4.45/include/linux/vserver/device_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,44 @@
++#ifndef _VX_DEVICE_CMD_H
++#define _VX_DEVICE_CMD_H
++
++
++/*  device vserver commands */
++
++#define VCMD_set_mapping	VC_CMD(DEVICE, 1, 0)
++#define VCMD_unset_mapping	VC_CMD(DEVICE, 2, 0)
++
++struct	vcmd_set_mapping_v0 {
++	const char __user *device;
++	const char __user *target;
++	uint32_t flags;
++};
++
++
++#ifdef	__KERNEL__
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_set_mapping_v0_x32 {
++	compat_uptr_t device_ptr;
++	compat_uptr_t target_ptr;
++	uint32_t flags;
++};
++
++#endif	/* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_set_mapping(struct vx_info *, void __user *);
++extern int vc_unset_mapping(struct vx_info *, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_set_mapping_x32(struct vx_info *, void __user *);
++extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_DEVICE_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/device_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_def.h
+--- linux-3.4.45/include/linux/vserver/device_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/device_def.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _VX_DEVICE_DEF_H
++#define _VX_DEVICE_DEF_H
++
++#include <linux/types.h>
++
++struct vx_dmap_target {
++	dev_t target;
++	uint32_t flags;
++};
++
++struct _vx_device {
++#ifdef CONFIG_VSERVER_DEVICE
++	struct vx_dmap_target targets[2];
++#endif
++};
++
++#endif	/* _VX_DEVICE_DEF_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit.h
+--- linux-3.4.45/include/linux/vserver/dlimit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,54 @@
++#ifndef _VX_DLIMIT_H
++#define _VX_DLIMIT_H
++
++#include "switch.h"
++
++
++#ifdef	__KERNEL__
++
++/*      keep in sync with CDLIM_INFINITY	*/
++
++#define DLIM_INFINITY		(~0ULL)
++
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++
++struct super_block;
++
++struct dl_info {
++	struct hlist_node dl_hlist;		/* linked list of contexts */
++	struct rcu_head dl_rcu;			/* the rcu head */
++	tag_t dl_tag;				/* context tag */
++	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 */
++
++	unsigned long long dl_space_used;	/* used space in bytes */
++	unsigned long long dl_space_total;	/* maximum space in bytes */
++	unsigned long dl_inodes_used;		/* used inodes */
++	unsigned long 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 *, tag_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 */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/dlimit_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h
+--- linux-3.4.45/include/linux/vserver/dlimit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/dlimit_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,109 @@
++#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;
++};
++
++#define CDLIM_UNSET		((uint32_t)0UL)
++#define CDLIM_INFINITY		((uint32_t)~0UL)
++#define CDLIM_KEEP		((uint32_t)~1UL)
++
++#define DLIME_UNIT	0
++#define DLIME_KILO	1
++#define DLIME_MEGA	2
++#define DLIME_GIGA	3
++
++#define DLIMF_SHIFT	0x10
++
++#define DLIMS_USED	0
++#define DLIMS_TOTAL	2
++
++static inline
++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
++{
++	int exp = (flags & DLIMF_SHIFT) ?
++		(flags >> shift) & DLIME_GIGA : DLIME_KILO;
++	return ((uint64_t)val) << (10 * exp);
++}
++
++static inline
++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
++{
++	int exp = 0;
++
++	if (*flags & DLIMF_SHIFT) {
++		while (val > (1LL << 32) && (exp < 3)) {
++			val >>= 10;
++			exp++;
++		}
++		*flags &= ~(DLIME_GIGA << shift);
++		*flags |= exp << shift;
++	} else
++		val >>= 10;
++	return val;
++}
++
++#ifdef	__KERNEL__
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++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 */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/global.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/global.h
+--- linux-3.4.45/include/linux/vserver/global.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/global.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VX_GLOBAL_H
++#define _VX_GLOBAL_H
++
++
++extern atomic_t vx_global_ctotal;
++extern atomic_t vx_global_cactive;
++
++extern atomic_t nx_global_ctotal;
++extern atomic_t nx_global_cactive;
++
++extern atomic_t vs_global_nsproxy;
++extern atomic_t vs_global_fs;
++extern atomic_t vs_global_mnt_ns;
++extern atomic_t vs_global_uts_ns;
++extern atomic_t vs_global_user_ns;
++extern atomic_t vs_global_pid_ns;
++
++
++#endif /* _VX_GLOBAL_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/history.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/history.h
+--- linux-3.4.45/include/linux/vserver/history.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/history.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,197 @@
++#ifndef _VX_HISTORY_H
++#define _VX_HISTORY_H
++
++
++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 _vxhe_vxi {
++	struct vx_info *ptr;
++	unsigned xid;
++	unsigned usecnt;
++	unsigned tasks;
++};
++
++struct _vxhe_set_clr {
++	void *data;
++};
++
++struct _vxhe_loc_lookup {
++	unsigned arg;
++};
++
++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;
++	};
++};
++
++#ifdef	CONFIG_VSERVER_HISTORY
++
++extern unsigned volatile int vxh_active;
++
++struct _vx_hist_entry *vxh_advance(void *loc);
++
++
++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	__HERE__ current_text_addr()
++
++#define __VXH_BODY(__type, __data, __here)	\
++	struct _vx_hist_entry *entry;		\
++						\
++	preempt_disable();			\
++	entry = vxh_advance(__here);		\
++	__data;					\
++	entry->type = __type;			\
++	preempt_enable();
++
++
++	/* pass vxi only */
++
++#define __VXH_SMPL				\
++	__vxh_copy_vxi(entry, vxi)
++
++static inline
++void	__vxh_smpl(struct vx_info *vxi, int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_SMPL, __here)
++}
++
++	/* pass vxi and data (void *) */
++
++#define __VXH_DATA				\
++	__vxh_copy_vxi(entry, vxi);		\
++	entry->sc.data = data
++
++static inline
++void	__vxh_data(struct vx_info *vxi, void *data,
++			int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_DATA, __here)
++}
++
++	/* pass vxi and arg (long) */
++
++#define __VXH_LONG				\
++	__vxh_copy_vxi(entry, vxi);		\
++	entry->ll.arg = arg
++
++static inline
++void	__vxh_long(struct vx_info *vxi, long arg,
++			int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_LONG, __here)
++}
++
++
++static inline
++void	__vxh_throw_oops(void *__here)
++{
++	__VXH_BODY(VXH_THROW_OOPS, {}, __here);
++	/* prevent further acquisition */
++	vxh_active = 0;
++}
++
++
++#define vxh_throw_oops()	__vxh_throw_oops(__HERE__);
++
++#define __vxh_get_vx_info(v, h)	__vxh_smpl(v, VXH_GET_VX_INFO, h);
++#define __vxh_put_vx_info(v, h)	__vxh_smpl(v, VXH_PUT_VX_INFO, h);
++
++#define __vxh_init_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_INIT_VX_INFO, h);
++#define __vxh_set_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_SET_VX_INFO, h);
++#define __vxh_clr_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_CLR_VX_INFO, h);
++
++#define __vxh_claim_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
++#define __vxh_release_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
++
++#define vxh_alloc_vx_info(v) \
++	__vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
++#define vxh_dealloc_vx_info(v) \
++	__vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
++
++#define vxh_hash_vx_info(v) \
++	__vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
++#define vxh_unhash_vx_info(v) \
++	__vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
++
++#define vxh_loc_vx_info(v, l) \
++	__vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
++#define vxh_lookup_vx_info(v, l) \
++	__vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
++#define vxh_create_vx_info(v, l) \
++	__vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
++
++extern void vxh_dump_history(void);
++
++
++#else  /* CONFIG_VSERVER_HISTORY */
++
++#define	__HERE__	0
++
++#define vxh_throw_oops()		do { } while (0)
++
++#define __vxh_get_vx_info(v, h)		do { } while (0)
++#define __vxh_put_vx_info(v, h)		do { } while (0)
++
++#define __vxh_init_vx_info(v, d, h)	do { } while (0)
++#define __vxh_set_vx_info(v, d, h)	do { } while (0)
++#define __vxh_clr_vx_info(v, d, h)	do { } while (0)
++
++#define __vxh_claim_vx_info(v, d, h)	do { } while (0)
++#define __vxh_release_vx_info(v, d, h)	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(v, l)		do { } while (0)
++#define vxh_lookup_vx_info(v, l)	do { } while (0)
++#define vxh_create_vx_info(v, l)	do { } while (0)
++
++#define vxh_dump_history()		do { } while (0)
++
++
++#endif /* CONFIG_VSERVER_HISTORY */
++
++#endif /* _VX_HISTORY_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode.h
+--- linux-3.4.45/include/linux/vserver/inode.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,39 @@
++#ifndef _VX_INODE_H
++#define _VX_INODE_H
++
++
++#define IATTR_TAG	0x01000000
++
++#define IATTR_ADMIN	0x00000001
++#define IATTR_WATCH	0x00000002
++#define IATTR_HIDE	0x00000004
++#define IATTR_FLAGS	0x00000007
++
++#define IATTR_BARRIER	0x00010000
++#define IATTR_IXUNLINK	0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++#define IATTR_COW	0x00080000
++
++#ifdef	__KERNEL__
++
++
++#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 */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/inode_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode_cmd.h
+--- linux-3.4.45/include/linux/vserver/inode_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/inode_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,59 @@
++#ifndef _VX_INODE_CMD_H
++#define _VX_INODE_CMD_H
++
++
++/*  inode vserver commands */
++
++#define VCMD_get_iattr		VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr		VC_CMD(INODE, 2, 1)
++
++#define VCMD_fget_iattr		VC_CMD(INODE, 3, 0)
++#define VCMD_fset_iattr		VC_CMD(INODE, 4, 0)
++
++struct	vcmd_ctx_iattr_v1 {
++	const char __user *name;
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++struct	vcmd_ctx_fiattr_v0 {
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++
++#ifdef	__KERNEL__
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_ctx_iattr_v1_x32 {
++	compat_uptr_t name_ptr;
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++#endif	/* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_get_iattr(void __user *);
++extern int vc_set_iattr(void __user *);
++
++extern int vc_fget_iattr(uint32_t, void __user *);
++extern int vc_fset_iattr(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_get_iattr_x32(void __user *);
++extern int vc_set_iattr_x32(void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_INODE_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit.h
+--- linux-3.4.45/include/linux/vserver/limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,71 @@
++#ifndef _VX_LIMIT_H
++#define _VX_LIMIT_H
++
++#define VLIMIT_NSOCK	16
++#define VLIMIT_OPENFD	17
++#define VLIMIT_ANON	18
++#define VLIMIT_SHMEM	19
++#define VLIMIT_SEMARY	20
++#define VLIMIT_NSEMS	21
++#define VLIMIT_DENTRY	22
++#define VLIMIT_MAPPED	23
++
++
++#ifdef	__KERNEL__
++
++#define	VLIM_NOCHECK	((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
++
++/*	keep in sync with CRLIM_INFINITY */
++
++#define	VLIM_INFINITY	(~0ULL)
++
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
++#ifndef RLIM_INFINITY
++#warning RLIM_INFINITY is undefined
++#endif
++
++#define __rlim_val(l, r, v)	((l)->res[r].v)
++
++#define __rlim_soft(l, r)	__rlim_val(l, r, soft)
++#define __rlim_hard(l, r)	__rlim_val(l, r, hard)
++
++#define __rlim_rcur(l, r)	__rlim_val(l, r, rcur)
++#define __rlim_rmin(l, r)	__rlim_val(l, r, rmin)
++#define __rlim_rmax(l, r)	__rlim_val(l, r, rmax)
++
++#define __rlim_lhit(l, r)	__rlim_val(l, r, lhit)
++#define __rlim_hit(l, r)	atomic_inc(&__rlim_lhit(l, r))
++
++typedef atomic_long_t rlim_atomic_t;
++typedef unsigned long rlim_t;
++
++#define __rlim_get(l, r)	atomic_long_read(&__rlim_rcur(l, r))
++#define __rlim_set(l, r, v)	atomic_long_set(&__rlim_rcur(l, r), v)
++#define __rlim_inc(l, r)	atomic_long_inc(&__rlim_rcur(l, r))
++#define __rlim_dec(l, r)	atomic_long_dec(&__rlim_rcur(l, r))
++#define __rlim_add(l, r, v)	atomic_long_add(v, &__rlim_rcur(l, r))
++#define __rlim_sub(l, r, v)	atomic_long_sub(v, &__rlim_rcur(l, r))
++
++
++#if	(RLIM_INFINITY == VLIM_INFINITY)
++#define	VX_VLIM(r) ((long long)(long)(r))
++#define	VX_RLIM(v) ((rlim_t)(v))
++#else
++#define	VX_VLIM(r) (((r) == RLIM_INFINITY) \
++		? VLIM_INFINITY : (long long)(r))
++#define	VX_RLIM(v) (((v) == VLIM_INFINITY) \
++		? RLIM_INFINITY : (rlim_t)(v))
++#endif
++
++struct sysinfo;
++
++void vx_vsi_meminfo(struct sysinfo *);
++void vx_vsi_swapinfo(struct sysinfo *);
++long vx_vsi_cached(struct sysinfo *);
++
++#define NUM_LIMITS	24
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_LIMIT_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_cmd.h
+--- linux-3.4.45/include/linux/vserver/limit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,71 @@
++#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)
++#define VCMD_reset_hits		VC_CMD(RLIMIT, 7, 0)
++#define VCMD_reset_minmax	VC_CMD(RLIMIT, 9, 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 VCMD_rlimit_stat	VC_CMD(VSTAT, 1, 0)
++
++struct	vcmd_rlimit_stat_v0 {
++	uint32_t id;
++	uint32_t hits;
++	uint64_t value;
++	uint64_t minimum;
++	uint64_t maximum;
++};
++
++#define CRLIM_UNSET		(0ULL)
++#define CRLIM_INFINITY		(~0ULL)
++#define CRLIM_KEEP		(~1ULL)
++
++#ifdef	__KERNEL__
++
++#ifdef	CONFIG_IA32_EMULATION
++
++struct	vcmd_ctx_rlimit_v0_x32 {
++	uint32_t id;
++	uint64_t minimum;
++	uint64_t softlimit;
++	uint64_t maximum;
++} __attribute__ ((packed));
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++#include <linux/compiler.h>
++
++extern int vc_get_rlimit_mask(uint32_t, void __user *);
++extern int vc_get_rlimit(struct vx_info *, void __user *);
++extern int vc_set_rlimit(struct vx_info *, void __user *);
++extern int vc_reset_hits(struct vx_info *, void __user *);
++extern int vc_reset_minmax(struct vx_info *, void __user *);
++
++extern int vc_rlimit_stat(struct vx_info *, void __user *);
++
++#ifdef	CONFIG_IA32_EMULATION
++
++extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
++extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_LIMIT_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_def.h
+--- linux-3.4.45/include/linux/vserver/limit_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_def.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,47 @@
++#ifndef _VX_LIMIT_DEF_H
++#define _VX_LIMIT_DEF_H
++
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
++#include "limit.h"
++
++
++struct _vx_res_limit {
++	rlim_t soft;		/* Context soft limit */
++	rlim_t hard;		/* Context hard limit */
++
++	rlim_atomic_t rcur;	/* Current value */
++	rlim_t rmin;		/* Context minimum */
++	rlim_t rmax;		/* Context maximum */
++
++	atomic_t lhit;		/* Limit hits */
++};
++
++/* context sub struct */
++
++struct _vx_limit {
++	struct _vx_res_limit res[NUM_LIMITS];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_limit(struct _vx_limit *limit)
++{
++	int i;
++
++	printk("\t_vx_limit:");
++	for (i = 0; i < NUM_LIMITS; i++) {
++		printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
++			i, (unsigned long)__rlim_get(limit, i),
++			(unsigned long)__rlim_rmin(limit, i),
++			(unsigned long)__rlim_rmax(limit, i),
++			(long)__rlim_soft(limit, i),
++			(long)__rlim_hard(limit, i),
++			atomic_read(&__rlim_lhit(limit, i)));
++	}
++}
++
++#endif
++
++#endif	/* _VX_LIMIT_DEF_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/limit_int.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_int.h
+--- linux-3.4.45/include/linux/vserver/limit_int.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/limit_int.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,198 @@
++#ifndef _VX_LIMIT_INT_H
++#define _VX_LIMIT_INT_H
++
++#include "context.h"
++
++#ifdef	__KERNEL__
++
++#define VXD_RCRES_COND(r)	VXD_CBIT(cres, r)
++#define VXD_RLIMIT_COND(r)	VXD_CBIT(limit, r)
++
++extern const char *vlimit_name[NUM_LIMITS];
++
++static inline void __vx_acc_cres(struct vx_info *vxi,
++	int res, int dir, void *_data, char *_file, int _line)
++{
++	if (VXD_RCRES_COND(res))
++		vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			(dir > 0) ? "++" : "--", _data, _file, _line);
++	if (!vxi)
++		return;
++
++	if (dir > 0)
++		__rlim_inc(&vxi->limit, res);
++	else
++		__rlim_dec(&vxi->limit, res);
++}
++
++static inline void __vx_add_cres(struct vx_info *vxi,
++	int res, int amount, void *_data, char *_file, int _line)
++{
++	if (VXD_RCRES_COND(res))
++		vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			amount, _data, _file, _line);
++	if (amount == 0)
++		return;
++	if (!vxi)
++		return;
++	__rlim_add(&vxi->limit, res, amount);
++}
++
++static inline
++int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
++{
++	int cond = (value > __rlim_rmax(limit, res));
++
++	if (cond)
++		__rlim_rmax(limit, res) = value;
++	return cond;
++}
++
++static inline
++int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
++{
++	int cond = (value < __rlim_rmin(limit, res));
++
++	if (cond)
++		__rlim_rmin(limit, res) = value;
++	return cond;
++}
++
++static inline
++void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
++{
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++}
++
++
++/*	return values:
++	 +1 ... no limit hit
++	 -1 ... over soft limit
++	  0 ... over hard limit		*/
++
++static inline int __vx_cres_avail(struct vx_info *vxi,
++	int res, int num, char *_file, int _line)
++{
++	struct _vx_limit *limit;
++	rlim_t value;
++
++	if (VXD_RLIMIT_COND(res))
++		vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_soft(&vxi->limit, res) : -1),
++			(vxi ? (long)__rlim_hard(&vxi->limit, res) : -1),
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			num, _file, _line);
++	if (!vxi)
++		return 1;
++
++	limit = &vxi->limit;
++	value = __rlim_get(limit, res);
++
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++
++	if (num == 0)
++		return 1;
++
++	if (__rlim_soft(limit, res) == RLIM_INFINITY)
++		return -1;
++	if (value + num <= __rlim_soft(limit, res))
++		return -1;
++
++	if (__rlim_hard(limit, res) == RLIM_INFINITY)
++		return 1;
++	if (value + num <= __rlim_hard(limit, res))
++		return 1;
++
++	__rlim_hit(limit, res);
++	return 0;
++}
++
++
++static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
++
++static inline
++rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
++{
++	rlim_t value, sum = 0;
++	int res;
++
++	while ((res = *array++)) {
++		value = __rlim_get(limit, res);
++		__vx_cres_fixup(limit, res, value);
++		sum += value;
++	}
++	return sum;
++}
++
++static inline
++rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
++{
++	rlim_t value = __vx_cres_array_sum(limit, array + 1);
++	int res = *array;
++
++	if (value == __rlim_get(limit, res))
++		return value;
++
++	__rlim_set(limit, res, value);
++	/* now adjust min/max */
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++
++	return value;
++}
++
++static inline int __vx_cres_array_avail(struct vx_info *vxi,
++	const int *array, int num, char *_file, int _line)
++{
++	struct _vx_limit *limit;
++	rlim_t value = 0;
++	int res;
++
++	if (num == 0)
++		return 1;
++	if (!vxi)
++		return 1;
++
++	limit = &vxi->limit;
++	res = *array;
++	value = __vx_cres_array_sum(limit, array + 1);
++
++	__rlim_set(limit, res, value);
++	__vx_cres_fixup(limit, res, value);
++
++	return __vx_cres_avail(vxi, res, num, _file, _line);
++}
++
++
++static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
++{
++	rlim_t value;
++	int res;
++
++	/* complex resources first */
++	if ((id < 0) || (id == RLIMIT_RSS))
++		__vx_cres_array_fixup(limit, VLA_RSS);
++
++	for (res = 0; res < NUM_LIMITS; res++) {
++		if ((id > 0) && (res != id))
++			continue;
++
++		value = __rlim_get(limit, res);
++		__vx_cres_fixup(limit, res, value);
++
++		/* not supposed to happen, maybe warn? */
++		if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
++			__rlim_rmax(limit, res) = __rlim_hard(limit, res);
++	}
++}
++
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_LIMIT_INT_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/monitor.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/monitor.h
+--- linux-3.4.45/include/linux/vserver/monitor.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/monitor.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,96 @@
++#ifndef _VX_MONITOR_H
++#define _VX_MONITOR_H
++
++#include <linux/types.h>
++
++enum {
++	VXM_UNUSED = 0,
++
++	VXM_SYNC = 0x10,
++
++	VXM_UPDATE = 0x20,
++	VXM_UPDATE_1,
++	VXM_UPDATE_2,
++
++	VXM_RQINFO_1 = 0x24,
++	VXM_RQINFO_2,
++
++	VXM_ACTIVATE = 0x40,
++	VXM_DEACTIVATE,
++	VXM_IDLE,
++
++	VXM_HOLD = 0x44,
++	VXM_UNHOLD,
++
++	VXM_MIGRATE = 0x48,
++	VXM_RESCHED,
++
++	/* all other bits are flags */
++	VXM_SCHED = 0x80,
++};
++
++struct _vxm_update_1 {
++	uint32_t tokens_max;
++	uint32_t fill_rate;
++	uint32_t interval;
++};
++
++struct _vxm_update_2 {
++	uint32_t tokens_min;
++	uint32_t fill_rate;
++	uint32_t interval;
++};
++
++struct _vxm_rqinfo_1 {
++	uint16_t running;
++	uint16_t onhold;
++	uint16_t iowait;
++	uint16_t uintr;
++	uint32_t idle_tokens;
++};
++
++struct _vxm_rqinfo_2 {
++	uint32_t norm_time;
++	uint32_t idle_time;
++	uint32_t idle_skip;
++};
++
++struct _vxm_sched {
++	uint32_t tokens;
++	uint32_t norm_time;
++	uint32_t idle_time;
++};
++
++struct _vxm_task {
++	uint16_t pid;
++	uint16_t state;
++};
++
++struct _vxm_event {
++	uint32_t jif;
++	union {
++		uint32_t seq;
++		uint32_t sec;
++	};
++	union {
++		uint32_t tokens;
++		uint32_t nsec;
++		struct _vxm_task tsk;
++	};
++};
++
++struct _vx_mon_entry {
++	uint16_t type;
++	uint16_t xid;
++	union {
++		struct _vxm_event ev;
++		struct _vxm_sched sd;
++		struct _vxm_update_1 u1;
++		struct _vxm_update_2 u2;
++		struct _vxm_rqinfo_1 q1;
++		struct _vxm_rqinfo_2 q2;
++	};
++};
++
++
++#endif /* _VX_MONITOR_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/network.h
+--- linux-3.4.45/include/linux/vserver/network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/network.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,148 @@
++#ifndef _VX_NETWORK_H
++#define _VX_NETWORK_H
++
++#include <linux/types.h>
++
++
++#define MAX_N_CONTEXT	65535	/* Arbitrary limit */
++
++
++/* network flags */
++
++#define NXF_INFO_PRIVATE	0x00000008
++
++#define NXF_SINGLE_IP		0x00000100
++#define NXF_LBACK_REMAP		0x00000200
++#define NXF_LBACK_ALLOW		0x00000400
++
++#define NXF_HIDE_NETIF		0x02000000
++#define NXF_HIDE_LBACK		0x04000000
++
++#define NXF_STATE_SETUP		(1ULL << 32)
++#define NXF_STATE_ADMIN		(1ULL << 34)
++
++#define NXF_SC_HELPER		(1ULL << 36)
++#define NXF_PERSISTENT		(1ULL << 38)
++
++#define NXF_ONE_TIME		(0x0005ULL << 32)
++
++
++#define	NXF_INIT_SET		(__nxf_init_set())
++
++static inline uint64_t __nxf_init_set(void) {
++	return	  NXF_STATE_ADMIN
++#ifdef	CONFIG_VSERVER_AUTO_LBACK
++		| NXF_LBACK_REMAP
++		| NXF_HIDE_LBACK
++#endif
++#ifdef	CONFIG_VSERVER_AUTO_SINGLE
++		| NXF_SINGLE_IP
++#endif
++		| NXF_HIDE_NETIF;
++}
++
++
++/* network caps */
++
++#define NXC_TUN_CREATE		0x00000001
++
++#define NXC_RAW_ICMP		0x00000100
++
++#define NXC_MULTICAST		0x00001000
++
++
++/* address types */
++
++#define NXA_TYPE_IPV4		0x0001
++#define NXA_TYPE_IPV6		0x0002
++
++#define NXA_TYPE_NONE		0x0000
++#define NXA_TYPE_ANY		0x00FF
++
++#define NXA_TYPE_ADDR		0x0010
++#define NXA_TYPE_MASK		0x0020
++#define NXA_TYPE_RANGE		0x0040
++
++#define NXA_MASK_ALL		(NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
++
++#define NXA_MOD_BCAST		0x0100
++#define NXA_MOD_LBACK		0x0200
++
++#define NXA_LOOPBACK		0x1000
++
++#define NXA_MASK_BIND		(NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
++#define NXA_MASK_SHOW		(NXA_MASK_ALL | NXA_LOOPBACK)
++
++#ifdef	__KERNEL__
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
++
++struct nx_addr_v4 {
++	struct nx_addr_v4 *next;
++	struct in_addr ip[2];
++	struct in_addr mask;
++	uint16_t type;
++	uint16_t flags;
++};
++
++struct nx_addr_v6 {
++	struct nx_addr_v6 *next;
++	struct in6_addr ip;
++	struct in6_addr mask;
++	uint32_t prefix;
++	uint16_t type;
++	uint16_t flags;
++};
++
++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 */
++
++	struct in_addr v4_lback;	/* Loopback address */
++	struct in_addr v4_bcast;	/* Broadcast address */
++	struct nx_addr_v4 v4;		/* First/Single ipv4 address */
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 v6;		/* First/Single ipv6 address */
++#endif
++	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 *lookup_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 sock;
++
++
++#define NX_IPV4(n)	((n)->v4.type != NXA_TYPE_NONE)
++#ifdef  CONFIG_IPV6
++#define NX_IPV6(n)	((n)->v6.type != NXA_TYPE_NONE)
++#else
++#define NX_IPV6(n)	(0)
++#endif
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_NETWORK_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/network_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/network_cmd.h
+--- linux-3.4.45/include/linux/vserver/network_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/network_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,164 @@
++#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);
++
++#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(struct nx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++#include <linux/in.h>
++#include <linux/in6.h>
++
++#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;
++	struct in_addr ip[4];
++	struct in_addr mask[4];
++};
++
++#define VCMD_net_add_ipv4_v1	VC_CMD(NETALT, 1, 1)
++#define VCMD_net_rem_ipv4_v1	VC_CMD(NETALT, 2, 1)
++
++struct	vcmd_net_addr_ipv4_v1 {
++	uint16_t type;
++	uint16_t flags;
++	struct in_addr ip;
++	struct in_addr mask;
++};
++
++#define VCMD_net_add_ipv4	VC_CMD(NETALT, 1, 2)
++#define VCMD_net_rem_ipv4	VC_CMD(NETALT, 2, 2)
++
++struct	vcmd_net_addr_ipv4_v2 {
++	uint16_t type;
++	uint16_t flags;
++	struct in_addr ip;
++	struct in_addr ip2;
++	struct in_addr mask;
++};
++
++#define VCMD_net_add_ipv6	VC_CMD(NETALT, 3, 1)
++#define VCMD_net_remove_ipv6	VC_CMD(NETALT, 4, 1)
++
++struct	vcmd_net_addr_ipv6_v1 {
++	uint16_t type;
++	uint16_t flags;
++	uint32_t prefix;
++	struct in6_addr ip;
++	struct in6_addr mask;
++};
++
++#define VCMD_add_match_ipv4	VC_CMD(NETALT, 5, 0)
++#define VCMD_get_match_ipv4	VC_CMD(NETALT, 6, 0)
++
++struct	vcmd_match_ipv4_v0 {
++	uint16_t type;
++	uint16_t flags;
++	uint16_t parent;
++	uint16_t prefix;
++	struct in_addr ip;
++	struct in_addr ip2;
++	struct in_addr mask;
++};
++
++#define VCMD_add_match_ipv6	VC_CMD(NETALT, 7, 0)
++#define VCMD_get_match_ipv6	VC_CMD(NETALT, 8, 0)
++
++struct	vcmd_match_ipv6_v0 {
++	uint16_t type;
++	uint16_t flags;
++	uint16_t parent;
++	uint16_t prefix;
++	struct in6_addr ip;
++	struct in6_addr ip2;
++	struct in6_addr mask;
++};
++
++
++#ifdef	__KERNEL__
++extern int vc_net_create(uint32_t, void __user *);
++extern int vc_net_migrate(struct nx_info *, void __user *);
++
++extern int vc_net_add(struct nx_info *, void __user *);
++extern int vc_net_remove(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_add_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_rem_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv6(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv4(struct nx_info *, void __user *);
++extern int vc_get_match_ipv4(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv6(struct nx_info *, void __user *);
++extern int vc_get_match_ipv6(struct nx_info *, 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(struct nx_info *, void __user *);
++extern int vc_set_nflags(struct nx_info *, 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(struct nx_info *, void __user *);
++extern int vc_set_ncaps(struct nx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/percpu.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/percpu.h
+--- linux-3.4.45/include/linux/vserver/percpu.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/percpu.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VX_PERCPU_H
++#define _VX_PERCPU_H
++
++#include "cvirt_def.h"
++#include "sched_def.h"
++
++struct	_vx_percpu {
++	struct _vx_cvirt_pc cvirt;
++	struct _vx_sched_pc sched;
++};
++
++#define	PERCPU_PERCTX	(sizeof(struct _vx_percpu))
++
++#endif	/* _VX_PERCPU_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/pid.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/pid.h
+--- linux-3.4.45/include/linux/vserver/pid.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/pid.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,51 @@
++#ifndef _VSERVER_PID_H
++#define _VSERVER_PID_H
++
++/* 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;
++}
++
++#endif
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched.h
+--- linux-3.4.45/include/linux/vserver/sched.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,23 @@
++#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 *);
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++	struct _vx_sched_pc *sched_pc);
++
++#endif	/* __KERNEL__ */
++#else	/* _VX_SCHED_H */
++#warning duplicate inclusion
++#endif	/* _VX_SCHED_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_cmd.h
+--- linux-3.4.45/include/linux/vserver/sched_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,21 @@
++#ifndef _VX_SCHED_CMD_H
++#define _VX_SCHED_CMD_H
++
++
++struct	vcmd_prio_bias {
++	int32_t cpu_id;
++	int32_t prio_bias;
++};
++
++#define VCMD_set_prio_bias	VC_CMD(SCHED, 4, 0)
++#define VCMD_get_prio_bias	VC_CMD(SCHED, 5, 0)
++
++#ifdef	__KERNEL__
++
++#include <linux/compiler.h>
++
++extern int vc_set_prio_bias(struct vx_info *, void __user *);
++extern int vc_get_prio_bias(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_SCHED_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/sched_def.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_def.h
+--- linux-3.4.45/include/linux/vserver/sched_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/sched_def.h	2012-05-21 16:15:05.000000000 +0000
+@@ -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>
++
++
++/* context sub struct */
++
++struct _vx_sched {
++	int prio_bias;			/* bias offset for priority */
++
++	cpumask_t update;		/* CPUs which should update */
++};
++
++struct _vx_sched_pc {
++	int prio_bias;			/* bias offset for priority */
++
++	uint64_t user_ticks;		/* token tick events */
++	uint64_t sys_ticks;		/* token tick events */
++	uint64_t hold_ticks;		/* token ticks paused */
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_sched(struct _vx_sched *sched)
++{
++	printk("\t_vx_sched:\n");
++	printk("\t priority = %4d\n", sched->prio_bias);
++}
++
++#endif
++
++#endif	/* _VX_SCHED_DEF_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal.h
+--- linux-3.4.45/include/linux/vserver/signal.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VX_SIGNAL_H
++#define _VX_SIGNAL_H
++
++
++#ifdef	__KERNEL__
++
++struct vx_info;
++
++int vx_info_kill(struct vx_info *, int, int);
++
++#endif	/* __KERNEL__ */
++#else	/* _VX_SIGNAL_H */
++#warning duplicate inclusion
++#endif	/* _VX_SIGNAL_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/signal_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal_cmd.h
+--- linux-3.4.45/include/linux/vserver/signal_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/signal_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,43 @@
++#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 reboot_cmd;
++	int32_t exit_code;
++};
++
++#ifdef	__KERNEL__
++
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
++
++#endif	/* __KERNEL__ */
++
++/*  process alteration commands */
++
++#define VCMD_get_pflags		VC_CMD(PROCALT, 5, 0)
++#define VCMD_set_pflags		VC_CMD(PROCALT, 6, 0)
++
++struct	vcmd_pflags_v0 {
++	uint32_t flagword;
++	uint32_t mask;
++};
++
++#ifdef	__KERNEL__
++
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/space.h
+--- linux-3.4.45/include/linux/vserver/space.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/space.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,12 @@
++#ifndef _VX_SPACE_H
++#define _VX_SPACE_H
++
++#include <linux/types.h>
++
++struct vx_info;
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
++
++#else	/* _VX_SPACE_H */
++#warning duplicate inclusion
++#endif	/* _VX_SPACE_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/space_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/space_cmd.h
+--- linux-3.4.45/include/linux/vserver/space_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/space_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,38 @@
++#ifndef _VX_SPACE_CMD_H
++#define _VX_SPACE_CMD_H
++
++
++#define VCMD_enter_space_v0	VC_CMD(PROCALT, 1, 0)
++#define VCMD_enter_space_v1	VC_CMD(PROCALT, 1, 1)
++#define VCMD_enter_space	VC_CMD(PROCALT, 1, 2)
++
++#define VCMD_set_space_v0	VC_CMD(PROCALT, 3, 0)
++#define VCMD_set_space_v1	VC_CMD(PROCALT, 3, 1)
++#define VCMD_set_space		VC_CMD(PROCALT, 3, 2)
++
++#define VCMD_get_space_mask_v0	VC_CMD(PROCALT, 4, 0)
++
++#define VCMD_get_space_mask	VC_CMD(VSPACE, 0, 1)
++#define VCMD_get_space_default	VC_CMD(VSPACE, 1, 0)
++
++
++struct	vcmd_space_mask_v1 {
++	uint64_t mask;
++};
++
++struct	vcmd_space_mask_v2 {
++	uint64_t mask;
++	uint32_t index;
++};
++
++
++#ifdef	__KERNEL__
++
++extern int vc_enter_space_v1(struct vx_info *, void __user *);
++extern int vc_set_space_v1(struct vx_info *, void __user *);
++extern int vc_enter_space(struct vx_info *, void __user *);
++extern int vc_set_space(struct vx_info *, void __user *);
++extern int vc_get_space_mask(void __user *, int);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_SPACE_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/switch.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/switch.h
+--- linux-3.4.45/include/linux/vserver/switch.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/switch.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,98 @@
++#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  |       |       |       | |DEVICE |       |
++  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 |       |       |       |       |MEMCTRL|       | |SWAP   |       |
++	 |     16|     17|     18|     19|     20|     21| |     22|     23|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  NETWORK|       |VNET   |NETALT |NETMIG |NETCTL |       | |SERIAL |       |
++	 |     24|     25|     26|     27|     28|     29| |     30|     31|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  DISK   |       |       |       |TAGMIG |DLIMIT |       | |INODE  |       |
++  VFS    |     32|     33|     34|     35|     36|     37| |     38|     39|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  OTHER  |VSTAT  |       |       |       |       |       | |VINFO  |       |
++	 |     40|     41|     42|     43|     44|     45| |     46|     47|
++  =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
++  SPECIAL|EVENT  |       |       |       |FLAGS  |       | |VSPACE |       |
++	 |     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_DEVICE		6
++
++#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_MEMCTRL		20
++
++#define VC_CAT_VNET		25
++#define VC_CAT_NETALT		26
++#define VC_CAT_NETMIG		27
++#define VC_CAT_NETCTRL		28
++
++#define VC_CAT_TAGMIG		35
++#define VC_CAT_DLIMIT		36
++#define VC_CAT_INODE		38
++
++#define VC_CAT_VSTAT		40
++#define VC_CAT_VINFO		46
++#define VC_CAT_EVENT		48
++
++#define VC_CAT_FLAGS		52
++#define VC_CAT_VSPACE		54
++#define VC_CAT_DEBUG		56
++#define VC_CAT_RLIMIT		60
++
++#define VC_CAT_SYSTEST		61
++#define VC_CAT_COMPAT		63
++
++/*  query version */
++
++#define VCMD_get_version	VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci		VC_CMD(VERSION, 1, 0)
++
++
++#ifdef	__KERNEL__
++
++#include <linux/errno.h>
++
++#endif	/* __KERNEL__ */
++
++#endif	/* _VX_SWITCH_H */
++
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag.h
+--- linux-3.4.45/include/linux/vserver/tag.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,143 @@
++#ifndef _DX_TAG_H
++#define _DX_TAG_H
++
++#include <linux/types.h>
++
++
++#define DX_TAG(in)	(IS_TAGGED(in))
++
++
++#ifdef CONFIG_TAG_NFSD
++#define DX_TAG_NFSD	1
++#else
++#define DX_TAG_NFSD	0
++#endif
++
++
++#ifdef CONFIG_TAGGING_NONE
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	(0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_GID16
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0x0000FFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	\
++	((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_ID24
++
++#define MAX_UID		0x00FFFFFF
++#define MAX_GID		0x00FFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	\
++	((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag)	\
++	((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_UID16
++
++#define MAX_UID		0x0000FFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	\
++	((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_INTERN
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (tag) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb)	\
++	((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
++#else
++#define dx_current_fstag(sb)	(0)
++#endif
++
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag)	(0)
++#else
++#define TAGINO_TAG(cond, tag)	((cond) ? (tag) : 0)
++#endif
++
++#define INOTAG_UID(cond, uid, gid)	\
++	((cond) ? ((uid) & MAX_UID) : (uid))
++#define INOTAG_GID(cond, uid, gid)	\
++	((cond) ? ((gid) & MAX_GID) : (gid))
++
++
++static inline uid_t dx_map_uid(uid_t uid)
++{
++	if ((uid > MAX_UID) && (uid != -1))
++		uid = -2;
++	return (uid & MAX_UID);
++}
++
++static inline gid_t dx_map_gid(gid_t gid)
++{
++	if ((gid > MAX_GID) && (gid != -1))
++		gid = -2;
++	return (gid & MAX_GID);
++}
++
++struct peer_tag {
++	int32_t xid;
++	int32_t nid;
++};
++
++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
++
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++		 unsigned long *flags);
++
++#ifdef	CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++
++#define dx_propagate_tag(n, i)	__dx_propagate_tag(n, i)
++
++#else
++#define dx_propagate_tag(n, i)	do { } while (0)
++#endif
++
++#endif /* _DX_TAG_H */
+diff -NurpP --minimal linux-3.4.45/include/linux/vserver/tag_cmd.h linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag_cmd.h
+--- linux-3.4.45/include/linux/vserver/tag_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/linux/vserver/tag_cmd.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,22 @@
++#ifndef _VX_TAG_CMD_H
++#define _VX_TAG_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_tag		VC_CMD(VINFO, 3, 0)
++
++#ifdef	__KERNEL__
++extern int vc_task_tag(uint32_t);
++
++#endif	/* __KERNEL__ */
++
++/* context commands */
++
++#define VCMD_tag_migrate	VC_CMD(TAGMIG, 1, 0)
++
++#ifdef	__KERNEL__
++extern int vc_tag_migrate(uint32_t);
++
++#endif	/* __KERNEL__ */
++#endif	/* _VX_TAG_CMD_H */
+diff -NurpP --minimal linux-3.4.45/include/net/addrconf.h linux-3.4.45-vs2.3.3.9/include/net/addrconf.h
+--- linux-3.4.45/include/net/addrconf.h	2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/addrconf.h	2012-05-21 16:15:05.000000000 +0000
+@@ -80,7 +80,8 @@ extern int			ipv6_dev_get_saddr(struct n
+ 					       struct net_device *dev,
+ 					       const struct in6_addr *daddr,
+ 					       unsigned int srcprefs,
+-					       struct in6_addr *saddr);
++					       struct in6_addr *saddr,
++					       struct nx_info *nxi);
+ extern int			ipv6_get_lladdr(struct net_device *dev,
+ 						struct in6_addr *addr,
+ 						unsigned char banned_flags);
+diff -NurpP --minimal linux-3.4.45/include/net/af_unix.h linux-3.4.45-vs2.3.3.9/include/net/af_unix.h
+--- linux-3.4.45/include/net/af_unix.h	2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/af_unix.h	2012-05-21 16:15:05.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/socket.h>
+ #include <linux/un.h>
+ #include <linux/mutex.h>
++#include <linux/vs_base.h>
+ #include <net/sock.h>
+ 
+ extern void unix_inflight(struct file *fp);
+diff -NurpP --minimal linux-3.4.45/include/net/inet_timewait_sock.h linux-3.4.45-vs2.3.3.9/include/net/inet_timewait_sock.h
+--- linux-3.4.45/include/net/inet_timewait_sock.h	2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/inet_timewait_sock.h	2012-05-21 16:15:05.000000000 +0000
+@@ -112,6 +112,10 @@ struct inet_timewait_sock {
+ #define tw_net			__tw_common.skc_net
+ #define tw_daddr        	__tw_common.skc_daddr
+ #define tw_rcv_saddr    	__tw_common.skc_rcv_saddr
++#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
+ 	int			tw_timeout;
+ 	volatile unsigned char	tw_substate;
+ 	unsigned char		tw_rcv_wscale;
+diff -NurpP --minimal linux-3.4.45/include/net/ip6_route.h linux-3.4.45-vs2.3.3.9/include/net/ip6_route.h
+--- linux-3.4.45/include/net/ip6_route.h	2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/ip6_route.h	2012-05-21 16:15:05.000000000 +0000
+@@ -88,7 +88,8 @@ extern int			ip6_route_get_saddr(struct
+ 						    struct rt6_info *rt,
+ 						    const struct in6_addr *daddr,
+ 						    unsigned int prefs,
+-						    struct in6_addr *saddr);
++						    struct in6_addr *saddr,
++						    struct nx_info *nxi);
+ 
+ extern struct rt6_info		*rt6_lookup(struct net *net,
+ 					    const struct in6_addr *daddr,
+diff -NurpP --minimal linux-3.4.45/include/net/route.h linux-3.4.45-vs2.3.3.9/include/net/route.h
+--- linux-3.4.45/include/net/route.h	2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/route.h	2012-05-21 16:15:05.000000000 +0000
+@@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
+ 		dst_release(&rt->dst);
+ }
+ 
++#include <linux/vs_base.h>
++#include <linux/vs_inet.h>
++
+ #define IPTOS_RT_MASK	(IPTOS_TOS_MASK & ~3)
+ 
+ extern const __u8 ip_tos2prio[16];
+@@ -253,6 +256,9 @@ static inline void ip_route_connect_init
+ 			   protocol, flow_flags, dst, src, dport, sport);
+ }
+ 
++extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
++	struct flowi4 *);
++
+ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
+ 					      __be32 dst, __be32 src, u32 tos,
+ 					      int oif, u8 protocol,
+@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co
+ {
+ 	struct net *net = sock_net(sk);
+ 	struct rtable *rt;
++	struct nx_info *nx_info = current_nx_info();
+ 
+ 	ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
+ 			      sport, dport, sk, can_sleep);
+ 
+-	if (!dst || !src) {
++	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));
++
++	rt = ip_v4_find_src(net, nx_info, fl4);
++	if (IS_ERR(rt))
++		return rt;
++	ip_rt_put(rt);
++
++	if (!fl4->daddr || !fl4->saddr) {
+ 		rt = __ip_route_output_key(net, fl4);
+ 		if (IS_ERR(rt))
+ 			return rt;
+diff -NurpP --minimal linux-3.4.45/include/net/sock.h linux-3.4.45-vs2.3.3.9/include/net/sock.h
+--- linux-3.4.45/include/net/sock.h	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/include/net/sock.h	2013-03-02 15:26:44.000000000 +0000
+@@ -170,6 +170,10 @@ struct sock_common {
+ #ifdef CONFIG_NET_NS
+ 	struct net	 	*skc_net;
+ #endif
++	xid_t			skc_xid;
++	struct vx_info		*skc_vx_info;
++	nid_t			skc_nid;
++	struct nx_info		*skc_nx_info;
+ 	/*
+ 	 * fields between dontcopy_begin/dontcopy_end
+ 	 * are not copied in sock_copy()
+@@ -282,6 +286,10 @@ struct sock {
+ #define sk_bind_node		__sk_common.skc_bind_node
+ #define sk_prot			__sk_common.skc_prot
+ #define sk_net			__sk_common.skc_net
++#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
+ 	socket_lock_t		sk_lock;
+ 	struct sk_buff_head	sk_receive_queue;
+ 	/*
+diff -NurpP --minimal linux-3.4.45/init/Kconfig linux-3.4.45-vs2.3.3.9/init/Kconfig
+--- linux-3.4.45/init/Kconfig	2012-05-21 16:07:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/init/Kconfig	2012-05-21 16:15:05.000000000 +0000
+@@ -579,6 +579,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
+ menuconfig CGROUPS
+ 	boolean "Control Group support"
+ 	depends on EVENTFD
++	default y
+ 	help
+ 	  This option adds support for grouping sets of processes together, for
+ 	  use with process control subsystems such as Cpusets, CFS, memory
+@@ -828,6 +829,7 @@ config IPC_NS
+ config USER_NS
+ 	bool "User namespace (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL
++	depends on VSERVER_DISABLED
+ 	default y
+ 	help
+ 	  This allows containers, i.e. vservers, to use user namespaces
+diff -NurpP --minimal linux-3.4.45/init/main.c linux-3.4.45-vs2.3.3.9/init/main.c
+--- linux-3.4.45/init/main.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/init/main.c	2013-02-19 14:42:56.000000000 +0000
+@@ -68,6 +68,7 @@
+ #include <linux/shmem_fs.h>
+ #include <linux/slab.h>
+ #include <linux/perf_event.h>
++#include <linux/vserver/percpu.h>
+ 
+ #include <asm/io.h>
+ #include <asm/bugs.h>
+diff -NurpP --minimal linux-3.4.45/ipc/mqueue.c linux-3.4.45-vs2.3.3.9/ipc/mqueue.c
+--- linux-3.4.45/ipc/mqueue.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/mqueue.c	2012-05-21 16:15:05.000000000 +0000
+@@ -34,6 +34,8 @@
+ #include <linux/ipc_namespace.h>
+ #include <linux/user_namespace.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ #include <net/sock.h>
+ #include "util.h"
+@@ -67,6 +69,7 @@ struct mqueue_inode_info {
+ 	struct sigevent notify;
+ 	struct pid* notify_owner;
+ 	struct user_struct *user;	/* user who created, for accounting */
++	struct vx_info *vxi;
+ 	struct sock *notify_sock;
+ 	struct sk_buff *notify_cookie;
+ 
+@@ -129,6 +132,7 @@ static struct inode *mqueue_get_inode(st
+ 	if (S_ISREG(mode)) {
+ 		struct mqueue_inode_info *info;
+ 		unsigned long mq_bytes, mq_msg_tblsz;
++		struct vx_info *vxi = current_vx_info();
+ 
+ 		inode->i_fop = &mqueue_file_operations;
+ 		inode->i_size = FILENT_SIZE;
+@@ -141,6 +145,7 @@ static struct inode *mqueue_get_inode(st
+ 		info->notify_owner = NULL;
+ 		info->qsize = 0;
+ 		info->user = NULL;	/* set when all is ok */
++		info->vxi = NULL;
+ 		memset(&info->attr, 0, sizeof(info->attr));
+ 		info->attr.mq_maxmsg = ipc_ns->mq_msg_max;
+ 		info->attr.mq_msgsize = ipc_ns->mq_msgsize_max;
+@@ -158,17 +163,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 > rlimit(RLIMIT_MSGQUEUE)) {
++		    u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) ||
++		    !vx_ipcmsg_avail(vxi, mq_bytes)) {
+ 			spin_unlock(&mq_lock);
+ 			/* mqueue_evict_inode() releases info->messages */
+ 			ret = -EMFILE;
+ 			goto out_inode;
+ 		}
+ 		u->mq_bytes += mq_bytes;
++		vx_ipcmsg_add(vxi, u, mq_bytes);
+ 		spin_unlock(&mq_lock);
+ 
+ 		/* all is ok */
+ 		info->user = get_uid(u);
++		info->vxi = get_vx_info(vxi);
+ 	} else if (S_ISDIR(mode)) {
+ 		inc_nlink(inode);
+ 		/* Some things misbehave if size == 0 on a directory */
+@@ -267,8 +275,11 @@ static void mqueue_evict_inode(struct in
+ 	    + info->attr.mq_msgsize);
+ 	user = info->user;
+ 	if (user) {
++		struct vx_info *vxi = info->vxi;
++
+ 		spin_lock(&mq_lock);
+ 		user->mq_bytes -= mq_bytes;
++		vx_ipcmsg_sub(vxi, user, mq_bytes);
+ 		/*
+ 		 * get_ns_from_inode() ensures that the
+ 		 * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
+@@ -278,6 +289,7 @@ static void mqueue_evict_inode(struct in
+ 		if (ipc_ns)
+ 			ipc_ns->mq_queues_count--;
+ 		spin_unlock(&mq_lock);
++		put_vx_info(vxi);
+ 		free_uid(user);
+ 	}
+ 	if (ipc_ns)
+diff -NurpP --minimal linux-3.4.45/ipc/msg.c linux-3.4.45-vs2.3.3.9/ipc/msg.c
+--- linux-3.4.45/ipc/msg.c	2011-05-22 14:17:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/msg.c	2012-05-21 16:15:05.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace *
+ 
+ 	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);
+diff -NurpP --minimal linux-3.4.45/ipc/namespace.c linux-3.4.45-vs2.3.3.9/ipc/namespace.c
+--- linux-3.4.45/ipc/namespace.c	2011-07-22 09:18:12.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/namespace.c	2012-05-21 16:15:05.000000000 +0000
+@@ -13,11 +13,12 @@
+ #include <linux/mount.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_fs.h>
++#include <linux/vs_base.h>
++#include <linux/vserver/global.h>
+ 
+ #include "util.h"
+ 
+-static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
+-					   struct ipc_namespace *old_ns)
++static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns)
+ {
+ 	struct ipc_namespace *ns;
+ 	int err;
+@@ -46,19 +47,18 @@ static struct ipc_namespace *create_ipc_
+ 	ipcns_notify(IPCNS_CREATED);
+ 	register_ipcns_notifier(ns);
+ 
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
++	ns->user_ns = get_user_ns(user_ns);
+ 
+ 	return ns;
+ }
+ 
+ struct ipc_namespace *copy_ipcs(unsigned long flags,
+-				struct task_struct *tsk)
++				struct ipc_namespace *old_ns,
++				struct user_namespace *user_ns)
+ {
+-	struct ipc_namespace *ns = tsk->nsproxy->ipc_ns;
+-
+ 	if (!(flags & CLONE_NEWIPC))
+-		return get_ipc_ns(ns);
+-	return create_ipc_ns(tsk, ns);
++		return get_ipc_ns(old_ns);
++	return create_ipc_ns(user_ns);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.4.45/ipc/sem.c linux-3.4.45-vs2.3.3.9/ipc/sem.c
+--- linux-3.4.45/ipc/sem.c	2012-01-09 15:14:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/sem.c	2012-05-21 16:15:05.000000000 +0000
+@@ -86,6 +86,8 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ #include "util.h"
+@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace *
+ 
+ 	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);
+@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace *
+ 		return id;
+ 	}
+ 	ns->used_sems += nsems;
++	/* FIXME: obsoleted? */
++	vx_semary_inc(sma);
++	vx_nsems_add(sma, nsems);
+ 
+ 	sma->sem_base = (struct sem *) &sma[1];
+ 
+@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace
+ 
+ 	wake_up_sem_queue_do(&tasks);
+ 	ns->used_sems -= sma->sem_nsems;
++	/* FIXME: obsoleted? */
++	vx_nsems_sub(sma, sma->sem_nsems);
++	vx_semary_dec(sma);
+ 	security_sem_free(sma);
+ 	ipc_rcu_putref(sma);
+ }
+diff -NurpP --minimal linux-3.4.45/ipc/shm.c linux-3.4.45-vs2.3.3.9/ipc/shm.c
+--- linux-3.4.45/ipc/shm.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/ipc/shm.c	2013-05-13 18:16:08.000000000 +0000
+@@ -39,6 +39,8 @@
+ #include <linux/nsproxy.h>
+ #include <linux/mount.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru
+  */
+ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
+ {
+-	ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++	struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
++	int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++
++	vx_ipcshm_sub(vxi, shp, numpages);
++	ns->shm_tot -= numpages;
++
+ 	shm_rmid(ns, shp);
+ 	shm_unlock(shp);
+ 	if (!is_file_hugepages(shp->shm_file))
+@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names
+ 						shp->mlock_user);
+ 	fput (shp->shm_file);
+ 	security_shm_free(shp);
++	put_vx_info(vxi);
+ 	ipc_rcu_putref(shp);
+ }
+ 
+@@ -462,11 +470,15 @@ static int newseg(struct ipc_namespace *
+ 	if (ns->shm_tot + numpages > ns->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_perm.mode = (shmflg & S_IRWXUGO);
+ 	shp->mlock_user = NULL;
+ 
+@@ -521,6 +533,7 @@ static int newseg(struct ipc_namespace *
+ 	ns->shm_tot += numpages;
+ 	error = shp->shm_perm.id;
+ 	shm_unlock(shp);
++	vx_ipcshm_add(current_vx_info(), key, numpages);
+ 	return error;
+ 
+ no_id:
+diff -NurpP --minimal linux-3.4.45/kernel/Makefile linux-3.4.45-vs2.3.3.9/kernel/Makefile
+--- linux-3.4.45/kernel/Makefile	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/Makefile	2012-05-21 16:15:05.000000000 +0000
+@@ -25,6 +25,7 @@ endif
+ obj-y += sched/
+ obj-y += power/
+ 
++obj-y += vserver/
+ obj-$(CONFIG_FREEZER) += freezer.o
+ obj-$(CONFIG_PROFILING) += profile.o
+ obj-$(CONFIG_STACKTRACE) += stacktrace.o
+diff -NurpP --minimal linux-3.4.45/kernel/auditsc.c linux-3.4.45-vs2.3.3.9/kernel/auditsc.c
+--- linux-3.4.45/kernel/auditsc.c	2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/auditsc.c	2012-05-21 16:15:05.000000000 +0000
+@@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid)
+ 	if (task->loginuid != -1)
+ 		return -EPERM;
+ #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+-	if (!capable(CAP_AUDIT_CONTROL))
++	if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
+ 		return -EPERM;
+ #endif  /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+ 
+diff -NurpP --minimal linux-3.4.45/kernel/capability.c linux-3.4.45-vs2.3.3.9/kernel/capability.c
+--- linux-3.4.45/kernel/capability.c	2012-03-19 18:47:29.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/capability.c	2012-05-21 16:15:05.000000000 +0000
+@@ -15,6 +15,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_context.h>
+ #include <asm/uaccess.h>
+ 
+ /*
+@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h
+ 	return 0;
+ }
+ 
++
+ /*
+  * The only thing that can change the capabilities of the current
+  * process is the current process. As such, we can't be in this code
+@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta
+ 	return (ret == 0);
+ }
+ 
++#include <linux/vserver/base.h>
++
+ /**
+  * has_capability_noaudit - Does a task have a capability (unaudited) in the
+  * initial user ns
+diff -NurpP --minimal linux-3.4.45/kernel/compat.c linux-3.4.45-vs2.3.3.9/kernel/compat.c
+--- linux-3.4.45/kernel/compat.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/compat.c	2012-05-21 16:15:05.000000000 +0000
+@@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_
+ 	if (err)
+ 		return err;
+ 
+-	do_settimeofday(&tv);
++	vx_settimeofday(&tv);
+ 	return 0;
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/kernel/cred.c linux-3.4.45-vs2.3.3.9/kernel/cred.c
+--- linux-3.4.45/kernel/cred.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/cred.c	2012-05-21 16:15:05.000000000 +0000
+@@ -62,31 +62,6 @@ struct cred init_cred = {
+ #endif
+ };
+ 
+-static inline void set_cred_subscribers(struct cred *cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	atomic_set(&cred->subscribers, n);
+-#endif
+-}
+-
+-static inline int read_cred_subscribers(const struct cred *cred)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	return atomic_read(&cred->subscribers);
+-#else
+-	return 0;
+-#endif
+-}
+-
+-static inline void alter_cred_subscribers(const struct cred *_cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	struct cred *cred = (struct cred *) _cred;
+-
+-	atomic_add(n, &cred->subscribers);
+-#endif
+-}
+-
+ /*
+  * Dispose of the shared task group credentials
+  */
+@@ -282,21 +257,16 @@ error:
+  *
+  * Call commit_creds() or abort_creds() to clean up.
+  */
+-struct cred *prepare_creds(void)
++struct cred *__prepare_creds(const struct cred *old)
+ {
+-	struct task_struct *task = current;
+-	const struct cred *old;
+ 	struct cred *new;
+ 
+-	validate_process_creds();
+-
+ 	new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
+ 	if (!new)
+ 		return NULL;
+ 
+ 	kdebug("prepare_creds() alloc %p", new);
+ 
+-	old = task->cred;
+ 	memcpy(new, old, sizeof(struct cred));
+ 
+ 	atomic_set(&new->usage, 1);
+@@ -323,6 +293,13 @@ error:
+ 	abort_creds(new);
+ 	return NULL;
+ }
++
++struct cred *prepare_creds(void)
++{
++	validate_process_creds();
++
++	return __prepare_creds(current->cred);
++}
+ EXPORT_SYMBOL(prepare_creds);
+ 
+ /*
+diff -NurpP --minimal linux-3.4.45/kernel/exit.c linux-3.4.45-vs2.3.3.9/kernel/exit.c
+--- linux-3.4.45/kernel/exit.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/exit.c	2012-12-08 00:54:06.000000000 +0000
+@@ -48,6 +48,10 @@
+ #include <linux/fs_struct.h>
+ #include <linux/init_task.h>
+ #include <linux/perf_event.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/oom.h>
+@@ -482,9 +486,11 @@ static void close_files(struct files_str
+ 					filp_close(file, files);
+ 					cond_resched();
+ 				}
++				vx_openfd_dec(i);
+ 			}
+ 			i++;
+ 			set >>= 1;
++			cond_resched();
+ 		}
+ 	}
+ }
+@@ -699,15 +705,25 @@ static struct task_struct *find_new_reap
+ 	__acquires(&tasklist_lock)
+ {
+ 	struct pid_namespace *pid_ns = task_active_pid_ns(father);
+-	struct task_struct *thread;
++	struct vx_info *vxi = task_get_vx_info(father);
++	struct task_struct *thread = father;
++	struct task_struct *reaper;
+ 
+-	thread = father;
+ 	while_each_thread(father, thread) {
+ 		if (thread->flags & PF_EXITING)
+ 			continue;
+ 		if (unlikely(pid_ns->child_reaper == father))
+ 			pid_ns->child_reaper = thread;
+-		return thread;
++		reaper = thread;
++		goto out_put;
++	}
++
++	reaper = pid_ns->child_reaper;
++	if (vxi) {
++		BUG_ON(!vxi->vx_reaper);
++		if (vxi->vx_reaper != init_pid_ns.child_reaper &&
++		    vxi->vx_reaper != father)
++			reaper = vxi->vx_reaper;
+ 	}
+ 
+ 	if (unlikely(pid_ns->child_reaper == father)) {
+@@ -751,7 +767,9 @@ static struct task_struct *find_new_reap
+ 		}
+ 	}
+ 
+-	return pid_ns->child_reaper;
++out_put:
++	put_vx_info(vxi);
++	return reaper;
+ }
+ 
+ /*
+@@ -802,10 +820,15 @@ static void forget_original_parent(struc
+ 	list_for_each_entry_safe(p, n, &father->children, sibling) {
+ 		struct task_struct *t = p;
+ 		do {
+-			t->real_parent = reaper;
++			struct task_struct *new_parent = reaper;
++
++			if (unlikely(p == reaper))
++				new_parent = task_active_pid_ns(p)->child_reaper;
++
++			t->real_parent = new_parent;
+ 			if (t->parent == father) {
+ 				BUG_ON(t->ptrace);
+-				t->parent = t->real_parent;
++				t->parent = new_parent;
+ 			}
+ 			if (t->pdeath_signal)
+ 				group_send_sig_info(t->pdeath_signal,
+@@ -1013,6 +1036,9 @@ void do_exit(long code)
+ 	 */
+ 	ptrace_put_breakpoints(tsk);
+ 
++	/* needs to stay before exit_notify() */
++	exit_vx_info_early(tsk, code);
++
+ 	exit_notify(tsk, group_dead);
+ #ifdef CONFIG_NUMA
+ 	task_lock(tsk);
+@@ -1063,10 +1089,15 @@ void do_exit(long code)
+ 	smp_mb();
+ 	raw_spin_unlock_wait(&tsk->pi_lock);
+ 
++	/* needs to stay after exit_notify() */
++	exit_vx_info(tsk, code);
++	exit_nx_info(tsk);
++
+ 	/* causes final put_task_struct in finish_task_switch(). */
+ 	tsk->state = TASK_DEAD;
+ 	tsk->flags |= PF_NOFREEZE;	/* tell freezer to ignore us */
+ 	schedule();
++	printk("bad task: %p [%lx]\n", current, current->state);
+ 	BUG();
+ 	/* Avoid "noreturn function does return".  */
+ 	for (;;)
+diff -NurpP --minimal linux-3.4.45/kernel/fork.c linux-3.4.45-vs2.3.3.9/kernel/fork.c
+--- linux-3.4.45/kernel/fork.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/fork.c	2012-06-28 14:45:07.000000000 +0000
+@@ -68,6 +68,9 @@
+ #include <linux/oom.h>
+ #include <linux/khugepaged.h>
+ #include <linux/signalfd.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/pgalloc.h>
+@@ -170,6 +173,8 @@ void free_task(struct task_struct *tsk)
+ 	account_kernel_stack(tsk->stack, -1);
+ 	free_thread_info(tsk->stack);
+ 	rt_mutex_debug_task_free(tsk);
++	clr_vx_info(&tsk->vx_info);
++	clr_nx_info(&tsk->nx_info);
+ 	ftrace_graph_exit_task(tsk);
+ 	free_task_struct(tsk);
+ }
+@@ -507,6 +512,7 @@ static struct mm_struct *mm_init(struct
+ 	if (likely(!mm_alloc_pgd(mm))) {
+ 		mm->def_flags = 0;
+ 		mmu_notifier_mm_init(mm);
++		set_vx_info(&mm->mm_vx_info, p->vx_info);
+ 		return mm;
+ 	}
+ 
+@@ -559,6 +565,7 @@ void __mmdrop(struct mm_struct *mm)
+ 	destroy_context(mm);
+ 	mmu_notifier_mm_destroy(mm);
+ 	check_mm(mm);
++	clr_vx_info(&mm->mm_vx_info);
+ 	free_mm(mm);
+ }
+ EXPORT_SYMBOL_GPL(__mmdrop);
+@@ -794,6 +801,7 @@ struct mm_struct *dup_mm(struct task_str
+ 		goto fail_nomem;
+ 
+ 	memcpy(mm, oldmm, sizeof(*mm));
++	mm->mm_vx_info = NULL;
+ 	mm_init_cpumask(mm);
+ 
+ 	/* Initializing for Swap token stuff */
+@@ -837,6 +845,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 NULL;
+@@ -1125,6 +1134,8 @@ static struct task_struct *copy_process(
+ 	int retval;
+ 	struct task_struct *p;
+ 	int cgroup_callbacks_done = 0;
++	struct vx_info *vxi;
++	struct nx_info *nxi;
+ 
+ 	if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
+ 		return ERR_PTR(-EINVAL);
+@@ -1171,7 +1182,12 @@ static struct task_struct *copy_process(
+ 	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
+ 	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
+ #endif
++	init_vx_info(&p->vx_info, current_vx_info());
++	init_nx_info(&p->nx_info, current_nx_info());
++
+ 	retval = -EAGAIN;
++	if (!vx_nproc_avail(1))
++		goto bad_fork_free;
+ 	if (atomic_read(&p->real_cred->user->processes) >=
+ 			task_rlimit(p, RLIMIT_NPROC)) {
+ 		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+@@ -1448,6 +1464,18 @@ static struct task_struct *copy_process(
+ 
+ 	total_forks++;
+ 	spin_unlock(&current->sighand->siglock);
++
++	/* 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);
+ 	proc_fork_connector(p);
+ 	cgroup_post_fork(p);
+diff -NurpP --minimal linux-3.4.45/kernel/kthread.c linux-3.4.45-vs2.3.3.9/kernel/kthread.c
+--- linux-3.4.45/kernel/kthread.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/kthread.c	2012-10-22 13:09:53.000000000 +0000
+@@ -16,6 +16,7 @@
+ #include <linux/mutex.h>
+ #include <linux/slab.h>
+ #include <linux/freezer.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+ 
+ static DEFINE_SPINLOCK(kthread_create_lock);
+diff -NurpP --minimal linux-3.4.45/kernel/nsproxy.c linux-3.4.45-vs2.3.3.9/kernel/nsproxy.c
+--- linux-3.4.45/kernel/nsproxy.c	2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/nsproxy.c	2012-05-21 16:15:05.000000000 +0000
+@@ -20,11 +20,14 @@
+ #include <linux/mnt_namespace.h>
+ #include <linux/utsname.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vserver/global.h>
++#include <linux/vserver/debug.h>
+ #include <net/net_namespace.h>
+ #include <linux/ipc_namespace.h>
+ #include <linux/proc_fs.h>
+ #include <linux/file.h>
+ #include <linux/syscalls.h>
++#include "../fs/mount.h"
+ 
+ static struct kmem_cache *nsproxy_cachep;
+ 
+@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp
+ 	struct nsproxy *nsproxy;
+ 
+ 	nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+-	if (nsproxy)
++	if (nsproxy) {
+ 		atomic_set(&nsproxy->count, 1);
++		atomic_inc(&vs_global_nsproxy);
++	}
++	vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
+ 	return nsproxy;
+ }
+ 
+@@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsp
+  * Return the newly created nsproxy.  Do not attach this to the task,
+  * leave it to the caller to do proper locking and attach it to task.
+  */
+-static struct nsproxy *create_new_namespaces(unsigned long flags,
+-			struct task_struct *tsk, struct fs_struct *new_fs)
++static struct nsproxy *unshare_namespaces(unsigned long flags,
++			struct nsproxy *orig,
++			struct fs_struct *new_fs,
++			struct user_namespace *new_user,
++			struct pid_namespace *new_pid)
+ {
+ 	struct nsproxy *new_nsp;
+ 	int err;
+@@ -66,31 +75,31 @@ static struct nsproxy *create_new_namesp
+ 	if (!new_nsp)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, new_fs);
++	new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs);
+ 	if (IS_ERR(new_nsp->mnt_ns)) {
+ 		err = PTR_ERR(new_nsp->mnt_ns);
+ 		goto out_ns;
+ 	}
+ 
+-	new_nsp->uts_ns = copy_utsname(flags, tsk);
++	new_nsp->uts_ns = copy_utsname(flags, orig->uts_ns, new_user);
+ 	if (IS_ERR(new_nsp->uts_ns)) {
+ 		err = PTR_ERR(new_nsp->uts_ns);
+ 		goto out_uts;
+ 	}
+ 
+-	new_nsp->ipc_ns = copy_ipcs(flags, tsk);
++	new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns, new_user);
+ 	if (IS_ERR(new_nsp->ipc_ns)) {
+ 		err = PTR_ERR(new_nsp->ipc_ns);
+ 		goto out_ipc;
+ 	}
+ 
+-	new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
++	new_nsp->pid_ns = copy_pid_ns(flags, new_pid);
+ 	if (IS_ERR(new_nsp->pid_ns)) {
+ 		err = PTR_ERR(new_nsp->pid_ns);
+ 		goto out_pid;
+ 	}
+ 
+-	new_nsp->net_ns = copy_net_ns(flags, tsk->nsproxy->net_ns);
++	new_nsp->net_ns = copy_net_ns(flags, orig->net_ns);
+ 	if (IS_ERR(new_nsp->net_ns)) {
+ 		err = PTR_ERR(new_nsp->net_ns);
+ 		goto out_net;
+@@ -115,6 +124,40 @@ out_ns:
+ 	return ERR_PTR(err);
+ }
+ 
++static struct nsproxy *create_new_namespaces(unsigned long flags,
++			struct task_struct *tsk, struct fs_struct *new_fs)
++{
++	return unshare_namespaces(flags, tsk->nsproxy,
++		new_fs, task_cred_xxx(tsk, user)->user_ns,
++		task_active_pid_ns(tsk));
++}
++
++/*
++ * copies the nsproxy, setting refcount to 1, and grabbing a
++ * reference to all contained namespaces.
++ */
++struct nsproxy *copy_nsproxy(struct nsproxy *orig)
++{
++	struct nsproxy *ns = create_nsproxy();
++
++	if (ns) {
++		memcpy(ns, orig, sizeof(struct nsproxy));
++		atomic_set(&ns->count, 1);
++
++		if (ns->mnt_ns)
++			get_mnt_ns(ns->mnt_ns);
++		if (ns->uts_ns)
++			get_uts_ns(ns->uts_ns);
++		if (ns->ipc_ns)
++			get_ipc_ns(ns->ipc_ns);
++		if (ns->pid_ns)
++			get_pid_ns(ns->pid_ns);
++		if (ns->net_ns)
++			get_net(ns->net_ns);
++	}
++	return ns;
++}
++
+ /*
+  * called from clone.  This now handles copy for nsproxy and all
+  * namespaces therein.
+@@ -122,9 +165,12 @@ out_ns:
+ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
+ {
+ 	struct nsproxy *old_ns = tsk->nsproxy;
+-	struct nsproxy *new_ns;
++	struct nsproxy *new_ns = NULL;
+ 	int err = 0;
+ 
++	vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])",
++		flags, tsk, old_ns);
++
+ 	if (!old_ns)
+ 		return 0;
+ 
+@@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags,
+ 				CLONE_NEWPID | CLONE_NEWNET)))
+ 		return 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN)) {
++	if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) {
+ 		err = -EPERM;
+ 		goto out;
+ 	}
+@@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags,
+ 
+ out:
+ 	put_nsproxy(old_ns);
++	vxdprintk(VXD_CBIT(space, 3),
++		"copy_namespaces(0x%08lx,%p[%p]) = %d [%p]",
++		flags, tsk, old_ns, err, new_ns);
+ 	return err;
+ }
+ 
+@@ -174,7 +223,9 @@ void free_nsproxy(struct nsproxy *ns)
+ 		put_ipc_ns(ns->ipc_ns);
+ 	if (ns->pid_ns)
+ 		put_pid_ns(ns->pid_ns);
+-	put_net(ns->net_ns);
++	if (ns->net_ns)
++		put_net(ns->net_ns);
++	atomic_dec(&vs_global_nsproxy);
+ 	kmem_cache_free(nsproxy_cachep, ns);
+ }
+ 
+@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned
+ {
+ 	int err = 0;
+ 
++	vxdprintk(VXD_CBIT(space, 4),
++		"unshare_nsproxy_namespaces(0x%08lx,[%p])",
++		unshare_flags, current->nsproxy);
++
+ 	if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
+ 			       CLONE_NEWNET)))
+ 		return 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags))
+ 		return -EPERM;
+ 
+ 	*new_nsp = create_new_namespaces(unshare_flags, current,
+diff -NurpP --minimal linux-3.4.45/kernel/pid.c linux-3.4.45-vs2.3.3.9/kernel/pid.c
+--- linux-3.4.45/kernel/pid.c	2012-03-19 18:47:30.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/pid.c	2012-05-21 16:15:05.000000000 +0000
+@@ -36,6 +36,7 @@
+ #include <linux/pid_namespace.h>
+ #include <linux/init_task.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_pid.h>
+ 
+ #define pid_hashfn(nr, ns)	\
+ 	hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
+@@ -344,7 +345,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+ 
+ struct pid *find_vpid(int nr)
+ {
+-	return find_pid_ns(nr, current->nsproxy->pid_ns);
++	return find_pid_ns(vx_rmap_pid(nr), current->nsproxy->pid_ns);
+ }
+ EXPORT_SYMBOL_GPL(find_vpid);
+ 
+@@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *ol
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
+ 	struct task_struct *result = NULL;
++
++	if (type == PIDTYPE_REALPID)
++		type = PIDTYPE_PID;
+ 	if (pid) {
+ 		struct hlist_node *first;
+ 		first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
+@@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns(
+ 	rcu_lockdep_assert(rcu_read_lock_held(),
+ 			   "find_task_by_pid_ns() needs rcu_read_lock()"
+ 			   " protection");
+-	return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
++	return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
+ }
+ 
+ struct task_struct *find_task_by_vpid(pid_t vnr)
+@@ -467,7 +471,7 @@ struct pid *find_get_pid(pid_t nr)
+ }
+ EXPORT_SYMBOL_GPL(find_get_pid);
+ 
+-pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns)
+ {
+ 	struct upid *upid;
+ 	pid_t nr = 0;
+@@ -480,6 +484,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
+ 	return nr;
+ }
+ 
++pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
++{
++	return vx_map_pid(pid_unmapped_nr_ns(pid, ns));
++}
++
+ pid_t pid_vnr(struct pid *pid)
+ {
+ 	return pid_nr_ns(pid, current->nsproxy->pid_ns);
+diff -NurpP --minimal linux-3.4.45/kernel/pid_namespace.c linux-3.4.45-vs2.3.3.9/kernel/pid_namespace.c
+--- linux-3.4.45/kernel/pid_namespace.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/pid_namespace.c	2012-05-21 16:15:05.000000000 +0000
+@@ -16,6 +16,7 @@
+ #include <linux/slab.h>
+ #include <linux/proc_fs.h>
+ #include <linux/reboot.h>
++#include <linux/vserver/global.h>
+ 
+ #define BITS_PER_PAGE		(PAGE_SIZE*8)
+ 
+@@ -89,6 +90,7 @@ static struct pid_namespace *create_pid_
+ 		goto out_free_map;
+ 
+ 	kref_init(&ns->kref);
++	atomic_inc(&vs_global_pid_ns);
+ 	ns->level = level;
+ 	ns->parent = get_pid_ns(parent_pid_ns);
+ 
+@@ -120,6 +122,7 @@ static void destroy_pid_namespace(struct
+ 
+ 	for (i = 0; i < PIDMAP_ENTRIES; i++)
+ 		kfree(ns->pidmap[i].page);
++	atomic_dec(&vs_global_pid_ns);
+ 	kmem_cache_free(pid_ns_cachep, ns);
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/kernel/posix-timers.c linux-3.4.45-vs2.3.3.9/kernel/posix-timers.c
+--- linux-3.4.45/kernel/posix-timers.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/posix-timers.c	2013-03-30 21:29:17.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <linux/wait.h>
+ #include <linux/workqueue.h>
+ #include <linux/export.h>
++#include <linux/vs_context.h>
+ 
+ /*
+  * Management arrays for POSIX timers.	 Timers are kept in slab memory
+@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t
+ {
+ 	struct task_struct *task;
+ 	int shared, ret = -1;
++
+ 	/*
+ 	 * FIXME: if ->sigq is queued we can race with
+ 	 * dequeue_signal()->do_schedule_next_timer().
+@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t
+ 	rcu_read_lock();
+ 	task = pid_task(timr->it_pid, PIDTYPE_PID);
+ 	if (task) {
++		struct vx_info_save vxis;
++		struct vx_info *vxi;
++
++		vxi = get_vx_info(task->vx_info);
++		enter_vx_info(vxi, &vxis);
+ 		shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
+ 		ret = send_sigqueue(timr->sigq, task, shared);
++		leave_vx_info(&vxis);
++		put_vx_info(vxi);
+ 	}
+ 	rcu_read_unlock();
++
+ 	/* If we failed to send the signal the timer stops. */
+ 	return ret > 0;
+ }
+diff -NurpP --minimal linux-3.4.45/kernel/printk.c linux-3.4.45-vs2.3.3.9/kernel/printk.c
+--- linux-3.4.45/kernel/printk.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/printk.c	2013-03-02 15:26:44.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/cpu.h>
+ #include <linux/notifier.h>
+ #include <linux/rculist.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -317,7 +318,7 @@ static int check_syslog_permissions(int
+ 		return 0;
+ 
+ 	if (syslog_action_restricted(type)) {
+-		if (capable(CAP_SYSLOG))
++		if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
+ 			return 0;
+ 		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
+ 		if (capable(CAP_SYS_ADMIN)) {
+@@ -347,12 +348,9 @@ int do_syslog(int type, char __user *buf
+ 	if (error)
+ 		return error;
+ 
+-	switch (type) {
+-	case SYSLOG_ACTION_CLOSE:	/* Close log */
+-		break;
+-	case SYSLOG_ACTION_OPEN:	/* Open log */
+-		break;
+-	case SYSLOG_ACTION_READ:	/* Read from log */
++	if ((type == SYSLOG_ACTION_READ) ||
++	    (type == SYSLOG_ACTION_READ_ALL) ||
++	    (type == SYSLOG_ACTION_READ_CLEAR)) {
+ 		error = -EINVAL;
+ 		if (!buf || len < 0)
+ 			goto out;
+@@ -363,6 +361,16 @@ int do_syslog(int type, char __user *buf
+ 			error = -EFAULT;
+ 			goto out;
+ 		}
++	}
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		return vx_do_syslog(type, buf, len);
++
++	switch (type) {
++	case SYSLOG_ACTION_CLOSE:	/* Close log */
++		break;
++	case SYSLOG_ACTION_OPEN:	/* Open log */
++		break;
++	case SYSLOG_ACTION_READ:	/* Read from log */
+ 		error = wait_event_interruptible(log_wait,
+ 							(log_start - log_end));
+ 		if (error)
+@@ -389,16 +397,6 @@ int do_syslog(int type, char __user *buf
+ 		/* FALL THRU */
+ 	/* Read last kernel messages */
+ 	case SYSLOG_ACTION_READ_ALL:
+-		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;
+diff -NurpP --minimal linux-3.4.45/kernel/ptrace.c linux-3.4.45-vs2.3.3.9/kernel/ptrace.c
+--- linux-3.4.45/kernel/ptrace.c	2013-05-13 17:36:36.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/ptrace.c	2013-02-11 23:37:30.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/uaccess.h>
+ #include <linux/regset.h>
++#include <linux/vs_context.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/cn_proc.h>
+ 
+@@ -256,6 +257,11 @@ ok:
+ 		dumpable = get_dumpable(task->mm);
+ 	if (!dumpable  && !ptrace_has_cap(task_user_ns(task), mode))
+ 		return -EPERM;
++	if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
++		return -EPERM;
++	if (!vx_check(task->xid, VS_IDENT) &&
++		!task_vx_flags(task, VXF_STATE_ADMIN, 0))
++		return -EACCES;
+ 
+ 	return security_ptrace_access_check(task, mode);
+ }
+diff -NurpP --minimal linux-3.4.45/kernel/sched/core.c linux-3.4.45-vs2.3.3.9/kernel/sched/core.c
+--- linux-3.4.45/kernel/sched/core.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sched/core.c	2013-05-13 18:16:08.000000000 +0000
+@@ -72,6 +72,8 @@
+ #include <linux/slab.h>
+ #include <linux/init_task.h>
+ #include <linux/binfmts.h>
++#include <linux/vs_sched.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <asm/switch_to.h>
+ #include <asm/tlb.h>
+@@ -2228,9 +2230,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+  */
+ void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
+ {
+-	loads[0] = (avenrun[0] + offset) << shift;
+-	loads[1] = (avenrun[1] + offset) << shift;
+-	loads[2] = (avenrun[2] + offset) << shift;
++	if (vx_flags(VXF_VIRT_LOAD, 0)) {
++		struct vx_info *vxi = current_vx_info();
++
++		loads[0] = (vxi->cvirt.load[0] + offset) << shift;
++		loads[1] = (vxi->cvirt.load[1] + offset) << shift;
++		loads[2] = (vxi->cvirt.load[2] + offset) << shift;
++	} else {
++		loads[0] = (avenrun[0] + offset) << shift;
++		loads[1] = (avenrun[1] + offset) << shift;
++		loads[2] = (avenrun[2] + offset) << shift;
++	}
+ }
+ 
+ static long calc_load_fold_active(struct rq *this_rq)
+@@ -2799,14 +2809,17 @@ static inline void task_group_account_fi
+ void account_user_time(struct task_struct *p, cputime_t cputime,
+ 		       cputime_t cputime_scaled)
+ {
++	struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
++	int nice = (TASK_NICE(p) > 0);
+ 	int index;
+ 
+ 	/* Add user time to process. */
+ 	p->utime += cputime;
+ 	p->utimescaled += cputime_scaled;
++	vx_account_user(vxi, cputime, nice);
+ 	account_group_user_time(p, cputime);
+ 
+-	index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
++	index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
+ 
+ 	/* Add user time to cpustat. */
+ 	task_group_account_field(p, index, (__force u64) cputime);
+@@ -2853,9 +2866,12 @@ static inline
+ void __account_system_time(struct task_struct *p, cputime_t cputime,
+ 			cputime_t cputime_scaled, int index)
+ {
++	struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
++
+ 	/* Add system time to process. */
+ 	p->stime += cputime;
+ 	p->stimescaled += cputime_scaled;
++	vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
+ 	account_group_system_time(p, cputime);
+ 
+ 	/* Add system time to cpustat. */
+@@ -4081,7 +4097,7 @@ SYSCALL_DEFINE1(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)
+diff -NurpP --minimal linux-3.4.45/kernel/sched/fair.c linux-3.4.45-vs2.3.3.9/kernel/sched/fair.c
+--- linux-3.4.45/kernel/sched/fair.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sched/fair.c	2012-05-21 16:15:05.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/slab.h>
+ #include <linux/profile.h>
+ #include <linux/interrupt.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <trace/events/sched.h>
+ 
+@@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+ 		__enqueue_entity(cfs_rq, se);
+ 	se->on_rq = 1;
+ 
++	if (entity_is_task(se))
++		vx_activate_task(task_of(se));
+ 	if (cfs_rq->nr_running == 1) {
+ 		list_add_leaf_cfs_rq(cfs_rq);
+ 		check_enqueue_throttle(cfs_rq);
+@@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+ 	if (se != cfs_rq->curr)
+ 		__dequeue_entity(cfs_rq, se);
+ 	se->on_rq = 0;
++	if (entity_is_task(se))
++		vx_deactivate_task(task_of(se));
+ 	update_cfs_load(cfs_rq, 0);
+ 	account_entity_dequeue(cfs_rq, se);
+ 
+diff -NurpP --minimal linux-3.4.45/kernel/signal.c linux-3.4.45-vs2.3.3.9/kernel/signal.c
+--- linux-3.4.45/kernel/signal.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/signal.c	2013-05-13 18:16:08.000000000 +0000
+@@ -29,6 +29,8 @@
+ #include <linux/pid_namespace.h>
+ #include <linux/nsproxy.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/signal.h>
+ 
+@@ -787,9 +789,18 @@ static int check_kill_permission(int sig
+ 	struct pid *sid;
+ 	int error;
+ 
++	vxdprintk(VXD_CBIT(misc, 7),
++		"check_kill_permission(%d,%p,%p[#%u,%u])",
++		sig, info, t, vx_task_xid(t), t->pid);
++
+ 	if (!valid_signal(sig))
+ 		return -EINVAL;
+ 
++/*	FIXME: needed? if so, why?
++	if ((info != SEND_SIG_NOINFO) &&
++		(is_si_special(info) || !si_fromuser(info)))
++		goto skip;	*/
++
+ 	if (!si_fromuser(info))
+ 		return 0;
+ 
+@@ -813,6 +824,20 @@ static int check_kill_permission(int sig
+ 		}
+ 	}
+ 
++	error = -EPERM;
++	if (t->pid == 1 && current->xid)
++		return error;
++
++	error = -ESRCH;
++	/* FIXME: we shouldn't return ESRCH ever, to avoid
++		  loops, maybe ENOENT or EACCES? */
++	if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
++		vxdprintk(current->xid || VXD_CBIT(misc, 7),
++			"signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
++			sig, info, t, vx_task_xid(t), t->pid, current->xid);
++		return error;
++	}
++/* skip: */
+ 	return security_task_kill(t, info, sig, 0);
+ }
+ 
+@@ -1355,7 +1380,7 @@ int kill_pid_info(int sig, struct siginf
+ 	rcu_read_lock();
+ retry:
+ 	p = pid_task(pid, PIDTYPE_PID);
+-	if (p) {
++	if (p && vx_check(vx_task_xid(p), VS_IDENT)) {
+ 		error = group_send_sig_info(sig, info, p);
+ 		if (unlikely(error == -ESRCH))
+ 			/*
+@@ -1405,7 +1430,7 @@ int kill_pid_info_as_cred(int sig, struc
+ 
+ 	rcu_read_lock();
+ 	p = pid_task(pid, PIDTYPE_PID);
+-	if (!p) {
++	if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
+ 		ret = -ESRCH;
+ 		goto out_unlock;
+ 	}
+@@ -1457,8 +1482,10 @@ static int kill_something_info(int sig,
+ 		struct task_struct * p;
+ 
+ 		for_each_process(p) {
+-			if (task_pid_vnr(p) > 1 &&
+-					!same_thread_group(p, current)) {
++			if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
++				task_pid_vnr(p) > 1 &&
++				!same_thread_group(p, current) &&
++				!vx_current_initpid(p->pid)) {
+ 				int err = group_send_sig_info(sig, info, p);
+ 				++count;
+ 				if (err != -EPERM)
+@@ -2312,6 +2339,11 @@ relock:
+ 				!sig_kernel_only(signr))
+ 			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
+diff -NurpP --minimal linux-3.4.45/kernel/softirq.c linux-3.4.45-vs2.3.3.9/kernel/softirq.c
+--- linux-3.4.45/kernel/softirq.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/softirq.c	2012-05-21 16:15:05.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <linux/ftrace.h>
+ #include <linux/smp.h>
+ #include <linux/tick.h>
++#include <linux/vs_context.h>
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/irq.h>
+diff -NurpP --minimal linux-3.4.45/kernel/sys.c linux-3.4.45-vs2.3.3.9/kernel/sys.c
+--- linux-3.4.45/kernel/sys.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sys.c	2013-05-13 18:16:08.000000000 +0000
+@@ -45,6 +45,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/kprobes.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_pid.h>
+ 
+ #include <linux/kmsg_dump.h>
+ /* Move somewhere else to avoid recompiling? */
+@@ -155,7 +156,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);
+@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
+ 			else
+ 				pgrp = task_pgrp(current);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				error = set_one_prio(p, niceval, error);
+ 			} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
+ 			break;
+@@ -268,6 +274,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+ 			else
+ 				pgrp = task_pgrp(current);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				niceval = 20 - task_nice(p);
+ 				if (niceval > retval)
+ 					retval = niceval;
+@@ -420,6 +428,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+ 
+ static DEFINE_MUTEX(reboot_mutex);
+ 
++long vs_reboot(unsigned int, void __user *);
++
+ /*
+  * Reboot system call: for obvious reasons only root may call it,
+  * and even root needs to set up some magic numbers in the registers
+@@ -461,6 +471,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+ 	if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
+ 		cmd = LINUX_REBOOT_CMD_HALT;
+ 
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		return vs_reboot(cmd, arg);
++
+ 	mutex_lock(&reboot_mutex);
+ 	switch (cmd) {
+ 	case LINUX_REBOOT_CMD_RESTART:
+@@ -1286,7 +1299,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+ 	int errno;
+ 	char tmp[__NEW_UTS_LEN];
+ 
+-	if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++	if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++		CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ 		return -EPERM;
+ 
+ 	if (len < 0 || len > __NEW_UTS_LEN)
+@@ -1337,7 +1351,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+ 	int errno;
+ 	char tmp[__NEW_UTS_LEN];
+ 
+-	if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++	if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++		CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ 		return -EPERM;
+ 	if (len < 0 || len > __NEW_UTS_LEN)
+ 		return -EINVAL;
+@@ -1456,7 +1471,7 @@ int do_prlimit(struct task_struct *tsk,
+ 		/* Keep the capable check against init_user_ns until
+ 		   cgroups can contain all limits */
+ 		if (new_rlim->rlim_max > rlim->rlim_max &&
+-				!capable(CAP_SYS_RESOURCE))
++			!vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ 			retval = -EPERM;
+ 		if (!retval)
+ 			retval = security_task_setrlimit(tsk->group_leader,
+@@ -1510,7 +1525,8 @@ static int check_prlimit_permission(stru
+ 	     cred->gid == tcred->sgid &&
+ 	     cred->gid == tcred->gid))
+ 		return 0;
+-	if (ns_capable(tcred->user->user_ns, CAP_SYS_RESOURCE))
++	if (vx_ns_capable(tcred->user->user_ns,
++		CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ 		return 0;
+ 
+ 	return -EPERM;
+diff -NurpP --minimal linux-3.4.45/kernel/sysctl.c linux-3.4.45-vs2.3.3.9/kernel/sysctl.c
+--- linux-3.4.45/kernel/sysctl.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sysctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -81,6 +81,7 @@
+ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+ #include <linux/lockdep.h>
+ #endif
++extern char vshelper_path[];
+ #ifdef CONFIG_CHR_DEV_SG
+ #include <scsi/sg.h>
+ #endif
+@@ -562,6 +563,13 @@ static struct ctl_table kern_table[] = {
+ 		.proc_handler	= proc_dostring,
+ 	},
+ #endif
++	{
++		.procname	= "vshelper",
++		.data		= &vshelper_path,
++		.maxlen		= 256,
++		.mode		= 0644,
++		.proc_handler	= &proc_dostring,
++	},
+ #ifdef CONFIG_CHR_DEV_SG
+ 	{
+ 		.procname	= "sg-big-buff",
+diff -NurpP --minimal linux-3.4.45/kernel/sysctl_binary.c linux-3.4.45-vs2.3.3.9/kernel/sysctl_binary.c
+--- linux-3.4.45/kernel/sysctl_binary.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/sysctl_binary.c	2013-03-30 21:29:17.000000000 +0000
+@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
+ 
+ 	{ CTL_INT,	KERN_PANIC,			"panic" },
+ 	{ CTL_INT,	KERN_REALROOTDEV,		"real-root-dev" },
++	{ CTL_STR,	KERN_VSHELPER,			"vshelper" },
+ 
+ 	{ CTL_STR,	KERN_SPARC_REBOOT,		"reboot-cmd" },
+ 	{ CTL_INT,	KERN_CTLALTDEL,			"ctrl-alt-del" },
+diff -NurpP --minimal linux-3.4.45/kernel/time/timekeeping.c linux-3.4.45-vs2.3.3.9/kernel/time/timekeeping.c
+--- linux-3.4.45/kernel/time/timekeeping.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/time/timekeeping.c	2012-12-08 00:53:53.000000000 +0000
+@@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
+ 	} while (read_seqretry(&timekeeper.lock, seq));
+ 
+ 	timespec_add_ns(ts, nsecs);
++	vx_adjust_timespec(ts);
+ }
+ 
+ EXPORT_SYMBOL(getnstimeofday);
+diff -NurpP --minimal linux-3.4.45/kernel/time.c linux-3.4.45-vs2.3.3.9/kernel/time.c
+--- linux-3.4.45/kernel/time.c	2012-05-21 16:07:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/time.c	2012-05-21 16:15:05.000000000 +0000
+@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
+ 	if (err)
+ 		return err;
+ 
+-	do_settimeofday(&tv);
++	vx_settimeofday(&tv);
+ 	return 0;
+ }
+ 
+@@ -172,7 +172,7 @@ int do_sys_settimeofday(const struct tim
+ 		}
+ 	}
+ 	if (tv)
+-		return do_settimeofday(tv);
++		return vx_settimeofday(tv);
+ 	return 0;
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/kernel/timer.c linux-3.4.45-vs2.3.3.9/kernel/timer.c
+--- linux-3.4.45/kernel/timer.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/timer.c	2012-10-22 13:09:53.000000000 +0000
+@@ -40,6 +40,10 @@
+ #include <linux/irq_work.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
++#include <linux/vs_base.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/sched.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -1388,12 +1392,6 @@ SYSCALL_DEFINE1(alarm, unsigned int, sec
+ 
+ #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
+@@ -1422,10 +1420,23 @@ SYSCALL_DEFINE0(getppid)
+ 	rcu_read_lock();
+ 	pid = task_tgid_vnr(rcu_dereference(current->real_parent));
+ 	rcu_read_unlock();
++	return vx_map_pid(pid);
++}
+ 
+-	return 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_ */
++
+ SYSCALL_DEFINE0(getuid)
+ {
+ 	/* Only we change this so SMP safe */
+diff -NurpP --minimal linux-3.4.45/kernel/user_namespace.c linux-3.4.45-vs2.3.3.9/kernel/user_namespace.c
+--- linux-3.4.45/kernel/user_namespace.c	2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/user_namespace.c	2012-05-21 16:15:05.000000000 +0000
+@@ -11,6 +11,7 @@
+ #include <linux/user_namespace.h>
+ #include <linux/highuid.h>
+ #include <linux/cred.h>
++#include <linux/vserver/global.h>
+ 
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ 
+@@ -33,6 +34,7 @@ int create_user_ns(struct cred *new)
+ 		return -ENOMEM;
+ 
+ 	kref_init(&ns->kref);
++	atomic_inc(&vs_global_user_ns);
+ 
+ 	for (n = 0; n < UIDHASH_SZ; ++n)
+ 		INIT_HLIST_HEAD(ns->uidhash_table + n);
+@@ -81,6 +83,8 @@ void free_user_ns(struct kref *kref)
+ 	struct user_namespace *ns =
+ 		container_of(kref, struct user_namespace, kref);
+ 
++	/* FIXME: maybe move into destroyer? */
++	atomic_dec(&vs_global_user_ns);
+ 	INIT_WORK(&ns->destroyer, free_user_ns_work);
+ 	schedule_work(&ns->destroyer);
+ }
+diff -NurpP --minimal linux-3.4.45/kernel/utsname.c linux-3.4.45-vs2.3.3.9/kernel/utsname.c
+--- linux-3.4.45/kernel/utsname.c	2012-01-09 15:15:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/utsname.c	2012-05-21 16:15:05.000000000 +0000
+@@ -16,14 +16,17 @@
+ #include <linux/slab.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_fs.h>
++#include <linux/vserver/global.h>
+ 
+ static struct uts_namespace *create_uts_ns(void)
+ {
+ 	struct uts_namespace *uts_ns;
+ 
+ 	uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
+-	if (uts_ns)
++	if (uts_ns) {
+ 		kref_init(&uts_ns->kref);
++		atomic_inc(&vs_global_uts_ns);
++	}
+ 	return uts_ns;
+ }
+ 
+@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_
+  * @old_ns: namespace to clone
+  * Return NULL on error (failure to kmalloc), new ns otherwise
+  */
+-static struct uts_namespace *clone_uts_ns(struct task_struct *tsk,
+-					  struct uts_namespace *old_ns)
++static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns,
++					  struct user_namespace *old_user)
+ {
+ 	struct uts_namespace *ns;
+ 
+@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n
+ 
+ 	down_read(&uts_sem);
+ 	memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
++	ns->user_ns = get_user_ns(old_user);
+ 	up_read(&uts_sem);
+ 	return ns;
+ }
+@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n
+  * versa.
+  */
+ struct uts_namespace *copy_utsname(unsigned long flags,
+-				   struct task_struct *tsk)
++				   struct uts_namespace *old_ns,
++				   struct user_namespace *user_ns)
+ {
+-	struct uts_namespace *old_ns = tsk->nsproxy->uts_ns;
+ 	struct uts_namespace *new_ns;
+ 
+ 	BUG_ON(!old_ns);
+@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig
+ 	if (!(flags & CLONE_NEWUTS))
+ 		return old_ns;
+ 
+-	new_ns = clone_uts_ns(tsk, old_ns);
++	new_ns = clone_uts_ns(old_ns, user_ns);
+ 
+ 	put_uts_ns(old_ns);
+ 	return new_ns;
+@@ -78,6 +81,7 @@ void free_uts_ns(struct kref *kref)
+ 
+ 	ns = container_of(kref, struct uts_namespace, kref);
+ 	put_user_ns(ns->user_ns);
++	atomic_dec(&vs_global_uts_ns);
+ 	kfree(ns);
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/Kconfig linux-3.4.45-vs2.3.3.9/kernel/vserver/Kconfig
+--- linux-3.4.45/kernel/vserver/Kconfig	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/Kconfig	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,224 @@
++#
++# Linux VServer configuration
++#
++
++menu "Linux VServer"
++
++config	VSERVER_AUTO_LBACK
++	bool    "Automatically Assign Loopback IP"
++	default y
++	help
++	  Automatically assign a guest specific loopback
++	  IP and add it to the kernel network stack on
++	  startup.
++
++config	VSERVER_AUTO_SINGLE
++	bool	"Automatic Single IP Special Casing"
++	depends on EXPERIMENTAL
++	default y
++	help
++	  This allows network contexts with a single IP to
++	  automatically remap 0.0.0.0 bindings to that IP,
++	  avoiding further network checks and improving
++	  performance.
++
++	  (note: such guests do not allow to change the ip
++	   on the fly and do not show loopback addresses)
++
++config	VSERVER_COWBL
++	bool	"Enable COW Immutable Link Breaking"
++	default y
++	help
++	  This enables the COW (Copy-On-Write) link break code.
++	  It allows you to treat unified files like normal files
++	  when writing to them (which will implicitely break the
++	  link and create a copy of the unified file)
++
++config	VSERVER_VTIME
++	bool	"Enable Virtualized Guest Time"
++	depends on EXPERIMENTAL
++	default n
++	help
++	  This enables per guest time offsets to allow for
++	  adjusting the system clock individually per guest.
++	  this adds some overhead to the time functions and
++	  therefore should not be enabled without good reason.
++
++config	VSERVER_DEVICE
++	bool	"Enable Guest Device Mapping"
++	depends on EXPERIMENTAL
++	default n
++	help
++	  This enables generic device remapping.
++
++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)
++
++choice
++	prompt	"Persistent Inode Tagging"
++	default	TAGGING_ID24
++	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	TAGGING_NONE
++	bool	"Disabled"
++	help
++	  do not store per-context information in inodes.
++
++config	TAGGING_UID16
++	bool	"UID16/GID32"
++	help
++	  reduces UID to 16 bit, but leaves GID at 32 bit.
++
++config	TAGGING_GID16
++	bool	"UID32/GID16"
++	help
++	  reduces GID to 16 bit, but leaves UID at 32 bit.
++
++config	TAGGING_ID24
++	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	TAGGING_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)
++
++endchoice
++
++config	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 tagging specified above.
++	  (will require patched clients too)
++
++config	VSERVER_PRIVACY
++	bool	"Honor Privacy Aspects of Guests"
++	default n
++	help
++	  When enabled, most context checks will disallow
++	  access to structures assigned to a specific context,
++	  like ptys or loop devices.
++
++config	VSERVER_CONTEXTS
++	int	"Maximum number of Contexts (1-65533)"	if EMBEDDED
++	range 1 65533
++	default "768"	if 64BIT
++	default "256"
++	help
++	  This setting will optimize certain data structures
++	  and memory allocations according to the expected
++	  maximum.
++
++	  note: this is not a strict upper limit.
++
++config	VSERVER_WARN
++	bool	"VServer Warnings"
++	default y
++	help
++	  This enables various runtime warnings, which will
++	  notify about potential manipulation attempts or
++	  resource shortage. It is generally considered to
++	  be a good idea to have that enabled.
++
++config	VSERVER_WARN_DEVPTS
++	bool	"VServer DevPTS Warnings"
++	depends on VSERVER_WARN
++	default y
++	help
++	  This enables DevPTS related warnings, issued when a
++	  process inside a context tries to lookup or access
++	  a dynamic pts from the host or a different context.
++
++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 very 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.
++
++choice
++	prompt	"Quotes used in debug and warn messages"
++	default	QUOTES_ISO8859
++
++config	QUOTES_ISO8859
++	bool	"Extended ASCII (ISO 8859) angle quotes"
++	help
++	  This uses the extended ASCII characters \xbb
++	  and \xab for quoting file and process names.
++
++config	QUOTES_UTF8
++	bool	"UTF-8 angle quotes"
++	help
++	  This uses the the UTF-8 sequences for angle
++	  quotes to quote file and process names.
++
++config	QUOTES_ASCII
++	bool	"ASCII single quotes"
++	help
++	  This uses the ASCII single quote character
++	  (\x27) to quote file and process names.
++
++endchoice
++
++endmenu
++
++
++config	VSERVER
++	bool
++	default y
++	select NAMESPACES
++	select UTS_NS
++	select IPC_NS
++#	select USER_NS
++	select SYSVIPC
++
++config	VSERVER_SECURITY
++	bool
++	depends on SECURITY
++	default y
++	select SECURITY_CAPABILITIES
++
++config	VSERVER_DISABLED
++	bool
++	default n
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/Makefile linux-3.4.45-vs2.3.3.9/kernel/vserver/Makefile
+--- linux-3.4.45/kernel/vserver/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/Makefile	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,18 @@
++#
++# Makefile for the Linux vserver routines.
++#
++
++
++obj-y		+= vserver.o
++
++vserver-y	:= switch.o context.o space.o sched.o network.o inode.o \
++		   limit.o cvirt.o cacct.o signal.o helper.o init.o \
++		   dlimit.o tag.o
++
++vserver-$(CONFIG_INET) += inet.o
++vserver-$(CONFIG_PROC_FS) += proc.o
++vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
++vserver-$(CONFIG_VSERVER_HISTORY) += history.o
++vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
++vserver-$(CONFIG_VSERVER_DEVICE) += device.o
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct.c linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct.c
+--- linux-3.4.45/kernel/vserver/cacct.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,42 @@
++/*
++ *  linux/kernel/vserver/cacct.c
++ *
++ *  Virtual Server: Context Accounting
++ *
++ *  Copyright (C) 2006-2007 Herbert Pötzl
++ *
++ *  V0.01  added accounting stats
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/cacct_cmd.h>
++#include <linux/vserver/cacct_int.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++int vc_sock_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_sock_stat_v0 vc_data;
++	int j, field;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	field = vc_data.field;
++	if ((field < 0) || (field >= VXA_SOCK_SIZE))
++		return -EINVAL;
++
++	for (j = 0; j < 3; j++) {
++		vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
++		vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_init.h
+--- linux-3.4.45/kernel/vserver/cacct_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_init.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,25 @@
++
++
++static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
++{
++	int i, j;
++
++
++	for (i = 0; i < VXA_SOCK_SIZE; i++) {
++		for (j = 0; j < 3; j++) {
++			atomic_long_set(&cacct->sock[i][j].count, 0);
++			atomic_long_set(&cacct->sock[i][j].total, 0);
++		}
++	}
++	for (i = 0; i < 8; i++)
++		atomic_set(&cacct->slab[i], 0);
++	for (i = 0; i < 5; i++)
++		for (j = 0; j < 4; j++)
++			atomic_set(&cacct->page[i][j], 0);
++}
++
++static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
++{
++	return;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cacct_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_proc.h
+--- linux-3.4.45/kernel/vserver/cacct_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cacct_proc.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,53 @@
++#ifndef _VX_CACCT_PROC_H
++#define _VX_CACCT_PROC_H
++
++#include <linux/vserver/cacct_int.h>
++
++
++#define VX_SOCKA_TOP	\
++	"Type\t    recv #/bytes\t\t   send #/bytes\t\t    fail #/bytes\n"
++
++static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
++{
++	int i, j, length = 0;
++	static char *type[VXA_SOCK_SIZE] = {
++		"UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
++	};
++
++	length += sprintf(buffer + length, VX_SOCKA_TOP);
++	for (i = 0; i < VXA_SOCK_SIZE; i++) {
++		length += sprintf(buffer + length, "%s:", type[i]);
++		for (j = 0; j < 3; j++) {
++			length += sprintf(buffer + length,
++				"\t%10lu/%-10lu",
++				vx_sock_count(cacct, i, j),
++				vx_sock_total(cacct, i, j));
++		}
++		buffer[length++] = '\n';
++	}
++
++	length += sprintf(buffer + length, "\n");
++	length += sprintf(buffer + length,
++		"slab:\t %8u %8u %8u %8u\n",
++		atomic_read(&cacct->slab[1]),
++		atomic_read(&cacct->slab[4]),
++		atomic_read(&cacct->slab[0]),
++		atomic_read(&cacct->slab[2]));
++
++	length += sprintf(buffer + length, "\n");
++	for (i = 0; i < 5; i++) {
++		length += sprintf(buffer + length,
++			"page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
++			atomic_read(&cacct->page[i][0]),
++			atomic_read(&cacct->page[i][1]),
++			atomic_read(&cacct->page[i][2]),
++			atomic_read(&cacct->page[i][3]),
++			atomic_read(&cacct->page[i][4]),
++			atomic_read(&cacct->page[i][5]),
++			atomic_read(&cacct->page[i][6]),
++			atomic_read(&cacct->page[i][7]));
++	}
++	return length;
++}
++
++#endif	/* _VX_CACCT_PROC_H */
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/context.c linux-3.4.45-vs2.3.3.9/kernel/vserver/context.c
+--- linux-3.4.45/kernel/vserver/context.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/context.c	2012-06-28 14:45:48.000000000 +0000
+@@ -0,0 +1,1119 @@
++/*
++ *  linux/kernel/vserver/context.c
++ *
++ *  Virtual Server: Context Support
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  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
++ *  V0.12  referenced context store
++ *  V0.13  separate per cpu data
++ *  V0.14  changed vcmds to vxi arg
++ *  V0.15  added context stat
++ *  V0.16  have __create claim() the vxi
++ *  V0.17  removed older and legacy stuff
++ *  V0.18  added user credentials
++ *  V0.19  added warn mask
++ *
++ */
++
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <linux/security.h>
++#include <linux/pid_namespace.h>
++#include <linux/capability.h>
++
++#include <linux/vserver/context.h>
++#include <linux/vserver/network.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/limit_int.h>
++#include <linux/vserver/space.h>
++#include <linux/init_task.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/context_cmd.h>
++
++#include "cvirt_init.h"
++#include "cacct_init.h"
++#include "limit_init.h"
++#include "sched_init.h"
++
++
++atomic_t vx_global_ctotal	= ATOMIC_INIT(0);
++atomic_t vx_global_cactive	= ATOMIC_INIT(0);
++
++
++/*	now inactive context structures */
++
++static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
++
++static DEFINE_SPINLOCK(vx_info_inactive_lock);
++
++
++/*	__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;
++	int cpu, index;
++
++	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));
++#ifdef CONFIG_SMP
++	new->ptr_pc = alloc_percpu(struct _vx_info_pc);
++	if (!new->ptr_pc)
++		goto error;
++#endif
++	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);
++
++	/* prepare reaper */
++	get_task_struct(init_pid_ns.child_reaper);
++	new->vx_reaper = init_pid_ns.child_reaper;
++	new->vx_badness_bias = 0;
++
++	/* 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);
++
++	/* per cpu data structures */
++	for_each_possible_cpu(cpu) {
++		vx_info_init_sched_pc(
++			&vx_per_cpu(new, sched_pc, cpu), cpu);
++		vx_info_init_cvirt_pc(
++			&vx_per_cpu(new, cvirt_pc, cpu), cpu);
++	}
++
++	new->vx_flags = VXF_INIT_SET;
++	new->vx_bcaps = CAP_FULL_SET;	// maybe ~CAP_SETPCAP
++	new->vx_ccaps = 0;
++	new->vx_umask = 0;
++	new->vx_wmask = 0;
++
++	new->reboot_cmd = 0;
++	new->exit_code = 0;
++
++	// preconfig spaces
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &new->space[index];
++
++		// filesystem
++		spin_lock(&init_fs.lock);
++		init_fs.users++;
++		spin_unlock(&init_fs.lock);
++		space->vx_fs = &init_fs;
++
++		/* FIXME: do we want defaults? */
++		// space->vx_real_cred = 0;
++		// space->vx_cred = 0;
++	}
++
++
++	vxdprintk(VXD_CBIT(xid, 0),
++		"alloc_vx_info(%d) = %p", xid, new);
++	vxh_alloc_vx_info(new);
++	atomic_inc(&vx_global_ctotal);
++	return new;
++#ifdef CONFIG_SMP
++error:
++	kfree(new);
++	return 0;
++#endif
++}
++
++/*	__dealloc_vx_info()
++
++	* final disposal of vx_info				*/
++
++static void __dealloc_vx_info(struct vx_info *vxi)
++{
++#ifdef	CONFIG_VSERVER_WARN
++	struct vx_info_save vxis;
++	int cpu;
++#endif
++	vxdprintk(VXD_CBIT(xid, 0),
++		"dealloc_vx_info(%p)", vxi);
++	vxh_dealloc_vx_info(vxi);
++
++#ifdef	CONFIG_VSERVER_WARN
++	enter_vx_info(vxi, &vxis);
++	vx_info_exit_limit(&vxi->limit);
++	vx_info_exit_sched(&vxi->sched);
++	vx_info_exit_cvirt(&vxi->cvirt);
++	vx_info_exit_cacct(&vxi->cacct);
++
++	for_each_possible_cpu(cpu) {
++		vx_info_exit_sched_pc(
++			&vx_per_cpu(vxi, sched_pc, cpu), cpu);
++		vx_info_exit_cvirt_pc(
++			&vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
++	}
++	leave_vx_info(&vxis);
++#endif
++
++	vxi->vx_id = -1;
++	vxi->vx_state |= VXS_RELEASED;
++
++#ifdef CONFIG_SMP
++	free_percpu(vxi->ptr_pc);
++#endif
++	kfree(vxi);
++	atomic_dec(&vx_global_ctotal);
++}
++
++static void __shutdown_vx_info(struct vx_info *vxi)
++{
++	struct nsproxy *nsproxy;
++	struct fs_struct *fs;
++	struct cred *cred;
++	int index, kill;
++
++	might_sleep();
++
++	vxi->vx_state |= VXS_SHUTDOWN;
++	vs_state_change(vxi, VSC_SHUTDOWN);
++
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &vxi->space[index];
++
++		nsproxy = xchg(&space->vx_nsproxy, NULL);
++		if (nsproxy)
++			put_nsproxy(nsproxy);
++
++		fs = xchg(&space->vx_fs, NULL);
++		spin_lock(&fs->lock);
++		kill = !--fs->users;
++		spin_unlock(&fs->lock);
++		if (kill)
++			free_fs_struct(fs);
++
++		cred = (struct cred *)xchg(&space->vx_cred, NULL);
++		if (cred)
++			abort_creds(cred);
++	}
++}
++
++/* exported stuff */
++
++void free_vx_info(struct vx_info *vxi)
++{
++	unsigned long flags;
++	unsigned index;
++
++	/* check for reference counts first */
++	BUG_ON(atomic_read(&vxi->vx_usecnt));
++	BUG_ON(atomic_read(&vxi->vx_tasks));
++
++	/* context must not be hashed */
++	BUG_ON(vx_info_state(vxi, VXS_HASHED));
++
++	/* context shutdown is mandatory */
++	BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
++
++	/* spaces check */
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &vxi->space[index];
++
++		BUG_ON(space->vx_nsproxy);
++		BUG_ON(space->vx_fs);
++		// BUG_ON(space->vx_real_cred);
++		// BUG_ON(space->vx_cred);
++	}
++
++	spin_lock_irqsave(&vx_info_inactive_lock, flags);
++	hlist_del(&vxi->vx_hlist);
++	spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++
++	__dealloc_vx_info(vxi);
++}
++
++
++/*	hash table for vx_info hash */
++
++#define VX_HASH_SIZE	13
++
++static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
++	{ [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
++
++static DEFINE_SPINLOCK(vx_info_hash_lock);
++
++
++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);
++	atomic_inc(&vx_global_cactive);
++}
++
++/*	__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)
++{
++	unsigned long flags;
++
++	vxd_assert_lock(&vx_info_hash_lock);
++	vxdprintk(VXD_CBIT(xid, 4),
++		"__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
++		atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
++	vxh_unhash_vx_info(vxi);
++
++	/* context must be hashed */
++	BUG_ON(!vx_info_state(vxi, VXS_HASHED));
++	/* but without tasks */
++	BUG_ON(atomic_read(&vxi->vx_tasks));
++
++	vxi->vx_state &= ~VXS_HASHED;
++	hlist_del_init(&vxi->vx_hlist);
++	spin_lock_irqsave(&vx_info_inactive_lock, flags);
++	hlist_add_head(&vxi->vx_hlist, &vx_info_inactive);
++	spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++	atomic_dec(&vx_global_cactive);
++}
++
++
++/*	__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;
++}
++
++
++/*	__create_vx_info()
++
++	* create the requested context
++	* get(), claim() 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);
++
++	/* static context requested */
++	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;
++	}
++	/* new context */
++	vxdprintk(VXD_CBIT(xid, 0),
++		"create_vx_info(%d) = %p (new)", id, new);
++	claim_vx_info(new, NULL);
++	__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)
++{
++	spin_lock(&vx_info_hash_lock);
++	__unhash_vx_info(vxi);
++	spin_unlock(&vx_info_hash_lock);
++	__shutdown_vx_info(vxi);
++	__wakeup_vx_info(vxi);
++}
++
++
++/*	lookup_vx_info()
++
++	* search for a vx_info and get() it
++	* negative id means current				*/
++
++struct vx_info *lookup_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_PROC_FS
++
++/*	get_xid_list()
++
++	* get a subset of hashed xids for proc
++	* assumes size is at least one				*/
++
++int get_xid_list(int index, unsigned int *xids, int size)
++{
++	int hindex, nr_xids = 0;
++
++	/* only show current and children */
++	if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
++		if (index > 0)
++			return 0;
++		xids[nr_xids] = vx_current_xid();
++		return 1;
++	}
++
++	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
++
++#ifdef	CONFIG_VSERVER_DEBUG
++
++void	dump_vx_info_inactive(int level)
++{
++	struct hlist_node *entry, *next;
++
++	hlist_for_each_safe(entry, next, &vx_info_inactive) {
++		struct vx_info *vxi =
++			list_entry(entry, struct vx_info, vx_hlist);
++
++		dump_vx_info(vxi, level);
++	}
++}
++
++#endif
++
++#if 0
++int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
++{
++	struct user_struct *new_user, *old_user;
++
++	if (!p || !vxi)
++		BUG();
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++		return -EACCES;
++
++	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;
++}
++#endif
++
++#if 0
++void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
++{
++	// p->cap_effective &= vxi->vx_cap_bset;
++	p->cap_effective =
++		cap_intersect(p->cap_effective, vxi->cap_bset);
++	// p->cap_inheritable &= vxi->vx_cap_bset;
++	p->cap_inheritable =
++		cap_intersect(p->cap_inheritable, vxi->cap_bset);
++	// p->cap_permitted &= vxi->vx_cap_bset;
++	p->cap_permitted =
++		cap_intersect(p->cap_permitted, vxi->cap_bset);
++}
++#endif
++
++
++#include <linux/file.h>
++#include <linux/fdtable.h>
++
++static int vx_openfd_task(struct task_struct *tsk)
++{
++	struct files_struct *files = tsk->files;
++	struct fdtable *fdt;
++	const unsigned long *bptr;
++	int count, total;
++
++	/* no rcu_read_lock() because of spin_lock() */
++	spin_lock(&files->file_lock);
++	fdt = files_fdtable(files);
++	bptr = fdt->open_fds;
++	count = fdt->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;
++}
++
++
++/*	for *space compatibility */
++
++asmlinkage long sys_unshare(unsigned long);
++
++/*
++ *	migrate task to new context
++ *	gets vxi, puts old_vxi on change
++ *	optionally unshares namespaces (hack)
++ */
++
++int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare)
++{
++	struct vx_info *old_vxi;
++	int ret = 0;
++
++	if (!p || !vxi)
++		BUG();
++
++	vxdprintk(VXD_CBIT(xid, 5),
++		"vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
++		vxi->vx_id, atomic_read(&vxi->vx_usecnt));
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) &&
++		!vx_info_flags(vxi, VXF_STATE_SETUP, 0))
++		return -EACCES;
++
++	if (vx_info_state(vxi, VXS_SHUTDOWN))
++		return -EFAULT;
++
++	old_vxi = task_get_vx_info(p);
++	if (old_vxi == vxi)
++		goto out;
++
++//	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);
++			__rlim_dec(&old_vxi->limit, RLIMIT_NPROC);
++			/* FIXME: what about the struct files here? */
++			__rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd);
++			/* account for the executable */
++			__rlim_dec(&old_vxi->limit, VLIMIT_DENTRY);
++		}
++		atomic_inc(&vxi->cvirt.nr_threads);
++		atomic_inc(&vxi->cvirt.nr_running);
++		__rlim_inc(&vxi->limit, RLIMIT_NPROC);
++		/* FIXME: what about the struct files here? */
++		__rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd);
++		/* account for the executable */
++		__rlim_inc(&vxi->limit, VLIMIT_DENTRY);
++
++		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_cap_bset(vxi, p);
++		task_unlock(p);
++
++		/* hack for *spaces to provide compatibility */
++		if (unshare) {
++			struct nsproxy *old_nsp, *new_nsp;
++
++			ret = unshare_nsproxy_namespaces(
++				CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
++				&new_nsp, NULL);
++			if (ret)
++				goto out;
++
++			old_nsp = xchg(&p->nsproxy, new_nsp);
++			vx_set_space(vxi,
++				CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0);
++			put_nsproxy(old_nsp);
++		}
++	}
++out:
++	put_vx_info(old_vxi);
++	return ret;
++}
++
++int vx_set_reaper(struct vx_info *vxi, struct task_struct *p)
++{
++	struct task_struct *old_reaper;
++	struct vx_info *reaper_vxi;
++
++	if (!vxi)
++		return -EINVAL;
++
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_set_reaper(%p[#%d],%p[#%d,%d])",
++		vxi, vxi->vx_id, p, p->xid, p->pid);
++
++	old_reaper = vxi->vx_reaper;
++	if (old_reaper == p)
++		return 0;
++
++	reaper_vxi = task_get_vx_info(p);
++	if (reaper_vxi && reaper_vxi != vxi) {
++		vxwprintk(1,
++			"Unsuitable reaper [" VS_Q("%s") ",%u:#%u] "
++			"for [xid #%u]",
++			p->comm, p->pid, p->xid, vx_current_xid());
++		goto out;
++	}
++
++	/* set new child reaper */
++	get_task_struct(p);
++	vxi->vx_reaper = p;
++	put_task_struct(old_reaper);
++out:
++	put_vx_info(reaper_vxi);
++	return 0;
++}
++
++int vx_set_init(struct vx_info *vxi, struct task_struct *p)
++{
++	if (!vxi)
++		return -EINVAL;
++
++	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_flags &= ~VXF_STATE_INIT;
++	// vxi->vx_initpid = p->tgid;
++	vxi->vx_initpid = p->pid;
++	return 0;
++}
++
++void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_exit_init(%p[#%d],%p[#%d,%d,%d])",
++		vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
++
++	vxi->exit_code = code;
++	vxi->vx_initpid = 0;
++}
++
++
++void vx_set_persistent(struct vx_info *vxi)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
++
++	get_vx_info(vxi);
++	claim_vx_info(vxi, NULL);
++}
++
++void vx_clear_persistent(struct vx_info *vxi)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
++
++	release_vx_info(vxi, NULL);
++	put_vx_info(vxi);
++}
++
++void vx_update_persistent(struct vx_info *vxi)
++{
++	if (vx_info_flags(vxi, VXF_PERSISTENT, 0))
++		vx_set_persistent(vxi);
++	else
++		vx_clear_persistent(vxi);
++}
++
++
++/*	task must be current or locked		*/
++
++void	exit_vx_info(struct task_struct *p, int code)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi) {
++		atomic_dec(&vxi->cvirt.nr_threads);
++		vx_nproc_dec(p);
++
++		vxi->exit_code = code;
++		release_vx_info(vxi, p);
++	}
++}
++
++void	exit_vx_info_early(struct task_struct *p, int code)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi) {
++		if (vxi->vx_initpid == p->pid)
++			vx_exit_init(vxi, p, code);
++		if (vxi->vx_reaper == p)
++			vx_set_reaper(vxi, init_pid_ns.child_reaper);
++	}
++}
++
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++#include <asm/uaccess.h>
++
++
++int vc_task_xid(uint32_t id)
++{
++	xid_t xid;
++
++	if (id) {
++		struct task_struct *tsk;
++
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		xid = (tsk) ? tsk->xid : -ESRCH;
++		rcu_read_unlock();
++	} else
++		xid = vx_current_xid();
++	return xid;
++}
++
++
++int vc_vx_info(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vx_info_v0 vc_data;
++
++	vc_data.xid = vxi->vx_id;
++	vc_data.initpid = vxi->vx_initpid;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++int vc_ctx_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_stat_v0 vc_data;
++
++	vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
++	vc_data.tasks = atomic_read(&vxi->vx_tasks);
++
++	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 (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if ((xid > MAX_S_CONTEXT) || (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;
++
++	ret = -ENOEXEC;
++	if (vs_state_change(new_vxi, VSC_STARTUP))
++		goto out;
++
++	ret = vx_migrate_task(current, new_vxi, (!data));
++	if (ret)
++		goto out;
++
++	/* return context id on success */
++	ret = new_vxi->vx_id;
++
++	/* get a reference for persistent contexts */
++	if ((vc_data.flagword & VXF_PERSISTENT))
++		vx_set_persistent(new_vxi);
++out:
++	release_vx_info(new_vxi, NULL);
++	put_vx_info(new_vxi);
++	return ret;
++}
++
++
++int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
++	int ret;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = vx_migrate_task(current, vxi, 0);
++	if (ret)
++		return ret;
++	if (vc_data.flagword & VXM_SET_INIT)
++		ret = vx_set_init(vxi, current);
++	if (ret)
++		return ret;
++	if (vc_data.flagword & VXM_SET_REAPER)
++		ret = vx_set_reaper(vxi, current);
++	return ret;
++}
++
++
++int vc_get_cflags(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_flags_v0 vc_data;
++
++	vc_data.flagword = vxi->vx_flags;
++
++	/* special STATE flag handling */
++	vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_cflags(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_flags_v0 vc_data;
++	uint64_t mask, trigger;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special STATE flag handling */
++	mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
++	trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
++
++	if (vxi == current_vx_info()) {
++		/* if (trigger & VXF_STATE_SETUP)
++			vx_mask_cap_bset(vxi, current); */
++		if (trigger & VXF_STATE_INIT) {
++			int ret;
++
++			ret = vx_set_init(vxi, current);
++			if (ret)
++				return ret;
++			ret = vx_set_reaper(vxi, current);
++			if (ret)
++				return ret;
++		}
++	}
++
++	vxi->vx_flags = vs_mask_flags(vxi->vx_flags,
++		vc_data.flagword, mask);
++	if (trigger & VXF_PERSISTENT)
++		vx_update_persistent(vxi);
++
++	return 0;
++}
++
++
++static inline uint64_t caps_from_cap_t(kernel_cap_t c)
++{
++	uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32);
++
++	// printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v);
++	return v;
++}
++
++static inline kernel_cap_t cap_t_from_caps(uint64_t v)
++{
++	kernel_cap_t c = __cap_empty_set;
++
++	c.cap[0] = v & 0xFFFFFFFF;
++	c.cap[1] = (v >> 32) & 0xFFFFFFFF;
++
++	// printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]);
++	return c;
++}
++
++
++static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
++{
++	if (bcaps)
++		*bcaps = caps_from_cap_t(vxi->vx_bcaps);
++	if (ccaps)
++		*ccaps = vxi->vx_ccaps;
++
++	return 0;
++}
++
++int vc_get_ccaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_caps_v1 vc_data;
++	int ret;
++
++	ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
++	if (ret)
++		return ret;
++	vc_data.cmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++static int do_set_caps(struct vx_info *vxi,
++	uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
++{
++	uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps);
++
++#if 0
++	printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n",
++		bcaps, bmask, ccaps, cmask);
++#endif
++	vxi->vx_bcaps = cap_t_from_caps(
++		vs_mask_flags(bcold, bcaps, bmask));
++	vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
++
++	return 0;
++}
++
++int vc_set_ccaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_caps_v1 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
++}
++
++int vc_get_bcaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_bcaps vc_data;
++	int ret;
++
++	ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
++	if (ret)
++		return ret;
++	vc_data.bmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_bcaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_bcaps vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
++}
++
++
++int vc_get_umask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_umask vc_data;
++
++	vc_data.umask = vxi->vx_umask;
++	vc_data.mask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_umask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_umask vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
++		vc_data.umask, vc_data.mask);
++	return 0;
++}
++
++
++int vc_get_wmask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wmask vc_data;
++
++	vc_data.wmask = vxi->vx_wmask;
++	vc_data.mask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_wmask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wmask vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask,
++		vc_data.wmask, vc_data.mask);
++	return 0;
++}
++
++
++int vc_get_badness(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_badness_v0 vc_data;
++
++	vc_data.bias = vxi->vx_badness_bias;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_badness(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_badness_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_badness_bias = vc_data.bias;
++	return 0;
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(free_vx_info);
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt.c linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt.c
+--- linux-3.4.45/kernel/vserver/cvirt.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,313 @@
++/*
++ *  linux/kernel/vserver/cvirt.c
++ *
++ *  Virtual Server: Context Virtualization
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  broken out from limit.c
++ *  V0.02  added utsname stuff
++ *  V0.03  changed vcmds to vxi arg
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/utsname.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vserver/switch.h>
++#include <linux/vserver/cvirt_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++void vx_vsi_boottime(struct timespec *boottime)
++{
++	struct vx_info *vxi = current_vx_info();
++
++	set_normalized_timespec(boottime,
++		boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
++		boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
++	return;
++}
++
++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;
++	unsigned long flags;
++
++	spin_lock_irqsave(&vxi->cvirt.load_lock, flags);
++
++	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_irqrestore(&vxi->cvirt.load_lock, flags);
++}
++
++
++/*
++ * 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)
++{
++	struct nsproxy *nsproxy;
++	struct uts_namespace *uts;
++
++	if (id == VHIN_CONTEXT)
++		return vxi->vx_name;
++
++	nsproxy = vxi->space[0].vx_nsproxy;
++	if (!nsproxy)
++		return NULL;
++
++	uts = nsproxy->uts_ns;
++	if (!uts)
++		return NULL;
++
++	switch (id) {
++	case VHIN_SYSNAME:
++		return uts->name.sysname;
++	case VHIN_NODENAME:
++		return uts->name.nodename;
++	case VHIN_RELEASE:
++		return uts->name.release;
++	case VHIN_VERSION:
++		return uts->name.version;
++	case VHIN_MACHINE:
++		return uts->name.machine;
++	case VHIN_DOMAINNAME:
++		return uts->name.domainname;
++	default:
++		return NULL;
++	}
++	return NULL;
++}
++
++int vc_set_vhi_name(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vhi_name_v0 vc_data;
++	char *name;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	name = vx_vhi_name(vxi, vc_data.field);
++	if (!name)
++		return -EINVAL;
++
++	memcpy(name, vc_data.name, 65);
++	return 0;
++}
++
++int vc_get_vhi_name(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vhi_name_v0 vc_data;
++	char *name;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	name = vx_vhi_name(vxi, vc_data.field);
++	if (!name)
++		return -EINVAL;
++
++	memcpy(vc_data.name, name, 65);
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++int vc_virt_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_virt_stat_v0 vc_data;
++	struct _vx_cvirt *cvirt = &vxi->cvirt;
++	struct timespec uptime;
++
++	do_posix_clock_monotonic_gettime(&uptime);
++	set_normalized_timespec(&uptime,
++		uptime.tv_sec - cvirt->bias_uptime.tv_sec,
++		uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
++
++	vc_data.offset = timespec_to_ns(&cvirt->bias_ts);
++	vc_data.uptime = timespec_to_ns(&uptime);
++	vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
++	vc_data.nr_running = atomic_read(&cvirt->nr_running);
++	vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
++	vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold);
++	vc_data.nr_forks = atomic_read(&cvirt->total_forks);
++	vc_data.load[0] = cvirt->load[0];
++	vc_data.load[1] = cvirt->load[1];
++	vc_data.load[2] = cvirt->load[2];
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++#ifdef CONFIG_VSERVER_VTIME
++
++/* virtualized time base */
++
++void vx_adjust_timespec(struct timespec *ts)
++{
++	struct vx_info *vxi;
++
++	if (!vx_flags(VXF_VIRT_TIME, 0))
++		return;
++
++	vxi = current_vx_info();
++	ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
++	ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
++
++	if (ts->tv_nsec >= NSEC_PER_SEC) {
++		ts->tv_sec++;
++		ts->tv_nsec -= NSEC_PER_SEC;
++	} else if (ts->tv_nsec < 0) {
++		ts->tv_sec--;
++		ts->tv_nsec += NSEC_PER_SEC;
++	}
++}
++
++int vx_settimeofday(const struct timespec *ts)
++{
++	struct timespec ats, delta;
++	struct vx_info *vxi;
++
++	if (!vx_flags(VXF_VIRT_TIME, 0))
++		return do_settimeofday(ts);
++
++	getnstimeofday(&ats);
++	delta = timespec_sub(*ts, ats);
++
++	vxi = current_vx_info();
++	vxi->cvirt.bias_ts = timespec_add(vxi->cvirt.bias_ts, delta);
++	return 0;
++}
++
++#endif
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_init.h
+--- linux-3.4.45/kernel/vserver/cvirt_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_init.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,70 @@
++
++
++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);
++	cvirt->bias_ts.tv_sec = 0;
++	cvirt->bias_ts.tv_nsec = 0;
++
++	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);
++
++	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_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
++{
++	// cvirt_pc->cpustat = { 0 };
++}
++
++static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
++{
++#ifdef	CONFIG_VSERVER_WARN
++	int value;
++#endif
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
++		"!!! cvirt: %p[nr_threads] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
++		"!!! cvirt: %p[nr_running] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
++		"!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
++		"!!! cvirt: %p[nr_onhold] = %d on exit.",
++		cvirt, value);
++	return;
++}
++
++static inline
++void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
++{
++	return;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/cvirt_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_proc.h
+--- linux-3.4.45/kernel/vserver/cvirt_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/cvirt_proc.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,123 @@
++#ifndef _VX_CVIRT_PROC_H
++#define _VX_CVIRT_PROC_H
++
++#include <linux/nsproxy.h>
++#include <linux/mnt_namespace.h>
++#include <linux/ipc_namespace.h>
++#include <linux/utsname.h>
++#include <linux/ipc.h>
++
++extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
++
++static inline
++int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
++{
++	struct mnt_namespace *ns;
++	struct uts_namespace *uts;
++	struct ipc_namespace *ipc;
++	int length = 0;
++
++	if (!nsproxy)
++		goto out;
++
++	length += sprintf(buffer + length,
++		"NSProxy:\t%p [%p,%p,%p]\n",
++		nsproxy, nsproxy->mnt_ns,
++		nsproxy->uts_ns, nsproxy->ipc_ns);
++
++	ns = nsproxy->mnt_ns;
++	if (!ns)
++		goto skip_ns;
++
++	length += vx_info_mnt_namespace(ns, buffer + length);
++
++skip_ns:
++
++	uts = nsproxy->uts_ns;
++	if (!uts)
++		goto skip_uts;
++
++	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, uts->name.sysname,
++		__NEW_UTS_LEN, uts->name.nodename,
++		__NEW_UTS_LEN, uts->name.release,
++		__NEW_UTS_LEN, uts->name.version,
++		__NEW_UTS_LEN, uts->name.machine,
++		__NEW_UTS_LEN, uts->name.domainname);
++skip_uts:
++
++	ipc = nsproxy->ipc_ns;
++	if (!ipc)
++		goto skip_ipc;
++
++	length += sprintf(buffer + length,
++		"SEMS:\t\t%d %d %d %d  %d\n"
++		"MSG:\t\t%d %d %d\n"
++		"SHM:\t\t%lu %lu  %d %d\n",
++		ipc->sem_ctls[0], ipc->sem_ctls[1],
++		ipc->sem_ctls[2], ipc->sem_ctls[3],
++		ipc->used_sems,
++		ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
++		(unsigned long)ipc->shm_ctlmax,
++		(unsigned long)ipc->shm_ctlall,
++		ipc->shm_ctlmni, ipc->shm_tot);
++skip_ipc:
++out:
++	return length;
++}
++
++
++#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)));
++
++	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
++int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
++	char *buffer, int cpu)
++{
++	int length = 0;
++	return length;
++}
++
++#endif	/* _VX_CVIRT_PROC_H */
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/debug.c linux-3.4.45-vs2.3.3.9/kernel/vserver/debug.c
+--- linux-3.4.45/kernel/vserver/debug.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/debug.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,32 @@
++/*
++ *  kernel/vserver/debug.c
++ *
++ *  Copyright (C) 2005-2007 Herbert Pötzl
++ *
++ *  V0.01  vx_info dump support
++ *
++ */
++
++#include <linux/module.h>
++
++#include <linux/vserver/context.h>
++
++
++void	dump_vx_info(struct vx_info *vxi, int level)
++{
++	printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
++		atomic_read(&vxi->vx_usecnt),
++		atomic_read(&vxi->vx_tasks),
++		vxi->vx_state);
++	if (level > 0) {
++		__dump_vx_limit(&vxi->limit);
++		__dump_vx_sched(&vxi->sched);
++		__dump_vx_cvirt(&vxi->cvirt);
++		__dump_vx_cacct(&vxi->cacct);
++	}
++	printk("---\n");
++}
++
++
++EXPORT_SYMBOL_GPL(dump_vx_info);
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/device.c linux-3.4.45-vs2.3.3.9/kernel/vserver/device.c
+--- linux-3.4.45/kernel/vserver/device.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/device.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,443 @@
++/*
++ *  linux/kernel/vserver/device.c
++ *
++ *  Linux-VServer: Device Support
++ *
++ *  Copyright (C) 2006  Herbert Pötzl
++ *  Copyright (C) 2007  Daniel Hokka Zakrisson
++ *
++ *  V0.01  device mapping basics
++ *  V0.02  added defaults
++ *
++ */
++
++#include <linux/slab.h>
++#include <linux/rcupdate.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/hash.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++#include <linux/vserver/base.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/device.h>
++#include <linux/vserver/device_cmd.h>
++
++
++#define DMAP_HASH_BITS	4
++
++
++struct vs_mapping {
++	union {
++		struct hlist_node hlist;
++		struct list_head list;
++	} u;
++#define dm_hlist	u.hlist
++#define dm_list		u.list
++	xid_t xid;
++	dev_t device;
++	struct vx_dmap_target target;
++};
++
++
++static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
++
++static DEFINE_SPINLOCK(dmap_main_hash_lock);
++
++static struct vx_dmap_target dmap_defaults[2] = {
++	{ .flags = DATTR_OPEN },
++	{ .flags = DATTR_OPEN },
++};
++
++
++struct kmem_cache *dmap_cachep __read_mostly;
++
++int __init dmap_cache_init(void)
++{
++	dmap_cachep = kmem_cache_create("dmap_cache",
++		sizeof(struct vs_mapping), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	return 0;
++}
++
++__initcall(dmap_cache_init);
++
++
++static inline unsigned int __hashval(dev_t dev, int bits)
++{
++	return hash_long((unsigned long)dev, bits);
++}
++
++
++/*	__hash_mapping()
++ *	add the mapping to the hash table
++ */
++static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct hlist_head *head, *hash = dmap_main_hash;
++	int device = vdm->device;
++
++	spin_lock(hash_lock);
++	vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x",
++		vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target);
++
++	head = &hash[__hashval(device, DMAP_HASH_BITS)];
++	hlist_add_head(&vdm->dm_hlist, head);
++	spin_unlock(hash_lock);
++}
++
++
++static inline int __mode_to_default(umode_t mode)
++{
++	switch (mode) {
++	case S_IFBLK:
++		return 0;
++	case S_IFCHR:
++		return 1;
++	default:
++		BUG();
++	}
++}
++
++
++/*	__set_default()
++ *	set a default
++ */
++static inline void __set_default(struct vx_info *vxi, umode_t mode,
++	struct vx_dmap_target *vdmt)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	spin_lock(hash_lock);
++
++	if (vxi)
++		vxi->dmap.targets[__mode_to_default(mode)] = *vdmt;
++	else
++		dmap_defaults[__mode_to_default(mode)] = *vdmt;
++
++
++	spin_unlock(hash_lock);
++
++	vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x",
++		  vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags);
++}
++
++
++/*	__remove_default()
++ *	remove a default
++ */
++static inline int __remove_default(struct vx_info *vxi, umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	spin_lock(hash_lock);
++
++	if (vxi)
++		vxi->dmap.targets[__mode_to_default(mode)].flags = 0;
++	else	/* remove == reset */
++		dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode;
++
++	spin_unlock(hash_lock);
++	return 0;
++}
++
++
++/*	__find_mapping()
++ *	find a mapping in the hash table
++ *
++ *	caller must hold hash_lock
++ */
++static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode,
++	struct vs_mapping **local, struct vs_mapping **global)
++{
++	struct hlist_head *hash = dmap_main_hash;
++	struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)];
++	struct hlist_node *pos;
++	struct vs_mapping *vdm;
++
++	*local = NULL;
++	if (global)
++		*global = NULL;
++
++	hlist_for_each(pos, head) {
++		vdm = hlist_entry(pos, struct vs_mapping, dm_hlist);
++
++		if ((vdm->device == device) &&
++			!((vdm->target.flags ^ mode) & S_IFMT)) {
++			if (vdm->xid == xid) {
++				*local = vdm;
++				return 1;
++			} else if (global && vdm->xid == 0)
++				*global = vdm;
++		}
++	}
++
++	if (global && *global)
++		return 0;
++	else
++		return -ENOENT;
++}
++
++
++/*	__lookup_mapping()
++ *	find a mapping and store the result in target and flags
++ */
++static inline int __lookup_mapping(struct vx_info *vxi,
++	dev_t device, dev_t *target, int *flags, umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct vs_mapping *vdm, *global;
++	struct vx_dmap_target *vdmt;
++	int ret = 0;
++	xid_t xid = vxi->vx_id;
++	int index;
++
++	spin_lock(hash_lock);
++	if (__find_mapping(xid, device, mode, &vdm, &global) > 0) {
++		ret = 1;
++		vdmt = &vdm->target;
++		goto found;
++	}
++
++	index = __mode_to_default(mode);
++	if (vxi && vxi->dmap.targets[index].flags) {
++		ret = 2;
++		vdmt = &vxi->dmap.targets[index];
++	} else if (global) {
++		ret = 3;
++		vdmt = &global->target;
++		goto found;
++	} else {
++		ret = 4;
++		vdmt = &dmap_defaults[index];
++	}
++
++found:
++	if (target && (vdmt->flags & DATTR_REMAP))
++		*target = vdmt->target;
++	else if (target)
++		*target = device;
++	if (flags)
++		*flags = vdmt->flags;
++
++	spin_unlock(hash_lock);
++
++	return ret;
++}
++
++
++/*	__remove_mapping()
++ *	remove a mapping from the hash table
++ */
++static inline int __remove_mapping(struct vx_info *vxi, dev_t device,
++	umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct vs_mapping *vdm = NULL;
++	int ret = 0;
++
++	spin_lock(hash_lock);
++
++	ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm,
++		NULL);
++	vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x",
++		vxi, vxi ? vxi->vx_id : 0, device, mode);
++	if (ret < 0)
++		goto out;
++	hlist_del(&vdm->dm_hlist);
++
++out:
++	spin_unlock(hash_lock);
++	if (vdm)
++		kmem_cache_free(dmap_cachep, vdm);
++	return ret;
++}
++
++
++
++int vs_map_device(struct vx_info *vxi,
++	dev_t device, dev_t *target, umode_t mode)
++{
++	int ret, flags = DATTR_MASK;
++
++	if (!vxi) {
++		if (target)
++			*target = device;
++		goto out;
++	}
++	ret = __lookup_mapping(vxi, device, target, &flags, mode);
++	vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d",
++		device, target ? *target : 0, flags, mode, ret);
++out:
++	return (flags & DATTR_MASK);
++}
++
++
++
++static int do_set_mapping(struct vx_info *vxi,
++	dev_t device, dev_t target, int flags, umode_t mode)
++{
++	if (device) {
++		struct vs_mapping *new;
++
++		new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL);
++		if (!new)
++			return -ENOMEM;
++
++		INIT_HLIST_NODE(&new->dm_hlist);
++		new->device = device;
++		new->target.target = target;
++		new->target.flags = flags | mode;
++		new->xid = (vxi ? vxi->vx_id : 0);
++
++		vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags);
++		__hash_mapping(vxi, new);
++	} else {
++		struct vx_dmap_target new = {
++			.target = target,
++			.flags = flags | mode,
++		};
++		__set_default(vxi, mode, &new);
++	}
++	return 0;
++}
++
++
++static int do_unset_mapping(struct vx_info *vxi,
++	dev_t device, dev_t target, int flags, umode_t mode)
++{
++	int ret = -EINVAL;
++
++	if (device) {
++		ret = __remove_mapping(vxi, device, mode);
++		if (ret < 0)
++			goto out;
++	} else {
++		ret = __remove_default(vxi, mode);
++		if (ret < 0)
++			goto out;
++	}
++
++out:
++	return ret;
++}
++
++
++static inline int __user_device(const char __user *name, dev_t *dev,
++	umode_t *mode)
++{
++	struct nameidata nd;
++	int ret;
++
++	if (!name) {
++		*dev = 0;
++		return 0;
++	}
++	ret = user_lpath(name, &nd.path);
++	if (ret)
++		return ret;
++	if (nd.path.dentry->d_inode) {
++		*dev = nd.path.dentry->d_inode->i_rdev;
++		*mode = nd.path.dentry->d_inode->i_mode;
++	}
++	path_put(&nd.path);
++	return 0;
++}
++
++static inline int __mapping_mode(dev_t device, dev_t target,
++	umode_t device_mode, umode_t target_mode, umode_t *mode)
++{
++	if (device)
++		*mode = device_mode & S_IFMT;
++	else if (target)
++		*mode = target_mode & S_IFMT;
++	else
++		return -EINVAL;
++
++	/* if both given, device and target mode have to match */
++	if (device && target &&
++		((device_mode ^ target_mode) & S_IFMT))
++		return -EINVAL;
++	return 0;
++}
++
++
++static inline int do_mapping(struct vx_info *vxi, const char __user *device_path,
++	const char __user *target_path, int flags, int set)
++{
++	dev_t device = ~0, target = ~0;
++	umode_t device_mode = 0, target_mode = 0, mode;
++	int ret;
++
++	ret = __user_device(device_path, &device, &device_mode);
++	if (ret)
++		return ret;
++	ret = __user_device(target_path, &target, &target_mode);
++	if (ret)
++		return ret;
++
++	ret = __mapping_mode(device, target,
++		device_mode, target_mode, &mode);
++	if (ret)
++		return ret;
++
++	if (set)
++		return do_set_mapping(vxi, device, target,
++			flags, mode);
++	else
++		return do_unset_mapping(vxi, device, target,
++			flags, mode);
++}
++
++
++int vc_set_mapping(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, vc_data.device, vc_data.target,
++		vc_data.flags, 1);
++}
++
++int vc_unset_mapping(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, vc_data.device, vc_data.target,
++		vc_data.flags, 0);
++}
++
++
++#ifdef	CONFIG_COMPAT
++
++int vc_set_mapping_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++		compat_ptr(vc_data.target_ptr), vc_data.flags, 1);
++}
++
++int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++		compat_ptr(vc_data.target_ptr), vc_data.flags, 0);
++}
++
++#endif	/* CONFIG_COMPAT */
++
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/dlimit.c linux-3.4.45-vs2.3.3.9/kernel/vserver/dlimit.c
+--- linux-3.4.45/kernel/vserver/dlimit.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/dlimit.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,531 @@
++/*
++ *  linux/kernel/vserver/dlimit.c
++ *
++ *  Virtual Server: Context Disk Limits
++ *
++ *  Copyright (C) 2004-2009  Herbert Pötzl
++ *
++ *  V0.01  initial version
++ *  V0.02  compat32 splitup
++ *  V0.03  extended interface
++ *
++ */
++
++#include <linux/statfs.h>
++#include <linux/sched.h>
++#include <linux/namei.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vserver/dlimit_cmd.h>
++#include <linux/slab.h>
++// #include <linux/gfp.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, tag_t tag)
++{
++	struct dl_info *new = NULL;
++
++	vxdprintk(VXD_CBIT(dlim, 5),
++		"alloc_dl_info(%p,%d)*", sb, tag);
++
++	/* 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_tag = tag;
++	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, tag, 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_tag = -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 DEFINE_SPINLOCK(dl_info_hash_lock);
++
++
++static inline unsigned int __hashval(struct super_block *sb, tag_t tag)
++{
++	return ((tag ^ (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_tag);
++	get_dl_info(dli);
++	head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)];
++	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_tag);
++	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, tag_t tag)
++{
++	struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
++	struct hlist_node *pos;
++	struct dl_info *dli;
++
++	hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) {
++
++		if (dli->dl_tag == tag && dli->dl_sb == sb) {
++			return dli;
++		}
++	}
++	return NULL;
++}
++
++
++struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag)
++{
++	struct dl_info *dli;
++
++	rcu_read_lock();
++	dli = get_dl_info(__lookup_dl_info(sb, tag));
++	vxdprintk(VXD_CBIT(dlim, 7),
++		"locate_dl_info(%p,#%d) = %p", sb, tag, 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");
++}
++
++
++
++
++static int do_addrem_dlimit(uint32_t id, const char __user *name,
++	uint32_t flags, int add)
++{
++	struct path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.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_put(&path);
++	}
++	return ret;
++}
++
++int vc_add_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_base_v0 vc_data;
++
++	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 (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 (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 (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 path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.dentry->d_inode->i_sb))
++			goto out_release;
++
++		/* sanity checks */
++		if ((reserved != CDLIM_KEEP &&
++			reserved > 100) ||
++			(inodes_used != CDLIM_KEEP &&
++			inodes_used > inodes_total) ||
++			(space_used != 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 != CDLIM_KEEP)
++			dli->dl_inodes_used = inodes_used;
++		if (inodes_total != CDLIM_KEEP)
++			dli->dl_inodes_total = inodes_total;
++		if (space_used != CDLIM_KEEP)
++			dli->dl_space_used = dlimit_space_32to64(
++				space_used, flags, DLIMS_USED);
++
++		if (space_total == CDLIM_INFINITY)
++			dli->dl_space_total = DLIM_INFINITY;
++		else if (space_total != CDLIM_KEEP)
++			dli->dl_space_total = dlimit_space_32to64(
++				space_total, flags, DLIMS_TOTAL);
++
++		if (reserved != CDLIM_KEEP)
++			dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
++
++		spin_unlock(&dli->dl_lock);
++
++		put_dl_info(dli);
++		ret = 0;
++
++	out_release:
++		path_put(&path);
++	}
++	return ret;
++}
++
++int vc_set_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_v0 vc_data;
++
++	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 (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 path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.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 = dlimit_space_64to32(
++			dli->dl_space_used, flags, DLIMS_USED);
++
++		if (dli->dl_space_total == DLIM_INFINITY)
++			*space_total = CDLIM_INFINITY;
++		else
++			*space_total = dlimit_space_64to32(
++				dli->dl_space_total, flags, DLIMS_TOTAL);
++
++		*reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
++		spin_unlock(&dli->dl_lock);
++
++		put_dl_info(dli);
++		ret = -EFAULT;
++
++		ret = 0;
++	out_release:
++		path_put(&path);
++	}
++	return ret;
++}
++
++
++int vc_get_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_v0 vc_data;
++	int ret;
++
++	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 (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, dx_current_tag());
++	if (!dli)
++		return;
++
++	spin_lock(&dli->dl_lock);
++	if (dli->dl_inodes_total == (unsigned long)DLIM_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 == DLIM_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);
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/helper.c linux-3.4.45-vs2.3.3.9/kernel/vserver/helper.c
+--- linux-3.4.45/kernel/vserver/helper.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/helper.c	2012-09-16 18:49:44.000000000 +0000
+@@ -0,0 +1,229 @@
++/*
++ *  linux/kernel/vserver/helper.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic helper
++ *
++ */
++
++#include <linux/kmod.h>
++#include <linux/reboot.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/signal.h>
++
++
++char vshelper_path[255] = "/sbin/vshelper";
++
++static int vshelper_init(struct subprocess_info *info, struct cred *new_cred)
++{
++	current->flags &= ~PF_THREAD_BOUND;
++	return 0;
++}
++
++static int do_vshelper(char *name, char *argv[], char *envp[], int sync)
++{
++	int ret;
++
++	if ((ret = call_usermodehelper_fns(name, argv, envp,
++		sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC,
++		vshelper_init, NULL, NULL))) {
++		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_helper(struct vx_info *vxi, int cmd, void __user *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};
++
++	if (vx_info_state(vxi, VXS_HELPER))
++		return -EAGAIN;
++	vxi->vx_state |= VXS_HELPER;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
++
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++	snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", current_uid());
++	snprintf(pid_buf, sizeof(pid_buf), "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;
++
++	case LINUX_REBOOT_CMD_OOM:
++		argv[1] = "oom";
++		break;
++
++	default:
++		vxi->vx_state &= ~VXS_HELPER;
++		return 0;
++	}
++
++	ret = do_vshelper(vshelper_path, argv, envp, 0);
++	vxi->vx_state &= ~VXS_HELPER;
++	__wakeup_vx_info(vxi);
++	return (ret) ? -EPERM : 0;
++}
++
++
++long vs_reboot(unsigned int cmd, void __user *arg)
++{
++	struct vx_info *vxi = current_vx_info();
++	long ret = 0;
++
++	vxdprintk(VXD_CBIT(misc, 5),
++		"vs_reboot(%p[#%d],%u)",
++		vxi, vxi ? vxi->vx_id : 0, cmd);
++
++	ret = vs_reboot_helper(vxi, cmd, arg);
++	if (ret)
++		return ret;
++
++	vxi->reboot_cmd = cmd;
++	if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++		switch (cmd) {
++		case LINUX_REBOOT_CMD_RESTART:
++		case LINUX_REBOOT_CMD_HALT:
++		case LINUX_REBOOT_CMD_POWER_OFF:
++			vx_info_kill(vxi, 0, SIGKILL);
++			vx_info_kill(vxi, 1, SIGKILL);
++		default:
++			break;
++		}
++	}
++	return 0;
++}
++
++long vs_oom_action(unsigned int cmd)
++{
++	struct vx_info *vxi = current_vx_info();
++	long ret = 0;
++
++	vxdprintk(VXD_CBIT(misc, 5),
++		"vs_oom_action(%p[#%d],%u)",
++		vxi, vxi ? vxi->vx_id : 0, cmd);
++
++	ret = vs_reboot_helper(vxi, cmd, NULL);
++	if (ret)
++		return ret;
++
++	vxi->reboot_cmd = cmd;
++	if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++		vx_info_kill(vxi, 0, SIGKILL);
++		vx_info_kill(vxi, 1, SIGKILL);
++	}
++	return 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_SC_HELPER, 0))
++		return 0;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++
++	switch (cmd) {
++	case VSC_STARTUP:
++		argv[1] = "startup";
++		break;
++	case VSC_SHUTDOWN:
++		argv[1] = "shutdown";
++		break;
++	default:
++		return 0;
++	}
++
++	return do_vshelper(vshelper_path, argv, envp, 1);
++}
++
++
++/*
++ *      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_SC_HELPER, 0))
++		return 0;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id);
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++
++	switch (cmd) {
++	case VSC_NETUP:
++		argv[1] = "netup";
++		break;
++	case VSC_NETDOWN:
++		argv[1] = "netdown";
++		break;
++	default:
++		return 0;
++	}
++
++	return do_vshelper(vshelper_path, argv, envp, 1);
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/history.c linux-3.4.45-vs2.3.3.9/kernel/vserver/history.c
+--- linux-3.4.45/kernel/vserver/history.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/history.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,258 @@
++/*
++ *  kernel/vserver/history.c
++ *
++ *  Virtual Context History Backtrace
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *  V0.02  hash/unhash and trace
++ *  V0.03  preemption fixes
++ *
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++
++#include <linux/vserver/context.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/debug_cmd.h>
++#include <linux/vserver/history.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;
++}
++
++EXPORT_SYMBOL_GPL(vxh_advance);
++
++
++#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, cpu;
++
++	printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
++		atomic_read(&sequence), NR_CPUS);
++
++	for (i = 0; i < VXH_SIZE; i++) {
++		for_each_online_cpu(cpu) {
++			struct _vx_history *hist =
++				&per_cpu(vx_history_buffer, cpu);
++			unsigned int index = (hist->counter - i) % VXH_SIZE;
++			struct _vx_hist_entry *entry = &hist->entry[index];
++
++			vxh_dump_entry(entry, cpu);
++		}
++	}
++}
++
++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;
++}
++
++
++int do_read_history(struct __user _vx_hist_entry *data,
++	int cpu, uint32_t *index, uint32_t *count)
++{
++	int pos, ret = 0;
++	struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
++	int end = hist->counter;
++	int start = end - VXH_SIZE + 2;
++	int idx = *index;
++
++	/* special case: get current pos */
++	if (!*count) {
++		*index = end;
++		return 0;
++	}
++
++	/* have we lost some data? */
++	if (idx < start)
++		idx = start;
++
++	for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
++		struct _vx_hist_entry *entry =
++			&hist->entry[idx % VXH_SIZE];
++
++		/* send entry to userspace */
++		ret = copy_to_user(&data[pos], entry, sizeof(*entry));
++		if (ret)
++			break;
++	}
++	/* save new index and count */
++	*index = idx;
++	*count = pos;
++	return ret ? ret : (*index < end);
++}
++
++int vc_read_history(uint32_t id, void __user *data)
++{
++	struct vcmd_read_history_v0 vc_data;
++	int ret;
++
++	if (id >= NR_CPUS)
++		return -EINVAL;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
++		id, &vc_data.index, &vc_data.count);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++#ifdef	CONFIG_COMPAT
++
++int vc_read_history_x32(uint32_t id, void __user *data)
++{
++	struct vcmd_read_history_v0_x32 vc_data;
++	int ret;
++
++	if (id >= NR_CPUS)
++		return -EINVAL;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_read_history((struct __user _vx_hist_entry *)
++		compat_ptr(vc_data.data_ptr),
++		id, &vc_data.index, &vc_data.count);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/inet.c linux-3.4.45-vs2.3.3.9/kernel/vserver/inet.c
+--- linux-3.4.45/kernel/vserver/inet.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/inet.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,226 @@
++
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/export.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
++#include <linux/vserver/debug.h>
++#include <net/route.h>
++#include <net/addrconf.h>
++
++
++int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
++{
++	int ret = 0;
++
++	if (!nxi1 || !nxi2 || nxi1 == nxi2)
++		ret = 1;
++	else {
++		struct nx_addr_v4 *ptr;
++
++		for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
++			if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
++				ret = 1;
++				break;
++			}
++		}
++	}
++
++	vxdprintk(VXD_CBIT(net, 2),
++		"nx_v4_addr_conflict(%p,%p): %d",
++		nxi1, nxi2, ret);
++
++	return ret;
++}
++
++
++#ifdef	CONFIG_IPV6
++
++int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
++{
++	int ret = 0;
++
++	if (!nxi1 || !nxi2 || nxi1 == nxi2)
++		ret = 1;
++	else {
++		struct nx_addr_v6 *ptr;
++
++		for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
++			if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
++				ret = 1;
++				break;
++			}
++		}
++	}
++
++	vxdprintk(VXD_CBIT(net, 2),
++		"nx_v6_addr_conflict(%p,%p): %d",
++		nxi1, nxi2, ret);
++
++	return ret;
++}
++
++#endif
++
++int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	struct in_device *in_dev;
++	struct in_ifaddr **ifap;
++	struct in_ifaddr *ifa;
++	int ret = 0;
++
++	if (!dev)
++		goto out;
++	in_dev = in_dev_get(dev);
++	if (!in_dev)
++		goto out;
++
++	for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
++		ifap = &ifa->ifa_next) {
++		if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) {
++			ret = 1;
++			break;
++		}
++	}
++	in_dev_put(in_dev);
++out:
++	return ret;
++}
++
++
++#ifdef	CONFIG_IPV6
++
++int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	struct inet6_dev *in_dev;
++	struct inet6_ifaddr *ifa;
++	int ret = 0;
++
++	if (!dev)
++		goto out;
++	in_dev = in6_dev_get(dev);
++	if (!in_dev)
++		goto out;
++
++	// for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL;
++	list_for_each_entry(ifa, &in_dev->addr_list, if_list) {
++		if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) {
++			ret = 1;
++			break;
++		}
++	}
++	in6_dev_put(in_dev);
++out:
++	return ret;
++}
++
++#endif
++
++int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++	if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi))
++		goto out;
++#ifdef	CONFIG_IPV6
++	ret = 2;
++	if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi))
++		goto out;
++#endif
++	ret = 0;
++out:
++	vxdprintk(VXD_CBIT(net, 3),
++		"dev_in_nx_info(%p,%p[#%d]) = %d",
++		dev, nxi, nxi ? nxi->nx_id : 0, ret);
++	return ret;
++}
++
++struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi,
++	struct flowi4 *fl4)
++{
++	struct rtable *rt;
++
++	if (!nxi)
++		return NULL;
++
++	/* FIXME: handle lback only case */
++	if (!NX_IPV4(nxi))
++		return ERR_PTR(-EPERM);
++
++	vxdprintk(VXD_CBIT(net, 4),
++		"ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
++		nxi, nxi ? nxi->nx_id : 0,
++		NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr));
++
++	/* single IP is unconditional */
++	if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) &&
++		(fl4->saddr == INADDR_ANY))
++		fl4->saddr = nxi->v4.ip[0].s_addr;
++
++	if (fl4->saddr == INADDR_ANY) {
++		struct nx_addr_v4 *ptr;
++		__be32 found = 0;
++
++		rt = __ip_route_output_key(net, fl4);
++		if (!IS_ERR(rt)) {
++			found = fl4->saddr;
++			ip_rt_put(rt);
++			vxdprintk(VXD_CBIT(net, 4),
++				"ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found));
++			if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND))
++				goto found;
++		}
++
++		for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
++			__be32 primary = ptr->ip[0].s_addr;
++			__be32 mask = ptr->mask.s_addr;
++			__be32 neta = primary & mask;
++
++			vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: "
++				NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary),
++				NIPQUAD(mask), NIPQUAD(neta));
++			if ((found & mask) != neta)
++				continue;
++
++			fl4->saddr = primary;
++			rt = __ip_route_output_key(net, fl4);
++			vxdprintk(VXD_CBIT(net, 4),
++				"ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary));
++			if (!IS_ERR(rt)) {
++				found = fl4->saddr;
++				ip_rt_put(rt);
++				if (found == primary)
++					goto found;
++			}
++		}
++		/* still no source ip? */
++		found = ipv4_is_loopback(fl4->daddr)
++			? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
++	found:
++		/* assign src ip to flow */
++		fl4->saddr = found;
++
++	} else {
++		if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
++			return ERR_PTR(-EPERM);
++	}
++
++	if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
++		if (ipv4_is_loopback(fl4->daddr))
++			fl4->daddr = nxi->v4_lback.s_addr;
++		if (ipv4_is_loopback(fl4->saddr))
++			fl4->saddr = nxi->v4_lback.s_addr;
++	} else if (ipv4_is_loopback(fl4->daddr) &&
++		!nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
++		return ERR_PTR(-EPERM);
++
++	return NULL;
++}
++
++EXPORT_SYMBOL_GPL(ip_v4_find_src);
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/init.c linux-3.4.45-vs2.3.3.9/kernel/vserver/init.c
+--- linux-3.4.45/kernel/vserver/init.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/init.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,45 @@
++/*
++ *  linux/kernel/init.c
++ *
++ *  Virtual Server Init
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *
++ */
++
++#include <linux/init.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;
++}
++
++/* FIXME: GFP_ZONETYPES gone
++long vx_slab[GFP_ZONETYPES]; */
++long vx_area;
++
++
++module_init(init_vserver);
++module_exit(exit_vserver);
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/inode.c linux-3.4.45-vs2.3.3.9/kernel/vserver/inode.c
+--- linux-3.4.45/kernel/vserver/inode.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/inode.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,437 @@
++/*
++ *  linux/kernel/vserver/inode.c
++ *
++ *  Virtual Server: File System Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  separated from vcontext V0.05
++ *  V0.02  moved to tag (instead of xid)
++ *
++ */
++
++#include <linux/tty.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/fs.h>
++#include <linux/file.h>
++#include <linux/mount.h>
++#include <linux/parser.h>
++#include <linux/namei.h>
++#include <linux/vserver/inode.h>
++#include <linux/vserver/inode_cmd.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
++
++#include <asm/uaccess.h>
++
++
++static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
++{
++	struct proc_dir_entry *entry;
++
++	if (!in || !in->i_sb)
++		return -ESRCH;
++
++	*flags = IATTR_TAG
++		| (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
++		| (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
++		| (IS_BARRIER(in) ? IATTR_BARRIER : 0)
++		| (IS_COW(in) ? IATTR_COW : 0);
++	*mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW;
++
++	if (S_ISDIR(in->i_mode))
++		*mask |= IATTR_BARRIER;
++
++	if (IS_TAGGED(in)) {
++		*tag = in->i_tag;
++		*mask |= IATTR_TAG;
++	}
++
++	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:
++		*tag = in->i_tag;
++		*mask |= IATTR_TAG;
++		break;
++
++	default:
++		break;
++	}
++	return 0;
++}
++
++int vc_get_iattr(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(vc_data.name, &path);
++	if (!ret) {
++		ret = __vc_get_iattr(path.dentry->d_inode,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++	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(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
++	if (!ret) {
++		ret = __vc_get_iattr(path.dentry->d_inode,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
++
++int vc_fget_iattr(uint32_t fd, void __user *data)
++{
++	struct file *filp;
++	struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	filp = fget(fd);
++	if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++		return -EBADF;
++
++	ret = __vc_get_iattr(filp->f_dentry->d_inode,
++		&vc_data.tag, &vc_data.flags, &vc_data.mask);
++
++	fput(filp);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++
++static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
++{
++	struct inode *in = de->d_inode;
++	int error = 0, is_proc = 0, has_tag = 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_tag = IS_TAGGED(in) ||
++		(in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
++	if ((*mask & IATTR_TAG) && !has_tag)
++		return -EINVAL;
++
++	mutex_lock(&in->i_mutex);
++	if (*mask & IATTR_TAG) {
++		attr.ia_tag = *tag;
++		attr.ia_valid |= ATTR_TAG;
++	}
++
++	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_IMMUTABLE | IATTR_IXUNLINK |
++		IATTR_BARRIER | IATTR_COW)) {
++		int iflags = in->i_flags;
++		int vflags = in->i_vflags;
++
++		if (*mask & IATTR_IMMUTABLE) {
++			if (*flags & IATTR_IMMUTABLE)
++				iflags |= S_IMMUTABLE;
++			else
++				iflags &= ~S_IMMUTABLE;
++		}
++		if (*mask & IATTR_IXUNLINK) {
++			if (*flags & IATTR_IXUNLINK)
++				iflags |= S_IXUNLINK;
++			else
++				iflags &= ~S_IXUNLINK;
++		}
++		if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
++			if (*flags & IATTR_BARRIER)
++				vflags |= V_BARRIER;
++			else
++				vflags &= ~V_BARRIER;
++		}
++		if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) {
++			if (*flags & IATTR_COW)
++				vflags |= V_COW;
++			else
++				vflags &= ~V_COW;
++		}
++		if (in->i_op && in->i_op->sync_flags) {
++			error = in->i_op->sync_flags(in, iflags, vflags);
++			if (error)
++				goto out;
++		}
++	}
++
++	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) {
++				setattr_copy(in, &attr);
++				mark_inode_dirty(in);
++			}
++		}
++	}
++
++out:
++	mutex_unlock(&in->i_mutex);
++	return error;
++}
++
++int vc_set_iattr(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(vc_data.name, &path);
++	if (!ret) {
++		ret = __vc_set_iattr(path.dentry,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#ifdef	CONFIG_COMPAT
++
++int vc_set_iattr_x32(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1_x32 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
++	if (!ret) {
++		ret = __vc_set_iattr(path.dentry,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
++int vc_fset_iattr(uint32_t fd, void __user *data)
++{
++	struct file *filp;
++	struct vcmd_ctx_fiattr_v0 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	filp = fget(fd);
++	if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++		return -EBADF;
++
++	ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag,
++		&vc_data.flags, &vc_data.mask);
++
++	fput(filp);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++
++enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err };
++
++static match_table_t tokens = {
++	{Opt_notagcheck, "notagcheck"},
++#ifdef	CONFIG_PROPAGATE
++	{Opt_notag, "notag"},
++	{Opt_tag, "tag"},
++	{Opt_tagid, "tagid=%u"},
++#endif
++	{Opt_err, NULL}
++};
++
++
++static void __dx_parse_remove(char *string, char *opt)
++{
++	char *p = strstr(string, opt);
++	char *q = p;
++
++	if (p) {
++		while (*q != '\0' && *q != ',')
++			q++;
++		while (*q)
++			*p++ = *q++;
++		while (*p)
++			*p++ = '\0';
++	}
++}
++
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++		 unsigned long *flags)
++{
++	int set = 0;
++	substring_t args[MAX_OPT_ARGS];
++	int token;
++	char *s, *p, *opts;
++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
++	int option = 0;
++#endif
++
++	if (!string)
++		return 0;
++	s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
++	if (!s)
++		return 0;
++
++	opts = s;
++	while ((p = strsep(&opts, ",")) != NULL) {
++		token = match_token(p, tokens, args);
++
++		switch (token) {
++#ifdef CONFIG_PROPAGATE
++		case Opt_tag:
++			if (tag)
++				*tag = 0;
++			if (remove)
++				__dx_parse_remove(s, "tag");
++			*mnt_flags |= MNT_TAGID;
++			set |= MNT_TAGID;
++			break;
++		case Opt_notag:
++			if (remove)
++				__dx_parse_remove(s, "notag");
++			*mnt_flags |= MNT_NOTAG;
++			set |= MNT_NOTAG;
++			break;
++		case Opt_tagid:
++			if (tag && !match_int(args, &option))
++				*tag = option;
++			if (remove)
++				__dx_parse_remove(s, "tagid");
++			*mnt_flags |= MNT_TAGID;
++			set |= MNT_TAGID;
++			break;
++#endif	/* CONFIG_PROPAGATE */
++		case Opt_notagcheck:
++			if (remove)
++				__dx_parse_remove(s, "notagcheck");
++			*flags |= MS_NOTAGCHECK;
++			set |= MS_NOTAGCHECK;
++			break;
++		}
++		vxdprintk(VXD_CBIT(tag, 7),
++			"dx_parse_tag(" VS_Q("%s") "): %d:#%d",
++			p, token, option);
++	}
++	if (set)
++		strcpy(string, s);
++	kfree(s);
++	return set;
++}
++
++#ifdef	CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
++{
++	tag_t new_tag = 0;
++	struct vfsmount *mnt;
++	int propagate;
++
++	if (!nd)
++		return;
++	mnt = nd->path.mnt;
++	if (!mnt)
++		return;
++
++	propagate = (mnt->mnt_flags & MNT_TAGID);
++	if (propagate)
++		new_tag = mnt->mnt_tag;
++
++	vxdprintk(VXD_CBIT(tag, 7),
++		"dx_propagate_tag(%p[#%lu.%d]): %d,%d",
++		inode, inode->i_ino, inode->i_tag,
++		new_tag, (propagate) ? 1 : 0);
++
++	if (propagate)
++		inode->i_tag = new_tag;
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(__dx_propagate_tag);
++
++#endif	/* CONFIG_PROPAGATE */
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit.c linux-3.4.45-vs2.3.3.9/kernel/vserver/limit.c
+--- linux-3.4.45/kernel/vserver/limit.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit.c	2012-09-01 09:15:21.000000000 +0000
+@@ -0,0 +1,345 @@
++/*
++ *  linux/kernel/vserver/limit.c
++ *
++ *  Virtual Server: Context Limits
++ *
++ *  Copyright (C) 2004-2010  Herbert Pötzl
++ *
++ *  V0.01  broken out from vcontext V0.05
++ *  V0.02  changed vcmds to vxi arg
++ *  V0.03  added memory cgroup support
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/module.h>
++#include <linux/memcontrol.h>
++#include <linux/res_counter.h>
++#include <linux/vs_limit.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/limit_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++const char *vlimit_name[NUM_LIMITS] = {
++	[RLIMIT_CPU]		= "CPU",
++	[RLIMIT_NPROC]		= "NPROC",
++	[RLIMIT_NOFILE]		= "NOFILE",
++	[RLIMIT_LOCKS]		= "LOCKS",
++	[RLIMIT_SIGPENDING]	= "SIGP",
++	[RLIMIT_MSGQUEUE]	= "MSGQ",
++
++	[VLIMIT_NSOCK]		= "NSOCK",
++	[VLIMIT_OPENFD]		= "OPENFD",
++	[VLIMIT_SHMEM]		= "SHMEM",
++	[VLIMIT_DENTRY]		= "DENTRY",
++};
++
++EXPORT_SYMBOL_GPL(vlimit_name);
++
++#define MASK_ENTRY(x)	(1 << (x))
++
++const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
++		/* minimum */
++	0
++	,	/* softlimit */
++	0
++	,       /* maximum */
++	MASK_ENTRY( RLIMIT_NPROC	) |
++	MASK_ENTRY( RLIMIT_NOFILE	) |
++	MASK_ENTRY( RLIMIT_LOCKS	) |
++	MASK_ENTRY( RLIMIT_MSGQUEUE	) |
++
++	MASK_ENTRY( VLIMIT_NSOCK	) |
++	MASK_ENTRY( VLIMIT_OPENFD	) |
++	MASK_ENTRY( VLIMIT_SHMEM	) |
++	MASK_ENTRY( VLIMIT_DENTRY	) |
++	0
++};
++		/* accounting only */
++uint32_t account_mask =
++	MASK_ENTRY( VLIMIT_SEMARY	) |
++	MASK_ENTRY( VLIMIT_NSEMS	) |
++	MASK_ENTRY( VLIMIT_MAPPED	) |
++	0;
++
++
++static int is_valid_vlimit(int id)
++{
++	uint32_t mask = vlimit_mask.minimum |
++		vlimit_mask.softlimit | vlimit_mask.maximum;
++	return mask & (1 << id);
++}
++
++static int is_accounted_vlimit(int id)
++{
++	if (is_valid_vlimit(id))
++		return 1;
++	return account_mask & (1 << id);
++}
++
++
++static inline uint64_t vc_get_soft(struct vx_info *vxi, int id)
++{
++	rlim_t limit = __rlim_soft(&vxi->limit, id);
++	return VX_VLIM(limit);
++}
++
++static inline uint64_t vc_get_hard(struct vx_info *vxi, int id)
++{
++	rlim_t limit = __rlim_hard(&vxi->limit, id);
++	return VX_VLIM(limit);
++}
++
++static int do_get_rlimit(struct vx_info *vxi, uint32_t id,
++	uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum)
++{
++	if (!is_valid_vlimit(id))
++		return -EINVAL;
++
++	if (minimum)
++		*minimum = CRLIM_UNSET;
++	if (softlimit)
++		*softlimit = vc_get_soft(vxi, id);
++	if (maximum)
++		*maximum = vc_get_hard(vxi, id);
++	return 0;
++}
++
++int vc_get_rlimit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0 vc_data;
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_get_rlimit(vxi, vc_data.id,
++		&vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++static int do_set_rlimit(struct vx_info *vxi, uint32_t id,
++	uint64_t minimum, uint64_t softlimit, uint64_t maximum)
++{
++	if (!is_valid_vlimit(id))
++		return -EINVAL;
++
++	if (maximum != CRLIM_KEEP)
++		__rlim_hard(&vxi->limit, id) = VX_RLIM(maximum);
++	if (softlimit != CRLIM_KEEP)
++		__rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit);
++
++	/* clamp soft limit */
++	if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id))
++		__rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id);
++
++	return 0;
++}
++
++int vc_set_rlimit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_rlimit(vxi, vc_data.id,
++		vc_data.minimum, vc_data.softlimit, vc_data.maximum);
++}
++
++#ifdef	CONFIG_IA32_EMULATION
++
++int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_rlimit(vxi, vc_data.id,
++		vc_data.minimum, vc_data.softlimit, vc_data.maximum);
++}
++
++int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0_x32 vc_data;
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_get_rlimit(vxi, vc_data.id,
++		&vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++
++int vc_get_rlimit_mask(uint32_t id, void __user *data)
++{
++	if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
++		return -EFAULT;
++	return 0;
++}
++
++
++static inline void vx_reset_hits(struct _vx_limit *limit)
++{
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		atomic_set(&__rlim_lhit(limit, lim), 0);
++	}
++}
++
++int vc_reset_hits(struct vx_info *vxi, void __user *data)
++{
++	vx_reset_hits(&vxi->limit);
++	return 0;
++}
++
++static inline void vx_reset_minmax(struct _vx_limit *limit)
++{
++	rlim_t value;
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		value = __rlim_get(limit, lim);
++		__rlim_rmax(limit, lim) = value;
++		__rlim_rmin(limit, lim) = value;
++	}
++}
++
++int vc_reset_minmax(struct vx_info *vxi, void __user *data)
++{
++	vx_reset_minmax(&vxi->limit);
++	return 0;
++}
++
++
++int vc_rlimit_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_rlimit_stat_v0 vc_data;
++	struct _vx_limit *limit = &vxi->limit;
++	int id;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	id = vc_data.id;
++	if (!is_accounted_vlimit(id))
++		return -EINVAL;
++
++	vx_limit_fixup(limit, id);
++	vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
++	vc_data.value = __rlim_get(limit, id);
++	vc_data.minimum = __rlim_rmin(limit, id);
++	vc_data.maximum = __rlim_rmax(limit, id);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++void vx_vsi_meminfo(struct sysinfo *val)
++{
++#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
++	struct mem_cgroup *mcg;
++	u64 res_limit, res_usage;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	if (!mcg)
++		goto out;
++
++	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++
++	if (res_limit != RESOURCE_MAX)
++		val->totalram = (res_limit >> PAGE_SHIFT);
++	val->freeram = val->totalram - (res_usage >> PAGE_SHIFT);
++	val->bufferram = 0;
++	val->totalhigh = 0;
++	val->freehigh = 0;
++out:
++	rcu_read_unlock();
++#endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
++	return;
++}
++
++void vx_vsi_swapinfo(struct sysinfo *val)
++{
++#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
++#ifdef	CONFIG_CGROUP_MEM_RES_CTLR_SWAP
++	struct mem_cgroup *mcg;
++	u64 res_limit, res_usage, memsw_limit, memsw_usage;
++	s64 swap_limit, swap_usage;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	if (!mcg)
++		goto out;
++
++	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++	memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT);
++	memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE);
++
++	/* memory unlimited */
++	if (res_limit == RESOURCE_MAX)
++		goto out;
++
++	swap_limit = memsw_limit - res_limit;
++	/* we have a swap limit? */
++	if (memsw_limit != RESOURCE_MAX)
++		val->totalswap = swap_limit >> PAGE_SHIFT;
++
++	/* calculate swap part */
++	swap_usage = (memsw_usage > res_usage) ?
++		memsw_usage - res_usage : 0;
++
++	/* total shown minus usage gives free swap */
++	val->freeswap = (swap_usage < swap_limit) ?
++		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
++out:
++	rcu_read_unlock();
++#else	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
++	val->totalswap = 0;
++	val->freeswap = 0;
++#endif	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
++#endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
++	return;
++}
++
++long vx_vsi_cached(struct sysinfo *val)
++{
++	long cache = 0;
++#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
++	struct mem_cgroup *mcg;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	if (!mcg)
++		goto out;
++
++	cache = mem_cgroup_stat_read_cache(mcg);
++out:
++	rcu_read_unlock();
++#endif
++	return cache;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_init.h
+--- linux-3.4.45/kernel/vserver/limit_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_init.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,31 @@
++
++
++static inline void vx_info_init_limit(struct _vx_limit *limit)
++{
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		__rlim_soft(limit, lim) = RLIM_INFINITY;
++		__rlim_hard(limit, lim) = RLIM_INFINITY;
++		__rlim_set(limit, lim, 0);
++		atomic_set(&__rlim_lhit(limit, lim), 0);
++		__rlim_rmin(limit, lim) = 0;
++		__rlim_rmax(limit, lim) = 0;
++	}
++}
++
++static inline void vx_info_exit_limit(struct _vx_limit *limit)
++{
++	rlim_t value;
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		if ((1 << lim) & VLIM_NOCHECK)
++			continue;
++		value = __rlim_get(limit, lim);
++		vxwprintk_xid(value,
++			"!!! limit: %p[%s,%d] = %ld on exit.",
++			limit, vlimit_name[lim], lim, (long)value);
++	}
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/limit_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_proc.h
+--- linux-3.4.45/kernel/vserver/limit_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/limit_proc.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,57 @@
++#ifndef _VX_LIMIT_PROC_H
++#define _VX_LIMIT_PROC_H
++
++#include <linux/vserver/limit_int.h>
++
++
++#define VX_LIMIT_FMT	":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
++#define VX_LIMIT_TOP	\
++	"Limit\t current\t     min/max\t\t    soft/hard\t\thits\n"
++
++#define VX_LIMIT_ARG(r)				\
++	(unsigned long)__rlim_get(limit, r),	\
++	(unsigned long)__rlim_rmin(limit, r),	\
++	(unsigned long)__rlim_rmax(limit, r),	\
++	VX_VLIM(__rlim_soft(limit, r)),		\
++	VX_VLIM(__rlim_hard(limit, r)),		\
++	atomic_read(&__rlim_lhit(limit, r))
++
++static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
++{
++	vx_limit_fixup(limit, -1);
++	return sprintf(buffer, VX_LIMIT_TOP
++		"PROC"	VX_LIMIT_FMT
++		"VM"	VX_LIMIT_FMT
++		"VML"	VX_LIMIT_FMT
++		"RSS"	VX_LIMIT_FMT
++		"ANON"	VX_LIMIT_FMT
++		"RMAP"	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
++		"SEMA"	VX_LIMIT_FMT
++		"SEMS"	VX_LIMIT_FMT
++		"DENT"	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(VLIMIT_MAPPED),
++		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),
++		VX_LIMIT_ARG(VLIMIT_SEMARY),
++		VX_LIMIT_ARG(VLIMIT_NSEMS),
++		VX_LIMIT_ARG(VLIMIT_DENTRY));
++}
++
++#endif	/* _VX_LIMIT_PROC_H */
++
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/network.c linux-3.4.45-vs2.3.3.9/kernel/vserver/network.c
+--- linux-3.4.45/kernel/vserver/network.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/network.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,912 @@
++/*
++ *  linux/kernel/vserver/network.c
++ *
++ *  Virtual Server: Network Support
++ *
++ *  Copyright (C) 2003-2007  Herbert Pötzl
++ *
++ *  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
++ *  V0.06  changed vcmds to nxi arg
++ *  V0.07  have __create claim() the nxi
++ *
++ */
++
++#include <linux/err.h>
++#include <linux/slab.h>
++#include <linux/rcupdate.h>
++
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/network_cmd.h>
++
++
++atomic_t nx_global_ctotal	= ATOMIC_INIT(0);
++atomic_t nx_global_cactive	= ATOMIC_INIT(0);
++
++static struct kmem_cache *nx_addr_v4_cachep = NULL;
++static struct kmem_cache *nx_addr_v6_cachep = NULL;
++
++
++static int __init init_network(void)
++{
++	nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache",
++		sizeof(struct nx_addr_v4), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache",
++		sizeof(struct nx_addr_v6), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	return 0;
++}
++
++
++/*	__alloc_nx_addr_v4()					*/
++
++static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void)
++{
++	struct nx_addr_v4 *nxa = kmem_cache_alloc(
++		nx_addr_v4_cachep, GFP_KERNEL);
++
++	if (!IS_ERR(nxa))
++		memset(nxa, 0, sizeof(*nxa));
++	return nxa;
++}
++
++/*	__dealloc_nx_addr_v4()					*/
++
++static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa)
++{
++	kmem_cache_free(nx_addr_v4_cachep, nxa);
++}
++
++/*	__dealloc_nx_addr_v4_all()				*/
++
++static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa)
++{
++	while (nxa) {
++		struct nx_addr_v4 *next = nxa->next;
++
++		__dealloc_nx_addr_v4(nxa);
++		nxa = next;
++	}
++}
++
++
++#ifdef CONFIG_IPV6
++
++/*	__alloc_nx_addr_v6()					*/
++
++static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void)
++{
++	struct nx_addr_v6 *nxa = kmem_cache_alloc(
++		nx_addr_v6_cachep, GFP_KERNEL);
++
++	if (!IS_ERR(nxa))
++		memset(nxa, 0, sizeof(*nxa));
++	return nxa;
++}
++
++/*	__dealloc_nx_addr_v6()					*/
++
++static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa)
++{
++	kmem_cache_free(nx_addr_v6_cachep, nxa);
++}
++
++/*	__dealloc_nx_addr_v6_all()				*/
++
++static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa)
++{
++	while (nxa) {
++		struct nx_addr_v6 *next = nxa->next;
++
++		__dealloc_nx_addr_v6(nxa);
++		nxa = next;
++	}
++}
++
++#endif	/* CONFIG_IPV6 */
++
++/*	__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 */
++
++	new->v4_lback.s_addr = htonl(INADDR_LOOPBACK);
++	new->v4_bcast.s_addr = htonl(INADDR_BROADCAST);
++
++	vxdprintk(VXD_CBIT(nid, 0),
++		"alloc_nx_info(%d) = %p", nid, new);
++	atomic_inc(&nx_global_ctotal);
++	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));
++
++	__dealloc_nx_addr_v4_all(nxi->v4.next);
++
++	nxi->nx_state |= NXS_RELEASED;
++	kfree(nxi);
++	atomic_dec(&nx_global_ctotal);
++}
++
++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_read(&nxi->nx_tasks));
++
++	__dealloc_nx_info(nxi);
++}
++
++
++void __nx_set_lback(struct nx_info *nxi)
++{
++	int nid = nxi->nx_id;
++	__be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
++
++	nxi->v4_lback.s_addr = lback;
++}
++
++extern int __nx_inet_add_lback(__be32 addr);
++extern int __nx_inet_del_lback(__be32 addr);
++
++
++/*	hash table for nx_info hash */
++
++#define NX_HASH_SIZE	13
++
++struct hlist_head nx_info_hash[NX_HASH_SIZE];
++
++static DEFINE_SPINLOCK(nx_info_hash_lock);
++
++
++static inline unsigned int __hashval(nid_t nid)
++{
++	return (nid % NX_HASH_SIZE);
++}
++
++
++
++/*	__hash_nx_info()
++
++	* add the nxi to the global hash table
++	* requires the hash_lock to be held			*/
++
++static inline void __hash_nx_info(struct nx_info *nxi)
++{
++	struct hlist_head *head;
++
++	vxd_assert_lock(&nx_info_hash_lock);
++	vxdprintk(VXD_CBIT(nid, 4),
++		"__hash_nx_info: %p[#%d]", nxi, nxi->nx_id);
++
++	/* context must not be hashed */
++	BUG_ON(nx_info_state(nxi, NXS_HASHED));
++
++	nxi->nx_state |= NXS_HASHED;
++	head = &nx_info_hash[__hashval(nxi->nx_id)];
++	hlist_add_head(&nxi->nx_hlist, head);
++	atomic_inc(&nx_global_cactive);
++}
++
++/*	__unhash_nx_info()
++
++	* remove the nxi from the global hash table
++	* requires the hash_lock to be held			*/
++
++static inline void __unhash_nx_info(struct nx_info *nxi)
++{
++	vxd_assert_lock(&nx_info_hash_lock);
++	vxdprintk(VXD_CBIT(nid, 4),
++		"__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
++		atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
++
++	/* context must be hashed */
++	BUG_ON(!nx_info_state(nxi, NXS_HASHED));
++	/* but without tasks */
++	BUG_ON(atomic_read(&nxi->nx_tasks));
++
++	nxi->nx_state &= ~NXS_HASHED;
++	hlist_del(&nxi->nx_hlist);
++	atomic_dec(&nx_global_cactive);
++}
++
++
++/*	__lookup_nx_info()
++
++	* requires the hash_lock to be held
++	* doesn't increment the nx_refcnt			*/
++
++static inline struct nx_info *__lookup_nx_info(nid_t nid)
++{
++	struct hlist_head *head = &nx_info_hash[__hashval(nid)];
++	struct hlist_node *pos;
++	struct nx_info *nxi;
++
++	vxd_assert_lock(&nx_info_hash_lock);
++	hlist_for_each(pos, head) {
++		nxi = hlist_entry(pos, struct nx_info, nx_hlist);
++
++		if (nxi->nx_id == nid)
++			goto found;
++	}
++	nxi = NULL;
++found:
++	vxdprintk(VXD_CBIT(nid, 0),
++		"__lookup_nx_info(#%u): %p[#%u]",
++		nid, nxi, nxi ? nxi->nx_id : 0);
++	return nxi;
++}
++
++
++/*	__create_nx_info()
++
++	* create the requested context
++	* get(), claim() and hash it				*/
++
++static struct nx_info *__create_nx_info(int id)
++{
++	struct nx_info *new, *nxi = NULL;
++
++	vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id);
++
++	if (!(new = __alloc_nx_info(id)))
++		return ERR_PTR(-ENOMEM);
++
++	/* required to make dynamic xids unique */
++	spin_lock(&nx_info_hash_lock);
++
++	/* static context requested */
++	if ((nxi = __lookup_nx_info(id))) {
++		vxdprintk(VXD_CBIT(nid, 0),
++			"create_nx_info(%d) = %p (already there)", id, nxi);
++		if (nx_info_flags(nxi, NXF_STATE_SETUP, 0))
++			nxi = ERR_PTR(-EBUSY);
++		else
++			nxi = ERR_PTR(-EEXIST);
++		goto out_unlock;
++	}
++	/* new context */
++	vxdprintk(VXD_CBIT(nid, 0),
++		"create_nx_info(%d) = %p (new)", id, new);
++	claim_nx_info(new, NULL);
++	__nx_set_lback(new);
++	__hash_nx_info(get_nx_info(new));
++	nxi = new, new = NULL;
++
++out_unlock:
++	spin_unlock(&nx_info_hash_lock);
++	if (new)
++		__dealloc_nx_info(new);
++	return nxi;
++}
++
++
++
++/*	exported stuff						*/
++
++
++void unhash_nx_info(struct nx_info *nxi)
++{
++	__shutdown_nx_info(nxi);
++	spin_lock(&nx_info_hash_lock);
++	__unhash_nx_info(nxi);
++	spin_unlock(&nx_info_hash_lock);
++}
++
++/*	lookup_nx_info()
++
++	* search for a nx_info and get() it
++	* negative id means current				*/
++
++struct nx_info *lookup_nx_info(int id)
++{
++	struct nx_info *nxi = NULL;
++
++	if (id < 0) {
++		nxi = get_nx_info(current_nx_info());
++	} else if (id > 1) {
++		spin_lock(&nx_info_hash_lock);
++		nxi = get_nx_info(__lookup_nx_info(id));
++		spin_unlock(&nx_info_hash_lock);
++	}
++	return nxi;
++}
++
++/*	nid_is_hashed()
++
++	* verify that nid is still hashed			*/
++
++int nid_is_hashed(nid_t nid)
++{
++	int hashed;
++
++	spin_lock(&nx_info_hash_lock);
++	hashed = (__lookup_nx_info(nid) != NULL);
++	spin_unlock(&nx_info_hash_lock);
++	return hashed;
++}
++
++
++#ifdef	CONFIG_PROC_FS
++
++/*	get_nid_list()
++
++	* get a subset of hashed nids for proc
++	* assumes size is at least one				*/
++
++int get_nid_list(int index, unsigned int *nids, int size)
++{
++	int hindex, nr_nids = 0;
++
++	/* only show current and children */
++	if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
++		if (index > 0)
++			return 0;
++		nids[nr_nids] = nx_current_nid();
++		return 1;
++	}
++
++	for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) {
++		struct hlist_head *head = &nx_info_hash[hindex];
++		struct hlist_node *pos;
++
++		spin_lock(&nx_info_hash_lock);
++		hlist_for_each(pos, head) {
++			struct nx_info *nxi;
++
++			if (--index > 0)
++				continue;
++
++			nxi = hlist_entry(pos, struct nx_info, nx_hlist);
++			nids[nr_nids] = nxi->nx_id;
++			if (++nr_nids >= size) {
++				spin_unlock(&nx_info_hash_lock);
++				goto out;
++			}
++		}
++		/* keep the lock time short */
++		spin_unlock(&nx_info_hash_lock);
++	}
++out:
++	return nr_nids;
++}
++#endif
++
++
++/*
++ *	migrate task to new network
++ *	gets nxi, puts old_nxi on change
++ */
++
++int nx_migrate_task(struct task_struct *p, struct nx_info *nxi)
++{
++	struct nx_info *old_nxi;
++	int ret = 0;
++
++	if (!p || !nxi)
++		BUG();
++
++	vxdprintk(VXD_CBIT(nid, 5),
++		"nx_migrate_task(%p,%p[#%d.%d.%d])",
++		p, nxi, nxi->nx_id,
++		atomic_read(&nxi->nx_usecnt),
++		atomic_read(&nxi->nx_tasks));
++
++	if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) &&
++		!nx_info_flags(nxi, NXF_STATE_SETUP, 0))
++		return -EACCES;
++
++	if (nx_info_state(nxi, NXS_SHUTDOWN))
++		return -EFAULT;
++
++	/* maybe disallow this completely? */
++	old_nxi = task_get_nx_info(p);
++	if (old_nxi == nxi)
++		goto out;
++
++	task_lock(p);
++	if (old_nxi)
++		clr_nx_info(&p->nx_info);
++	claim_nx_info(nxi, p);
++	set_nx_info(&p->nx_info, nxi);
++	p->nid = nxi->nx_id;
++	task_unlock(p);
++
++	vxdprintk(VXD_CBIT(nid, 5),
++		"moved task %p into nxi:%p[#%d]",
++		p, nxi, nxi->nx_id);
++
++	if (old_nxi)
++		release_nx_info(old_nxi, p);
++	ret = 0;
++out:
++	put_nx_info(old_nxi);
++	return ret;
++}
++
++
++void nx_set_persistent(struct nx_info *nxi)
++{
++	vxdprintk(VXD_CBIT(nid, 6),
++		"nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
++
++	get_nx_info(nxi);
++	claim_nx_info(nxi, NULL);
++}
++
++void nx_clear_persistent(struct nx_info *nxi)
++{
++	vxdprintk(VXD_CBIT(nid, 6),
++		"nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
++
++	release_nx_info(nxi, NULL);
++	put_nx_info(nxi);
++}
++
++void nx_update_persistent(struct nx_info *nxi)
++{
++	if (nx_info_flags(nxi, NXF_PERSISTENT, 0))
++		nx_set_persistent(nxi);
++	else
++		nx_clear_persistent(nxi);
++}
++
++/* vserver syscall commands below here */
++
++/* taks nid and nx_info functions */
++
++#include <asm/uaccess.h>
++
++
++int vc_task_nid(uint32_t id)
++{
++	nid_t nid;
++
++	if (id) {
++		struct task_struct *tsk;
++
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		nid = (tsk) ? tsk->nid : -ESRCH;
++		rcu_read_unlock();
++	} else
++		nid = nx_current_nid();
++	return nid;
++}
++
++
++int vc_nx_info(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_nx_info_v0 vc_data;
++
++	vc_data.nid = nxi->nx_id;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++/* network functions */
++
++int vc_net_create(uint32_t nid, void __user *data)
++{
++	struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET };
++	struct nx_info *new_nxi;
++	int ret;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if ((nid > MAX_S_CONTEXT) || (nid < 2))
++		return -EINVAL;
++
++	new_nxi = __create_nx_info(nid);
++	if (IS_ERR(new_nxi))
++		return PTR_ERR(new_nxi);
++
++	/* initial flags */
++	new_nxi->nx_flags = vc_data.flagword;
++
++	ret = -ENOEXEC;
++	if (vs_net_change(new_nxi, VSC_NETUP))
++		goto out;
++
++	ret = nx_migrate_task(current, new_nxi);
++	if (ret)
++		goto out;
++
++	/* return context id on success */
++	ret = new_nxi->nx_id;
++
++	/* get a reference for persistent contexts */
++	if ((vc_data.flagword & NXF_PERSISTENT))
++		nx_set_persistent(new_nxi);
++out:
++	release_nx_info(new_nxi, NULL);
++	put_nx_info(new_nxi);
++	return ret;
++}
++
++
++int vc_net_migrate(struct nx_info *nxi, void __user *data)
++{
++	return nx_migrate_task(current, nxi);
++}
++
++
++
++int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
++	uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v4 *nxa = &nxi->v4;
++
++	if (NX_IPV4(nxi)) {
++		/* locate last entry */
++		for (; nxa->next; nxa = nxa->next);
++		nxa->next = __alloc_nx_addr_v4();
++		nxa = nxa->next;
++
++		if (IS_ERR(nxa))
++			return PTR_ERR(nxa);
++	}
++
++	if (nxi->v4.next)
++		/* remove single ip for ip list */
++		nxi->nx_flags &= ~NXF_SINGLE_IP;
++
++	nxa->ip[0].s_addr = ip;
++	nxa->ip[1].s_addr = ip2;
++	nxa->mask.s_addr = mask;
++	nxa->type = type;
++	nxa->flags = flags;
++	return 0;
++}
++
++int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
++	uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v4 *nxa = &nxi->v4;
++
++	switch (type) {
++/*	case NXA_TYPE_ADDR:
++		break;		*/
++
++	case NXA_TYPE_ANY:
++		__dealloc_nx_addr_v4_all(xchg(&nxa->next, NULL));
++		memset(nxa, 0, sizeof(*nxa));
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++
++int vc_net_add(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_v0 vc_data;
++	int index, ret = 0;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_IPV4:
++		if ((vc_data.count < 1) || (vc_data.count > 4))
++			return -EINVAL;
++
++		index = 0;
++		while (index < vc_data.count) {
++			ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0,
++				vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0);
++			if (ret)
++				return ret;
++			index++;
++		}
++		ret = index;
++		break;
++
++	case NXA_TYPE_IPV4|NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip[0];
++		ret = 1;
++		break;
++
++	case NXA_TYPE_IPV4|NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip[0];
++		ret = 1;
++		break;
++
++	default:
++		ret = -EINVAL;
++		break;
++	}
++	return ret;
++}
++
++int vc_net_remove(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_v0 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ANY:
++		__dealloc_nx_addr_v4_all(xchg(&nxi->v4.next, NULL));
++		memset(&nxi->v4, 0, sizeof(nxi->v4));
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++
++int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++	case NXA_TYPE_MASK:
++		return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0,
++			vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++	case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip;
++		break;
++
++	case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip;
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_add_ipv4(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v2 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++	case NXA_TYPE_MASK:
++	case NXA_TYPE_RANGE:
++		return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
++			vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++	case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip;
++		break;
++
++	case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip;
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0,
++		vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++}
++
++int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v2 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
++		vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++}
++
++#ifdef CONFIG_IPV6
++
++int do_add_v6_addr(struct nx_info *nxi,
++	struct in6_addr *ip, struct in6_addr *mask,
++	uint32_t prefix, uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v6 *nxa = &nxi->v6;
++
++	if (NX_IPV6(nxi)) {
++		/* locate last entry */
++		for (; nxa->next; nxa = nxa->next);
++		nxa->next = __alloc_nx_addr_v6();
++		nxa = nxa->next;
++
++		if (IS_ERR(nxa))
++			return PTR_ERR(nxa);
++	}
++
++	nxa->ip = *ip;
++	nxa->mask = *mask;
++	nxa->prefix = prefix;
++	nxa->type = type;
++	nxa->flags = flags;
++	return 0;
++}
++
++
++int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv6_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++		memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++		/* fallthrough */
++	case NXA_TYPE_MASK:
++		return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++			vc_data.prefix, vc_data.type, vc_data.flags);
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv6_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ANY:
++		__dealloc_nx_addr_v6_all(xchg(&nxi->v6.next, NULL));
++		memset(&nxi->v6, 0, sizeof(nxi->v6));
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++#endif	/* CONFIG_IPV6 */
++
++
++int vc_get_nflags(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_flags_v0 vc_data;
++
++	vc_data.flagword = nxi->nx_flags;
++
++	/* special STATE flag handling */
++	vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_nflags(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_flags_v0 vc_data;
++	uint64_t mask, trigger;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special STATE flag handling */
++	mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
++	trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword);
++
++	nxi->nx_flags = vs_mask_flags(nxi->nx_flags,
++		vc_data.flagword, mask);
++	if (trigger & NXF_PERSISTENT)
++		nx_update_persistent(nxi);
++
++	return 0;
++}
++
++int vc_get_ncaps(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_caps_v0 vc_data;
++
++	vc_data.ncaps = nxi->nx_ncaps;
++	vc_data.cmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_ncaps(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_caps_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
++		vc_data.ncaps, vc_data.cmask);
++	return 0;
++}
++
++
++#include <linux/module.h>
++
++module_init(init_network);
++
++EXPORT_SYMBOL_GPL(free_nx_info);
++EXPORT_SYMBOL_GPL(unhash_nx_info);
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/proc.c linux-3.4.45-vs2.3.3.9/kernel/vserver/proc.c
+--- linux-3.4.45/kernel/vserver/proc.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/proc.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,1103 @@
++/*
++ *  linux/kernel/vserver/proc.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *  V0.02  adaptation vs1.3.0
++ *  V0.03  proc permissions
++ *  V0.04  locking/generic
++ *  V0.05  next generation procfs
++ *  V0.06  inode validation
++ *  V0.07  generic rewrite vid
++ *  V0.08  remove inode type
++ *  V0.09  added u/wmask info
++ *
++ */
++
++#include <linux/proc_fs.h>
++#include <linux/fs_struct.h>
++#include <linux/mount.h>
++#include <asm/unistd.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_cvirt.h>
++
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
++
++#include <linux/vserver/global.h>
++
++#include "cvirt_proc.h"
++#include "cacct_proc.h"
++#include "limit_proc.h"
++#include "sched_proc.h"
++#include "vci_config.h"
++
++
++static inline char *print_cap_t(char *buffer, kernel_cap_t *c)
++{
++	unsigned __capi;
++
++	CAP_FOR_EACH_U32(__capi) {
++		buffer += sprintf(buffer, "%08x",
++			c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]);
++	}
++	return buffer;
++}
++
++
++static struct proc_dir_entry *proc_virtual;
++
++static struct proc_dir_entry *proc_virtnet;
++
++
++/* first the actual feeds */
++
++
++static int proc_vci(char *buffer)
++{
++	return sprintf(buffer,
++		"VCIVersion:\t%04x:%04x\n"
++		"VCISyscall:\t%d\n"
++		"VCIKernel:\t%08x\n",
++		VCI_VERSION >> 16,
++		VCI_VERSION & 0xFFFF,
++		__NR_vserver,
++		vci_kernel_config());
++}
++
++static int proc_virtual_info(char *buffer)
++{
++	return proc_vci(buffer);
++}
++
++static int proc_virtual_status(char *buffer)
++{
++	return sprintf(buffer,
++		"#CTotal:\t%d\n"
++		"#CActive:\t%d\n"
++		"#NSProxy:\t%d\t%d %d %d %d %d %d\n"
++		"#InitTask:\t%d\t%d %d\n",
++		atomic_read(&vx_global_ctotal),
++		atomic_read(&vx_global_cactive),
++		atomic_read(&vs_global_nsproxy),
++		atomic_read(&vs_global_fs),
++		atomic_read(&vs_global_mnt_ns),
++		atomic_read(&vs_global_uts_ns),
++		atomic_read(&nr_ipc_ns),
++		atomic_read(&vs_global_user_ns),
++		atomic_read(&vs_global_pid_ns),
++		atomic_read(&init_task.usage),
++		atomic_read(&init_task.nsproxy->count),
++		init_task.fs->users);
++}
++
++
++int proc_vxi_info(struct vx_info *vxi, char *buffer)
++{
++	int length;
++
++	length = sprintf(buffer,
++		"ID:\t%d\n"
++		"Info:\t%p\n"
++		"Init:\t%d\n"
++		"OOM:\t%lld\n",
++		vxi->vx_id,
++		vxi,
++		vxi->vx_initpid,
++		vxi->vx_badness_bias);
++	return length;
++}
++
++int proc_vxi_status(struct vx_info *vxi, char *buffer)
++{
++	char *orig = buffer;
++
++	buffer += sprintf(buffer,
++		"UseCnt:\t%d\n"
++		"Tasks:\t%d\n"
++		"Flags:\t%016llx\n",
++		atomic_read(&vxi->vx_usecnt),
++		atomic_read(&vxi->vx_tasks),
++		(unsigned long long)vxi->vx_flags);
++
++	buffer += sprintf(buffer, "BCaps:\t");
++	buffer = print_cap_t(buffer, &vxi->vx_bcaps);
++	buffer += sprintf(buffer, "\n");
++
++	buffer += sprintf(buffer,
++		"CCaps:\t%016llx\n"
++		"Umask:\t%16llx\n"
++		"Wmask:\t%16llx\n"
++		"Spaces:\t%08lx %08lx\n",
++		(unsigned long long)vxi->vx_ccaps,
++		(unsigned long long)vxi->vx_umask,
++		(unsigned long long)vxi->vx_wmask,
++		vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
++	return buffer - orig;
++}
++
++int proc_vxi_limit(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_limit(&vxi->limit, buffer);
++}
++
++int proc_vxi_sched(struct vx_info *vxi, char *buffer)
++{
++	int cpu, length;
++
++	length = vx_info_proc_sched(&vxi->sched, buffer);
++	for_each_online_cpu(cpu) {
++		length += vx_info_proc_sched_pc(
++			&vx_per_cpu(vxi, sched_pc, cpu),
++			buffer + length, cpu);
++	}
++	return length;
++}
++
++int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer);
++}
++
++int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer);
++}
++
++int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
++{
++	int cpu, length;
++
++	vx_update_load(vxi);
++	length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
++	for_each_online_cpu(cpu) {
++		length += vx_info_proc_cvirt_pc(
++			&vx_per_cpu(vxi, cvirt_pc, cpu),
++			buffer + length, cpu);
++	}
++	return length;
++}
++
++int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_cacct(&vxi->cacct, buffer);
++}
++
++
++static int proc_virtnet_info(char *buffer)
++{
++	return proc_vci(buffer);
++}
++
++static int proc_virtnet_status(char *buffer)
++{
++	return sprintf(buffer,
++		"#CTotal:\t%d\n"
++		"#CActive:\t%d\n",
++		atomic_read(&nx_global_ctotal),
++		atomic_read(&nx_global_cactive));
++}
++
++int proc_nxi_info(struct nx_info *nxi, char *buffer)
++{
++	struct nx_addr_v4 *v4a;
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 *v6a;
++#endif
++	int length, i;
++
++	length = sprintf(buffer,
++		"ID:\t%d\n"
++		"Info:\t%p\n"
++		"Bcast:\t" NIPQUAD_FMT "\n"
++		"Lback:\t" NIPQUAD_FMT "\n",
++		nxi->nx_id,
++		nxi,
++		NIPQUAD(nxi->v4_bcast.s_addr),
++		NIPQUAD(nxi->v4_lback.s_addr));
++
++	if (!NX_IPV4(nxi))
++		goto skip_v4;
++	for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++		length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n",
++			i, NXAV4(v4a));
++skip_v4:
++#ifdef	CONFIG_IPV6
++	if (!NX_IPV6(nxi))
++		goto skip_v6;
++	for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++		length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n",
++			i, NXAV6(v6a));
++skip_v6:
++#endif
++	return length;
++}
++
++int proc_nxi_status(struct nx_info *nxi, char *buffer)
++{
++	int length;
++
++	length = sprintf(buffer,
++		"UseCnt:\t%d\n"
++		"Tasks:\t%d\n"
++		"Flags:\t%016llx\n"
++		"NCaps:\t%016llx\n",
++		atomic_read(&nxi->nx_usecnt),
++		atomic_read(&nxi->nx_tasks),
++		(unsigned long long)nxi->nx_flags,
++		(unsigned long long)nxi->nx_ncaps);
++	return length;
++}
++
++
++
++/* here the inode helpers */
++
++struct vs_entry {
++	int len;
++	char *name;
++	mode_t mode;
++	struct inode_operations *iop;
++	struct file_operations *fop;
++	union proc_op op;
++};
++
++static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p)
++{
++	struct inode *inode = new_inode(sb);
++
++	if (!inode)
++		goto out;
++
++	inode->i_mode = p->mode;
++	if (p->iop)
++		inode->i_op = p->iop;
++	if (p->fop)
++		inode->i_fop = p->fop;
++
++	set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1);
++	inode->i_flags |= S_IMMUTABLE;
++
++	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
++
++	inode->i_uid = 0;
++	inode->i_gid = 0;
++	inode->i_tag = 0;
++out:
++	return inode;
++}
++
++static struct dentry *vs_proc_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	struct vs_entry *p = ptr;
++	struct inode *inode = vs_proc_make_inode(dir->i_sb, p);
++	struct dentry *error = ERR_PTR(-EINVAL);
++
++	if (!inode)
++		goto out;
++
++	PROC_I(inode)->op = p->op;
++	PROC_I(inode)->fd = id;
++	d_add(dentry, inode);
++	error = NULL;
++out:
++	return error;
++}
++
++/* Lookups */
++
++typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *);
++
++/*
++ * Fill a directory entry.
++ *
++ * If possible create the dcache entry and derive our inode number and
++ * file type from dcache entry.
++ *
++ * Since all of the proc inode numbers are dynamically generated, the inode
++ * numbers do not exist until the inode is cache.  This means creating the
++ * the dcache entry in readdir is necessary to keep the inode numbers
++ * reported by readdir in sync with the inode numbers reported
++ * by stat.
++ */
++static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
++	char *name, int len, instantiate_t instantiate, int id, void *ptr)
++{
++	struct dentry *child, *dir = filp->f_dentry;
++	struct inode *inode;
++	struct qstr qname;
++	ino_t ino = 0;
++	unsigned type = DT_UNKNOWN;
++
++	qname.name = name;
++	qname.len  = len;
++	qname.hash = full_name_hash(name, len);
++
++	child = d_lookup(dir, &qname);
++	if (!child) {
++		struct dentry *new;
++		new = d_alloc(dir, &qname);
++		if (new) {
++			child = instantiate(dir->d_inode, new, id, ptr);
++			if (child)
++				dput(new);
++			else
++				child = new;
++		}
++	}
++	if (!child || IS_ERR(child) || !child->d_inode)
++		goto end_instantiate;
++	inode = child->d_inode;
++	if (inode) {
++		ino = inode->i_ino;
++		type = inode->i_mode >> 12;
++	}
++	dput(child);
++end_instantiate:
++	if (!ino)
++		ino = find_inode_number(dir, &qname);
++	if (!ino)
++		ino = 1;
++	return filldir(dirent, name, len, filp->f_pos, ino, type);
++}
++
++
++
++/* get and revalidate vx_info/xid */
++
++static inline
++struct vx_info *get_proc_vx_info(struct inode *inode)
++{
++	return lookup_vx_info(PROC_I(inode)->fd);
++}
++
++static int proc_xid_revalidate(struct dentry *dentry, struct nameidata *nd)
++{
++	struct inode *inode = dentry->d_inode;
++	xid_t xid = PROC_I(inode)->fd;
++
++	if (!xid || xid_is_hashed(xid))
++		return 1;
++	d_drop(dentry);
++	return 0;
++}
++
++
++/* get and revalidate nx_info/nid */
++
++static int proc_nid_revalidate(struct dentry *dentry, struct nameidata *nd)
++{
++	struct inode *inode = dentry->d_inode;
++	nid_t nid = PROC_I(inode)->fd;
++
++	if (!nid || nid_is_hashed(nid))
++		return 1;
++	d_drop(dentry);
++	return 0;
++}
++
++
++
++#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
++
++static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(PROC_I(inode)->fd);
++
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		return -ENOMEM;
++
++	BUG_ON(!PROC_I(inode)->op.proc_vs_read);
++	length = PROC_I(inode)->op.proc_vs_read((char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++	return length;
++}
++
++static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	struct vx_info *vxi = NULL;
++	xid_t xid = PROC_I(inode)->fd;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(!xid);
++	vxi = lookup_vx_info(xid);
++	if (!vxi)
++		goto out;
++
++	length = -ENOMEM;
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		goto out_put;
++
++	BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
++	length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++out_put:
++	put_vx_info(vxi);
++out:
++	return length;
++}
++
++static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	struct nx_info *nxi = NULL;
++	nid_t nid = PROC_I(inode)->fd;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(!nid);
++	nxi = lookup_nx_info(nid);
++	if (!nxi)
++		goto out;
++
++	length = -ENOMEM;
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		goto out_put;
++
++	BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
++	length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++out_put:
++	put_nx_info(nxi);
++out:
++	return length;
++}
++
++
++
++/* here comes the lower level */
++
++
++#define NOD(NAME, MODE, IOP, FOP, OP) {	\
++	.len  = sizeof(NAME) - 1,	\
++	.name = (NAME),			\
++	.mode = MODE,			\
++	.iop  = IOP,			\
++	.fop  = FOP,			\
++	.op   = OP,			\
++}
++
++
++#define DIR(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFDIR | (MODE)),			\
++		&proc_ ## OTYPE ## _inode_operations,	\
++		&proc_ ## OTYPE ## _file_operations, { } )
++
++#define INF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_vs_info_file_operations,		\
++		{ .proc_vs_read = &proc_##OTYPE } )
++
++#define VINF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_vx_info_file_operations,		\
++		{ .proc_vxi_read = &proc_##OTYPE } )
++
++#define NINF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_nx_info_file_operations,		\
++		{ .proc_nxi_read = &proc_##OTYPE } )
++
++
++static struct file_operations proc_vs_info_file_operations = {
++	.read =		proc_vs_info_read,
++};
++
++static struct file_operations proc_vx_info_file_operations = {
++	.read =		proc_vx_info_read,
++};
++
++static struct dentry_operations proc_xid_dentry_operations = {
++	.d_revalidate =	proc_xid_revalidate,
++};
++
++static struct vs_entry vx_base_stuff[] = {
++	VINF("info",	S_IRUGO, vxi_info),
++	VINF("status",	S_IRUGO, vxi_status),
++	VINF("limit",	S_IRUGO, vxi_limit),
++	VINF("sched",	S_IRUGO, vxi_sched),
++	VINF("nsproxy",	S_IRUGO, vxi_nsproxy0),
++	VINF("nsproxy1",S_IRUGO, vxi_nsproxy1),
++	VINF("cvirt",	S_IRUGO, vxi_cvirt),
++	VINF("cacct",	S_IRUGO, vxi_cacct),
++	{}
++};
++
++
++
++
++static struct dentry *proc_xid_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	dentry->d_op = &proc_xid_dentry_operations;
++	return vs_proc_instantiate(dir, dentry, id, ptr);
++}
++
++static struct dentry *proc_xid_lookup(struct inode *dir,
++	struct dentry *dentry, struct nameidata *nd)
++{
++	struct vs_entry *p = vx_base_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (!p->name)
++		goto out;
++
++	error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
++out:
++	return error;
++}
++
++static int proc_xid_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = vx_base_stuff;
++	int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto out;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, PROC_I(inode)->fd, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 1;
++}
++
++
++
++static struct file_operations proc_nx_info_file_operations = {
++	.read =		proc_nx_info_read,
++};
++
++static struct dentry_operations proc_nid_dentry_operations = {
++	.d_revalidate =	proc_nid_revalidate,
++};
++
++static struct vs_entry nx_base_stuff[] = {
++	NINF("info",	S_IRUGO, nxi_info),
++	NINF("status",	S_IRUGO, nxi_status),
++	{}
++};
++
++
++static struct dentry *proc_nid_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	dentry->d_op = &proc_nid_dentry_operations;
++	return vs_proc_instantiate(dir, dentry, id, ptr);
++}
++
++static struct dentry *proc_nid_lookup(struct inode *dir,
++	struct dentry *dentry, struct nameidata *nd)
++{
++	struct vs_entry *p = nx_base_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (!p->name)
++		goto out;
++
++	error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
++out:
++	return error;
++}
++
++static int proc_nid_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = nx_base_stuff;
++	int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto out;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, PROC_I(inode)->fd, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 1;
++}
++
++
++#define MAX_MULBY10	((~0U - 9) / 10)
++
++static inline int atovid(const char *str, int len)
++{
++	int vid, c;
++
++	vid = 0;
++	while (len-- > 0) {
++		c = *str - '0';
++		str++;
++		if (c > 9)
++			return -1;
++		if (vid >= MAX_MULBY10)
++			return -1;
++		vid *= 10;
++		vid += c;
++		if (!vid)
++			return -1;
++	}
++	return vid;
++}
++
++/* now the upper level (virtual) */
++
++
++static struct file_operations proc_xid_file_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_xid_readdir,
++};
++
++static struct inode_operations proc_xid_inode_operations = {
++	.lookup =	proc_xid_lookup,
++};
++
++static struct vs_entry vx_virtual_stuff[] = {
++	INF("info",	S_IRUGO, virtual_info),
++	INF("status",	S_IRUGO, virtual_status),
++	DIR(NULL,	S_IRUGO | S_IXUGO, xid),
++};
++
++
++static struct dentry *proc_virtual_lookup(struct inode *dir,
++	struct dentry *dentry, struct nameidata *nd)
++{
++	struct vs_entry *p = vx_virtual_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++	int id = 0;
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (p->name)
++		goto instantiate;
++
++	id = atovid(dentry->d_name.name, dentry->d_name.len);
++	if ((id < 0) || !xid_is_hashed(id))
++		goto out;
++
++instantiate:
++	error = proc_xid_instantiate(dir, dentry, id, p);
++out:
++	return error;
++}
++
++static struct file_operations proc_nid_file_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_nid_readdir,
++};
++
++static struct inode_operations proc_nid_inode_operations = {
++	.lookup =	proc_nid_lookup,
++};
++
++static struct vs_entry nx_virtnet_stuff[] = {
++	INF("info",	S_IRUGO, virtnet_info),
++	INF("status",	S_IRUGO, virtnet_status),
++	DIR(NULL,	S_IRUGO | S_IXUGO, nid),
++};
++
++
++static struct dentry *proc_virtnet_lookup(struct inode *dir,
++	struct dentry *dentry, struct nameidata *nd)
++{
++	struct vs_entry *p = nx_virtnet_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++	int id = 0;
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (p->name)
++		goto instantiate;
++
++	id = atovid(dentry->d_name.name, dentry->d_name.len);
++	if ((id < 0) || !nid_is_hashed(id))
++		goto out;
++
++instantiate:
++	error = proc_nid_instantiate(dir, dentry, id, p);
++out:
++	return error;
++}
++
++
++#define PROC_MAXVIDS 32
++
++int proc_virtual_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = vx_virtual_stuff;
++	int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	unsigned int xid_array[PROC_MAXVIDS];
++	char buf[PROC_NUMBUF];
++	unsigned int nr_xids, i;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto entries;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, 0, p))
++				goto out;
++			pos++;
++		}
++	entries:
++		index = pos - size;
++		p = &vx_virtual_stuff[size - 1];
++		nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
++		for (i = 0; i < nr_xids; i++) {
++			int n, xid = xid_array[i];
++			unsigned int j = PROC_NUMBUF;
++
++			n = xid;
++			do
++				buf[--j] = '0' + (n % 10);
++			while (n /= 10);
++
++			if (proc_fill_cache(filp, dirent, filldir,
++				buf + j, PROC_NUMBUF - j,
++				vs_proc_instantiate, xid, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 0;
++}
++
++static int proc_virtual_getattr(struct vfsmount *mnt,
++	struct dentry *dentry, struct kstat *stat)
++{
++	struct inode *inode = dentry->d_inode;
++
++	generic_fillattr(inode, stat);
++	stat->nlink = 2 + atomic_read(&vx_global_cactive);
++	return 0;
++}
++
++static struct file_operations proc_virtual_dir_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_virtual_readdir,
++};
++
++static struct inode_operations proc_virtual_dir_inode_operations = {
++	.getattr =	proc_virtual_getattr,
++	.lookup =	proc_virtual_lookup,
++};
++
++
++
++
++
++int proc_virtnet_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = nx_virtnet_stuff;
++	int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	unsigned int nid_array[PROC_MAXVIDS];
++	char buf[PROC_NUMBUF];
++	unsigned int nr_nids, i;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto entries;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, 0, p))
++				goto out;
++			pos++;
++		}
++	entries:
++		index = pos - size;
++		p = &nx_virtnet_stuff[size - 1];
++		nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
++		for (i = 0; i < nr_nids; i++) {
++			int n, nid = nid_array[i];
++			unsigned int j = PROC_NUMBUF;
++
++			n = nid;
++			do
++				buf[--j] = '0' + (n % 10);
++			while (n /= 10);
++
++			if (proc_fill_cache(filp, dirent, filldir,
++				buf + j, PROC_NUMBUF - j,
++				vs_proc_instantiate, nid, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 0;
++}
++
++static int proc_virtnet_getattr(struct vfsmount *mnt,
++	struct dentry *dentry, struct kstat *stat)
++{
++	struct inode *inode = dentry->d_inode;
++
++	generic_fillattr(inode, stat);
++	stat->nlink = 2 + atomic_read(&nx_global_cactive);
++	return 0;
++}
++
++static struct file_operations proc_virtnet_dir_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_virtnet_readdir,
++};
++
++static struct inode_operations proc_virtnet_dir_inode_operations = {
++	.getattr =	proc_virtnet_getattr,
++	.lookup =	proc_virtnet_lookup,
++};
++
++
++
++void proc_vx_init(void)
++{
++	struct proc_dir_entry *ent;
++
++	ent = proc_mkdir("virtual", 0);
++	if (ent) {
++		ent->proc_fops = &proc_virtual_dir_operations;
++		ent->proc_iops = &proc_virtual_dir_inode_operations;
++	}
++	proc_virtual = ent;
++
++	ent = proc_mkdir("virtnet", 0);
++	if (ent) {
++		ent->proc_fops = &proc_virtnet_dir_operations;
++		ent->proc_iops = &proc_virtnet_dir_inode_operations;
++	}
++	proc_virtnet = ent;
++}
++
++
++
++
++/* per pid info */
++
++
++int proc_pid_vx_info(struct task_struct *p, char *buffer)
++{
++	struct vx_info *vxi;
++	char *orig = buffer;
++
++	buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p));
++
++	vxi = task_get_vx_info(p);
++	if (!vxi)
++		goto out;
++
++	buffer += sprintf(buffer, "BCaps:\t");
++	buffer = print_cap_t(buffer, &vxi->vx_bcaps);
++	buffer += sprintf(buffer, "\n");
++	buffer += sprintf(buffer, "CCaps:\t%016llx\n",
++		(unsigned long long)vxi->vx_ccaps);
++	buffer += sprintf(buffer, "CFlags:\t%016llx\n",
++		(unsigned long long)vxi->vx_flags);
++	buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid);
++
++	put_vx_info(vxi);
++out:
++	return buffer - orig;
++}
++
++
++int proc_pid_nx_info(struct task_struct *p, char *buffer)
++{
++	struct nx_info *nxi;
++	struct nx_addr_v4 *v4a;
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 *v6a;
++#endif
++	char *orig = buffer;
++	int i;
++
++	buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p));
++
++	nxi = task_get_nx_info(p);
++	if (!nxi)
++		goto out;
++
++	buffer += sprintf(buffer, "NCaps:\t%016llx\n",
++		(unsigned long long)nxi->nx_ncaps);
++	buffer += sprintf(buffer, "NFlags:\t%016llx\n",
++		(unsigned long long)nxi->nx_flags);
++
++	buffer += sprintf(buffer,
++		"V4Root[bcast]:\t" NIPQUAD_FMT "\n",
++		NIPQUAD(nxi->v4_bcast.s_addr));
++	buffer += sprintf (buffer,
++		"V4Root[lback]:\t" NIPQUAD_FMT "\n",
++		NIPQUAD(nxi->v4_lback.s_addr));
++	if (!NX_IPV4(nxi))
++		goto skip_v4;
++	for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++		buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n",
++			i, NXAV4(v4a));
++skip_v4:
++#ifdef	CONFIG_IPV6
++	if (!NX_IPV6(nxi))
++		goto skip_v6;
++	for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++		buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n",
++			i, NXAV6(v6a));
++skip_v6:
++#endif
++	put_nx_info(nxi);
++out:
++	return buffer - orig;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched.c linux-3.4.45-vs2.3.3.9/kernel/vserver/sched.c
+--- linux-3.4.45/kernel/vserver/sched.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched.c	2012-05-21 16:25:11.000000000 +0000
+@@ -0,0 +1,83 @@
++/*
++ *  linux/kernel/vserver/sched.c
++ *
++ *  Virtual Server: Scheduler Support
++ *
++ *  Copyright (C) 2004-2010  Herbert Pötzl
++ *
++ *  V0.01  adapted Sam Vilains version to 2.6.3
++ *  V0.02  removed legacy interface
++ *  V0.03  changed vcmds to vxi arg
++ *  V0.04  removed older and legacy interfaces
++ *  V0.05  removed scheduler code/commands
++ *
++ */
++
++#include <linux/vs_context.h>
++#include <linux/vs_sched.h>
++#include <linux/cpumask.h>
++#include <linux/vserver/sched_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++	struct _vx_sched_pc *sched_pc)
++{
++	sched_pc->prio_bias = sched->prio_bias;
++}
++
++static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data)
++{
++	int cpu;
++
++	if (data->prio_bias > MAX_PRIO_BIAS)
++		data->prio_bias = MAX_PRIO_BIAS;
++	if (data->prio_bias < MIN_PRIO_BIAS)
++		data->prio_bias = MIN_PRIO_BIAS;
++
++	if (data->cpu_id != ~0) {
++		vxi->sched.update = cpumask_of_cpu(data->cpu_id);
++		cpumask_and(&vxi->sched.update, &vxi->sched.update,
++			cpu_online_mask);
++	} else
++		cpumask_copy(&vxi->sched.update, cpu_online_mask);
++
++	for_each_cpu_mask(cpu, vxi->sched.update)
++		vx_update_sched_param(&vxi->sched,
++			&vx_per_cpu(vxi, sched_pc, cpu));
++	return 0;
++}
++
++int vc_set_prio_bias(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_prio_bias vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_prio_bias(vxi, &vc_data);
++}
++
++int vc_get_prio_bias(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_prio_bias vc_data;
++	struct _vx_sched_pc *pcd;
++	int cpu;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	cpu = vc_data.cpu_id;
++
++	if (!cpu_possible(cpu))
++		return -EINVAL;
++
++	pcd = &vx_per_cpu(vxi, sched_pc, cpu);
++	vc_data.prio_bias = pcd->prio_bias;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_init.h linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_init.h
+--- linux-3.4.45/kernel/vserver/sched_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_init.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,27 @@
++
++static inline void vx_info_init_sched(struct _vx_sched *sched)
++{
++	/* scheduling; hard code starting values as constants */
++	sched->prio_bias = 0;
++}
++
++static inline
++void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++	sched_pc->prio_bias = 0;
++
++	sched_pc->user_ticks = 0;
++	sched_pc->sys_ticks = 0;
++	sched_pc->hold_ticks = 0;
++}
++
++static inline void vx_info_exit_sched(struct _vx_sched *sched)
++{
++	return;
++}
++
++static inline
++void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++	return;
++}
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sched_proc.h linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_proc.h
+--- linux-3.4.45/kernel/vserver/sched_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sched_proc.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,32 @@
++#ifndef _VX_SCHED_PROC_H
++#define _VX_SCHED_PROC_H
++
++
++static inline
++int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
++{
++	int length = 0;
++
++	length += sprintf(buffer,
++		"PrioBias:\t%8d\n",
++		sched->prio_bias);
++	return length;
++}
++
++static inline
++int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
++	char *buffer, int cpu)
++{
++	int length = 0;
++
++	length += sprintf(buffer + length,
++		"cpu %d: %lld %lld %lld", cpu,
++		(unsigned long long)sched_pc->user_ticks,
++		(unsigned long long)sched_pc->sys_ticks,
++		(unsigned long long)sched_pc->hold_ticks);
++	length += sprintf(buffer + length,
++		" %d\n", sched_pc->prio_bias);
++	return length;
++}
++
++#endif	/* _VX_SCHED_PROC_H */
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/signal.c linux-3.4.45-vs2.3.3.9/kernel/vserver/signal.c
+--- linux-3.4.45/kernel/vserver/signal.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/signal.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,134 @@
++/*
++ *  linux/kernel/vserver/signal.c
++ *
++ *  Virtual Server: Signal Support
++ *
++ *  Copyright (C) 2003-2007  Herbert Pötzl
++ *
++ *  V0.01  broken out from vcontext V0.05
++ *  V0.02  changed vcmds to vxi arg
++ *  V0.03  adjusted siginfo for kill
++ *
++ */
++
++#include <asm/uaccess.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/signal_cmd.h>
++
++
++int vx_info_kill(struct vx_info *vxi, int pid, int sig)
++{
++	int retval, count = 0;
++	struct task_struct *p;
++	struct siginfo *sip = SEND_SIG_PRIV;
++
++	retval = -ESRCH;
++	vxdprintk(VXD_CBIT(misc, 4),
++		"vx_info_kill(%p[#%d],%d,%d)*",
++		vxi, vxi->vx_id, pid, sig);
++	read_lock(&tasklist_lock);
++	switch (pid) {
++	case  0:
++	case -1:
++		for_each_process(p) {
++			int err = 0;
++
++			if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 ||
++				(pid && vxi->vx_initpid == p->pid))
++				continue;
++
++			err = group_send_sig_info(sig, sip, p);
++			++count;
++			if (err != -EPERM)
++				retval = err;
++		}
++		break;
++
++	case 1:
++		if (vxi->vx_initpid) {
++			pid = vxi->vx_initpid;
++			/* for now, only SIGINT to private init ... */
++			if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++				/* ... as long as there are tasks left */
++				(atomic_read(&vxi->vx_tasks) > 1))
++				sig = SIGINT;
++		}
++		/* fallthrough */
++	default:
++		rcu_read_lock();
++		p = find_task_by_real_pid(pid);
++		rcu_read_unlock();
++		if (p) {
++			if (vx_task_xid(p) == vxi->vx_id)
++				retval = group_send_sig_info(sig, sip, p);
++		}
++		break;
++	}
++	read_unlock(&tasklist_lock);
++	vxdprintk(VXD_CBIT(misc, 4),
++		"vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
++		vxi, vxi->vx_id, pid, sig, (long)sip, retval);
++	return retval;
++}
++
++int vc_ctx_kill(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_kill_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special check to allow guest shutdown */
++	if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++		/* forbid killall pid=0 when init is present */
++		(((vc_data.pid < 1) && vxi->vx_initpid) ||
++		(vc_data.pid > 1)))
++		return -EACCES;
++
++	return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
++}
++
++
++static int __wait_exit(struct vx_info *vxi)
++{
++	DECLARE_WAITQUEUE(wait, current);
++	int ret = 0;
++
++	add_wait_queue(&vxi->vx_wait, &wait);
++	set_current_state(TASK_INTERRUPTIBLE);
++
++wait:
++	if (vx_info_state(vxi,
++		VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
++		goto out;
++	if (signal_pending(current)) {
++		ret = -ERESTARTSYS;
++		goto out;
++	}
++	schedule();
++	goto wait;
++
++out:
++	set_current_state(TASK_RUNNING);
++	remove_wait_queue(&vxi->vx_wait, &wait);
++	return ret;
++}
++
++
++
++int vc_wait_exit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wait_exit_v0 vc_data;
++	int ret;
++
++	ret = __wait_exit(vxi);
++	vc_data.reboot_cmd = vxi->reboot_cmd;
++	vc_data.exit_code = vxi->exit_code;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/space.c linux-3.4.45-vs2.3.3.9/kernel/vserver/space.c
+--- linux-3.4.45/kernel/vserver/space.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/space.c	2013-02-12 00:16:04.000000000 +0000
+@@ -0,0 +1,436 @@
++/*
++ *  linux/kernel/vserver/space.c
++ *
++ *  Virtual Server: Context Space Support
++ *
++ *  Copyright (C) 2003-2010  Herbert Pötzl
++ *
++ *  V0.01  broken out from context.c 0.07
++ *  V0.02  added task locking for namespace
++ *  V0.03  broken out vx_enter_namespace
++ *  V0.04  added *space support and commands
++ *  V0.05  added credential support
++ *
++ */
++
++#include <linux/utsname.h>
++#include <linux/nsproxy.h>
++#include <linux/err.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
++#include <asm/uaccess.h>
++
++#include <linux/vs_context.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/space_cmd.h>
++
++atomic_t vs_global_nsproxy	= ATOMIC_INIT(0);
++atomic_t vs_global_fs		= ATOMIC_INIT(0);
++atomic_t vs_global_mnt_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_uts_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_user_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_pid_ns	= ATOMIC_INIT(0);
++
++
++/* namespace functions */
++
++#include <linux/mnt_namespace.h>
++#include <linux/user_namespace.h>
++#include <linux/pid_namespace.h>
++#include <linux/ipc_namespace.h>
++#include <net/net_namespace.h>
++#include "../fs/mount.h"
++
++
++static const struct vcmd_space_mask_v1 space_mask_v0 = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++		0
++};
++
++static const struct vcmd_space_mask_v1 space_mask = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++#ifdef	CONFIG_PID_NS
++		CLONE_NEWPID |
++#endif
++#ifdef	CONFIG_NET_NS
++		CLONE_NEWNET |
++#endif
++		0
++};
++
++static const struct vcmd_space_mask_v1 default_space_mask = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++#ifdef	CONFIG_PID_NS
++//		CLONE_NEWPID |
++#endif
++		0
++};
++
++/*
++ *	build a new nsproxy mix
++ *      assumes that both proxies are 'const'
++ *	does not touch nsproxy refcounts
++ *	will hold a reference on the result.
++ */
++
++struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
++	struct nsproxy *new_nsproxy, unsigned long mask)
++{
++	struct mnt_namespace *old_ns;
++	struct uts_namespace *old_uts;
++	struct ipc_namespace *old_ipc;
++#ifdef	CONFIG_PID_NS
++	struct pid_namespace *old_pid;
++#endif
++#ifdef	CONFIG_NET_NS
++	struct net *old_net;
++#endif
++	struct nsproxy *nsproxy;
++
++	nsproxy = copy_nsproxy(old_nsproxy);
++	if (!nsproxy)
++		goto out;
++
++	if (mask & CLONE_NEWNS) {
++		old_ns = nsproxy->mnt_ns;
++		nsproxy->mnt_ns = new_nsproxy->mnt_ns;
++		if (nsproxy->mnt_ns)
++			get_mnt_ns(nsproxy->mnt_ns);
++	} else
++		old_ns = NULL;
++
++	if (mask & CLONE_NEWUTS) {
++		old_uts = nsproxy->uts_ns;
++		nsproxy->uts_ns = new_nsproxy->uts_ns;
++		if (nsproxy->uts_ns)
++			get_uts_ns(nsproxy->uts_ns);
++	} else
++		old_uts = NULL;
++
++	if (mask & CLONE_NEWIPC) {
++		old_ipc = nsproxy->ipc_ns;
++		nsproxy->ipc_ns = new_nsproxy->ipc_ns;
++		if (nsproxy->ipc_ns)
++			get_ipc_ns(nsproxy->ipc_ns);
++	} else
++		old_ipc = NULL;
++
++#ifdef	CONFIG_PID_NS
++	if (mask & CLONE_NEWPID) {
++		old_pid = nsproxy->pid_ns;
++		nsproxy->pid_ns = new_nsproxy->pid_ns;
++		if (nsproxy->pid_ns)
++			get_pid_ns(nsproxy->pid_ns);
++	} else
++		old_pid = NULL;
++#endif
++#ifdef	CONFIG_NET_NS
++	if (mask & CLONE_NEWNET) {
++		old_net = nsproxy->net_ns;
++		nsproxy->net_ns = new_nsproxy->net_ns;
++		if (nsproxy->net_ns)
++			get_net(nsproxy->net_ns);
++	} else
++		old_net = NULL;
++#endif
++	if (old_ns)
++		put_mnt_ns(old_ns);
++	if (old_uts)
++		put_uts_ns(old_uts);
++	if (old_ipc)
++		put_ipc_ns(old_ipc);
++#ifdef	CONFIG_PID_NS
++	if (old_pid)
++		put_pid_ns(old_pid);
++#endif
++#ifdef	CONFIG_NET_NS
++	if (old_net)
++		put_net(old_net);
++#endif
++out:
++	return nsproxy;
++}
++
++
++/*
++ *	merge two nsproxy structs into a new one.
++ *	will hold a reference on the result.
++ */
++
++static inline
++struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
++	struct nsproxy *proxy, unsigned long mask)
++{
++	struct nsproxy null_proxy = { .mnt_ns = NULL };
++
++	if (!proxy)
++		return NULL;
++
++	if (mask) {
++		/* vs_mix_nsproxy returns with reference */
++		return vs_mix_nsproxy(old ? old : &null_proxy,
++			proxy, mask);
++	}
++	get_nsproxy(proxy);
++	return proxy;
++}
++
++
++int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
++{
++	struct nsproxy *proxy, *proxy_cur, *proxy_new;
++	struct fs_struct *fs_cur, *fs = NULL;
++	struct _vx_space *space;
++	int ret, kill = 0;
++
++	vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
++		vxi, vxi->vx_id, mask, index);
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++		return -EACCES;
++
++	if (index >= VX_SPACES)
++		return -EINVAL;
++
++	space = &vxi->space[index];
++
++	if (!mask)
++		mask = space->vx_nsmask;
++
++	if ((mask & space->vx_nsmask) != mask)
++		return -EINVAL;
++
++	if (mask & CLONE_FS) {
++		fs = copy_fs_struct(space->vx_fs);
++		if (!fs)
++			return -ENOMEM;
++	}
++	proxy = space->vx_nsproxy;
++
++	vxdprintk(VXD_CBIT(space, 9),
++		"vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
++		vxi, vxi->vx_id, mask, index, proxy, fs);
++
++	task_lock(current);
++	fs_cur = current->fs;
++
++	if (mask & CLONE_FS) {
++		spin_lock(&fs_cur->lock);
++		current->fs = fs;
++		kill = !--fs_cur->users;
++		spin_unlock(&fs_cur->lock);
++	}
++
++	proxy_cur = current->nsproxy;
++	get_nsproxy(proxy_cur);
++	task_unlock(current);
++
++	if (kill)
++		free_fs_struct(fs_cur);
++
++	proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
++	if (IS_ERR(proxy_new)) {
++		ret = PTR_ERR(proxy_new);
++		goto out_put;
++	}
++
++	proxy_new = xchg(&current->nsproxy, proxy_new);
++
++	if (mask & CLONE_NEWUSER) {
++		struct cred *cred;
++
++		vxdprintk(VXD_CBIT(space, 10),
++			"vx_enter_space(%p[#%u],%p) cred (%p,%p)",
++			vxi, vxi->vx_id, space->vx_cred,
++			current->real_cred, current->cred);
++
++		if (space->vx_cred) {
++			cred = __prepare_creds(space->vx_cred);
++			if (cred)
++				commit_creds(cred);
++		}
++	}
++
++	ret = 0;
++
++	if (proxy_new)
++		put_nsproxy(proxy_new);
++out_put:
++	if (proxy_cur)
++		put_nsproxy(proxy_cur);
++	return ret;
++}
++
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
++{
++	struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
++	struct fs_struct *fs_vxi, *fs = NULL;
++	struct _vx_space *space;
++	int ret, kill = 0;
++
++	vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
++		vxi, vxi->vx_id, mask, index);
++
++	if ((mask & space_mask.mask) != mask)
++		return -EINVAL;
++
++	if (index >= VX_SPACES)
++		return -EINVAL;
++
++	space = &vxi->space[index];
++
++	proxy_vxi = space->vx_nsproxy;
++	fs_vxi = space->vx_fs;
++
++	if (mask & CLONE_FS) {
++		fs = copy_fs_struct(current->fs);
++		if (!fs)
++			return -ENOMEM;
++	}
++
++	task_lock(current);
++
++	if (mask & CLONE_FS) {
++		spin_lock(&fs_vxi->lock);
++		space->vx_fs = fs;
++		kill = !--fs_vxi->users;
++		spin_unlock(&fs_vxi->lock);
++	}
++
++	proxy_cur = current->nsproxy;
++	get_nsproxy(proxy_cur);
++	task_unlock(current);
++
++	if (kill)
++		free_fs_struct(fs_vxi);
++
++	proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
++	if (IS_ERR(proxy_new)) {
++		ret = PTR_ERR(proxy_new);
++		goto out_put;
++	}
++
++	proxy_new = xchg(&space->vx_nsproxy, proxy_new);
++	space->vx_nsmask |= mask;
++
++	if (mask & CLONE_NEWUSER) {
++		struct cred *cred;
++
++		vxdprintk(VXD_CBIT(space, 10),
++			"vx_set_space(%p[#%u],%p) cred (%p,%p)",
++			vxi, vxi->vx_id, space->vx_cred,
++			current->real_cred, current->cred);
++
++		cred = prepare_creds();
++		cred = (struct cred *)xchg(&space->vx_cred, cred);
++		if (cred)
++			abort_creds(cred);
++	}
++
++	ret = 0;
++
++	if (proxy_new)
++		put_nsproxy(proxy_new);
++out_put:
++	if (proxy_cur)
++		put_nsproxy(proxy_cur);
++	return ret;
++}
++
++
++int vc_enter_space_v1(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return vx_enter_space(vxi, vc_data.mask, 0);
++}
++
++int vc_enter_space(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if (vc_data.index >= VX_SPACES)
++		return -EINVAL;
++
++	return vx_enter_space(vxi, vc_data.mask, vc_data.index);
++}
++
++int vc_set_space_v1(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return vx_set_space(vxi, vc_data.mask, 0);
++}
++
++int vc_set_space(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if (vc_data.index >= VX_SPACES)
++		return -EINVAL;
++
++	return vx_set_space(vxi, vc_data.mask, vc_data.index);
++}
++
++int vc_get_space_mask(void __user *data, int type)
++{
++	const struct vcmd_space_mask_v1 *mask;
++
++	if (type == 0)
++		mask = &space_mask_v0;
++	else if (type == 1)
++		mask = &space_mask;
++	else
++		mask = &default_space_mask;
++
++	vxdprintk(VXD_CBIT(space, 10),
++		"vc_get_space_mask(%d) = %08llx", type, mask->mask);
++
++	if (copy_to_user(data, mask, sizeof(*mask)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/switch.c linux-3.4.45-vs2.3.3.9/kernel/vserver/switch.c
+--- linux-3.4.45/kernel/vserver/switch.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/switch.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,556 @@
++/*
++ *  linux/kernel/vserver/switch.c
++ *
++ *  Virtual Server: Syscall Switch
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  V0.01  syscall switch
++ *  V0.02  added signal to context
++ *  V0.03  added rlimit functions
++ *  V0.04  added iattr, task/xid functions
++ *  V0.05  added debug/history stuff
++ *  V0.06  added compat32 layer
++ *  V0.07  vcmd args and perms
++ *  V0.08  added status commands
++ *  V0.09  added tag commands
++ *  V0.10  added oom bias
++ *  V0.11  added device commands
++ *  V0.12  added warn mask
++ *
++ */
++
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/switch.h>
++
++#include "vci_config.h"
++
++
++static inline
++int vc_get_version(uint32_t id)
++{
++	return VCI_VERSION;
++}
++
++static inline
++int vc_get_vci(uint32_t id)
++{
++	return vci_kernel_config();
++}
++
++#include <linux/vserver/context_cmd.h>
++#include <linux/vserver/cvirt_cmd.h>
++#include <linux/vserver/cacct_cmd.h>
++#include <linux/vserver/limit_cmd.h>
++#include <linux/vserver/network_cmd.h>
++#include <linux/vserver/sched_cmd.h>
++#include <linux/vserver/debug_cmd.h>
++#include <linux/vserver/inode_cmd.h>
++#include <linux/vserver/dlimit_cmd.h>
++#include <linux/vserver/signal_cmd.h>
++#include <linux/vserver/space_cmd.h>
++#include <linux/vserver/tag_cmd.h>
++#include <linux/vserver/device_cmd.h>
++
++#include <linux/vserver/inode.h>
++#include <linux/vserver/dlimit.h>
++
++
++#ifdef	CONFIG_COMPAT
++#define __COMPAT(name, id, data, compat)	\
++	(compat) ? name ## _x32(id, data) : name(id, data)
++#define __COMPAT_NO_ID(name, data, compat)	\
++	(compat) ? name ## _x32(data) : name(data)
++#else
++#define __COMPAT(name, id, data, compat)	\
++	name(id, data)
++#define __COMPAT_NO_ID(name, data, compat)	\
++	name(data)
++#endif
++
++
++static inline
++long do_vcmd(uint32_t cmd, uint32_t id,
++	struct vx_info *vxi, struct nx_info *nxi,
++	void __user *data, int compat)
++{
++	switch (cmd) {
++
++	case VCMD_get_version:
++		return vc_get_version(id);
++	case VCMD_get_vci:
++		return vc_get_vci(id);
++
++	case VCMD_task_xid:
++		return vc_task_xid(id);
++	case VCMD_vx_info:
++		return vc_vx_info(vxi, data);
++
++	case VCMD_task_nid:
++		return vc_task_nid(id);
++	case VCMD_nx_info:
++		return vc_nx_info(nxi, data);
++
++	case VCMD_task_tag:
++		return vc_task_tag(id);
++
++	case VCMD_set_space_v1:
++		return vc_set_space_v1(vxi, data);
++	/* this is version 2 */
++	case VCMD_set_space:
++		return vc_set_space(vxi, data);
++
++	case VCMD_get_space_mask_v0:
++		return vc_get_space_mask(data, 0);
++	/* this is version 1 */
++	case VCMD_get_space_mask:
++		return vc_get_space_mask(data, 1);
++
++	case VCMD_get_space_default:
++		return vc_get_space_mask(data, -1);
++
++	case VCMD_set_umask:
++		return vc_set_umask(vxi, data);
++
++	case VCMD_get_umask:
++		return vc_get_umask(vxi, data);
++
++	case VCMD_set_wmask:
++		return vc_set_wmask(vxi, data);
++
++	case VCMD_get_wmask:
++		return vc_get_wmask(vxi, data);
++#ifdef	CONFIG_IA32_EMULATION
++	case VCMD_get_rlimit:
++		return __COMPAT(vc_get_rlimit, vxi, data, compat);
++	case VCMD_set_rlimit:
++		return __COMPAT(vc_set_rlimit, vxi, data, compat);
++#else
++	case VCMD_get_rlimit:
++		return vc_get_rlimit(vxi, data);
++	case VCMD_set_rlimit:
++		return vc_set_rlimit(vxi, data);
++#endif
++	case VCMD_get_rlimit_mask:
++		return vc_get_rlimit_mask(id, data);
++	case VCMD_reset_hits:
++		return vc_reset_hits(vxi, data);
++	case VCMD_reset_minmax:
++		return vc_reset_minmax(vxi, data);
++
++	case VCMD_get_vhi_name:
++		return vc_get_vhi_name(vxi, data);
++	case VCMD_set_vhi_name:
++		return vc_set_vhi_name(vxi, data);
++
++	case VCMD_ctx_stat:
++		return vc_ctx_stat(vxi, data);
++	case VCMD_virt_stat:
++		return vc_virt_stat(vxi, data);
++	case VCMD_sock_stat:
++		return vc_sock_stat(vxi, data);
++	case VCMD_rlimit_stat:
++		return vc_rlimit_stat(vxi, data);
++
++	case VCMD_set_cflags:
++		return vc_set_cflags(vxi, data);
++	case VCMD_get_cflags:
++		return vc_get_cflags(vxi, data);
++
++	/* this is version 1 */
++	case VCMD_set_ccaps:
++		return vc_set_ccaps(vxi, data);
++	/* this is version 1 */
++	case VCMD_get_ccaps:
++		return vc_get_ccaps(vxi, data);
++	case VCMD_set_bcaps:
++		return vc_set_bcaps(vxi, data);
++	case VCMD_get_bcaps:
++		return vc_get_bcaps(vxi, data);
++
++	case VCMD_set_badness:
++		return vc_set_badness(vxi, data);
++	case VCMD_get_badness:
++		return vc_get_badness(vxi, data);
++
++	case VCMD_set_nflags:
++		return vc_set_nflags(nxi, data);
++	case VCMD_get_nflags:
++		return vc_get_nflags(nxi, data);
++
++	case VCMD_set_ncaps:
++		return vc_set_ncaps(nxi, data);
++	case VCMD_get_ncaps:
++		return vc_get_ncaps(nxi, data);
++
++	case VCMD_set_prio_bias:
++		return vc_set_prio_bias(vxi, data);
++	case VCMD_get_prio_bias:
++		return vc_get_prio_bias(vxi, data);
++	case VCMD_add_dlimit:
++		return __COMPAT(vc_add_dlimit, id, data, compat);
++	case VCMD_rem_dlimit:
++		return __COMPAT(vc_rem_dlimit, id, data, compat);
++	case VCMD_set_dlimit:
++		return __COMPAT(vc_set_dlimit, id, data, compat);
++	case VCMD_get_dlimit:
++		return __COMPAT(vc_get_dlimit, id, data, compat);
++
++	case VCMD_ctx_kill:
++		return vc_ctx_kill(vxi, data);
++
++	case VCMD_wait_exit:
++		return vc_wait_exit(vxi, data);
++
++	case VCMD_get_iattr:
++		return __COMPAT_NO_ID(vc_get_iattr, data, compat);
++	case VCMD_set_iattr:
++		return __COMPAT_NO_ID(vc_set_iattr, data, compat);
++
++	case VCMD_fget_iattr:
++		return vc_fget_iattr(id, data);
++	case VCMD_fset_iattr:
++		return vc_fset_iattr(id, data);
++
++	case VCMD_enter_space_v0:
++		return vc_enter_space_v1(vxi, NULL);
++	case VCMD_enter_space_v1:
++		return vc_enter_space_v1(vxi, data);
++	/* this is version 2 */
++	case VCMD_enter_space:
++		return vc_enter_space(vxi, data);
++
++	case VCMD_ctx_create_v0:
++		return vc_ctx_create(id, NULL);
++	case VCMD_ctx_create:
++		return vc_ctx_create(id, data);
++	case VCMD_ctx_migrate_v0:
++		return vc_ctx_migrate(vxi, NULL);
++	case VCMD_ctx_migrate:
++		return vc_ctx_migrate(vxi, data);
++
++	case VCMD_net_create_v0:
++		return vc_net_create(id, NULL);
++	case VCMD_net_create:
++		return vc_net_create(id, data);
++	case VCMD_net_migrate:
++		return vc_net_migrate(nxi, data);
++
++	case VCMD_tag_migrate:
++		return vc_tag_migrate(id);
++
++	case VCMD_net_add:
++		return vc_net_add(nxi, data);
++	case VCMD_net_remove:
++		return vc_net_remove(nxi, data);
++
++	case VCMD_net_add_ipv4_v1:
++		return vc_net_add_ipv4_v1(nxi, data);
++	/* this is version 2 */
++	case VCMD_net_add_ipv4:
++		return vc_net_add_ipv4(nxi, data);
++
++	case VCMD_net_rem_ipv4_v1:
++		return vc_net_rem_ipv4_v1(nxi, data);
++	/* this is version 2 */
++	case VCMD_net_rem_ipv4:
++		return vc_net_rem_ipv4(nxi, data);
++#ifdef	CONFIG_IPV6
++	case VCMD_net_add_ipv6:
++		return vc_net_add_ipv6(nxi, data);
++	case VCMD_net_remove_ipv6:
++		return vc_net_remove_ipv6(nxi, data);
++#endif
++/*	case VCMD_add_match_ipv4:
++		return vc_add_match_ipv4(nxi, data);
++	case VCMD_get_match_ipv4:
++		return vc_get_match_ipv4(nxi, data);
++#ifdef	CONFIG_IPV6
++	case VCMD_add_match_ipv6:
++		return vc_add_match_ipv6(nxi, data);
++	case VCMD_get_match_ipv6:
++		return vc_get_match_ipv6(nxi, data);
++#endif	*/
++
++#ifdef	CONFIG_VSERVER_DEVICE
++	case VCMD_set_mapping:
++		return __COMPAT(vc_set_mapping, vxi, data, compat);
++	case VCMD_unset_mapping:
++		return __COMPAT(vc_unset_mapping, vxi, data, compat);
++#endif
++#ifdef	CONFIG_VSERVER_HISTORY
++	case VCMD_dump_history:
++		return vc_dump_history(id);
++	case VCMD_read_history:
++		return __COMPAT(vc_read_history, id, data, compat);
++#endif
++	default:
++		vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
++			VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
++	}
++	return -ENOSYS;
++}
++
++
++#define	__VCMD(vcmd, _perm, _args, _flags)		\
++	case VCMD_ ## vcmd: perm = _perm;		\
++		args = _args; flags = _flags; break
++
++
++#define VCA_NONE	0x00
++#define VCA_VXI		0x01
++#define VCA_NXI		0x02
++
++#define VCF_NONE	0x00
++#define VCF_INFO	0x01
++#define VCF_ADMIN	0x02
++#define VCF_ARES	0x06	/* includes admin */
++#define VCF_SETUP	0x08
++
++#define VCF_ZIDOK	0x10	/* zero id okay */
++
++
++static inline
++long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
++{
++	long ret;
++	int permit = -1, state = 0;
++	int perm = -1, args = 0, flags = 0;
++	struct vx_info *vxi = NULL;
++	struct nx_info *nxi = NULL;
++
++	switch (cmd) {
++	/* unpriviledged commands */
++	__VCMD(get_version,	 0, VCA_NONE,	0);
++	__VCMD(get_vci,		 0, VCA_NONE,	0);
++	__VCMD(get_rlimit_mask,	 0, VCA_NONE,	0);
++	__VCMD(get_space_mask_v0,0, VCA_NONE,   0);
++	__VCMD(get_space_mask,	 0, VCA_NONE,   0);
++	__VCMD(get_space_default,0, VCA_NONE,   0);
++
++	/* info commands */
++	__VCMD(task_xid,	 2, VCA_NONE,	0);
++	__VCMD(reset_hits,	 2, VCA_VXI,	0);
++	__VCMD(reset_minmax,	 2, VCA_VXI,	0);
++	__VCMD(vx_info,		 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_bcaps,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_ccaps,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_cflags,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_umask,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_wmask,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_badness,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_vhi_name,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_rlimit,	 3, VCA_VXI,	VCF_INFO);
++
++	__VCMD(ctx_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(virt_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(sock_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(rlimit_stat,	 3, VCA_VXI,	VCF_INFO);
++
++	__VCMD(task_nid,	 2, VCA_NONE,	0);
++	__VCMD(nx_info,		 3, VCA_NXI,	VCF_INFO);
++	__VCMD(get_ncaps,	 3, VCA_NXI,	VCF_INFO);
++	__VCMD(get_nflags,	 3, VCA_NXI,	VCF_INFO);
++
++	__VCMD(task_tag,	 2, VCA_NONE,	0);
++
++	__VCMD(get_iattr,	 2, VCA_NONE,	0);
++	__VCMD(fget_iattr,	 2, VCA_NONE,	0);
++	__VCMD(get_dlimit,	 3, VCA_NONE,	VCF_INFO);
++	__VCMD(get_prio_bias,	 3, VCA_VXI,	VCF_INFO);
++
++	/* lower admin commands */
++	__VCMD(wait_exit,	 4, VCA_VXI,	VCF_INFO);
++	__VCMD(ctx_create_v0,	 5, VCA_NONE,	0);
++	__VCMD(ctx_create,	 5, VCA_NONE,	0);
++	__VCMD(ctx_migrate_v0,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(ctx_migrate,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space_v0,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space_v1,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space,	 5, VCA_VXI,	VCF_ADMIN);
++
++	__VCMD(net_create_v0,	 5, VCA_NONE,	0);
++	__VCMD(net_create,	 5, VCA_NONE,	0);
++	__VCMD(net_migrate,	 5, VCA_NXI,	VCF_ADMIN);
++
++	__VCMD(tag_migrate,	 5, VCA_NONE,	VCF_ADMIN);
++
++	/* higher admin commands */
++	__VCMD(ctx_kill,	 6, VCA_VXI,	VCF_ARES);
++	__VCMD(set_space_v1,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_space,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_ccaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_bcaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_cflags,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_umask,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_wmask,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_badness,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_vhi_name,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_rlimit,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_prio_bias,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_ncaps,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_nflags,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add,		 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_remove,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add_ipv4_v1,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_rem_ipv4_v1,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add_ipv4,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_rem_ipv4,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++#ifdef	CONFIG_IPV6
++	__VCMD(net_add_ipv6,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_remove_ipv6,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++#endif
++	__VCMD(set_iattr,	 7, VCA_NONE,	0);
++	__VCMD(fset_iattr,	 7, VCA_NONE,	0);
++	__VCMD(set_dlimit,	 7, VCA_NONE,	VCF_ARES);
++	__VCMD(add_dlimit,	 8, VCA_NONE,	VCF_ARES);
++	__VCMD(rem_dlimit,	 8, VCA_NONE,	VCF_ARES);
++
++#ifdef	CONFIG_VSERVER_DEVICE
++	__VCMD(set_mapping,	 8, VCA_VXI,    VCF_ARES|VCF_ZIDOK);
++	__VCMD(unset_mapping,	 8, VCA_VXI,	VCF_ARES|VCF_ZIDOK);
++#endif
++	/* debug level admin commands */
++#ifdef	CONFIG_VSERVER_HISTORY
++	__VCMD(dump_history,	 9, VCA_NONE,	0);
++	__VCMD(read_history,	 9, VCA_NONE,	0);
++#endif
++
++	default:
++		perm = -1;
++	}
++
++	vxdprintk(VXD_CBIT(switch, 0),
++		"vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]",
++		VC_CATEGORY(cmd), VC_COMMAND(cmd),
++		VC_VERSION(cmd), id, data, compat,
++		perm, args, flags);
++
++	ret = -ENOSYS;
++	if (perm < 0)
++		goto out;
++
++	state = 1;
++	if (!capable(CAP_CONTEXT))
++		goto out;
++
++	state = 2;
++	/* moved here from the individual commands */
++	ret = -EPERM;
++	if ((perm > 1) && !capable(CAP_SYS_ADMIN))
++		goto out;
++
++	state = 3;
++	/* vcmd involves resource management  */
++	ret = -EPERM;
++	if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE))
++		goto out;
++
++	state = 4;
++	/* various legacy exceptions */
++	switch (cmd) {
++	/* will go away when spectator is a cap */
++	case VCMD_ctx_migrate_v0:
++	case VCMD_ctx_migrate:
++		if (id == 1) {
++			current->xid = 1;
++			ret = 1;
++			goto out;
++		}
++		break;
++
++	/* will go away when spectator is a cap */
++	case VCMD_net_migrate:
++		if (id == 1) {
++			current->nid = 1;
++			ret = 1;
++			goto out;
++		}
++		break;
++	}
++
++	/* vcmds are fine by default */
++	permit = 1;
++
++	/* admin type vcmds require admin ... */
++	if (flags & VCF_ADMIN)
++		permit = vx_check(0, VS_ADMIN) ? 1 : 0;
++
++	/* ... but setup type vcmds override that */
++	if (!permit && (flags & VCF_SETUP))
++		permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0;
++
++	state = 5;
++	ret = -EPERM;
++	if (!permit)
++		goto out;
++
++	state = 6;
++	if (!id && (flags & VCF_ZIDOK))
++		goto skip_id;
++
++	ret = -ESRCH;
++	if (args & VCA_VXI) {
++		vxi = lookup_vx_info(id);
++		if (!vxi)
++			goto out;
++
++		if ((flags & VCF_ADMIN) &&
++			/* special case kill for shutdown */
++			(cmd != VCMD_ctx_kill) &&
++			/* can context be administrated? */
++			!vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
++			ret = -EACCES;
++			goto out_vxi;
++		}
++	}
++	state = 7;
++	if (args & VCA_NXI) {
++		nxi = lookup_nx_info(id);
++		if (!nxi)
++			goto out_vxi;
++
++		if ((flags & VCF_ADMIN) &&
++			/* can context be administrated? */
++			!nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
++			ret = -EACCES;
++			goto out_nxi;
++		}
++	}
++skip_id:
++	state = 8;
++	ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
++
++out_nxi:
++	if ((args & VCA_NXI) && nxi)
++		put_nx_info(nxi);
++out_vxi:
++	if ((args & VCA_VXI) && vxi)
++		put_vx_info(vxi);
++out:
++	vxdprintk(VXD_CBIT(switch, 1),
++		"vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]",
++		VC_CATEGORY(cmd), VC_COMMAND(cmd),
++		VC_VERSION(cmd), ret, ret, state, permit);
++	return ret;
++}
++
++asmlinkage long
++sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
++{
++	return do_vserver(cmd, id, data, 0);
++}
++
++#ifdef	CONFIG_COMPAT
++
++asmlinkage long
++sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
++{
++	return do_vserver(cmd, id, data, 1);
++}
++
++#endif	/* CONFIG_COMPAT */
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/sysctl.c linux-3.4.45-vs2.3.3.9/kernel/vserver/sysctl.c
+--- linux-3.4.45/kernel/vserver/sysctl.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/sysctl.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,247 @@
++/*
++ *  kernel/vserver/sysctl.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/ctype.h>
++#include <linux/sysctl.h>
++#include <linux/parser.h>
++#include <asm/uaccess.h>
++
++enum {
++	CTL_DEBUG_ERROR		= 0,
++	CTL_DEBUG_SWITCH	= 1,
++	CTL_DEBUG_XID,
++	CTL_DEBUG_NID,
++	CTL_DEBUG_TAG,
++	CTL_DEBUG_NET,
++	CTL_DEBUG_LIMIT,
++	CTL_DEBUG_CRES,
++	CTL_DEBUG_DLIM,
++	CTL_DEBUG_QUOTA,
++	CTL_DEBUG_CVIRT,
++	CTL_DEBUG_SPACE,
++	CTL_DEBUG_PERM,
++	CTL_DEBUG_MISC,
++};
++
++
++unsigned int vs_debug_switch	= 0;
++unsigned int vs_debug_xid	= 0;
++unsigned int vs_debug_nid	= 0;
++unsigned int vs_debug_tag	= 0;
++unsigned int vs_debug_net	= 0;
++unsigned int vs_debug_limit	= 0;
++unsigned int vs_debug_cres	= 0;
++unsigned int vs_debug_dlim	= 0;
++unsigned int vs_debug_quota	= 0;
++unsigned int vs_debug_cvirt	= 0;
++unsigned int vs_debug_space	= 0;
++unsigned int vs_debug_perm	= 0;
++unsigned int vs_debug_misc	= 0;
++
++
++static struct ctl_table_header *vserver_table_header;
++static ctl_table vserver_root_table[];
++
++
++void vserver_register_sysctl(void)
++{
++	if (!vserver_table_header) {
++		vserver_table_header = register_sysctl_table(vserver_root_table);
++	}
++
++}
++
++void vserver_unregister_sysctl(void)
++{
++	if (vserver_table_header) {
++		unregister_sysctl_table(vserver_table_header);
++		vserver_table_header = NULL;
++	}
++}
++
++
++static int proc_dodebug(ctl_table *table, int write,
++	void __user *buffer, size_t *lenp, loff_t *ppos)
++{
++	char		tmpbuf[20], *p, c;
++	unsigned int	value;
++	size_t		left, len;
++
++	if ((*ppos && !write) || !*lenp) {
++		*lenp = 0;
++		return 0;
++	}
++
++	left = *lenp;
++
++	if (write) {
++		if (!access_ok(VERIFY_READ, buffer, left))
++			return -EFAULT;
++		p = (char *)buffer;
++		while (left && __get_user(c, p) >= 0 && isspace(c))
++			left--, p++;
++		if (!left)
++			goto done;
++
++		if (left > sizeof(tmpbuf) - 1)
++			return -EINVAL;
++		if (copy_from_user(tmpbuf, p, left))
++			return -EFAULT;
++		tmpbuf[left] = '\0';
++
++		for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--)
++			value = 10 * value + (*p - '0');
++		if (*p && !isspace(*p))
++			return -EINVAL;
++		while (left && isspace(*p))
++			left--, p++;
++		*(unsigned int *)table->data = value;
++	} else {
++		if (!access_ok(VERIFY_WRITE, buffer, left))
++			return -EFAULT;
++		len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
++		if (len > left)
++			len = left;
++		if (__copy_to_user(buffer, tmpbuf, len))
++			return -EFAULT;
++		if ((left -= len) > 0) {
++			if (put_user('\n', (char *)buffer + len))
++				return -EFAULT;
++			left--;
++		}
++	}
++
++done:
++	*lenp -= left;
++	*ppos += *lenp;
++	return 0;
++}
++
++static int zero;
++
++#define	CTL_ENTRY(ctl, name)				\
++	{						\
++		.procname	= #name,		\
++		.data		= &vs_ ## name,		\
++		.maxlen		= sizeof(int),		\
++		.mode		= 0644,			\
++		.proc_handler	= &proc_dodebug,	\
++		.extra1		= &zero,		\
++		.extra2		= &zero,		\
++	}
++
++static ctl_table vserver_debug_table[] = {
++	CTL_ENTRY(CTL_DEBUG_SWITCH,	debug_switch),
++	CTL_ENTRY(CTL_DEBUG_XID,	debug_xid),
++	CTL_ENTRY(CTL_DEBUG_NID,	debug_nid),
++	CTL_ENTRY(CTL_DEBUG_TAG,	debug_tag),
++	CTL_ENTRY(CTL_DEBUG_NET,	debug_net),
++	CTL_ENTRY(CTL_DEBUG_LIMIT,	debug_limit),
++	CTL_ENTRY(CTL_DEBUG_CRES,	debug_cres),
++	CTL_ENTRY(CTL_DEBUG_DLIM,	debug_dlim),
++	CTL_ENTRY(CTL_DEBUG_QUOTA,	debug_quota),
++	CTL_ENTRY(CTL_DEBUG_CVIRT,	debug_cvirt),
++	CTL_ENTRY(CTL_DEBUG_SPACE,	debug_space),
++	CTL_ENTRY(CTL_DEBUG_PERM,	debug_perm),
++	CTL_ENTRY(CTL_DEBUG_MISC,	debug_misc),
++	{ 0 }
++};
++
++static ctl_table vserver_root_table[] = {
++	{
++		.procname	= "vserver",
++		.mode		= 0555,
++		.child		= vserver_debug_table
++	},
++	{ 0 }
++};
++
++
++static match_table_t tokens = {
++	{ CTL_DEBUG_SWITCH,	"switch=%x"	},
++	{ CTL_DEBUG_XID,	"xid=%x"	},
++	{ CTL_DEBUG_NID,	"nid=%x"	},
++	{ CTL_DEBUG_TAG,	"tag=%x"	},
++	{ CTL_DEBUG_NET,	"net=%x"	},
++	{ CTL_DEBUG_LIMIT,	"limit=%x"	},
++	{ CTL_DEBUG_CRES,	"cres=%x"	},
++	{ CTL_DEBUG_DLIM,	"dlim=%x"	},
++	{ CTL_DEBUG_QUOTA,	"quota=%x"	},
++	{ CTL_DEBUG_CVIRT,	"cvirt=%x"	},
++	{ CTL_DEBUG_SPACE,	"space=%x"	},
++	{ CTL_DEBUG_PERM,	"perm=%x"	},
++	{ CTL_DEBUG_MISC,	"misc=%x"	},
++	{ CTL_DEBUG_ERROR,	NULL		}
++};
++
++#define	HANDLE_CASE(id, name, val)				\
++	case CTL_DEBUG_ ## id:					\
++		vs_debug_ ## name = val;			\
++		printk("vs_debug_" #name "=0x%x\n", val);	\
++		break
++
++
++static int __init vs_debug_setup(char *str)
++{
++	char *p;
++	int token;
++
++	printk("vs_debug_setup(%s)\n", str);
++	while ((p = strsep(&str, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		unsigned int value;
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, tokens, args);
++		value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
++
++		switch (token) {
++		HANDLE_CASE(SWITCH, switch, value);
++		HANDLE_CASE(XID,    xid,    value);
++		HANDLE_CASE(NID,    nid,    value);
++		HANDLE_CASE(TAG,    tag,    value);
++		HANDLE_CASE(NET,    net,    value);
++		HANDLE_CASE(LIMIT,  limit,  value);
++		HANDLE_CASE(CRES,   cres,   value);
++		HANDLE_CASE(DLIM,   dlim,   value);
++		HANDLE_CASE(QUOTA,  quota,  value);
++		HANDLE_CASE(CVIRT,  cvirt,  value);
++		HANDLE_CASE(SPACE,  space,  value);
++		HANDLE_CASE(PERM,   perm,   value);
++		HANDLE_CASE(MISC,   misc,   value);
++		default:
++			return -EINVAL;
++			break;
++		}
++	}
++	return 1;
++}
++
++__setup("vsdebug=", vs_debug_setup);
++
++
++
++EXPORT_SYMBOL_GPL(vs_debug_switch);
++EXPORT_SYMBOL_GPL(vs_debug_xid);
++EXPORT_SYMBOL_GPL(vs_debug_nid);
++EXPORT_SYMBOL_GPL(vs_debug_net);
++EXPORT_SYMBOL_GPL(vs_debug_limit);
++EXPORT_SYMBOL_GPL(vs_debug_cres);
++EXPORT_SYMBOL_GPL(vs_debug_dlim);
++EXPORT_SYMBOL_GPL(vs_debug_quota);
++EXPORT_SYMBOL_GPL(vs_debug_cvirt);
++EXPORT_SYMBOL_GPL(vs_debug_space);
++EXPORT_SYMBOL_GPL(vs_debug_perm);
++EXPORT_SYMBOL_GPL(vs_debug_misc);
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/tag.c linux-3.4.45-vs2.3.3.9/kernel/vserver/tag.c
+--- linux-3.4.45/kernel/vserver/tag.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/tag.c	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,63 @@
++/*
++ *  linux/kernel/vserver/tag.c
++ *
++ *  Virtual Server: Shallow Tag Space
++ *
++ *  Copyright (C) 2007  Herbert Pötzl
++ *
++ *  V0.01  basic implementation
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/vserver/debug.h>
++#include <linux/vs_pid.h>
++#include <linux/vs_tag.h>
++
++#include <linux/vserver/tag_cmd.h>
++
++
++int dx_migrate_task(struct task_struct *p, tag_t tag)
++{
++	if (!p)
++		BUG();
++
++	vxdprintk(VXD_CBIT(tag, 5),
++		"dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag);
++
++	task_lock(p);
++	p->tag = tag;
++	task_unlock(p);
++
++	vxdprintk(VXD_CBIT(tag, 5),
++		"moved task %p into [#%d]", p, tag);
++	return 0;
++}
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++
++int vc_task_tag(uint32_t id)
++{
++	tag_t tag;
++
++	if (id) {
++		struct task_struct *tsk;
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		tag = (tsk) ? tsk->tag : -ESRCH;
++		rcu_read_unlock();
++	} else
++		tag = dx_current_tag();
++	return tag;
++}
++
++
++int vc_tag_migrate(uint32_t tag)
++{
++	return dx_migrate_task(current, tag & 0xFFFF);
++}
++
++
+diff -NurpP --minimal linux-3.4.45/kernel/vserver/vci_config.h linux-3.4.45-vs2.3.3.9/kernel/vserver/vci_config.h
+--- linux-3.4.45/kernel/vserver/vci_config.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/kernel/vserver/vci_config.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,76 @@
++
++/*  interface version */
++
++#define VCI_VERSION		0x00020308
++
++
++enum {
++	VCI_KCBIT_NO_DYNAMIC = 0,
++
++	VCI_KCBIT_PROC_SECURE = 4,
++	/* VCI_KCBIT_HARDCPU = 5, */
++	/* VCI_KCBIT_IDLELIMIT = 6, */
++	/* VCI_KCBIT_IDLETIME = 7, */
++
++	VCI_KCBIT_COWBL = 8,
++	VCI_KCBIT_FULLCOWBL = 9,
++	VCI_KCBIT_SPACES = 10,
++	VCI_KCBIT_NETV2 = 11,
++	VCI_KCBIT_MEMCG = 12,
++
++	VCI_KCBIT_DEBUG = 16,
++	VCI_KCBIT_HISTORY = 20,
++	VCI_KCBIT_TAGGED = 24,
++	VCI_KCBIT_PPTAG = 28,
++
++	VCI_KCBIT_MORE = 31,
++};
++
++
++static inline uint32_t vci_kernel_config(void)
++{
++	return
++	(1 << VCI_KCBIT_NO_DYNAMIC) |
++
++	/* configured features */
++#ifdef	CONFIG_VSERVER_PROC_SECURE
++	(1 << VCI_KCBIT_PROC_SECURE) |
++#endif
++#ifdef	CONFIG_VSERVER_COWBL
++	(1 << VCI_KCBIT_COWBL) |
++	(1 << VCI_KCBIT_FULLCOWBL) |
++#endif
++	(1 << VCI_KCBIT_SPACES) |
++	(1 << VCI_KCBIT_NETV2) |
++#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
++	(1 << VCI_KCBIT_MEMCG) |
++#endif
++
++	/* debug options */
++#ifdef	CONFIG_VSERVER_DEBUG
++	(1 << VCI_KCBIT_DEBUG) |
++#endif
++#ifdef	CONFIG_VSERVER_HISTORY
++	(1 << VCI_KCBIT_HISTORY) |
++#endif
++
++	/* inode context tagging */
++#if	defined(CONFIG_TAGGING_NONE)
++	(0 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_UID16)
++	(1 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_GID16)
++	(2 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_ID24)
++	(3 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_INTERN)
++	(4 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_RUNTIME)
++	(5 << VCI_KCBIT_TAGGED) |
++#else
++	(7 << VCI_KCBIT_TAGGED) |
++#endif
++	(1 << VCI_KCBIT_PPTAG) |
++	0;
++}
++
+diff -NurpP --minimal linux-3.4.45/mm/memcontrol.c linux-3.4.45-vs2.3.3.9/mm/memcontrol.c
+--- linux-3.4.45/mm/memcontrol.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/memcontrol.c	2012-12-08 00:53:53.000000000 +0000
+@@ -846,6 +846,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ 				struct mem_cgroup, css);
+ }
+ 
++u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
++{
++	return res_counter_read_u64(&mem->res, member);
++}
++
++u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member)
++{
++	return res_counter_read_u64(&mem->memsw, member);
++}
++
++s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE);
++}
++
++s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS);
++}
++
++s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED);
++}
++
+ struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
+ {
+ 	struct mem_cgroup *memcg = NULL;
+diff -NurpP --minimal linux-3.4.45/mm/oom_kill.c linux-3.4.45-vs2.3.3.9/mm/oom_kill.c
+--- linux-3.4.45/mm/oom_kill.c	2012-05-21 16:07:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/oom_kill.c	2012-05-21 16:15:05.000000000 +0000
+@@ -35,6 +35,8 @@
+ #include <linux/freezer.h>
+ #include <linux/ftrace.h>
+ #include <linux/ratelimit.h>
++#include <linux/reboot.h>
++#include <linux/vs_context.h>
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/oom.h>
+@@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(st
+ static bool oom_unkillable_task(struct task_struct *p,
+ 		const struct mem_cgroup *memcg, const nodemask_t *nodemask)
+ {
+-	if (is_global_init(p))
++	unsigned xid = vx_current_xid();
++
++	/* skip the init task, global and per guest */
++	if (task_is_init(p))
+ 		return true;
+ 	if (p->flags & PF_KTHREAD)
+ 		return true;
+ 
++	/* skip other guest and host processes if oom in guest */
++	if (xid && vx_task_xid(p) != xid)
++		return true;
++
+ 	/* When mem_cgroup_out_of_memory() and p is not member of the group */
+ 	if (memcg && !task_in_mem_cgroup(p, memcg))
+ 		return true;
+@@ -462,8 +471,8 @@ static void oom_kill_process(struct task
+ 		dump_header(p, gfp_mask, order, memcg, nodemask);
+ 
+ 	task_lock(p);
+-	pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n",
+-		message, task_pid_nr(p), p->comm, points);
++	pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
++		message, task_pid_nr(p), p->xid, p->comm, points);
+ 	task_unlock(p);
+ 
+ 	/*
+@@ -496,8 +505,8 @@ static void oom_kill_process(struct task
+ 
+ 	/* mm cannot safely be dereferenced after task_unlock(victim) */
+ 	mm = victim->mm;
+-	pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+-		task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
++	pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
++		task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
+ 		K(get_mm_counter(victim->mm, MM_ANONPAGES)),
+ 		K(get_mm_counter(victim->mm, MM_FILEPAGES)));
+ 	task_unlock(victim);
+@@ -596,6 +605,8 @@ int unregister_oom_notifier(struct notif
+ }
+ EXPORT_SYMBOL_GPL(unregister_oom_notifier);
+ 
++long vs_oom_action(unsigned int);
++
+ /*
+  * Try to acquire the OOM killer lock for the zones in zonelist.  Returns zero
+  * if a parallel OOM killing is already taking place that includes a zone in
+@@ -747,7 +758,12 @@ void out_of_memory(struct zonelist *zone
+ 	if (!p) {
+ 		dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
+ 		read_unlock(&tasklist_lock);
+-		panic("Out of memory and no killable processes...\n");
++
++		/* avoid panic for guest OOM */
++		if (current->xid)
++			vs_oom_action(LINUX_REBOOT_CMD_OOM);
++		else
++			panic("Out of memory and no killable processes...\n");
+ 	}
+ 	if (PTR_ERR(p) != -1UL) {
+ 		oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
+diff -NurpP --minimal linux-3.4.45/mm/page_alloc.c linux-3.4.45-vs2.3.3.9/mm/page_alloc.c
+--- linux-3.4.45/mm/page_alloc.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/page_alloc.c	2013-03-02 15:26:44.000000000 +0000
+@@ -58,6 +58,8 @@
+ #include <linux/memcontrol.h>
+ #include <linux/prefetch.h>
+ #include <linux/page-debug-flags.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/tlbflush.h>
+ #include <asm/div64.h>
+@@ -2655,6 +2657,9 @@ void si_meminfo(struct sysinfo *val)
+ 	val->totalhigh = totalhigh_pages;
+ 	val->freehigh = nr_free_highpages();
+ 	val->mem_unit = PAGE_SIZE;
++
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_meminfo(val);
+ }
+ 
+ EXPORT_SYMBOL(si_meminfo);
+@@ -2675,6 +2680,9 @@ void si_meminfo_node(struct sysinfo *val
+ 	val->freehigh = 0;
+ #endif
+ 	val->mem_unit = PAGE_SIZE;
++
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_meminfo(val);
+ }
+ #endif
+ 
+diff -NurpP --minimal linux-3.4.45/mm/pgtable-generic.c linux-3.4.45-vs2.3.3.9/mm/pgtable-generic.c
+--- linux-3.4.45/mm/pgtable-generic.c	2012-05-21 16:07:35.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/pgtable-generic.c	2012-05-21 16:15:05.000000000 +0000
+@@ -6,6 +6,8 @@
+  *  Copyright (C) 2010  Linus Torvalds
+  */
+ 
++#include <linux/mm.h>
++
+ #include <linux/pagemap.h>
+ #include <asm/tlb.h>
+ #include <asm-generic/pgtable.h>
+diff -NurpP --minimal linux-3.4.45/mm/shmem.c linux-3.4.45-vs2.3.3.9/mm/shmem.c
+--- linux-3.4.45/mm/shmem.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/shmem.c	2013-03-02 15:26:44.000000000 +0000
+@@ -1473,7 +1473,7 @@ static int shmem_statfs(struct dentry *d
+ {
+ 	struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
+ 
+-	buf->f_type = TMPFS_MAGIC;
++	buf->f_type = TMPFS_SUPER_MAGIC;
+ 	buf->f_bsize = PAGE_CACHE_SIZE;
+ 	buf->f_namelen = NAME_MAX;
+ 	if (sbinfo->max_blocks) {
+@@ -2287,7 +2287,7 @@ int shmem_fill_super(struct super_block
+ 	sb->s_maxbytes = MAX_LFS_FILESIZE;
+ 	sb->s_blocksize = PAGE_CACHE_SIZE;
+ 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+-	sb->s_magic = TMPFS_MAGIC;
++	sb->s_magic = TMPFS_SUPER_MAGIC;
+ 	sb->s_op = &shmem_ops;
+ 	sb->s_time_gran = 1;
+ #ifdef CONFIG_TMPFS_XATTR
+diff -NurpP --minimal linux-3.4.45/mm/slab.c linux-3.4.45-vs2.3.3.9/mm/slab.c
+--- linux-3.4.45/mm/slab.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/slab.c	2012-10-22 13:09:53.000000000 +0000
+@@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_
+ #define STATS_INC_FREEMISS(x)	do { } while (0)
+ #endif
+ 
++#include "slab_vs.h"
++
+ #if DEBUG
+ 
+ /*
+@@ -3466,6 +3468,7 @@ retry:
+ 
+ 	obj = slab_get_obj(cachep, slabp, nodeid);
+ 	check_slabp(cachep, slabp);
++	vx_slab_alloc(cachep, flags);
+ 	l3->free_objects--;
+ 	/* move slabp to correct slabp list: */
+ 	list_del(&slabp->list);
+@@ -3543,6 +3546,7 @@ __cache_alloc_node(struct kmem_cache *ca
+ 	/* ___cache_alloc_node can fall back to other nodes */
+ 	ptr = ____cache_alloc_node(cachep, flags, nodeid);
+   out:
++	vx_slab_alloc(cachep, flags);
+ 	local_irq_restore(save_flags);
+ 	ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
+ 	kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags,
+@@ -3730,6 +3734,7 @@ static inline void __cache_free(struct k
+ 	check_irq_off();
+ 	kmemleak_free_recursive(objp, cachep->flags);
+ 	objp = cache_free_debugcheck(cachep, objp, caller);
++	vx_slab_free(cachep);
+ 
+ 	kmemcheck_slab_free(cachep, objp, obj_size(cachep));
+ 
+diff -NurpP --minimal linux-3.4.45/mm/slab_vs.h linux-3.4.45-vs2.3.3.9/mm/slab_vs.h
+--- linux-3.4.45/mm/slab_vs.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/slab_vs.h	2012-05-21 16:15:05.000000000 +0000
+@@ -0,0 +1,29 @@
++
++#include <linux/vserver/context.h>
++
++#include <linux/vs_context.h>
++
++static inline
++void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
++{
++	int what = gfp_zone(cachep->gfpflags);
++	struct vx_info *vxi = current_vx_info();
++
++	if (!vxi)
++		return;
++
++	atomic_add(cachep->buffer_size, &vxi->cacct.slab[what]);
++}
++
++static inline
++void vx_slab_free(struct kmem_cache *cachep)
++{
++	int what = gfp_zone(cachep->gfpflags);
++	struct vx_info *vxi = current_vx_info();
++
++	if (!vxi)
++		return;
++
++	atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
++}
++
+diff -NurpP --minimal linux-3.4.45/mm/swapfile.c linux-3.4.45-vs2.3.3.9/mm/swapfile.c
+--- linux-3.4.45/mm/swapfile.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/mm/swapfile.c	2012-06-28 14:45:07.000000000 +0000
+@@ -36,6 +36,7 @@
+ #include <asm/tlbflush.h>
+ #include <linux/swapops.h>
+ #include <linux/page_cgroup.h>
++#include <linux/vs_base.h>
+ 
+ static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
+ 				 unsigned char);
+@@ -1754,6 +1755,16 @@ static int swap_show(struct seq_file *sw
+ 
+ 	if (si == SEQ_START_TOKEN) {
+ 		seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
++		if (vx_flags(VXF_VIRT_MEM, 0)) {
++			struct sysinfo si;
++
++			vx_vsi_swapinfo(&si);
++			if (si.totalswap < (1 << 10))
++				return 0;
++			seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
++				"hdv0", "partition", si.totalswap >> 10,
++				(si.totalswap - si.freeswap) >> 10, -1);
++		}
+ 		return 0;
+ 	}
+ 
+@@ -2176,6 +2187,8 @@ void si_swapinfo(struct sysinfo *val)
+ 	val->freeswap = nr_swap_pages + nr_to_be_unused;
+ 	val->totalswap = total_swap_pages + nr_to_be_unused;
+ 	spin_unlock(&swap_lock);
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_swapinfo(val);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.4.45/net/bridge/br_multicast.c linux-3.4.45-vs2.3.3.9/net/bridge/br_multicast.c
+--- linux-3.4.45/net/bridge/br_multicast.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/bridge/br_multicast.c	2012-05-21 16:15:05.000000000 +0000
+@@ -445,7 +445,7 @@ static struct sk_buff *br_ip6_multicast_
+ 	ip6h->hop_limit = 1;
+ 	ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
+ 	if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
+-			       &ip6h->saddr)) {
++			       &ip6h->saddr, NULL)) {
+ 		kfree_skb(skb);
+ 		return NULL;
+ 	}
+diff -NurpP --minimal linux-3.4.45/net/core/dev.c linux-3.4.45-vs2.3.3.9/net/core/dev.c
+--- linux-3.4.45/net/core/dev.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/core/dev.c	2013-05-13 18:16:08.000000000 +0000
+@@ -126,6 +126,7 @@
+ #include <linux/in.h>
+ #include <linux/jhash.h>
+ #include <linux/random.h>
++#include <linux/vs_inet.h>
+ #include <trace/events/napi.h>
+ #include <trace/events/net.h>
+ #include <trace/events/skb.h>
+@@ -621,7 +622,8 @@ struct net_device *__dev_get_by_name(str
+ 	struct hlist_head *head = dev_name_hash(net, name);
+ 
+ 	hlist_for_each_entry(dev, p, head, name_hlist)
+-		if (!strncmp(dev->name, name, IFNAMSIZ))
++		if (!strncmp(dev->name, name, IFNAMSIZ) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -647,7 +649,8 @@ struct net_device *dev_get_by_name_rcu(s
+ 	struct hlist_head *head = dev_name_hash(net, name);
+ 
+ 	hlist_for_each_entry_rcu(dev, p, head, name_hlist)
+-		if (!strncmp(dev->name, name, IFNAMSIZ))
++		if (!strncmp(dev->name, name, IFNAMSIZ) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -698,7 +701,8 @@ struct net_device *__dev_get_by_index(st
+ 	struct hlist_head *head = dev_index_hash(net, ifindex);
+ 
+ 	hlist_for_each_entry(dev, p, head, index_hlist)
+-		if (dev->ifindex == ifindex)
++		if ((dev->ifindex == ifindex) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -716,7 +720,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+  *	about locking. The caller must hold RCU lock.
+  */
+ 
+-struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
+ {
+ 	struct hlist_node *p;
+ 	struct net_device *dev;
+@@ -728,6 +732,16 @@ struct net_device *dev_get_by_index_rcu(
+ 
+ 	return NULL;
+ }
++EXPORT_SYMBOL(dev_get_by_index_real_rcu);
++
++struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++{
++	struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
++
++	if (nx_dev_visible(current_nx_info(), dev))
++		return dev;
++	return NULL;
++}
+ EXPORT_SYMBOL(dev_get_by_index_rcu);
+ 
+ 
+@@ -776,7 +790,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+ 
+ 	for_each_netdev_rcu(net, dev)
+ 		if (dev->type == type &&
+-		    !memcmp(dev->dev_addr, ha, dev->addr_len))
++		    !memcmp(dev->dev_addr, ha, dev->addr_len) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -788,9 +803,11 @@ struct net_device *__dev_getfirstbyhwtyp
+ 	struct net_device *dev;
+ 
+ 	ASSERT_RTNL();
+-	for_each_netdev(net, dev)
+-		if (dev->type == type)
++	for_each_netdev(net, dev) {
++		if ((dev->type == type) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
++	}
+ 
+ 	return NULL;
+ }
+@@ -908,6 +925,8 @@ static int __dev_alloc_name(struct net *
+ 				continue;
+ 			if (i < 0 || i >= max_netdevices)
+ 				continue;
++			if (!nx_dev_visible(current_nx_info(), d))
++				continue;
+ 
+ 			/*  avoid cases where sscanf is not exact inverse of printf */
+ 			snprintf(buf, IFNAMSIZ, name, i);
+@@ -4009,6 +4028,8 @@ static int dev_ifconf(struct net *net, c
+ 
+ 	total = 0;
+ 	for_each_netdev(net, dev) {
++		if (!nx_dev_visible(current_nx_info(), dev))
++			continue;
+ 		for (i = 0; i < NPROTO; i++) {
+ 			if (gifconf_list[i]) {
+ 				int done;
+@@ -4111,6 +4132,10 @@ static void dev_seq_printf_stats(struct
+ 	struct rtnl_link_stats64 temp;
+ 	const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
+ 
++	/* device visible inside network context? */
++	if (!nx_dev_visible(current_nx_info(), dev))
++		return;
++
+ 	seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
+ 		   "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
+ 		   dev->name, stats->rx_bytes, stats->rx_packets,
+diff -NurpP --minimal linux-3.4.45/net/core/rtnetlink.c linux-3.4.45-vs2.3.3.9/net/core/rtnetlink.c
+--- linux-3.4.45/net/core/rtnetlink.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/core/rtnetlink.c	2013-05-13 18:16:08.000000000 +0000
+@@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+ 		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+ 			if (idx < s_idx)
+ 				goto cont;
++			if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
++				continue;
+ 			if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
+ 					     NETLINK_CB(cb->skb).pid,
+ 					     cb->nlh->nlmsg_seq, 0,
+@@ -1962,6 +1964,9 @@ void rtmsg_ifinfo(int type, struct net_d
+ 	int err = -ENOBUFS;
+ 	size_t if_info_size;
+ 
++	if (!nx_dev_visible(current_nx_info(), dev))
++		return;
++
+ 	skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
+ 	if (skb == NULL)
+ 		goto errout;
+diff -NurpP --minimal linux-3.4.45/net/core/sock.c linux-3.4.45-vs2.3.3.9/net/core/sock.c
+--- linux-3.4.45/net/core/sock.c	2013-05-13 17:36:37.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/core/sock.c	2013-05-13 18:16:08.000000000 +0000
+@@ -129,6 +129,10 @@
+ #include <net/netprio_cgroup.h>
+ 
+ #include <linux/filter.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ 
+ #include <trace/events/sock.h>
+ 
+@@ -1153,6 +1157,8 @@ static struct sock *sk_prot_alloc(struct
+ 			goto out_free_sec;
+ 		sk_tx_queue_clear(sk);
+ 	}
++		sock_vx_init(sk);
++		sock_nx_init(sk);
+ 
+ 	return sk;
+ 
+@@ -1261,6 +1267,11 @@ static void __sk_free(struct sock *sk)
+ 		put_cred(sk->sk_peer_cred);
+ 	put_pid(sk->sk_peer_pid);
+ 	put_net(sock_net(sk));
++	vx_sock_dec(sk);
++	clr_vx_info(&sk->sk_vx_info);
++	sk->sk_xid = -1;
++	clr_nx_info(&sk->sk_nx_info);
++	sk->sk_nid = -1;
+ 	sk_prot_free(sk->sk_prot_creator, sk);
+ }
+ 
+@@ -1321,6 +1332,8 @@ struct sock *sk_clone_lock(const struct
+ 
+ 		/* SANITY */
+ 		get_net(sock_net(newsk));
++		sock_vx_init(newsk);
++		sock_nx_init(newsk);
+ 		sk_node_init(&newsk->sk_node);
+ 		sock_lock_init(newsk);
+ 		bh_lock_sock(newsk);
+@@ -1377,6 +1390,12 @@ struct sock *sk_clone_lock(const struct
+ 		smp_wmb();
+ 		atomic_set(&newsk->sk_refcnt, 2);
+ 
++		set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
++		newsk->sk_xid = sk->sk_xid;
++		vx_sock_inc(newsk);
++		set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info);
++		newsk->sk_nid = sk->sk_nid;
++
+ 		/*
+ 		 * Increment the counter in the same struct proto as the master
+ 		 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
+@@ -2133,6 +2152,12 @@ void sock_init_data(struct socket *sock,
+ 
+ 	sk->sk_stamp = ktime_set(-1L, 0);
+ 
++	set_vx_info(&sk->sk_vx_info, current_vx_info());
++	sk->sk_xid = vx_current_xid();
++	vx_sock_inc(sk);
++	set_nx_info(&sk->sk_nx_info, current_nx_info());
++	sk->sk_nid = nx_current_nid();
++
+ 	/*
+ 	 * Before updating sk_refcnt, we must commit prior changes to memory
+ 	 * (Documentation/RCU/rculist_nulls.txt for details)
+diff -NurpP --minimal linux-3.4.45/net/ipv4/af_inet.c linux-3.4.45-vs2.3.3.9/net/ipv4/af_inet.c
+--- linux-3.4.45/net/ipv4/af_inet.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/af_inet.c	2013-03-02 15:26:44.000000000 +0000
+@@ -118,6 +118,7 @@
+ #ifdef CONFIG_IP_MROUTE
+ #include <linux/mroute.h>
+ #endif
++#include <linux/vs_limit.h>
+ 
+ 
+ /* The inetsw table contains everything that inet_create needs to
+@@ -332,9 +333,13 @@ lookup_protocol:
+ 	}
+ 
+ 	err = -EPERM;
++	if ((protocol == IPPROTO_ICMP) &&
++		nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
++		goto override;
++
+ 	if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ 		goto out_rcu_unlock;
+-
++override:
+ 	err = -EAFNOSUPPORT;
+ 	if (!inet_netns_ok(net, protocol))
+ 		goto out_rcu_unlock;
+@@ -459,6 +464,7 @@ int inet_bind(struct socket *sock, struc
+ 	struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
+ 	struct sock *sk = sock->sk;
+ 	struct inet_sock *inet = inet_sk(sk);
++	struct nx_v4_sock_addr nsa;
+ 	unsigned short snum;
+ 	int chk_addr_ret;
+ 	int err;
+@@ -482,7 +488,11 @@ int inet_bind(struct socket *sock, struc
+ 			goto out;
+ 	}
+ 
+-	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
++	err = v4_map_sock_addr(inet, addr, &nsa);
++	if (err)
++		goto out;
++
++	chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
+ 
+ 	/* Not specified by any standard per-se, however it breaks too
+ 	 * many applications when removed.  It is unfortunate since
+@@ -494,7 +504,7 @@ int inet_bind(struct socket *sock, struc
+ 	err = -EADDRNOTAVAIL;
+ 	if (!sysctl_ip_nonlocal_bind &&
+ 	    !(inet->freebind || inet->transparent) &&
+-	    addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
++	    nsa.saddr != htonl(INADDR_ANY) &&
+ 	    chk_addr_ret != RTN_LOCAL &&
+ 	    chk_addr_ret != RTN_MULTICAST &&
+ 	    chk_addr_ret != RTN_BROADCAST)
+@@ -519,7 +529,7 @@ int inet_bind(struct socket *sock, struc
+ 	if (sk->sk_state != TCP_CLOSE || inet->inet_num)
+ 		goto out_release_sock;
+ 
+-	inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++	v4_set_sock_addr(inet, &nsa);
+ 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
+ 		inet->inet_saddr = 0;  /* Use device */
+ 
+@@ -722,11 +732,13 @@ int inet_getname(struct socket *sock, st
+ 		     peer == 1))
+ 			return -ENOTCONN;
+ 		sin->sin_port = inet->inet_dport;
+-		sin->sin_addr.s_addr = inet->inet_daddr;
++		sin->sin_addr.s_addr =
++			nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr);
+ 	} else {
+ 		__be32 addr = inet->inet_rcv_saddr;
+ 		if (!addr)
+ 			addr = inet->inet_saddr;
++		addr = nx_map_sock_lback(sk->sk_nx_info, addr);
+ 		sin->sin_port = inet->inet_sport;
+ 		sin->sin_addr.s_addr = addr;
+ 	}
+diff -NurpP --minimal linux-3.4.45/net/ipv4/arp.c linux-3.4.45-vs2.3.3.9/net/ipv4/arp.c
+--- linux-3.4.45/net/ipv4/arp.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/arp.c	2012-05-21 16:15:05.000000000 +0000
+@@ -1328,6 +1328,7 @@ static void arp_format_neigh_entry(struc
+ 	struct net_device *dev = n->dev;
+ 	int hatype = dev->type;
+ 
++	/* FIXME: check for network context */
+ 	read_lock(&n->lock);
+ 	/* Convert hardware address to XX:XX:XX:XX ... form. */
+ #if IS_ENABLED(CONFIG_AX25)
+@@ -1359,6 +1360,7 @@ static void arp_format_pneigh_entry(stru
+ 	int hatype = dev ? dev->type : 0;
+ 	char tbuf[16];
+ 
++	/* FIXME: check for network context */
+ 	sprintf(tbuf, "%pI4", n->key);
+ 	seq_printf(seq, "%-16s 0x%-10x0x%-10x%s     *        %s\n",
+ 		   tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
+diff -NurpP --minimal linux-3.4.45/net/ipv4/devinet.c linux-3.4.45-vs2.3.3.9/net/ipv4/devinet.c
+--- linux-3.4.45/net/ipv4/devinet.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/devinet.c	2012-05-21 16:15:05.000000000 +0000
+@@ -517,6 +517,7 @@ struct in_device *inetdev_by_index(struc
+ }
+ EXPORT_SYMBOL(inetdev_by_index);
+ 
++
+ /* Called only from RTNL semaphored context. No locks. */
+ 
+ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
+@@ -758,6 +759,8 @@ int devinet_ioctl(struct net *net, unsig
+ 
+ 	in_dev = __in_dev_get_rtnl(dev);
+ 	if (in_dev) {
++		struct nx_info *nxi = current_nx_info();
++
+ 		if (tryaddrmatch) {
+ 			/* Matthias Andree */
+ 			/* compare label and address (4.4BSD style) */
+@@ -766,6 +769,8 @@ int devinet_ioctl(struct net *net, unsig
+ 			   This is checked above. */
+ 			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
+ 			     ifap = &ifa->ifa_next) {
++				if (!nx_v4_ifa_visible(nxi, ifa))
++					continue;
+ 				if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
+ 				    sin_orig.sin_addr.s_addr ==
+ 							ifa->ifa_local) {
+@@ -778,9 +783,12 @@ int devinet_ioctl(struct net *net, unsig
+ 		   comparing just the label */
+ 		if (!ifa) {
+ 			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
+-			     ifap = &ifa->ifa_next)
++			     ifap = &ifa->ifa_next) {
++				if (!nx_v4_ifa_visible(nxi, ifa))
++					continue;
+ 				if (!strcmp(ifr.ifr_name, ifa->ifa_label))
+ 					break;
++			}
+ 		}
+ 	}
+ 
+@@ -933,6 +941,8 @@ static int inet_gifconf(struct net_devic
+ 		goto out;
+ 
+ 	for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
++		if (!nx_v4_ifa_visible(current_nx_info(), ifa))
++			continue;
+ 		if (!buf) {
+ 			done += sizeof(ifr);
+ 			continue;
+@@ -1294,6 +1304,7 @@ static int inet_dump_ifaddr(struct sk_bu
+ 	struct net_device *dev;
+ 	struct in_device *in_dev;
+ 	struct in_ifaddr *ifa;
++	struct sock *sk = skb->sk;
+ 	struct hlist_head *head;
+ 	struct hlist_node *node;
+ 
+@@ -1316,6 +1327,8 @@ static int inet_dump_ifaddr(struct sk_bu
+ 
+ 			for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
+ 			     ifa = ifa->ifa_next, ip_idx++) {
++			if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa))
++				continue;
+ 				if (ip_idx < s_ip_idx)
+ 					continue;
+ 				if (inet_fill_ifaddr(skb, ifa,
+diff -NurpP --minimal linux-3.4.45/net/ipv4/fib_trie.c linux-3.4.45-vs2.3.3.9/net/ipv4/fib_trie.c
+--- linux-3.4.45/net/ipv4/fib_trie.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/fib_trie.c	2012-05-21 16:15:05.000000000 +0000
+@@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq
+ 			    || fa->fa_type == RTN_MULTICAST)
+ 				continue;
+ 
++			/* FIXME: check for network context? */
+ 			if (fi)
+ 				seq_printf(seq,
+ 					 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
+diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_connection_sock.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_connection_sock.c
+--- linux-3.4.45/net/ipv4/inet_connection_sock.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_connection_sock.c	2013-01-16 00:15:57.000000000 +0000
+@@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
+ }
+ EXPORT_SYMBOL(inet_get_local_port_range);
+ 
++int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
++{
++	__be32	sk1_rcv_saddr = sk_rcv_saddr(sk1),
++		sk2_rcv_saddr = sk_rcv_saddr(sk2);
++
++	if (inet_v6_ipv6only(sk2))
++		return 0;
++
++	if (sk1_rcv_saddr &&
++	    sk2_rcv_saddr &&
++	    sk1_rcv_saddr == sk2_rcv_saddr)
++		return 1;
++
++	if (sk1_rcv_saddr &&
++	    !sk2_rcv_saddr &&
++	    v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, NXA_MASK_BIND))
++		return 1;
++
++	if (sk2_rcv_saddr &&
++	    !sk1_rcv_saddr &&
++	    v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, NXA_MASK_BIND))
++		return 1;
++
++	if (!sk1_rcv_saddr &&
++	    !sk2_rcv_saddr &&
++	    nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info))
++		return 1;
++
++	return 0;
++}
++
+ int inet_csk_bind_conflict(const struct sock *sk,
+ 			   const struct inet_bind_bucket *tb)
+ {
+@@ -74,9 +105,7 @@ int inet_csk_bind_conflict(const struct
+ 		     sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
+ 			if (!reuse || !sk2->sk_reuse ||
+ 			    sk2->sk_state == TCP_LISTEN) {
+-				const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
+-				if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) ||
+-				    sk2_rcv_saddr == sk_rcv_saddr(sk))
++				if (ipv4_rcv_saddr_equal(sk, sk2))
+ 					break;
+ 			}
+ 		}
+diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_diag.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_diag.c
+--- linux-3.4.45/net/ipv4/inet_diag.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_diag.c	2013-01-16 00:18:21.000000000 +0000
+@@ -31,6 +31,8 @@
+ 
+ #include <linux/inet.h>
+ #include <linux/stddef.h>
++#include <linux/vs_network.h>
++#include <linux/vs_inet.h>
+ 
+ #include <linux/inet_diag.h>
+ #include <linux/sock_diag.h>
+@@ -110,8 +112,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+ 
+ 	r->id.idiag_sport = inet->inet_sport;
+ 	r->id.idiag_dport = inet->inet_dport;
+-	r->id.idiag_src[0] = inet->inet_rcv_saddr;
+-	r->id.idiag_dst[0] = inet->inet_daddr;
++	r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info,
++		inet->inet_rcv_saddr);
++	r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info,
++		inet->inet_daddr);
+ 
+ 	/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
+ 	 * hence this needs to be included regardless of socket family.
+@@ -231,8 +235,8 @@ static int inet_twsk_diag_fill(struct in
+ 	sock_diag_save_cookie(tw, r->id.idiag_cookie);
+ 	r->id.idiag_sport     = tw->tw_sport;
+ 	r->id.idiag_dport     = tw->tw_dport;
+-	r->id.idiag_src[0]    = tw->tw_rcv_saddr;
+-	r->id.idiag_dst[0]    = tw->tw_daddr;
++	r->id.idiag_src[0]    = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr);
++	r->id.idiag_dst[0]    = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr);
+ 	r->idiag_state	      = tw->tw_substate;
+ 	r->idiag_timer	      = 3;
+ 	r->idiag_expires      = DIV_ROUND_UP(tmo * 1000, HZ);
+@@ -276,12 +280,14 @@ int inet_diag_dump_one_icsk(struct inet_
+ 
+ 	err = -EINVAL;
+ 	if (req->sdiag_family == AF_INET) {
++		/* TODO: lback */
+ 		sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
+ 				 req->id.idiag_dport, req->id.idiag_src[0],
+ 				 req->id.idiag_sport, req->id.idiag_if);
+ 	}
+ #if IS_ENABLED(CONFIG_IPV6)
+ 	else if (req->sdiag_family == AF_INET6) {
++		/* TODO: lback */
+ 		sk = inet6_lookup(&init_net, hashinfo,
+ 				  (struct in6_addr *)req->id.idiag_dst,
+ 				  req->id.idiag_dport,
+@@ -482,6 +488,7 @@ int inet_diag_bc_sk(const struct nlattr
+ 	} else
+ #endif
+ 	{
++			/* TODO: lback */
+ 		entry.saddr = &inet->inet_rcv_saddr;
+ 		entry.daddr = &inet->inet_daddr;
+ 	}
+@@ -639,6 +646,7 @@ static int inet_twsk_diag_dump(struct in
+ 		} else
+ #endif
+ 		{
++			/* TODO: lback */
+ 			entry.saddr = &tw->tw_rcv_saddr;
+ 			entry.daddr = &tw->tw_daddr;
+ 		}
+@@ -714,8 +722,8 @@ static int inet_diag_fill_req(struct sk_
+ 
+ 	r->id.idiag_sport = inet->inet_sport;
+ 	r->id.idiag_dport = ireq->rmt_port;
+-	r->id.idiag_src[0] = ireq->loc_addr;
+-	r->id.idiag_dst[0] = ireq->rmt_addr;
++	r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr);
++	r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr);
+ 	r->idiag_expires = jiffies_to_msecs(tmo);
+ 	r->idiag_rqueue = 0;
+ 	r->idiag_wqueue = 0;
+@@ -784,6 +792,7 @@ static int inet_diag_dump_reqs(struct sk
+ 				continue;
+ 
+ 			if (bc) {
++				/* TODO: lback */
+ 				inet_diag_req_addrs(sk, req, &entry);
+ 				entry.dport = ntohs(ireq->rmt_port);
+ 
+@@ -834,6 +843,8 @@ void inet_diag_dump_icsk(struct inet_has
+ 			sk_nulls_for_each(sk, node, &ilb->head) {
+ 				struct inet_sock *inet = inet_sk(sk);
+ 
++				if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (num < s_num) {
+ 					num++;
+ 					continue;
+@@ -904,6 +915,8 @@ skip_listen_ht:
+ 		sk_nulls_for_each(sk, node, &head->chain) {
+ 			struct inet_sock *inet = inet_sk(sk);
+ 
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (num < s_num)
+ 				goto next_normal;
+ 			if (!(r->idiag_states & (1 << sk->sk_state)))
+@@ -931,6 +944,8 @@ next_normal:
+ 			inet_twsk_for_each(tw, node,
+ 				    &head->twchain) {
+ 
++				if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (num < s_num)
+ 					goto next_dying;
+ 				if (r->sdiag_family != AF_UNSPEC &&
+diff -NurpP --minimal linux-3.4.45/net/ipv4/inet_hashtables.c linux-3.4.45-vs2.3.3.9/net/ipv4/inet_hashtables.c
+--- linux-3.4.45/net/ipv4/inet_hashtables.c	2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/inet_hashtables.c	2012-05-21 16:15:05.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
++#include <net/route.h>
+ #include <net/ip.h>
+ 
+ /*
+@@ -156,6 +157,11 @@ static inline int compute_score(struct s
+ 			if (rcv_saddr != daddr)
+ 				return -1;
+ 			score += 2;
++		} else {
++			/* block non nx_info ips */
++			if (!v4_addr_in_nx_info(sk->sk_nx_info,
++				daddr, NXA_MASK_BIND))
++				return -1;
+ 		}
+ 		if (sk->sk_bound_dev_if) {
+ 			if (sk->sk_bound_dev_if != dif)
+@@ -173,7 +179,6 @@ static inline int compute_score(struct s
+  * wildcarded during the search since they can never be otherwise.
+  */
+ 
+-
+ struct sock *__inet_lookup_listener(struct net *net,
+ 				    struct inet_hashinfo *hashinfo,
+ 				    const __be32 daddr, const unsigned short hnum,
+@@ -196,6 +201,7 @@ begin:
+ 			hiscore = score;
+ 		}
+ 	}
++
+ 	/*
+ 	 * if the nulls value we got at the end of this lookup is
+ 	 * not the expected one, we must restart lookup.
+diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter/nf_nat_helper.c linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.4.45/net/ipv4/netfilter/nf_nat_helper.c	2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter/nf_nat_helper.c	2012-05-21 16:15:05.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <net/route.h>
+ 
+ #include <linux/netfilter_ipv4.h>
++#include <net/route.h>
+ #include <net/netfilter/nf_conntrack.h>
+ #include <net/netfilter/nf_conntrack_helper.h>
+ #include <net/netfilter/nf_conntrack_ecache.h>
+diff -NurpP --minimal linux-3.4.45/net/ipv4/netfilter.c linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter.c
+--- linux-3.4.45/net/ipv4/netfilter.c	2012-01-09 15:15:03.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/netfilter.c	2012-05-21 16:15:05.000000000 +0000
+@@ -6,7 +6,7 @@
+ #include <linux/skbuff.h>
+ #include <linux/gfp.h>
+ #include <linux/export.h>
+-#include <net/route.h>
++// #include <net/route.h>
+ #include <net/xfrm.h>
+ #include <net/ip.h>
+ #include <net/netfilter/nf_queue.h>
+diff -NurpP --minimal linux-3.4.45/net/ipv4/raw.c linux-3.4.45-vs2.3.3.9/net/ipv4/raw.c
+--- linux-3.4.45/net/ipv4/raw.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/raw.c	2012-10-22 13:09:53.000000000 +0000
+@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
+ 
+ 		if (net_eq(sock_net(sk), net) && inet->inet_num == num	&&
+ 		    !(inet->inet_daddr && inet->inet_daddr != raddr) 	&&
+-		    !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
++		    v4_sock_addr_match(sk->sk_nx_info, inet, laddr)	&&
+ 		    !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
+ 			goto found; /* gotcha */
+ 	}
+@@ -392,6 +392,12 @@ static int raw_send_hdrinc(struct sock *
+ 		icmp_out_count(net, ((struct icmphdr *)
+ 			skb_transport_header(skb))->type);
+ 
++	err = -EPERM;
++	if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
++		sk->sk_nx_info &&
++		!v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
++		goto error_free;
++
+ 	err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
+ 		      rt->dst.dev, dst_output);
+ 	if (err > 0)
+@@ -577,6 +583,16 @@ static int raw_sendmsg(struct kiocb *ioc
+ 			goto done;
+ 	}
+ 
++	if (sk->sk_nx_info) {
++		rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4);
++		if (IS_ERR(rt)) {
++			err = PTR_ERR(rt);
++			rt = NULL;
++			goto done;
++		}
++		ip_rt_put(rt);
++	}
++
+ 	security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+ 	rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
+ 	if (IS_ERR(rt)) {
+@@ -653,17 +669,19 @@ static int raw_bind(struct sock *sk, str
+ {
+ 	struct inet_sock *inet = inet_sk(sk);
+ 	struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
++	struct nx_v4_sock_addr nsa = { 0 };
+ 	int ret = -EINVAL;
+ 	int chk_addr_ret;
+ 
+ 	if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
+ 		goto out;
+-	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
++	v4_map_sock_addr(inet, addr, &nsa);
++	chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
+ 	ret = -EADDRNOTAVAIL;
+-	if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
++	if (nsa.saddr && chk_addr_ret != RTN_LOCAL &&
+ 	    chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
+ 		goto out;
+-	inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++	v4_set_sock_addr(inet, &nsa);
+ 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
+ 		inet->inet_saddr = 0;  /* Use device */
+ 	sk_dst_reset(sk);
+@@ -715,7 +733,8 @@ static int raw_recvmsg(struct kiocb *ioc
+ 	/* Copy the address. */
+ 	if (sin) {
+ 		sin->sin_family = AF_INET;
+-		sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++		sin->sin_addr.s_addr =
++			nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr);
+ 		sin->sin_port = 0;
+ 		memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
+ 	}
+@@ -911,7 +930,8 @@ static struct sock *raw_get_first(struct
+ 		struct hlist_node *node;
+ 
+ 		sk_for_each(sk, node, &state->h->ht[state->bucket])
+-			if (sock_net(sk) == seq_file_net(seq))
++			if ((sock_net(sk) == seq_file_net(seq)) &&
++				nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ 				goto found;
+ 	}
+ 	sk = NULL;
+@@ -927,7 +947,8 @@ static struct sock *raw_get_next(struct
+ 		sk = sk_next(sk);
+ try_again:
+ 		;
+-	} while (sk && sock_net(sk) != seq_file_net(seq));
++	} while (sk && ((sock_net(sk) != seq_file_net(seq)) ||
++		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 
+ 	if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
+ 		sk = sk_head(&state->h->ht[state->bucket]);
+diff -NurpP --minimal linux-3.4.45/net/ipv4/route.c linux-3.4.45-vs2.3.3.9/net/ipv4/route.c
+--- linux-3.4.45/net/ipv4/route.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/route.c	2012-05-21 16:15:05.000000000 +0000
+@@ -2696,7 +2696,7 @@ static struct rtable *ip_route_output_sl
+ 
+ 
+ 	if (fl4->flowi4_oif) {
+-		dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
++		dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
+ 		rth = ERR_PTR(-ENODEV);
+ 		if (dev_out == NULL)
+ 			goto out;
+diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp.c
+--- linux-3.4.45/net/ipv4/tcp.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp.c	2013-03-30 21:29:17.000000000 +0000
+@@ -268,6 +268,7 @@
+ #include <linux/crypto.h>
+ #include <linux/time.h>
+ #include <linux/slab.h>
++#include <linux/in.h>
+ 
+ #include <net/icmp.h>
+ #include <net/tcp.h>
+diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_ipv4.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_ipv4.c
+--- linux-3.4.45/net/ipv4/tcp_ipv4.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_ipv4.c	2013-01-16 00:15:57.000000000 +0000
+@@ -2037,6 +2037,12 @@ static void *listening_get_next(struct s
+ 		req = req->dl_next;
+ 		while (1) {
+ 			while (req) {
++				vxdprintk(VXD_CBIT(net, 6),
++					"sk,req: %p [#%d] (from %d)", req->sk,
++					(req->sk)?req->sk->sk_nid:0, nx_current_nid());
++				if (req->sk &&
++					!nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (req->rsk_ops->family == st->family) {
+ 					cur = req;
+ 					goto out;
+@@ -2061,6 +2067,10 @@ get_req:
+ 	}
+ get_sk:
+ 	sk_nulls_for_each_from(sk, node) {
++		vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
++			sk, sk->sk_nid, nx_current_nid());
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (!net_eq(sock_net(sk), net))
+ 			continue;
+ 		if (sk->sk_family == st->family) {
+@@ -2137,6 +2147,11 @@ static void *established_get_first(struc
+ 
+ 		spin_lock_bh(lock);
+ 		sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
++			vxdprintk(VXD_CBIT(net, 6),
++				"sk,egf: %p [#%d] (from %d)",
++				sk, sk->sk_nid, nx_current_nid());
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (sk->sk_family != st->family ||
+ 			    !net_eq(sock_net(sk), net)) {
+ 				continue;
+@@ -2147,6 +2162,11 @@ static void *established_get_first(struc
+ 		st->state = TCP_SEQ_STATE_TIME_WAIT;
+ 		inet_twsk_for_each(tw, node,
+ 				   &tcp_hashinfo.ehash[st->bucket].twchain) {
++			vxdprintk(VXD_CBIT(net, 6),
++				"tw: %p [#%d] (from %d)",
++				tw, tw->tw_nid, nx_current_nid());
++			if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (tw->tw_family != st->family ||
+ 			    !net_eq(twsk_net(tw), net)) {
+ 				continue;
+@@ -2176,7 +2196,9 @@ static void *established_get_next(struct
+ 		tw = cur;
+ 		tw = tw_next(tw);
+ get_tw:
+-		while (tw && (tw->tw_family != st->family || !net_eq(twsk_net(tw), net))) {
++		while (tw && (tw->tw_family != st->family ||
++			!net_eq(twsk_net(tw), net) ||
++			!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) {
+ 			tw = tw_next(tw);
+ 		}
+ 		if (tw) {
+@@ -2200,6 +2222,11 @@ get_tw:
+ 		sk = sk_nulls_next(sk);
+ 
+ 	sk_nulls_for_each_from(sk, node) {
++		vxdprintk(VXD_CBIT(net, 6),
++			"sk,egn: %p [#%d] (from %d)",
++			sk, sk->sk_nid, nx_current_nid());
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
+ 			goto found;
+ 	}
+@@ -2405,9 +2432,9 @@ static void get_openreq4(const struct so
+ 	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
+ 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
+ 		i,
+-		ireq->loc_addr,
++		nx_map_sock_lback(current_nx_info(), ireq->loc_addr),
+ 		ntohs(inet_sk(sk)->inet_sport),
+-		ireq->rmt_addr,
++		nx_map_sock_lback(current_nx_info(), ireq->rmt_addr),
+ 		ntohs(ireq->rmt_port),
+ 		TCP_SYN_RECV,
+ 		0, 0, /* could print option size, but that is af dependent. */
+@@ -2429,8 +2456,8 @@ static void get_tcp4_sock(struct sock *s
+ 	const struct tcp_sock *tp = tcp_sk(sk);
+ 	const struct inet_connection_sock *icsk = inet_csk(sk);
+ 	const struct inet_sock *inet = inet_sk(sk);
+-	__be32 dest = inet->inet_daddr;
+-	__be32 src = inet->inet_rcv_saddr;
++	__be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++	__be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ 	__u16 destp = ntohs(inet->inet_dport);
+ 	__u16 srcp = ntohs(inet->inet_sport);
+ 	int rx_queue;
+@@ -2487,8 +2514,8 @@ static void get_timewait4_sock(const str
+ 	if (ttd < 0)
+ 		ttd = 0;
+ 
+-	dest  = tw->tw_daddr;
+-	src   = tw->tw_rcv_saddr;
++	dest  = nx_map_sock_lback(current_nx_info(), tw->tw_daddr);
++	src   = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr);
+ 	destp = ntohs(tw->tw_dport);
+ 	srcp  = ntohs(tw->tw_sport);
+ 
+diff -NurpP --minimal linux-3.4.45/net/ipv4/tcp_minisocks.c linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_minisocks.c
+--- linux-3.4.45/net/ipv4/tcp_minisocks.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/tcp_minisocks.c	2012-05-21 16:15:05.000000000 +0000
+@@ -23,6 +23,9 @@
+ #include <linux/slab.h>
+ #include <linux/sysctl.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_context.h>
+ #include <net/tcp.h>
+ #include <net/inet_common.h>
+ #include <net/xfrm.h>
+@@ -336,6 +339,11 @@ void tcp_time_wait(struct sock *sk, int
+ 		tcptw->tw_ts_recent	= tp->rx_opt.ts_recent;
+ 		tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
+ 
++		tw->tw_xid		= sk->sk_xid;
++		tw->tw_vx_info		= NULL;
++		tw->tw_nid		= sk->sk_nid;
++		tw->tw_nx_info		= NULL;
++
+ #if IS_ENABLED(CONFIG_IPV6)
+ 		if (tw->tw_family == PF_INET6) {
+ 			struct ipv6_pinfo *np = inet6_sk(sk);
+diff -NurpP --minimal linux-3.4.45/net/ipv4/udp.c linux-3.4.45-vs2.3.3.9/net/ipv4/udp.c
+--- linux-3.4.45/net/ipv4/udp.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv4/udp.c	2012-06-28 14:45:36.000000000 +0000
+@@ -298,14 +298,7 @@ fail:
+ }
+ EXPORT_SYMBOL(udp_lib_get_port);
+ 
+-static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+-{
+-	struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
+-
+-	return 	(!ipv6_only_sock(sk2)  &&
+-		 (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr ||
+-		   inet1->inet_rcv_saddr == inet2->inet_rcv_saddr));
+-}
++extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *);
+ 
+ static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
+ 				       unsigned int port)
+@@ -340,6 +333,11 @@ static inline int compute_score(struct s
+ 			if (inet->inet_rcv_saddr != daddr)
+ 				return -1;
+ 			score += 2;
++		} else {
++			/* block non nx_info ips */
++			if (!v4_addr_in_nx_info(sk->sk_nx_info,
++				daddr, NXA_MASK_BIND))
++				return -1;
+ 		}
+ 		if (inet->inet_daddr) {
+ 			if (inet->inet_daddr != saddr)
+@@ -443,6 +441,7 @@ exact_match:
+ 	return result;
+ }
+ 
++
+ /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
+  * harder than this. -DaveM
+  */
+@@ -488,6 +487,11 @@ begin:
+ 	sk_nulls_for_each_rcu(sk, node, &hslot->head) {
+ 		score = compute_score(sk, net, saddr, hnum, sport,
+ 				      daddr, dport, dif);
++		/* FIXME: disabled?
++		if (score == 9) {
++			result = sk;
++			break;
++		} else */
+ 		if (score > badness) {
+ 			result = sk;
+ 			badness = score;
+@@ -501,6 +505,7 @@ begin:
+ 	if (get_nulls_value(node) != slot)
+ 		goto begin;
+ 
++
+ 	if (result) {
+ 		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
+ 			result = NULL;
+@@ -510,6 +515,7 @@ begin:
+ 			goto begin;
+ 		}
+ 	}
++
+ 	rcu_read_unlock();
+ 	return result;
+ }
+@@ -553,8 +559,7 @@ static inline struct sock *udp_v4_mcast_
+ 		    udp_sk(s)->udp_port_hash != hnum ||
+ 		    (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
+ 		    (inet->inet_dport != rmt_port && inet->inet_dport) ||
+-		    (inet->inet_rcv_saddr &&
+-		     inet->inet_rcv_saddr != loc_addr) ||
++		    !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr)	||
+ 		    ipv6_only_sock(s) ||
+ 		    (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
+ 			continue;
+@@ -933,6 +938,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
+ 				   inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
+ 				   faddr, saddr, dport, inet->inet_sport);
+ 
++		if (sk->sk_nx_info) {
++			rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
++			if (IS_ERR(rt)) {
++				err = PTR_ERR(rt);
++				rt = NULL;
++				goto out;
++			}
++			ip_rt_put(rt);
++		}
++
+ 		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
+ 		rt = ip_route_output_flow(net, fl4, sk);
+ 		if (IS_ERR(rt)) {
+@@ -1231,7 +1246,8 @@ try_again:
+ 	if (sin) {
+ 		sin->sin_family = AF_INET;
+ 		sin->sin_port = udp_hdr(skb)->source;
+-		sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++		sin->sin_addr.s_addr = nx_map_sock_lback(
++			skb->sk->sk_nx_info, ip_hdr(skb)->saddr);
+ 		memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+ 	}
+ 	if (inet->cmsg_flags)
+@@ -1970,6 +1986,8 @@ static struct sock *udp_get_first(struct
+ 		sk_nulls_for_each(sk, node, &hslot->head) {
+ 			if (!net_eq(sock_net(sk), net))
+ 				continue;
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (sk->sk_family == state->family)
+ 				goto found;
+ 		}
+@@ -1987,7 +2005,9 @@ static struct sock *udp_get_next(struct
+ 
+ 	do {
+ 		sk = sk_nulls_next(sk);
+-	} while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
++	} while (sk && (!net_eq(sock_net(sk), net) ||
++		sk->sk_family != state->family ||
++		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 
+ 	if (!sk) {
+ 		if (state->bucket <= state->udp_table->mask)
+@@ -2083,8 +2103,8 @@ static void udp4_format_sock(struct sock
+ 		int bucket, int *len)
+ {
+ 	struct inet_sock *inet = inet_sk(sp);
+-	__be32 dest = inet->inet_daddr;
+-	__be32 src  = inet->inet_rcv_saddr;
++	__be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++	__be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ 	__u16 destp	  = ntohs(inet->inet_dport);
+ 	__u16 srcp	  = ntohs(inet->inet_sport);
+ 
+diff -NurpP --minimal linux-3.4.45/net/ipv6/Kconfig linux-3.4.45-vs2.3.3.9/net/ipv6/Kconfig
+--- linux-3.4.45/net/ipv6/Kconfig	2010-08-02 14:52:59.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/Kconfig	2012-05-21 16:15:05.000000000 +0000
+@@ -4,8 +4,8 @@
+ 
+ #   IPv6 as module will cause a CRASH if you try to unload it
+ menuconfig IPV6
+-	tristate "The IPv6 protocol"
+-	default m
++	bool "The IPv6 protocol"
++	default n
+ 	---help---
+ 	  This is complemental support for the IP version 6.
+ 	  You will still be able to do traditional IPv4 networking as well.
+diff -NurpP --minimal linux-3.4.45/net/ipv6/addrconf.c linux-3.4.45-vs2.3.3.9/net/ipv6/addrconf.c
+--- linux-3.4.45/net/ipv6/addrconf.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/addrconf.c	2013-05-13 18:16:08.000000000 +0000
+@@ -88,6 +88,8 @@
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/export.h>
++#include <linux/vs_network.h>
++#include <linux/vs_inet6.h>
+ 
+ /* Set to 3 to get tracing... */
+ #define ACONF_DEBUG 2
+@@ -1108,7 +1110,7 @@ out:
+ 
+ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+-		       struct in6_addr *saddr)
++		       struct in6_addr *saddr, struct nx_info *nxi)
+ {
+ 	struct ipv6_saddr_score scores[2],
+ 				*score = &scores[0], *hiscore = &scores[1];
+@@ -1180,6 +1182,8 @@ int ipv6_dev_get_saddr(struct net *net,
+ 					       dev->name);
+ 				continue;
+ 			}
++			if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
++				continue;
+ 
+ 			score->rule = -1;
+ 			bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
+@@ -3193,7 +3197,10 @@ static void if6_seq_stop(struct seq_file
+ static int if6_seq_show(struct seq_file *seq, void *v)
+ {
+ 	struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
+-	seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
++
++	if (nx_check(0, VS_ADMIN|VS_WATCH) ||
++	    v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1))
++		seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
+ 		   &ifp->addr,
+ 		   ifp->idev->dev->ifindex,
+ 		   ifp->prefix_len,
+@@ -3699,6 +3706,11 @@ static int in6_dump_addrs(struct inet6_d
+ 	struct ifacaddr6 *ifaca;
+ 	int err = 1;
+ 	int ip_idx = *p_ip_idx;
++	struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
++
++	/* disable ipv6 on non v6 guests */
++	if (nxi && !nx_info_has_v6(nxi))
++		return skb->len;
+ 
+ 	read_lock_bh(&idev->lock);
+ 	switch (type) {
+@@ -3709,6 +3721,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		list_for_each_entry(ifa, &idev->addr_list, if_list) {
+ 			if (++ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
++					continue;
+ 			err = inet6_fill_ifaddr(skb, ifa,
+ 						NETLINK_CB(cb->skb).pid,
+ 						cb->nlh->nlmsg_seq,
+@@ -3725,6 +3739,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		     ifmca = ifmca->next, ip_idx++) {
+ 			if (ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
++					continue;
+ 			err = inet6_fill_ifmcaddr(skb, ifmca,
+ 						  NETLINK_CB(cb->skb).pid,
+ 						  cb->nlh->nlmsg_seq,
+@@ -3740,6 +3756,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		     ifaca = ifaca->aca_next, ip_idx++) {
+ 			if (ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
++					continue;
+ 			err = inet6_fill_ifacaddr(skb, ifaca,
+ 						  NETLINK_CB(cb->skb).pid,
+ 						  cb->nlh->nlmsg_seq,
+@@ -4125,6 +4143,11 @@ static int inet6_dump_ifinfo(struct sk_b
+ 	struct inet6_dev *idev;
+ 	struct hlist_head *head;
+ 	struct hlist_node *node;
++	struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
++
++	/* FIXME: maybe disable ipv6 on non v6 guests?
++	if (skb->sk && skb->sk->sk_vx_info)
++		return skb->len; */
+ 
+ 	s_h = cb->args[0];
+ 	s_idx = cb->args[1];
+@@ -4136,6 +4159,8 @@ static int inet6_dump_ifinfo(struct sk_b
+ 		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+ 			if (idx < s_idx)
+ 				goto cont;
++			if (!v6_dev_in_nx_info(dev, nxi))
++				goto cont;
+ 			idev = __in6_dev_get(dev);
+ 			if (!idev)
+ 				goto cont;
+diff -NurpP --minimal linux-3.4.45/net/ipv6/af_inet6.c linux-3.4.45-vs2.3.3.9/net/ipv6/af_inet6.c
+--- linux-3.4.45/net/ipv6/af_inet6.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/af_inet6.c	2012-09-01 09:15:04.000000000 +0000
+@@ -42,6 +42,8 @@
+ #include <linux/netdevice.h>
+ #include <linux/icmpv6.h>
+ #include <linux/netfilter_ipv6.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <net/ip.h>
+ #include <net/ipv6.h>
+@@ -159,9 +161,12 @@ lookup_protocol:
+ 	}
+ 
+ 	err = -EPERM;
++	if ((protocol == IPPROTO_ICMPV6) &&
++		nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
++		goto override;
+ 	if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ 		goto out_rcu_unlock;
+-
++override:
+ 	sock->ops = answer->ops;
+ 	answer_prot = answer->prot;
+ 	answer_no_check = answer->no_check;
+@@ -261,6 +266,7 @@ int inet6_bind(struct socket *sock, stru
+ 	struct inet_sock *inet = inet_sk(sk);
+ 	struct ipv6_pinfo *np = inet6_sk(sk);
+ 	struct net *net = sock_net(sk);
++	struct nx_v6_sock_addr nsa;
+ 	__be32 v4addr = 0;
+ 	unsigned short snum;
+ 	int addr_type = 0;
+@@ -276,6 +282,10 @@ int inet6_bind(struct socket *sock, stru
+ 	if (addr->sin6_family != AF_INET6)
+ 		return -EAFNOSUPPORT;
+ 
++	err = v6_map_sock_addr(inet, addr, &nsa);
++	if (err)
++		return err;
++
+ 	addr_type = ipv6_addr_type(&addr->sin6_addr);
+ 	if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
+ 		return -EINVAL;
+@@ -307,6 +317,7 @@ int inet6_bind(struct socket *sock, stru
+ 		/* Reproduce AF_INET checks to make the bindings consistent */
+ 		v4addr = addr->sin6_addr.s6_addr32[3];
+ 		chk_addr_ret = inet_addr_type(net, v4addr);
++
+ 		if (!sysctl_ip_nonlocal_bind &&
+ 		    !(inet->freebind || inet->transparent) &&
+ 		    v4addr != htonl(INADDR_ANY) &&
+@@ -316,6 +327,10 @@ int inet6_bind(struct socket *sock, stru
+ 			err = -EADDRNOTAVAIL;
+ 			goto out;
+ 		}
++		if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
++			err = -EADDRNOTAVAIL;
++			goto out;
++		}
+ 	} else {
+ 		if (addr_type != IPV6_ADDR_ANY) {
+ 			struct net_device *dev = NULL;
+@@ -342,6 +357,11 @@ int inet6_bind(struct socket *sock, stru
+ 				}
+ 			}
+ 
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++				err = -EADDRNOTAVAIL;
++				goto out_unlock;
++			}
++
+ 			/* ipv4 addr of the socket is invalid.  Only the
+ 			 * unspecified and mapped address have a v4 equivalent.
+ 			 */
+@@ -358,6 +378,9 @@ int inet6_bind(struct socket *sock, stru
+ 		}
+ 	}
+ 
++	/* what's that for? */
++	v6_set_sock_addr(inet, &nsa);
++
+ 	inet->inet_rcv_saddr = v4addr;
+ 	inet->inet_saddr = v4addr;
+ 
+@@ -459,9 +482,11 @@ int inet6_getname(struct socket *sock, s
+ 			return -ENOTCONN;
+ 		sin->sin6_port = inet->inet_dport;
+ 		sin->sin6_addr = np->daddr;
++		/* FIXME: remap lback? */
+ 		if (np->sndflow)
+ 			sin->sin6_flowinfo = np->flow_label;
+ 	} else {
++		/* FIXME: remap lback? */
+ 		if (ipv6_addr_any(&np->rcv_saddr))
+ 			sin->sin6_addr = np->saddr;
+ 		else
+diff -NurpP --minimal linux-3.4.45/net/ipv6/datagram.c linux-3.4.45-vs2.3.3.9/net/ipv6/datagram.c
+--- linux-3.4.45/net/ipv6/datagram.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/datagram.c	2012-05-21 16:15:05.000000000 +0000
+@@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s
+ 
+ 			rcu_read_lock();
+ 			if (fl6->flowi6_oif) {
+-				dev = dev_get_by_index_rcu(net, fl6->flowi6_oif);
++				dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif);
+ 				if (!dev) {
+ 					rcu_read_unlock();
+ 					return -ENODEV;
+diff -NurpP --minimal linux-3.4.45/net/ipv6/fib6_rules.c linux-3.4.45-vs2.3.3.9/net/ipv6/fib6_rules.c
+--- linux-3.4.45/net/ipv6/fib6_rules.c	2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/fib6_rules.c	2012-05-21 16:15:05.000000000 +0000
+@@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r
+ 					       ip6_dst_idev(&rt->dst)->dev,
+ 					       &flp6->daddr,
+ 					       rt6_flags2srcprefs(flags),
+-					       &saddr))
++					       &saddr, NULL))
+ 				goto again;
+ 			if (!ipv6_prefix_equal(&saddr, &r->src.addr,
+ 					       r->src.plen))
+diff -NurpP --minimal linux-3.4.45/net/ipv6/inet6_hashtables.c linux-3.4.45-vs2.3.3.9/net/ipv6/inet6_hashtables.c
+--- linux-3.4.45/net/ipv6/inet6_hashtables.c	2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/inet6_hashtables.c	2012-05-21 16:15:05.000000000 +0000
+@@ -16,6 +16,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/random.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established(
+ 	unsigned int slot = hash & hashinfo->ehash_mask;
+ 	struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
+ 
+-
+ 	rcu_read_lock();
+ begin:
+ 	sk_nulls_for_each_rcu(sk, node, &head->chain) {
+@@ -95,7 +95,7 @@ begin:
+ 				sock_put(sk);
+ 				goto begin;
+ 			}
+-		goto out;
++			goto out;
+ 		}
+ 	}
+ 	if (get_nulls_value(node) != slot)
+@@ -141,6 +141,9 @@ static inline int compute_score(struct s
+ 			if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
+ 				return -1;
+ 			score++;
++		} else {
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++				return -1;
+ 		}
+ 		if (sk->sk_bound_dev_if) {
+ 			if (sk->sk_bound_dev_if != dif)
+diff -NurpP --minimal linux-3.4.45/net/ipv6/ip6_output.c linux-3.4.45-vs2.3.3.9/net/ipv6/ip6_output.c
+--- linux-3.4.45/net/ipv6/ip6_output.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/ip6_output.c	2013-02-19 14:42:56.000000000 +0000
+@@ -966,7 +966,8 @@ static int ip6_dst_lookup_tail(struct so
+ 		struct rt6_info *rt = (struct rt6_info *) *dst;
+ 		err = ip6_route_get_saddr(net, rt, &fl6->daddr,
+ 					  sk ? inet6_sk(sk)->srcprefs : 0,
+-					  &fl6->saddr);
++					  &fl6->saddr,
++					  sk ? sk->sk_nx_info : NULL);
+ 		if (err)
+ 			goto out_err_release;
+ 	}
+diff -NurpP --minimal linux-3.4.45/net/ipv6/ndisc.c linux-3.4.45-vs2.3.3.9/net/ipv6/ndisc.c
+--- linux-3.4.45/net/ipv6/ndisc.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/ndisc.c	2012-11-18 23:52:30.000000000 +0000
+@@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev
+ 	} else {
+ 		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
+ 				       inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
+-				       &tmpaddr))
++				       &tmpaddr, NULL))
+ 			return;
+ 		src_addr = &tmpaddr;
+ 	}
+diff -NurpP --minimal linux-3.4.45/net/ipv6/raw.c linux-3.4.45-vs2.3.3.9/net/ipv6/raw.c
+--- linux-3.4.45/net/ipv6/raw.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/raw.c	2012-10-22 13:09:53.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include <linux/icmpv6.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter_ipv6.h>
++#include <linux/vs_inet6.h>
+ #include <linux/skbuff.h>
+ #include <linux/compat.h>
+ #include <asm/uaccess.h>
+@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s
+ 				goto out_unlock;
+ 		}
+ 
++		if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++			err = -EADDRNOTAVAIL;
++			if (dev)
++				dev_put(dev);
++			goto out;
++		}
++
+ 		/* ipv4 addr of the socket is invalid.  Only the
+ 		 * unspecified and mapped address have a v4 equivalent.
+ 		 */
+diff -NurpP --minimal linux-3.4.45/net/ipv6/route.c linux-3.4.45-vs2.3.3.9/net/ipv6/route.c
+--- linux-3.4.45/net/ipv6/route.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/route.c	2013-03-30 21:29:17.000000000 +0000
+@@ -55,6 +55,7 @@
+ #include <net/xfrm.h>
+ #include <net/netevent.h>
+ #include <net/netlink.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -2147,15 +2148,17 @@ int ip6_route_get_saddr(struct net *net,
+ 			struct rt6_info *rt,
+ 			const struct in6_addr *daddr,
+ 			unsigned int prefs,
+-			struct in6_addr *saddr)
++			struct in6_addr *saddr,
++			struct nx_info *nxi)
+ {
+ 	struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt);
+ 	int err = 0;
+-	if (rt->rt6i_prefsrc.plen)
++	if (rt->rt6i_prefsrc.plen && (!nxi ||
++	    v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR)))
+ 		*saddr = rt->rt6i_prefsrc.addr;
+ 	else
+ 		err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
+-					 daddr, prefs, saddr);
++					 daddr, prefs, saddr, nxi);
+ 	return err;
+ }
+ 
+@@ -2486,7 +2489,8 @@ static int rt6_fill_node(struct net *net
+ 			NLA_PUT_U32(skb, RTA_IIF, iif);
+ 	} else if (dst) {
+ 		struct in6_addr saddr_buf;
+-		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0)
++		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
++					(skb->sk ? skb->sk->sk_nx_info : NULL)) == 0)
+ 			NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
+ 	}
+ 
+@@ -2713,6 +2717,7 @@ static int rt6_info_route(struct rt6_inf
+ 	struct seq_file *m = p_arg;
+ 	struct neighbour *n;
+ 
++	/* FIXME: check for network context? */
+ 	seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
+ 
+ #ifdef CONFIG_IPV6_SUBTREES
+diff -NurpP --minimal linux-3.4.45/net/ipv6/tcp_ipv6.c linux-3.4.45-vs2.3.3.9/net/ipv6/tcp_ipv6.c
+--- linux-3.4.45/net/ipv6/tcp_ipv6.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/tcp_ipv6.c	2013-01-16 00:15:57.000000000 +0000
+@@ -71,6 +71,7 @@
+ 
+ #include <linux/crypto.h>
+ #include <linux/scatterlist.h>
++#include <linux/vs_inet6.h>
+ 
+ static void	tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
+ static void	tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
+@@ -163,8 +164,15 @@ static int tcp_v6_connect(struct sock *s
+ 	 *	connect() to INADDR_ANY means loopback (BSD'ism).
+ 	 */
+ 
+-	if(ipv6_addr_any(&usin->sin6_addr))
+-		usin->sin6_addr.s6_addr[15] = 0x1;
++	if(ipv6_addr_any(&usin->sin6_addr)) {
++		struct nx_info *nxi =  sk->sk_nx_info;
++
++		if (nxi && nx_info_has_v6(nxi))
++			/* FIXME: remap lback? */
++			usin->sin6_addr = nxi->v6.ip;
++		else
++			usin->sin6_addr.s6_addr[15] = 0x1;
++	}
+ 
+ 	addr_type = ipv6_addr_type(&usin->sin6_addr);
+ 
+diff -NurpP --minimal linux-3.4.45/net/ipv6/udp.c linux-3.4.45-vs2.3.3.9/net/ipv6/udp.c
+--- linux-3.4.45/net/ipv6/udp.c	2012-05-21 16:07:40.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/udp.c	2012-05-21 16:15:05.000000000 +0000
+@@ -45,41 +45,67 @@
+ #include <net/tcp_states.h>
+ #include <net/ip6_checksum.h>
+ #include <net/xfrm.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include "udp_impl.h"
+ 
+-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
++int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+ {
+-	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
++	const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr;
+ 	const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
+-	__be32 sk1_rcv_saddr = sk_rcv_saddr(sk);
++	__be32 sk1_rcv_saddr = sk_rcv_saddr(sk1);
+ 	__be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
+-	int sk_ipv6only = ipv6_only_sock(sk);
++	int sk1_ipv6only = ipv6_only_sock(sk1);
+ 	int sk2_ipv6only = inet_v6_ipv6only(sk2);
+-	int addr_type = ipv6_addr_type(sk_rcv_saddr6);
++	int addr_type = ipv6_addr_type(sk1_rcv_saddr6);
+ 	int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
+ 
+ 	/* if both are mapped, treat as IPv4 */
+-	if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED)
+-		return (!sk2_ipv6only &&
++	if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
++		if (!sk2_ipv6only &&
+ 			(!sk1_rcv_saddr || !sk2_rcv_saddr ||
+-			  sk1_rcv_saddr == sk2_rcv_saddr));
++			  sk1_rcv_saddr == sk2_rcv_saddr))
++			goto vs_v4;
++		else
++			return 0;
++	}
+ 
+ 	if (addr_type2 == IPV6_ADDR_ANY &&
+ 	    !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
+-		return 1;
++		goto vs;
+ 
+ 	if (addr_type == IPV6_ADDR_ANY &&
+-	    !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
+-		return 1;
++	    !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
++		goto vs;
+ 
+ 	if (sk2_rcv_saddr6 &&
+-	    ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))
+-		return 1;
++	    ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6))
++		goto vs;
+ 
+ 	return 0;
++
++vs_v4:
++	if (!sk1_rcv_saddr && !sk2_rcv_saddr)
++		return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++	if (!sk2_rcv_saddr)
++		return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
++	if (!sk1_rcv_saddr)
++		return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
++	return 1;
++vs:
++	if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY)
++		return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++	else if (addr_type2 == IPV6_ADDR_ANY)
++		return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
++	else if (addr_type == IPV6_ADDR_ANY) {
++		if (addr_type2 == IPV6_ADDR_MAPPED)
++			return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++		else
++			return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
++	}
++	return 1;
+ }
+ 
+ static unsigned int udp6_portaddr_hash(struct net *net,
+@@ -143,6 +169,10 @@ static inline int compute_score(struct s
+ 			if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
+ 				return -1;
+ 			score++;
++		} else {
++			/* block non nx_info ips */
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++				return -1;
+ 		}
+ 		if (!ipv6_addr_any(&np->daddr)) {
+ 			if (!ipv6_addr_equal(&np->daddr, saddr))
+diff -NurpP --minimal linux-3.4.45/net/ipv6/xfrm6_policy.c linux-3.4.45-vs2.3.3.9/net/ipv6/xfrm6_policy.c
+--- linux-3.4.45/net/ipv6/xfrm6_policy.c	2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/ipv6/xfrm6_policy.c	2012-05-21 16:15:05.000000000 +0000
+@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
+ 	dev = ip6_dst_idev(dst)->dev;
+ 	ipv6_dev_get_saddr(dev_net(dev), dev,
+ 			   (struct in6_addr *)&daddr->a6, 0,
+-			   (struct in6_addr *)&saddr->a6);
++			   (struct in6_addr *)&saddr->a6, NULL);
+ 	dst_release(dst);
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.4.45/net/netfilter/ipvs/ip_vs_xmit.c linux-3.4.45-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.4.45/net/netfilter/ipvs/ip_vs_xmit.c	2012-03-19 18:47:33.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/netfilter/ipvs/ip_vs_xmit.c	2012-05-21 16:15:05.000000000 +0000
+@@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
+ 		return dst;
+ 	if (ipv6_addr_any(&fl6.saddr) &&
+ 	    ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
+-			       &fl6.daddr, 0, &fl6.saddr) < 0)
++			       &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
+ 		goto out_err;
+ 	if (do_xfrm) {
+ 		dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
+diff -NurpP --minimal linux-3.4.45/net/netlink/af_netlink.c linux-3.4.45-vs2.3.3.9/net/netlink/af_netlink.c
+--- linux-3.4.45/net/netlink/af_netlink.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/netlink/af_netlink.c	2012-11-18 23:52:30.000000000 +0000
+@@ -55,6 +55,9 @@
+ #include <linux/types.h>
+ #include <linux/audit.h>
+ #include <linux/mutex.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
+ 
+ #include <net/net_namespace.h>
+ #include <net/sock.h>
+@@ -1951,6 +1954,8 @@ static struct sock *netlink_seq_socket_i
+ 			sk_for_each(s, node, &hash->table[j]) {
+ 				if (sock_net(s) != seq_file_net(seq))
+ 					continue;
++				if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (off == pos) {
+ 					iter->link = i;
+ 					iter->hash_idx = j;
+@@ -1985,7 +1990,8 @@ static void *netlink_seq_next(struct seq
+ 	s = v;
+ 	do {
+ 		s = sk_next(s);
+-	} while (s && sock_net(s) != seq_file_net(seq));
++	} while (s && (sock_net(s) != seq_file_net(seq) ||
++		!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 	if (s)
+ 		return s;
+ 
+@@ -1997,7 +2003,8 @@ static void *netlink_seq_next(struct seq
+ 
+ 		for (; j <= hash->mask; j++) {
+ 			s = sk_head(&hash->table[j]);
+-			while (s && sock_net(s) != seq_file_net(seq))
++			while (s && (sock_net(s) != seq_file_net(seq) ||
++				!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)))
+ 				s = sk_next(s);
+ 			if (s) {
+ 				iter->link = i;
+diff -NurpP --minimal linux-3.4.45/net/socket.c linux-3.4.45-vs2.3.3.9/net/socket.c
+--- linux-3.4.45/net/socket.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/socket.c	2012-10-22 13:09:53.000000000 +0000
+@@ -98,6 +98,10 @@
+ 
+ #include <net/sock.h>
+ #include <linux/netfilter.h>
++#include <linux/vs_base.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <linux/if_tun.h>
+ #include <linux/ipv6_route.h>
+@@ -551,6 +555,7 @@ static inline int __sock_sendmsg_nosec(s
+ 				       struct msghdr *msg, size_t size)
+ {
+ 	struct sock_iocb *si = kiocb_to_siocb(iocb);
++	size_t len;
+ 
+ 	sock_update_classid(sock->sk);
+ 
+@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(s
+ 	si->msg = msg;
+ 	si->size = size;
+ 
+-	return sock->ops->sendmsg(iocb, sock, msg, size);
++	len = sock->ops->sendmsg(iocb, sock, msg, size);
++	if (sock->sk) {
++		if (len == size)
++			vx_sock_send(sock->sk, size);
++		else
++			vx_sock_fail(sock->sk, size);
++	}
++	vxdprintk(VXD_CBIT(net, 7),
++		"__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu",
++		sock, sock->sk,
++		(sock->sk)?sock->sk->sk_nx_info:0,
++		(sock->sk)?sock->sk->sk_vx_info:0,
++		(sock->sk)?sock->sk->sk_xid:0,
++		(sock->sk)?sock->sk->sk_nid:0,
++		(unsigned int)size, len);
++	return len;
+ }
+ 
+ static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
+@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(s
+ 				       struct msghdr *msg, size_t size, int flags)
+ {
+ 	struct sock_iocb *si = kiocb_to_siocb(iocb);
++	int len;
+ 
+ 	sock_update_classid(sock->sk);
+ 
+@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(s
+ 	si->size = size;
+ 	si->flags = flags;
+ 
+-	return sock->ops->recvmsg(iocb, sock, msg, size, flags);
++	len = sock->ops->recvmsg(iocb, sock, msg, size, flags);
++	if ((len >= 0) && sock->sk)
++		vx_sock_recv(sock->sk, len);
++	vxdprintk(VXD_CBIT(net, 7),
++		"__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
++		sock, sock->sk,
++		(sock->sk)?sock->sk->sk_nx_info:0,
++		(sock->sk)?sock->sk->sk_vx_info:0,
++		(sock->sk)?sock->sk->sk_xid:0,
++		(sock->sk)?sock->sk->sk_nid:0,
++		(unsigned int)size, len);
++	return len;
+ }
+ 
+ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
+@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int f
+ 	if (type < 0 || type >= SOCK_MAX)
+ 		return -EINVAL;
+ 
++	if (!nx_check(0, VS_ADMIN)) {
++		if (family == PF_INET && !current_nx_info_has_v4())
++			return -EAFNOSUPPORT;
++		if (family == PF_INET6 && !current_nx_info_has_v6())
++			return -EAFNOSUPPORT;
++	}
++
+ 	/* Compatibility.
+ 
+ 	   This uglymoron is moved from INET layer to here to avoid
+@@ -1346,6 +1385,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+ 	if (retval < 0)
+ 		goto out;
+ 
++	set_bit(SOCK_USER_SOCKET, &sock->flags);
+ 	retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
+ 	if (retval < 0)
+ 		goto out_release;
+@@ -1387,10 +1427,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+ 	err = sock_create(family, type, protocol, &sock1);
+ 	if (err < 0)
+ 		goto out;
++	set_bit(SOCK_USER_SOCKET, &sock1->flags);
+ 
+ 	err = sock_create(family, type, protocol, &sock2);
+ 	if (err < 0)
+ 		goto out_release_1;
++	set_bit(SOCK_USER_SOCKET, &sock2->flags);
+ 
+ 	err = sock1->ops->socketpair(sock1, sock2);
+ 	if (err < 0)
+diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth.c linux-3.4.45-vs2.3.3.9/net/sunrpc/auth.c
+--- linux-3.4.45/net/sunrpc/auth.c	2011-10-24 16:45:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/sunrpc/auth.c	2012-05-21 16:15:05.000000000 +0000
+@@ -14,6 +14,7 @@
+ #include <linux/hash.h>
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/spinlock.h>
++#include <linux/vs_tag.h>
+ 
+ #ifdef RPC_DEBUG
+ # define RPCDBG_FACILITY	RPCDBG_AUTH
+@@ -427,6 +428,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+ 	memset(&acred, 0, sizeof(acred));
+ 	acred.uid = cred->fsuid;
+ 	acred.gid = cred->fsgid;
++	acred.tag = dx_current_tag();
+ 	acred.group_info = get_group_info(((struct cred *)cred)->group_info);
+ 
+ 	ret = auth->au_ops->lookup_cred(auth, &acred, flags);
+@@ -467,6 +469,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+ 	struct auth_cred acred = {
+ 		.uid = 0,
+ 		.gid = 0,
++		.tag = dx_current_tag(),
+ 	};
+ 
+ 	dprintk("RPC: %5u looking up %s cred\n",
+diff -NurpP --minimal linux-3.4.45/net/sunrpc/auth_unix.c linux-3.4.45-vs2.3.3.9/net/sunrpc/auth_unix.c
+--- linux-3.4.45/net/sunrpc/auth_unix.c	2012-01-09 15:15:04.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/sunrpc/auth_unix.c	2012-05-21 16:15:05.000000000 +0000
+@@ -12,12 +12,14 @@
+ #include <linux/module.h>
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/auth.h>
++#include <linux/vs_tag.h>
+ 
+ #define NFS_NGROUPS	16
+ 
+ struct unx_cred {
+ 	struct rpc_cred		uc_base;
+ 	gid_t			uc_gid;
++	tag_t			uc_tag;
+ 	gid_t			uc_gids[NFS_NGROUPS];
+ };
+ #define uc_uid			uc_base.cr_uid
+@@ -78,6 +80,7 @@ unx_create_cred(struct rpc_auth *auth, s
+ 		groups = NFS_NGROUPS;
+ 
+ 	cred->uc_gid = acred->gid;
++	cred->uc_tag = acred->tag;
+ 	for (i = 0; i < groups; i++)
+ 		cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
+ 	if (i < NFS_NGROUPS)
+@@ -119,7 +122,9 @@ unx_match(struct auth_cred *acred, struc
+ 	unsigned int i;
+ 
+ 
+-	if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)
++	if (cred->uc_uid != acred->uid ||
++		cred->uc_gid != acred->gid ||
++		cred->uc_tag != acred->tag)
+ 		return 0;
+ 
+ 	if (acred->group_info != NULL)
+@@ -145,7 +150,7 @@ unx_marshal(struct rpc_task *task, __be3
+ 	struct rpc_clnt	*clnt = task->tk_client;
+ 	struct unx_cred	*cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
+ 	__be32		*base, *hold;
+-	int		i;
++	int		i, tag;
+ 
+ 	*p++ = htonl(RPC_AUTH_UNIX);
+ 	base = p++;
+@@ -155,9 +160,12 @@ unx_marshal(struct rpc_task *task, __be3
+ 	 * Copy the UTS nodename captured when the client was created.
+ 	 */
+ 	p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
++	tag = task->tk_client->cl_tag;
+ 
+-	*p++ = htonl((u32) cred->uc_uid);
+-	*p++ = htonl((u32) cred->uc_gid);
++	*p++ = htonl((u32) TAGINO_UID(tag,
++		cred->uc_uid, cred->uc_tag));
++	*p++ = htonl((u32) TAGINO_GID(tag,
++		cred->uc_gid, cred->uc_tag));
+ 	hold = p++;
+ 	for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
+ 		*p++ = htonl((u32) cred->uc_gids[i]);
+diff -NurpP --minimal linux-3.4.45/net/sunrpc/clnt.c linux-3.4.45-vs2.3.3.9/net/sunrpc/clnt.c
+--- linux-3.4.45/net/sunrpc/clnt.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/sunrpc/clnt.c	2013-02-11 23:37:30.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <linux/in6.h>
+ #include <linux/un.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/rpc_pipe_fs.h>
+@@ -483,6 +484,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+ 	if (!(args->flags & RPC_CLNT_CREATE_QUIET))
+ 		clnt->cl_chatty = 1;
+ 
++	/* TODO: handle RPC_CLNT_CREATE_TAGGED
++	if (args->flags & RPC_CLNT_CREATE_TAGGED)
++		clnt->cl_tag = 1; */
+ 	return clnt;
+ }
+ EXPORT_SYMBOL_GPL(rpc_create);
+diff -NurpP --minimal linux-3.4.45/net/unix/af_unix.c linux-3.4.45-vs2.3.3.9/net/unix/af_unix.c
+--- linux-3.4.45/net/unix/af_unix.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/net/unix/af_unix.c	2013-05-13 18:16:08.000000000 +0000
+@@ -114,6 +114,8 @@
+ #include <linux/mount.h>
+ #include <net/checksum.h>
+ #include <linux/security.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1];
+ EXPORT_SYMBOL_GPL(unix_socket_table);
+@@ -261,6 +263,8 @@ static struct sock *__unix_find_socket_b
+ 		if (!net_eq(sock_net(s), net))
+ 			continue;
+ 
++		if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (u->addr->len == len &&
+ 		    !memcmp(u->addr->name, sunname, len))
+ 			goto found;
+@@ -2265,6 +2269,8 @@ static struct sock *unix_seq_idx(struct
+ 	for (s = first_unix_socket(&iter->i); s; s = next_unix_socket(&iter->i, s)) {
+ 		if (sock_net(s) != seq_file_net(seq))
+ 			continue;
++		if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (off == pos)
+ 			return s;
+ 		++off;
+@@ -2289,7 +2295,8 @@ static void *unix_seq_next(struct seq_fi
+ 		sk = first_unix_socket(&iter->i);
+ 	else
+ 		sk = next_unix_socket(&iter->i, sk);
+-	while (sk && (sock_net(sk) != seq_file_net(seq)))
++	while (sk && (sock_net(sk) != seq_file_net(seq) ||
++		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)))
+ 		sk = next_unix_socket(&iter->i, sk);
+ 	return sk;
+ }
+diff -NurpP --minimal linux-3.4.45/scripts/checksyscalls.sh linux-3.4.45-vs2.3.3.9/scripts/checksyscalls.sh
+--- linux-3.4.45/scripts/checksyscalls.sh	2012-03-19 18:47:34.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/scripts/checksyscalls.sh	2012-05-21 16:15:05.000000000 +0000
+@@ -193,7 +193,6 @@ cat << EOF
+ #define __IGNORE_afs_syscall
+ #define __IGNORE_getpmsg
+ #define __IGNORE_putpmsg
+-#define __IGNORE_vserver
+ EOF
+ }
+ 
+diff -NurpP --minimal linux-3.4.45/security/commoncap.c linux-3.4.45-vs2.3.3.9/security/commoncap.c
+--- linux-3.4.45/security/commoncap.c	2012-05-21 16:07:41.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/security/commoncap.c	2012-05-21 16:15:05.000000000 +0000
+@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
+ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
+ 		int cap, int audit)
+ {
++	struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
++
+ 	for (;;) {
+ 		/* The creator of the user namespace has all caps. */
+ 		if (targ_ns != &init_user_ns && targ_ns->creator == cred->user)
+ 			return 0;
+ 
+ 		/* Do we have the necessary capabilities? */
+-		if (targ_ns == cred->user->user_ns)
+-			return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
++		if (targ_ns == cred->user->user_ns) {
++			if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
++			    cap_raised(cred->cap_effective, cap))
++				return 0;
++			return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM;
++		}
+ 
+ 		/* Have we tried all of the parent namespaces? */
+ 		if (targ_ns == &init_user_ns)
+@@ -612,7 +618,7 @@ int cap_inode_setxattr(struct dentry *de
+ 
+ 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ 		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+-	    !capable(CAP_SYS_ADMIN))
++		!vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ 		return -EPERM;
+ 	return 0;
+ }
+@@ -638,7 +644,7 @@ int cap_inode_removexattr(struct dentry
+ 
+ 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ 		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+-	    !capable(CAP_SYS_ADMIN))
++		!vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ 		return -EPERM;
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.4.45/security/selinux/hooks.c linux-3.4.45-vs2.3.3.9/security/selinux/hooks.c
+--- linux-3.4.45/security/selinux/hooks.c	2013-05-13 17:36:38.000000000 +0000
++++ linux-3.4.45-vs2.3.3.9/security/selinux/hooks.c	2012-09-01 08:50:49.000000000 +0000
+@@ -66,7 +66,6 @@
+ #include <linux/dccp.h>
+ #include <linux/quota.h>
+ #include <linux/un.h>		/* for Unix socket types */
+-#include <net/af_unix.h>	/* for Unix socket types */
+ #include <linux/parser.h>
+ #include <linux/nfs_mount.h>
+ #include <net/ipv6.h>
diff --git a/main/linux-vserver/patch-3.6.11-al5.patch b/main/linux-vserver/patch-3.6.11-al5.patch
new file mode 100644
index 000000000..54952a485
--- /dev/null
+++ b/main/linux-vserver/patch-3.6.11-al5.patch
@@ -0,0 +1,17797 @@
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index ad7e2e5..15199ed 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -570,6 +570,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+ 			UART at the specified I/O port or MMIO address,
+ 			switching to the matching ttyS device later.  The
+ 			options are the same as for ttyS, above.
++		hvc<n>	Use the hypervisor console device <n>. This is for
++			both Xen and PowerPC hypervisors.
+ 
+                 If the device connected to the port is not a TTY but a braille
+                 device, prepend "brl," before the device type, for instance
+@@ -760,6 +762,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+ 
+ 	earlyprintk=	[X86,SH,BLACKFIN]
+ 			earlyprintk=vga
++			earlyprintk=xen
+ 			earlyprintk=serial[,ttySn[,baudrate]]
+ 			earlyprintk=ttySn[,baudrate]
+ 			earlyprintk=dbgp[debugController#]
+@@ -777,6 +780,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+ 			The VGA output is eventually overwritten by the real
+ 			console.
+ 
++			The xen output can only be used by Xen PV guests.
++
+ 	ekgdboc=	[X86,KGDB] Allow early kernel console debugging
+ 			ekgdboc=kbd
+ 
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 9a6c4da..61ed6f7 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -2697,7 +2697,7 @@ S:	Maintained
+ F:	drivers/net/ethernet/i825xx/eexpress.*
+ 
+ ETHERNET BRIDGE
+-M:	Stephen Hemminger <shemminger@vyatta.com>
++M:	Stephen Hemminger <stephen@networkplumber.org>
+ L:	bridge@lists.linux-foundation.org
+ L:	netdev@vger.kernel.org
+ W:	http://www.linuxfoundation.org/en/Net:Bridge
+@@ -4420,7 +4420,7 @@ S:	Maintained
+ 
+ MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
+ M:	Mirko Lindner <mlindner@marvell.com>
+-M:	Stephen Hemminger <shemminger@vyatta.com>
++M:	Stephen Hemminger <stephen@networkplumber.org>
+ L:	netdev@vger.kernel.org
+ S:	Maintained
+ F:	drivers/net/ethernet/marvell/sk*
+@@ -4664,7 +4664,7 @@ S:	Supported
+ F:	drivers/infiniband/hw/nes/
+ 
+ NETEM NETWORK EMULATOR
+-M:	Stephen Hemminger <shemminger@vyatta.com>
++M:	Stephen Hemminger <stephen@networkplumber.org>
+ L:	netem@lists.linux-foundation.org
+ S:	Maintained
+ F:	net/sched/sch_netem.c
+diff --git a/arch/arm/kernel/sched_clock.c b/arch/arm/kernel/sched_clock.c
+index f451539..63bc22c 100644
+--- a/arch/arm/kernel/sched_clock.c
++++ b/arch/arm/kernel/sched_clock.c
+@@ -89,11 +89,11 @@ static void notrace update_sched_clock(void)
+ 	 * detectable in cyc_to_fixed_sched_clock().
+ 	 */
+ 	raw_local_irq_save(flags);
+-	cd.epoch_cyc = cyc;
++	cd.epoch_cyc_copy = cyc;
+ 	smp_wmb();
+ 	cd.epoch_ns = ns;
+ 	smp_wmb();
+-	cd.epoch_cyc_copy = cyc;
++	cd.epoch_cyc = cyc;
+ 	raw_local_irq_restore(flags);
+ }
+ 
+diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
+index df74518..ab1017b 100644
+--- a/arch/arm/kernel/swp_emulate.c
++++ b/arch/arm/kernel/swp_emulate.c
+@@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr)
+ {
+ 	siginfo_t info;
+ 
++	down_read(&current->mm->mmap_sem);
+ 	if (find_vma(current->mm, addr) == NULL)
+ 		info.si_code = SEGV_MAPERR;
+ 	else
+ 		info.si_code = SEGV_ACCERR;
++	up_read(&current->mm->mmap_sem);
+ 
+ 	info.si_signo = SIGSEGV;
+ 	info.si_errno = 0;
+diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
+index bd0e88c..c2ff99c 100644
+--- a/arch/arm/mach-at91/setup.c
++++ b/arch/arm/mach-at91/setup.c
+@@ -104,6 +104,8 @@ static void __init soc_detect(u32 dbgu_base)
+ 	switch (socid) {
+ 	case ARCH_ID_AT91RM9200:
+ 		at91_soc_initdata.type = AT91_SOC_RM9200;
++		if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_NONE)
++			at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
+ 		at91_boot_soc = at91rm9200_soc;
+ 		break;
+ 
+diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
+index a611ad3..b6132aa 100644
+--- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
++++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
+@@ -463,6 +463,9 @@
+ 	GPIO76_LCD_PCLK,	\
+ 	GPIO77_LCD_BIAS
+ 
++/* these enable a work-around for a hw bug in pxa27x during ac97 warm reset */
++#define GPIO113_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO113, AF0, DEFAULT)
++#define GPIO95_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO95, AF0, DEFAULT)
+ 
+ extern int keypad_set_wake(unsigned int on);
+ #endif /* __ASM_ARCH_MFP_PXA27X_H */
+diff --git a/arch/arm/mach-pxa/include/mach/smemc.h b/arch/arm/mach-pxa/include/mach/smemc.h
+index b7de471..b802f28 100644
+--- a/arch/arm/mach-pxa/include/mach/smemc.h
++++ b/arch/arm/mach-pxa/include/mach/smemc.h
+@@ -37,6 +37,7 @@
+ #define CSADRCFG1	(SMEMC_VIRT + 0x84)  /* Address Configuration Register for CS1 */
+ #define CSADRCFG2	(SMEMC_VIRT + 0x88)  /* Address Configuration Register for CS2 */
+ #define CSADRCFG3	(SMEMC_VIRT + 0x8C)  /* Address Configuration Register for CS3 */
++#define CSMSADRCFG	(SMEMC_VIRT + 0xA0)  /* Chip Select Configuration Register */
+ 
+ /*
+  * More handy macros for PCMCIA
+diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
+index 4726c24..a2fe795 100644
+--- a/arch/arm/mach-pxa/pxa27x.c
++++ b/arch/arm/mach-pxa/pxa27x.c
+@@ -47,9 +47,9 @@ void pxa27x_clear_otgph(void)
+ EXPORT_SYMBOL(pxa27x_clear_otgph);
+ 
+ static unsigned long ac97_reset_config[] = {
+-	GPIO113_GPIO,
++	GPIO113_AC97_nRESET_GPIO_HIGH,
+ 	GPIO113_AC97_nRESET,
+-	GPIO95_GPIO,
++	GPIO95_AC97_nRESET_GPIO_HIGH,
+ 	GPIO95_AC97_nRESET,
+ };
+ 
+diff --git a/arch/arm/mach-pxa/smemc.c b/arch/arm/mach-pxa/smemc.c
+index 7992305..f38aa89 100644
+--- a/arch/arm/mach-pxa/smemc.c
++++ b/arch/arm/mach-pxa/smemc.c
+@@ -40,6 +40,8 @@ static void pxa3xx_smemc_resume(void)
+ 	__raw_writel(csadrcfg[1], CSADRCFG1);
+ 	__raw_writel(csadrcfg[2], CSADRCFG2);
+ 	__raw_writel(csadrcfg[3], CSADRCFG3);
++	/* CSMSADRCFG wakes up in its default state (0), so we need to set it */
++	__raw_writel(0x2, CSMSADRCFG);
+ }
+ 
+ static struct syscore_ops smemc_syscore_ops = {
+@@ -49,8 +51,19 @@ static struct syscore_ops smemc_syscore_ops = {
+ 
+ static int __init smemc_init(void)
+ {
+-	if (cpu_is_pxa3xx())
++	if (cpu_is_pxa3xx()) {
++		/*
++		 * The only documentation we have on the
++		 * Chip Select Configuration Register (CSMSADRCFG) is that
++		 * it must be programmed to 0x2.
++		 * Moreover, in the bit definitions, the second bit
++		 * (CSMSADRCFG[1]) is called "SETALWAYS".
++		 * Other bits are reserved in this register.
++		 */
++		__raw_writel(0x2, CSMSADRCFG);
++
+ 		register_syscore_ops(&smemc_syscore_ops);
++	}
+ 
+ 	return 0;
+ }
+diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h
+index 124bce6..a301e61 100644
+--- a/arch/arm/mach-realview/include/mach/board-eb.h
++++ b/arch/arm/mach-realview/include/mach/board-eb.h
+@@ -47,7 +47,7 @@
+ #define REALVIEW_EB_USB_BASE		0x4F000000	/* USB */
+ 
+ #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
+-#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x1F000000
++#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x10100000
+ #define REALVIEW_EB11MP_L220_BASE	0x10102000	/* L220 registers */
+ #define REALVIEW_EB11MP_SYS_PLD_CTRL1	0xD8		/* Register offset for MPCore sysctl */
+ #else
+diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+index 4135de8..13ed33c 100644
+--- a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
++++ b/arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+@@ -40,17 +40,17 @@
+ 		addeq	\rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
+ 		addne	\rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
+ 		bic	\rd, \rd, #0xff000
+-		ldr	\rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
++		ldr	\rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
+ 		and	\rd, \rd, #0x00ff0000
+ 		teq	\rd, #0x00440000		@ is it 2440?
+ 1004:
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		moveq	\rd, \rd, lsr #SHIFT_2440TXF
+ 		tst	\rd, #S3C2410_UFSTAT_TXFULL
+ 	.endm
+ 
+ 	.macro  fifo_full_s3c2410 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		tst	\rd, #S3C2410_UFSTAT_TXFULL
+ 	.endm
+ 
+@@ -68,18 +68,18 @@
+ 		addeq	\rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
+ 		addne	\rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
+ 		bic	\rd, \rd, #0xff000
+-		ldr	\rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
++		ldr	\rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)]
+ 		and	\rd, \rd, #0x00ff0000
+ 		teq	\rd, #0x00440000		@ is it 2440?
+ 
+ 10000:
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		andne	\rd, \rd, #S3C2410_UFSTAT_TXMASK
+ 		andeq	\rd, \rd, #S3C2440_UFSTAT_TXMASK
+ 	.endm
+ 
+ 	.macro fifo_level_s3c2410 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		and	\rd, \rd, #S3C2410_UFSTAT_TXMASK
+ 	.endm
+ 
+diff --git a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
+index 7615a14..6a21bee 100644
+--- a/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
++++ b/arch/arm/mach-s3c24xx/include/mach/entry-macro.S
+@@ -31,10 +31,10 @@
+ 
+ 		@@ try the interrupt offset register, since it is there
+ 
+-		ldr	\irqstat, [ \base, #INTPND ]
++		ldr	\irqstat, [\base, #INTPND ]
+ 		teq	\irqstat, #0
+ 		beq	1002f
+-		ldr	\irqnr, [ \base, #INTOFFSET ]
++		ldr	\irqnr, [\base, #INTOFFSET ]
+ 		mov	\tmp, #1
+ 		tst	\irqstat, \tmp, lsl \irqnr
+ 		bne	1001f
+diff --git a/arch/arm/mach-s3c24xx/pm-h1940.S b/arch/arm/mach-s3c24xx/pm-h1940.S
+index c93bf2d..6183a68 100644
+--- a/arch/arm/mach-s3c24xx/pm-h1940.S
++++ b/arch/arm/mach-s3c24xx/pm-h1940.S
+@@ -30,4 +30,4 @@
+ 
+ h1940_pm_return:
+ 	mov	r0, #S3C2410_PA_GPIO
+-	ldr	pc, [ r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO ]
++	ldr	pc, [r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO]
+diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+index dd5b638..65200ae 100644
+--- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
++++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+@@ -45,9 +45,9 @@ ENTRY(s3c2410_cpu_suspend)
+ 	ldr	r4, =S3C2410_REFRESH
+ 	ldr	r5, =S3C24XX_MISCCR
+ 	ldr	r6, =S3C2410_CLKCON
+-	ldr	r7, [ r4 ]		@ get REFRESH (and ensure in TLB)
+-	ldr	r8, [ r5 ]		@ get MISCCR (and ensure in TLB)
+-	ldr	r9, [ r6 ]		@ get CLKCON (and ensure in TLB)
++	ldr	r7, [r4]		@ get REFRESH (and ensure in TLB)
++	ldr	r8, [r5]		@ get MISCCR (and ensure in TLB)
++	ldr	r9, [r6]		@ get CLKCON (and ensure in TLB)
+ 
+ 	orr	r7, r7, #S3C2410_REFRESH_SELF	@ SDRAM sleep command
+ 	orr	r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
+@@ -61,8 +61,8 @@ ENTRY(s3c2410_cpu_suspend)
+ 	@@ align next bit of code to cache line
+ 	.align	5
+ s3c2410_do_sleep:
+-	streq	r7, [ r4 ]			@ SDRAM sleep command
+-	streq	r8, [ r5 ]			@ SDRAM power-down config
+-	streq	r9, [ r6 ]			@ CPU sleep
++	streq	r7, [r4]			@ SDRAM sleep command
++	streq	r8, [r5]			@ SDRAM power-down config
++	streq	r9, [r6]			@ CPU sleep
+ 1:	beq	1b
+ 	mov	pc, r14
+diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
+index c82418e..5adaceb 100644
+--- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
++++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
+@@ -57,12 +57,12 @@ s3c2412_sleep_enter1:
+ 	 * retry, as simply returning causes the system to lock.
+ 	*/
+ 
+-	ldrne	r9, [ r1 ]
+-	strne	r9, [ r1 ]
+-	ldrne	r9, [ r2 ]
+-	strne	r9, [ r2 ]
+-	ldrne	r9, [ r3 ]
+-	strne	r9, [ r3 ]
++	ldrne	r9, [r1]
++	strne	r9, [r1]
++	ldrne	r9, [r2]
++	strne	r9, [r2]
++	ldrne	r9, [r3]
++	strne	r9, [r3]
+ 	bne	s3c2412_sleep_enter1
+ 
+ 	mov	pc, r14
+diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
+index 13f555d..357fc03 100644
+--- a/arch/arm/mm/dma-mapping.c
++++ b/arch/arm/mm/dma-mapping.c
+@@ -729,25 +729,27 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,
+ 	size_t size, enum dma_data_direction dir,
+ 	void (*op)(const void *, size_t, int))
+ {
++	unsigned long pfn;
++	size_t left = size;
++
++	pfn = page_to_pfn(page) + offset / PAGE_SIZE;
++	offset %= PAGE_SIZE;
++
+ 	/*
+ 	 * A single sg entry may refer to multiple physically contiguous
+ 	 * pages.  But we still need to process highmem pages individually.
+ 	 * If highmem is not configured then the bulk of this loop gets
+ 	 * optimized out.
+ 	 */
+-	size_t left = size;
+ 	do {
+ 		size_t len = left;
+ 		void *vaddr;
+ 
++		page = pfn_to_page(pfn);
++
+ 		if (PageHighMem(page)) {
+-			if (len + offset > PAGE_SIZE) {
+-				if (offset >= PAGE_SIZE) {
+-					page += offset / PAGE_SIZE;
+-					offset %= PAGE_SIZE;
+-				}
++			if (len + offset > PAGE_SIZE)
+ 				len = PAGE_SIZE - offset;
+-			}
+ 			vaddr = kmap_high_get(page);
+ 			if (vaddr) {
+ 				vaddr += offset;
+@@ -764,7 +766,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,
+ 			op(vaddr, len, dir);
+ 		}
+ 		offset = 0;
+-		page++;
++		pfn++;
+ 		left -= len;
+ 	} while (left);
+ }
+diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
+index c2fa21d..b68b531 100644
+--- a/arch/arm/mm/mmu.c
++++ b/arch/arm/mm/mmu.c
+@@ -498,7 +498,7 @@ static void __init build_mem_type_table(void)
+ #endif
+ 
+ 	for (i = 0; i < 16; i++) {
+-		unsigned long v = pgprot_val(protection_map[i]);
++		pteval_t v = pgprot_val(protection_map[i]);
+ 		protection_map[i] = __pgprot(v | user_pgprot);
+ 	}
+ 
+diff --git a/arch/arm/plat-samsung/include/plat/debug-macro.S b/arch/arm/plat-samsung/include/plat/debug-macro.S
+index 207e275..f3a9cff 100644
+--- a/arch/arm/plat-samsung/include/plat/debug-macro.S
++++ b/arch/arm/plat-samsung/include/plat/debug-macro.S
+@@ -14,12 +14,12 @@
+ /* The S5PV210/S5PC110 implementations are as belows. */
+ 
+ 	.macro fifo_level_s5pv210 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		and	\rd, \rd, #S5PV210_UFSTAT_TXMASK
+ 	.endm
+ 
+ 	.macro  fifo_full_s5pv210 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		tst	\rd, #S5PV210_UFSTAT_TXFULL
+ 	.endm
+ 
+@@ -27,7 +27,7 @@
+  * most widely re-used */
+ 
+ 	.macro fifo_level_s3c2440 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		and	\rd, \rd, #S3C2440_UFSTAT_TXMASK
+ 	.endm
+ 
+@@ -36,7 +36,7 @@
+ #endif
+ 
+ 	.macro  fifo_full_s3c2440 rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UFSTAT]
+ 		tst	\rd, #S3C2440_UFSTAT_TXFULL
+ 	.endm
+ 
+@@ -45,11 +45,11 @@
+ #endif
+ 
+ 	.macro	senduart,rd,rx
+-		strb 	\rd, [\rx, # S3C2410_UTXH ]
++		strb 	\rd, [\rx, # S3C2410_UTXH]
+ 	.endm
+ 
+ 	.macro	busyuart, rd, rx
+-		ldr	\rd, [ \rx, # S3C2410_UFCON ]
++		ldr	\rd, [\rx, # S3C2410_UFCON]
+ 		tst	\rd, #S3C2410_UFCON_FIFOMODE	@ fifo enabled?
+ 		beq	1001f				@
+ 		@ FIFO enabled...
+@@ -60,7 +60,7 @@
+ 
+ 1001:
+ 		@ busy waiting for non fifo
+-		ldr	\rd, [ \rx, # S3C2410_UTRSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UTRSTAT]
+ 		tst	\rd, #S3C2410_UTRSTAT_TXFE
+ 		beq	1001b
+ 
+@@ -68,7 +68,7 @@
+ 	.endm
+ 
+ 	.macro	waituart,rd,rx
+-		ldr	\rd, [ \rx, # S3C2410_UFCON ]
++		ldr	\rd, [\rx, # S3C2410_UFCON]
+ 		tst	\rd, #S3C2410_UFCON_FIFOMODE	@ fifo enabled?
+ 		beq	1001f				@
+ 		@ FIFO enabled...
+@@ -79,7 +79,7 @@
+ 		b	1002f
+ 1001:
+ 		@ idle waiting for non fifo
+-		ldr	\rd, [ \rx, # S3C2410_UTRSTAT ]
++		ldr	\rd, [\rx, # S3C2410_UTRSTAT]
+ 		tst	\rd, #S3C2410_UTRSTAT_TXFE
+ 		beq	1001b
+ 
+diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
+index cc926c9..323ce1a 100644
+--- a/arch/arm/vfp/entry.S
++++ b/arch/arm/vfp/entry.S
+@@ -22,7 +22,7 @@
+ @  IRQs disabled.
+ @
+ ENTRY(do_vfp)
+-#ifdef CONFIG_PREEMPT
++#ifdef CONFIG_PREEMPT_COUNT
+ 	ldr	r4, [r10, #TI_PREEMPT]	@ get preempt count
+ 	add	r11, r4, #1		@ increment it
+ 	str	r11, [r10, #TI_PREEMPT]
+@@ -35,7 +35,7 @@ ENTRY(do_vfp)
+ ENDPROC(do_vfp)
+ 
+ ENTRY(vfp_null_entry)
+-#ifdef CONFIG_PREEMPT
++#ifdef CONFIG_PREEMPT_COUNT
+ 	get_thread_info	r10
+ 	ldr	r4, [r10, #TI_PREEMPT]	@ get preempt count
+ 	sub	r11, r4, #1		@ decrement it
+@@ -53,7 +53,7 @@ ENDPROC(vfp_null_entry)
+ 
+ 	__INIT
+ ENTRY(vfp_testing_entry)
+-#ifdef CONFIG_PREEMPT
++#ifdef CONFIG_PREEMPT_COUNT
+ 	get_thread_info	r10
+ 	ldr	r4, [r10, #TI_PREEMPT]	@ get preempt count
+ 	sub	r11, r4, #1		@ decrement it
+diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
+index ea0349f..dd5e56f 100644
+--- a/arch/arm/vfp/vfphw.S
++++ b/arch/arm/vfp/vfphw.S
+@@ -168,7 +168,7 @@ vfp_hw_state_valid:
+ 					@ else it's one 32-bit instruction, so
+ 					@ always subtract 4 from the following
+ 					@ instruction address.
+-#ifdef CONFIG_PREEMPT
++#ifdef CONFIG_PREEMPT_COUNT
+ 	get_thread_info	r10
+ 	ldr	r4, [r10, #TI_PREEMPT]	@ get preempt count
+ 	sub	r11, r4, #1		@ decrement it
+@@ -192,7 +192,7 @@ look_for_VFP_exceptions:
+ 	@ not recognised by VFP
+ 
+ 	DBGSTR	"not VFP"
+-#ifdef CONFIG_PREEMPT
++#ifdef CONFIG_PREEMPT_COUNT
+ 	get_thread_info	r10
+ 	ldr	r4, [r10, #TI_PREEMPT]	@ get preempt count
+ 	sub	r11, r4, #1		@ decrement it
+diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h
+index 32567bc..ac12ae2 100644
+--- a/arch/cris/include/asm/io.h
++++ b/arch/cris/include/asm/io.h
+@@ -133,12 +133,39 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)
+ #define insb(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,1,count) : 0)
+ #define insw(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,2,count) : 0)
+ #define insl(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,4,count) : 0)
+-#define outb(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,1,1)
+-#define outw(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,2,1)
+-#define outl(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,4,1)
+-#define outsb(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,1,count)
+-#define outsw(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,2,count)
+-#define outsl(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,3,count)
++static inline void outb(unsigned char data, unsigned int port)
++{
++	if (cris_iops)
++		cris_iops->write_io(port, (void *) &data, 1, 1);
++}
++static inline void outw(unsigned short data, unsigned int port)
++{
++	if (cris_iops)
++		cris_iops->write_io(port, (void *) &data, 2, 1);
++}
++static inline void outl(unsigned int data, unsigned int port)
++{
++	if (cris_iops)
++		cris_iops->write_io(port, (void *) &data, 4, 1);
++}
++static inline void outsb(unsigned int port, const void *addr,
++			 unsigned long count)
++{
++	if (cris_iops)
++		cris_iops->write_io(port, (void *)addr, 1, count);
++}
++static inline void outsw(unsigned int port, const void *addr,
++			 unsigned long count)
++{
++	if (cris_iops)
++		cris_iops->write_io(port, (void *)addr, 2, count);
++}
++static inline void outsl(unsigned int port, const void *addr,
++			 unsigned long count)
++{
++	if (cris_iops)
++		cris_iops->write_io(port, (void *)addr, 4, count);
++}
+ 
+ /*
+  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
+index e9a5fd7..69b17a9 100644
+--- a/arch/mips/kernel/process.c
++++ b/arch/mips/kernel/process.c
+@@ -72,9 +72,7 @@ void __noreturn cpu_idle(void)
+ 			}
+ 		}
+ #ifdef CONFIG_HOTPLUG_CPU
+-		if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map) &&
+-		    (system_state == SYSTEM_RUNNING ||
+-		     system_state == SYSTEM_BOOTING))
++		if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map))
+ 			play_dead();
+ #endif
+ 		rcu_idle_exit();
+diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
+index ee99f23..7df49fa 100644
+--- a/arch/parisc/include/asm/pgtable.h
++++ b/arch/parisc/include/asm/pgtable.h
+@@ -12,11 +12,10 @@
+ 
+ #include <linux/bitops.h>
+ #include <linux/spinlock.h>
++#include <linux/mm_types.h>
+ #include <asm/processor.h>
+ #include <asm/cache.h>
+ 
+-struct vm_area_struct;
+-
+ /*
+  * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel
+  * memory.  For the return value to be meaningful, ADDR must be >=
+@@ -40,7 +39,14 @@ struct vm_area_struct;
+         do{                                                     \
+                 *(pteptr) = (pteval);                           \
+         } while(0)
+-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
++
++extern void purge_tlb_entries(struct mm_struct *, unsigned long);
++
++#define set_pte_at(mm, addr, ptep, pteval)                      \
++	do {                                                    \
++		set_pte(ptep, pteval);                          \
++		purge_tlb_entries(mm, addr);                    \
++	} while (0)
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
+@@ -466,6 +472,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
+ 		old = pte_val(*ptep);
+ 		new = pte_val(pte_wrprotect(__pte (old)));
+ 	} while (cmpxchg((unsigned long *) ptep, old, new) != old);
++	purge_tlb_entries(mm, addr);
+ #else
+ 	pte_t old_pte = *ptep;
+ 	set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
+diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
+index 9d18189..fa21463 100644
+--- a/arch/parisc/kernel/cache.c
++++ b/arch/parisc/kernel/cache.c
+@@ -420,6 +420,24 @@ void kunmap_parisc(void *addr)
+ EXPORT_SYMBOL(kunmap_parisc);
+ #endif
+ 
++void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
++{
++	unsigned long flags;
++
++	/* Note: purge_tlb_entries can be called at startup with
++	   no context.  */
++
++	/* Disable preemption while we play with %sr1.  */
++	preempt_disable();
++	mtsp(mm->context, 1);
++	purge_tlb_start(flags);
++	pdtlb(addr);
++	pitlb(addr);
++	purge_tlb_end(flags);
++	preempt_enable();
++}
++EXPORT_SYMBOL(purge_tlb_entries);
++
+ void __flush_tlb_range(unsigned long sid, unsigned long start,
+ 		       unsigned long end)
+ {
+diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
+index 58bddee..9e07bd0 100644
+--- a/arch/powerpc/kernel/head_64.S
++++ b/arch/powerpc/kernel/head_64.S
+@@ -422,7 +422,7 @@ _STATIC(__after_prom_start)
+ 	tovirt(r6,r6)			/* on booke, we already run at PAGE_OFFSET */
+ #endif
+ 
+-#ifdef CONFIG_CRASH_DUMP
++#ifdef CONFIG_RELOCATABLE
+ /*
+  * Check if the kernel has to be running as relocatable kernel based on the
+  * variable __run_at_load, if it is set the kernel is treated as relocatable
+diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
+index d7f6090..39833e0 100644
+--- a/arch/powerpc/kernel/machine_kexec_64.c
++++ b/arch/powerpc/kernel/machine_kexec_64.c
+@@ -162,6 +162,8 @@ static int kexec_all_irq_disabled = 0;
+ static void kexec_smp_down(void *arg)
+ {
+ 	local_irq_disable();
++	hard_irq_disable();
++
+ 	mb(); /* make sure our irqs are disabled before we say they are */
+ 	get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
+ 	while(kexec_all_irq_disabled == 0)
+@@ -244,6 +246,8 @@ static void kexec_prepare_cpus(void)
+ 	wake_offline_cpus();
+ 	smp_call_function(kexec_smp_down, NULL, /* wait */0);
+ 	local_irq_disable();
++	hard_irq_disable();
++
+ 	mb(); /* make sure IRQs are disabled before we say they are */
+ 	get_paca()->kexec_state = KEXEC_STATE_IRQS_OFF;
+ 
+@@ -281,6 +285,7 @@ static void kexec_prepare_cpus(void)
+ 	if (ppc_md.kexec_cpu_down)
+ 		ppc_md.kexec_cpu_down(0, 0);
+ 	local_irq_disable();
++	hard_irq_disable();
+ }
+ 
+ #endif /* SMP */
+diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
+index e49e931..5395666 100644
+--- a/arch/powerpc/kernel/time.c
++++ b/arch/powerpc/kernel/time.c
+@@ -759,13 +759,8 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
+ 
+ void update_vsyscall_tz(void)
+ {
+-	/* Make userspace gettimeofday spin until we're done. */
+-	++vdso_data->tb_update_count;
+-	smp_mb();
+ 	vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
+ 	vdso_data->tz_dsttime = sys_tz.tz_dsttime;
+-	smp_mb();
+-	++vdso_data->tb_update_count;
+ }
+ 
+ static void __init clocksource_init(void)
+diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
+index c8c6157..c39cd0b 100644
+--- a/arch/powerpc/kvm/44x_emulate.c
++++ b/arch/powerpc/kvm/44x_emulate.c
+@@ -76,6 +76,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
+ 				run->dcr.dcrn = dcrn;
+ 				run->dcr.data =  0;
+ 				run->dcr.is_write = 0;
++				vcpu->arch.dcr_is_write = 0;
+ 				vcpu->arch.io_gpr = rt;
+ 				vcpu->arch.dcr_needed = 1;
+ 				kvmppc_account_exit(vcpu, DCR_EXITS);
+@@ -94,6 +95,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
+ 				run->dcr.dcrn = dcrn;
+ 				run->dcr.data = kvmppc_get_gpr(vcpu, rs);
+ 				run->dcr.is_write = 1;
++				vcpu->arch.dcr_is_write = 1;
+ 				vcpu->arch.dcr_needed = 1;
+ 				kvmppc_account_exit(vcpu, DCR_EXITS);
+ 				emulated = EMULATE_DO_DCR;
+diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
+index 9761206..f0eee75 100644
+--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
++++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
+@@ -57,7 +57,8 @@ static const char *board[] __initdata = {
+ 	"amcc,makalu",
+ 	"apm,klondike",
+ 	"est,hotfoot",
+-	"plathome,obs600"
++	"plathome,obs600",
++	NULL
+ };
+ 
+ static int __init ppc40x_probe(void)
+diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
+index fba4d66..4c060bb 100644
+--- a/arch/s390/include/asm/timex.h
++++ b/arch/s390/include/asm/timex.h
+@@ -128,4 +128,32 @@ static inline unsigned long long get_clock_monotonic(void)
+ 	return get_clock_xt() - sched_clock_base_cc;
+ }
+ 
++/**
++ * tod_to_ns - convert a TOD format value to nanoseconds
++ * @todval: to be converted TOD format value
++ * Returns: number of nanoseconds that correspond to the TOD format value
++ *
++ * Converting a 64 Bit TOD format value to nanoseconds means that the value
++ * must be divided by 4.096. In order to achieve that we multiply with 125
++ * and divide by 512:
++ *
++ *    ns = (todval * 125) >> 9;
++ *
++ * In order to avoid an overflow with the multiplication we can rewrite this.
++ * With a split todval == 2^32 * th + tl (th upper 32 bits, tl lower 32 bits)
++ * we end up with
++ *
++ *    ns = ((2^32 * th + tl) * 125 ) >> 9;
++ * -> ns = (2^23 * th * 125) + ((tl * 125) >> 9);
++ *
++ */
++static inline unsigned long long tod_to_ns(unsigned long long todval)
++{
++	unsigned long long ns;
++
++	ns = ((todval >> 32) << 23) * 125;
++	ns += ((todval & 0xffffffff) * 125) >> 9;
++	return ns;
++}
++
+ #endif
+diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
+index dcec960..18c39ad 100644
+--- a/arch/s390/kernel/time.c
++++ b/arch/s390/kernel/time.c
+@@ -63,7 +63,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators);
+  */
+ unsigned long long notrace __kprobes sched_clock(void)
+ {
+-	return (get_clock_monotonic() * 125) >> 9;
++	return tod_to_ns(get_clock_monotonic());
+ }
+ 
+ /*
+@@ -120,6 +120,9 @@ static int s390_next_ktime(ktime_t expires,
+ 	nsecs = ktime_to_ns(ktime_add(timespec_to_ktime(ts), expires));
+ 	do_div(nsecs, 125);
+ 	S390_lowcore.clock_comparator = sched_clock_base_cc + (nsecs << 9);
++	/* Program the maximum value if we have an overflow (== year 2042) */
++	if (unlikely(S390_lowcore.clock_comparator < sched_clock_base_cc))
++		S390_lowcore.clock_comparator = -1ULL;
+ 	set_clock_comparator(S390_lowcore.clock_comparator);
+ 	return 0;
+ }
+diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
+index b7bc1aa..a80b585 100644
+--- a/arch/s390/kvm/interrupt.c
++++ b/arch/s390/kvm/interrupt.c
+@@ -390,7 +390,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu)
+ 		return 0;
+ 	}
+ 
+-	sltime = ((vcpu->arch.sie_block->ckc - now)*125)>>9;
++	sltime = tod_to_ns(vcpu->arch.sie_block->ckc - now);
+ 
+ 	hrtimer_start(&vcpu->arch.ckc_timer, ktime_set (0, sltime) , HRTIMER_MODE_REL);
+ 	VCPU_EVENT(vcpu, 5, "enabled wait via clock comparator: %llx ns", sltime);
+diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
+index d470ccb..ef49b98 100644
+--- a/arch/s390/kvm/kvm-s390.c
++++ b/arch/s390/kvm/kvm-s390.c
+@@ -753,6 +753,14 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
+ 	} else
+ 		prefix = 0;
+ 
++	/*
++	 * The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy
++	 * copying in vcpu load/put. Lets update our copies before we save
++	 * it into the save area
++	 */
++	save_fp_regs(&vcpu->arch.guest_fpregs);
++	save_access_regs(vcpu->run->s.regs.acrs);
++
+ 	if (__guestcopy(vcpu, addr + offsetof(struct save_area, fp_regs),
+ 			vcpu->arch.guest_fpregs.fprs, 128, prefix))
+ 		return -EFAULT;
+diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
+index f38112b..978b7fd 100644
+--- a/arch/sh/include/asm/elf.h
++++ b/arch/sh/include/asm/elf.h
+@@ -202,9 +202,9 @@ extern void __kernel_vsyscall;
+ 	if (vdso_enabled)					\
+ 		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);	\
+ 	else							\
+-		NEW_AUX_ENT(AT_IGNORE, 0);
++		NEW_AUX_ENT(AT_IGNORE, 0)
+ #else
+-#define VSYSCALL_AUX_ENT
++#define VSYSCALL_AUX_ENT	NEW_AUX_ENT(AT_IGNORE, 0)
+ #endif /* CONFIG_VSYSCALL */
+ 
+ #ifdef CONFIG_SH_FPU
+diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
+index 1770610..f368cef 100644
+--- a/arch/sparc/include/asm/hugetlb.h
++++ b/arch/sparc/include/asm/hugetlb.h
+@@ -58,14 +58,20 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)
+ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
+ 					   unsigned long addr, pte_t *ptep)
+ {
+-	ptep_set_wrprotect(mm, addr, ptep);
++	pte_t old_pte = *ptep;
++	set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
+ }
+ 
+ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
+ 					     unsigned long addr, pte_t *ptep,
+ 					     pte_t pte, int dirty)
+ {
+-	return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
++	int changed = !pte_same(*ptep, pte);
++	if (changed) {
++		set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
++		flush_tlb_page(vma, addr);
++	}
++	return changed;
+ }
+ 
+ static inline pte_t huge_ptep_get(pte_t *ptep)
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 50a1d1f..01897ac 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1246,10 +1246,6 @@ config NODES_SHIFT
+ 	  Specify the maximum number of NUMA Nodes available on the target
+ 	  system.  Increases memory reserved to accommodate various tables.
+ 
+-config HAVE_ARCH_ALLOC_REMAP
+-	def_bool y
+-	depends on X86_32 && NUMA
+-
+ config ARCH_HAVE_MEMORY_PRESENT
+ 	def_bool y
+ 	depends on X86_32 && DISCONTIGMEM
+diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
+index 20e5f7b..f6d477a 100644
+--- a/arch/x86/ia32/ia32entry.S
++++ b/arch/x86/ia32/ia32entry.S
+@@ -204,7 +204,7 @@ sysexit_from_sys_call:
+ 	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+ 	jnz ia32_ret_from_sys_call
+ 	TRACE_IRQS_ON
+-	sti
++	ENABLE_INTERRUPTS(CLBR_NONE)
+ 	movl %eax,%esi		/* second arg, syscall return value */
+ 	cmpl $-MAX_ERRNO,%eax	/* is it an error ? */
+ 	jbe 1f
+@@ -214,7 +214,7 @@ sysexit_from_sys_call:
+ 	call __audit_syscall_exit
+ 	movq RAX-ARGOFFSET(%rsp),%rax	/* reload syscall return value */
+ 	movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
+-	cli
++	DISABLE_INTERRUPTS(CLBR_NONE)
+ 	TRACE_IRQS_OFF
+ 	testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
+ 	jz \exit
+diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
+index 029189d..da37433 100644
+--- a/arch/x86/include/asm/efi.h
++++ b/arch/x86/include/asm/efi.h
+@@ -94,6 +94,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
+ #endif /* CONFIG_X86_32 */
+ 
+ extern int add_efi_memmap;
++extern unsigned long x86_efi_facility;
+ extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
+ extern int efi_memblock_x86_reserve_range(void);
+ extern void efi_call_phys_prelog(void);
+diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
+index eb05fb3..8a9b3e2 100644
+--- a/arch/x86/include/asm/mmzone_32.h
++++ b/arch/x86/include/asm/mmzone_32.h
+@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[];
+ 
+ #include <asm/numaq.h>
+ 
+-extern void resume_map_numa_kva(pgd_t *pgd);
+-
+-#else /* !CONFIG_NUMA */
+-
+-static inline void resume_map_numa_kva(pgd_t *pgd) {}
+-
+ #endif /* CONFIG_NUMA */
+ 
+ #ifdef CONFIG_DISCONTIGMEM
+diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
+index c3520d7..3f3dd52 100644
+--- a/arch/x86/include/asm/pgtable.h
++++ b/arch/x86/include/asm/pgtable.h
+@@ -142,6 +142,11 @@ static inline unsigned long pmd_pfn(pmd_t pmd)
+ 	return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;
+ }
+ 
++static inline unsigned long pud_pfn(pud_t pud)
++{
++	return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
++}
++
+ #define pte_page(pte)	pfn_to_page(pte_pfn(pte))
+ 
+ static inline int pmd_large(pmd_t pte)
+diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
+index e03a1e1..562a76d 100644
+--- a/arch/x86/kernel/apic/x2apic_phys.c
++++ b/arch/x86/kernel/apic/x2apic_phys.c
+@@ -20,18 +20,19 @@ static int set_x2apic_phys_mode(char *arg)
+ }
+ early_param("x2apic_phys", set_x2apic_phys_mode);
+ 
+-static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
++static bool x2apic_fadt_phys(void)
+ {
+-	if (x2apic_phys)
+-		return x2apic_enabled();
+-	else if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
+-		(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) &&
+-		x2apic_enabled()) {
++	if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
++		(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL)) {
+ 		printk(KERN_DEBUG "System requires x2apic physical mode\n");
+-		return 1;
++		return true;
+ 	}
+-	else
+-		return 0;
++	return false;
++}
++
++static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
++{
++	return x2apic_enabled() && (x2apic_phys || x2apic_fadt_phys());
+ }
+ 
+ static void
+@@ -82,7 +83,7 @@ static void init_x2apic_ldr(void)
+ 
+ static int x2apic_phys_probe(void)
+ {
+-	if (x2apic_mode && x2apic_phys)
++	if (x2apic_mode && (x2apic_phys || x2apic_fadt_phys()))
+ 		return 1;
+ 
+ 	return apic == &apic_x2apic_phys;
+diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
+index 0a630dd..646d192 100644
+--- a/arch/x86/kernel/cpu/mshyperv.c
++++ b/arch/x86/kernel/cpu/mshyperv.c
+@@ -68,7 +68,8 @@ static void __init ms_hyperv_init_platform(void)
+ 	printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n",
+ 	       ms_hyperv.features, ms_hyperv.hints);
+ 
+-	clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
++	if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)
++		clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
+ }
+ 
+ const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
+diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
+index 8f8e8ee..2a6919e 100644
+--- a/arch/x86/kernel/entry_32.S
++++ b/arch/x86/kernel/entry_32.S
+@@ -1065,7 +1065,6 @@ ENTRY(xen_failsafe_callback)
+ 	lea 16(%esp),%esp
+ 	CFI_ADJUST_CFA_OFFSET -16
+ 	jz 5f
+-	addl $16,%esp
+ 	jmp iret_exc
+ 5:	pushl_cfi $-1 /* orig_ax = -1 => not a system call */
+ 	SAVE_ALL
+diff --git a/arch/x86/kernel/head.c b/arch/x86/kernel/head.c
+index 48d9d4e..992f442 100644
+--- a/arch/x86/kernel/head.c
++++ b/arch/x86/kernel/head.c
+@@ -5,8 +5,6 @@
+ #include <asm/setup.h>
+ #include <asm/bios_ebda.h>
+ 
+-#define BIOS_LOWMEM_KILOBYTES 0x413
+-
+ /*
+  * The BIOS places the EBDA/XBDA at the top of conventional
+  * memory, and usually decreases the reported amount of
+@@ -16,17 +14,30 @@
+  * chipset: reserve a page before VGA to prevent PCI prefetch
+  * into it (errata #56). Usually the page is reserved anyways,
+  * unless you have no PS/2 mouse plugged in.
++ *
++ * This functions is deliberately very conservative.  Losing
++ * memory in the bottom megabyte is rarely a problem, as long
++ * as we have enough memory to install the trampoline.  Using
++ * memory that is in use by the BIOS or by some DMA device
++ * the BIOS didn't shut down *is* a big problem.
+  */
++
++#define BIOS_LOWMEM_KILOBYTES	0x413
++#define LOWMEM_CAP		0x9f000U	/* Absolute maximum */
++#define INSANE_CUTOFF		0x20000U	/* Less than this = insane */
++
+ void __init reserve_ebda_region(void)
+ {
+ 	unsigned int lowmem, ebda_addr;
+ 
+-	/* To determine the position of the EBDA and the */
+-	/* end of conventional memory, we need to look at */
+-	/* the BIOS data area. In a paravirtual environment */
+-	/* that area is absent. We'll just have to assume */
+-	/* that the paravirt case can handle memory setup */
+-	/* correctly, without our help. */
++	/*
++	 * To determine the position of the EBDA and the
++	 * end of conventional memory, we need to look at
++	 * the BIOS data area. In a paravirtual environment
++	 * that area is absent. We'll just have to assume
++	 * that the paravirt case can handle memory setup
++	 * correctly, without our help.
++	 */
+ 	if (paravirt_enabled())
+ 		return;
+ 
+@@ -37,19 +48,23 @@ void __init reserve_ebda_region(void)
+ 	/* start of EBDA area */
+ 	ebda_addr = get_bios_ebda();
+ 
+-	/* Fixup: bios puts an EBDA in the top 64K segment */
+-	/* of conventional memory, but does not adjust lowmem. */
+-	if ((lowmem - ebda_addr) <= 0x10000)
+-		lowmem = ebda_addr;
++	/*
++	 * Note: some old Dells seem to need 4k EBDA without
++	 * reporting so, so just consider the memory above 0x9f000
++	 * to be off limits (bugzilla 2990).
++	 */
++
++	/* If the EBDA address is below 128K, assume it is bogus */
++	if (ebda_addr < INSANE_CUTOFF)
++		ebda_addr = LOWMEM_CAP;
+ 
+-	/* Fixup: bios does not report an EBDA at all. */
+-	/* Some old Dells seem to need 4k anyhow (bugzilla 2990) */
+-	if ((ebda_addr == 0) && (lowmem >= 0x9f000))
+-		lowmem = 0x9f000;
++	/* If lowmem is less than 128K, assume it is bogus */
++	if (lowmem < INSANE_CUTOFF)
++		lowmem = LOWMEM_CAP;
+ 
+-	/* Paranoia: should never happen, but... */
+-	if ((lowmem == 0) || (lowmem >= 0x100000))
+-		lowmem = 0x9f000;
++	/* Use the lower of the lowmem and EBDA markers as the cutoff */
++	lowmem = min(lowmem, ebda_addr);
++	lowmem = min(lowmem, LOWMEM_CAP); /* Absolute cap */
+ 
+ 	/* reserve all memory between lowmem and the 1MB mark */
+ 	memblock_reserve(lowmem, 0x100000 - lowmem);
+diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
+index eb11369..8563b64 100644
+--- a/arch/x86/kernel/msr.c
++++ b/arch/x86/kernel/msr.c
+@@ -174,6 +174,9 @@ static int msr_open(struct inode *inode, struct file *file)
+ 	unsigned int cpu;
+ 	struct cpuinfo_x86 *c;
+ 
++	if (!capable(CAP_SYS_RAWIO))
++		return -EPERM;
++
+ 	cpu = iminor(file->f_path.dentry->d_inode);
+ 	if (cpu >= nr_cpu_ids || !cpu_online(cpu))
+ 		return -ENXIO;	/* No such CPU */
+diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
+index 52190a9..3f20ab4 100644
+--- a/arch/x86/kernel/reboot.c
++++ b/arch/x86/kernel/reboot.c
+@@ -592,7 +592,7 @@ static void native_machine_emergency_restart(void)
+ 			break;
+ 
+ 		case BOOT_EFI:
+-			if (efi_enabled)
++			if (efi_enabled(EFI_RUNTIME_SERVICES))
+ 				efi.reset_system(reboot_mode ?
+ 						 EFI_RESET_WARM :
+ 						 EFI_RESET_COLD,
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 5cee802..771ff4d 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -613,6 +613,83 @@ static __init void reserve_ibft_region(void)
+ 
+ static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10;
+ 
++static bool __init snb_gfx_workaround_needed(void)
++{
++#ifdef CONFIG_PCI
++	int i;
++	u16 vendor, devid;
++	static const u16 snb_ids[] = {
++		0x0102,
++		0x0112,
++		0x0122,
++		0x0106,
++		0x0116,
++		0x0126,
++		0x010a,
++	};
++
++	/* Assume no if something weird is going on with PCI */
++	if (!early_pci_allowed())
++		return false;
++
++	vendor = read_pci_config_16(0, 2, 0, PCI_VENDOR_ID);
++	if (vendor != 0x8086)
++		return false;
++
++	devid = read_pci_config_16(0, 2, 0, PCI_DEVICE_ID);
++	for (i = 0; i < ARRAY_SIZE(snb_ids); i++)
++		if (devid == snb_ids[i])
++			return true;
++#endif
++
++	return false;
++}
++
++/*
++ * Sandy Bridge graphics has trouble with certain ranges, exclude
++ * them from allocation.
++ */
++static void __init trim_snb_memory(void)
++{
++	static const unsigned long bad_pages[] = {
++		0x20050000,
++		0x20110000,
++		0x20130000,
++		0x20138000,
++		0x40004000,
++	};
++	int i;
++
++	if (!snb_gfx_workaround_needed())
++		return;
++
++	printk(KERN_DEBUG "reserving inaccessible SNB gfx pages\n");
++
++	/*
++	 * Reserve all memory below the 1 MB mark that has not
++	 * already been reserved.
++	 */
++	memblock_reserve(0, 1<<20);
++
++	for (i = 0; i < ARRAY_SIZE(bad_pages); i++) {
++		if (memblock_reserve(bad_pages[i], PAGE_SIZE))
++			printk(KERN_WARNING "failed to reserve 0x%08lx\n",
++			       bad_pages[i]);
++	}
++}
++
++/*
++ * Here we put platform-specific memory range workarounds, i.e.
++ * memory known to be corrupt or otherwise in need to be reserved on
++ * specific platforms.
++ *
++ * If this gets used more widely it could use a real dispatch mechanism.
++ */
++static void __init trim_platform_memory_ranges(void)
++{
++	trim_snb_memory();
++}
++
+ static void __init trim_bios_range(void)
+ {
+ 	/*
+@@ -633,6 +710,7 @@ static void __init trim_bios_range(void)
+ 	 * take them out.
+ 	 */
+ 	e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
++
+ 	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
+ }
+ 
+@@ -732,15 +810,15 @@ void __init setup_arch(char **cmdline_p)
+ #ifdef CONFIG_EFI
+ 	if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
+ 		     "EL32", 4)) {
+-		efi_enabled = 1;
+-		efi_64bit = false;
++		set_bit(EFI_BOOT, &x86_efi_facility);
+ 	} else if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
+ 		     "EL64", 4)) {
+-		efi_enabled = 1;
+-		efi_64bit = true;
++		set_bit(EFI_BOOT, &x86_efi_facility);
++		set_bit(EFI_64BIT, &x86_efi_facility);
+ 	}
+-	if (efi_enabled && efi_memblock_x86_reserve_range())
+-		efi_enabled = 0;
++
++	if (efi_enabled(EFI_BOOT))
++		efi_memblock_x86_reserve_range();
+ #endif
+ 
+ 	x86_init.oem.arch_setup();
+@@ -813,7 +891,7 @@ void __init setup_arch(char **cmdline_p)
+ 
+ 	finish_e820_parsing();
+ 
+-	if (efi_enabled)
++	if (efi_enabled(EFI_BOOT))
+ 		efi_init();
+ 
+ 	dmi_scan_machine();
+@@ -896,7 +974,7 @@ void __init setup_arch(char **cmdline_p)
+ 	 * The EFI specification says that boot service code won't be called
+ 	 * after ExitBootServices(). This is, in fact, a lie.
+ 	 */
+-	if (efi_enabled)
++	if (efi_enabled(EFI_MEMMAP))
+ 		efi_reserve_boot_services();
+ 
+ 	/* preallocate 4k for mptable mpc */
+@@ -911,6 +989,8 @@ void __init setup_arch(char **cmdline_p)
+ 
+ 	setup_real_mode();
+ 
++	trim_platform_memory_ranges();
++
+ 	init_gbpages();
+ 
+ 	/* max_pfn_mapped is updated here */
+@@ -1035,7 +1115,7 @@ void __init setup_arch(char **cmdline_p)
+ 
+ #ifdef CONFIG_VT
+ #if defined(CONFIG_VGA_CONSOLE)
+-	if (!efi_enabled || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))
++	if (!efi_enabled(EFI_BOOT) || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))
+ 		conswitchp = &vga_con;
+ #elif defined(CONFIG_DUMMY_CONSOLE)
+ 	conswitchp = &dummy_con;
+@@ -1050,14 +1130,14 @@ void __init setup_arch(char **cmdline_p)
+ 	arch_init_ideal_nops();
+ 
+ #ifdef CONFIG_EFI
+-	/* Once setup is done above, disable efi_enabled on mismatched
+-	 * firmware/kernel archtectures since there is no support for
+-	 * runtime services.
++	/* Once setup is done above, unmap the EFI memory map on
++	 * mismatched firmware/kernel archtectures since there is no
++	 * support for runtime services.
+ 	 */
+-	if (efi_enabled && IS_ENABLED(CONFIG_X86_64) != efi_64bit) {
++	if (efi_enabled(EFI_BOOT) &&
++	    IS_ENABLED(CONFIG_X86_64) != efi_enabled(EFI_64BIT)) {
+ 		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
+ 		efi_unmap_memmap();
+-		efi_enabled = 0;
+ 	}
+ #endif
+ }
+diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
+index 76dcd9d..c6b10e2 100644
+--- a/arch/x86/mm/fault.c
++++ b/arch/x86/mm/fault.c
+@@ -747,13 +747,15 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
+ 				return;
+ 		}
+ #endif
++		/* Kernel addresses are always protection faults: */
++		if (address >= TASK_SIZE)
++			error_code |= PF_PROT;
+ 
+-		if (unlikely(show_unhandled_signals))
++		if (likely(show_unhandled_signals))
+ 			show_signal_msg(regs, error_code, address, tsk);
+ 
+-		/* Kernel addresses are always protection faults: */
+ 		tsk->thread.cr2		= address;
+-		tsk->thread.error_code	= error_code | (address >= TASK_SIZE);
++		tsk->thread.error_code	= error_code;
+ 		tsk->thread.trap_nr	= X86_TRAP_PF;
+ 
+ 		force_sig_info_fault(SIGSEGV, si_code, address, tsk, 0);
+diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
+index 3baff25..ce42da7 100644
+--- a/arch/x86/mm/init_64.c
++++ b/arch/x86/mm/init_64.c
+@@ -829,6 +829,9 @@ int kern_addr_valid(unsigned long addr)
+ 	if (pud_none(*pud))
+ 		return 0;
+ 
++	if (pud_large(*pud))
++		return pfn_valid(pud_pfn(*pud));
++
+ 	pmd = pmd_offset(pud, addr);
+ 	if (pmd_none(*pmd))
+ 		return 0;
+diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
+index 2d125be..8504f36 100644
+--- a/arch/x86/mm/numa.c
++++ b/arch/x86/mm/numa.c
+@@ -193,7 +193,6 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
+ static void __init setup_node_data(int nid, u64 start, u64 end)
+ {
+ 	const size_t nd_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
+-	bool remapped = false;
+ 	u64 nd_pa;
+ 	void *nd;
+ 	int tnid;
+@@ -205,37 +204,28 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
+ 	if (end && (end - start) < NODE_MIN_SIZE)
+ 		return;
+ 
+-	/* initialize remap allocator before aligning to ZONE_ALIGN */
+-	init_alloc_remap(nid, start, end);
+-
+ 	start = roundup(start, ZONE_ALIGN);
+ 
+ 	printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n",
+ 	       nid, start, end - 1);
+ 
+ 	/*
+-	 * Allocate node data.  Try remap allocator first, node-local
+-	 * memory and then any node.  Never allocate in DMA zone.
++	 * Allocate node data.  Try node-local memory and then any node.
++	 * Never allocate in DMA zone.
+ 	 */
+-	nd = alloc_remap(nid, nd_size);
+-	if (nd) {
+-		nd_pa = __pa(nd);
+-		remapped = true;
+-	} else {
+-		nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
+-		if (!nd_pa) {
+-			pr_err("Cannot find %zu bytes in node %d\n",
+-			       nd_size, nid);
+-			return;
+-		}
+-		nd = __va(nd_pa);
++	nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
++	if (!nd_pa) {
++		pr_err("Cannot find %zu bytes in node %d\n",
++		       nd_size, nid);
++		return;
+ 	}
++	nd = __va(nd_pa);
+ 
+ 	/* report and initialize */
+-	printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]%s\n",
+-	       nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");
++	printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]\n",
++	       nd_pa, nd_pa + nd_size - 1);
+ 	tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
+-	if (!remapped && tnid != nid)
++	if (tnid != nid)
+ 		printk(KERN_INFO "    NODE_DATA(%d) on node %d\n", nid, tnid);
+ 
+ 	node_data[nid] = nd;
+diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
+index 534255a..73a6d73 100644
+--- a/arch/x86/mm/numa_32.c
++++ b/arch/x86/mm/numa_32.c
+@@ -73,167 +73,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
+ 
+ extern unsigned long highend_pfn, highstart_pfn;
+ 
+-#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
+-
+-static void *node_remap_start_vaddr[MAX_NUMNODES];
+-void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);
+-
+-/*
+- * Remap memory allocator
+- */
+-static unsigned long node_remap_start_pfn[MAX_NUMNODES];
+-static void *node_remap_end_vaddr[MAX_NUMNODES];
+-static void *node_remap_alloc_vaddr[MAX_NUMNODES];
+-
+-/**
+- * alloc_remap - Allocate remapped memory
+- * @nid: NUMA node to allocate memory from
+- * @size: The size of allocation
+- *
+- * Allocate @size bytes from the remap area of NUMA node @nid.  The
+- * size of the remap area is predetermined by init_alloc_remap() and
+- * only the callers considered there should call this function.  For
+- * more info, please read the comment on top of init_alloc_remap().
+- *
+- * The caller must be ready to handle allocation failure from this
+- * function and fall back to regular memory allocator in such cases.
+- *
+- * CONTEXT:
+- * Single CPU early boot context.
+- *
+- * RETURNS:
+- * Pointer to the allocated memory on success, %NULL on failure.
+- */
+-void *alloc_remap(int nid, unsigned long size)
+-{
+-	void *allocation = node_remap_alloc_vaddr[nid];
+-
+-	size = ALIGN(size, L1_CACHE_BYTES);
+-
+-	if (!allocation || (allocation + size) > node_remap_end_vaddr[nid])
+-		return NULL;
+-
+-	node_remap_alloc_vaddr[nid] += size;
+-	memset(allocation, 0, size);
+-
+-	return allocation;
+-}
+-
+-#ifdef CONFIG_HIBERNATION
+-/**
+- * resume_map_numa_kva - add KVA mapping to the temporary page tables created
+- *                       during resume from hibernation
+- * @pgd_base - temporary resume page directory
+- */
+-void resume_map_numa_kva(pgd_t *pgd_base)
+-{
+-	int node;
+-
+-	for_each_online_node(node) {
+-		unsigned long start_va, start_pfn, nr_pages, pfn;
+-
+-		start_va = (unsigned long)node_remap_start_vaddr[node];
+-		start_pfn = node_remap_start_pfn[node];
+-		nr_pages = (node_remap_end_vaddr[node] -
+-			    node_remap_start_vaddr[node]) >> PAGE_SHIFT;
+-
+-		printk(KERN_DEBUG "%s: node %d\n", __func__, node);
+-
+-		for (pfn = 0; pfn < nr_pages; pfn += PTRS_PER_PTE) {
+-			unsigned long vaddr = start_va + (pfn << PAGE_SHIFT);
+-			pgd_t *pgd = pgd_base + pgd_index(vaddr);
+-			pud_t *pud = pud_offset(pgd, vaddr);
+-			pmd_t *pmd = pmd_offset(pud, vaddr);
+-
+-			set_pmd(pmd, pfn_pmd(start_pfn + pfn,
+-						PAGE_KERNEL_LARGE_EXEC));
+-
+-			printk(KERN_DEBUG "%s: %08lx -> pfn %08lx\n",
+-				__func__, vaddr, start_pfn + pfn);
+-		}
+-	}
+-}
+-#endif
+-
+-/**
+- * init_alloc_remap - Initialize remap allocator for a NUMA node
+- * @nid: NUMA node to initizlie remap allocator for
+- *
+- * NUMA nodes may end up without any lowmem.  As allocating pgdat and
+- * memmap on a different node with lowmem is inefficient, a special
+- * remap allocator is implemented which can be used by alloc_remap().
+- *
+- * For each node, the amount of memory which will be necessary for
+- * pgdat and memmap is calculated and two memory areas of the size are
+- * allocated - one in the node and the other in lowmem; then, the area
+- * in the node is remapped to the lowmem area.
+- *
+- * As pgdat and memmap must be allocated in lowmem anyway, this
+- * doesn't waste lowmem address space; however, the actual lowmem
+- * which gets remapped over is wasted.  The amount shouldn't be
+- * problematic on machines this feature will be used.
+- *
+- * Initialization failure isn't fatal.  alloc_remap() is used
+- * opportunistically and the callers will fall back to other memory
+- * allocation mechanisms on failure.
+- */
+-void __init init_alloc_remap(int nid, u64 start, u64 end)
+-{
+-	unsigned long start_pfn = start >> PAGE_SHIFT;
+-	unsigned long end_pfn = end >> PAGE_SHIFT;
+-	unsigned long size, pfn;
+-	u64 node_pa, remap_pa;
+-	void *remap_va;
+-
+-	/*
+-	 * The acpi/srat node info can show hot-add memroy zones where
+-	 * memory could be added but not currently present.
+-	 */
+-	printk(KERN_DEBUG "node %d pfn: [%lx - %lx]\n",
+-	       nid, start_pfn, end_pfn);
+-
+-	/* calculate the necessary space aligned to large page size */
+-	size = node_memmap_size_bytes(nid, start_pfn, end_pfn);
+-	size += ALIGN(sizeof(pg_data_t), PAGE_SIZE);
+-	size = ALIGN(size, LARGE_PAGE_BYTES);
+-
+-	/* allocate node memory and the lowmem remap area */
+-	node_pa = memblock_find_in_range(start, end, size, LARGE_PAGE_BYTES);
+-	if (!node_pa) {
+-		pr_warning("remap_alloc: failed to allocate %lu bytes for node %d\n",
+-			   size, nid);
+-		return;
+-	}
+-	memblock_reserve(node_pa, size);
+-
+-	remap_pa = memblock_find_in_range(min_low_pfn << PAGE_SHIFT,
+-					  max_low_pfn << PAGE_SHIFT,
+-					  size, LARGE_PAGE_BYTES);
+-	if (!remap_pa) {
+-		pr_warning("remap_alloc: failed to allocate %lu bytes remap area for node %d\n",
+-			   size, nid);
+-		memblock_free(node_pa, size);
+-		return;
+-	}
+-	memblock_reserve(remap_pa, size);
+-	remap_va = phys_to_virt(remap_pa);
+-
+-	/* perform actual remap */
+-	for (pfn = 0; pfn < size >> PAGE_SHIFT; pfn += PTRS_PER_PTE)
+-		set_pmd_pfn((unsigned long)remap_va + (pfn << PAGE_SHIFT),
+-			    (node_pa >> PAGE_SHIFT) + pfn,
+-			    PAGE_KERNEL_LARGE);
+-
+-	/* initialize remap allocator parameters */
+-	node_remap_start_pfn[nid] = node_pa >> PAGE_SHIFT;
+-	node_remap_start_vaddr[nid] = remap_va;
+-	node_remap_end_vaddr[nid] = remap_va + size;
+-	node_remap_alloc_vaddr[nid] = remap_va;
+-
+-	printk(KERN_DEBUG "remap_alloc: node %d [%08llx-%08llx) -> [%p-%p)\n",
+-	       nid, node_pa, node_pa + size, remap_va, remap_va + size);
+-}
+-
+ void __init initmem_init(void)
+ {
+ 	x86_numa_init();
+diff --git a/arch/x86/mm/numa_internal.h b/arch/x86/mm/numa_internal.h
+index 7178c3a..ad86ec9 100644
+--- a/arch/x86/mm/numa_internal.h
++++ b/arch/x86/mm/numa_internal.h
+@@ -21,12 +21,6 @@ void __init numa_reset_distance(void);
+ 
+ void __init x86_numa_init(void);
+ 
+-#ifdef CONFIG_X86_64
+-static inline void init_alloc_remap(int nid, u64 start, u64 end)	{ }
+-#else
+-void __init init_alloc_remap(int nid, u64 start, u64 end);
+-#endif
+-
+ #ifdef CONFIG_NUMA_EMU
+ void __init numa_emulation(struct numa_meminfo *numa_meminfo,
+ 			   int numa_dist_cnt);
+diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
+index 72d8899..1e40637 100644
+--- a/arch/x86/platform/efi/efi.c
++++ b/arch/x86/platform/efi/efi.c
+@@ -50,9 +50,6 @@
+ 
+ #define EFI_DEBUG	1
+ 
+-int efi_enabled;
+-EXPORT_SYMBOL(efi_enabled);
+-
+ struct efi __read_mostly efi = {
+ 	.mps        = EFI_INVALID_TABLE_ADDR,
+ 	.acpi       = EFI_INVALID_TABLE_ADDR,
+@@ -68,19 +65,29 @@ EXPORT_SYMBOL(efi);
+ 
+ struct efi_memory_map memmap;
+ 
+-bool efi_64bit;
+-
+ static struct efi efi_phys __initdata;
+ static efi_system_table_t efi_systab __initdata;
+ 
+ static inline bool efi_is_native(void)
+ {
+-	return IS_ENABLED(CONFIG_X86_64) == efi_64bit;
++	return IS_ENABLED(CONFIG_X86_64) == efi_enabled(EFI_64BIT);
++}
++
++unsigned long x86_efi_facility;
++
++/*
++ * Returns 1 if 'facility' is enabled, 0 otherwise.
++ */
++int efi_enabled(int facility)
++{
++	return test_bit(facility, &x86_efi_facility) != 0;
+ }
++EXPORT_SYMBOL(efi_enabled);
+ 
++static bool disable_runtime = false;
+ static int __init setup_noefi(char *arg)
+ {
+-	efi_enabled = 0;
++	disable_runtime = true;
+ 	return 0;
+ }
+ early_param("noefi", setup_noefi);
+@@ -425,6 +432,7 @@ void __init efi_reserve_boot_services(void)
+ 
+ void __init efi_unmap_memmap(void)
+ {
++	clear_bit(EFI_MEMMAP, &x86_efi_facility);
+ 	if (memmap.map) {
+ 		early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);
+ 		memmap.map = NULL;
+@@ -459,7 +467,7 @@ void __init efi_free_boot_services(void)
+ 
+ static int __init efi_systab_init(void *phys)
+ {
+-	if (efi_64bit) {
++	if (efi_enabled(EFI_64BIT)) {
+ 		efi_system_table_64_t *systab64;
+ 		u64 tmp = 0;
+ 
+@@ -551,7 +559,7 @@ static int __init efi_config_init(u64 tables, int nr_tables)
+ 	void *config_tables, *tablep;
+ 	int i, sz;
+ 
+-	if (efi_64bit)
++	if (efi_enabled(EFI_64BIT))
+ 		sz = sizeof(efi_config_table_64_t);
+ 	else
+ 		sz = sizeof(efi_config_table_32_t);
+@@ -571,7 +579,7 @@ static int __init efi_config_init(u64 tables, int nr_tables)
+ 		efi_guid_t guid;
+ 		unsigned long table;
+ 
+-		if (efi_64bit) {
++		if (efi_enabled(EFI_64BIT)) {
+ 			u64 table64;
+ 			guid = ((efi_config_table_64_t *)tablep)->guid;
+ 			table64 = ((efi_config_table_64_t *)tablep)->table;
+@@ -683,7 +691,6 @@ void __init efi_init(void)
+ 	if (boot_params.efi_info.efi_systab_hi ||
+ 	    boot_params.efi_info.efi_memmap_hi) {
+ 		pr_info("Table located above 4GB, disabling EFI.\n");
+-		efi_enabled = 0;
+ 		return;
+ 	}
+ 	efi_phys.systab = (efi_system_table_t *)boot_params.efi_info.efi_systab;
+@@ -693,10 +700,10 @@ void __init efi_init(void)
+ 			  ((__u64)boot_params.efi_info.efi_systab_hi<<32));
+ #endif
+ 
+-	if (efi_systab_init(efi_phys.systab)) {
+-		efi_enabled = 0;
++	if (efi_systab_init(efi_phys.systab))
+ 		return;
+-	}
++
++	set_bit(EFI_SYSTEM_TABLES, &x86_efi_facility);
+ 
+ 	/*
+ 	 * Show what we know for posterity
+@@ -714,10 +721,10 @@ void __init efi_init(void)
+ 		efi.systab->hdr.revision >> 16,
+ 		efi.systab->hdr.revision & 0xffff, vendor);
+ 
+-	if (efi_config_init(efi.systab->tables, efi.systab->nr_tables)) {
+-		efi_enabled = 0;
++	if (efi_config_init(efi.systab->tables, efi.systab->nr_tables))
+ 		return;
+-	}
++
++	set_bit(EFI_CONFIG_TABLES, &x86_efi_facility);
+ 
+ 	/*
+ 	 * Note: We currently don't support runtime services on an EFI
+@@ -726,15 +733,17 @@ void __init efi_init(void)
+ 
+ 	if (!efi_is_native())
+ 		pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
+-	else if (efi_runtime_init()) {
+-		efi_enabled = 0;
+-		return;
++	else {
++		if (disable_runtime || efi_runtime_init())
++			return;
++		set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
+ 	}
+ 
+-	if (efi_memmap_init()) {
+-		efi_enabled = 0;
++	if (efi_memmap_init())
+ 		return;
+-	}
++
++	set_bit(EFI_MEMMAP, &x86_efi_facility);
++
+ #ifdef CONFIG_X86_32
+ 	if (efi_is_native()) {
+ 		x86_platform.get_wallclock = efi_get_time;
+@@ -900,7 +909,7 @@ void __init efi_enter_virtual_mode(void)
+ 	 *
+ 	 * Call EFI services through wrapper functions.
+ 	 */
+-	efi.runtime_version = efi_systab.fw_revision;
++	efi.runtime_version = efi_systab.hdr.revision;
+ 	efi.get_time = virt_efi_get_time;
+ 	efi.set_time = virt_efi_set_time;
+ 	efi.get_wakeup_time = virt_efi_get_wakeup_time;
+@@ -943,6 +952,9 @@ u64 efi_mem_attributes(unsigned long phys_addr)
+ 	efi_memory_desc_t *md;
+ 	void *p;
+ 
++	if (!efi_enabled(EFI_MEMMAP))
++		return 0;
++
+ 	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
+ 		md = p;
+ 		if ((md->phys_addr <= phys_addr) &&
+diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
+index ac3aa54..0fba86d 100644
+--- a/arch/x86/platform/efi/efi_64.c
++++ b/arch/x86/platform/efi/efi_64.c
+@@ -38,7 +38,7 @@
+ #include <asm/cacheflush.h>
+ #include <asm/fixmap.h>
+ 
+-static pgd_t save_pgd __initdata;
++static pgd_t *save_pgd __initdata;
+ static unsigned long efi_flags __initdata;
+ 
+ static void __init early_code_mapping_set_exec(int executable)
+@@ -61,12 +61,20 @@ static void __init early_code_mapping_set_exec(int executable)
+ void __init efi_call_phys_prelog(void)
+ {
+ 	unsigned long vaddress;
++	int pgd;
++	int n_pgds;
+ 
+ 	early_code_mapping_set_exec(1);
+ 	local_irq_save(efi_flags);
+-	vaddress = (unsigned long)__va(0x0UL);
+-	save_pgd = *pgd_offset_k(0x0UL);
+-	set_pgd(pgd_offset_k(0x0UL), *pgd_offset_k(vaddress));
++
++	n_pgds = DIV_ROUND_UP((max_pfn << PAGE_SHIFT), PGDIR_SIZE);
++	save_pgd = kmalloc(n_pgds * sizeof(pgd_t), GFP_KERNEL);
++
++	for (pgd = 0; pgd < n_pgds; pgd++) {
++		save_pgd[pgd] = *pgd_offset_k(pgd * PGDIR_SIZE);
++		vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
++		set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
++	}
+ 	__flush_tlb_all();
+ }
+ 
+@@ -75,7 +83,11 @@ void __init efi_call_phys_epilog(void)
+ 	/*
+ 	 * After the lock is released, the original page table is restored.
+ 	 */
+-	set_pgd(pgd_offset_k(0x0UL), save_pgd);
++	int pgd;
++	int n_pgds = DIV_ROUND_UP((max_pfn << PAGE_SHIFT) , PGDIR_SIZE);
++	for (pgd = 0; pgd < n_pgds; pgd++)
++		set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
++	kfree(save_pgd);
+ 	__flush_tlb_all();
+ 	local_irq_restore(efi_flags);
+ 	early_code_mapping_set_exec(0);
+diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
+index 74202c1..7d28c88 100644
+--- a/arch/x86/power/hibernate_32.c
++++ b/arch/x86/power/hibernate_32.c
+@@ -129,8 +129,6 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)
+ 		}
+ 	}
+ 
+-	resume_map_numa_kva(pgd_base);
+-
+ 	return 0;
+ }
+ 
+diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
+index 83e866d..f7a080e 100644
+--- a/arch/x86/xen/spinlock.c
++++ b/arch/x86/xen/spinlock.c
+@@ -328,7 +328,6 @@ static noinline void xen_spin_unlock_slow(struct xen_spinlock *xl)
+ 		if (per_cpu(lock_spinners, cpu) == xl) {
+ 			ADD_STATS(released_slow_kicked, 1);
+ 			xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR);
+-			break;
+ 		}
+ 	}
+ }
+diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
+index f9643fc..33ca6e4 100644
+--- a/arch/x86/xen/xen-asm_32.S
++++ b/arch/x86/xen/xen-asm_32.S
+@@ -89,11 +89,11 @@ ENTRY(xen_iret)
+ 	 */
+ #ifdef CONFIG_SMP
+ 	GET_THREAD_INFO(%eax)
+-	movl TI_cpu(%eax), %eax
+-	movl __per_cpu_offset(,%eax,4), %eax
+-	mov xen_vcpu(%eax), %eax
++	movl %ss:TI_cpu(%eax), %eax
++	movl %ss:__per_cpu_offset(,%eax,4), %eax
++	mov %ss:xen_vcpu(%eax), %eax
+ #else
+-	movl xen_vcpu, %eax
++	movl %ss:xen_vcpu, %eax
+ #endif
+ 
+ 	/* check IF state we're restoring */
+@@ -106,11 +106,11 @@ ENTRY(xen_iret)
+ 	 * resuming the code, so we don't have to be worried about
+ 	 * being preempted to another CPU.
+ 	 */
+-	setz XEN_vcpu_info_mask(%eax)
++	setz %ss:XEN_vcpu_info_mask(%eax)
+ xen_iret_start_crit:
+ 
+ 	/* check for unmasked and pending */
+-	cmpw $0x0001, XEN_vcpu_info_pending(%eax)
++	cmpw $0x0001, %ss:XEN_vcpu_info_pending(%eax)
+ 
+ 	/*
+ 	 * If there's something pending, mask events again so we can
+@@ -118,7 +118,7 @@ xen_iret_start_crit:
+ 	 * touch XEN_vcpu_info_mask.
+ 	 */
+ 	jne 1f
+-	movb $1, XEN_vcpu_info_mask(%eax)
++	movb $1, %ss:XEN_vcpu_info_mask(%eax)
+ 
+ 1:	popl %eax
+ 
+diff --git a/block/genhd.c b/block/genhd.c
+index d839723..6c9a4e8 100644
+--- a/block/genhd.c
++++ b/block/genhd.c
+@@ -25,7 +25,7 @@ static DEFINE_MUTEX(block_class_lock);
+ struct kobject *block_depr;
+ 
+ /* for extended dynamic devt allocation, currently only one major is used */
+-#define MAX_EXT_DEVT		(1 << MINORBITS)
++#define NR_EXT_DEVT		(1 << MINORBITS)
+ 
+ /* For extended devt allocation.  ext_devt_mutex prevents look up
+  * results from going away underneath its user.
+@@ -420,17 +420,18 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt)
+ 	do {
+ 		if (!idr_pre_get(&ext_devt_idr, GFP_KERNEL))
+ 			return -ENOMEM;
++		mutex_lock(&ext_devt_mutex);
+ 		rc = idr_get_new(&ext_devt_idr, part, &idx);
++		if (!rc && idx >= NR_EXT_DEVT) {
++			idr_remove(&ext_devt_idr, idx);
++			rc = -EBUSY;
++		}
++		mutex_unlock(&ext_devt_mutex);
+ 	} while (rc == -EAGAIN);
+ 
+ 	if (rc)
+ 		return rc;
+ 
+-	if (idx > MAX_EXT_DEVT) {
+-		idr_remove(&ext_devt_idr, idx);
+-		return -EBUSY;
+-	}
+-
+ 	*devt = MKDEV(BLOCK_EXT_MAJOR, blk_mangle_minor(idx));
+ 	return 0;
+ }
+@@ -644,7 +645,6 @@ void del_gendisk(struct gendisk *disk)
+ 	disk_part_iter_exit(&piter);
+ 
+ 	invalidate_partition(disk, 0);
+-	blk_free_devt(disk_to_dev(disk)->devt);
+ 	set_capacity(disk, 0);
+ 	disk->flags &= ~GENHD_FL_UP;
+ 
+@@ -662,6 +662,7 @@ void del_gendisk(struct gendisk *disk)
+ 	if (!sysfs_deprecated)
+ 		sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk)));
+ 	device_del(disk_to_dev(disk));
++	blk_free_devt(disk_to_dev(disk)->devt);
+ }
+ EXPORT_SYMBOL(del_gendisk);
+ 
+diff --git a/block/partition-generic.c b/block/partition-generic.c
+index f1d1451..1cb4dec 100644
+--- a/block/partition-generic.c
++++ b/block/partition-generic.c
+@@ -249,11 +249,11 @@ void delete_partition(struct gendisk *disk, int partno)
+ 	if (!part)
+ 		return;
+ 
+-	blk_free_devt(part_devt(part));
+ 	rcu_assign_pointer(ptbl->part[partno], NULL);
+ 	rcu_assign_pointer(ptbl->last_lookup, NULL);
+ 	kobject_put(part->holder_dir);
+ 	device_del(part_to_dev(part));
++	blk_free_devt(part_devt(part));
+ 
+ 	hd_struct_put(part);
+ }
+diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
+index 9eaf708..251435a 100644
+--- a/drivers/acpi/osl.c
++++ b/drivers/acpi/osl.c
+@@ -250,7 +250,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
+ 		return acpi_rsdp;
+ #endif
+ 
+-	if (efi_enabled) {
++	if (efi_enabled(EFI_CONFIG_TABLES)) {
+ 		if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+ 			return efi.acpi20;
+ 		else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
+index ad3730b..aac684d 100644
+--- a/drivers/acpi/processor_idle.c
++++ b/drivers/acpi/processor_idle.c
+@@ -1009,6 +1009,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
+ 		return -EINVAL;
+ 	}
+ 
++	if (!dev)
++		return -EINVAL;
++
+ 	dev->cpu = pr->id;
+ 
+ 	if (max_cstate == 0)
+@@ -1196,6 +1199,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
+ 		}
+ 
+ 		/* Populate Updated C-state information */
++		acpi_processor_get_power_info(pr);
+ 		acpi_processor_setup_cpuidle_states(pr);
+ 
+ 		/* Enable all cpuidle devices */
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index d1ecca2..f1fcaca 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -807,8 +807,8 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
+ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
+ {
+ 	struct acpi_device_id button_device_ids[] = {
+-		{"PNP0C0D", 0},
+ 		{"PNP0C0C", 0},
++		{"PNP0C0D", 0},
+ 		{"PNP0C0E", 0},
+ 		{"", 0},
+ 	};
+@@ -820,6 +820,11 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
+ 	/* Power button, Lid switch always enable wakeup */
+ 	if (!acpi_match_device_ids(device, button_device_ids)) {
+ 		device->wakeup.flags.run_wake = 1;
++		if (!acpi_match_device_ids(device, &button_device_ids[1])) {
++			/* Do not use Lid/sleep button for S5 wakeup */
++			if (device->wakeup.sleep_state == ACPI_STATE_S5)
++				device->wakeup.sleep_state = ACPI_STATE_S4;
++		}
+ 		device_set_wakeup_capable(&device->dev, true);
+ 		return;
+ 	}
+@@ -1175,7 +1180,7 @@ static void acpi_device_set_id(struct acpi_device *device)
+ 			acpi_add_id(device, ACPI_DOCK_HID);
+ 		else if (!acpi_ibm_smbus_match(device))
+ 			acpi_add_id(device, ACPI_SMBUS_IBM_HID);
+-		else if (!acpi_device_hid(device) &&
++		else if (list_empty(&device->pnp.ids) &&
+ 			 ACPI_IS_ROOT_DEVICE(device->parent)) {
+ 			acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
+ 			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
+diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
+index 847ed55..b38787b 100644
+--- a/drivers/acpi/sleep.c
++++ b/drivers/acpi/sleep.c
+@@ -109,6 +109,188 @@ void __init acpi_old_suspend_ordering(void)
+ 	old_suspend_ordering = true;
+ }
+ 
++static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
++{
++	acpi_old_suspend_ordering();
++	return 0;
++}
++
++static int __init init_nvs_nosave(const struct dmi_system_id *d)
++{
++	acpi_nvs_nosave();
++	return 0;
++}
++
++static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
++	{
++	.callback = init_old_suspend_ordering,
++	.ident = "Abit KN9 (nForce4 variant)",
++	.matches = {
++		DMI_MATCH(DMI_BOARD_VENDOR, "http://www.abit.com.tw/"),
++		DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"),
++		},
++	},
++	{
++	.callback = init_old_suspend_ordering,
++	.ident = "HP xw4600 Workstation",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"),
++		},
++	},
++	{
++	.callback = init_old_suspend_ordering,
++	.ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
++	.matches = {
++		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
++		DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
++		},
++	},
++	{
++	.callback = init_old_suspend_ordering,
++	.ident = "Panasonic CF51-2L",
++	.matches = {
++		DMI_MATCH(DMI_BOARD_VENDOR,
++				"Matsushita Electric Industrial Co.,Ltd."),
++		DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VGN-FW41E_H",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW41E_H"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VGN-FW21E",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VPCEB17FX",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VGN-SR11M",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Everex StepNote Series",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Everex Systems, Inc."),
++		DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VPCEB1Z1E",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VGN-NW130D",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VPCCW29FX",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Averatec AV1020-ED2",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
++		},
++	},
++	{
++	.callback = init_old_suspend_ordering,
++	.ident = "Asus A8N-SLI DELUXE",
++	.matches = {
++		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
++		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI DELUXE"),
++		},
++	},
++	{
++	.callback = init_old_suspend_ordering,
++	.ident = "Asus A8N-SLI Premium",
++	.matches = {
++		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
++		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI Premium"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VGN-SR26GN_P",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR26GN_P"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VPCEB1S1E",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Sony Vaio VGN-FW520F",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Asus K54C",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
++		DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
++		},
++	},
++	{
++	.callback = init_nvs_nosave,
++	.ident = "Asus K54HR",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
++		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
++		},
++	},
++	{},
++};
++
++static void acpi_sleep_dmi_check(void)
++{
++	dmi_check_system(acpisleep_dmi_table);
++}
++
+ /**
+  * acpi_pm_freeze - Disable the GPEs and suspend EC transactions.
+  */
+@@ -224,6 +406,7 @@ static void acpi_pm_end(void)
+ }
+ #else /* !CONFIG_ACPI_SLEEP */
+ #define acpi_target_sleep_state	ACPI_STATE_S0
++static inline void acpi_sleep_dmi_check(void) {}
+ #endif /* CONFIG_ACPI_SLEEP */
+ 
+ #ifdef CONFIG_SUSPEND
+@@ -382,175 +565,6 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = {
+ 	.end = acpi_pm_end,
+ 	.recover = acpi_pm_finish,
+ };
+-
+-static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
+-{
+-	old_suspend_ordering = true;
+-	return 0;
+-}
+-
+-static int __init init_nvs_nosave(const struct dmi_system_id *d)
+-{
+-	acpi_nvs_nosave();
+-	return 0;
+-}
+-
+-static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
+-	{
+-	.callback = init_old_suspend_ordering,
+-	.ident = "Abit KN9 (nForce4 variant)",
+-	.matches = {
+-		DMI_MATCH(DMI_BOARD_VENDOR, "http://www.abit.com.tw/"),
+-		DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"),
+-		},
+-	},
+-	{
+-	.callback = init_old_suspend_ordering,
+-	.ident = "HP xw4600 Workstation",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"),
+-		},
+-	},
+-	{
+-	.callback = init_old_suspend_ordering,
+-	.ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
+-	.matches = {
+-		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
+-		DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
+-		},
+-	},
+-	{
+-	.callback = init_old_suspend_ordering,
+-	.ident = "Panasonic CF51-2L",
+-	.matches = {
+-		DMI_MATCH(DMI_BOARD_VENDOR,
+-				"Matsushita Electric Industrial Co.,Ltd."),
+-		DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VGN-FW21E",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VPCEB17FX",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VGN-SR11M",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Everex StepNote Series",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Everex Systems, Inc."),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VPCEB1Z1E",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VGN-NW130D",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VPCCW29FX",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Averatec AV1020-ED2",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
+-		},
+-	},
+-	{
+-	.callback = init_old_suspend_ordering,
+-	.ident = "Asus A8N-SLI DELUXE",
+-	.matches = {
+-		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+-		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI DELUXE"),
+-		},
+-	},
+-	{
+-	.callback = init_old_suspend_ordering,
+-	.ident = "Asus A8N-SLI Premium",
+-	.matches = {
+-		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+-		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI Premium"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VGN-SR26GN_P",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR26GN_P"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VPCEB1S1E",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Sony Vaio VGN-FW520F",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Asus K54C",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
+-		},
+-	},
+-	{
+-	.callback = init_nvs_nosave,
+-	.ident = "Asus K54HR",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+-		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
+-		},
+-	},
+-	{},
+-};
+ #endif /* CONFIG_SUSPEND */
+ 
+ #ifdef CONFIG_HIBERNATION
+@@ -881,13 +895,13 @@ int __init acpi_sleep_init(void)
+ 	u8 type_a, type_b;
+ #ifdef CONFIG_SUSPEND
+ 	int i = 0;
+-
+-	dmi_check_system(acpisleep_dmi_table);
+ #endif
+ 
+ 	if (acpi_disabled)
+ 		return 0;
+ 
++	acpi_sleep_dmi_check();
++
+ 	sleep_states[ACPI_STATE_S0] = 1;
+ 	printk(KERN_INFO PREFIX "(supports S0");
+ 
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index 7862d17..4979127 100644
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -53,6 +53,7 @@
+ 
+ enum {
+ 	AHCI_PCI_BAR_STA2X11	= 0,
++	AHCI_PCI_BAR_ENMOTUS	= 2,
+ 	AHCI_PCI_BAR_STANDARD	= 5,
+ };
+ 
+@@ -410,6 +411,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
+ 	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci },	/* ASM1061 */
+ 	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1062 */
+ 
++	/* Enmotus */
++	{ PCI_DEVICE(0x1c44, 0x8000), board_ahci },
++
+ 	/* Generic, PCI class code for AHCI */
+ 	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+ 	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
+@@ -1098,9 +1102,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 		dev_info(&pdev->dev,
+ 			 "PDC42819 can only drive SATA devices with this driver\n");
+ 
+-	/* The Connext uses non-standard BAR */
++	/* Both Connext and Enmotus devices use non-standard BARs */
+ 	if (pdev->vendor == PCI_VENDOR_ID_STMICRO && pdev->device == 0xCC06)
+ 		ahci_pci_bar = AHCI_PCI_BAR_STA2X11;
++	else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
++		ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
+ 
+ 	/* acquire resources */
+ 	rc = pcim_enable_device(pdev);
+diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
+index ef773e1..4cb6096 100644
+--- a/drivers/ata/ata_piix.c
++++ b/drivers/ata/ata_piix.c
+@@ -339,6 +339,23 @@ static const struct pci_device_id piix_pci_tbl[] = {
+ 	{ 0x8086, 0x9c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ 	/* SATA Controller IDE (DH89xxCC) */
+ 	{ 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
++	/* SATA Controller IDE (Avoton) */
++	{ 0x8086, 0x1f20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
++	/* SATA Controller IDE (Avoton) */
++	{ 0x8086, 0x1f21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
++	/* SATA Controller IDE (Avoton) */
++	{ 0x8086, 0x1f30, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
++	/* SATA Controller IDE (Avoton) */
++	{ 0x8086, 0x1f31, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
++	/* SATA Controller IDE (Wellsburg) */
++	{ 0x8086, 0x8d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
++	/* SATA Controller IDE (Wellsburg) */
++	{ 0x8086, 0x8d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
++	/* SATA Controller IDE (Wellsburg) */
++	{ 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
++	/* SATA Controller IDE (Wellsburg) */
++	{ 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
++
+ 	{ }	/* terminate list */
+ };
+ 
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
+index 8e1039c..8789aef 100644
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -2541,6 +2541,7 @@ int ata_bus_probe(struct ata_port *ap)
+ 		 * bus as we may be talking too fast.
+ 		 */
+ 		dev->pio_mode = XFER_PIO_0;
++		dev->dma_mode = 0xff;
+ 
+ 		/* If the controller has a pio mode setup function
+ 		 * then use it to set the chipset to rights. Don't
+diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
+index 7d4535e..105e31f 100644
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -2653,6 +2653,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
+ 		 * bus as we may be talking too fast.
+ 		 */
+ 		dev->pio_mode = XFER_PIO_0;
++		dev->dma_mode = 0xff;
+ 
+ 		/* If the controller has a pio mode setup function
+ 		 * then use it to set the chipset to rights. Don't
+diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
+index 8ec81ca..9f8b751 100644
+--- a/drivers/ata/libata-scsi.c
++++ b/drivers/ata/libata-scsi.c
+@@ -309,7 +309,8 @@ ata_scsi_activity_show(struct device *dev, struct device_attribute *attr,
+ 	struct ata_port *ap = ata_shost_to_port(sdev->host);
+ 	struct ata_device *atadev = ata_scsi_find_dev(ap, sdev);
+ 
+-	if (ap->ops->sw_activity_show && (ap->flags & ATA_FLAG_SW_ACTIVITY))
++	if (atadev && ap->ops->sw_activity_show &&
++	    (ap->flags & ATA_FLAG_SW_ACTIVITY))
+ 		return ap->ops->sw_activity_show(atadev, buf);
+ 	return -EINVAL;
+ }
+@@ -324,7 +325,8 @@ ata_scsi_activity_store(struct device *dev, struct device_attribute *attr,
+ 	enum sw_activity val;
+ 	int rc;
+ 
+-	if (ap->ops->sw_activity_store && (ap->flags & ATA_FLAG_SW_ACTIVITY)) {
++	if (atadev && ap->ops->sw_activity_store &&
++	    (ap->flags & ATA_FLAG_SW_ACTIVITY)) {
+ 		val = simple_strtoul(buf, NULL, 0);
+ 		switch (val) {
+ 		case OFF: case BLINK_ON: case BLINK_OFF:
+diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
+index 489c817..fb0dd87 100644
+--- a/drivers/ata/sata_promise.c
++++ b/drivers/ata/sata_promise.c
+@@ -147,6 +147,10 @@ struct pdc_port_priv {
+ 	dma_addr_t		pkt_dma;
+ };
+ 
++struct pdc_host_priv {
++	spinlock_t hard_reset_lock;
++};
++
+ static int pdc_sata_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
+ static int pdc_sata_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
+ static int pdc_ata_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
+@@ -801,9 +805,10 @@ static void pdc_hard_reset_port(struct ata_port *ap)
+ 	void __iomem *host_mmio = ap->host->iomap[PDC_MMIO_BAR];
+ 	void __iomem *pcictl_b1_mmio = host_mmio + PDC_PCI_CTL + 1;
+ 	unsigned int ata_no = pdc_ata_port_to_ata_no(ap);
++	struct pdc_host_priv *hpriv = ap->host->private_data;
+ 	u8 tmp;
+ 
+-	spin_lock(&ap->host->lock);
++	spin_lock(&hpriv->hard_reset_lock);
+ 
+ 	tmp = readb(pcictl_b1_mmio);
+ 	tmp &= ~(0x10 << ata_no);
+@@ -814,7 +819,7 @@ static void pdc_hard_reset_port(struct ata_port *ap)
+ 	writeb(tmp, pcictl_b1_mmio);
+ 	readb(pcictl_b1_mmio); /* flush */
+ 
+-	spin_unlock(&ap->host->lock);
++	spin_unlock(&hpriv->hard_reset_lock);
+ }
+ 
+ static int pdc_sata_hardreset(struct ata_link *link, unsigned int *class,
+@@ -1182,6 +1187,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
+ 	const struct ata_port_info *pi = &pdc_port_info[ent->driver_data];
+ 	const struct ata_port_info *ppi[PDC_MAX_PORTS];
+ 	struct ata_host *host;
++	struct pdc_host_priv *hpriv;
+ 	void __iomem *host_mmio;
+ 	int n_ports, i, rc;
+ 	int is_sataii_tx4;
+@@ -1218,6 +1224,11 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
+ 		dev_err(&pdev->dev, "failed to allocate host\n");
+ 		return -ENOMEM;
+ 	}
++	hpriv = devm_kzalloc(&pdev->dev, sizeof *hpriv, GFP_KERNEL);
++	if (!hpriv)
++		return -ENOMEM;
++	spin_lock_init(&hpriv->hard_reset_lock);
++	host->private_data = hpriv;
+ 	host->iomap = pcim_iomap_table(pdev);
+ 
+ 	is_sataii_tx4 = pdc_is_sataii_tx4(pi->flags);
+diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h
+index 6a0955e..53ecac5 100644
+--- a/drivers/atm/iphase.h
++++ b/drivers/atm/iphase.h
+@@ -636,82 +636,82 @@ struct rx_buf_desc {
+ #define SEG_BASE IPHASE5575_FRAG_CONTROL_REG_BASE  
+ #define REASS_BASE IPHASE5575_REASS_CONTROL_REG_BASE  
+ 
+-typedef volatile u_int  freg_t;
++typedef volatile u_int	ffreg_t;
+ typedef u_int   rreg_t;
+ 
+ typedef struct _ffredn_t {
+-        freg_t  idlehead_high;  /* Idle cell header (high)              */
+-        freg_t  idlehead_low;   /* Idle cell header (low)               */
+-        freg_t  maxrate;        /* Maximum rate                         */
+-        freg_t  stparms;        /* Traffic Management Parameters        */
+-        freg_t  abrubr_abr;     /* ABRUBR Priority Byte 1, TCR Byte 0   */
+-        freg_t  rm_type;        /*                                      */
+-        u_int   filler5[0x17 - 0x06];
+-        freg_t  cmd_reg;        /* Command register                     */
+-        u_int   filler18[0x20 - 0x18];
+-        freg_t  cbr_base;       /* CBR Pointer Base                     */
+-        freg_t  vbr_base;       /* VBR Pointer Base                     */
+-        freg_t  abr_base;       /* ABR Pointer Base                     */
+-        freg_t  ubr_base;       /* UBR Pointer Base                     */
+-        u_int   filler24;
+-        freg_t  vbrwq_base;     /* VBR Wait Queue Base                  */
+-        freg_t  abrwq_base;     /* ABR Wait Queue Base                  */
+-        freg_t  ubrwq_base;     /* UBR Wait Queue Base                  */
+-        freg_t  vct_base;       /* Main VC Table Base                   */
+-        freg_t  vcte_base;      /* Extended Main VC Table Base          */
+-        u_int   filler2a[0x2C - 0x2A];
+-        freg_t  cbr_tab_beg;    /* CBR Table Begin                      */
+-        freg_t  cbr_tab_end;    /* CBR Table End                        */
+-        freg_t  cbr_pointer;    /* CBR Pointer                          */
+-        u_int   filler2f[0x30 - 0x2F];
+-        freg_t  prq_st_adr;     /* Packet Ready Queue Start Address     */
+-        freg_t  prq_ed_adr;     /* Packet Ready Queue End Address       */
+-        freg_t  prq_rd_ptr;     /* Packet Ready Queue read pointer      */
+-        freg_t  prq_wr_ptr;     /* Packet Ready Queue write pointer     */
+-        freg_t  tcq_st_adr;     /* Transmit Complete Queue Start Address*/
+-        freg_t  tcq_ed_adr;     /* Transmit Complete Queue End Address  */
+-        freg_t  tcq_rd_ptr;     /* Transmit Complete Queue read pointer */
+-        freg_t  tcq_wr_ptr;     /* Transmit Complete Queue write pointer*/
+-        u_int   filler38[0x40 - 0x38];
+-        freg_t  queue_base;     /* Base address for PRQ and TCQ         */
+-        freg_t  desc_base;      /* Base address of descriptor table     */
+-        u_int   filler42[0x45 - 0x42];
+-        freg_t  mode_reg_0;     /* Mode register 0                      */
+-        freg_t  mode_reg_1;     /* Mode register 1                      */
+-        freg_t  intr_status_reg;/* Interrupt Status register            */
+-        freg_t  mask_reg;       /* Mask Register                        */
+-        freg_t  cell_ctr_high1; /* Total cell transfer count (high)     */
+-        freg_t  cell_ctr_lo1;   /* Total cell transfer count (low)      */
+-        freg_t  state_reg;      /* Status register                      */
+-        u_int   filler4c[0x58 - 0x4c];
+-        freg_t  curr_desc_num;  /* Contains the current descriptor num  */
+-        freg_t  next_desc;      /* Next descriptor                      */
+-        freg_t  next_vc;        /* Next VC                              */
+-        u_int   filler5b[0x5d - 0x5b];
+-        freg_t  present_slot_cnt;/* Present slot count                  */
+-        u_int   filler5e[0x6a - 0x5e];
+-        freg_t  new_desc_num;   /* New descriptor number                */
+-        freg_t  new_vc;         /* New VC                               */
+-        freg_t  sched_tbl_ptr;  /* Schedule table pointer               */
+-        freg_t  vbrwq_wptr;     /* VBR wait queue write pointer         */
+-        freg_t  vbrwq_rptr;     /* VBR wait queue read pointer          */
+-        freg_t  abrwq_wptr;     /* ABR wait queue write pointer         */
+-        freg_t  abrwq_rptr;     /* ABR wait queue read pointer          */
+-        freg_t  ubrwq_wptr;     /* UBR wait queue write pointer         */
+-        freg_t  ubrwq_rptr;     /* UBR wait queue read pointer          */
+-        freg_t  cbr_vc;         /* CBR VC                               */
+-        freg_t  vbr_sb_vc;      /* VBR SB VC                            */
+-        freg_t  abr_sb_vc;      /* ABR SB VC                            */
+-        freg_t  ubr_sb_vc;      /* UBR SB VC                            */
+-        freg_t  vbr_next_link;  /* VBR next link                        */
+-        freg_t  abr_next_link;  /* ABR next link                        */
+-        freg_t  ubr_next_link;  /* UBR next link                        */
+-        u_int   filler7a[0x7c-0x7a];
+-        freg_t  out_rate_head;  /* Out of rate head                     */
+-        u_int   filler7d[0xca-0x7d]; /* pad out to full address space   */
+-        freg_t  cell_ctr_high1_nc;/* Total cell transfer count (high)   */
+-        freg_t  cell_ctr_lo1_nc;/* Total cell transfer count (low)      */
+-        u_int   fillercc[0x100-0xcc]; /* pad out to full address space   */
++	ffreg_t	idlehead_high;	/* Idle cell header (high)		*/
++	ffreg_t	idlehead_low;	/* Idle cell header (low)		*/
++	ffreg_t	maxrate;	/* Maximum rate				*/
++	ffreg_t	stparms;	/* Traffic Management Parameters	*/
++	ffreg_t	abrubr_abr;	/* ABRUBR Priority Byte 1, TCR Byte 0	*/
++	ffreg_t	rm_type;	/*					*/
++	u_int	filler5[0x17 - 0x06];
++	ffreg_t	cmd_reg;	/* Command register			*/
++	u_int	filler18[0x20 - 0x18];
++	ffreg_t	cbr_base;	/* CBR Pointer Base			*/
++	ffreg_t	vbr_base;	/* VBR Pointer Base			*/
++	ffreg_t	abr_base;	/* ABR Pointer Base			*/
++	ffreg_t	ubr_base;	/* UBR Pointer Base			*/
++	u_int	filler24;
++	ffreg_t	vbrwq_base;	/* VBR Wait Queue Base			*/
++	ffreg_t	abrwq_base;	/* ABR Wait Queue Base			*/
++	ffreg_t	ubrwq_base;	/* UBR Wait Queue Base			*/
++	ffreg_t	vct_base;	/* Main VC Table Base			*/
++	ffreg_t	vcte_base;	/* Extended Main VC Table Base		*/
++	u_int	filler2a[0x2C - 0x2A];
++	ffreg_t	cbr_tab_beg;	/* CBR Table Begin			*/
++	ffreg_t	cbr_tab_end;	/* CBR Table End			*/
++	ffreg_t	cbr_pointer;	/* CBR Pointer				*/
++	u_int	filler2f[0x30 - 0x2F];
++	ffreg_t	prq_st_adr;	/* Packet Ready Queue Start Address	*/
++	ffreg_t	prq_ed_adr;	/* Packet Ready Queue End Address	*/
++	ffreg_t	prq_rd_ptr;	/* Packet Ready Queue read pointer	*/
++	ffreg_t	prq_wr_ptr;	/* Packet Ready Queue write pointer	*/
++	ffreg_t	tcq_st_adr;	/* Transmit Complete Queue Start Address*/
++	ffreg_t	tcq_ed_adr;	/* Transmit Complete Queue End Address	*/
++	ffreg_t	tcq_rd_ptr;	/* Transmit Complete Queue read pointer */
++	ffreg_t	tcq_wr_ptr;	/* Transmit Complete Queue write pointer*/
++	u_int	filler38[0x40 - 0x38];
++	ffreg_t	queue_base;	/* Base address for PRQ and TCQ		*/
++	ffreg_t	desc_base;	/* Base address of descriptor table	*/
++	u_int	filler42[0x45 - 0x42];
++	ffreg_t	mode_reg_0;	/* Mode register 0			*/
++	ffreg_t	mode_reg_1;	/* Mode register 1			*/
++	ffreg_t	intr_status_reg;/* Interrupt Status register		*/
++	ffreg_t	mask_reg;	/* Mask Register			*/
++	ffreg_t	cell_ctr_high1; /* Total cell transfer count (high)	*/
++	ffreg_t	cell_ctr_lo1;	/* Total cell transfer count (low)	*/
++	ffreg_t	state_reg;	/* Status register			*/
++	u_int	filler4c[0x58 - 0x4c];
++	ffreg_t	curr_desc_num;	/* Contains the current descriptor num	*/
++	ffreg_t	next_desc;	/* Next descriptor			*/
++	ffreg_t	next_vc;	/* Next VC				*/
++	u_int	filler5b[0x5d - 0x5b];
++	ffreg_t	present_slot_cnt;/* Present slot count			*/
++	u_int	filler5e[0x6a - 0x5e];
++	ffreg_t	new_desc_num;	/* New descriptor number		*/
++	ffreg_t	new_vc;		/* New VC				*/
++	ffreg_t	sched_tbl_ptr;	/* Schedule table pointer		*/
++	ffreg_t	vbrwq_wptr;	/* VBR wait queue write pointer		*/
++	ffreg_t	vbrwq_rptr;	/* VBR wait queue read pointer		*/
++	ffreg_t	abrwq_wptr;	/* ABR wait queue write pointer		*/
++	ffreg_t	abrwq_rptr;	/* ABR wait queue read pointer		*/
++	ffreg_t	ubrwq_wptr;	/* UBR wait queue write pointer		*/
++	ffreg_t	ubrwq_rptr;	/* UBR wait queue read pointer		*/
++	ffreg_t	cbr_vc;		/* CBR VC				*/
++	ffreg_t	vbr_sb_vc;	/* VBR SB VC				*/
++	ffreg_t	abr_sb_vc;	/* ABR SB VC				*/
++	ffreg_t	ubr_sb_vc;	/* UBR SB VC				*/
++	ffreg_t	vbr_next_link;	/* VBR next link			*/
++	ffreg_t	abr_next_link;	/* ABR next link			*/
++	ffreg_t	ubr_next_link;	/* UBR next link			*/
++	u_int	filler7a[0x7c-0x7a];
++	ffreg_t	out_rate_head;	/* Out of rate head			*/
++	u_int	filler7d[0xca-0x7d]; /* pad out to full address space	*/
++	ffreg_t	cell_ctr_high1_nc;/* Total cell transfer count (high)	*/
++	ffreg_t	cell_ctr_lo1_nc;/* Total cell transfer count (low)	*/
++	u_int	fillercc[0x100-0xcc]; /* pad out to full address space	 */
+ } ffredn_t;
+ 
+ typedef struct _rfredn_t {
+diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
+index 9851093..1853a45 100644
+--- a/drivers/atm/solos-pci.c
++++ b/drivers/atm/solos-pci.c
+@@ -967,10 +967,11 @@ static uint32_t fpga_tx(struct solos_card *card)
+ 	for (port = 0; tx_pending; tx_pending >>= 1, port++) {
+ 		if (tx_pending & 1) {
+ 			struct sk_buff *oldskb = card->tx_skb[port];
+-			if (oldskb)
++			if (oldskb) {
+ 				pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr,
+ 						 oldskb->len, PCI_DMA_TODEVICE);
+-
++				card->tx_skb[port] = NULL;
++			}
+ 			spin_lock(&card->tx_queue_lock);
+ 			skb = skb_dequeue(&card->tx_queue[port]);
+ 			if (!skb)
+diff --git a/drivers/base/bus.c b/drivers/base/bus.c
+index 181ed26..513a02d 100644
+--- a/drivers/base/bus.c
++++ b/drivers/base/bus.c
+@@ -293,7 +293,7 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start,
+ 	struct device *dev;
+ 	int error = 0;
+ 
+-	if (!bus)
++	if (!bus || !bus->p)
+ 		return -EINVAL;
+ 
+ 	klist_iter_init_node(&bus->p->klist_devices, &i,
+@@ -327,7 +327,7 @@ struct device *bus_find_device(struct bus_type *bus,
+ 	struct klist_iter i;
+ 	struct device *dev;
+ 
+-	if (!bus)
++	if (!bus || !bus->p)
+ 		return NULL;
+ 
+ 	klist_iter_init_node(&bus->p->klist_devices, &i,
+diff --git a/drivers/base/dd.c b/drivers/base/dd.c
+index e3bbed8..61d3e1b 100644
+--- a/drivers/base/dd.c
++++ b/drivers/base/dd.c
+@@ -172,6 +172,8 @@ static int deferred_probe_initcall(void)
+ 
+ 	driver_deferred_probe_enable = true;
+ 	driver_deferred_probe_trigger();
++	/* Sort as many dependencies as possible before exiting initcalls */
++	flush_workqueue(deferred_wq);
+ 	return 0;
+ }
+ late_initcall(deferred_probe_initcall);
+diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
+index bb1ff17..c394041 100644
+--- a/drivers/base/regmap/regmap-debugfs.c
++++ b/drivers/base/regmap/regmap-debugfs.c
+@@ -90,7 +90,7 @@ static ssize_t regmap_map_read_file(struct file *file, char __user *user_buf,
+ 		/* If we're in the region the user is trying to read */
+ 		if (p >= *ppos) {
+ 			/* ...but not beyond it */
+-			if (buf_pos >= count - 1 - tot_len)
++			if (buf_pos + 1 + tot_len >= count)
+ 				break;
+ 
+ 			/* Format the register */
+diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
+index cc65b45..b4e83b8 100644
+--- a/drivers/bcma/driver_mips.c
++++ b/drivers/bcma/driver_mips.c
+@@ -115,7 +115,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
+ 			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
+ 			    ~(1 << irqflag));
+ 	else
+-		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0);
++		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);
+ 
+ 	/* assign the new one */
+ 	if (irq == 0) {
+diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
+index db195ab..e49ddd0 100644
+--- a/drivers/block/aoe/aoe.h
++++ b/drivers/block/aoe/aoe.h
+@@ -1,5 +1,5 @@
+ /* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+-#define VERSION "47"
++#define VERSION "47q"
+ #define AOE_MAJOR 152
+ #define DEVICE_NAME "aoe"
+ 
+diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
+index 321de7b..7eca463 100644
+--- a/drivers/block/aoe/aoeblk.c
++++ b/drivers/block/aoe/aoeblk.c
+@@ -276,8 +276,6 @@ aoeblk_gdalloc(void *vp)
+ 		goto err_mempool;
+ 	blk_queue_make_request(d->blkq, aoeblk_make_request);
+ 	d->blkq->backing_dev_info.name = "aoe";
+-	if (bdi_init(&d->blkq->backing_dev_info))
+-		goto err_blkq;
+ 	spin_lock_irqsave(&d->lock, flags);
+ 	gd->major = AOE_MAJOR;
+ 	gd->first_minor = d->sysminor * AOE_PARTITIONS;
+@@ -298,9 +296,6 @@ aoeblk_gdalloc(void *vp)
+ 	aoedisk_add_sysfs(d);
+ 	return;
+ 
+-err_blkq:
+-	blk_cleanup_queue(d->blkq);
+-	d->blkq = NULL;
+ err_mempool:
+ 	mempool_destroy(d->bufpool);
+ err_disk:
+diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
+index 54a55f0..7aac910 100644
+--- a/drivers/block/rbd.c
++++ b/drivers/block/rbd.c
+@@ -69,7 +69,7 @@
+ #define DEV_NAME_LEN		32
+ #define MAX_INT_FORMAT_WIDTH	((5 * sizeof (int)) / 2 + 1)
+ 
+-#define RBD_NOTIFY_TIMEOUT_DEFAULT 10
++#define RBD_READ_ONLY_DEFAULT		false
+ 
+ /*
+  * block device image metadata (in-memory version)
+@@ -91,7 +91,7 @@ struct rbd_image_header {
+ };
+ 
+ struct rbd_options {
+-	int	notify_timeout;
++	bool	read_only;
+ };
+ 
+ /*
+@@ -177,7 +177,7 @@ struct rbd_device {
+ 	u64                     snap_id;	/* current snapshot id */
+ 	/* whether the snap_id this device reads from still exists */
+ 	bool                    snap_exists;
+-	int                     read_only;
++	bool			read_only;
+ 
+ 	struct list_head	node;
+ 
+@@ -186,6 +186,7 @@ struct rbd_device {
+ 
+ 	/* sysfs related */
+ 	struct device		dev;
++	unsigned long		open_count;
+ };
+ 
+ static DEFINE_MUTEX(ctl_mutex);	  /* Serialize open/close/setup/teardown */
+@@ -249,8 +250,11 @@ static int rbd_open(struct block_device *bdev, fmode_t mode)
+ 	if ((mode & FMODE_WRITE) && rbd_dev->read_only)
+ 		return -EROFS;
+ 
++	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
+ 	rbd_get_dev(rbd_dev);
+ 	set_device_ro(bdev, rbd_dev->read_only);
++	rbd_dev->open_count++;
++	mutex_unlock(&ctl_mutex);
+ 
+ 	return 0;
+ }
+@@ -259,7 +263,11 @@ static int rbd_release(struct gendisk *disk, fmode_t mode)
+ {
+ 	struct rbd_device *rbd_dev = disk->private_data;
+ 
++	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
++	BUG_ON(!rbd_dev->open_count);
++	rbd_dev->open_count--;
+ 	rbd_put_dev(rbd_dev);
++	mutex_unlock(&ctl_mutex);
+ 
+ 	return 0;
+ }
+@@ -341,17 +349,24 @@ static struct rbd_client *__rbd_client_find(struct ceph_options *ceph_opts)
+  * mount options
+  */
+ enum {
+-	Opt_notify_timeout,
+ 	Opt_last_int,
+ 	/* int args above */
+ 	Opt_last_string,
+ 	/* string args above */
++	Opt_read_only,
++	Opt_read_write,
++	/* Boolean args above */
++	Opt_last_bool,
+ };
+ 
+ static match_table_t rbd_opts_tokens = {
+-	{Opt_notify_timeout, "notify_timeout=%d"},
+ 	/* int args above */
+ 	/* string args above */
++	{Opt_read_only, "read_only"},
++	{Opt_read_only, "ro"},		/* Alternate spelling */
++	{Opt_read_write, "read_write"},
++	{Opt_read_write, "rw"},		/* Alternate spelling */
++	/* Boolean args above */
+ 	{-1, NULL}
+ };
+ 
+@@ -376,13 +391,18 @@ static int parse_rbd_opts_token(char *c, void *private)
+ 	} else if (token > Opt_last_int && token < Opt_last_string) {
+ 		dout("got string token %d val %s\n", token,
+ 		     argstr[0].from);
++	} else if (token > Opt_last_string && token < Opt_last_bool) {
++		dout("got Boolean token %d\n", token);
+ 	} else {
+ 		dout("got token %d\n", token);
+ 	}
+ 
+ 	switch (token) {
+-	case Opt_notify_timeout:
+-		rbd_opts->notify_timeout = intval;
++	case Opt_read_only:
++		rbd_opts->read_only = true;
++		break;
++	case Opt_read_write:
++		rbd_opts->read_only = false;
+ 		break;
+ 	default:
+ 		BUG_ON(token);
+@@ -406,7 +426,7 @@ static struct rbd_client *rbd_get_client(const char *mon_addr,
+ 	if (!rbd_opts)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT;
++	rbd_opts->read_only = RBD_READ_ONLY_DEFAULT;
+ 
+ 	ceph_opts = ceph_parse_options(options, mon_addr,
+ 					mon_addr + mon_addr_len,
+@@ -606,7 +626,7 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, u64 *size)
+ 		    sizeof (RBD_SNAP_HEAD_NAME))) {
+ 		rbd_dev->snap_id = CEPH_NOSNAP;
+ 		rbd_dev->snap_exists = false;
+-		rbd_dev->read_only = 0;
++		rbd_dev->read_only = rbd_dev->rbd_opts.read_only;
+ 		if (size)
+ 			*size = rbd_dev->header.image_size;
+ 	} else {
+@@ -618,7 +638,7 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, u64 *size)
+ 			goto done;
+ 		rbd_dev->snap_id = snap_id;
+ 		rbd_dev->snap_exists = true;
+-		rbd_dev->read_only = 1;
++		rbd_dev->read_only = true;	/* No choice for snapshots */
+ 	}
+ 
+ 	ret = 0;
+@@ -938,8 +958,9 @@ static int rbd_do_request(struct request *rq,
+ 	layout->fl_stripe_count = cpu_to_le32(1);
+ 	layout->fl_object_size = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);
+ 	layout->fl_pg_pool = cpu_to_le32(rbd_dev->pool_id);
+-	ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,
+-				req, ops);
++	ret = ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,
++				   req, ops);
++	rbd_assert(ret == 0);
+ 
+ 	ceph_osdc_build_request(req, ofs, &len,
+ 				ops,
+@@ -2260,8 +2281,8 @@ static void rbd_id_put(struct rbd_device *rbd_dev)
+ 		struct rbd_device *rbd_dev;
+ 
+ 		rbd_dev = list_entry(tmp, struct rbd_device, node);
+-		if (rbd_id > max_id)
+-			max_id = rbd_id;
++		if (rbd_dev->id > max_id)
++			max_id = rbd_dev->id;
+ 	}
+ 	spin_unlock(&rbd_dev_list_lock);
+ 
+@@ -2623,6 +2644,11 @@ static ssize_t rbd_remove(struct bus_type *bus,
+ 		goto done;
+ 	}
+ 
++	if (rbd_dev->open_count) {
++		ret = -EBUSY;
++		goto done;
++	}
++
+ 	__rbd_remove_all_snaps(rbd_dev);
+ 	rbd_bus_del_dev(rbd_dev);
+ 
+diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
+index 9dcf76a..31dd451 100644
+--- a/drivers/block/sunvdc.c
++++ b/drivers/block/sunvdc.c
+@@ -461,7 +461,7 @@ static int generic_request(struct vdc_port *port, u8 op, void *buf, int len)
+ 	int op_len, err;
+ 	void *req_buf;
+ 
+-	if (!(((u64)1 << ((u64)op - 1)) & port->operations))
++	if (!(((u64)1 << (u64)op) & port->operations))
+ 		return -EOPNOTSUPP;
+ 
+ 	switch (op) {
+diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
+index c6decb9..73d8c92 100644
+--- a/drivers/block/xen-blkback/blkback.c
++++ b/drivers/block/xen-blkback/blkback.c
+@@ -623,7 +623,6 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
+ 		goto fail_response;
+ 	}
+ 
+-	preq.dev           = req->u.rw.handle;
+ 	preq.sector_number = req->u.rw.sector_number;
+ 	preq.nr_sects      = 0;
+ 
+diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
+index 4f66171..a155254 100644
+--- a/drivers/block/xen-blkback/xenbus.c
++++ b/drivers/block/xen-blkback/xenbus.c
+@@ -367,6 +367,7 @@ static int xen_blkbk_remove(struct xenbus_device *dev)
+ 		be->blkif = NULL;
+ 	}
+ 
++	kfree(be->mode);
+ 	kfree(be);
+ 	dev_set_drvdata(&dev->dev, NULL);
+ 	return 0;
+@@ -502,6 +503,7 @@ static void backend_changed(struct xenbus_watch *watch,
+ 		= container_of(watch, struct backend_info, backend_watch);
+ 	struct xenbus_device *dev = be->dev;
+ 	int cdrom = 0;
++	unsigned long handle;
+ 	char *device_type;
+ 
+ 	DPRINTK("");
+@@ -521,10 +523,10 @@ static void backend_changed(struct xenbus_watch *watch,
+ 		return;
+ 	}
+ 
+-	if ((be->major || be->minor) &&
+-	    ((be->major != major) || (be->minor != minor))) {
+-		pr_warn(DRV_PFX "changing physical device (from %x:%x to %x:%x) not supported.\n",
+-			be->major, be->minor, major, minor);
++	if (be->major | be->minor) {
++		if (be->major != major || be->minor != minor)
++			pr_warn(DRV_PFX "changing physical device (from %x:%x to %x:%x) not supported.\n",
++				be->major, be->minor, major, minor);
+ 		return;
+ 	}
+ 
+@@ -542,36 +544,33 @@ static void backend_changed(struct xenbus_watch *watch,
+ 		kfree(device_type);
+ 	}
+ 
+-	if (be->major == 0 && be->minor == 0) {
+-		/* Front end dir is a number, which is used as the handle. */
+-
+-		char *p = strrchr(dev->otherend, '/') + 1;
+-		long handle;
+-		err = strict_strtoul(p, 0, &handle);
+-		if (err)
+-			return;
++	/* Front end dir is a number, which is used as the handle. */
++	err = strict_strtoul(strrchr(dev->otherend, '/') + 1, 0, &handle);
++	if (err)
++		return;
+ 
+-		be->major = major;
+-		be->minor = minor;
++	be->major = major;
++	be->minor = minor;
+ 
+-		err = xen_vbd_create(be->blkif, handle, major, minor,
+-				 (NULL == strchr(be->mode, 'w')), cdrom);
+-		if (err) {
+-			be->major = 0;
+-			be->minor = 0;
+-			xenbus_dev_fatal(dev, err, "creating vbd structure");
+-			return;
+-		}
++	err = xen_vbd_create(be->blkif, handle, major, minor,
++			     !strchr(be->mode, 'w'), cdrom);
+ 
++	if (err)
++		xenbus_dev_fatal(dev, err, "creating vbd structure");
++	else {
+ 		err = xenvbd_sysfs_addif(dev);
+ 		if (err) {
+ 			xen_vbd_free(&be->blkif->vbd);
+-			be->major = 0;
+-			be->minor = 0;
+ 			xenbus_dev_fatal(dev, err, "creating sysfs entries");
+-			return;
+ 		}
++	}
+ 
++	if (err) {
++		kfree(be->mode);
++		be->mode = NULL;
++		be->major = 0;
++		be->minor = 0;
++	} else {
+ 		/* We're potentially connected now */
+ 		xen_update_blkif_status(be->blkif);
+ 	}
+diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
+index fc2de55..b00000e 100644
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -67,6 +67,7 @@ static struct usb_device_id ath3k_table[] = {
+ 	{ USB_DEVICE(0x13d3, 0x3304) },
+ 	{ USB_DEVICE(0x0930, 0x0215) },
+ 	{ USB_DEVICE(0x0489, 0xE03D) },
++	{ USB_DEVICE(0x0489, 0xE027) },
+ 
+ 	/* Atheros AR9285 Malbec with sflash firmware */
+ 	{ USB_DEVICE(0x03F0, 0x311D) },
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 654e248..e023c65 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -123,6 +123,7 @@ static struct usb_device_id blacklist_table[] = {
+ 	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
+ 	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
+ 	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
++	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
+ 
+ 	/* Atheros AR9285 Malbec with sflash firmware */
+ 	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
+diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
+index cdf2f54..f77e341 100644
+--- a/drivers/char/virtio_console.c
++++ b/drivers/char/virtio_console.c
+@@ -1808,7 +1808,8 @@ static void virtcons_remove(struct virtio_device *vdev)
+ 	/* Disable interrupts for vqs */
+ 	vdev->config->reset(vdev);
+ 	/* Finish up work that's lined up */
+-	cancel_work_sync(&portdev->control_work);
++	if (use_multiport(portdev))
++		cancel_work_sync(&portdev->control_work);
+ 
+ 	list_for_each_entry_safe(port, port2, &portdev->ports, list)
+ 		unplug_port(port);
+diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c
+index bc6f5fa..819dfda 100644
+--- a/drivers/dca/dca-core.c
++++ b/drivers/dca/dca-core.c
+@@ -420,6 +420,11 @@ void unregister_dca_provider(struct dca_provider *dca, struct device *dev)
+ 
+ 	raw_spin_lock_irqsave(&dca_lock, flags);
+ 
++	if (list_empty(&dca_domains)) {
++		raw_spin_unlock_irqrestore(&dca_lock, flags);
++		return;
++	}
++
+ 	list_del(&dca->node);
+ 
+ 	pci_rc = dca_pci_rc_from_dev(dev);
+diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
+index f7f1dc6..ed0e8b7 100644
+--- a/drivers/dma/ioat/dma_v3.c
++++ b/drivers/dma/ioat/dma_v3.c
+@@ -951,7 +951,7 @@ static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device)
+ 			goto free_resources;
+ 		}
+ 	}
+-	dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_TO_DEVICE);
++	dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_FROM_DEVICE);
+ 
+ 	/* skip validate if the capability is not present */
+ 	if (!dma_has_cap(DMA_XOR_VAL, dma_chan->device->cap_mask))
+diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
+index e164c55..1bfb207 100644
+--- a/drivers/edac/edac_pci_sysfs.c
++++ b/drivers/edac/edac_pci_sysfs.c
+@@ -256,7 +256,7 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj,
+ 	struct edac_pci_dev_attribute *edac_pci_dev;
+ 	edac_pci_dev = (struct edac_pci_dev_attribute *)attr;
+ 
+-	if (edac_pci_dev->show)
++	if (edac_pci_dev->store)
+ 		return edac_pci_dev->store(edac_pci_dev->value, buffer, count);
+ 	return -EIO;
+ }
+diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
+index 7a05fd2..841c78d 100644
+--- a/drivers/firewire/core-device.c
++++ b/drivers/firewire/core-device.c
+@@ -1019,6 +1019,10 @@ static void fw_device_init(struct work_struct *work)
+ 	ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ?
+ 	      idr_get_new(&fw_device_idr, device, &minor) :
+ 	      -ENOMEM;
++	if (minor >= 1 << MINORBITS) {
++		idr_remove(&fw_device_idr, minor);
++		minor = -ENOSPC;
++	}
+ 	up_write(&fw_device_rwsem);
+ 
+ 	if (ret < 0)
+diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
+index 08c6749..638e1f7 100644
+--- a/drivers/firewire/net.c
++++ b/drivers/firewire/net.c
+@@ -861,8 +861,8 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
+ 	if (specifier_id == IANA_SPECIFIER_ID && ver == RFC2734_SW_VERSION) {
+ 		buf_ptr += 2;
+ 		length -= IEEE1394_GASP_HDR_SIZE;
+-		fwnet_incoming_packet(dev, buf_ptr, length,
+-				      source_node_id, -1, true);
++		fwnet_incoming_packet(dev, buf_ptr, length, source_node_id,
++				      context->card->generation, true);
+ 	}
+ 
+ 	packet.payload_length = dev->rcv_buffer_size;
+@@ -958,7 +958,12 @@ static void fwnet_transmit_packet_done(struct fwnet_packet_task *ptask)
+ 			break;
+ 		}
+ 
+-		skb_pull(skb, ptask->max_payload);
++		if (ptask->dest_node == IEEE1394_ALL_NODES) {
++			skb_pull(skb,
++				 ptask->max_payload + IEEE1394_GASP_HDR_SIZE);
++		} else {
++			skb_pull(skb, ptask->max_payload);
++		}
+ 		if (ptask->outstanding_pkts > 1) {
+ 			fwnet_make_sf_hdr(&ptask->hdr, RFC2374_HDR_INTFRAG,
+ 					  dg_size, fg_off, datagram_label);
+@@ -1062,7 +1067,7 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
+ 		smp_rmb();
+ 		node_id = dev->card->node_id;
+ 
+-		p = skb_push(ptask->skb, 8);
++		p = skb_push(ptask->skb, IEEE1394_GASP_HDR_SIZE);
+ 		put_unaligned_be32(node_id << 16 | IANA_SPECIFIER_ID >> 8, p);
+ 		put_unaligned_be32((IANA_SPECIFIER_ID & 0xff) << 24
+ 						| RFC2734_SW_VERSION, &p[4]);
+diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
+index b298158..982f1f5 100644
+--- a/drivers/firmware/dmi_scan.c
++++ b/drivers/firmware/dmi_scan.c
+@@ -16,6 +16,7 @@
+  */
+ static char dmi_empty_string[] = "        ";
+ 
++static u16 __initdata dmi_ver;
+ /*
+  * Catch too early calls to dmi_check_system():
+  */
+@@ -118,12 +119,12 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
+ 	return 0;
+ }
+ 
+-static int __init dmi_checksum(const u8 *buf)
++static int __init dmi_checksum(const u8 *buf, u8 len)
+ {
+ 	u8 sum = 0;
+ 	int a;
+ 
+-	for (a = 0; a < 15; a++)
++	for (a = 0; a < len; a++)
+ 		sum += buf[a];
+ 
+ 	return sum == 0;
+@@ -161,8 +162,10 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int inde
+ 		return;
+ 
+ 	for (i = 0; i < 16 && (is_ff || is_00); i++) {
+-		if(d[i] != 0x00) is_ff = 0;
+-		if(d[i] != 0xFF) is_00 = 0;
++		if (d[i] != 0x00)
++			is_00 = 0;
++		if (d[i] != 0xFF)
++			is_ff = 0;
+ 	}
+ 
+ 	if (is_ff || is_00)
+@@ -172,7 +175,15 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int inde
+ 	if (!s)
+ 		return;
+ 
+-	sprintf(s, "%pUB", d);
++	/*
++	 * As of version 2.6 of the SMBIOS specification, the first 3 fields of
++	 * the UUID are supposed to be little-endian encoded.  The specification
++	 * says that this is the defacto standard.
++	 */
++	if (dmi_ver >= 0x0206)
++		sprintf(s, "%pUL", d);
++	else
++		sprintf(s, "%pUB", d);
+ 
+         dmi_ident[slot] = s;
+ }
+@@ -404,35 +415,63 @@ static int __init dmi_present(const char __iomem *p)
+ 	u8 buf[15];
+ 
+ 	memcpy_fromio(buf, p, 15);
+-	if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) {
++	if (dmi_checksum(buf, 15)) {
+ 		dmi_num = (buf[13] << 8) | buf[12];
+ 		dmi_len = (buf[7] << 8) | buf[6];
+ 		dmi_base = (buf[11] << 24) | (buf[10] << 16) |
+ 			(buf[9] << 8) | buf[8];
+ 
+-		/*
+-		 * DMI version 0.0 means that the real version is taken from
+-		 * the SMBIOS version, which we don't know at this point.
+-		 */
+-		if (buf[14] != 0)
+-			printk(KERN_INFO "DMI %d.%d present.\n",
+-			       buf[14] >> 4, buf[14] & 0xF);
+-		else
+-			printk(KERN_INFO "DMI present.\n");
+ 		if (dmi_walk_early(dmi_decode) == 0) {
++			if (dmi_ver)
++				pr_info("SMBIOS %d.%d present.\n",
++				       dmi_ver >> 8, dmi_ver & 0xFF);
++			else {
++				dmi_ver = (buf[14] & 0xF0) << 4 |
++					   (buf[14] & 0x0F);
++				pr_info("Legacy DMI %d.%d present.\n",
++				       dmi_ver >> 8, dmi_ver & 0xFF);
++			}
+ 			dmi_dump_ids();
+ 			return 0;
+ 		}
+ 	}
++	dmi_ver = 0;
+ 	return 1;
+ }
+ 
++static int __init smbios_present(const char __iomem *p)
++{
++	u8 buf[32];
++	int offset = 0;
++
++	memcpy_fromio(buf, p, 32);
++	if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) {
++		dmi_ver = (buf[6] << 8) + buf[7];
++
++		/* Some BIOS report weird SMBIOS version, fix that up */
++		switch (dmi_ver) {
++		case 0x021F:
++		case 0x0221:
++			pr_debug("SMBIOS version fixup(2.%d->2.%d)\n",
++			       dmi_ver & 0xFF, 3);
++			dmi_ver = 0x0203;
++			break;
++		case 0x0233:
++			pr_debug("SMBIOS version fixup(2.%d->2.%d)\n", 51, 6);
++			dmi_ver = 0x0206;
++			break;
++		}
++		offset = 16;
++	}
++	return dmi_present(buf + offset);
++}
++
+ void __init dmi_scan_machine(void)
+ {
+ 	char __iomem *p, *q;
+ 	int rc;
+ 
+-	if (efi_enabled) {
++	if (efi_enabled(EFI_CONFIG_TABLES)) {
+ 		if (efi.smbios == EFI_INVALID_TABLE_ADDR)
+ 			goto error;
+ 
+@@ -444,7 +483,7 @@ void __init dmi_scan_machine(void)
+ 		if (p == NULL)
+ 			goto error;
+ 
+-		rc = dmi_present(p + 0x10); /* offset of _DMI_ string */
++		rc = smbios_present(p);
+ 		dmi_iounmap(p, 32);
+ 		if (!rc) {
+ 			dmi_available = 1;
+@@ -462,7 +501,12 @@ void __init dmi_scan_machine(void)
+ 			goto error;
+ 
+ 		for (q = p; q < p + 0x10000; q += 16) {
+-			rc = dmi_present(q);
++			if (memcmp(q, "_SM_", 4) == 0 && q - p <= 0xFFE0)
++				rc = smbios_present(q);
++			else if (memcmp(q, "_DMI_", 5) == 0)
++				rc = dmi_present(q);
++			else
++				continue;
+ 			if (!rc) {
+ 				dmi_available = 1;
+ 				dmi_iounmap(p, 0x10000);
+diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
+index d10c987..bfd8f43 100644
+--- a/drivers/firmware/efivars.c
++++ b/drivers/firmware/efivars.c
+@@ -1224,7 +1224,7 @@ efivars_init(void)
+ 	printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION,
+ 	       EFIVARS_DATE);
+ 
+-	if (!efi_enabled)
++	if (!efi_enabled(EFI_RUNTIME_SERVICES))
+ 		return 0;
+ 
+ 	/* For now we'll register the efi directory at /sys/firmware/efi */
+@@ -1262,7 +1262,7 @@ err_put:
+ static void __exit
+ efivars_exit(void)
+ {
+-	if (efi_enabled) {
++	if (efi_enabled(EFI_RUNTIME_SERVICES)) {
+ 		unregister_efivars(&__efivars);
+ 		kobject_put(efi_kobj);
+ 	}
+diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
+index 4da4eb9..2224f1d 100644
+--- a/drivers/firmware/iscsi_ibft_find.c
++++ b/drivers/firmware/iscsi_ibft_find.c
+@@ -99,7 +99,7 @@ unsigned long __init find_ibft_region(unsigned long *sizep)
+ 	/* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will
+ 	 * only use ACPI for this */
+ 
+-	if (!efi_enabled)
++	if (!efi_enabled(EFI_BOOT))
+ 		find_ibft_in_mem();
+ 
+ 	if (ibft_addr) {
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index af81f77..3859f43 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -2023,7 +2023,7 @@ uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth)
+ 
+ 	switch (bpp) {
+ 	case 8:
+-		fmt = DRM_FORMAT_RGB332;
++		fmt = DRM_FORMAT_C8;
+ 		break;
+ 	case 16:
+ 		if (depth == 15)
+@@ -3633,6 +3633,7 @@ void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
+ 			  int *bpp)
+ {
+ 	switch (format) {
++	case DRM_FORMAT_C8:
+ 	case DRM_FORMAT_RGB332:
+ 	case DRM_FORMAT_BGR233:
+ 		*depth = 8;
+diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
+index b7ee230..7906edd 100644
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -1924,7 +1924,8 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
+ 	num_modes += add_cvt_modes(connector, edid);
+ 	num_modes += add_standard_modes(connector, edid);
+ 	num_modes += add_established_modes(connector, edid);
+-	num_modes += add_inferred_modes(connector, edid);
++	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
++		num_modes += add_inferred_modes(connector, edid);
+ 	num_modes += add_cea_modes(connector, edid);
+ 
+ 	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
+diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
+index 37c9a52..767782a 100644
+--- a/drivers/gpu/drm/drm_usb.c
++++ b/drivers/gpu/drm/drm_usb.c
+@@ -18,7 +18,7 @@ int drm_get_usb_dev(struct usb_interface *interface,
+ 
+ 	usbdev = interface_to_usbdev(interface);
+ 	dev->usbdev = usbdev;
+-	dev->dev = &usbdev->dev;
++	dev->dev = &interface->dev;
+ 
+ 	mutex_lock(&drm_global_mutex);
+ 
+diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+index cdf46b5..d8bb392 100644
+--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+@@ -749,6 +749,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
+ 	total = 0;
+ 	for (i = 0; i < count; i++) {
+ 		struct drm_i915_gem_relocation_entry __user *user_relocs;
++		u64 invalid_offset = (u64)-1;
++		int j;
+ 
+ 		user_relocs = (void __user *)(uintptr_t)exec[i].relocs_ptr;
+ 
+@@ -759,6 +761,25 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
+ 			goto err;
+ 		}
+ 
++		/* As we do not update the known relocation offsets after
++		 * relocating (due to the complexities in lock handling),
++		 * we need to mark them as invalid now so that we force the
++		 * relocation processing next time. Just in case the target
++		 * object is evicted and then rebound into its old
++		 * presumed_offset before the next execbuffer - if that
++		 * happened we would make the mistake of assuming that the
++		 * relocations were valid.
++		 */
++		for (j = 0; j < exec[i].relocation_count; j++) {
++			if (copy_to_user(&user_relocs[j].presumed_offset,
++					 &invalid_offset,
++					 sizeof(invalid_offset))) {
++				ret = -EFAULT;
++				mutex_lock(&dev->struct_mutex);
++				goto err;
++			}
++		}
++
+ 		reloc_offset[i] = total;
+ 		total += exec[i].relocation_count;
+ 	}
+diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
+index f02cfad..380e7da 100644
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
+@@ -506,6 +506,7 @@
+  * the enables for writing to the corresponding low bit.
+  */
+ #define _3D_CHICKEN	0x02084
++#define  _3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB	(1 << 10)
+ #define _3D_CHICKEN2	0x0208c
+ /* Disables pipelining of read flushes past the SF-WIZ interface.
+  * Required on all Ironlake steppings according to the B-Spec, but the
+@@ -3274,6 +3275,8 @@
+ #define _PFA_CTL_1               0x68080
+ #define _PFB_CTL_1               0x68880
+ #define  PF_ENABLE              (1<<31)
++#define  PF_PIPE_SEL_MASK_IVB	(3<<29)
++#define  PF_PIPE_SEL_IVB(pipe)	((pipe)<<29)
+ #define  PF_FILTER_MASK		(3<<23)
+ #define  PF_FILTER_PROGRAMMED	(0<<23)
+ #define  PF_FILTER_MED_3x3	(1<<23)
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 0777c79..3098027 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -146,8 +146,8 @@ static const intel_limit_t intel_limits_i9xx_sdvo = {
+ 	.vco = { .min = 1400000, .max = 2800000 },
+ 	.n = { .min = 1, .max = 6 },
+ 	.m = { .min = 70, .max = 120 },
+-	.m1 = { .min = 10, .max = 22 },
+-	.m2 = { .min = 5, .max = 9 },
++	.m1 = { .min = 8, .max = 18 },
++	.m2 = { .min = 3, .max = 7 },
+ 	.p = { .min = 5, .max = 80 },
+ 	.p1 = { .min = 1, .max = 8 },
+ 	.p2 = { .dot_limit = 200000,
+@@ -2347,18 +2347,6 @@ static void intel_fdi_normal_train(struct drm_crtc *crtc)
+ 			   FDI_FE_ERRC_ENABLE);
+ }
+ 
+-static void cpt_phase_pointer_enable(struct drm_device *dev, int pipe)
+-{
+-	struct drm_i915_private *dev_priv = dev->dev_private;
+-	u32 flags = I915_READ(SOUTH_CHICKEN1);
+-
+-	flags |= FDI_PHASE_SYNC_OVR(pipe);
+-	I915_WRITE(SOUTH_CHICKEN1, flags); /* once to unlock... */
+-	flags |= FDI_PHASE_SYNC_EN(pipe);
+-	I915_WRITE(SOUTH_CHICKEN1, flags); /* then again to enable */
+-	POSTING_READ(SOUTH_CHICKEN1);
+-}
+-
+ /* The FDI link training functions for ILK/Ibexpeak. */
+ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
+ {
+@@ -2509,9 +2497,6 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
+ 	POSTING_READ(reg);
+ 	udelay(150);
+ 
+-	if (HAS_PCH_CPT(dev))
+-		cpt_phase_pointer_enable(dev, pipe);
+-
+ 	for (i = 0; i < 4; i++) {
+ 		reg = FDI_TX_CTL(pipe);
+ 		temp = I915_READ(reg);
+@@ -2638,9 +2623,6 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
+ 	POSTING_READ(reg);
+ 	udelay(150);
+ 
+-	if (HAS_PCH_CPT(dev))
+-		cpt_phase_pointer_enable(dev, pipe);
+-
+ 	for (i = 0; i < 4; i++) {
+ 		reg = FDI_TX_CTL(pipe);
+ 		temp = I915_READ(reg);
+@@ -2754,17 +2736,6 @@ static void ironlake_fdi_pll_enable(struct drm_crtc *crtc)
+ 	}
+ }
+ 
+-static void cpt_phase_pointer_disable(struct drm_device *dev, int pipe)
+-{
+-	struct drm_i915_private *dev_priv = dev->dev_private;
+-	u32 flags = I915_READ(SOUTH_CHICKEN1);
+-
+-	flags &= ~(FDI_PHASE_SYNC_EN(pipe));
+-	I915_WRITE(SOUTH_CHICKEN1, flags); /* once to disable... */
+-	flags &= ~(FDI_PHASE_SYNC_OVR(pipe));
+-	I915_WRITE(SOUTH_CHICKEN1, flags); /* then again to lock */
+-	POSTING_READ(SOUTH_CHICKEN1);
+-}
+ static void ironlake_fdi_disable(struct drm_crtc *crtc)
+ {
+ 	struct drm_device *dev = crtc->dev;
+@@ -2794,8 +2765,6 @@ static void ironlake_fdi_disable(struct drm_crtc *crtc)
+ 		I915_WRITE(FDI_RX_CHICKEN(pipe),
+ 			   I915_READ(FDI_RX_CHICKEN(pipe) &
+ 				     ~FDI_RX_PHASE_SYNC_POINTER_EN));
+-	} else if (HAS_PCH_CPT(dev)) {
+-		cpt_phase_pointer_disable(dev, pipe);
+ 	}
+ 
+ 	/* still set train pattern 1 */
+@@ -3233,7 +3202,11 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
+ 		 * as some pre-programmed values are broken,
+ 		 * e.g. x201.
+ 		 */
+-		I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3);
++		if (IS_IVYBRIDGE(dev))
++			I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3 |
++						 PF_PIPE_SEL_IVB(pipe));
++		else
++			I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3);
+ 		I915_WRITE(PF_WIN_POS(pipe), dev_priv->pch_pf_pos);
+ 		I915_WRITE(PF_WIN_SZ(pipe), dev_priv->pch_pf_size);
+ 	}
+@@ -3435,6 +3408,7 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
+ 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+ 	int pipe = intel_crtc->pipe;
+ 	int plane = intel_crtc->plane;
++	u32 pctl;
+ 
+ 	if (!intel_crtc->active)
+ 		return;
+@@ -3450,6 +3424,13 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
+ 
+ 	intel_disable_plane(dev_priv, plane, pipe);
+ 	intel_disable_pipe(dev_priv, pipe);
++
++	/* Disable pannel fitter if it is on this pipe. */
++	pctl = I915_READ(PFIT_CONTROL);
++	if ((pctl & PFIT_ENABLE) &&
++	    ((pctl & PFIT_PIPE_MASK) >> PFIT_PIPE_SHIFT) == pipe)
++		I915_WRITE(PFIT_CONTROL, 0);
++
+ 	intel_disable_pll(dev_priv, pipe);
+ 
+ 	intel_crtc->active = false;
+diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
+index 0c52448..2e6448c 100644
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -774,14 +774,6 @@ static const struct dmi_system_id intel_no_lvds[] = {
+ 	},
+ 	{
+ 		.callback = intel_no_lvds_dmi_callback,
+-		.ident = "ZOTAC ZBOXSD-ID12/ID13",
+-		.matches = {
+-			DMI_MATCH(DMI_BOARD_VENDOR, "ZOTAC"),
+-			DMI_MATCH(DMI_BOARD_NAME, "ZBOXSD-ID12/ID13"),
+-		},
+-	},
+-	{
+-		.callback = intel_no_lvds_dmi_callback,
+ 		.ident = "Gigabyte GA-D525TUD",
+ 		.matches = {
+ 			DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
+diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
+index c23c9ea..572b2ca 100644
+--- a/drivers/gpu/drm/i915/intel_pm.c
++++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -3324,6 +3324,10 @@ static void gen6_init_clock_gating(struct drm_device *dev)
+ 		   I915_READ(ILK_DISPLAY_CHICKEN2) |
+ 		   ILK_ELPIN_409_SELECT);
+ 
++	/* WaDisableHiZPlanesWhenMSAAEnabled */
++	I915_WRITE(_3D_CHICKEN,
++		   _MASKED_BIT_ENABLE(_3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB));
++
+ 	I915_WRITE(WM3_LP_ILK, 0);
+ 	I915_WRITE(WM2_LP_ILK, 0);
+ 	I915_WRITE(WM1_LP_ILK, 0);
+diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c
+index 89640f2..2b59f41 100644
+--- a/drivers/gpu/drm/nouveau/nv04_dfp.c
++++ b/drivers/gpu/drm/nouveau/nv04_dfp.c
+@@ -504,7 +504,7 @@ static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode)
+ 
+ static inline bool is_powersaving_dpms(int mode)
+ {
+-	return (mode != DRM_MODE_DPMS_ON);
++	return mode != DRM_MODE_DPMS_ON && mode != NV_DPMS_CLEARED;
+ }
+ 
+ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode)
+diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
+index 2817101..9bd3015 100644
+--- a/drivers/gpu/drm/radeon/atombios_crtc.c
++++ b/drivers/gpu/drm/radeon/atombios_crtc.c
+@@ -258,8 +258,6 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
+ 		radeon_crtc->enabled = true;
+ 		/* adjust pm to dpms changes BEFORE enabling crtcs */
+ 		radeon_pm_compute_clocks(rdev);
+-		if (ASIC_IS_DCE6(rdev) && !radeon_crtc->in_mode_set)
+-			atombios_powergate_crtc(crtc, ATOM_DISABLE);
+ 		atombios_enable_crtc(crtc, ATOM_ENABLE);
+ 		if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev))
+ 			atombios_enable_crtc_memreq(crtc, ATOM_ENABLE);
+@@ -277,8 +275,6 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
+ 			atombios_enable_crtc_memreq(crtc, ATOM_DISABLE);
+ 		atombios_enable_crtc(crtc, ATOM_DISABLE);
+ 		radeon_crtc->enabled = false;
+-		if (ASIC_IS_DCE6(rdev) && !radeon_crtc->in_mode_set)
+-			atombios_powergate_crtc(crtc, ATOM_ENABLE);
+ 		/* adjust pm to dpms changes AFTER disabling crtcs */
+ 		radeon_pm_compute_clocks(rdev);
+ 		break;
+@@ -1667,6 +1663,8 @@ static void atombios_crtc_disable(struct drm_crtc *crtc)
+ 	int i;
+ 
+ 	atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
++	if (ASIC_IS_DCE6(rdev))
++		atombios_powergate_crtc(crtc, ATOM_ENABLE);
+ 
+ 	for (i = 0; i < rdev->num_crtc; i++) {
+ 		if (rdev->mode_info.crtcs[i] &&
+diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
+index 2eb418e..e53a91b 100644
+--- a/drivers/gpu/drm/radeon/atombios_encoders.c
++++ b/drivers/gpu/drm/radeon/atombios_encoders.c
+@@ -95,7 +95,7 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
+ 	    ((radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) ||
+ 	     (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE))) {
+ 		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
+-		radeon_dp_set_link_config(connector, mode);
++		radeon_dp_set_link_config(connector, adjusted_mode);
+ 	}
+ 
+ 	return true;
+diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
+index 5528fea..8f0ce47 100644
+--- a/drivers/gpu/drm/radeon/evergreen.c
++++ b/drivers/gpu/drm/radeon/evergreen.c
+@@ -1259,14 +1259,18 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav
+ 				if (!(tmp & EVERGREEN_CRTC_BLANK_DATA_EN)) {
+ 					radeon_wait_for_vblank(rdev, i);
+ 					tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;
++					WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
+ 					WREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp);
++					WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
+ 				}
+ 			} else {
+ 				tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
+ 				if (!(tmp & EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE)) {
+ 					radeon_wait_for_vblank(rdev, i);
+ 					tmp |= EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE;
++					WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
+ 					WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp);
++					WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
+ 				}
+ 			}
+ 			/* wait for the next frame */
+@@ -1291,6 +1295,8 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav
+ 		blackout &= ~BLACKOUT_MODE_MASK;
+ 		WREG32(MC_SHARED_BLACKOUT_CNTL, blackout | 1);
+ 	}
++	/* wait for the MC to settle */
++	udelay(100);
+ }
+ 
+ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save)
+@@ -1324,11 +1330,15 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s
+ 			if (ASIC_IS_DCE6(rdev)) {
+ 				tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]);
+ 				tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;
++				WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
+ 				WREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp);
++				WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
+ 			} else {
+ 				tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
+ 				tmp &= ~EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE;
++				WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
+ 				WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp);
++				WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
+ 			}
+ 			/* wait for the next frame */
+ 			frame_count = radeon_get_vblank_counter(rdev, i);
+diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
+index 4a33cdc..bf849ea 100644
+--- a/drivers/gpu/drm/radeon/evergreen_cs.c
++++ b/drivers/gpu/drm/radeon/evergreen_cs.c
+@@ -2724,6 +2724,7 @@ static bool evergreen_vm_reg_valid(u32 reg)
+ 
+ 	/* check config regs */
+ 	switch (reg) {
++	case WAIT_UNTIL:
+ 	case GRBM_GFX_INDEX:
+ 	case CP_STRMOUT_CNTL:
+ 	case CP_COHER_CNTL:
+diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
+index f75247d..33d3975 100644
+--- a/drivers/gpu/drm/radeon/radeon_combios.c
++++ b/drivers/gpu/drm/radeon/radeon_combios.c
+@@ -2419,6 +2419,14 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev)
+ 								   1),
+ 								  ATOM_DEVICE_CRT1_SUPPORT);
+ 				}
++				/* RV100 board with external TDMS bit mis-set.
++				 * Actually uses internal TMDS, clear the bit.
++				 */
++				if (dev->pdev->device == 0x5159 &&
++				    dev->pdev->subsystem_vendor == 0x1014 &&
++				    dev->pdev->subsystem_device == 0x029A) {
++					tmp &= ~(1 << 4);
++				}
+ 				if ((tmp >> 4) & 0x1) {
+ 					devices |= ATOM_DEVICE_DFP2_SUPPORT;
+ 					radeon_add_legacy_encoder(dev,
+diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
+index 895e628..a7e797c 100644
+--- a/drivers/gpu/drm/radeon/radeon_connectors.c
++++ b/drivers/gpu/drm/radeon/radeon_connectors.c
+@@ -745,7 +745,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
+ 		ret = connector_status_disconnected;
+ 
+ 	if (radeon_connector->ddc_bus)
+-		dret = radeon_ddc_probe(radeon_connector);
++		dret = radeon_ddc_probe(radeon_connector, false);
+ 	if (dret) {
+ 		radeon_connector->detected_by_load = false;
+ 		if (radeon_connector->edid) {
+@@ -951,7 +951,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
+ 		return connector->status;
+ 
+ 	if (radeon_connector->ddc_bus)
+-		dret = radeon_ddc_probe(radeon_connector);
++		dret = radeon_ddc_probe(radeon_connector, false);
+ 	if (dret) {
+ 		radeon_connector->detected_by_load = false;
+ 		if (radeon_connector->edid) {
+@@ -1391,7 +1391,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
+ 		if (encoder) {
+ 			/* setup ddc on the bridge */
+ 			radeon_atom_ext_encoder_setup_ddc(encoder);
+-			if (radeon_ddc_probe(radeon_connector)) /* try DDC */
++			/* bridge chips are always aux */
++			if (radeon_ddc_probe(radeon_connector, true)) /* try DDC */
+ 				ret = connector_status_connected;
+ 			else if (radeon_connector->dac_load_detect) { /* try load detection */
+ 				struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
+@@ -1409,7 +1410,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
+ 				if (radeon_dp_getdpcd(radeon_connector))
+ 					ret = connector_status_connected;
+ 			} else {
+-				if (radeon_ddc_probe(radeon_connector))
++				/* try non-aux ddc (DP to DVI/HMDI/etc. adapter) */
++				if (radeon_ddc_probe(radeon_connector, false))
+ 					ret = connector_status_connected;
+ 			}
+ 		}
+diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
+index 8794744..f1b951d 100644
+--- a/drivers/gpu/drm/radeon/radeon_cursor.c
++++ b/drivers/gpu/drm/radeon/radeon_cursor.c
+@@ -240,7 +240,8 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,
+ 		y = 0;
+ 	}
+ 
+-	if (ASIC_IS_AVIVO(rdev)) {
++	/* fixed on DCE6 and newer */
++	if (ASIC_IS_AVIVO(rdev) && !ASIC_IS_DCE6(rdev)) {
+ 		int i = 0;
+ 		struct drm_crtc *crtc_p;
+ 
+diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
+index 7a3daeb..9d9bf5f 100644
+--- a/drivers/gpu/drm/radeon/radeon_device.c
++++ b/drivers/gpu/drm/radeon/radeon_device.c
+@@ -427,7 +427,8 @@ bool radeon_card_posted(struct radeon_device *rdev)
+ {
+ 	uint32_t reg;
+ 
+-	if (efi_enabled && rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)
++	if (efi_enabled(EFI_BOOT) &&
++	    rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)
+ 		return false;
+ 
+ 	/* first check CRTCs */
+diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
+index 7ddef8f..06a31cf 100644
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -695,10 +695,15 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
+ 	if (radeon_connector->router.ddc_valid)
+ 		radeon_router_select_ddc_port(radeon_connector);
+ 
+-	if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
+-	    (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) ||
+-	    (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) !=
+-	     ENCODER_OBJECT_ID_NONE)) {
++	if (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) !=
++	    ENCODER_OBJECT_ID_NONE) {
++		struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
++
++		if (dig->dp_i2c_bus)
++			radeon_connector->edid = drm_get_edid(&radeon_connector->base,
++							      &dig->dp_i2c_bus->adapter);
++	} else if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
++		   (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)) {
+ 		struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
+ 
+ 		if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT ||
+@@ -1106,14 +1111,16 @@ radeon_user_framebuffer_create(struct drm_device *dev,
+ 	}
+ 
+ 	radeon_fb = kzalloc(sizeof(*radeon_fb), GFP_KERNEL);
+-	if (radeon_fb == NULL)
++	if (radeon_fb == NULL) {
++		drm_gem_object_unreference_unlocked(obj);
+ 		return ERR_PTR(-ENOMEM);
++	}
+ 
+ 	ret = radeon_framebuffer_init(dev, radeon_fb, mode_cmd, obj);
+ 	if (ret) {
+ 		kfree(radeon_fb);
+ 		drm_gem_object_unreference_unlocked(obj);
+-		return NULL;
++		return ERR_PTR(ret);
+ 	}
+ 
+ 	return &radeon_fb->base;
+diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
+index 3edec1c..6076e85 100644
+--- a/drivers/gpu/drm/radeon/radeon_i2c.c
++++ b/drivers/gpu/drm/radeon/radeon_i2c.c
+@@ -39,7 +39,7 @@ extern u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap);
+  * radeon_ddc_probe
+  *
+  */
+-bool radeon_ddc_probe(struct radeon_connector *radeon_connector)
++bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool use_aux)
+ {
+ 	u8 out = 0x0;
+ 	u8 buf[8];
+@@ -63,7 +63,13 @@ bool radeon_ddc_probe(struct radeon_connector *radeon_connector)
+ 	if (radeon_connector->router.ddc_valid)
+ 		radeon_router_select_ddc_port(radeon_connector);
+ 
+-	ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
++	if (use_aux) {
++		struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
++		ret = i2c_transfer(&dig->dp_i2c_bus->adapter, msgs, 2);
++	} else {
++		ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
++	}
++
+ 	if (ret != 2)
+ 		/* Couldn't find an accessible DDC on this connector */
+ 		return false;
+diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+index dd402bb..9633dbb 100644
+--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
++++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+@@ -618,6 +618,14 @@ static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc
+ 	enum drm_connector_status found = connector_status_disconnected;
+ 	bool color = true;
+ 
++	/* just don't bother on RN50 those chip are often connected to remoting
++	 * console hw and often we get failure to load detect those. So to make
++	 * everyone happy report the encoder as always connected.
++	 */
++	if (ASIC_IS_RN50(rdev)) {
++		return connector_status_connected;
++	}
++
+ 	/* save the regs we need */
+ 	vclk_ecp_cntl = RREG32_PLL(RADEON_VCLK_ECP_CNTL);
+ 	crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);
+diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
+index d569789..485d16e 100644
+--- a/drivers/gpu/drm/radeon/radeon_mode.h
++++ b/drivers/gpu/drm/radeon/radeon_mode.h
+@@ -534,7 +534,7 @@ extern void radeon_i2c_put_byte(struct radeon_i2c_chan *i2c,
+ 				u8 val);
+ extern void radeon_router_select_ddc_port(struct radeon_connector *radeon_connector);
+ extern void radeon_router_select_cd_port(struct radeon_connector *radeon_connector);
+-extern bool radeon_ddc_probe(struct radeon_connector *radeon_connector);
++extern bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool use_aux);
+ extern int radeon_ddc_get_modes(struct radeon_connector *radeon_connector);
+ 
+ extern struct drm_encoder *radeon_best_encoder(struct drm_connector *connector);
+diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
+index 43c431a..f2017fc 100644
+--- a/drivers/gpu/drm/radeon/radeon_ring.c
++++ b/drivers/gpu/drm/radeon/radeon_ring.c
+@@ -361,6 +361,9 @@ int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *ring, unsi
+ {
+ 	int r;
+ 
++	/* make sure we aren't trying to allocate more space than there is on the ring */
++	if (ndw > (ring->ring_size / 4))
++		return -ENOMEM;
+ 	/* Align requested size with padding so unlock_commit can
+ 	 * pad safely */
+ 	ndw = (ndw + ring->align_mask) & ~ring->align_mask;
+diff --git a/drivers/gpu/drm/radeon/reg_srcs/cayman b/drivers/gpu/drm/radeon/reg_srcs/cayman
+index 0f656b1..a072fa8 100644
+--- a/drivers/gpu/drm/radeon/reg_srcs/cayman
++++ b/drivers/gpu/drm/radeon/reg_srcs/cayman
+@@ -1,5 +1,6 @@
+ cayman 0x9400
+ 0x0000802C GRBM_GFX_INDEX
++0x00008040 WAIT_UNTIL
+ 0x000084FC CP_STRMOUT_CNTL
+ 0x000085F0 CP_COHER_CNTL
+ 0x000085F4 CP_COHER_SIZE
+diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
+index 8d9dc44..3234224 100644
+--- a/drivers/gpu/drm/udl/udl_connector.c
++++ b/drivers/gpu/drm/udl/udl_connector.c
+@@ -22,13 +22,17 @@
+ static u8 *udl_get_edid(struct udl_device *udl)
+ {
+ 	u8 *block;
+-	char rbuf[3];
++	char *rbuf;
+ 	int ret, i;
+ 
+ 	block = kmalloc(EDID_LENGTH, GFP_KERNEL);
+ 	if (block == NULL)
+ 		return NULL;
+ 
++	rbuf = kmalloc(2, GFP_KERNEL);
++	if (rbuf == NULL)
++		goto error;
++
+ 	for (i = 0; i < EDID_LENGTH; i++) {
+ 		ret = usb_control_msg(udl->ddev->usbdev,
+ 				      usb_rcvctrlpipe(udl->ddev->usbdev, 0), (0x02),
+@@ -36,16 +40,17 @@ static u8 *udl_get_edid(struct udl_device *udl)
+ 				      HZ);
+ 		if (ret < 1) {
+ 			DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
+-			i--;
+ 			goto error;
+ 		}
+ 		block[i] = rbuf[1];
+ 	}
+ 
++	kfree(rbuf);
+ 	return block;
+ 
+ error:
+ 	kfree(block);
++	kfree(rbuf);
+ 	return NULL;
+ }
+ 
+@@ -59,6 +64,14 @@ static int udl_get_modes(struct drm_connector *connector)
+ 
+ 	connector->display_info.raw_edid = (char *)edid;
+ 
++	/*
++	 * We only read the main block, but if the monitor reports extension
++	 * blocks then the drm edid code expects them to be present, so patch
++	 * the extension count to 0.
++	 */
++	edid->checksum += edid->extensions;
++	edid->extensions = 0;
++
+ 	drm_mode_connector_update_edid_property(connector, edid);
+ 	ret = drm_add_edid_modes(connector, edid);
+ 	connector->display_info.raw_edid = NULL;
+diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
+index 87aa5f5..cc6d90f 100644
+--- a/drivers/gpu/drm/udl/udl_drv.h
++++ b/drivers/gpu/drm/udl/udl_drv.h
+@@ -75,6 +75,8 @@ struct udl_framebuffer {
+ 	struct drm_framebuffer base;
+ 	struct udl_gem_object *obj;
+ 	bool active_16; /* active on the 16-bit channel */
++	int x1, y1, x2, y2; /* dirty rect */
++	spinlock_t dirty_lock;
+ };
+ 
+ #define to_udl_fb(x) container_of(x, struct udl_framebuffer, base)
+diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
+index 6f6ca50..c9df873 100644
+--- a/drivers/gpu/drm/udl/udl_fb.c
++++ b/drivers/gpu/drm/udl/udl_fb.c
+@@ -22,9 +22,9 @@
+ 
+ #include "drm_fb_helper.h"
+ 
+-#define DL_DEFIO_WRITE_DELAY    5 /* fb_deferred_io.delay in jiffies */
++#define DL_DEFIO_WRITE_DELAY    (HZ/20) /* fb_deferred_io.delay in jiffies */
+ 
+-static int fb_defio = 1;  /* Optionally enable experimental fb_defio mmap support */
++static int fb_defio = 0;  /* Optionally enable experimental fb_defio mmap support */
+ static int fb_bpp = 16;
+ 
+ module_param(fb_bpp, int, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP);
+@@ -153,6 +153,9 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
+ 	struct urb *urb;
+ 	int aligned_x;
+ 	int bpp = (fb->base.bits_per_pixel / 8);
++	int x2, y2;
++	bool store_for_later = false;
++	unsigned long flags;
+ 
+ 	if (!fb->active_16)
+ 		return 0;
+@@ -169,8 +172,6 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
+ 		}
+ 	}
+ 
+-	start_cycles = get_cycles();
+-
+ 	aligned_x = DL_ALIGN_DOWN(x, sizeof(unsigned long));
+ 	width = DL_ALIGN_UP(width + (x-aligned_x), sizeof(unsigned long));
+ 	x = aligned_x;
+@@ -180,19 +181,53 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
+ 	    (y + height > fb->base.height))
+ 		return -EINVAL;
+ 
++	/* if we are in atomic just store the info
++	   can't test inside spin lock */
++	if (in_atomic())
++		store_for_later = true;
++
++	x2 = x + width - 1;
++	y2 = y + height - 1;
++
++	spin_lock_irqsave(&fb->dirty_lock, flags);
++
++	if (fb->y1 < y)
++		y = fb->y1;
++	if (fb->y2 > y2)
++		y2 = fb->y2;
++	if (fb->x1 < x)
++		x = fb->x1;
++	if (fb->x2 > x2)
++		x2 = fb->x2;
++
++	if (store_for_later) {
++		fb->x1 = x;
++		fb->x2 = x2;
++		fb->y1 = y;
++		fb->y2 = y2;
++		spin_unlock_irqrestore(&fb->dirty_lock, flags);
++		return 0;
++	}
++
++	fb->x1 = fb->y1 = INT_MAX;
++	fb->x2 = fb->y2 = 0;
++
++	spin_unlock_irqrestore(&fb->dirty_lock, flags);
++	start_cycles = get_cycles();
++
+ 	urb = udl_get_urb(dev);
+ 	if (!urb)
+ 		return 0;
+ 	cmd = urb->transfer_buffer;
+ 
+-	for (i = y; i < y + height ; i++) {
++	for (i = y; i <= y2 ; i++) {
+ 		const int line_offset = fb->base.pitches[0] * i;
+ 		const int byte_offset = line_offset + (x * bpp);
+ 		const int dev_byte_offset = (fb->base.width * bpp * i) + (x * bpp);
+ 		if (udl_render_hline(dev, bpp, &urb,
+ 				     (char *) fb->obj->vmapping,
+ 				     &cmd, byte_offset, dev_byte_offset,
+-				     width * bpp,
++				     (x2 - x + 1) * bpp,
+ 				     &bytes_identical, &bytes_sent))
+ 			goto error;
+ 	}
+@@ -417,6 +452,7 @@ udl_framebuffer_init(struct drm_device *dev,
+ {
+ 	int ret;
+ 
++	spin_lock_init(&ufb->dirty_lock);
+ 	ufb->obj = obj;
+ 	ret = drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs);
+ 	drm_helper_mode_fill_fb_struct(&ufb->base, mode_cmd);
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 5de3bb3..545eab4 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1528,6 +1528,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
++	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+@@ -2025,6 +2026,7 @@ static const struct hid_device_id hid_ignore_list[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_MASTERKIT, USB_DEVICE_ID_MASTERKIT_MA901RADIO) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index ab8ce9f..1c8d114 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -536,6 +536,9 @@
+ #define USB_VENDOR_ID_MADCATZ		0x0738
+ #define USB_DEVICE_ID_MADCATZ_BEATPAD	0x4540
+ 
++#define USB_VENDOR_ID_MASTERKIT			0x16c0
++#define USB_DEVICE_ID_MASTERKIT_MA901RADIO	0x05df
++
+ #define USB_VENDOR_ID_MCC		0x09db
+ #define USB_DEVICE_ID_MCC_PMD1024LS	0x0076
+ #define USB_DEVICE_ID_MCC_PMD1208LS	0x007a
+@@ -681,6 +684,9 @@
+ #define USB_VENDOR_ID_SIGMA_MICRO	0x1c4f
+ #define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD	0x0002
+ 
++#define USB_VENDOR_ID_SIGMATEL		0x066F
++#define USB_DEVICE_ID_SIGMATEL_STMP3780	0x3780
++
+ #define USB_VENDOR_ID_SKYCABLE			0x1223
+ #define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
+ 
+diff --git a/drivers/hid/hid-wiimote-ext.c b/drivers/hid/hid-wiimote-ext.c
+index 0a1805c..ef59c84 100644
+--- a/drivers/hid/hid-wiimote-ext.c
++++ b/drivers/hid/hid-wiimote-ext.c
+@@ -378,14 +378,14 @@ static void handler_nunchuck(struct wiimote_ext *ext, const __u8 *payload)
+ 
+ 	if (ext->motionp) {
+ 		input_report_key(ext->input,
+-			wiiext_keymap[WIIEXT_KEY_Z], !!(payload[5] & 0x04));
++			wiiext_keymap[WIIEXT_KEY_Z], !(payload[5] & 0x04));
+ 		input_report_key(ext->input,
+-			wiiext_keymap[WIIEXT_KEY_C], !!(payload[5] & 0x08));
++			wiiext_keymap[WIIEXT_KEY_C], !(payload[5] & 0x08));
+ 	} else {
+ 		input_report_key(ext->input,
+-			wiiext_keymap[WIIEXT_KEY_Z], !!(payload[5] & 0x01));
++			wiiext_keymap[WIIEXT_KEY_Z], !(payload[5] & 0x01));
+ 		input_report_key(ext->input,
+-			wiiext_keymap[WIIEXT_KEY_C], !!(payload[5] & 0x02));
++			wiiext_keymap[WIIEXT_KEY_C], !(payload[5] & 0x02));
+ 	}
+ 
+ 	input_sync(ext->input);
+diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
+index 8865fa3..eb55cef 100644
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -79,6 +79,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
++	{ USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
+diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
+index 8fa2632..7272176 100644
+--- a/drivers/hwmon/lm73.c
++++ b/drivers/hwmon/lm73.c
+@@ -49,6 +49,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
+ 	struct i2c_client *client = to_i2c_client(dev);
+ 	long temp;
+ 	short value;
++	s32 err;
+ 
+ 	int status = kstrtol(buf, 10, &temp);
+ 	if (status < 0)
+@@ -57,8 +58,8 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
+ 	/* Write value */
+ 	value = (short) SENSORS_LIMIT(temp/250, (LM73_TEMP_MIN*4),
+ 		(LM73_TEMP_MAX*4)) << 5;
+-	i2c_smbus_write_word_swapped(client, attr->index, value);
+-	return count;
++	err = i2c_smbus_write_word_swapped(client, attr->index, value);
++	return (err < 0) ? err : count;
+ }
+ 
+ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+@@ -66,11 +67,16 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+ {
+ 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ 	struct i2c_client *client = to_i2c_client(dev);
++	int temp;
++
++	s32 err = i2c_smbus_read_word_swapped(client, attr->index);
++	if (err < 0)
++		return err;
++
+ 	/* use integer division instead of equivalent right shift to
+ 	   guarantee arithmetic shift and preserve the sign */
+-	int temp = ((s16) (i2c_smbus_read_word_swapped(client,
+-		    attr->index))*250) / 32;
+-	return sprintf(buf, "%d\n", temp);
++	temp = (((s16) err) * 250) / 32;
++	return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
+ }
+ 
+ 
+diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
+index c438e46..3f41d9f 100644
+--- a/drivers/infiniband/hw/nes/nes.h
++++ b/drivers/infiniband/hw/nes/nes.h
+@@ -524,6 +524,7 @@ void nes_iwarp_ce_handler(struct nes_device *, struct nes_hw_cq *);
+ int nes_destroy_cqp(struct nes_device *);
+ int nes_nic_cm_xmit(struct sk_buff *, struct net_device *);
+ void nes_recheck_link_status(struct work_struct *work);
++void nes_terminate_timeout(unsigned long context);
+ 
+ /* nes_nic.c */
+ struct net_device *nes_netdev_init(struct nes_device *, void __iomem *);
+diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
+index d42c9f4..96801c3 100644
+--- a/drivers/infiniband/hw/nes/nes_hw.c
++++ b/drivers/infiniband/hw/nes/nes_hw.c
+@@ -75,7 +75,6 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev,
+ static void process_critical_error(struct nes_device *nesdev);
+ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number);
+ static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_Mode);
+-static void nes_terminate_timeout(unsigned long context);
+ static void nes_terminate_start_timer(struct nes_qp *nesqp);
+ 
+ #ifdef CONFIG_INFINIBAND_NES_DEBUG
+@@ -3522,7 +3521,7 @@ static void nes_terminate_received(struct nes_device *nesdev,
+ }
+ 
+ /* Timeout routine in case terminate fails to complete */
+-static void nes_terminate_timeout(unsigned long context)
++void nes_terminate_timeout(unsigned long context)
+ {
+ 	struct nes_qp *nesqp = (struct nes_qp *)(unsigned long)context;
+ 
+@@ -3532,11 +3531,7 @@ static void nes_terminate_timeout(unsigned long context)
+ /* Set a timer in case hw cannot complete the terminate sequence */
+ static void nes_terminate_start_timer(struct nes_qp *nesqp)
+ {
+-	init_timer(&nesqp->terminate_timer);
+-	nesqp->terminate_timer.function = nes_terminate_timeout;
+-	nesqp->terminate_timer.expires = jiffies + HZ;
+-	nesqp->terminate_timer.data = (unsigned long)nesqp;
+-	add_timer(&nesqp->terminate_timer);
++	mod_timer(&nesqp->terminate_timer, (jiffies + HZ));
+ }
+ 
+ /**
+diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
+index 8b8812d..da84ea3 100644
+--- a/drivers/infiniband/hw/nes/nes_verbs.c
++++ b/drivers/infiniband/hw/nes/nes_verbs.c
+@@ -1404,6 +1404,9 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
+ 	}
+ 
+ 	nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR);
++	init_timer(&nesqp->terminate_timer);
++	nesqp->terminate_timer.function = nes_terminate_timeout;
++	nesqp->terminate_timer.data = (unsigned long)nesqp;
+ 
+ 	/* update the QP table */
+ 	nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp;
+@@ -1413,7 +1416,6 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
+ 	return &nesqp->ibqp;
+ }
+ 
+-
+ /**
+  * nes_clean_cq
+  */
+@@ -2559,6 +2561,11 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+ 			return ibmr;
+ 		case IWNES_MEMREG_TYPE_QP:
+ 		case IWNES_MEMREG_TYPE_CQ:
++			if (!region->length) {
++				nes_debug(NES_DBG_MR, "Unable to register zero length region for CQ\n");
++				ib_umem_release(region);
++				return ERR_PTR(-EINVAL);
++			}
+ 			nespbl = kzalloc(sizeof(*nespbl), GFP_KERNEL);
+ 			if (!nespbl) {
+ 				nes_debug(NES_DBG_MR, "Unable to allocate PBL\n");
+diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
+index 4dfa1ee..f8f892b 100644
+--- a/drivers/input/joystick/walkera0701.c
++++ b/drivers/input/joystick/walkera0701.c
+@@ -196,6 +196,7 @@ static void walkera0701_close(struct input_dev *dev)
+ 	struct walkera_dev *w = input_get_drvdata(dev);
+ 
+ 	parport_disable_irq(w->parport);
++	hrtimer_cancel(&w->timer);
+ }
+ 
+ static int walkera0701_connect(struct walkera_dev *w, int parport)
+@@ -224,6 +225,9 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
+ 	if (parport_claim(w->pardevice))
+ 		goto init_err1;
+ 
++	hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	w->timer.function = timer_handler;
++
+ 	w->input_dev = input_allocate_device();
+ 	if (!w->input_dev)
+ 		goto init_err2;
+@@ -254,8 +258,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
+ 	if (err)
+ 		goto init_err3;
+ 
+-	hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+-	w->timer.function = timer_handler;
+ 	return 0;
+ 
+  init_err3:
+@@ -271,7 +273,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
+ 
+ static void walkera0701_disconnect(struct walkera_dev *w)
+ {
+-	hrtimer_cancel(&w->timer);
+ 	input_unregister_device(w->input_dev);
+ 	parport_release(w->pardevice);
+ 	parport_unregister_device(w->pardevice);
+diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
+index a261d85..c4c9218 100644
+--- a/drivers/input/mouse/sentelic.c
++++ b/drivers/input/mouse/sentelic.c
+@@ -791,7 +791,7 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
+ 			fsp_set_slot(dev, 0, fgrs > 0, abs_x, abs_y);
+ 			fsp_set_slot(dev, 1, false, 0, 0);
+ 		}
+-		if (fgrs > 0) {
++		if (fgrs == 1 || (fgrs == 2 && !(packet[0] & FSP_PB0_MFMC_FGR2))) {
+ 			input_report_abs(dev, ABS_X, abs_x);
+ 			input_report_abs(dev, ABS_Y, abs_y);
+ 		}
+diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
+index d6cc77a..5f306f7 100644
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
+ 	int retval;
+ 
+ #ifdef CONFIG_X86
++	u8 a20_on = 0xdf;
+ 	/* Just return if pre-detection shows no i8042 controller exist */
+ 	if (!x86_platform.i8042_detect())
+ 		return -ENODEV;
+@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
+ 
+ 	if (dmi_check_system(i8042_dmi_dritek_table))
+ 		i8042_dritek = true;
++
++	/*
++	 * A20 was already enabled during early kernel init. But some buggy
++	 * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
++	 * resume from S3. So we do it here and hope that nothing breaks.
++	 */
++	i8042_command(&a20_on, 0x10d1);
++	i8042_command(NULL, 0x00ff);	/* Null command for SMM firmware */
+ #endif /* CONFIG_X86 */
+ 
+ 	return retval;
+diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
+index 18a89b7..2a5e8dd 100644
+--- a/drivers/iommu/amd_iommu_init.c
++++ b/drivers/iommu/amd_iommu_init.c
+@@ -906,6 +906,38 @@ static void __init free_iommu_all(void)
+ }
+ 
+ /*
++ * Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations)
++ * Workaround:
++ *     BIOS should disable L2B micellaneous clock gating by setting
++ *     L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b
++ */
++static void __init amd_iommu_erratum_746_workaround(struct amd_iommu *iommu)
++{
++	u32 value;
++
++	if ((boot_cpu_data.x86 != 0x15) ||
++	    (boot_cpu_data.x86_model < 0x10) ||
++	    (boot_cpu_data.x86_model > 0x1f))
++		return;
++
++	pci_write_config_dword(iommu->dev, 0xf0, 0x90);
++	pci_read_config_dword(iommu->dev, 0xf4, &value);
++
++	if (value & BIT(2))
++		return;
++
++	/* Select NB indirect register 0x90 and enable writing */
++	pci_write_config_dword(iommu->dev, 0xf0, 0x90 | (1 << 8));
++
++	pci_write_config_dword(iommu->dev, 0xf4, value | 0x4);
++	pr_info("AMD-Vi: Applying erratum 746 workaround for IOMMU at %s\n",
++		dev_name(&iommu->dev->dev));
++
++	/* Clear the enable writing bit */
++	pci_write_config_dword(iommu->dev, 0xf0, 0x90);
++}
++
++/*
+  * This function clues the initialization function for one IOMMU
+  * together and also allocates the command buffer and programs the
+  * hardware. It does NOT enable the IOMMU. This is done afterwards.
+@@ -1092,6 +1124,8 @@ static int iommu_init_pci(struct amd_iommu *iommu)
+ 			iommu->stored_l2[i] = iommu_read_l2(iommu, i);
+ 	}
+ 
++	amd_iommu_erratum_746_workaround(iommu);
++
+ 	return pci_enable_device(iommu->dev);
+ }
+ 
+@@ -1667,6 +1701,11 @@ static int amd_iommu_init_dma(void)
+ 	if (ret)
+ 		return ret;
+ 
++	init_device_table_dma();
++
++	for_each_iommu(iommu)
++		iommu_flush_all_caches(iommu);
++
+ 	amd_iommu_init_api();
+ 
+ 	amd_iommu_init_notifier();
+diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
+index 554e6ac..16dc458 100644
+--- a/drivers/iommu/intel-iommu.c
++++ b/drivers/iommu/intel-iommu.c
+@@ -1827,10 +1827,17 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
+ 			if (!pte)
+ 				return -ENOMEM;
+ 			/* It is large page*/
+-			if (largepage_lvl > 1)
++			if (largepage_lvl > 1) {
+ 				pteval |= DMA_PTE_LARGE_PAGE;
+-			else
++				/* Ensure that old small page tables are removed to make room
++				   for superpage, if they exist. */
++				dma_pte_clear_range(domain, iov_pfn,
++						    iov_pfn + lvl_to_nr_pages(largepage_lvl) - 1);
++				dma_pte_free_pagetable(domain, iov_pfn,
++						       iov_pfn + lvl_to_nr_pages(largepage_lvl) - 1);
++			} else {
+ 				pteval &= ~(uint64_t)DMA_PTE_LARGE_PAGE;
++			}
+ 
+ 		}
+ 		/* We don't need lock here, nobody else
+@@ -2320,8 +2327,39 @@ static int domain_add_dev_info(struct dmar_domain *domain,
+ 	return 0;
+ }
+ 
++static bool device_has_rmrr(struct pci_dev *dev)
++{
++	struct dmar_rmrr_unit *rmrr;
++	int i;
++
++	for_each_rmrr_units(rmrr) {
++		for (i = 0; i < rmrr->devices_cnt; i++) {
++			/*
++			 * Return TRUE if this RMRR contains the device that
++			 * is passed in.
++			 */
++			if (rmrr->devices[i] == dev)
++				return true;
++		}
++	}
++	return false;
++}
++
+ static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
+ {
++
++	/*
++	 * We want to prevent any device associated with an RMRR from
++	 * getting placed into the SI Domain. This is done because
++	 * problems exist when devices are moved in and out of domains
++	 * and their respective RMRR info is lost. We exempt USB devices
++	 * from this process due to their usage of RMRRs that are known
++	 * to not be needed after BIOS hand-off to OS.
++	 */
++	if (device_has_rmrr(pdev) &&
++	    (pdev->class >> 8) != PCI_CLASS_SERIAL_USB)
++		return 0;
++
+ 	if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
+ 		return 1;
+ 
+@@ -4196,23 +4234,38 @@ static struct iommu_ops intel_iommu_ops = {
+ 	.pgsize_bitmap	= INTEL_IOMMU_PGSIZES,
+ };
+ 
++static void __devinit quirk_iommu_g4x_gfx(struct pci_dev *dev)
++{
++	/* G4x/GM45 integrated gfx dmar support is totally busted. */
++	printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n");
++	dmar_map_gfx = 0;
++}
++
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_g4x_gfx);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_g4x_gfx);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_g4x_gfx);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e20, quirk_iommu_g4x_gfx);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e30, quirk_iommu_g4x_gfx);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e40, quirk_iommu_g4x_gfx);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e90, quirk_iommu_g4x_gfx);
++
+ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
+ {
+ 	/*
+ 	 * Mobile 4 Series Chipset neglects to set RWBF capability,
+-	 * but needs it:
++	 * but needs it. Same seems to hold for the desktop versions.
+ 	 */
+ 	printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
+ 	rwbf_quirk = 1;
+-
+-	/* https://bugzilla.redhat.com/show_bug.cgi?id=538163 */
+-	if (dev->revision == 0x07) {
+-		printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n");
+-		dmar_map_gfx = 0;
+-	}
+ }
+ 
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_rwbf);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_rwbf);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e20, quirk_iommu_rwbf);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e30, quirk_iommu_rwbf);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e40, quirk_iommu_rwbf);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e90, quirk_iommu_rwbf);
+ 
+ #define GGC 0x52
+ #define GGC_MEMORY_SIZE_MASK	(0xf << 8)
+diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
+index 68452b7..03a0a01 100644
+--- a/drivers/isdn/gigaset/capi.c
++++ b/drivers/isdn/gigaset/capi.c
+@@ -248,6 +248,8 @@ static inline void dump_rawmsg(enum debuglevel level, const char *tag,
+ 		CAPIMSG_APPID(data), CAPIMSG_MSGID(data), l,
+ 		CAPIMSG_CONTROL(data));
+ 	l -= 12;
++	if (l <= 0)
++		return;
+ 	dbgline = kmalloc(3 * l, GFP_ATOMIC);
+ 	if (!dbgline)
+ 		return;
+diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
+index afd9598..a651d52 100644
+--- a/drivers/md/dm-ioctl.c
++++ b/drivers/md/dm-ioctl.c
+@@ -1566,6 +1566,14 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param)
+ 	if (copy_from_user(dmi, user, tmp.data_size))
+ 		goto bad;
+ 
++	/*
++	 * Abort if something changed the ioctl data while it was being copied.
++	 */
++	if (dmi->data_size != tmp.data_size) {
++		DMERR("rejecting ioctl: data size modified while processing parameters");
++		goto bad;
++	}
++
+ 	/* Wipe the user buffer so we do not return it to userspace */
+ 	if (secure_data && clear_user(user, tmp.data_size))
+ 		goto bad;
+diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
+index 5709bfe..accbb05 100644
+--- a/drivers/md/persistent-data/dm-btree-internal.h
++++ b/drivers/md/persistent-data/dm-btree-internal.h
+@@ -36,13 +36,13 @@ struct node_header {
+ 	__le32 padding;
+ } __packed;
+ 
+-struct node {
++struct btree_node {
+ 	struct node_header header;
+ 	__le64 keys[0];
+ } __packed;
+ 
+ 
+-void inc_children(struct dm_transaction_manager *tm, struct node *n,
++void inc_children(struct dm_transaction_manager *tm, struct btree_node *n,
+ 		  struct dm_btree_value_type *vt);
+ 
+ int new_block(struct dm_btree_info *info, struct dm_block **result);
+@@ -64,7 +64,7 @@ struct ro_spine {
+ void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info);
+ int exit_ro_spine(struct ro_spine *s);
+ int ro_step(struct ro_spine *s, dm_block_t new_child);
+-struct node *ro_node(struct ro_spine *s);
++struct btree_node *ro_node(struct ro_spine *s);
+ 
+ struct shadow_spine {
+ 	struct dm_btree_info *info;
+@@ -98,17 +98,17 @@ int shadow_root(struct shadow_spine *s);
+ /*
+  * Some inlines.
+  */
+-static inline __le64 *key_ptr(struct node *n, uint32_t index)
++static inline __le64 *key_ptr(struct btree_node *n, uint32_t index)
+ {
+ 	return n->keys + index;
+ }
+ 
+-static inline void *value_base(struct node *n)
++static inline void *value_base(struct btree_node *n)
+ {
+ 	return &n->keys[le32_to_cpu(n->header.max_entries)];
+ }
+ 
+-static inline void *value_ptr(struct node *n, uint32_t index)
++static inline void *value_ptr(struct btree_node *n, uint32_t index)
+ {
+ 	uint32_t value_size = le32_to_cpu(n->header.value_size);
+ 	return value_base(n) + (value_size * index);
+@@ -117,7 +117,7 @@ static inline void *value_ptr(struct node *n, uint32_t index)
+ /*
+  * Assumes the values are suitably-aligned and converts to core format.
+  */
+-static inline uint64_t value64(struct node *n, uint32_t index)
++static inline uint64_t value64(struct btree_node *n, uint32_t index)
+ {
+ 	__le64 *values_le = value_base(n);
+ 
+@@ -127,7 +127,7 @@ static inline uint64_t value64(struct node *n, uint32_t index)
+ /*
+  * Searching for a key within a single node.
+  */
+-int lower_bound(struct node *n, uint64_t key);
++int lower_bound(struct btree_node *n, uint64_t key);
+ 
+ extern struct dm_block_validator btree_node_validator;
+ 
+diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
+index aa71e23..c4f2813 100644
+--- a/drivers/md/persistent-data/dm-btree-remove.c
++++ b/drivers/md/persistent-data/dm-btree-remove.c
+@@ -53,7 +53,7 @@
+ /*
+  * Some little utilities for moving node data around.
+  */
+-static void node_shift(struct node *n, int shift)
++static void node_shift(struct btree_node *n, int shift)
+ {
+ 	uint32_t nr_entries = le32_to_cpu(n->header.nr_entries);
+ 	uint32_t value_size = le32_to_cpu(n->header.value_size);
+@@ -79,7 +79,7 @@ static void node_shift(struct node *n, int shift)
+ 	}
+ }
+ 
+-static void node_copy(struct node *left, struct node *right, int shift)
++static void node_copy(struct btree_node *left, struct btree_node *right, int shift)
+ {
+ 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
+ 	uint32_t value_size = le32_to_cpu(left->header.value_size);
+@@ -108,7 +108,7 @@ static void node_copy(struct node *left, struct node *right, int shift)
+ /*
+  * Delete a specific entry from a leaf node.
+  */
+-static void delete_at(struct node *n, unsigned index)
++static void delete_at(struct btree_node *n, unsigned index)
+ {
+ 	unsigned nr_entries = le32_to_cpu(n->header.nr_entries);
+ 	unsigned nr_to_copy = nr_entries - (index + 1);
+@@ -128,7 +128,7 @@ static void delete_at(struct node *n, unsigned index)
+ 	n->header.nr_entries = cpu_to_le32(nr_entries - 1);
+ }
+ 
+-static unsigned merge_threshold(struct node *n)
++static unsigned merge_threshold(struct btree_node *n)
+ {
+ 	return le32_to_cpu(n->header.max_entries) / 3;
+ }
+@@ -136,7 +136,7 @@ static unsigned merge_threshold(struct node *n)
+ struct child {
+ 	unsigned index;
+ 	struct dm_block *block;
+-	struct node *n;
++	struct btree_node *n;
+ };
+ 
+ static struct dm_btree_value_type le64_type = {
+@@ -147,7 +147,7 @@ static struct dm_btree_value_type le64_type = {
+ 	.equal = NULL
+ };
+ 
+-static int init_child(struct dm_btree_info *info, struct node *parent,
++static int init_child(struct dm_btree_info *info, struct btree_node *parent,
+ 		      unsigned index, struct child *result)
+ {
+ 	int r, inc;
+@@ -177,7 +177,7 @@ static int exit_child(struct dm_btree_info *info, struct child *c)
+ 	return dm_tm_unlock(info->tm, c->block);
+ }
+ 
+-static void shift(struct node *left, struct node *right, int count)
++static void shift(struct btree_node *left, struct btree_node *right, int count)
+ {
+ 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
+ 	uint32_t nr_right = le32_to_cpu(right->header.nr_entries);
+@@ -203,11 +203,11 @@ static void shift(struct node *left, struct node *right, int count)
+ 	right->header.nr_entries = cpu_to_le32(nr_right + count);
+ }
+ 
+-static void __rebalance2(struct dm_btree_info *info, struct node *parent,
++static void __rebalance2(struct dm_btree_info *info, struct btree_node *parent,
+ 			 struct child *l, struct child *r)
+ {
+-	struct node *left = l->n;
+-	struct node *right = r->n;
++	struct btree_node *left = l->n;
++	struct btree_node *right = r->n;
+ 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
+ 	uint32_t nr_right = le32_to_cpu(right->header.nr_entries);
+ 	unsigned threshold = 2 * merge_threshold(left) + 1;
+@@ -239,7 +239,7 @@ static int rebalance2(struct shadow_spine *s, struct dm_btree_info *info,
+ 		      unsigned left_index)
+ {
+ 	int r;
+-	struct node *parent;
++	struct btree_node *parent;
+ 	struct child left, right;
+ 
+ 	parent = dm_block_data(shadow_current(s));
+@@ -270,9 +270,9 @@ static int rebalance2(struct shadow_spine *s, struct dm_btree_info *info,
+  * in right, then rebalance2.  This wastes some cpu, but I want something
+  * simple atm.
+  */
+-static void delete_center_node(struct dm_btree_info *info, struct node *parent,
++static void delete_center_node(struct dm_btree_info *info, struct btree_node *parent,
+ 			       struct child *l, struct child *c, struct child *r,
+-			       struct node *left, struct node *center, struct node *right,
++			       struct btree_node *left, struct btree_node *center, struct btree_node *right,
+ 			       uint32_t nr_left, uint32_t nr_center, uint32_t nr_right)
+ {
+ 	uint32_t max_entries = le32_to_cpu(left->header.max_entries);
+@@ -301,9 +301,9 @@ static void delete_center_node(struct dm_btree_info *info, struct node *parent,
+ /*
+  * Redistributes entries among 3 sibling nodes.
+  */
+-static void redistribute3(struct dm_btree_info *info, struct node *parent,
++static void redistribute3(struct dm_btree_info *info, struct btree_node *parent,
+ 			  struct child *l, struct child *c, struct child *r,
+-			  struct node *left, struct node *center, struct node *right,
++			  struct btree_node *left, struct btree_node *center, struct btree_node *right,
+ 			  uint32_t nr_left, uint32_t nr_center, uint32_t nr_right)
+ {
+ 	int s;
+@@ -343,12 +343,12 @@ static void redistribute3(struct dm_btree_info *info, struct node *parent,
+ 	*key_ptr(parent, r->index) = right->keys[0];
+ }
+ 
+-static void __rebalance3(struct dm_btree_info *info, struct node *parent,
++static void __rebalance3(struct dm_btree_info *info, struct btree_node *parent,
+ 			 struct child *l, struct child *c, struct child *r)
+ {
+-	struct node *left = l->n;
+-	struct node *center = c->n;
+-	struct node *right = r->n;
++	struct btree_node *left = l->n;
++	struct btree_node *center = c->n;
++	struct btree_node *right = r->n;
+ 
+ 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
+ 	uint32_t nr_center = le32_to_cpu(center->header.nr_entries);
+@@ -371,7 +371,7 @@ static int rebalance3(struct shadow_spine *s, struct dm_btree_info *info,
+ 		      unsigned left_index)
+ {
+ 	int r;
+-	struct node *parent = dm_block_data(shadow_current(s));
++	struct btree_node *parent = dm_block_data(shadow_current(s));
+ 	struct child left, center, right;
+ 
+ 	/*
+@@ -421,7 +421,7 @@ static int get_nr_entries(struct dm_transaction_manager *tm,
+ {
+ 	int r;
+ 	struct dm_block *block;
+-	struct node *n;
++	struct btree_node *n;
+ 
+ 	r = dm_tm_read_lock(tm, b, &btree_node_validator, &block);
+ 	if (r)
+@@ -438,7 +438,7 @@ static int rebalance_children(struct shadow_spine *s,
+ {
+ 	int i, r, has_left_sibling, has_right_sibling;
+ 	uint32_t child_entries;
+-	struct node *n;
++	struct btree_node *n;
+ 
+ 	n = dm_block_data(shadow_current(s));
+ 
+@@ -483,7 +483,7 @@ static int rebalance_children(struct shadow_spine *s,
+ 	return r;
+ }
+ 
+-static int do_leaf(struct node *n, uint64_t key, unsigned *index)
++static int do_leaf(struct btree_node *n, uint64_t key, unsigned *index)
+ {
+ 	int i = lower_bound(n, key);
+ 
+@@ -506,7 +506,7 @@ static int remove_raw(struct shadow_spine *s, struct dm_btree_info *info,
+ 		      uint64_t key, unsigned *index)
+ {
+ 	int i = *index, r;
+-	struct node *n;
++	struct btree_node *n;
+ 
+ 	for (;;) {
+ 		r = shadow_step(s, root, vt);
+@@ -556,7 +556,7 @@ int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
+ 	unsigned level, last_level = info->levels - 1;
+ 	int index = 0, r = 0;
+ 	struct shadow_spine spine;
+-	struct node *n;
++	struct btree_node *n;
+ 
+ 	init_shadow_spine(&spine, info);
+ 	for (level = 0; level < info->levels; level++) {
+diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
+index d9a7912..2f0805c 100644
+--- a/drivers/md/persistent-data/dm-btree-spine.c
++++ b/drivers/md/persistent-data/dm-btree-spine.c
+@@ -23,7 +23,7 @@ static void node_prepare_for_write(struct dm_block_validator *v,
+ 				   struct dm_block *b,
+ 				   size_t block_size)
+ {
+-	struct node *n = dm_block_data(b);
++	struct btree_node *n = dm_block_data(b);
+ 	struct node_header *h = &n->header;
+ 
+ 	h->blocknr = cpu_to_le64(dm_block_location(b));
+@@ -38,7 +38,7 @@ static int node_check(struct dm_block_validator *v,
+ 		      struct dm_block *b,
+ 		      size_t block_size)
+ {
+-	struct node *n = dm_block_data(b);
++	struct btree_node *n = dm_block_data(b);
+ 	struct node_header *h = &n->header;
+ 	size_t value_size;
+ 	__le32 csum_disk;
+@@ -164,7 +164,7 @@ int ro_step(struct ro_spine *s, dm_block_t new_child)
+ 	return r;
+ }
+ 
+-struct node *ro_node(struct ro_spine *s)
++struct btree_node *ro_node(struct ro_spine *s)
+ {
+ 	struct dm_block *block;
+ 
+diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
+index d12b2cc..371f3d4 100644
+--- a/drivers/md/persistent-data/dm-btree.c
++++ b/drivers/md/persistent-data/dm-btree.c
+@@ -38,7 +38,7 @@ static void array_insert(void *base, size_t elt_size, unsigned nr_elts,
+ /*----------------------------------------------------------------*/
+ 
+ /* makes the assumption that no two keys are the same. */
+-static int bsearch(struct node *n, uint64_t key, int want_hi)
++static int bsearch(struct btree_node *n, uint64_t key, int want_hi)
+ {
+ 	int lo = -1, hi = le32_to_cpu(n->header.nr_entries);
+ 
+@@ -58,12 +58,12 @@ static int bsearch(struct node *n, uint64_t key, int want_hi)
+ 	return want_hi ? hi : lo;
+ }
+ 
+-int lower_bound(struct node *n, uint64_t key)
++int lower_bound(struct btree_node *n, uint64_t key)
+ {
+ 	return bsearch(n, key, 0);
+ }
+ 
+-void inc_children(struct dm_transaction_manager *tm, struct node *n,
++void inc_children(struct dm_transaction_manager *tm, struct btree_node *n,
+ 		  struct dm_btree_value_type *vt)
+ {
+ 	unsigned i;
+@@ -77,7 +77,7 @@ void inc_children(struct dm_transaction_manager *tm, struct node *n,
+ 			vt->inc(vt->context, value_ptr(n, i));
+ }
+ 
+-static int insert_at(size_t value_size, struct node *node, unsigned index,
++static int insert_at(size_t value_size, struct btree_node *node, unsigned index,
+ 		      uint64_t key, void *value)
+ 		      __dm_written_to_disk(value)
+ {
+@@ -122,7 +122,7 @@ int dm_btree_empty(struct dm_btree_info *info, dm_block_t *root)
+ {
+ 	int r;
+ 	struct dm_block *b;
+-	struct node *n;
++	struct btree_node *n;
+ 	size_t block_size;
+ 	uint32_t max_entries;
+ 
+@@ -154,7 +154,7 @@ EXPORT_SYMBOL_GPL(dm_btree_empty);
+ #define MAX_SPINE_DEPTH 64
+ struct frame {
+ 	struct dm_block *b;
+-	struct node *n;
++	struct btree_node *n;
+ 	unsigned level;
+ 	unsigned nr_children;
+ 	unsigned current_child;
+@@ -295,7 +295,7 @@ EXPORT_SYMBOL_GPL(dm_btree_del);
+ /*----------------------------------------------------------------*/
+ 
+ static int btree_lookup_raw(struct ro_spine *s, dm_block_t block, uint64_t key,
+-			    int (*search_fn)(struct node *, uint64_t),
++			    int (*search_fn)(struct btree_node *, uint64_t),
+ 			    uint64_t *result_key, void *v, size_t value_size)
+ {
+ 	int i, r;
+@@ -406,7 +406,7 @@ static int btree_split_sibling(struct shadow_spine *s, dm_block_t root,
+ 	size_t size;
+ 	unsigned nr_left, nr_right;
+ 	struct dm_block *left, *right, *parent;
+-	struct node *ln, *rn, *pn;
++	struct btree_node *ln, *rn, *pn;
+ 	__le64 location;
+ 
+ 	left = shadow_current(s);
+@@ -491,7 +491,7 @@ static int btree_split_beneath(struct shadow_spine *s, uint64_t key)
+ 	size_t size;
+ 	unsigned nr_left, nr_right;
+ 	struct dm_block *left, *right, *new_parent;
+-	struct node *pn, *ln, *rn;
++	struct btree_node *pn, *ln, *rn;
+ 	__le64 val;
+ 
+ 	new_parent = shadow_current(s);
+@@ -576,7 +576,7 @@ static int btree_insert_raw(struct shadow_spine *s, dm_block_t root,
+ 			    uint64_t key, unsigned *index)
+ {
+ 	int r, i = *index, top = 1;
+-	struct node *node;
++	struct btree_node *node;
+ 
+ 	for (;;) {
+ 		r = shadow_step(s, root, vt);
+@@ -643,7 +643,7 @@ static int insert(struct dm_btree_info *info, dm_block_t root,
+ 	unsigned level, index = -1, last_level = info->levels - 1;
+ 	dm_block_t block = root;
+ 	struct shadow_spine spine;
+-	struct node *n;
++	struct btree_node *n;
+ 	struct dm_btree_value_type le64_type;
+ 
+ 	le64_type.context = NULL;
+diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
+index cabc19c..cec1f8c 100644
+--- a/drivers/media/rc/rc-main.c
++++ b/drivers/media/rc/rc-main.c
+@@ -778,8 +778,10 @@ static ssize_t show_protocols(struct device *device,
+ 	} else if (dev->raw) {
+ 		enabled = dev->raw->enabled_protocols;
+ 		allowed = ir_raw_get_allowed_protocols();
+-	} else
++	} else {
++		mutex_unlock(&dev->lock);
+ 		return -ENODEV;
++	}
+ 
+ 	IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n",
+ 		   (long long)allowed,
+diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
+index f8b7771..7604f4e 100644
+--- a/drivers/mfd/mfd-core.c
++++ b/drivers/mfd/mfd-core.c
+@@ -21,6 +21,10 @@
+ #include <linux/irqdomain.h>
+ #include <linux/of.h>
+ 
++static struct device_type mfd_dev_type = {
++	.name	= "mfd_device",
++};
++
+ int mfd_cell_enable(struct platform_device *pdev)
+ {
+ 	const struct mfd_cell *cell = mfd_get_cell(pdev);
+@@ -91,6 +95,7 @@ static int mfd_add_device(struct device *parent, int id,
+ 		goto fail_device;
+ 
+ 	pdev->dev.parent = parent;
++	pdev->dev.type = &mfd_dev_type;
+ 
+ 	if (parent->of_node && cell->of_compatible) {
+ 		for_each_child_of_node(parent->of_node, np) {
+@@ -204,10 +209,16 @@ EXPORT_SYMBOL(mfd_add_devices);
+ 
+ static int mfd_remove_devices_fn(struct device *dev, void *c)
+ {
+-	struct platform_device *pdev = to_platform_device(dev);
+-	const struct mfd_cell *cell = mfd_get_cell(pdev);
++	struct platform_device *pdev;
++	const struct mfd_cell *cell;
+ 	atomic_t **usage_count = c;
+ 
++	if (dev->type != &mfd_dev_type)
++		return 0;
++
++	pdev = to_platform_device(dev);
++	cell = mfd_get_cell(pdev);
++
+ 	/* find the base address of usage_count pointers (for freeing) */
+ 	if (!*usage_count || (cell->usage_count < *usage_count))
+ 		*usage_count = cell->usage_count;
+diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
+index 2febf88..38de846 100644
+--- a/drivers/mfd/wm8994-core.c
++++ b/drivers/mfd/wm8994-core.c
+@@ -557,6 +557,7 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)
+ 		case 1:
+ 		case 2:
+ 		case 3:
++		case 4:
+ 			regmap_patch = wm1811_reva_patch;
+ 			patch_regs = ARRAY_SIZE(wm1811_reva_patch);
+ 			break;
+diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
+index 8d082b4..d971817 100644
+--- a/drivers/misc/sgi-xp/xpc_main.c
++++ b/drivers/misc/sgi-xp/xpc_main.c
+@@ -53,6 +53,10 @@
+ #include <linux/kthread.h>
+ #include "xpc.h"
+ 
++#ifdef CONFIG_X86_64
++#include <asm/traps.h>
++#endif
++
+ /* define two XPC debug device structures to be used with dev_dbg() et al */
+ 
+ struct device_driver xpc_dbg_name = {
+@@ -1079,6 +1083,9 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
+ 	return NOTIFY_DONE;
+ }
+ 
++/* Used to only allow one cpu to complete disconnect */
++static unsigned int xpc_die_disconnecting;
++
+ /*
+  * Notify other partitions to deactivate from us by first disengaging from all
+  * references to our memory.
+@@ -1092,6 +1099,9 @@ xpc_die_deactivate(void)
+ 	long keep_waiting;
+ 	long wait_to_print;
+ 
++	if (cmpxchg(&xpc_die_disconnecting, 0, 1))
++		return;
++
+ 	/* keep xpc_hb_checker thread from doing anything (just in case) */
+ 	xpc_exiting = 1;
+ 
+@@ -1159,7 +1169,7 @@ xpc_die_deactivate(void)
+  * about the lack of a heartbeat.
+  */
+ static int
+-xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
++xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
+ {
+ #ifdef CONFIG_IA64		/* !!! temporary kludge */
+ 	switch (event) {
+@@ -1191,7 +1201,27 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
+ 		break;
+ 	}
+ #else
+-	xpc_die_deactivate();
++	struct die_args *die_args = _die_args;
++
++	switch (event) {
++	case DIE_TRAP:
++		if (die_args->trapnr == X86_TRAP_DF)
++			xpc_die_deactivate();
++
++		if (((die_args->trapnr == X86_TRAP_MF) ||
++		     (die_args->trapnr == X86_TRAP_XF)) &&
++		    !user_mode_vm(die_args->regs))
++			xpc_die_deactivate();
++
++		break;
++	case DIE_INT3:
++	case DIE_DEBUG:
++		break;
++	case DIE_OOPS:
++	case DIE_GPF:
++	default:
++		xpc_die_deactivate();
++	}
+ #endif
+ 
+ 	return NOTIFY_DONE;
+diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
+index e23f813..c80c588 100644
+--- a/drivers/mmc/host/sdhci-esdhc-imx.c
++++ b/drivers/mmc/host/sdhci-esdhc-imx.c
+@@ -237,15 +237,18 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
+ 
+ static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
+ {
++	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
++	struct pltfm_imx_data *imx_data = pltfm_host->priv;
++
+ 	if (unlikely(reg == SDHCI_HOST_VERSION)) {
+-		u16 val = readw(host->ioaddr + (reg ^ 2));
+-		/*
+-		 * uSDHC supports SDHCI v3.0, but it's encoded as value
+-		 * 0x3 in host controller version register, which violates
+-		 * SDHCI_SPEC_300 definition.  Work it around here.
+-		 */
+-		if ((val & SDHCI_SPEC_VER_MASK) == 3)
+-			return --val;
++		reg ^= 2;
++		if (is_imx6q_usdhc(imx_data)) {
++			/*
++			 * The usdhc register returns a wrong host version.
++			 * Correct it here.
++			 */
++			return SDHCI_SPEC_300;
++		}
+ 	}
+ 
+ 	return readw(host->ioaddr + reg);
+diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
+index adb6c3e..2cdeab8 100644
+--- a/drivers/mtd/nand/cs553x_nand.c
++++ b/drivers/mtd/nand/cs553x_nand.c
+@@ -237,6 +237,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
+ 	this->ecc.hwctl  = cs_enable_hwecc;
+ 	this->ecc.calculate = cs_calculate_ecc;
+ 	this->ecc.correct  = nand_correct_data;
++	this->ecc.strength = 1;
+ 
+ 	/* Enable the following for a flash based bad block table */
+ 	this->bbt_options = NAND_BBT_USE_FLASH;
+@@ -247,8 +248,6 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
+ 		goto out_ior;
+ 	}
+ 
+-	this->ecc.strength = 1;
+-
+ 	new_mtd->name = kasprintf(GFP_KERNEL, "cs553x_nand_cs%d", cs);
+ 
+ 	cs553x_mtd[cs] = new_mtd;
+diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+index a1f4332..b27e215 100644
+--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
++++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+@@ -136,6 +136,15 @@ int gpmi_init(struct gpmi_nand_data *this)
+ 	if (ret)
+ 		goto err_out;
+ 
++	/*
++	 * Reset BCH here, too. We got failures otherwise :(
++	 * See later BCH reset for explanation of MX23 handling
++	 */
++	ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MX23(this));
++	if (ret)
++		goto err_out;
++
++
+ 	/* Choose NAND mode. */
+ 	writel(BM_GPMI_CTRL1_GPMI_MODE, r->gpmi_regs + HW_GPMI_CTRL1_CLR);
+ 
+diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
+index 4c538e3..f56a48e 100644
+--- a/drivers/net/can/c_can/c_can.c
++++ b/drivers/net/can/c_can/c_can.c
+@@ -918,7 +918,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
+ 		break;
+ 	case LEC_ACK_ERROR:
+ 		netdev_dbg(dev, "ack error\n");
+-		cf->data[2] |= (CAN_ERR_PROT_LOC_ACK |
++		cf->data[3] |= (CAN_ERR_PROT_LOC_ACK |
+ 				CAN_ERR_PROT_LOC_ACK_DEL);
+ 		break;
+ 	case LEC_BIT1_ERROR:
+@@ -931,7 +931,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
+ 		break;
+ 	case LEC_CRC_ERROR:
+ 		netdev_dbg(dev, "CRC error\n");
+-		cf->data[2] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
++		cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
+ 				CAN_ERR_PROT_LOC_CRC_DEL);
+ 		break;
+ 	default:
+diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
+index 963e2cc..8233e5e 100644
+--- a/drivers/net/can/dev.c
++++ b/drivers/net/can/dev.c
+@@ -609,8 +609,7 @@ void close_candev(struct net_device *dev)
+ {
+ 	struct can_priv *priv = netdev_priv(dev);
+ 
+-	if (del_timer_sync(&priv->restart_timer))
+-		dev_put(dev);
++	del_timer_sync(&priv->restart_timer);
+ 	can_flush_echo_skb(dev);
+ }
+ EXPORT_SYMBOL_GPL(close_candev);
+diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
+index 48b3d62..7a43d4d 100644
+--- a/drivers/net/can/pch_can.c
++++ b/drivers/net/can/pch_can.c
+@@ -560,7 +560,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
+ 		stats->rx_errors++;
+ 		break;
+ 	case PCH_CRC_ERR:
+-		cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
++		cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |
+ 			       CAN_ERR_PROT_LOC_CRC_DEL;
+ 		priv->can.can_stats.bus_error++;
+ 		stats->rx_errors++;
+diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
+index 9ded21e..44996a9 100644
+--- a/drivers/net/can/ti_hecc.c
++++ b/drivers/net/can/ti_hecc.c
+@@ -746,12 +746,12 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
+ 		}
+ 		if (err_status & HECC_CANES_CRCE) {
+ 			hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE);
+-			cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
++			cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |
+ 					CAN_ERR_PROT_LOC_CRC_DEL;
+ 		}
+ 		if (err_status & HECC_CANES_ACKE) {
+ 			hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE);
+-			cf->data[2] |= CAN_ERR_PROT_LOC_ACK |
++			cf->data[3] |= CAN_ERR_PROT_LOC_ACK |
+ 					CAN_ERR_PROT_LOC_ACK_DEL;
+ 		}
+ 	}
+diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
+index 711eb14..3756278 100644
+--- a/drivers/net/ethernet/broadcom/tg3.c
++++ b/drivers/net/ethernet/broadcom/tg3.c
+@@ -1245,14 +1245,26 @@ static int tg3_phy_auxctl_write(struct tg3 *tp, int reg, u32 set)
+ 	return tg3_writephy(tp, MII_TG3_AUX_CTRL, set | reg);
+ }
+ 
+-#define TG3_PHY_AUXCTL_SMDSP_ENABLE(tp) \
+-	tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \
+-			     MII_TG3_AUXCTL_ACTL_SMDSP_ENA | \
+-			     MII_TG3_AUXCTL_ACTL_TX_6DB)
++static int tg3_phy_toggle_auxctl_smdsp(struct tg3 *tp, bool enable)
++{
++	u32 val;
++	int err;
+ 
+-#define TG3_PHY_AUXCTL_SMDSP_DISABLE(tp) \
+-	tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \
+-			     MII_TG3_AUXCTL_ACTL_TX_6DB);
++	err = tg3_phy_auxctl_read(tp, MII_TG3_AUXCTL_SHDWSEL_AUXCTL, &val);
++
++	if (err)
++		return err;
++	if (enable)
++
++		val |= MII_TG3_AUXCTL_ACTL_SMDSP_ENA;
++	else
++		val &= ~MII_TG3_AUXCTL_ACTL_SMDSP_ENA;
++
++	err = tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL,
++				   val | MII_TG3_AUXCTL_ACTL_TX_6DB);
++
++	return err;
++}
+ 
+ static int tg3_bmcr_reset(struct tg3 *tp)
+ {
+@@ -2185,7 +2197,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp)
+ 
+ 	otp = tp->phy_otp;
+ 
+-	if (TG3_PHY_AUXCTL_SMDSP_ENABLE(tp))
++	if (tg3_phy_toggle_auxctl_smdsp(tp, true))
+ 		return;
+ 
+ 	phy = ((otp & TG3_OTP_AGCTGT_MASK) >> TG3_OTP_AGCTGT_SHIFT);
+@@ -2210,7 +2222,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp)
+ 	      ((otp & TG3_OTP_RCOFF_MASK) >> TG3_OTP_RCOFF_SHIFT);
+ 	tg3_phydsp_write(tp, MII_TG3_DSP_EXP97, phy);
+ 
+-	TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++	tg3_phy_toggle_auxctl_smdsp(tp, false);
+ }
+ 
+ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
+@@ -2246,9 +2258,9 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
+ 
+ 	if (!tp->setlpicnt) {
+ 		if (current_link_up == 1 &&
+-		   !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
++		   !tg3_phy_toggle_auxctl_smdsp(tp, true)) {
+ 			tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000);
+-			TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++			tg3_phy_toggle_auxctl_smdsp(tp, false);
+ 		}
+ 
+ 		val = tr32(TG3_CPMU_EEE_MODE);
+@@ -2264,11 +2276,11 @@ static void tg3_phy_eee_enable(struct tg3 *tp)
+ 	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
+ 	     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
+ 	     tg3_flag(tp, 57765_CLASS)) &&
+-	    !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
++	    !tg3_phy_toggle_auxctl_smdsp(tp, true)) {
+ 		val = MII_TG3_DSP_TAP26_ALNOKO |
+ 		      MII_TG3_DSP_TAP26_RMRXSTO;
+ 		tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val);
+-		TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++		tg3_phy_toggle_auxctl_smdsp(tp, false);
+ 	}
+ 
+ 	val = tr32(TG3_CPMU_EEE_MODE);
+@@ -2412,7 +2424,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
+ 		tg3_writephy(tp, MII_CTRL1000,
+ 			     CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER);
+ 
+-		err = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp);
++		err = tg3_phy_toggle_auxctl_smdsp(tp, true);
+ 		if (err)
+ 			return err;
+ 
+@@ -2433,7 +2445,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
+ 	tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200);
+ 	tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0000);
+ 
+-	TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++	tg3_phy_toggle_auxctl_smdsp(tp, false);
+ 
+ 	tg3_writephy(tp, MII_CTRL1000, phy9_orig);
+ 
+@@ -2522,10 +2534,10 @@ static int tg3_phy_reset(struct tg3 *tp)
+ 
+ out:
+ 	if ((tp->phy_flags & TG3_PHYFLG_ADC_BUG) &&
+-	    !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
++	    !tg3_phy_toggle_auxctl_smdsp(tp, true)) {
+ 		tg3_phydsp_write(tp, 0x201f, 0x2aaa);
+ 		tg3_phydsp_write(tp, 0x000a, 0x0323);
+-		TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++		tg3_phy_toggle_auxctl_smdsp(tp, false);
+ 	}
+ 
+ 	if (tp->phy_flags & TG3_PHYFLG_5704_A0_BUG) {
+@@ -2534,14 +2546,14 @@ out:
+ 	}
+ 
+ 	if (tp->phy_flags & TG3_PHYFLG_BER_BUG) {
+-		if (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
++		if (!tg3_phy_toggle_auxctl_smdsp(tp, true)) {
+ 			tg3_phydsp_write(tp, 0x000a, 0x310b);
+ 			tg3_phydsp_write(tp, 0x201f, 0x9506);
+ 			tg3_phydsp_write(tp, 0x401f, 0x14e2);
+-			TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++			tg3_phy_toggle_auxctl_smdsp(tp, false);
+ 		}
+ 	} else if (tp->phy_flags & TG3_PHYFLG_JITTER_BUG) {
+-		if (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
++		if (!tg3_phy_toggle_auxctl_smdsp(tp, true)) {
+ 			tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);
+ 			if (tp->phy_flags & TG3_PHYFLG_ADJUST_TRIM) {
+ 				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x110b);
+@@ -2550,7 +2562,7 @@ out:
+ 			} else
+ 				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x010b);
+ 
+-			TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++			tg3_phy_toggle_auxctl_smdsp(tp, false);
+ 		}
+ 	}
+ 
+@@ -3967,7 +3979,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)
+ 	tw32(TG3_CPMU_EEE_MODE,
+ 	     tr32(TG3_CPMU_EEE_MODE) & ~TG3_CPMU_EEEMD_LPI_ENABLE);
+ 
+-	err = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp);
++	err = tg3_phy_toggle_auxctl_smdsp(tp, true);
+ 	if (!err) {
+ 		u32 err2;
+ 
+@@ -4000,7 +4012,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)
+ 						 MII_TG3_DSP_CH34TP2_HIBW01);
+ 		}
+ 
+-		err2 = TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
++		err2 = tg3_phy_toggle_auxctl_smdsp(tp, false);
+ 		if (!err)
+ 			err = err2;
+ 	}
+@@ -6703,6 +6715,9 @@ static void tg3_poll_controller(struct net_device *dev)
+ 	int i;
+ 	struct tg3 *tp = netdev_priv(dev);
+ 
++	if (tg3_irq_sync(tp))
++		return;
++
+ 	for (i = 0; i < tp->irq_cnt; i++)
+ 		tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]);
+ }
+@@ -15806,6 +15821,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
+ 	tp->pm_cap = pm_cap;
+ 	tp->rx_mode = TG3_DEF_RX_MODE;
+ 	tp->tx_mode = TG3_DEF_TX_MODE;
++	tp->irq_sync = 1;
+ 
+ 	if (tg3_debug > 0)
+ 		tp->msg_enable = tg3_debug;
+diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
+index 16814b3..e29c1b6 100644
+--- a/drivers/net/ethernet/calxeda/xgmac.c
++++ b/drivers/net/ethernet/calxeda/xgmac.c
+@@ -546,6 +546,10 @@ static int desc_get_rx_status(struct xgmac_priv *priv, struct xgmac_dma_desc *p)
+ 		return -1;
+ 	}
+ 
++	/* All frames should fit into a single buffer */
++	if (!(status & RXDESC_FIRST_SEG) || !(status & RXDESC_LAST_SEG))
++		return -1;
++
+ 	/* Check if packet has checksum already */
+ 	if ((status & RXDESC_FRAME_TYPE) && (status & RXDESC_EXT_STATUS) &&
+ 		!(ext_status & RXDESC_IP_PAYLOAD_MASK))
+diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
+index 48cc4fb..8a747b7 100644
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -936,17 +936,18 @@ static int igb_request_msix(struct igb_adapter *adapter)
+ {
+ 	struct net_device *netdev = adapter->netdev;
+ 	struct e1000_hw *hw = &adapter->hw;
+-	int i, err = 0, vector = 0;
++	int i, err = 0, vector = 0, free_vector = 0;
+ 
+ 	err = request_irq(adapter->msix_entries[vector].vector,
+ 	                  igb_msix_other, 0, netdev->name, adapter);
+ 	if (err)
+-		goto out;
+-	vector++;
++		goto err_out;
+ 
+ 	for (i = 0; i < adapter->num_q_vectors; i++) {
+ 		struct igb_q_vector *q_vector = adapter->q_vector[i];
+ 
++		vector++;
++
+ 		q_vector->itr_register = hw->hw_addr + E1000_EITR(vector);
+ 
+ 		if (q_vector->rx.ring && q_vector->tx.ring)
+@@ -965,13 +966,22 @@ static int igb_request_msix(struct igb_adapter *adapter)
+ 		                  igb_msix_ring, 0, q_vector->name,
+ 		                  q_vector);
+ 		if (err)
+-			goto out;
+-		vector++;
++			goto err_free;
+ 	}
+ 
+ 	igb_configure_msix(adapter);
+ 	return 0;
+-out:
++
++err_free:
++	/* free already assigned IRQs */
++	free_irq(adapter->msix_entries[free_vector++].vector, adapter);
++
++	vector--;
++	for (i = 0; i < vector; i++) {
++		free_irq(adapter->msix_entries[free_vector++].vector,
++			 adapter->q_vector[i]);
++	}
++err_out:
+ 	return err;
+ }
+ 
+@@ -4661,11 +4671,13 @@ void igb_update_stats(struct igb_adapter *adapter,
+ 	bytes = 0;
+ 	packets = 0;
+ 	for (i = 0; i < adapter->num_rx_queues; i++) {
+-		u32 rqdpc_tmp = rd32(E1000_RQDPC(i)) & 0x0FFF;
++		u32 rqdpc = rd32(E1000_RQDPC(i));
+ 		struct igb_ring *ring = adapter->rx_ring[i];
+ 
+-		ring->rx_stats.drops += rqdpc_tmp;
+-		net_stats->rx_fifo_errors += rqdpc_tmp;
++		if (rqdpc) {
++			ring->rx_stats.drops += rqdpc;
++			net_stats->rx_fifo_errors += rqdpc;
++		}
+ 
+ 		do {
+ 			start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
+diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+index 10bba09..2af24ba 100644
+--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
++++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+@@ -630,10 +630,15 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
+ 		ring->tx_csum++;
+ 	}
+ 
+-	/* Copy dst mac address to wqe */
+-	ethh = (struct ethhdr *)skb->data;
+-	tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest);
+-	tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2));
++	if (mlx4_is_mfunc(mdev->dev) || priv->validate_loopback) {
++		/* Copy dst mac address to wqe. This allows loopback in eSwitch,
++		 * so that VFs and PF can communicate with each other
++		 */
++		ethh = (struct ethhdr *)skb->data;
++		tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest);
++		tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2));
++	}
++
+ 	/* Handle LSO (TSO) packets */
+ 	if (lso_header_size) {
+ 		/* Mark opcode as LSO */
+diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
+index 2f816c6..8ca1ed8 100644
+--- a/drivers/net/ethernet/mellanox/mlx4/main.c
++++ b/drivers/net/ethernet/mellanox/mlx4/main.c
+@@ -1630,15 +1630,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
+ 	int i;
+ 
+ 	if (msi_x) {
+-		/* In multifunction mode each function gets 2 msi-X vectors
+-		 * one for data path completions anf the other for asynch events
+-		 * or command completions */
+-		if (mlx4_is_mfunc(dev)) {
+-			nreq = 2;
+-		} else {
+-			nreq = min_t(int, dev->caps.num_eqs -
+-				     dev->caps.reserved_eqs, nreq);
+-		}
++		nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
++			     nreq);
+ 
+ 		entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
+ 		if (!entries)
+diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+index bc165f4..695667d 100644
+--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
++++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+@@ -144,7 +144,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter)
+ 					 buffrag->length, PCI_DMA_TODEVICE);
+ 			buffrag->dma = 0ULL;
+ 		}
+-		for (j = 0; j < cmd_buf->frag_count; j++) {
++		for (j = 1; j < cmd_buf->frag_count; j++) {
+ 			buffrag++;
+ 			if (buffrag->dma) {
+ 				pci_unmap_page(adapter->pdev, buffrag->dma,
+diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+index a77c558..d6a8218 100644
+--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
++++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+@@ -1963,10 +1963,12 @@ unwind:
+ 	while (--i >= 0) {
+ 		nf = &pbuf->frag_array[i+1];
+ 		pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE);
++		nf->dma = 0ULL;
+ 	}
+ 
+ 	nf = &pbuf->frag_array[0];
+ 	pci_unmap_single(pdev, nf->dma, skb_headlen(skb), PCI_DMA_TODEVICE);
++	nf->dma = 0ULL;
+ 
+ out_err:
+ 	return -ENOMEM;
+diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
+index df7bbba..6c1c396 100644
+--- a/drivers/net/ethernet/realtek/r8169.c
++++ b/drivers/net/ethernet/realtek/r8169.c
+@@ -6088,13 +6088,6 @@ process_pkt:
+ 			tp->rx_stats.bytes += pkt_size;
+ 			u64_stats_update_end(&tp->rx_stats.syncp);
+ 		}
+-
+-		/* Work around for AMD plateform. */
+-		if ((desc->opts2 & cpu_to_le32(0xfffe000)) &&
+-		    (tp->mac_version == RTL_GIGA_MAC_VER_05)) {
+-			desc->opts2 = 0;
+-			cur_rx++;
+-		}
+ 	}
+ 
+ 	count = cur_rx - tp->cur_rx;
+diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
+index 0459c09..046526e0 100644
+--- a/drivers/net/ethernet/via/via-rhine.c
++++ b/drivers/net/ethernet/via/via-rhine.c
+@@ -1802,7 +1802,7 @@ static void rhine_tx(struct net_device *dev)
+ 					 rp->tx_skbuff[entry]->len,
+ 					 PCI_DMA_TODEVICE);
+ 		}
+-		dev_kfree_skb_irq(rp->tx_skbuff[entry]);
++		dev_kfree_skb(rp->tx_skbuff[entry]);
+ 		rp->tx_skbuff[entry] = NULL;
+ 		entry = (++rp->dirty_tx) % TX_RING_SIZE;
+ 	}
+@@ -2011,11 +2011,7 @@ static void rhine_slow_event_task(struct work_struct *work)
+ 	if (intr_status & IntrPCIErr)
+ 		netif_warn(rp, hw, dev, "PCI error\n");
+ 
+-	napi_disable(&rp->napi);
+-	rhine_irq_disable(rp);
+-	/* Slow and safe. Consider __napi_schedule as a replacement ? */
+-	napi_enable(&rp->napi);
+-	napi_schedule(&rp->napi);
++	iowrite16(RHINE_EVENT & 0xffff, rp->base + IntrEnable);
+ 
+ out_unlock:
+ 	mutex_unlock(&rp->task_lock);
+diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
+index e2a06fd..ba61c33 100644
+--- a/drivers/net/loopback.c
++++ b/drivers/net/loopback.c
+@@ -77,6 +77,11 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
+ 
+ 	skb_orphan(skb);
+ 
++	/* Before queueing this packet to netif_rx(),
++	 * make sure dst is refcounted.
++	 */
++	skb_dst_force(skb);
++
+ 	skb->protocol = eth_type_trans(skb, dev);
+ 
+ 	/* it's OK to use per_cpu_ptr() because BHs are off */
+diff --git a/drivers/net/wimax/i2400m/i2400m-usb.h b/drivers/net/wimax/i2400m/i2400m-usb.h
+index 6650fde..9f1e947 100644
+--- a/drivers/net/wimax/i2400m/i2400m-usb.h
++++ b/drivers/net/wimax/i2400m/i2400m-usb.h
+@@ -152,6 +152,9 @@ enum {
+ 	/* Device IDs */
+ 	USB_DEVICE_ID_I6050 = 0x0186,
+ 	USB_DEVICE_ID_I6050_2 = 0x0188,
++	USB_DEVICE_ID_I6150 = 0x07d6,
++	USB_DEVICE_ID_I6150_2 = 0x07d7,
++	USB_DEVICE_ID_I6150_3 = 0x07d9,
+ 	USB_DEVICE_ID_I6250 = 0x0187,
+ };
+ 
+diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
+index 713d033..080f363 100644
+--- a/drivers/net/wimax/i2400m/usb.c
++++ b/drivers/net/wimax/i2400m/usb.c
+@@ -510,6 +510,9 @@ int i2400mu_probe(struct usb_interface *iface,
+ 	switch (id->idProduct) {
+ 	case USB_DEVICE_ID_I6050:
+ 	case USB_DEVICE_ID_I6050_2:
++	case USB_DEVICE_ID_I6150:
++	case USB_DEVICE_ID_I6150_2:
++	case USB_DEVICE_ID_I6150_3:
+ 	case USB_DEVICE_ID_I6250:
+ 		i2400mu->i6050 = 1;
+ 		break;
+@@ -759,6 +762,9 @@ static
+ struct usb_device_id i2400mu_id_table[] = {
+ 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) },
+ 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) },
++	{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150) },
++	{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_2) },
++	{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_3) },
+ 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6250) },
+ 	{ USB_DEVICE(0x8086, 0x0181) },
+ 	{ USB_DEVICE(0x8086, 0x1403) },
+diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
+index 2aab20e..68a4046 100644
+--- a/drivers/net/wireless/ath/ath5k/base.c
++++ b/drivers/net/wireless/ath/ath5k/base.c
+@@ -848,7 +848,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf)
+ 		return;
+ 	dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
+ 			DMA_TO_DEVICE);
+-	dev_kfree_skb_any(bf->skb);
++	ieee80211_free_txskb(ah->hw, bf->skb);
+ 	bf->skb = NULL;
+ 	bf->skbaddr = 0;
+ 	bf->desc->ds_data = 0;
+@@ -1575,7 +1575,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
+ 	return;
+ 
+ drop_packet:
+-	dev_kfree_skb_any(skb);
++	ieee80211_free_txskb(hw, skb);
+ }
+ 
+ static void
+diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+index d56453e..b010a77 100644
+--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
++++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+@@ -61,7 +61,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+ 	u16 qnum = skb_get_queue_mapping(skb);
+ 
+ 	if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
+-		dev_kfree_skb_any(skb);
++		ieee80211_free_txskb(hw, skb);
+ 		return;
+ 	}
+ 
+diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+index 6f7cf49..262e1e0 100644
+--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+@@ -534,98 +534,98 @@ static const u32 ar9300_2p2_baseband_core[][2] = {
+ 
+ static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
+ 	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+-	{0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+-	{0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+-	{0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
++	{0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++	{0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++	{0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ 	{0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+-	{0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+-	{0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-	{0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+-	{0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+-	{0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+-	{0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
+-	{0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
+-	{0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
+-	{0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
+-	{0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
+-	{0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
+-	{0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
+-	{0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
+-	{0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
+-	{0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
+-	{0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
+-	{0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
+-	{0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
+-	{0x0000a544, 0x52022470, 0x52022470, 0x3f001861, 0x3f001861},
+-	{0x0000a548, 0x55022490, 0x55022490, 0x43001a81, 0x43001a81},
+-	{0x0000a54c, 0x59022492, 0x59022492, 0x47001a83, 0x47001a83},
+-	{0x0000a550, 0x5d022692, 0x5d022692, 0x4a001c84, 0x4a001c84},
+-	{0x0000a554, 0x61022892, 0x61022892, 0x4e001ce3, 0x4e001ce3},
+-	{0x0000a558, 0x65024890, 0x65024890, 0x52001ce5, 0x52001ce5},
+-	{0x0000a55c, 0x69024892, 0x69024892, 0x56001ce9, 0x56001ce9},
+-	{0x0000a560, 0x6e024c92, 0x6e024c92, 0x5a001ceb, 0x5a001ceb},
+-	{0x0000a564, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+-	{0x0000a568, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+-	{0x0000a56c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+-	{0x0000a570, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+-	{0x0000a574, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+-	{0x0000a578, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+-	{0x0000a57c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
+-	{0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+-	{0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
+-	{0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
+-	{0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
+-	{0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
+-	{0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
+-	{0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
+-	{0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
+-	{0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
+-	{0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
+-	{0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
+-	{0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
+-	{0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
+-	{0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
+-	{0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
+-	{0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
+-	{0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
+-	{0x0000a5c4, 0x52822470, 0x52822470, 0x3f801861, 0x3f801861},
+-	{0x0000a5c8, 0x55822490, 0x55822490, 0x43801a81, 0x43801a81},
+-	{0x0000a5cc, 0x59822492, 0x59822492, 0x47801a83, 0x47801a83},
+-	{0x0000a5d0, 0x5d822692, 0x5d822692, 0x4a801c84, 0x4a801c84},
+-	{0x0000a5d4, 0x61822892, 0x61822892, 0x4e801ce3, 0x4e801ce3},
+-	{0x0000a5d8, 0x65824890, 0x65824890, 0x52801ce5, 0x52801ce5},
+-	{0x0000a5dc, 0x69824892, 0x69824892, 0x56801ce9, 0x56801ce9},
+-	{0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x5a801ceb, 0x5a801ceb},
+-	{0x0000a5e4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+-	{0x0000a5e8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+-	{0x0000a5ec, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+-	{0x0000a5f0, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+-	{0x0000a5f4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+-	{0x0000a5f8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
+-	{0x0000a5fc, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
++	{0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
++	{0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
++	{0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
++	{0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
++	{0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
++	{0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
++	{0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
++	{0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
++	{0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
++	{0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
++	{0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
++	{0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
++	{0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
++	{0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
++	{0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
++	{0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
++	{0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
++	{0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
++	{0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
++	{0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
++	{0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
++	{0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
++	{0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
++	{0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
++	{0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
++	{0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
++	{0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++	{0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++	{0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++	{0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++	{0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++	{0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++	{0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
++	{0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
++	{0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
++	{0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
++	{0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
++	{0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
++	{0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
++	{0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
++	{0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
++	{0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
++	{0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
++	{0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
++	{0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
++	{0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
++	{0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
++	{0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
++	{0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
++	{0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
++	{0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
++	{0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
++	{0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
++	{0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
++	{0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
++	{0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
++	{0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
++	{0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
++	{0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++	{0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++	{0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++	{0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++	{0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++	{0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
++	{0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+ 	{0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ 	{0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ 	{0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ 	{0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-	{0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+-	{0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
+-	{0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
+-	{0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
+-	{0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
+-	{0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
+-	{0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
+-	{0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+-	{0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+-	{0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+-	{0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+-	{0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+-	{0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+-	{0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+-	{0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
++	{0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
++	{0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
++	{0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
++	{0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
++	{0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
++	{0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
++	{0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
++	{0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++	{0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++	{0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++	{0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++	{0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
++	{0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++	{0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++	{0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ 	{0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+-	{0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+-	{0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+-	{0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
++	{0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
++	{0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
++	{0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+ 	{0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+ 	{0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+ 	{0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
+diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+index 84b558d..678854a 100644
+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+@@ -903,6 +903,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
+ 					  AR_PHY_CL_TAB_1,
+ 					  AR_PHY_CL_TAB_2 };
+ 
++	ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
++
+ 	if (rtt) {
+ 		if (!ar9003_hw_rtt_restore(ah, chan))
+ 			run_rtt_cal = true;
+diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+index 3a1ff55..a633aea 100644
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+@@ -68,13 +68,13 @@
+ #define AR9300_BASE_ADDR 0x3ff
+ #define AR9300_BASE_ADDR_512 0x1ff
+ 
+-#define AR9300_OTP_BASE			0x14000
+-#define AR9300_OTP_STATUS		0x15f18
++#define AR9300_OTP_BASE			(AR_SREV_9340(ah) ? 0x30000 : 0x14000)
++#define AR9300_OTP_STATUS		(AR_SREV_9340(ah) ? 0x30018 : 0x15f18)
+ #define AR9300_OTP_STATUS_TYPE		0x7
+ #define AR9300_OTP_STATUS_VALID		0x4
+ #define AR9300_OTP_STATUS_ACCESS_BUSY	0x2
+ #define AR9300_OTP_STATUS_SM_BUSY	0x1
+-#define AR9300_OTP_READ_DATA		0x15f1c
++#define AR9300_OTP_READ_DATA		(AR_SREV_9340(ah) ? 0x3001c : 0x15f1c)
+ 
+ enum targetPowerHTRates {
+ 	HT_TARGET_RATE_0_8_16,
+diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+index e476f9f..6b23a50 100644
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -533,7 +533,7 @@ static void ar9003_hw_init_bb(struct ath_hw *ah,
+ 	ath9k_hw_synth_delay(ah, chan, synthDelay);
+ }
+ 
+-static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
++void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
+ {
+ 	switch (rx) {
+ 	case 0x5:
+diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
+index 1b48414..4527d0d 100644
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
+ 				 skb->len, DMA_TO_DEVICE);
+ 		dev_kfree_skb_any(skb);
+ 		bf->bf_buf_addr = 0;
++		bf->bf_mpdu = NULL;
+ 	}
+ 
+ 	skb = ieee80211_beacon_get(hw, vif);
+diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
+index e5cceb0..bbd249d 100644
+--- a/drivers/net/wireless/ath/ath9k/calib.c
++++ b/drivers/net/wireless/ath/ath9k/calib.c
+@@ -69,6 +69,7 @@ s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan)
+ 
+ 	if (chan && chan->noisefloor) {
+ 		s8 delta = chan->noisefloor -
++			   ATH9K_NF_CAL_NOISE_THRESH -
+ 			   ath9k_hw_get_default_nf(ah, chan);
+ 		if (delta > 0)
+ 			noise += delta;
+diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h
+index 1060c19..60dcb6c 100644
+--- a/drivers/net/wireless/ath/ath9k/calib.h
++++ b/drivers/net/wireless/ath/ath9k/calib.h
+@@ -21,6 +21,9 @@
+ 
+ #define AR_PHY_CCA_FILTERWINDOW_LENGTH          5
+ 
++/* Internal noise floor can vary by about 6db depending on the frequency */
++#define ATH9K_NF_CAL_NOISE_THRESH		6
++
+ #define NUM_NF_READINGS       6
+ #define ATH9K_NF_CAL_HIST_MAX 5
+ 
+diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
+index 4a9570d..aac4a40 100644
+--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
++++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
+@@ -344,6 +344,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle,
+ 			endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv,
+ 						  skb, htc_hdr->endpoint_id,
+ 						  txok);
++		} else {
++			kfree_skb(skb);
+ 		}
+ 	}
+ 
+diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
+index de6968f..c59edc7 100644
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -1060,6 +1060,7 @@ int ar9003_paprd_create_curve(struct ath_hw *ah,
+ int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
+ int ar9003_paprd_init_table(struct ath_hw *ah);
+ bool ar9003_paprd_is_done(struct ath_hw *ah);
++void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
+ 
+ /* Hardware family op attach helpers */
+ void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
+diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
+index 4480c0c..6b12d48 100644
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -744,6 +744,7 @@ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
+ 			return NULL;
+ 	}
+ 
++	list_del(&bf->list);
+ 	if (!bf->bf_mpdu)
+ 		return bf;
+ 
+@@ -1251,14 +1252,15 @@ requeue_drop_frag:
+ 			sc->rx.frag = NULL;
+ 		}
+ requeue:
++		list_add_tail(&bf->list, &sc->rx.rxbuf);
++		if (flush)
++			continue;
++
+ 		if (edma) {
+-			list_add_tail(&bf->list, &sc->rx.rxbuf);
+ 			ath_rx_edma_buf_link(sc, qtype);
+ 		} else {
+-			list_move_tail(&bf->list, &sc->rx.rxbuf);
+ 			ath_rx_buf_link(sc, bf);
+-			if (!flush)
+-				ath9k_hw_rxena(ah);
++			ath9k_hw_rxena(ah);
+ 		}
+ 	} while (1);
+ 
+diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
+index 7c899fc..ac593ab 100644
+--- a/drivers/net/wireless/b43/b43.h
++++ b/drivers/net/wireless/b43/b43.h
+@@ -7,6 +7,7 @@
+ #include <linux/hw_random.h>
+ #include <linux/bcma/bcma.h>
+ #include <linux/ssb/ssb.h>
++#include <linux/completion.h>
+ #include <net/mac80211.h>
+ 
+ #include "debugfs.h"
+@@ -718,6 +719,10 @@ enum b43_firmware_file_type {
+ struct b43_request_fw_context {
+ 	/* The device we are requesting the fw for. */
+ 	struct b43_wldev *dev;
++	/* a completion event structure needed if this call is asynchronous */
++	struct completion fw_load_complete;
++	/* a pointer to the firmware object */
++	const struct firmware *blob;
+ 	/* The type of firmware to request. */
+ 	enum b43_firmware_file_type req_type;
+ 	/* Error messages for each firmware type. */
+diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
+index 777cd74..38bc5a7 100644
+--- a/drivers/net/wireless/b43/dma.c
++++ b/drivers/net/wireless/b43/dma.c
+@@ -409,7 +409,10 @@ static inline
+ 				struct b43_dmadesc_meta *meta)
+ {
+ 	if (meta->skb) {
+-		dev_kfree_skb_any(meta->skb);
++		if (ring->tx)
++			ieee80211_free_txskb(ring->dev->wl->hw, meta->skb);
++		else
++			dev_kfree_skb_any(meta->skb);
+ 		meta->skb = NULL;
+ 	}
+ }
+@@ -1454,7 +1457,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb)
+ 	if (unlikely(err == -ENOKEY)) {
+ 		/* Drop this packet, as we don't have the encryption key
+ 		 * anymore and must not transmit it unencrypted. */
+-		dev_kfree_skb_any(skb);
++		ieee80211_free_txskb(dev->wl->hw, skb);
+ 		err = 0;
+ 		goto out;
+ 	}
+diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/b43/dma.h
+index 315b96e..9fdd198 100644
+--- a/drivers/net/wireless/b43/dma.h
++++ b/drivers/net/wireless/b43/dma.h
+@@ -169,7 +169,7 @@ struct b43_dmadesc_generic {
+ 
+ /* DMA engine tuning knobs */
+ #define B43_TXRING_SLOTS		256
+-#define B43_RXRING_SLOTS		64
++#define B43_RXRING_SLOTS		256
+ #define B43_DMA0_RX_FW598_BUFSIZE	(B43_DMA0_RX_FW598_FO + IEEE80211_MAX_FRAME_LEN)
+ #define B43_DMA0_RX_FW351_BUFSIZE	(B43_DMA0_RX_FW351_FO + IEEE80211_MAX_FRAME_LEN)
+ 
+diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
+index 46d9d4e..b70bc2d 100644
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -2088,11 +2088,18 @@ static void b43_print_fw_helptext(struct b43_wl *wl, bool error)
+ 		b43warn(wl, text);
+ }
+ 
++static void b43_fw_cb(const struct firmware *firmware, void *context)
++{
++	struct b43_request_fw_context *ctx = context;
++
++	ctx->blob = firmware;
++	complete(&ctx->fw_load_complete);
++}
++
+ int b43_do_request_fw(struct b43_request_fw_context *ctx,
+ 		      const char *name,
+-		      struct b43_firmware_file *fw)
++		      struct b43_firmware_file *fw, bool async)
+ {
+-	const struct firmware *blob;
+ 	struct b43_fw_header *hdr;
+ 	u32 size;
+ 	int err;
+@@ -2131,11 +2138,31 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
+ 		B43_WARN_ON(1);
+ 		return -ENOSYS;
+ 	}
+-	err = request_firmware(&blob, ctx->fwname, ctx->dev->dev->dev);
++	if (async) {
++		/* do this part asynchronously */
++		init_completion(&ctx->fw_load_complete);
++		err = request_firmware_nowait(THIS_MODULE, 1, ctx->fwname,
++					      ctx->dev->dev->dev, GFP_KERNEL,
++					      ctx, b43_fw_cb);
++		if (err < 0) {
++			pr_err("Unable to load firmware\n");
++			return err;
++		}
++		/* stall here until fw ready */
++		wait_for_completion(&ctx->fw_load_complete);
++		if (ctx->blob)
++			goto fw_ready;
++	/* On some ARM systems, the async request will fail, but the next sync
++	 * request works. For this reason, we dall through here
++	 */
++	}
++	err = request_firmware(&ctx->blob, ctx->fwname,
++			       ctx->dev->dev->dev);
+ 	if (err == -ENOENT) {
+ 		snprintf(ctx->errors[ctx->req_type],
+ 			 sizeof(ctx->errors[ctx->req_type]),
+-			 "Firmware file \"%s\" not found\n", ctx->fwname);
++			 "Firmware file \"%s\" not found\n",
++			 ctx->fwname);
+ 		return err;
+ 	} else if (err) {
+ 		snprintf(ctx->errors[ctx->req_type],
+@@ -2144,14 +2171,15 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
+ 			 ctx->fwname, err);
+ 		return err;
+ 	}
+-	if (blob->size < sizeof(struct b43_fw_header))
++fw_ready:
++	if (ctx->blob->size < sizeof(struct b43_fw_header))
+ 		goto err_format;
+-	hdr = (struct b43_fw_header *)(blob->data);
++	hdr = (struct b43_fw_header *)(ctx->blob->data);
+ 	switch (hdr->type) {
+ 	case B43_FW_TYPE_UCODE:
+ 	case B43_FW_TYPE_PCM:
+ 		size = be32_to_cpu(hdr->size);
+-		if (size != blob->size - sizeof(struct b43_fw_header))
++		if (size != ctx->blob->size - sizeof(struct b43_fw_header))
+ 			goto err_format;
+ 		/* fallthrough */
+ 	case B43_FW_TYPE_IV:
+@@ -2162,7 +2190,7 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
+ 		goto err_format;
+ 	}
+ 
+-	fw->data = blob;
++	fw->data = ctx->blob;
+ 	fw->filename = name;
+ 	fw->type = ctx->req_type;
+ 
+@@ -2172,7 +2200,7 @@ err_format:
+ 	snprintf(ctx->errors[ctx->req_type],
+ 		 sizeof(ctx->errors[ctx->req_type]),
+ 		 "Firmware file \"%s\" format error.\n", ctx->fwname);
+-	release_firmware(blob);
++	release_firmware(ctx->blob);
+ 
+ 	return -EPROTO;
+ }
+@@ -2223,7 +2251,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+ 			goto err_no_ucode;
+ 		}
+ 	}
+-	err = b43_do_request_fw(ctx, filename, &fw->ucode);
++	err = b43_do_request_fw(ctx, filename, &fw->ucode, true);
+ 	if (err)
+ 		goto err_load;
+ 
+@@ -2235,7 +2263,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+ 	else
+ 		goto err_no_pcm;
+ 	fw->pcm_request_failed = false;
+-	err = b43_do_request_fw(ctx, filename, &fw->pcm);
++	err = b43_do_request_fw(ctx, filename, &fw->pcm, false);
+ 	if (err == -ENOENT) {
+ 		/* We did not find a PCM file? Not fatal, but
+ 		 * core rev <= 10 must do without hwcrypto then. */
+@@ -2296,7 +2324,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+ 	default:
+ 		goto err_no_initvals;
+ 	}
+-	err = b43_do_request_fw(ctx, filename, &fw->initvals);
++	err = b43_do_request_fw(ctx, filename, &fw->initvals, false);
+ 	if (err)
+ 		goto err_load;
+ 
+@@ -2355,7 +2383,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+ 	default:
+ 		goto err_no_initvals;
+ 	}
+-	err = b43_do_request_fw(ctx, filename, &fw->initvals_band);
++	err = b43_do_request_fw(ctx, filename, &fw->initvals_band, false);
+ 	if (err)
+ 		goto err_load;
+ 
+@@ -3397,7 +3425,7 @@ static void b43_tx_work(struct work_struct *work)
+ 				break;
+ 			}
+ 			if (unlikely(err))
+-				dev_kfree_skb(skb); /* Drop it */
++				ieee80211_free_txskb(wl->hw, skb);
+ 			err = 0;
+ 		}
+ 
+@@ -3418,7 +3446,7 @@ static void b43_op_tx(struct ieee80211_hw *hw,
+ 
+ 	if (unlikely(skb->len < 2 + 2 + 6)) {
+ 		/* Too short, this can't be a valid frame. */
+-		dev_kfree_skb_any(skb);
++		ieee80211_free_txskb(hw, skb);
+ 		return;
+ 	}
+ 	B43_WARN_ON(skb_shinfo(skb)->nr_frags);
+@@ -4228,8 +4256,12 @@ redo:
+ 
+ 	/* Drain all TX queues. */
+ 	for (queue_num = 0; queue_num < B43_QOS_QUEUE_NUM; queue_num++) {
+-		while (skb_queue_len(&wl->tx_queue[queue_num]))
+-			dev_kfree_skb(skb_dequeue(&wl->tx_queue[queue_num]));
++		while (skb_queue_len(&wl->tx_queue[queue_num])) {
++			struct sk_buff *skb;
++
++			skb = skb_dequeue(&wl->tx_queue[queue_num]);
++			ieee80211_free_txskb(wl->hw, skb);
++		}
+ 	}
+ 
+ 	b43_mac_suspend(dev);
+diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h
+index 8c684cd..abac25e 100644
+--- a/drivers/net/wireless/b43/main.h
++++ b/drivers/net/wireless/b43/main.h
+@@ -137,9 +137,8 @@ void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on);
+ 
+ 
+ struct b43_request_fw_context;
+-int b43_do_request_fw(struct b43_request_fw_context *ctx,
+-		      const char *name,
+-		      struct b43_firmware_file *fw);
++int b43_do_request_fw(struct b43_request_fw_context *ctx, const char *name,
++		      struct b43_firmware_file *fw, bool async);
+ void b43_do_release_fw(struct b43_firmware_file *fw);
+ 
+ #endif /* B43_MAIN_H_ */
+diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
+index 3533ab8..a73ff8c 100644
+--- a/drivers/net/wireless/b43/pio.c
++++ b/drivers/net/wireless/b43/pio.c
+@@ -196,7 +196,7 @@ static void b43_pio_cancel_tx_packets(struct b43_pio_txqueue *q)
+ 	for (i = 0; i < ARRAY_SIZE(q->packets); i++) {
+ 		pack = &(q->packets[i]);
+ 		if (pack->skb) {
+-			dev_kfree_skb_any(pack->skb);
++			ieee80211_free_txskb(q->dev->wl->hw, pack->skb);
+ 			pack->skb = NULL;
+ 		}
+ 	}
+@@ -552,7 +552,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
+ 	if (unlikely(err == -ENOKEY)) {
+ 		/* Drop this packet, as we don't have the encryption key
+ 		 * anymore and must not transmit it unencrypted. */
+-		dev_kfree_skb_any(skb);
++		ieee80211_free_txskb(dev->wl->hw, skb);
+ 		err = 0;
+ 		goto out;
+ 	}
+diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
+index a29da67..482476f 100644
+--- a/drivers/net/wireless/b43legacy/b43legacy.h
++++ b/drivers/net/wireless/b43legacy/b43legacy.h
+@@ -13,6 +13,7 @@
+ 
+ #include <linux/ssb/ssb.h>
+ #include <linux/ssb/ssb_driver_chipcommon.h>
++#include <linux/completion.h>
+ 
+ #include <net/mac80211.h>
+ 
+@@ -733,6 +734,10 @@ struct b43legacy_wldev {
+ 
+ 	/* Firmware data */
+ 	struct b43legacy_firmware fw;
++	const struct firmware *fwp;	/* needed to pass fw pointer */
++
++	/* completion struct for firmware loading */
++	struct completion fw_load_complete;
+ 
+ 	/* Devicelist in struct b43legacy_wl (all 802.11 cores) */
+ 	struct list_head list;
+diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
+index 0ef08e0..aa87fb7 100644
+--- a/drivers/net/wireless/b43legacy/main.c
++++ b/drivers/net/wireless/b43legacy/main.c
+@@ -1513,9 +1513,17 @@ static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
+ 		     "and download the correct firmware (version 3).\n");
+ }
+ 
++static void b43legacy_fw_cb(const struct firmware *firmware, void *context)
++{
++	struct b43legacy_wldev *dev = context;
++
++	dev->fwp = firmware;
++	complete(&dev->fw_load_complete);
++}
++
+ static int do_request_fw(struct b43legacy_wldev *dev,
+ 			 const char *name,
+-			 const struct firmware **fw)
++			 const struct firmware **fw, bool async)
+ {
+ 	char path[sizeof(modparam_fwpostfix) + 32];
+ 	struct b43legacy_fw_header *hdr;
+@@ -1528,7 +1536,24 @@ static int do_request_fw(struct b43legacy_wldev *dev,
+ 	snprintf(path, ARRAY_SIZE(path),
+ 		 "b43legacy%s/%s.fw",
+ 		 modparam_fwpostfix, name);
+-	err = request_firmware(fw, path, dev->dev->dev);
++	b43legacyinfo(dev->wl, "Loading firmware %s\n", path);
++	if (async) {
++		init_completion(&dev->fw_load_complete);
++		err = request_firmware_nowait(THIS_MODULE, 1, path,
++					      dev->dev->dev, GFP_KERNEL,
++					      dev, b43legacy_fw_cb);
++		if (err) {
++			b43legacyerr(dev->wl, "Unable to load firmware\n");
++			return err;
++		}
++		/* stall here until fw ready */
++		wait_for_completion(&dev->fw_load_complete);
++		if (!dev->fwp)
++			err = -EINVAL;
++		*fw = dev->fwp;
++	} else {
++		err = request_firmware(fw, path, dev->dev->dev);
++	}
+ 	if (err) {
+ 		b43legacyerr(dev->wl, "Firmware file \"%s\" not found "
+ 		       "or load failed.\n", path);
+@@ -1580,7 +1605,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
+ 			filename = "ucode4";
+ 		else
+ 			filename = "ucode5";
+-		err = do_request_fw(dev, filename, &fw->ucode);
++		err = do_request_fw(dev, filename, &fw->ucode, true);
+ 		if (err)
+ 			goto err_load;
+ 	}
+@@ -1589,7 +1614,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
+ 			filename = "pcm4";
+ 		else
+ 			filename = "pcm5";
+-		err = do_request_fw(dev, filename, &fw->pcm);
++		err = do_request_fw(dev, filename, &fw->pcm, false);
+ 		if (err)
+ 			goto err_load;
+ 	}
+@@ -1607,7 +1632,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
+ 		default:
+ 			goto err_no_initvals;
+ 		}
+-		err = do_request_fw(dev, filename, &fw->initvals);
++		err = do_request_fw(dev, filename, &fw->initvals, false);
+ 		if (err)
+ 			goto err_load;
+ 	}
+@@ -1627,7 +1652,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
+ 		default:
+ 			goto err_no_initvals;
+ 		}
+-		err = do_request_fw(dev, filename, &fw->initvals_band);
++		err = do_request_fw(dev, filename, &fw->initvals_band, false);
+ 		if (err)
+ 			goto err_load;
+ 	}
+diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+index a5edebe..c110674 100644
+--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+@@ -1394,9 +1394,10 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
+ #endif
+ 	t->ms = ms;
+ 	t->periodic = (bool) periodic;
+-	t->set = true;
+-
+-	atomic_inc(&t->wl->callbacks);
++	if (!t->set) {
++		t->set = true;
++		atomic_inc(&t->wl->callbacks);
++	}
+ 
+ 	ieee80211_queue_delayed_work(hw, &t->dly_wrk, msecs_to_jiffies(ms));
+ }
+diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
+index 0370403..27eccd9 100644
+--- a/drivers/net/wireless/iwlegacy/common.c
++++ b/drivers/net/wireless/iwlegacy/common.c
+@@ -3957,17 +3957,21 @@ il_connection_init_rx_config(struct il_priv *il)
+ 
+ 	memset(&il->staging, 0, sizeof(il->staging));
+ 
+-	if (!il->vif) {
++	switch (il->iw_mode) {
++	case NL80211_IFTYPE_UNSPECIFIED:
+ 		il->staging.dev_type = RXON_DEV_TYPE_ESS;
+-	} else if (il->vif->type == NL80211_IFTYPE_STATION) {
++		break;
++	case NL80211_IFTYPE_STATION:
+ 		il->staging.dev_type = RXON_DEV_TYPE_ESS;
+ 		il->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
+-	} else if (il->vif->type == NL80211_IFTYPE_ADHOC) {
++		break;
++	case NL80211_IFTYPE_ADHOC:
+ 		il->staging.dev_type = RXON_DEV_TYPE_IBSS;
+ 		il->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
+ 		il->staging.filter_flags =
+ 		    RXON_FILTER_BCON_AWARE_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
+-	} else {
++		break;
++	default:
+ 		IL_ERR("Unsupported interface type %d\n", il->vif->type);
+ 		return;
+ 	}
+@@ -4550,8 +4554,7 @@ out:
+ EXPORT_SYMBOL(il_mac_add_interface);
+ 
+ static void
+-il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,
+-		      bool mode_change)
++il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif)
+ {
+ 	lockdep_assert_held(&il->mutex);
+ 
+@@ -4560,9 +4563,7 @@ il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,
+ 		il_force_scan_end(il);
+ 	}
+ 
+-	if (!mode_change)
+-		il_set_mode(il);
+-
++	il_set_mode(il);
+ }
+ 
+ void
+@@ -4575,8 +4576,8 @@ il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+ 
+ 	WARN_ON(il->vif != vif);
+ 	il->vif = NULL;
+-
+-	il_teardown_interface(il, vif, false);
++	il->iw_mode = NL80211_IFTYPE_UNSPECIFIED;
++	il_teardown_interface(il, vif);
+ 	memset(il->bssid, 0, ETH_ALEN);
+ 
+ 	D_MAC80211("leave\n");
+@@ -4685,18 +4686,10 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ 	}
+ 
+ 	/* success */
+-	il_teardown_interface(il, vif, true);
+ 	vif->type = newtype;
+ 	vif->p2p = false;
+-	err = il_set_mode(il);
+-	WARN_ON(err);
+-	/*
+-	 * We've switched internally, but submitting to the
+-	 * device may have failed for some reason. Mask this
+-	 * error, because otherwise mac80211 will not switch
+-	 * (and set the interface type back) and we'll be
+-	 * out of sync with it.
+-	 */
++	il->iw_mode = newtype;
++	il_teardown_interface(il, vif);
+ 	err = 0;
+ 
+ out:
+diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
+index 13fbc4e..b879e13 100644
+--- a/drivers/net/wireless/mwifiex/pcie.c
++++ b/drivers/net/wireless/mwifiex/pcie.c
+@@ -161,7 +161,7 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
+ 
+ 	if (pdev) {
+ 		card = (struct pcie_service_card *) pci_get_drvdata(pdev);
+-		if (!card || card->adapter) {
++		if (!card || !card->adapter) {
+ 			pr_err("Card or adapter structure is not valid\n");
+ 			return 0;
+ 		}
+diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
+index fb21360..8951285 100644
+--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
++++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
+@@ -53,7 +53,6 @@ int mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist,
+  */
+ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
+ {
+-	bool cancel_flag = false;
+ 	int status;
+ 	struct cmd_ctrl_node *cmd_queued;
+ 
+@@ -67,14 +66,11 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
+ 	atomic_inc(&adapter->cmd_pending);
+ 
+ 	/* Wait for completion */
+-	wait_event_interruptible(adapter->cmd_wait_q.wait,
+-				 *(cmd_queued->condition));
+-	if (!*(cmd_queued->condition))
+-		cancel_flag = true;
+-
+-	if (cancel_flag) {
+-		mwifiex_cancel_pending_ioctl(adapter);
+-		dev_dbg(adapter->dev, "cmd cancel\n");
++	status = wait_event_interruptible(adapter->cmd_wait_q.wait,
++					  *(cmd_queued->condition));
++	if (status) {
++		dev_err(adapter->dev, "cmd_wait_q terminated: %d\n", status);
++		return status;
+ 	}
+ 
+ 	status = adapter->cmd_wait_q.status;
+@@ -427,8 +423,11 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)
+ 		return false;
+ 	}
+ 
+-	wait_event_interruptible(adapter->hs_activate_wait_q,
+-				 adapter->hs_activate_wait_q_woken);
++	if (wait_event_interruptible(adapter->hs_activate_wait_q,
++				     adapter->hs_activate_wait_q_woken)) {
++		dev_err(adapter->dev, "hs_activate_wait_q terminated\n");
++		return false;
++	}
+ 
+ 	return true;
+ }
+diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
+index effb044..3d4dd4d 100644
+--- a/drivers/net/wireless/p54/p54usb.c
++++ b/drivers/net/wireless/p54/p54usb.c
+@@ -47,6 +47,7 @@ static struct usb_device_id p54u_table[] = {
+ 	{USB_DEVICE(0x0411, 0x0050)},	/* Buffalo WLI2-USB2-G54 */
+ 	{USB_DEVICE(0x045e, 0x00c2)},	/* Microsoft MN-710 */
+ 	{USB_DEVICE(0x0506, 0x0a11)},	/* 3COM 3CRWE254G72 */
++	{USB_DEVICE(0x0675, 0x0530)},	/* DrayTek Vigor 530 */
+ 	{USB_DEVICE(0x06b9, 0x0120)},	/* Thomson SpeedTouch 120g */
+ 	{USB_DEVICE(0x0707, 0xee06)},	/* SMC 2862W-G */
+ 	{USB_DEVICE(0x07aa, 0x001c)},	/* Corega CG-WLUSB2GT */
+@@ -82,7 +83,9 @@ static struct usb_device_id p54u_table[] = {
+ 	{USB_DEVICE(0x06a9, 0x000e)},	/* Westell 802.11g USB (A90-211WG-01) */
+ 	{USB_DEVICE(0x06b9, 0x0121)},	/* Thomson SpeedTouch 121g */
+ 	{USB_DEVICE(0x0707, 0xee13)},   /* SMC 2862W-G version 2 */
++	{USB_DEVICE(0x0803, 0x4310)},	/* Zoom 4410a */
+ 	{USB_DEVICE(0x083a, 0x4521)},   /* Siemens Gigaset USB Adapter 54 version 2 */
++	{USB_DEVICE(0x083a, 0x4531)},	/* T-Com Sinus 154 data II */
+ 	{USB_DEVICE(0x083a, 0xc501)},	/* Zoom Wireless-G 4410 */
+ 	{USB_DEVICE(0x083a, 0xf503)},	/* Accton FD7050E ver 1010ec  */
+ 	{USB_DEVICE(0x0846, 0x4240)},	/* Netgear WG111 (v2) */
+@@ -101,6 +104,7 @@ static struct usb_device_id p54u_table[] = {
+ 	{USB_DEVICE(0x13B1, 0x000C)},	/* Linksys WUSB54AG */
+ 	{USB_DEVICE(0x1413, 0x5400)},   /* Telsey 802.11g USB2.0 Adapter */
+ 	{USB_DEVICE(0x1435, 0x0427)},	/* Inventel UR054G */
++	/* {USB_DEVICE(0x15a9, 0x0002)}, * Also SparkLAN WL-682 with 3887 */
+ 	{USB_DEVICE(0x1668, 0x1050)},	/* Actiontec 802UIG-1 */
+ 	{USB_DEVICE(0x1740, 0x1000)},	/* Senao NUB-350 */
+ 	{USB_DEVICE(0x2001, 0x3704)},	/* DLink DWL-G122 rev A2 */
+diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
+index 942e56b..a37df3a 100644
+--- a/drivers/net/wireless/rtlwifi/base.c
++++ b/drivers/net/wireless/rtlwifi/base.c
+@@ -980,7 +980,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
+ 					 is_tx ? "Tx" : "Rx");
+ 
+ 				if (is_tx) {
+-					rtl_lps_leave(hw);
++					schedule_work(&rtlpriv->
++						      works.lps_leave_work);
+ 					ppsc->last_delaylps_stamp_jiffies =
+ 					    jiffies;
+ 				}
+@@ -990,7 +991,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
+ 		}
+ 	} else if (ETH_P_ARP == ether_type) {
+ 		if (is_tx) {
+-			rtl_lps_leave(hw);
++			schedule_work(&rtlpriv->works.lps_leave_work);
+ 			ppsc->last_delaylps_stamp_jiffies = jiffies;
+ 		}
+ 
+@@ -1000,7 +1001,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
+ 			 "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx");
+ 
+ 		if (is_tx) {
+-			rtl_lps_leave(hw);
++			schedule_work(&rtlpriv->works.lps_leave_work);
+ 			ppsc->last_delaylps_stamp_jiffies = jiffies;
+ 		}
+ 
+diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+index b7e6607..6395412 100644
+--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
++++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+@@ -285,6 +285,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
+ 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},
+ 	/* RTL8188CUS-VL */
+ 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)},
++	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},
+ 	/* 8188 Combo for BC4 */
+ 	{RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
+ 
+diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
+index aa970fc..6ce8484 100644
+--- a/drivers/net/wireless/rtlwifi/usb.c
++++ b/drivers/net/wireless/rtlwifi/usb.c
+@@ -42,8 +42,12 @@
+ 
+ static void usbctrl_async_callback(struct urb *urb)
+ {
+-	if (urb)
+-		kfree(urb->context);
++	if (urb) {
++		/* free dr */
++		kfree(urb->setup_packet);
++		/* free databuf */
++		kfree(urb->transfer_buffer);
++	}
+ }
+ 
+ static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
+@@ -55,39 +59,47 @@ static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
+ 	u8 reqtype;
+ 	struct usb_ctrlrequest *dr;
+ 	struct urb *urb;
+-	struct rtl819x_async_write_data {
+-		u8 data[REALTEK_USB_VENQT_MAX_BUF_SIZE];
+-		struct usb_ctrlrequest dr;
+-	} *buf;
++	const u16 databuf_maxlen = REALTEK_USB_VENQT_MAX_BUF_SIZE;
++	u8 *databuf;
++
++	if (WARN_ON_ONCE(len > databuf_maxlen))
++		len = databuf_maxlen;
+ 
+ 	pipe = usb_sndctrlpipe(udev, 0); /* write_out */
+ 	reqtype =  REALTEK_USB_VENQT_WRITE;
+ 
+-	buf = kmalloc(sizeof(*buf), GFP_ATOMIC);
+-	if (!buf)
++	dr = kmalloc(sizeof(*dr), GFP_ATOMIC);
++	if (!dr)
++		return -ENOMEM;
++
++	databuf = kmalloc(databuf_maxlen, GFP_ATOMIC);
++	if (!databuf) {
++		kfree(dr);
+ 		return -ENOMEM;
++	}
+ 
+ 	urb = usb_alloc_urb(0, GFP_ATOMIC);
+ 	if (!urb) {
+-		kfree(buf);
++		kfree(databuf);
++		kfree(dr);
+ 		return -ENOMEM;
+ 	}
+ 
+-	dr = &buf->dr;
+-
+ 	dr->bRequestType = reqtype;
+ 	dr->bRequest = request;
+ 	dr->wValue = cpu_to_le16(value);
+ 	dr->wIndex = cpu_to_le16(index);
+ 	dr->wLength = cpu_to_le16(len);
+ 	/* data are already in little-endian order */
+-	memcpy(buf, pdata, len);
++	memcpy(databuf, pdata, len);
+ 	usb_fill_control_urb(urb, udev, pipe,
+-			     (unsigned char *)dr, buf, len,
+-			     usbctrl_async_callback, buf);
++			     (unsigned char *)dr, databuf, len,
++			     usbctrl_async_callback, NULL);
+ 	rc = usb_submit_urb(urb, GFP_ATOMIC);
+-	if (rc < 0)
+-		kfree(buf);
++	if (rc < 0) {
++		kfree(databuf);
++		kfree(dr);
++	}
+ 	usb_free_urb(urb);
+ 	return rc;
+ }
+@@ -210,17 +222,16 @@ static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
+ 	u16 index = REALTEK_USB_VENQT_CMD_IDX;
+ 	int pipe = usb_sndctrlpipe(udev, 0); /* write_out */
+ 	u8 *buffer;
+-	dma_addr_t dma_addr;
+ 
+-	wvalue = (u16)(addr&0x0000ffff);
+-	buffer = usb_alloc_coherent(udev, (size_t)len, GFP_ATOMIC, &dma_addr);
++	wvalue = (u16)(addr & 0x0000ffff);
++	buffer = kmalloc(len, GFP_ATOMIC);
+ 	if (!buffer)
+ 		return;
+ 	memcpy(buffer, data, len);
+ 	usb_control_msg(udev, pipe, request, reqtype, wvalue,
+ 			index, buffer, len, 50);
+ 
+-	usb_free_coherent(udev, (size_t)len, buffer, dma_addr);
++	kfree(buffer);
+ }
+ 
+ static void _rtl_usb_io_handler_init(struct device *dev,
+@@ -543,8 +554,8 @@ static void _rtl_rx_pre_process(struct ieee80211_hw *hw, struct sk_buff *skb)
+ 	WARN_ON(skb_queue_empty(&rx_queue));
+ 	while (!skb_queue_empty(&rx_queue)) {
+ 		_skb = skb_dequeue(&rx_queue);
+-		_rtl_usb_rx_process_agg(hw, skb);
+-		ieee80211_rx_irqsafe(hw, skb);
++		_rtl_usb_rx_process_agg(hw, _skb);
++		ieee80211_rx_irqsafe(hw, _skb);
+ 	}
+ }
+ 
+diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
+index 94b79c3..9d7f172 100644
+--- a/drivers/net/xen-netback/common.h
++++ b/drivers/net/xen-netback/common.h
+@@ -151,6 +151,9 @@ void xen_netbk_queue_tx_skb(struct xenvif *vif, struct sk_buff *skb);
+ /* Notify xenvif that ring now has space to send an skb to the frontend */
+ void xenvif_notify_tx_completion(struct xenvif *vif);
+ 
++/* Prevent the device from generating any further traffic. */
++void xenvif_carrier_off(struct xenvif *vif);
++
+ /* Returns number of ring slots required to send an skb to the frontend */
+ unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb);
+ 
+diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
+index b7d41f8..221f426 100644
+--- a/drivers/net/xen-netback/interface.c
++++ b/drivers/net/xen-netback/interface.c
+@@ -132,6 +132,7 @@ static void xenvif_up(struct xenvif *vif)
+ static void xenvif_down(struct xenvif *vif)
+ {
+ 	disable_irq(vif->irq);
++	del_timer_sync(&vif->credit_timeout);
+ 	xen_netbk_deschedule_xenvif(vif);
+ 	xen_netbk_remove_xenvif(vif);
+ }
+@@ -343,23 +344,26 @@ err:
+ 	return err;
+ }
+ 
+-void xenvif_disconnect(struct xenvif *vif)
++void xenvif_carrier_off(struct xenvif *vif)
+ {
+ 	struct net_device *dev = vif->dev;
+-	if (netif_carrier_ok(dev)) {
+-		rtnl_lock();
+-		netif_carrier_off(dev); /* discard queued packets */
+-		if (netif_running(dev))
+-			xenvif_down(vif);
+-		rtnl_unlock();
+-		xenvif_put(vif);
+-	}
++
++	rtnl_lock();
++	netif_carrier_off(dev); /* discard queued packets */
++	if (netif_running(dev))
++		xenvif_down(vif);
++	rtnl_unlock();
++	xenvif_put(vif);
++}
++
++void xenvif_disconnect(struct xenvif *vif)
++{
++	if (netif_carrier_ok(vif->dev))
++		xenvif_carrier_off(vif);
+ 
+ 	atomic_dec(&vif->refcnt);
+ 	wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0);
+ 
+-	del_timer_sync(&vif->credit_timeout);
+-
+ 	if (vif->irq)
+ 		unbind_from_irqhandler(vif->irq, vif);
+ 
+diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
+index 682633b..6aa059e 100644
+--- a/drivers/net/xen-netback/netback.c
++++ b/drivers/net/xen-netback/netback.c
+@@ -146,7 +146,8 @@ void xen_netbk_remove_xenvif(struct xenvif *vif)
+ 	atomic_dec(&netbk->netfront_count);
+ }
+ 
+-static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx);
++static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx,
++				  u8 status);
+ static void make_tx_response(struct xenvif *vif,
+ 			     struct xen_netif_tx_request *txp,
+ 			     s8       st);
+@@ -850,7 +851,7 @@ static void netbk_tx_err(struct xenvif *vif,
+ 
+ 	do {
+ 		make_tx_response(vif, txp, XEN_NETIF_RSP_ERROR);
+-		if (cons >= end)
++		if (cons == end)
+ 			break;
+ 		txp = RING_GET_REQUEST(&vif->tx, cons++);
+ 	} while (1);
+@@ -859,6 +860,13 @@ static void netbk_tx_err(struct xenvif *vif,
+ 	xenvif_put(vif);
+ }
+ 
++static void netbk_fatal_tx_err(struct xenvif *vif)
++{
++	netdev_err(vif->dev, "fatal error; disabling device\n");
++	xenvif_carrier_off(vif);
++	xenvif_put(vif);
++}
++
+ static int netbk_count_requests(struct xenvif *vif,
+ 				struct xen_netif_tx_request *first,
+ 				struct xen_netif_tx_request *txp,
+@@ -872,29 +880,33 @@ static int netbk_count_requests(struct xenvif *vif,
+ 
+ 	do {
+ 		if (frags >= work_to_do) {
+-			netdev_dbg(vif->dev, "Need more frags\n");
+-			return -frags;
++			netdev_err(vif->dev, "Need more frags\n");
++			netbk_fatal_tx_err(vif);
++			return -ENODATA;
+ 		}
+ 
+ 		if (unlikely(frags >= MAX_SKB_FRAGS)) {
+-			netdev_dbg(vif->dev, "Too many frags\n");
+-			return -frags;
++			netdev_err(vif->dev, "Too many frags\n");
++			netbk_fatal_tx_err(vif);
++			return -E2BIG;
+ 		}
+ 
+ 		memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
+ 		       sizeof(*txp));
+ 		if (txp->size > first->size) {
+-			netdev_dbg(vif->dev, "Frags galore\n");
+-			return -frags;
++			netdev_err(vif->dev, "Frag is bigger than frame.\n");
++			netbk_fatal_tx_err(vif);
++			return -EIO;
+ 		}
+ 
+ 		first->size -= txp->size;
+ 		frags++;
+ 
+ 		if (unlikely((txp->offset + txp->size) > PAGE_SIZE)) {
+-			netdev_dbg(vif->dev, "txp->offset: %x, size: %u\n",
++			netdev_err(vif->dev, "txp->offset: %x, size: %u\n",
+ 				 txp->offset, txp->size);
+-			return -frags;
++			netbk_fatal_tx_err(vif);
++			return -EINVAL;
+ 		}
+ 	} while ((txp++)->flags & XEN_NETTXF_more_data);
+ 	return frags;
+@@ -937,7 +949,7 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
+ 		pending_idx = netbk->pending_ring[index];
+ 		page = xen_netbk_alloc_page(netbk, skb, pending_idx);
+ 		if (!page)
+-			return NULL;
++			goto err;
+ 
+ 		gop->source.u.ref = txp->gref;
+ 		gop->source.domid = vif->domid;
+@@ -959,6 +971,17 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
+ 	}
+ 
+ 	return gop;
++err:
++	/* Unwind, freeing all pages and sending error responses. */
++	while (i-- > start) {
++		xen_netbk_idx_release(netbk, frag_get_pending_idx(&frags[i]),
++				      XEN_NETIF_RSP_ERROR);
++	}
++	/* The head too, if necessary. */
++	if (start)
++		xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_ERROR);
++
++	return NULL;
+ }
+ 
+ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
+@@ -967,30 +990,20 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
+ {
+ 	struct gnttab_copy *gop = *gopp;
+ 	u16 pending_idx = *((u16 *)skb->data);
+-	struct pending_tx_info *pending_tx_info = netbk->pending_tx_info;
+-	struct xenvif *vif = pending_tx_info[pending_idx].vif;
+-	struct xen_netif_tx_request *txp;
+ 	struct skb_shared_info *shinfo = skb_shinfo(skb);
+ 	int nr_frags = shinfo->nr_frags;
+ 	int i, err, start;
+ 
+ 	/* Check status of header. */
+ 	err = gop->status;
+-	if (unlikely(err)) {
+-		pending_ring_idx_t index;
+-		index = pending_index(netbk->pending_prod++);
+-		txp = &pending_tx_info[pending_idx].req;
+-		make_tx_response(vif, txp, XEN_NETIF_RSP_ERROR);
+-		netbk->pending_ring[index] = pending_idx;
+-		xenvif_put(vif);
+-	}
++	if (unlikely(err))
++		xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_ERROR);
+ 
+ 	/* Skip first skb fragment if it is on same page as header fragment. */
+ 	start = (frag_get_pending_idx(&shinfo->frags[0]) == pending_idx);
+ 
+ 	for (i = start; i < nr_frags; i++) {
+ 		int j, newerr;
+-		pending_ring_idx_t index;
+ 
+ 		pending_idx = frag_get_pending_idx(&shinfo->frags[i]);
+ 
+@@ -999,16 +1012,12 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
+ 		if (likely(!newerr)) {
+ 			/* Had a previous error? Invalidate this fragment. */
+ 			if (unlikely(err))
+-				xen_netbk_idx_release(netbk, pending_idx);
++				xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_OKAY);
+ 			continue;
+ 		}
+ 
+ 		/* Error on this fragment: respond to client with an error. */
+-		txp = &netbk->pending_tx_info[pending_idx].req;
+-		make_tx_response(vif, txp, XEN_NETIF_RSP_ERROR);
+-		index = pending_index(netbk->pending_prod++);
+-		netbk->pending_ring[index] = pending_idx;
+-		xenvif_put(vif);
++		xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_ERROR);
+ 
+ 		/* Not the first error? Preceding frags already invalidated. */
+ 		if (err)
+@@ -1016,10 +1025,10 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
+ 
+ 		/* First error: invalidate header and preceding fragments. */
+ 		pending_idx = *((u16 *)skb->data);
+-		xen_netbk_idx_release(netbk, pending_idx);
++		xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_OKAY);
+ 		for (j = start; j < i; j++) {
+ 			pending_idx = frag_get_pending_idx(&shinfo->frags[j]);
+-			xen_netbk_idx_release(netbk, pending_idx);
++			xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_OKAY);
+ 		}
+ 
+ 		/* Remember the error: invalidate all subsequent fragments. */
+@@ -1053,7 +1062,7 @@ static void xen_netbk_fill_frags(struct xen_netbk *netbk, struct sk_buff *skb)
+ 
+ 		/* Take an extra reference to offset xen_netbk_idx_release */
+ 		get_page(netbk->mmap_pages[pending_idx]);
+-		xen_netbk_idx_release(netbk, pending_idx);
++		xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_OKAY);
+ 	}
+ }
+ 
+@@ -1066,7 +1075,8 @@ static int xen_netbk_get_extras(struct xenvif *vif,
+ 
+ 	do {
+ 		if (unlikely(work_to_do-- <= 0)) {
+-			netdev_dbg(vif->dev, "Missing extra info\n");
++			netdev_err(vif->dev, "Missing extra info\n");
++			netbk_fatal_tx_err(vif);
+ 			return -EBADR;
+ 		}
+ 
+@@ -1075,8 +1085,9 @@ static int xen_netbk_get_extras(struct xenvif *vif,
+ 		if (unlikely(!extra.type ||
+ 			     extra.type >= XEN_NETIF_EXTRA_TYPE_MAX)) {
+ 			vif->tx.req_cons = ++cons;
+-			netdev_dbg(vif->dev,
++			netdev_err(vif->dev,
+ 				   "Invalid extra type: %d\n", extra.type);
++			netbk_fatal_tx_err(vif);
+ 			return -EINVAL;
+ 		}
+ 
+@@ -1092,13 +1103,15 @@ static int netbk_set_skb_gso(struct xenvif *vif,
+ 			     struct xen_netif_extra_info *gso)
+ {
+ 	if (!gso->u.gso.size) {
+-		netdev_dbg(vif->dev, "GSO size must not be zero.\n");
++		netdev_err(vif->dev, "GSO size must not be zero.\n");
++		netbk_fatal_tx_err(vif);
+ 		return -EINVAL;
+ 	}
+ 
+ 	/* Currently only TCPv4 S.O. is supported. */
+ 	if (gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV4) {
+-		netdev_dbg(vif->dev, "Bad GSO type %d.\n", gso->u.gso.type);
++		netdev_err(vif->dev, "Bad GSO type %d.\n", gso->u.gso.type);
++		netbk_fatal_tx_err(vif);
+ 		return -EINVAL;
+ 	}
+ 
+@@ -1235,9 +1248,25 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
+ 
+ 		/* Get a netif from the list with work to do. */
+ 		vif = poll_net_schedule_list(netbk);
++		/* This can sometimes happen because the test of
++		 * list_empty(net_schedule_list) at the top of the
++		 * loop is unlocked.  Just go back and have another
++		 * look.
++		 */
+ 		if (!vif)
+ 			continue;
+ 
++		if (vif->tx.sring->req_prod - vif->tx.req_cons >
++		    XEN_NETIF_TX_RING_SIZE) {
++			netdev_err(vif->dev,
++				   "Impossible number of requests. "
++				   "req_prod %d, req_cons %d, size %ld\n",
++				   vif->tx.sring->req_prod, vif->tx.req_cons,
++				   XEN_NETIF_TX_RING_SIZE);
++			netbk_fatal_tx_err(vif);
++			continue;
++		}
++
+ 		RING_FINAL_CHECK_FOR_REQUESTS(&vif->tx, work_to_do);
+ 		if (!work_to_do) {
+ 			xenvif_put(vif);
+@@ -1265,17 +1294,14 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
+ 			work_to_do = xen_netbk_get_extras(vif, extras,
+ 							  work_to_do);
+ 			idx = vif->tx.req_cons;
+-			if (unlikely(work_to_do < 0)) {
+-				netbk_tx_err(vif, &txreq, idx);
++			if (unlikely(work_to_do < 0))
+ 				continue;
+-			}
+ 		}
+ 
+ 		ret = netbk_count_requests(vif, &txreq, txfrags, work_to_do);
+-		if (unlikely(ret < 0)) {
+-			netbk_tx_err(vif, &txreq, idx - ret);
++		if (unlikely(ret < 0))
+ 			continue;
+-		}
++
+ 		idx += ret;
+ 
+ 		if (unlikely(txreq.size < ETH_HLEN)) {
+@@ -1287,11 +1313,11 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
+ 
+ 		/* No crossing a page as the payload mustn't fragment. */
+ 		if (unlikely((txreq.offset + txreq.size) > PAGE_SIZE)) {
+-			netdev_dbg(vif->dev,
++			netdev_err(vif->dev,
+ 				   "txreq.offset: %x, size: %u, end: %lu\n",
+ 				   txreq.offset, txreq.size,
+ 				   (txreq.offset&~PAGE_MASK) + txreq.size);
+-			netbk_tx_err(vif, &txreq, idx);
++			netbk_fatal_tx_err(vif);
+ 			continue;
+ 		}
+ 
+@@ -1319,8 +1345,8 @@ static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
+ 			gso = &extras[XEN_NETIF_EXTRA_TYPE_GSO - 1];
+ 
+ 			if (netbk_set_skb_gso(vif, skb, gso)) {
++				/* Failure in netbk_set_skb_gso is fatal. */
+ 				kfree_skb(skb);
+-				netbk_tx_err(vif, &txreq, idx);
+ 				continue;
+ 			}
+ 		}
+@@ -1419,7 +1445,7 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
+ 			txp->size -= data_len;
+ 		} else {
+ 			/* Schedule a response immediately. */
+-			xen_netbk_idx_release(netbk, pending_idx);
++			xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_OKAY);
+ 		}
+ 
+ 		if (txp->flags & XEN_NETTXF_csum_blank)
+@@ -1474,7 +1500,8 @@ static void xen_netbk_tx_action(struct xen_netbk *netbk)
+ 
+ }
+ 
+-static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
++static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx,
++				  u8 status)
+ {
+ 	struct xenvif *vif;
+ 	struct pending_tx_info *pending_tx_info;
+@@ -1488,7 +1515,7 @@ static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
+ 
+ 	vif = pending_tx_info->vif;
+ 
+-	make_tx_response(vif, &pending_tx_info->req, XEN_NETIF_RSP_OKAY);
++	make_tx_response(vif, &pending_tx_info->req, status);
+ 
+ 	index = pending_index(netbk->pending_prod++);
+ 	netbk->pending_ring[index] = pending_idx;
+diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
+index 26ffd3e..2c113de 100644
+--- a/drivers/pci/hotplug/pciehp.h
++++ b/drivers/pci/hotplug/pciehp.h
+@@ -44,7 +44,6 @@ extern bool pciehp_poll_mode;
+ extern int pciehp_poll_time;
+ extern bool pciehp_debug;
+ extern bool pciehp_force;
+-extern struct workqueue_struct *pciehp_wq;
+ 
+ #define dbg(format, arg...)						\
+ do {									\
+@@ -78,6 +77,7 @@ struct slot {
+ 	struct hotplug_slot *hotplug_slot;
+ 	struct delayed_work work;	/* work for button event */
+ 	struct mutex lock;
++	struct workqueue_struct *wq;
+ };
+ 
+ struct event_info {
+diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
+index 365c6b9..9e39df9 100644
+--- a/drivers/pci/hotplug/pciehp_core.c
++++ b/drivers/pci/hotplug/pciehp_core.c
+@@ -42,7 +42,6 @@ bool pciehp_debug;
+ bool pciehp_poll_mode;
+ int pciehp_poll_time;
+ bool pciehp_force;
+-struct workqueue_struct *pciehp_wq;
+ 
+ #define DRIVER_VERSION	"0.4"
+ #define DRIVER_AUTHOR	"Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
+@@ -340,18 +339,13 @@ static int __init pcied_init(void)
+ {
+ 	int retval = 0;
+ 
+-	pciehp_wq = alloc_workqueue("pciehp", 0, 0);
+-	if (!pciehp_wq)
+-		return -ENOMEM;
+-
+ 	pciehp_firmware_init();
+ 	retval = pcie_port_service_register(&hpdriver_portdrv);
+  	dbg("pcie_port_service_register = %d\n", retval);
+   	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
+- 	if (retval) {
+-		destroy_workqueue(pciehp_wq);
++	if (retval)
+ 		dbg("Failure to register service\n");
+-	}
++
+ 	return retval;
+ }
+ 
+@@ -359,7 +353,6 @@ static void __exit pcied_cleanup(void)
+ {
+ 	dbg("unload_pciehpd()\n");
+ 	pcie_port_service_unregister(&hpdriver_portdrv);
+-	destroy_workqueue(pciehp_wq);
+ 	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
+ }
+ 
+diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
+index 27f4429..38f0186 100644
+--- a/drivers/pci/hotplug/pciehp_ctrl.c
++++ b/drivers/pci/hotplug/pciehp_ctrl.c
+@@ -49,7 +49,7 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
+ 	info->p_slot = p_slot;
+ 	INIT_WORK(&info->work, interrupt_event_handler);
+ 
+-	queue_work(pciehp_wq, &info->work);
++	queue_work(p_slot->wq, &info->work);
+ 
+ 	return 0;
+ }
+@@ -344,7 +344,7 @@ void pciehp_queue_pushbutton_work(struct work_struct *work)
+ 		kfree(info);
+ 		goto out;
+ 	}
+-	queue_work(pciehp_wq, &info->work);
++	queue_work(p_slot->wq, &info->work);
+  out:
+ 	mutex_unlock(&p_slot->lock);
+ }
+@@ -377,7 +377,7 @@ static void handle_button_press_event(struct slot *p_slot)
+ 		if (ATTN_LED(ctrl))
+ 			pciehp_set_attention_status(p_slot, 0);
+ 
+-		queue_delayed_work(pciehp_wq, &p_slot->work, 5*HZ);
++		queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ);
+ 		break;
+ 	case BLINKINGOFF_STATE:
+ 	case BLINKINGON_STATE:
+@@ -439,7 +439,7 @@ static void handle_surprise_event(struct slot *p_slot)
+ 	else
+ 		p_slot->state = POWERON_STATE;
+ 
+-	queue_work(pciehp_wq, &info->work);
++	queue_work(p_slot->wq, &info->work);
+ }
+ 
+ static void interrupt_event_handler(struct work_struct *work)
+diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
+index 302451e..61632c5 100644
+--- a/drivers/pci/hotplug/pciehp_hpc.c
++++ b/drivers/pci/hotplug/pciehp_hpc.c
+@@ -773,23 +773,32 @@ static void pcie_shutdown_notification(struct controller *ctrl)
+ static int pcie_init_slot(struct controller *ctrl)
+ {
+ 	struct slot *slot;
++	char name[32];
+ 
+ 	slot = kzalloc(sizeof(*slot), GFP_KERNEL);
+ 	if (!slot)
+ 		return -ENOMEM;
+ 
++	snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl));
++	slot->wq = alloc_workqueue(name, 0, 0);
++	if (!slot->wq)
++		goto abort;
++
+ 	slot->ctrl = ctrl;
+ 	mutex_init(&slot->lock);
+ 	INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
+ 	ctrl->slot = slot;
+ 	return 0;
++abort:
++	kfree(slot);
++	return -ENOMEM;
+ }
+ 
+ static void pcie_cleanup_slot(struct controller *ctrl)
+ {
+ 	struct slot *slot = ctrl->slot;
+ 	cancel_delayed_work(&slot->work);
+-	flush_workqueue(pciehp_wq);
++	destroy_workqueue(slot->wq);
+ 	kfree(slot);
+ }
+ 
+diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
+index ca64932..1b69d95 100644
+--- a/drivers/pci/hotplug/shpchp.h
++++ b/drivers/pci/hotplug/shpchp.h
+@@ -47,7 +47,6 @@ extern bool shpchp_poll_mode;
+ extern int shpchp_poll_time;
+ extern bool shpchp_debug;
+ extern struct workqueue_struct *shpchp_wq;
+-extern struct workqueue_struct *shpchp_ordered_wq;
+ 
+ #define dbg(format, arg...)						\
+ do {									\
+diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
+index b6de307..8c6d645 100644
+--- a/drivers/pci/hotplug/shpchp_core.c
++++ b/drivers/pci/hotplug/shpchp_core.c
+@@ -40,7 +40,6 @@ bool shpchp_debug;
+ bool shpchp_poll_mode;
+ int shpchp_poll_time;
+ struct workqueue_struct *shpchp_wq;
+-struct workqueue_struct *shpchp_ordered_wq;
+ 
+ #define DRIVER_VERSION	"0.4"
+ #define DRIVER_AUTHOR	"Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
+@@ -181,7 +180,6 @@ void cleanup_slots(struct controller *ctrl)
+ 		list_del(&slot->slot_list);
+ 		cancel_delayed_work(&slot->work);
+ 		flush_workqueue(shpchp_wq);
+-		flush_workqueue(shpchp_ordered_wq);
+ 		pci_hp_deregister(slot->hotplug_slot);
+ 	}
+ }
+@@ -370,17 +368,10 @@ static int __init shpcd_init(void)
+ 	if (!shpchp_wq)
+ 		return -ENOMEM;
+ 
+-	shpchp_ordered_wq = alloc_ordered_workqueue("shpchp_ordered", 0);
+-	if (!shpchp_ordered_wq) {
+-		destroy_workqueue(shpchp_wq);
+-		return -ENOMEM;
+-	}
+-
+ 	retval = pci_register_driver(&shpc_driver);
+ 	dbg("%s: pci_register_driver = %d\n", __func__, retval);
+ 	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
+ 	if (retval) {
+-		destroy_workqueue(shpchp_ordered_wq);
+ 		destroy_workqueue(shpchp_wq);
+ 	}
+ 	return retval;
+@@ -390,7 +381,6 @@ static void __exit shpcd_cleanup(void)
+ {
+ 	dbg("unload_shpchpd()\n");
+ 	pci_unregister_driver(&shpc_driver);
+-	destroy_workqueue(shpchp_ordered_wq);
+ 	destroy_workqueue(shpchp_wq);
+ 	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
+ }
+diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
+index f9b5a52..fd2cae9 100644
+--- a/drivers/pci/hotplug/shpchp_ctrl.c
++++ b/drivers/pci/hotplug/shpchp_ctrl.c
+@@ -453,7 +453,7 @@ void shpchp_queue_pushbutton_work(struct work_struct *work)
+ 		kfree(info);
+ 		goto out;
+ 	}
+-	queue_work(shpchp_ordered_wq, &info->work);
++	queue_work(shpchp_wq, &info->work);
+  out:
+ 	mutex_unlock(&p_slot->lock);
+ }
+diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
+index 1b7d05d..b0c92a5 100644
+--- a/drivers/pci/pcie/aer/aerdrv_core.c
++++ b/drivers/pci/pcie/aer/aerdrv_core.c
+@@ -649,6 +649,7 @@ static void aer_recover_work_func(struct work_struct *work)
+ 			continue;
+ 		}
+ 		do_recovery(pdev, entry.severity);
++		pci_dev_put(pdev);
+ 	}
+ }
+ #endif
+diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
+index b500840..474f22f 100644
+--- a/drivers/pci/pcie/aspm.c
++++ b/drivers/pci/pcie/aspm.c
+@@ -798,6 +798,9 @@ void pcie_clear_aspm(struct pci_bus *bus)
+ {
+ 	struct pci_dev *child;
+ 
++	if (aspm_force)
++		return;
++
+ 	/*
+ 	 * Clear any ASPM setup that the firmware has carried out on this bus
+ 	 */
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 5155317..161e7f0 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -2686,7 +2686,7 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
+ 	if (PCI_FUNC(dev->devfn))
+ 		return;
+ 	/*
+-	 * RICOH 0xe823 SD/MMC card reader fails to recognize
++	 * RICOH 0xe822 and 0xe823 SD/MMC card readers fail to recognize
+ 	 * certain types of SD/MMC cards. Lowering the SD base
+ 	 * clock frequency from 200Mhz to 50Mhz fixes this issue.
+ 	 *
+@@ -2697,7 +2697,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
+ 	 * 0xf9  - Key register for 0x150
+ 	 * 0xfc  - key register for 0xe1
+ 	 */
+-	if (dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
++	if (dev->device == PCI_DEVICE_ID_RICOH_R5CE822 ||
++	    dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
+ 		pci_write_config_byte(dev, 0xf9, 0xfc);
+ 		pci_write_config_byte(dev, 0x150, 0x10);
+ 		pci_write_config_byte(dev, 0xf9, 0x00);
+@@ -2724,6 +2725,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
+ }
+ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
+ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
++DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
+ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
+ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
+ #endif /*CONFIG_MMC_RICOH_MMC*/
+diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
+index 04a4861..073c33f 100644
+--- a/drivers/pci/remove.c
++++ b/drivers/pci/remove.c
+@@ -19,6 +19,8 @@ static void pci_free_resources(struct pci_dev *dev)
+ 
+ static void pci_stop_dev(struct pci_dev *dev)
+ {
++	pci_pme_active(dev, false);
++
+ 	if (dev->is_added) {
+ 		pci_proc_detach_device(dev);
+ 		pci_remove_sysfs_dev_files(dev);
+diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
+index 86e4a1a..6bb02ab 100644
+--- a/drivers/pcmcia/vrc4171_card.c
++++ b/drivers/pcmcia/vrc4171_card.c
+@@ -246,6 +246,7 @@ static int pccard_init(struct pcmcia_socket *sock)
+ 	socket = &vrc4171_sockets[slot];
+ 	socket->csc_irq = search_nonuse_irq();
+ 	socket->io_irq = search_nonuse_irq();
++	spin_lock_init(&socket->lock);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
+index 7481146..97c2be1 100644
+--- a/drivers/platform/x86/ibm_rtl.c
++++ b/drivers/platform/x86/ibm_rtl.c
+@@ -244,7 +244,7 @@ static int __init ibm_rtl_init(void) {
+ 	if (force)
+ 		pr_warn("module loaded by force\n");
+ 	/* first ensure that we are running on IBM HW */
+-	else if (efi_enabled || !dmi_check_system(ibm_rtl_dmi_table))
++	else if (efi_enabled(EFI_BOOT) || !dmi_check_system(ibm_rtl_dmi_table))
+ 		return -ENODEV;
+ 
+ 	/* Get the address for the Extended BIOS Data Area */
+diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
+index dd90d15..d1f0300 100644
+--- a/drivers/platform/x86/samsung-laptop.c
++++ b/drivers/platform/x86/samsung-laptop.c
+@@ -26,6 +26,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/debugfs.h>
+ #include <linux/ctype.h>
++#include <linux/efi.h>
+ #include <acpi/video.h>
+ 
+ /*
+@@ -1523,6 +1524,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
+ 		},
+ 	 .driver_data = &samsung_broken_acpi_video,
+ 	},
++	{
++	 .callback = samsung_dmi_matched,
++	 .ident = "N250P",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
++		DMI_MATCH(DMI_PRODUCT_NAME, "N250P"),
++		DMI_MATCH(DMI_BOARD_NAME, "N250P"),
++		},
++	 .driver_data = &samsung_broken_acpi_video,
++	},
+ 	{ },
+ };
+ MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
+@@ -1534,6 +1545,9 @@ static int __init samsung_init(void)
+ 	struct samsung_laptop *samsung;
+ 	int ret;
+ 
++	if (efi_enabled(EFI_BOOT))
++		return -ENODEV;
++
+ 	quirks = &samsung_unknown;
+ 	if (!force && !dmi_check_system(samsung_dmi_table))
+ 		return -ENODEV;
+diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
+index e49871d..3c5c353 100644
+--- a/drivers/pnp/pnpacpi/core.c
++++ b/drivers/pnp/pnpacpi/core.c
+@@ -58,7 +58,7 @@ static inline int __init is_exclusive_device(struct acpi_device *dev)
+ 	if (!(('0' <= (c) && (c) <= '9') || ('A' <= (c) && (c) <= 'F'))) \
+ 		return 0
+ #define TEST_ALPHA(c) \
+-	if (!('@' <= (c) || (c) <= 'Z')) \
++	if (!('A' <= (c) && (c) <= 'Z')) \
+ 		return 0
+ static int __init ispnpidacpi(const char *id)
+ {
+diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
+index bba3cca..8e3329e 100644
+--- a/drivers/power/ab8500_btemp.c
++++ b/drivers/power/ab8500_btemp.c
+@@ -1119,7 +1119,7 @@ static void __exit ab8500_btemp_exit(void)
+ 	platform_driver_unregister(&ab8500_btemp_driver);
+ }
+ 
+-subsys_initcall_sync(ab8500_btemp_init);
++device_initcall(ab8500_btemp_init);
+ module_exit(ab8500_btemp_exit);
+ 
+ MODULE_LICENSE("GPL v2");
+diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
+index 804b88c..d8cd151 100644
+--- a/drivers/power/abx500_chargalg.c
++++ b/drivers/power/abx500_chargalg.c
+@@ -1698,7 +1698,7 @@ static ssize_t abx500_chargalg_sysfs_charger(struct kobject *kobj,
+ static struct attribute abx500_chargalg_en_charger = \
+ {
+ 	.name = "chargalg",
+-	.mode = S_IWUGO,
++	.mode = S_IWUSR,
+ };
+ 
+ static struct attribute *abx500_chargalg_chg[] = {
+diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
+index 7413885..d4b9b1e 100644
+--- a/drivers/regulator/wm831x-dcdc.c
++++ b/drivers/regulator/wm831x-dcdc.c
+@@ -290,7 +290,7 @@ static int wm831x_buckv_set_voltage_sel(struct regulator_dev *rdev,
+ 	if (vsel > dcdc->dvs_vsel) {
+ 		ret = wm831x_set_bits(wm831x, dvs_reg,
+ 				      WM831X_DC1_DVS_VSEL_MASK,
+-				      dcdc->dvs_vsel);
++				      vsel);
+ 		if (ret == 0)
+ 			dcdc->dvs_vsel = vsel;
+ 		else
+diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
+index dd2aeee..8f8c8ae 100644
+--- a/drivers/rtc/rtc-isl1208.c
++++ b/drivers/rtc/rtc-isl1208.c
+@@ -494,6 +494,7 @@ isl1208_rtc_interrupt(int irq, void *data)
+ {
+ 	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
+ 	struct i2c_client *client = data;
++	struct rtc_device *rtc = i2c_get_clientdata(client);
+ 	int handled = 0, sr, err;
+ 
+ 	/*
+@@ -516,6 +517,8 @@ isl1208_rtc_interrupt(int irq, void *data)
+ 	if (sr & ISL1208_REG_SR_ALM) {
+ 		dev_dbg(&client->dev, "alarm!\n");
+ 
++		rtc_update_irq(rtc, 1, RTC_IRQF | RTC_AF);
++
+ 		/* Clear the alarm */
+ 		sr &= ~ISL1208_REG_SR_ALM;
+ 		sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR, sr);
+diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c
+index 9e94fb1..44878da 100644
+--- a/drivers/rtc/rtc-vt8500.c
++++ b/drivers/rtc/rtc-vt8500.c
+@@ -69,7 +69,7 @@
+ 				| ALARM_SEC_BIT)
+ 
+ #define VT8500_RTC_CR_ENABLE	(1 << 0)	/* Enable RTC */
+-#define VT8500_RTC_CR_24H	(1 << 1)	/* 24h time format */
++#define VT8500_RTC_CR_12H	(1 << 1)	/* 12h time format */
+ #define VT8500_RTC_CR_SM_ENABLE	(1 << 2)	/* Enable periodic irqs */
+ #define VT8500_RTC_CR_SM_SEC	(1 << 3)	/* 0: 1Hz/60, 1: 1Hz */
+ #define VT8500_RTC_CR_CALIB	(1 << 4)	/* Enable calibration */
+@@ -118,7 +118,7 @@ static int vt8500_rtc_read_time(struct device *dev, struct rtc_time *tm)
+ 	tm->tm_min = bcd2bin((time & TIME_MIN_MASK) >> TIME_MIN_S);
+ 	tm->tm_hour = bcd2bin((time & TIME_HOUR_MASK) >> TIME_HOUR_S);
+ 	tm->tm_mday = bcd2bin(date & DATE_DAY_MASK);
+-	tm->tm_mon = bcd2bin((date & DATE_MONTH_MASK) >> DATE_MONTH_S);
++	tm->tm_mon = bcd2bin((date & DATE_MONTH_MASK) >> DATE_MONTH_S) - 1;
+ 	tm->tm_year = bcd2bin((date & DATE_YEAR_MASK) >> DATE_YEAR_S)
+ 			+ ((date >> DATE_CENTURY_S) & 1 ? 200 : 100);
+ 	tm->tm_wday = (time & TIME_DOW_MASK) >> TIME_DOW_S;
+@@ -137,8 +137,9 @@ static int vt8500_rtc_set_time(struct device *dev, struct rtc_time *tm)
+ 	}
+ 
+ 	writel((bin2bcd(tm->tm_year - 100) << DATE_YEAR_S)
+-		| (bin2bcd(tm->tm_mon) << DATE_MONTH_S)
+-		| (bin2bcd(tm->tm_mday)),
++		| (bin2bcd(tm->tm_mon + 1) << DATE_MONTH_S)
++		| (bin2bcd(tm->tm_mday))
++		| ((tm->tm_year >= 200) << DATE_CENTURY_S),
+ 		vt8500_rtc->regbase + VT8500_RTC_DS);
+ 	writel((bin2bcd(tm->tm_wday) << TIME_DOW_S)
+ 		| (bin2bcd(tm->tm_hour) << TIME_HOUR_S)
+@@ -248,7 +249,7 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev)
+ 	}
+ 
+ 	/* Enable RTC and set it to 24-hour mode */
+-	writel(VT8500_RTC_CR_ENABLE | VT8500_RTC_CR_24H,
++	writel(VT8500_RTC_CR_ENABLE,
+ 	       vt8500_rtc->regbase + VT8500_RTC_CR);
+ 
+ 	vt8500_rtc->rtc = rtc_device_register("vt8500-rtc", &pdev->dev,
+diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
+index 368368f..908d287 100644
+--- a/drivers/s390/cio/device_pgid.c
++++ b/drivers/s390/cio/device_pgid.c
+@@ -234,7 +234,7 @@ static int pgid_cmp(struct pgid *p1, struct pgid *p2)
+  * Determine pathgroup state from PGID data.
+  */
+ static void pgid_analyze(struct ccw_device *cdev, struct pgid **p,
+-			 int *mismatch, int *reserved, u8 *reset)
++			 int *mismatch, u8 *reserved, u8 *reset)
+ {
+ 	struct pgid *pgid = &cdev->private->pgid[0];
+ 	struct pgid *first = NULL;
+@@ -248,7 +248,7 @@ static void pgid_analyze(struct ccw_device *cdev, struct pgid **p,
+ 		if ((cdev->private->pgid_valid_mask & lpm) == 0)
+ 			continue;
+ 		if (pgid->inf.ps.state2 == SNID_STATE2_RESVD_ELSE)
+-			*reserved = 1;
++			*reserved |= lpm;
+ 		if (pgid_is_reset(pgid)) {
+ 			*reset |= lpm;
+ 			continue;
+@@ -316,14 +316,14 @@ static void snid_done(struct ccw_device *cdev, int rc)
+ 	struct subchannel *sch = to_subchannel(cdev->dev.parent);
+ 	struct pgid *pgid;
+ 	int mismatch = 0;
+-	int reserved = 0;
++	u8 reserved = 0;
+ 	u8 reset = 0;
+ 	u8 donepm;
+ 
+ 	if (rc)
+ 		goto out;
+ 	pgid_analyze(cdev, &pgid, &mismatch, &reserved, &reset);
+-	if (reserved)
++	if (reserved == cdev->private->pgid_valid_mask)
+ 		rc = -EUSERS;
+ 	else if (mismatch)
+ 		rc = -EOPNOTSUPP;
+@@ -336,7 +336,7 @@ static void snid_done(struct ccw_device *cdev, int rc)
+ 	}
+ out:
+ 	CIO_MSG_EVENT(2, "snid: device 0.%x.%04x: rc=%d pvm=%02x vpm=%02x "
+-		      "todo=%02x mism=%d rsvd=%d reset=%02x\n", id->ssid,
++		      "todo=%02x mism=%d rsvd=%02x reset=%02x\n", id->ssid,
+ 		      id->devno, rc, cdev->private->pgid_valid_mask, sch->vpm,
+ 		      cdev->private->pgid_todo_mask, mismatch, reserved, reset);
+ 	switch (rc) {
+diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
+index 47cccd5..9c77c8b 100644
+--- a/drivers/s390/kvm/kvm_virtio.c
++++ b/drivers/s390/kvm/kvm_virtio.c
+@@ -419,6 +419,26 @@ static void kvm_extint_handler(struct ext_code ext_code,
+ }
+ 
+ /*
++ * For s390-virtio, we expect a page above main storage containing
++ * the virtio configuration. Try to actually load from this area
++ * in order to figure out if the host provides this page.
++ */
++static int __init test_devices_support(unsigned long addr)
++{
++	int ret = -EIO;
++
++	asm volatile(
++		"0:	lura	0,%1\n"
++		"1:	xgr	%0,%0\n"
++		"2:\n"
++		EX_TABLE(0b,2b)
++		EX_TABLE(1b,2b)
++		: "+d" (ret)
++		: "a" (addr)
++		: "0", "cc");
++	return ret;
++}
++/*
+  * Init function for virtio
+  * devices are in a single page above top of "normal" mem
+  */
+@@ -429,21 +449,23 @@ static int __init kvm_devices_init(void)
+ 	if (!MACHINE_IS_KVM)
+ 		return -ENODEV;
+ 
++	if (test_devices_support(real_memory_size) < 0)
++		return -ENODEV;
++
++	rc = vmem_add_mapping(real_memory_size, PAGE_SIZE);
++	if (rc)
++		return rc;
++
++	kvm_devices = (void *) real_memory_size;
++
+ 	kvm_root = root_device_register("kvm_s390");
+ 	if (IS_ERR(kvm_root)) {
+ 		rc = PTR_ERR(kvm_root);
+ 		printk(KERN_ERR "Could not register kvm_s390 root device");
++		vmem_remove_mapping(real_memory_size, PAGE_SIZE);
+ 		return rc;
+ 	}
+ 
+-	rc = vmem_add_mapping(real_memory_size, PAGE_SIZE);
+-	if (rc) {
+-		root_device_unregister(kvm_root);
+-		return rc;
+-	}
+-
+-	kvm_devices = (void *) real_memory_size;
+-
+ 	INIT_WORK(&hotplug_work, hotplug_devices);
+ 
+ 	service_subclass_irq_register();
+diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
+index 1286a8a..1c91061 100644
+--- a/drivers/scsi/isci/init.c
++++ b/drivers/scsi/isci/init.c
+@@ -633,7 +633,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic
+ 		return -ENOMEM;
+ 	pci_set_drvdata(pdev, pci_info);
+ 
+-	if (efi_enabled)
++	if (efi_enabled(EFI_RUNTIME_SERVICES))
+ 		orom = isci_get_efi_var(pdev);
+ 
+ 	if (!orom)
+diff --git a/drivers/scsi/mvsas/mv_94xx.h b/drivers/scsi/mvsas/mv_94xx.h
+index 8f7eb4f..487aa6f 100644
+--- a/drivers/scsi/mvsas/mv_94xx.h
++++ b/drivers/scsi/mvsas/mv_94xx.h
+@@ -258,21 +258,11 @@ enum sas_sata_phy_regs {
+ #define SPI_ADDR_VLD_94XX         	(1U << 1)
+ #define SPI_CTRL_SpiStart_94XX     	(1U << 0)
+ 
+-#define mv_ffc(x)   ffz(x)
+-
+ static inline int
+ mv_ffc64(u64 v)
+ {
+-	int i;
+-	i = mv_ffc((u32)v);
+-	if (i >= 0)
+-		return i;
+-	i = mv_ffc((u32)(v>>32));
+-
+-	if (i != 0)
+-		return 32 + i;
+-
+-	return -1;
++	u64 x = ~v;
++	return x ? __ffs64(x) : -1;
+ }
+ 
+ #define r_reg_set_enable(i) \
+diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
+index 4539d59..a3776d6 100644
+--- a/drivers/scsi/mvsas/mv_sas.c
++++ b/drivers/scsi/mvsas/mv_sas.c
+@@ -1629,7 +1629,7 @@ int mvs_abort_task(struct sas_task *task)
+ 			mv_dprintk("mvs_abort_task() mvi=%p task=%p "
+ 				   "slot=%p slot_idx=x%x\n",
+ 				   mvi, task, slot, slot_idx);
+-			mvs_tmf_timedout((unsigned long)task);
++			task->task_state_flags |= SAS_TASK_STATE_ABORTED;
+ 			mvs_slot_task_free(mvi, task, slot, slot_idx);
+ 			rc = TMF_RESP_FUNC_COMPLETE;
+ 			goto out;
+diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h
+index c04a4f5..da24955 100644
+--- a/drivers/scsi/mvsas/mv_sas.h
++++ b/drivers/scsi/mvsas/mv_sas.h
+@@ -69,7 +69,7 @@ extern struct kmem_cache *mvs_task_list_cache;
+ #define DEV_IS_EXPANDER(type)	\
+ 	((type == EDGE_DEV) || (type == FANOUT_DEV))
+ 
+-#define bit(n) ((u32)1 << n)
++#define bit(n) ((u64)1 << n)
+ 
+ #define for_each_phy(__lseq_mask, __mc, __lseq)			\
+ 	for ((__mc) = (__lseq_mask), (__lseq) = 0;		\
+diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
+index fb8cd38..0076210 100644
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -3801,9 +3801,9 @@ qla2x00_do_dpc(void *data)
+ 			    "ISP abort end.\n");
+ 		}
+ 
+-		if (test_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags)) {
++		if (test_and_clear_bit(FCPORT_UPDATE_NEEDED,
++		    &base_vha->dpc_flags)) {
+ 			qla2x00_update_fcports(base_vha);
+-			clear_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags);
+ 		}
+ 
+ 		if (test_bit(SCR_PENDING, &base_vha->dpc_flags)) {
+diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
+index ce5224c..931a7d9 100644
+--- a/drivers/scsi/scsi_sysfs.c
++++ b/drivers/scsi/scsi_sysfs.c
+@@ -247,11 +247,11 @@ show_shost_active_mode(struct device *dev,
+ 
+ static DEVICE_ATTR(active_mode, S_IRUGO | S_IWUSR, show_shost_active_mode, NULL);
+ 
+-static int check_reset_type(char *str)
++static int check_reset_type(const char *str)
+ {
+-	if (strncmp(str, "adapter", 10) == 0)
++	if (sysfs_streq(str, "adapter"))
+ 		return SCSI_ADAPTER_RESET;
+-	else if (strncmp(str, "firmware", 10) == 0)
++	else if (sysfs_streq(str, "firmware"))
+ 		return SCSI_FIRMWARE_RESET;
+ 	else
+ 		return 0;
+@@ -264,12 +264,9 @@ store_host_reset(struct device *dev, struct device_attribute *attr,
+ 	struct Scsi_Host *shost = class_to_shost(dev);
+ 	struct scsi_host_template *sht = shost->hostt;
+ 	int ret = -EINVAL;
+-	char str[10];
+ 	int type;
+ 
+-	sscanf(buf, "%s", str);
+-	type = check_reset_type(str);
+-
++	type = check_reset_type(buf);
+ 	if (!type)
+ 		goto exit_store_host_reset;
+ 
+diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
+index 4df73e5..8afedd6 100644
+--- a/drivers/scsi/sd.c
++++ b/drivers/scsi/sd.c
+@@ -2926,10 +2926,6 @@ static int __init init_sd(void)
+ 	if (err)
+ 		goto err_out;
+ 
+-	err = scsi_register_driver(&sd_template.gendrv);
+-	if (err)
+-		goto err_out_class;
+-
+ 	sd_cdb_cache = kmem_cache_create("sd_ext_cdb", SD_EXT_CDB_SIZE,
+ 					 0, 0, NULL);
+ 	if (!sd_cdb_cache) {
+@@ -2943,8 +2939,15 @@ static int __init init_sd(void)
+ 		goto err_out_cache;
+ 	}
+ 
++	err = scsi_register_driver(&sd_template.gendrv);
++	if (err)
++		goto err_out_driver;
++
+ 	return 0;
+ 
++err_out_driver:
++	mempool_destroy(sd_cdb_pool);
++
+ err_out_cache:
+ 	kmem_cache_destroy(sd_cdb_cache);
+ 
+@@ -2967,10 +2970,10 @@ static void __exit exit_sd(void)
+ 
+ 	SCSI_LOG_HLQUEUE(3, printk("exit_sd: exiting sd driver\n"));
+ 
++	scsi_unregister_driver(&sd_template.gendrv);
+ 	mempool_destroy(sd_cdb_pool);
+ 	kmem_cache_destroy(sd_cdb_cache);
+ 
+-	scsi_unregister_driver(&sd_template.gendrv);
+ 	class_unregister(&sd_disk_class);
+ 
+ 	for (i = 0; i < SD_MAJORS; i++)
+diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
+index 6cee785..2701546 100644
+--- a/drivers/staging/comedi/Kconfig
++++ b/drivers/staging/comedi/Kconfig
+@@ -444,6 +444,7 @@ config COMEDI_ADQ12B
+ 
+ config COMEDI_NI_AT_A2150
+ 	tristate "NI AT-A2150 ISA card support"
++	select COMEDI_FC
+ 	depends on VIRT_TO_BUS
+ 	---help---
+ 	  Enable support for National Instruments AT-A2150 cards
+diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
+index 41dea18..2bbf288 100644
+--- a/drivers/staging/comedi/comedi_fops.c
++++ b/drivers/staging/comedi/comedi_fops.c
+@@ -1545,8 +1545,16 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
+ 	/* Device config is special, because it must work on
+ 	 * an unconfigured device. */
+ 	if (cmd == COMEDI_DEVCONFIG) {
++		if (minor >= COMEDI_NUM_BOARD_MINORS) {
++			/* Device config not appropriate on non-board minors. */
++			rc = -ENOTTY;
++			goto done;
++		}
+ 		rc = do_devconfig_ioctl(dev,
+ 					(struct comedi_devconfig __user *)arg);
++		if (rc == 0)
++			/* Evade comedi_auto_unconfig(). */
++			dev_file_info->hardware_device = NULL;
+ 		goto done;
+ 	}
+ 
+@@ -1769,7 +1777,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
+ 
+ 	mask = 0;
+ 	read_subdev = comedi_get_read_subdevice(dev_file_info);
+-	if (read_subdev) {
++	if (read_subdev && read_subdev->async) {
+ 		poll_wait(file, &read_subdev->async->wait_head, wait);
+ 		if (!read_subdev->busy
+ 		    || comedi_buf_read_n_available(read_subdev->async) > 0
+@@ -1779,7 +1787,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
+ 		}
+ 	}
+ 	write_subdev = comedi_get_write_subdevice(dev_file_info);
+-	if (write_subdev) {
++	if (write_subdev && write_subdev->async) {
+ 		poll_wait(file, &write_subdev->async->wait_head, wait);
+ 		comedi_buf_write_alloc(write_subdev->async,
+ 				       write_subdev->async->prealloc_bufsz);
+@@ -1821,7 +1829,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
+ 	}
+ 
+ 	s = comedi_get_write_subdevice(dev_file_info);
+-	if (s == NULL) {
++	if (s == NULL || s->async == NULL) {
+ 		retval = -EIO;
+ 		goto done;
+ 	}
+@@ -1932,7 +1940,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
+ 	}
+ 
+ 	s = comedi_get_read_subdevice(dev_file_info);
+-	if (s == NULL) {
++	if (s == NULL || s->async == NULL) {
+ 		retval = -EIO;
+ 		goto done;
+ 	}
+diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
+index 523a809..e38bd64 100644
+--- a/drivers/staging/comedi/drivers/comedi_test.c
++++ b/drivers/staging/comedi/drivers/comedi_test.c
+@@ -396,7 +396,7 @@ static int waveform_ai_cancel(struct comedi_device *dev,
+ 			      struct comedi_subdevice *s)
+ {
+ 	devpriv->timer_running = 0;
+-	del_timer(&devpriv->timer);
++	del_timer_sync(&devpriv->timer);
+ 	return 0;
+ }
+ 
+diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
+index d3a1d65..ac0fbd7 100644
+--- a/drivers/staging/comedi/drivers/ni_labpc.c
++++ b/drivers/staging/comedi/drivers/ni_labpc.c
+@@ -1263,7 +1263,9 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
+ 	else
+ 		channel = CR_CHAN(cmd->chanlist[0]);
+ 	/* munge channel bits for differential / scan disabled mode */
+-	if (labpc_ai_scan_mode(cmd) != MODE_SINGLE_CHAN && aref == AREF_DIFF)
++	if ((labpc_ai_scan_mode(cmd) == MODE_SINGLE_CHAN ||
++	     labpc_ai_scan_mode(cmd) == MODE_SINGLE_CHAN_INTERVAL) &&
++	    aref == AREF_DIFF)
+ 		channel *= 2;
+ 	devpriv->command1_bits |= ADC_CHAN_BITS(channel);
+ 	devpriv->command1_bits |= thisboard->ai_range_code[range];
+@@ -1279,21 +1281,6 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
+ 		devpriv->write_byte(devpriv->command1_bits,
+ 				    dev->iobase + COMMAND1_REG);
+ 	}
+-	/*  setup any external triggering/pacing (command4 register) */
+-	devpriv->command4_bits = 0;
+-	if (cmd->convert_src != TRIG_EXT)
+-		devpriv->command4_bits |= EXT_CONVERT_DISABLE_BIT;
+-	/* XXX should discard first scan when using interval scanning
+-	 * since manual says it is not synced with scan clock */
+-	if (labpc_use_continuous_mode(cmd) == 0) {
+-		devpriv->command4_bits |= INTERVAL_SCAN_EN_BIT;
+-		if (cmd->scan_begin_src == TRIG_EXT)
+-			devpriv->command4_bits |= EXT_SCAN_EN_BIT;
+-	}
+-	/*  single-ended/differential */
+-	if (aref == AREF_DIFF)
+-		devpriv->command4_bits |= ADC_DIFF_BIT;
+-	devpriv->write_byte(devpriv->command4_bits, dev->iobase + COMMAND4_REG);
+ 
+ 	devpriv->write_byte(cmd->chanlist_len,
+ 			    dev->iobase + INTERVAL_COUNT_REG);
+@@ -1373,6 +1360,22 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
+ 		devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT;
+ 	devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG);
+ 
++	/*  setup any external triggering/pacing (command4 register) */
++	devpriv->command4_bits = 0;
++	if (cmd->convert_src != TRIG_EXT)
++		devpriv->command4_bits |= EXT_CONVERT_DISABLE_BIT;
++	/* XXX should discard first scan when using interval scanning
++	 * since manual says it is not synced with scan clock */
++	if (labpc_use_continuous_mode(cmd) == 0) {
++		devpriv->command4_bits |= INTERVAL_SCAN_EN_BIT;
++		if (cmd->scan_begin_src == TRIG_EXT)
++			devpriv->command4_bits |= EXT_SCAN_EN_BIT;
++	}
++	/*  single-ended/differential */
++	if (aref == AREF_DIFF)
++		devpriv->command4_bits |= ADC_DIFF_BIT;
++	devpriv->write_byte(devpriv->command4_bits, dev->iobase + COMMAND4_REG);
++
+ 	/*  startup acquisition */
+ 
+ 	/*  command2 reg */
+diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
+index 89f4d43..af5007c 100644
+--- a/drivers/staging/comedi/drivers/ni_pcimio.c
++++ b/drivers/staging/comedi/drivers/ni_pcimio.c
+@@ -963,7 +963,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_625x_ao,
+ 	 .reg_type = ni_reg_625x,
+ 	 .ao_unipolar = 0,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 8,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+@@ -982,7 +982,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_625x_ao,
+ 	 .reg_type = ni_reg_625x,
+ 	 .ao_unipolar = 0,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 8,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+@@ -1001,7 +1001,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_625x_ao,
+ 	 .reg_type = ni_reg_625x,
+ 	 .ao_unipolar = 0,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 8,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+@@ -1037,7 +1037,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_625x_ao,
+ 	 .reg_type = ni_reg_625x,
+ 	 .ao_unipolar = 0,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 32,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+@@ -1056,7 +1056,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_625x_ao,
+ 	 .reg_type = ni_reg_625x,
+ 	 .ao_unipolar = 0,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 32,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+@@ -1092,7 +1092,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_628x_ao,
+ 	 .reg_type = ni_reg_628x,
+ 	 .ao_unipolar = 1,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 8,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+@@ -1111,7 +1111,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_628x_ao,
+ 	 .reg_type = ni_reg_628x,
+ 	 .ao_unipolar = 1,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 8,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+@@ -1147,7 +1147,7 @@ static const struct ni_board_struct ni_boards[] = {
+ 	 .ao_range_table = &range_ni_M_628x_ao,
+ 	 .reg_type = ni_reg_628x,
+ 	 .ao_unipolar = 1,
+-	 .ao_speed = 357,
++	 .ao_speed = 350,
+ 	 .num_p0_dio_channels = 32,
+ 	 .caldac = {caldac_none},
+ 	 .has_8255 = 0,
+diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
+index c758c40..ad53781 100644
+--- a/drivers/staging/rtl8712/usb_intf.c
++++ b/drivers/staging/rtl8712/usb_intf.c
+@@ -64,6 +64,8 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = {
+ 	{USB_DEVICE(0x0B05, 0x1791)}, /* 11n mode disable */
+ 	/* Belkin */
+ 	{USB_DEVICE(0x050D, 0x945A)},
++	/* ISY IWL - Belkin clone */
++	{USB_DEVICE(0x050D, 0x11F1)},
+ 	/* Corega */
+ 	{USB_DEVICE(0x07AA, 0x0047)},
+ 	/* D-Link */
+diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
+index df95337..7616f05 100644
+--- a/drivers/staging/speakup/synth.c
++++ b/drivers/staging/speakup/synth.c
+@@ -342,7 +342,7 @@ int synth_init(char *synth_name)
+ 
+ 	mutex_lock(&spk_mutex);
+ 	/* First, check if we already have it loaded. */
+-	for (i = 0; synths[i] != NULL && i < MAXSYNTHS; i++)
++	for (i = 0; i < MAXSYNTHS && synths[i] != NULL; i++)
+ 		if (strcmp(synths[i]->name, synth_name) == 0)
+ 			synth = synths[i];
+ 
+@@ -423,7 +423,7 @@ int synth_add(struct spk_synth *in_synth)
+ 	int i;
+ 	int status = 0;
+ 	mutex_lock(&spk_mutex);
+-	for (i = 0; synths[i] != NULL && i < MAXSYNTHS; i++)
++	for (i = 0; i < MAXSYNTHS && synths[i] != NULL; i++)
+ 		/* synth_remove() is responsible for rotating the array down */
+ 		if (in_synth == synths[i]) {
+ 			mutex_unlock(&spk_mutex);
+diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h
+index 6b2ec39..806cbf7 100644
+--- a/drivers/staging/vt6656/bssdb.h
++++ b/drivers/staging/vt6656/bssdb.h
+@@ -90,7 +90,6 @@ typedef struct tagSRSNCapObject {
+ } SRSNCapObject, *PSRSNCapObject;
+ 
+ // BSS info(AP)
+-#pragma pack(1)
+ typedef struct tagKnownBSS {
+     // BSS info
+     BOOL            bActive;
+diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
+index 3aa895e..a510b29 100644
+--- a/drivers/staging/vt6656/dpc.c
++++ b/drivers/staging/vt6656/dpc.c
+@@ -1238,7 +1238,7 @@ static BOOL s_bHandleRxEncryption (
+ 
+         PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
+         *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
+-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
+         if (byDecMode == KEY_CTL_TKIP) {
+             *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
+         } else {
+@@ -1349,7 +1349,7 @@ static BOOL s_bHostWepRxEncryption (
+ 
+         PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
+         *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
+-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
+ 
+         if (byDecMode == KEY_CTL_TKIP) {
+             *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
+diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
+index 3734e2c..91ceb77 100644
+--- a/drivers/staging/vt6656/int.h
++++ b/drivers/staging/vt6656/int.h
+@@ -34,7 +34,6 @@
+ #include "device.h"
+ 
+ /*---------------------  Export Definitions -------------------------*/
+-#pragma pack(1)
+ typedef struct tagSINTData {
+ 	BYTE byTSR0;
+ 	BYTE byPkt0;
+diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h
+index 22710ce..ae6e2d2 100644
+--- a/drivers/staging/vt6656/iocmd.h
++++ b/drivers/staging/vt6656/iocmd.h
+@@ -95,13 +95,12 @@ typedef enum tagWZONETYPE {
+ // Ioctl interface structure
+ // Command structure
+ //
+-#pragma pack(1)
+ typedef struct tagSCmdRequest {
+ 	u8 name[16];
+ 	void	*data;
+ 	u16	    wResult;
+ 	u16     wCmdCode;
+-} SCmdRequest, *PSCmdRequest;
++} __packed SCmdRequest, *PSCmdRequest;
+ 
+ //
+ // Scan
+@@ -111,7 +110,7 @@ typedef struct tagSCmdScan {
+ 
+     u8	    ssid[SSID_MAXLEN + 2];
+ 
+-} SCmdScan, *PSCmdScan;
++} __packed SCmdScan, *PSCmdScan;
+ 
+ //
+ // BSS Join
+@@ -126,7 +125,7 @@ typedef struct tagSCmdBSSJoin {
+     BOOL    bPSEnable;
+     BOOL    bShareKeyAuth;
+ 
+-} SCmdBSSJoin, *PSCmdBSSJoin;
++} __packed SCmdBSSJoin, *PSCmdBSSJoin;
+ 
+ //
+ // Zonetype Setting
+@@ -137,7 +136,7 @@ typedef struct tagSCmdZoneTypeSet {
+  BOOL       bWrite;
+  WZONETYPE  ZoneType;
+ 
+-} SCmdZoneTypeSet, *PSCmdZoneTypeSet;
++} __packed SCmdZoneTypeSet, *PSCmdZoneTypeSet;
+ 
+ typedef struct tagSWPAResult {
+          char	ifname[100];
+@@ -145,7 +144,7 @@ typedef struct tagSWPAResult {
+ 	u8 key_mgmt;
+ 	u8 eap_type;
+          BOOL authenticated;
+-} SWPAResult, *PSWPAResult;
++} __packed SWPAResult, *PSWPAResult;
+ 
+ typedef struct tagSCmdStartAP {
+ 
+@@ -157,7 +156,7 @@ typedef struct tagSCmdStartAP {
+     BOOL    bShareKeyAuth;
+     u8      byBasicRate;
+ 
+-} SCmdStartAP, *PSCmdStartAP;
++} __packed SCmdStartAP, *PSCmdStartAP;
+ 
+ typedef struct tagSCmdSetWEP {
+ 
+@@ -167,7 +166,7 @@ typedef struct tagSCmdSetWEP {
+     BOOL    bWepKeyAvailable[WEP_NKEYS];
+     u32     auWepKeyLength[WEP_NKEYS];
+ 
+-} SCmdSetWEP, *PSCmdSetWEP;
++} __packed SCmdSetWEP, *PSCmdSetWEP;
+ 
+ typedef struct tagSBSSIDItem {
+ 
+@@ -180,14 +179,14 @@ typedef struct tagSBSSIDItem {
+     BOOL    bWEPOn;
+     u32     uRSSI;
+ 
+-} SBSSIDItem;
++} __packed SBSSIDItem;
+ 
+ 
+ typedef struct tagSBSSIDList {
+ 
+ 	u32		    uItem;
+ 	SBSSIDItem	sBSSIDList[0];
+-} SBSSIDList, *PSBSSIDList;
++} __packed SBSSIDList, *PSBSSIDList;
+ 
+ 
+ typedef struct tagSNodeItem {
+@@ -208,7 +207,7 @@ typedef struct tagSNodeItem {
+     u32            uTxAttempts;
+     u16            wFailureRatio;
+ 
+-} SNodeItem;
++} __packed SNodeItem;
+ 
+ 
+ typedef struct tagSNodeList {
+@@ -216,7 +215,7 @@ typedef struct tagSNodeList {
+ 	u32		    uItem;
+ 	SNodeItem	sNodeList[0];
+ 
+-} SNodeList, *PSNodeList;
++} __packed SNodeList, *PSNodeList;
+ 
+ 
+ typedef struct tagSCmdLinkStatus {
+@@ -229,7 +228,7 @@ typedef struct tagSCmdLinkStatus {
+     u32     uChannel;
+     u32     uLinkRate;
+ 
+-} SCmdLinkStatus, *PSCmdLinkStatus;
++} __packed SCmdLinkStatus, *PSCmdLinkStatus;
+ 
+ //
+ // 802.11 counter
+@@ -247,7 +246,7 @@ typedef struct tagSDot11MIBCount {
+     u32 ReceivedFragmentCount;
+     u32 MulticastReceivedFrameCount;
+     u32 FCSErrorCount;
+-} SDot11MIBCount, *PSDot11MIBCount;
++} __packed SDot11MIBCount, *PSDot11MIBCount;
+ 
+ 
+ 
+@@ -355,13 +354,13 @@ typedef struct tagSStatMIBCount {
+     u32   ullTxBroadcastBytes[2];
+     u32   ullTxMulticastBytes[2];
+     u32   ullTxDirectedBytes[2];
+-} SStatMIBCount, *PSStatMIBCount;
++} __packed SStatMIBCount, *PSStatMIBCount;
+ 
+ typedef struct tagSCmdValue {
+ 
+     u32     dwValue;
+ 
+-} SCmdValue,  *PSCmdValue;
++} __packed SCmdValue,  *PSCmdValue;
+ 
+ //
+ // hostapd & viawget ioctl related
+@@ -431,7 +430,7 @@ struct viawget_hostapd_param {
+ 			u8 ssid[32];
+ 		} scan_req;
+ 	} u;
+-};
++} __packed;
+ 
+ /*---------------------  Export Classes  ----------------------------*/
+ 
+diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h
+index 959c886..2522dde 100644
+--- a/drivers/staging/vt6656/iowpa.h
++++ b/drivers/staging/vt6656/iowpa.h
+@@ -67,12 +67,11 @@ enum {
+ 
+ 
+ 
+-#pragma pack(1)
+ typedef struct viawget_wpa_header {
+ 	u8 type;
+ 	u16 req_ie_len;
+ 	u16 resp_ie_len;
+-} viawget_wpa_header;
++} __packed viawget_wpa_header;
+ 
+ struct viawget_wpa_param {
+ 	u32 cmd;
+@@ -113,9 +112,8 @@ struct viawget_wpa_param {
+ 			u8 *buf;
+ 		} scan_results;
+ 	} u;
+-};
++} __packed;
+ 
+-#pragma pack(1)
+ struct viawget_scan_result {
+ 	u8 bssid[6];
+ 	u8 ssid[32];
+@@ -130,7 +128,7 @@ struct viawget_scan_result {
+ 	int noise;
+ 	int level;
+ 	int maxrate;
+-};
++} __packed;
+ 
+ /*---------------------  Export Classes  ----------------------------*/
+ 
+diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
+index ee62a06..ba3a561 100644
+--- a/drivers/staging/vt6656/key.c
++++ b/drivers/staging/vt6656/key.c
+@@ -223,7 +223,7 @@ BOOL KeybSetKey(
+     PSKeyManagement pTable,
+     PBYTE           pbyBSSID,
+     DWORD           dwKeyIndex,
+-    unsigned long           uKeyLength,
++	u32 uKeyLength,
+     PQWORD          pKeyRSC,
+     PBYTE           pbyKey,
+     BYTE            byKeyDecMode
+@@ -235,7 +235,8 @@ BOOL KeybSetKey(
+     PSKeyItem   pKey;
+     unsigned int        uKeyIdx;
+ 
+-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
++		"Enter KeybSetKey: %X\n", dwKeyIndex);
+ 
+     j = (MAX_KEY_TABLE-1);
+     for (i=0;i<(MAX_KEY_TABLE-1);i++) {
+@@ -261,7 +262,9 @@ BOOL KeybSetKey(
+                 if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
+                     // Group transmit key
+                     pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
+-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
++			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
++				"Group transmit key(R)[%X]: %d\n",
++					pTable->KeyTable[i].dwGTKeyIndex, i);
+                 }
+                 pTable->KeyTable[i].wKeyCtl &= 0xFF0F;          // clear group key control filed
+                 pTable->KeyTable[i].wKeyCtl |= (byKeyDecMode << 4);
+@@ -302,9 +305,12 @@ BOOL KeybSetKey(
+             }
+             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
+ 
+-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
+-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
+-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
++			pKey->dwTSC47_16);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ",
++			pKey->wTSC15_0);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
++			pKey->dwKeyIndex);
+ 
+             return (TRUE);
+         }
+@@ -326,7 +332,9 @@ BOOL KeybSetKey(
+             if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
+                 // Group transmit key
+                 pTable->KeyTable[j].dwGTKeyIndex = dwKeyIndex;
+-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(N)[%lX]: %d\n", pTable->KeyTable[j].dwGTKeyIndex, j);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
++			"Group transmit key(N)[%X]: %d\n",
++				pTable->KeyTable[j].dwGTKeyIndex, j);
+             }
+             pTable->KeyTable[j].wKeyCtl &= 0xFF0F;          // clear group key control filed
+             pTable->KeyTable[j].wKeyCtl |= (byKeyDecMode << 4);
+@@ -367,9 +375,11 @@ BOOL KeybSetKey(
+         }
+         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
+ 
+-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
++		pKey->dwTSC47_16);
+         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
+-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
++		pKey->dwKeyIndex);
+ 
+         return (TRUE);
+     }
+@@ -597,7 +607,8 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
+                             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]);
+                         }
+                         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
+-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %lX\n", pTable->KeyTable[i].dwGTKeyIndex);
++			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %X\n",
++				pTable->KeyTable[i].dwGTKeyIndex);
+ 
+                     return (TRUE);
+                 }
+@@ -664,7 +675,7 @@ BOOL KeybSetDefaultKey(
+     void *pDeviceHandler,
+     PSKeyManagement pTable,
+     DWORD           dwKeyIndex,
+-    unsigned long           uKeyLength,
++	u32 uKeyLength,
+     PQWORD          pKeyRSC,
+     PBYTE           pbyKey,
+     BYTE            byKeyDecMode
+@@ -696,7 +707,10 @@ BOOL KeybSetDefaultKey(
+     if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
+         // Group transmit key
+         pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = dwKeyIndex;
+-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex, MAX_KEY_TABLE-1);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
++		"Group transmit key(R)[%X]: %d\n",
++		pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex,
++		MAX_KEY_TABLE-1);
+ 
+     }
+     pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl &= 0x7F00;          // clear all key control filed
+@@ -747,9 +761,11 @@ BOOL KeybSetDefaultKey(
+     }
+     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
+ 
+-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n", pKey->dwTSC47_16);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n",
++		pKey->dwTSC47_16);
+     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n", pKey->wTSC15_0);
+-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n", pKey->dwKeyIndex);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n",
++		pKey->dwKeyIndex);
+ 
+     return (TRUE);
+ }
+@@ -775,7 +791,7 @@ BOOL KeybSetAllGroupKey(
+     void *pDeviceHandler,
+     PSKeyManagement pTable,
+     DWORD           dwKeyIndex,
+-    unsigned long           uKeyLength,
++	u32 uKeyLength,
+     PQWORD          pKeyRSC,
+     PBYTE           pbyKey,
+     BYTE            byKeyDecMode
+@@ -787,7 +803,8 @@ BOOL KeybSetAllGroupKey(
+     PSKeyItem   pKey;
+     unsigned int        uKeyIdx;
+ 
+-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %X\n",
++		dwKeyIndex);
+ 
+ 
+     if ((dwKeyIndex & PAIRWISE_KEY) != 0) {                  // Pairwise key
+@@ -804,7 +821,9 @@ BOOL KeybSetAllGroupKey(
+             if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
+                 // Group transmit key
+                 pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
+-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
++			"Group transmit key(R)[%X]: %d\n",
++			pTable->KeyTable[i].dwGTKeyIndex, i);
+ 
+             }
+             pTable->KeyTable[i].wKeyCtl &= 0xFF0F;          // clear group key control filed
+diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h
+index f749c7a..bd35d39 100644
+--- a/drivers/staging/vt6656/key.h
++++ b/drivers/staging/vt6656/key.h
+@@ -58,7 +58,7 @@
+ typedef struct tagSKeyItem
+ {
+     BOOL        bKeyValid;
+-    unsigned long       uKeyLength;
++	u32 uKeyLength;
+     BYTE        abyKey[MAX_KEY_LEN];
+     QWORD       KeyRSC;
+     DWORD       dwTSC47_16;
+@@ -107,7 +107,7 @@ BOOL KeybSetKey(
+     PSKeyManagement pTable,
+     PBYTE           pbyBSSID,
+     DWORD           dwKeyIndex,
+-    unsigned long           uKeyLength,
++	u32 uKeyLength,
+     PQWORD          pKeyRSC,
+     PBYTE           pbyKey,
+     BYTE            byKeyDecMode
+@@ -146,7 +146,7 @@ BOOL KeybSetDefaultKey(
+     void *pDeviceHandler,
+     PSKeyManagement pTable,
+     DWORD           dwKeyIndex,
+-    unsigned long           uKeyLength,
++	u32 uKeyLength,
+     PQWORD          pKeyRSC,
+     PBYTE           pbyKey,
+     BYTE            byKeyDecMode
+@@ -156,7 +156,7 @@ BOOL KeybSetAllGroupKey(
+     void *pDeviceHandler,
+     PSKeyManagement pTable,
+     DWORD           dwKeyIndex,
+-    unsigned long           uKeyLength,
++	u32 uKeyLength,
+     PQWORD          pKeyRSC,
+     PBYTE           pbyKey,
+     BYTE            byKeyDecMode
+diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
+index af4a29d..8fddc7b 100644
+--- a/drivers/staging/vt6656/mac.c
++++ b/drivers/staging/vt6656/mac.c
+@@ -260,7 +260,8 @@ BYTE            pbyData[24];
+     dwData1 <<= 16;
+     dwData1 |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5));
+ 
+-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %X,"\
++		" KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
+ 
+     //VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
+     //VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
+@@ -277,7 +278,8 @@ BYTE            pbyData[24];
+     dwData2 <<= 8;
+     dwData2 |= *(pbyAddr+0);
+ 
+-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %lX\n", wOffset, dwData2);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %X\n",
++		wOffset, dwData2);
+ 
+     //VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
+     //VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
+diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
+index 3fd0478..8cf0881 100644
+--- a/drivers/staging/vt6656/rf.c
++++ b/drivers/staging/vt6656/rf.c
+@@ -769,6 +769,9 @@ BYTE    byPwr = pDevice->byCCKPwr;
+         return TRUE;
+     }
+ 
++	if (uCH == 0)
++		return -EINVAL;
++
+     switch (uRATE) {
+     case RATE_1M:
+     case RATE_2M:
+diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
+index b6e04e7..7a56929 100644
+--- a/drivers/staging/vt6656/rxtx.c
++++ b/drivers/staging/vt6656/rxtx.c
+@@ -375,7 +375,8 @@ s_vFillTxKey (
+         *(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
+         // Append IV&ExtIV after Mac Header
+         *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);
+-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %lx\n", *pdwExtIV);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %x\n",
++		*pdwExtIV);
+ 
+     } else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) {
+         pTransmitKey->wTSC15_0++;
+@@ -1751,7 +1752,8 @@ s_bPacketToWirelessUsb(
+         MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12);
+         dwMIC_Priority = 0;
+         MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
+-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
++	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %X, %X\n",
++		dwMICKey0, dwMICKey1);
+ 
+         ///////////////////////////////////////////////////////////////////
+ 
+@@ -2633,7 +2635,8 @@ vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb) {
+             MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12);
+             dwMIC_Priority = 0;
+             MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
+-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY:"\
++			" %X, %X\n", dwMICKey0, dwMICKey1);
+ 
+             uLength = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen;
+ 
+@@ -2653,7 +2656,8 @@ vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb) {
+ 
+             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize);
+             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderSize, uPadding, cbIVlen);
+-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%x, %x\n",
++			*pdwMIC_L, *pdwMIC_R);
+ 
+         }
+ 
+@@ -3027,7 +3031,8 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
+                         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"error: KEY is GTK!!~~\n");
+                     }
+                     else {
+-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
++			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
++				pTransmitKey->dwKeyIndex);
+                         bNeedEncryption = TRUE;
+                     }
+                 }
+@@ -3041,7 +3046,8 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
+             if (pDevice->bEnableHostWEP) {
+                 if ((uNodeIndex != 0) &&
+                     (pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex & PAIRWISE_KEY)) {
+-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
++			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
++				pTransmitKey->dwKeyIndex);
+                     bNeedEncryption = TRUE;
+                  }
+              }
+diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h
+index 8e9450e..dfbf747 100644
+--- a/drivers/staging/vt6656/ttype.h
++++ b/drivers/staging/vt6656/ttype.h
+@@ -29,6 +29,8 @@
+ #ifndef __TTYPE_H__
+ #define __TTYPE_H__
+ 
++#include <linux/types.h>
++
+ /******* Common definitions and typedefs ***********************************/
+ 
+ typedef int             BOOL;
+@@ -42,17 +44,17 @@ typedef int             BOOL;
+ 
+ /****** Simple typedefs  ***************************************************/
+ 
+-typedef unsigned char   BYTE;           //  8-bit
+-typedef unsigned short  WORD;           // 16-bit
+-typedef unsigned long   DWORD;          // 32-bit
++typedef u8 BYTE;
++typedef u16 WORD;
++typedef u32 DWORD;
+ 
+ // QWORD is for those situation that we want
+ // an 8-byte-aligned 8 byte long structure
+ // which is NOT really a floating point number.
+ typedef union tagUQuadWord {
+     struct {
+-        DWORD   dwLowDword;
+-        DWORD   dwHighDword;
++	u32 dwLowDword;
++	u32 dwHighDword;
+     } u;
+     double      DoNotUseThisField;
+ } UQuadWord;
+@@ -60,8 +62,8 @@ typedef UQuadWord       QWORD;          // 64-bit
+ 
+ /****** Common pointer types ***********************************************/
+ 
+-typedef unsigned long   ULONG_PTR;      // 32-bit
+-typedef unsigned long   DWORD_PTR;      // 32-bit
++typedef u32 ULONG_PTR;
++typedef u32 DWORD_PTR;
+ 
+ // boolean pointer
+ 
+diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
+index 609e8fa..e962eae 100644
+--- a/drivers/staging/vt6656/usbpipe.c
++++ b/drivers/staging/vt6656/usbpipe.c
+@@ -165,6 +165,11 @@ int PIPEnsControlOut(
+     if (pDevice->Flags & fMP_CONTROL_WRITES)
+         return STATUS_FAILURE;
+ 
++	if (pDevice->Flags & fMP_CONTROL_READS)
++		return STATUS_FAILURE;
++
++	MP_SET_FLAG(pDevice, fMP_CONTROL_WRITES);
++
+ 	pDevice->sUsbCtlRequest.bRequestType = 0x40;
+ 	pDevice->sUsbCtlRequest.bRequest = byRequest;
+ 	pDevice->sUsbCtlRequest.wValue = cpu_to_le16p(&wValue);
+@@ -179,12 +184,13 @@ int PIPEnsControlOut(
+ 
+ 	ntStatus = usb_submit_urb(pDevice->pControlURB, GFP_ATOMIC);
+ 	if (ntStatus != 0) {
+-		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"control send request submission failed: %d\n", ntStatus);
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
++			"control send request submission failed: %d\n",
++				ntStatus);
++		MP_CLEAR_FLAG(pDevice, fMP_CONTROL_WRITES);
+ 		return STATUS_FAILURE;
+ 	}
+-	else {
+-	    MP_SET_FLAG(pDevice, fMP_CONTROL_WRITES);
+-	}
++
+ 	spin_unlock_irq(&pDevice->lock);
+     for (ii = 0; ii <= USB_CTL_WAIT; ii ++) {
+ 
+@@ -224,6 +230,11 @@ int PIPEnsControlIn(
+     if (pDevice->Flags & fMP_CONTROL_READS)
+ 	return STATUS_FAILURE;
+ 
++	if (pDevice->Flags & fMP_CONTROL_WRITES)
++		return STATUS_FAILURE;
++
++	MP_SET_FLAG(pDevice, fMP_CONTROL_READS);
++
+ 	pDevice->sUsbCtlRequest.bRequestType = 0xC0;
+ 	pDevice->sUsbCtlRequest.bRequest = byRequest;
+ 	pDevice->sUsbCtlRequest.wValue = cpu_to_le16p(&wValue);
+@@ -237,10 +248,11 @@ int PIPEnsControlIn(
+ 
+ 	ntStatus = usb_submit_urb(pDevice->pControlURB, GFP_ATOMIC);
+ 	if (ntStatus != 0) {
+-		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"control request submission failed: %d\n", ntStatus);
+-	}else {
+-		MP_SET_FLAG(pDevice, fMP_CONTROL_READS);
+-    }
++		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
++			"control request submission failed: %d\n", ntStatus);
++		MP_CLEAR_FLAG(pDevice, fMP_CONTROL_READS);
++		return STATUS_FAILURE;
++	}
+ 
+ 	spin_unlock_irq(&pDevice->lock);
+     for (ii = 0; ii <= USB_CTL_WAIT; ii ++) {
+diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
+index 9d2caa8..2225b9e 100644
+--- a/drivers/staging/vt6656/wcmd.c
++++ b/drivers/staging/vt6656/wcmd.c
+@@ -316,17 +316,19 @@ s_MgrMakeProbeRequest(
+     return pTxPacket;
+ }
+ 
+-void vCommandTimerWait(void *hDeviceContext, unsigned int MSecond)
++void vCommandTimerWait(void *hDeviceContext, unsigned long MSecond)
+ {
+-    PSDevice        pDevice = (PSDevice)hDeviceContext;
++	PSDevice pDevice = (PSDevice)hDeviceContext;
+ 
+-    init_timer(&pDevice->sTimerCommand);
+-    pDevice->sTimerCommand.data = (unsigned long)pDevice;
+-    pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
+-    // RUN_AT :1 msec ~= (HZ/1024)
+-    pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10);
+-    add_timer(&pDevice->sTimerCommand);
+-    return;
++	init_timer(&pDevice->sTimerCommand);
++
++	pDevice->sTimerCommand.data = (unsigned long)pDevice;
++	pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
++	pDevice->sTimerCommand.expires = RUN_AT((MSecond * HZ) / 1000);
++
++	add_timer(&pDevice->sTimerCommand);
++
++	return;
+ }
+ 
+ void vRunCommand(void *hDeviceContext)
+diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h
+index 46c2959..c359252 100644
+--- a/drivers/staging/vt6656/wpa2.h
++++ b/drivers/staging/vt6656/wpa2.h
+@@ -45,8 +45,8 @@ typedef struct tagsPMKIDInfo {
+ } PMKIDInfo, *PPMKIDInfo;
+ 
+ typedef struct tagSPMKIDCache {
+-    unsigned long       BSSIDInfoCount;
+-    PMKIDInfo   BSSIDInfo[MAX_PMKID_CACHE];
++	u32 BSSIDInfoCount;
++	PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE];
+ } SPMKIDCache, *PSPMKIDCache;
+ 
+ 
+diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
+index 4efa9bc..89bfd85 100644
+--- a/drivers/staging/wlan-ng/prism2mgmt.c
++++ b/drivers/staging/wlan-ng/prism2mgmt.c
+@@ -406,7 +406,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
+ 	/* SSID */
+ 	req->ssid.status = P80211ENUM_msgitem_status_data_ok;
+ 	req->ssid.data.len = le16_to_cpu(item->ssid.len);
+-	req->ssid.data.len = min_t(u16, req->ssid.data.len, WLAN_BSSID_LEN);
++	req->ssid.data.len = min_t(u16, req->ssid.data.len, WLAN_SSID_MAXLEN);
+ 	memcpy(req->ssid.data.data, item->ssid.data, req->ssid.data.len);
+ 
+ 	/* supported rates */
+diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
+index 6b6f50a..5bafd2d 100644
+--- a/drivers/target/iscsi/iscsi_target.c
++++ b/drivers/target/iscsi/iscsi_target.c
+@@ -2384,7 +2384,7 @@ static void iscsit_build_conn_drop_async_message(struct iscsi_conn *conn)
+ 	if (!conn_p)
+ 		return;
+ 
+-	cmd = iscsit_allocate_cmd(conn_p, GFP_KERNEL);
++	cmd = iscsit_allocate_cmd(conn_p, GFP_ATOMIC);
+ 	if (!cmd) {
+ 		iscsit_dec_conn_usage_count(conn_p);
+ 		return;
+diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
+index 68d4c10..7f9136e 100644
+--- a/drivers/target/target_core_device.c
++++ b/drivers/target/target_core_device.c
+@@ -1193,6 +1193,8 @@ int se_dev_set_queue_depth(struct se_device *dev, u32 queue_depth)
+ 
+ int se_dev_set_fabric_max_sectors(struct se_device *dev, u32 fabric_max_sectors)
+ {
++	int block_size = dev->se_sub_dev->se_dev_attrib.block_size;
++
+ 	if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+ 		pr_err("dev[%p]: Unable to change SE Device"
+ 			" fabric_max_sectors while dev_export_obj: %d count exists\n",
+@@ -1230,8 +1232,12 @@ int se_dev_set_fabric_max_sectors(struct se_device *dev, u32 fabric_max_sectors)
+ 	/*
+ 	 * Align max_sectors down to PAGE_SIZE to follow transport_allocate_data_tasks()
+ 	 */
++	if (!block_size) {
++		block_size = 512;
++		pr_warn("Defaulting to 512 for zero block_size\n");
++	}
+ 	fabric_max_sectors = se_dev_align_max_sectors(fabric_max_sectors,
+-						      dev->se_sub_dev->se_dev_attrib.block_size);
++						      block_size);
+ 
+ 	dev->se_sub_dev->se_dev_attrib.fabric_max_sectors = fabric_max_sectors;
+ 	pr_debug("dev[%p]: SE Device max_sectors changed to %u\n",
+@@ -1434,24 +1440,18 @@ static struct se_lun *core_dev_get_lun(struct se_portal_group *tpg, u32 unpacked
+ 
+ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
+ 	struct se_portal_group *tpg,
++	struct se_node_acl *nacl,
+ 	u32 mapped_lun,
+-	char *initiatorname,
+ 	int *ret)
+ {
+ 	struct se_lun_acl *lacl;
+-	struct se_node_acl *nacl;
+ 
+-	if (strlen(initiatorname) >= TRANSPORT_IQN_LEN) {
++	if (strlen(nacl->initiatorname) >= TRANSPORT_IQN_LEN) {
+ 		pr_err("%s InitiatorName exceeds maximum size.\n",
+ 			tpg->se_tpg_tfo->get_fabric_name());
+ 		*ret = -EOVERFLOW;
+ 		return NULL;
+ 	}
+-	nacl = core_tpg_get_initiator_node_acl(tpg, initiatorname);
+-	if (!nacl) {
+-		*ret = -EINVAL;
+-		return NULL;
+-	}
+ 	lacl = kzalloc(sizeof(struct se_lun_acl), GFP_KERNEL);
+ 	if (!lacl) {
+ 		pr_err("Unable to allocate memory for struct se_lun_acl.\n");
+@@ -1462,7 +1462,8 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
+ 	INIT_LIST_HEAD(&lacl->lacl_list);
+ 	lacl->mapped_lun = mapped_lun;
+ 	lacl->se_lun_nacl = nacl;
+-	snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s", initiatorname);
++	snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s",
++		 nacl->initiatorname);
+ 
+ 	return lacl;
+ }
+@@ -1622,6 +1623,7 @@ int core_dev_setup_virtual_lun0(void)
+ 		ret = PTR_ERR(dev);
+ 		goto out;
+ 	}
++	dev->dev_link_magic = SE_DEV_LINK_MAGIC;
+ 	se_dev->se_dev_ptr = dev;
+ 	g_lun0_dev = dev;
+ 
+diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
+index ea479e5..f06b130 100644
+--- a/drivers/target/target_core_fabric_configfs.c
++++ b/drivers/target/target_core_fabric_configfs.c
+@@ -72,6 +72,12 @@ static int target_fabric_mappedlun_link(
+ 	struct se_portal_group *se_tpg;
+ 	struct config_item *nacl_ci, *tpg_ci, *tpg_ci_s, *wwn_ci, *wwn_ci_s;
+ 	int ret = 0, lun_access;
++
++	if (lun->lun_link_magic != SE_LUN_LINK_MAGIC) {
++		pr_err("Bad lun->lun_link_magic, not a valid lun_ci pointer:"
++			" %p to struct lun: %p\n", lun_ci, lun);
++		return -EFAULT;
++	}
+ 	/*
+ 	 * Ensure that the source port exists
+ 	 */
+@@ -350,9 +356,17 @@ static struct config_group *target_fabric_make_mappedlun(
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
++	if (mapped_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
++		pr_err("Mapped LUN: %lu exceeds TRANSPORT_MAX_LUNS_PER_TPG"
++			"-1: %u for Target Portal Group: %u\n", mapped_lun,
++			TRANSPORT_MAX_LUNS_PER_TPG-1,
++			se_tpg->se_tpg_tfo->tpg_get_tag(se_tpg));
++		ret = -EINVAL;
++		goto out;
++	}
+ 
+-	lacl = core_dev_init_initiator_node_lun_acl(se_tpg, mapped_lun,
+-			config_item_name(acl_ci), &ret);
++	lacl = core_dev_init_initiator_node_lun_acl(se_tpg, se_nacl,
++			mapped_lun, &ret);
+ 	if (!lacl) {
+ 		ret = -EINVAL;
+ 		goto out;
+@@ -763,6 +777,11 @@ static int target_fabric_port_link(
+ 		ret = -ENODEV;
+ 		goto out;
+ 	}
++	if (dev->dev_link_magic != SE_DEV_LINK_MAGIC) {
++		pr_err("Bad dev->dev_link_magic, not a valid se_dev_ci pointer:"
++			" %p to struct se_device: %p\n", se_dev_ci, dev);
++		return -EFAULT;
++	}
+ 
+ 	lun_p = core_dev_add_lun(se_tpg, dev, lun->unpacked_lun);
+ 	if (IS_ERR(lun_p)) {
+diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
+index 0fd4282..e102488 100644
+--- a/drivers/target/target_core_internal.h
++++ b/drivers/target/target_core_internal.h
+@@ -51,7 +51,7 @@ struct se_lun *core_dev_add_lun(struct se_portal_group *, struct se_device *, u3
+ int	core_dev_del_lun(struct se_portal_group *, u32);
+ struct se_lun *core_get_lun_from_tpg(struct se_portal_group *, u32);
+ struct se_lun_acl *core_dev_init_initiator_node_lun_acl(struct se_portal_group *,
+-		u32, char *, int *);
++		struct se_node_acl *, u32, int *);
+ int	core_dev_add_initiator_node_lun_acl(struct se_portal_group *,
+ 		struct se_lun_acl *, u32, u32);
+ int	core_dev_del_initiator_node_lun_acl(struct se_portal_group *,
+diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
+index b8628a5..ee5000c 100644
+--- a/drivers/target/target_core_tpg.c
++++ b/drivers/target/target_core_tpg.c
+@@ -114,16 +114,10 @@ struct se_node_acl *core_tpg_get_initiator_node_acl(
+ 	struct se_node_acl *acl;
+ 
+ 	spin_lock_irq(&tpg->acl_node_lock);
+-	list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
+-		if (!strcmp(acl->initiatorname, initiatorname) &&
+-		    !acl->dynamic_node_acl) {
+-			spin_unlock_irq(&tpg->acl_node_lock);
+-			return acl;
+-		}
+-	}
++	acl = __core_tpg_get_initiator_node_acl(tpg, initiatorname);
+ 	spin_unlock_irq(&tpg->acl_node_lock);
+ 
+-	return NULL;
++	return acl;
+ }
+ 
+ /*	core_tpg_add_node_to_devs():
+@@ -672,6 +666,7 @@ int core_tpg_register(
+ 	for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+ 		lun = se_tpg->tpg_lun_list[i];
+ 		lun->unpacked_lun = i;
++		lun->lun_link_magic = SE_LUN_LINK_MAGIC;
+ 		lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
+ 		atomic_set(&lun->lun_acl_count, 0);
+ 		init_completion(&lun->lun_shutdown_comp);
+diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
+index c87ef74..65e6320 100644
+--- a/drivers/target/target_core_transport.c
++++ b/drivers/target/target_core_transport.c
+@@ -1085,6 +1085,7 @@ struct se_device *transport_add_device_to_core_hba(
+ 	dev->se_hba		= hba;
+ 	dev->se_sub_dev		= se_dev;
+ 	dev->transport		= transport;
++	dev->dev_link_magic	= SE_DEV_LINK_MAGIC;
+ 	INIT_LIST_HEAD(&dev->dev_list);
+ 	INIT_LIST_HEAD(&dev->dev_sep_list);
+ 	INIT_LIST_HEAD(&dev->dev_tmr_list);
+@@ -1553,6 +1554,8 @@ static void target_complete_tmr_failure(struct work_struct *work)
+ 
+ 	se_cmd->se_tmr_req->response = TMR_LUN_DOES_NOT_EXIST;
+ 	se_cmd->se_tfo->queue_tm_rsp(se_cmd);
++
++	transport_cmd_check_stop_to_fabric(se_cmd);
+ }
+ 
+ /**
+diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
+index 3c9e5b5..230d8ec 100644
+--- a/drivers/target/tcm_fc/tfc_sess.c
++++ b/drivers/target/tcm_fc/tfc_sess.c
+@@ -356,11 +356,11 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len,
+ 
+ 	tport = ft_tport_create(rdata->local_port);
+ 	if (!tport)
+-		return 0;	/* not a target for this local port */
++		goto not_target;	/* not a target for this local port */
+ 
+ 	acl = ft_acl_get(tport->tpg, rdata);
+ 	if (!acl)
+-		return 0;
++		goto not_target;	/* no target for this remote */
+ 
+ 	if (!rspp)
+ 		goto fill;
+@@ -397,12 +397,18 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len,
+ 
+ 	/*
+ 	 * OR in our service parameters with other provider (initiator), if any.
+-	 * TBD XXX - indicate RETRY capability?
+ 	 */
+ fill:
+ 	fcp_parm = ntohl(spp->spp_params);
++	fcp_parm &= ~FCP_SPPF_RETRY;
+ 	spp->spp_params = htonl(fcp_parm | FCP_SPPF_TARG_FCN);
+ 	return FC_SPP_RESP_ACK;
++
++not_target:
++	fcp_parm = ntohl(spp->spp_params);
++	fcp_parm &= ~FCP_SPPF_TARG_FCN;
++	spp->spp_params = htonl(fcp_parm);
++	return 0;
+ }
+ 
+ /**
+@@ -431,7 +437,6 @@ static void ft_sess_rcu_free(struct rcu_head *rcu)
+ {
+ 	struct ft_sess *sess = container_of(rcu, struct ft_sess, rcu);
+ 
+-	transport_deregister_session(sess->se_sess);
+ 	kfree(sess);
+ }
+ 
+@@ -439,6 +444,7 @@ static void ft_sess_free(struct kref *kref)
+ {
+ 	struct ft_sess *sess = container_of(kref, struct ft_sess, kref);
+ 
++	transport_deregister_session(sess->se_sess);
+ 	call_rcu(&sess->rcu, ft_sess_rcu_free);
+ }
+ 
+diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
+index 90dff82..4a418e4 100644
+--- a/drivers/tty/n_gsm.c
++++ b/drivers/tty/n_gsm.c
+@@ -1692,6 +1692,8 @@ static inline void dlci_put(struct gsm_dlci *dlci)
+ 	kref_put(&dlci->ref, gsm_dlci_free);
+ }
+ 
++static void gsm_destroy_network(struct gsm_dlci *dlci);
++
+ /**
+  *	gsm_dlci_release		-	release DLCI
+  *	@dlci: DLCI to destroy
+@@ -1705,9 +1707,19 @@ static void gsm_dlci_release(struct gsm_dlci *dlci)
+ {
+ 	struct tty_struct *tty = tty_port_tty_get(&dlci->port);
+ 	if (tty) {
++		mutex_lock(&dlci->mutex);
++		gsm_destroy_network(dlci);
++		mutex_unlock(&dlci->mutex);
++
++		/* tty_vhangup needs the tty_lock, so unlock and
++		   relock after doing the hangup. */
++		tty_unlock();
+ 		tty_vhangup(tty);
++		tty_lock();
++		tty_port_tty_set(&dlci->port, NULL);
+ 		tty_kref_put(tty);
+ 	}
++	dlci->state = DLCI_CLOSED;
+ 	dlci_put(dlci);
+ }
+ 
+@@ -2933,6 +2945,8 @@ static void gsmtty_close(struct tty_struct *tty, struct file *filp)
+ 
+ 	if (dlci == NULL)
+ 		return;
++	if (dlci->state == DLCI_CLOSED)
++		return;
+ 	mutex_lock(&dlci->mutex);
+ 	gsm_destroy_network(dlci);
+ 	mutex_unlock(&dlci->mutex);
+@@ -2951,6 +2965,8 @@ out:
+ static void gsmtty_hangup(struct tty_struct *tty)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return;
+ 	tty_port_hangup(&dlci->port);
+ 	gsm_dlci_begin_close(dlci);
+ }
+@@ -2958,9 +2974,12 @@ static void gsmtty_hangup(struct tty_struct *tty)
+ static int gsmtty_write(struct tty_struct *tty, const unsigned char *buf,
+ 								    int len)
+ {
++	int sent;
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return -EINVAL;
+ 	/* Stuff the bytes into the fifo queue */
+-	int sent = kfifo_in_locked(dlci->fifo, buf, len, &dlci->lock);
++	sent = kfifo_in_locked(dlci->fifo, buf, len, &dlci->lock);
+ 	/* Need to kick the channel */
+ 	gsm_dlci_data_kick(dlci);
+ 	return sent;
+@@ -2969,18 +2988,24 @@ static int gsmtty_write(struct tty_struct *tty, const unsigned char *buf,
+ static int gsmtty_write_room(struct tty_struct *tty)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return -EINVAL;
+ 	return TX_SIZE - kfifo_len(dlci->fifo);
+ }
+ 
+ static int gsmtty_chars_in_buffer(struct tty_struct *tty)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return -EINVAL;
+ 	return kfifo_len(dlci->fifo);
+ }
+ 
+ static void gsmtty_flush_buffer(struct tty_struct *tty)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return;
+ 	/* Caution needed: If we implement reliable transport classes
+ 	   then the data being transmitted can't simply be junked once
+ 	   it has first hit the stack. Until then we can just blow it
+@@ -2999,6 +3024,8 @@ static void gsmtty_wait_until_sent(struct tty_struct *tty, int timeout)
+ static int gsmtty_tiocmget(struct tty_struct *tty)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return -EINVAL;
+ 	return dlci->modem_rx;
+ }
+ 
+@@ -3008,6 +3035,8 @@ static int gsmtty_tiocmset(struct tty_struct *tty,
+ 	struct gsm_dlci *dlci = tty->driver_data;
+ 	unsigned int modem_tx = dlci->modem_tx;
+ 
++	if (dlci->state == DLCI_CLOSED)
++		return -EINVAL;
+ 	modem_tx &= ~clear;
+ 	modem_tx |= set;
+ 
+@@ -3026,6 +3055,8 @@ static int gsmtty_ioctl(struct tty_struct *tty,
+ 	struct gsm_netconfig nc;
+ 	int index;
+ 
++	if (dlci->state == DLCI_CLOSED)
++		return -EINVAL;
+ 	switch (cmd) {
+ 	case GSMIOC_ENABLE_NET:
+ 		if (copy_from_user(&nc, (void __user *)arg, sizeof(nc)))
+@@ -3052,6 +3083,9 @@ static int gsmtty_ioctl(struct tty_struct *tty,
+ 
+ static void gsmtty_set_termios(struct tty_struct *tty, struct ktermios *old)
+ {
++	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return;
+ 	/* For the moment its fixed. In actual fact the speed information
+ 	   for the virtual channel can be propogated in both directions by
+ 	   the RPN control message. This however rapidly gets nasty as we
+@@ -3063,6 +3097,8 @@ static void gsmtty_set_termios(struct tty_struct *tty, struct ktermios *old)
+ static void gsmtty_throttle(struct tty_struct *tty)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return;
+ 	if (tty->termios->c_cflag & CRTSCTS)
+ 		dlci->modem_tx &= ~TIOCM_DTR;
+ 	dlci->throttled = 1;
+@@ -3073,6 +3109,8 @@ static void gsmtty_throttle(struct tty_struct *tty)
+ static void gsmtty_unthrottle(struct tty_struct *tty)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
++	if (dlci->state == DLCI_CLOSED)
++		return;
+ 	if (tty->termios->c_cflag & CRTSCTS)
+ 		dlci->modem_tx |= TIOCM_DTR;
+ 	dlci->throttled = 0;
+@@ -3084,6 +3122,8 @@ static int gsmtty_break_ctl(struct tty_struct *tty, int state)
+ {
+ 	struct gsm_dlci *dlci = tty->driver_data;
+ 	int encode = 0;	/* Off */
++	if (dlci->state == DLCI_CLOSED)
++		return -EINVAL;
+ 
+ 	if (state == -1)	/* "On indefinitely" - we can't encode this
+ 				    properly */
+diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
+index f574eef..b6dc908 100644
+--- a/drivers/tty/serial/8250/8250_dw.c
++++ b/drivers/tty/serial/8250/8250_dw.c
+@@ -79,7 +79,7 @@ static int dw8250_handle_irq(struct uart_port *p)
+ 	} else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
+ 		/* Clear the USR and write the LCR again. */
+ 		(void)p->serial_in(p, UART_USR);
+-		p->serial_out(p, d->last_lcr, UART_LCR);
++		p->serial_out(p, UART_LCR, d->last_lcr);
+ 
+ 		return 1;
+ 	}
+diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
+index 3ad079f..f43156f 100644
+--- a/drivers/tty/serial/ifx6x60.c
++++ b/drivers/tty/serial/ifx6x60.c
+@@ -552,6 +552,7 @@ static void ifx_port_shutdown(struct tty_port *port)
+ 		container_of(port, struct ifx_spi_device, tty_port);
+ 
+ 	mrdy_set_low(ifx_dev);
++	del_timer(&ifx_dev->spi_timer);
+ 	clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
+ 	tasklet_kill(&ifx_dev->io_work_tasklet);
+ }
+diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
+index a1b9a2f..f8d03da 100644
+--- a/drivers/tty/tty_ioctl.c
++++ b/drivers/tty/tty_ioctl.c
+@@ -617,7 +617,7 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
+ 	if (opt & TERMIOS_WAIT) {
+ 		tty_wait_until_sent(tty, 0);
+ 		if (signal_pending(current))
+-			return -EINTR;
++			return -ERESTARTSYS;
+ 	}
+ 
+ 	tty_set_termios(tty, &tmp_termios);
+@@ -684,7 +684,7 @@ static int set_termiox(struct tty_struct *tty, void __user *arg, int opt)
+ 	if (opt & TERMIOS_WAIT) {
+ 		tty_wait_until_sent(tty, 0);
+ 		if (signal_pending(current))
+-			return -EINTR;
++			return -ERESTARTSYS;
+ 	}
+ 
+ 	mutex_lock(&tty->termios_mutex);
+diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
+index a13f7e1..d2f0b26 100644
+--- a/drivers/tty/vt/vt.c
++++ b/drivers/tty/vt/vt.c
+@@ -656,7 +656,7 @@ static inline void save_screen(struct vc_data *vc)
+  *	Redrawing of screen
+  */
+ 
+-static void clear_buffer_attributes(struct vc_data *vc)
++void clear_buffer_attributes(struct vc_data *vc)
+ {
+ 	unsigned short *p = (unsigned short *)vc->vc_origin;
+ 	int count = vc->vc_screenbuf_size / 2;
+@@ -3017,7 +3017,7 @@ int __init vty_init(const struct file_operations *console_fops)
+ 
+ static struct class *vtconsole_class;
+ 
+-static int bind_con_driver(const struct consw *csw, int first, int last,
++static int do_bind_con_driver(const struct consw *csw, int first, int last,
+ 			   int deflt)
+ {
+ 	struct module *owner = csw->owner;
+@@ -3028,7 +3028,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
+ 	if (!try_module_get(owner))
+ 		return -ENODEV;
+ 
+-	console_lock();
++	WARN_CONSOLE_UNLOCKED();
+ 
+ 	/* check if driver is registered */
+ 	for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
+@@ -3113,11 +3113,22 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
+ 
+ 	retval = 0;
+ err:
+-	console_unlock();
+ 	module_put(owner);
+ 	return retval;
+ };
+ 
++
++static int bind_con_driver(const struct consw *csw, int first, int last,
++			   int deflt)
++{
++	int ret;
++
++	console_lock();
++	ret = do_bind_con_driver(csw, first, last, deflt);
++	console_unlock();
++	return ret;
++}
++
+ #ifdef CONFIG_VT_HW_CONSOLE_BINDING
+ static int con_is_graphics(const struct consw *csw, int first, int last)
+ {
+@@ -3154,6 +3165,18 @@ static int con_is_graphics(const struct consw *csw, int first, int last)
+  */
+ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
+ {
++	int retval;
++
++	console_lock();
++	retval = do_unbind_con_driver(csw, first, last, deflt);
++	console_unlock();
++	return retval;
++}
++EXPORT_SYMBOL(unbind_con_driver);
++
++/* unlocked version of unbind_con_driver() */
++int do_unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
++{
+ 	struct module *owner = csw->owner;
+ 	const struct consw *defcsw = NULL;
+ 	struct con_driver *con_driver = NULL, *con_back = NULL;
+@@ -3162,7 +3185,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
+ 	if (!try_module_get(owner))
+ 		return -ENODEV;
+ 
+-	console_lock();
++	WARN_CONSOLE_UNLOCKED();
+ 
+ 	/* check if driver is registered and if it is unbindable */
+ 	for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
+@@ -3175,10 +3198,8 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
+ 		}
+ 	}
+ 
+-	if (retval) {
+-		console_unlock();
++	if (retval)
+ 		goto err;
+-	}
+ 
+ 	retval = -ENODEV;
+ 
+@@ -3194,15 +3215,11 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
+ 		}
+ 	}
+ 
+-	if (retval) {
+-		console_unlock();
++	if (retval)
+ 		goto err;
+-	}
+ 
+-	if (!con_is_bound(csw)) {
+-		console_unlock();
++	if (!con_is_bound(csw))
+ 		goto err;
+-	}
+ 
+ 	first = max(first, con_driver->first);
+ 	last = min(last, con_driver->last);
+@@ -3229,15 +3246,14 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
+ 	if (!con_is_bound(csw))
+ 		con_driver->flag &= ~CON_DRIVER_FLAG_INIT;
+ 
+-	console_unlock();
+ 	/* ignore return value, binding should not fail */
+-	bind_con_driver(defcsw, first, last, deflt);
++	do_bind_con_driver(defcsw, first, last, deflt);
+ err:
+ 	module_put(owner);
+ 	return retval;
+ 
+ }
+-EXPORT_SYMBOL(unbind_con_driver);
++EXPORT_SYMBOL_GPL(do_unbind_con_driver);
+ 
+ static int vt_bind(struct con_driver *con)
+ {
+@@ -3522,28 +3538,18 @@ int con_debug_leave(void)
+ }
+ EXPORT_SYMBOL_GPL(con_debug_leave);
+ 
+-/**
+- * register_con_driver - register console driver to console layer
+- * @csw: console driver
+- * @first: the first console to take over, minimum value is 0
+- * @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1
+- *
+- * DESCRIPTION: This function registers a console driver which can later
+- * bind to a range of consoles specified by @first and @last. It will
+- * also initialize the console driver by calling con_startup().
+- */
+-int register_con_driver(const struct consw *csw, int first, int last)
++static int do_register_con_driver(const struct consw *csw, int first, int last)
+ {
+ 	struct module *owner = csw->owner;
+ 	struct con_driver *con_driver;
+ 	const char *desc;
+ 	int i, retval = 0;
+ 
++	WARN_CONSOLE_UNLOCKED();
++
+ 	if (!try_module_get(owner))
+ 		return -ENODEV;
+ 
+-	console_lock();
+-
+ 	for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
+ 		con_driver = &registered_con_driver[i];
+ 
+@@ -3596,10 +3602,29 @@ int register_con_driver(const struct consw *csw, int first, int last)
+ 	}
+ 
+ err:
+-	console_unlock();
+ 	module_put(owner);
+ 	return retval;
+ }
++
++/**
++ * register_con_driver - register console driver to console layer
++ * @csw: console driver
++ * @first: the first console to take over, minimum value is 0
++ * @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1
++ *
++ * DESCRIPTION: This function registers a console driver which can later
++ * bind to a range of consoles specified by @first and @last. It will
++ * also initialize the console driver by calling con_startup().
++ */
++int register_con_driver(const struct consw *csw, int first, int last)
++{
++	int retval;
++
++	console_lock();
++	retval = do_register_con_driver(csw, first, last);
++	console_unlock();
++	return retval;
++}
+ EXPORT_SYMBOL(register_con_driver);
+ 
+ /**
+@@ -3615,9 +3640,18 @@ EXPORT_SYMBOL(register_con_driver);
+  */
+ int unregister_con_driver(const struct consw *csw)
+ {
+-	int i, retval = -ENODEV;
++	int retval;
+ 
+ 	console_lock();
++	retval = do_unregister_con_driver(csw);
++	console_unlock();
++	return retval;
++}
++EXPORT_SYMBOL(unregister_con_driver);
++
++int do_unregister_con_driver(const struct consw *csw)
++{
++	int i, retval = -ENODEV;
+ 
+ 	/* cannot unregister a bound driver */
+ 	if (con_is_bound(csw))
+@@ -3643,27 +3677,53 @@ int unregister_con_driver(const struct consw *csw)
+ 		}
+ 	}
+ err:
+-	console_unlock();
+ 	return retval;
+ }
+-EXPORT_SYMBOL(unregister_con_driver);
++EXPORT_SYMBOL_GPL(do_unregister_con_driver);
+ 
+ /*
+  *	If we support more console drivers, this function is used
+  *	when a driver wants to take over some existing consoles
+  *	and become default driver for newly opened ones.
+  *
+- *      take_over_console is basically a register followed by unbind
++ *	take_over_console is basically a register followed by unbind
++ */
++int do_take_over_console(const struct consw *csw, int first, int last, int deflt)
++{
++	int err;
++
++	err = do_register_con_driver(csw, first, last);
++	/*
++	 * If we get an busy error we still want to bind the console driver
++	 * and return success, as we may have unbound the console driver
++	 * but not unregistered it.
++	 */
++	if (err == -EBUSY)
++		err = 0;
++	if (!err)
++		do_bind_con_driver(csw, first, last, deflt);
++
++	return err;
++}
++EXPORT_SYMBOL_GPL(do_take_over_console);
++
++/*
++ *	If we support more console drivers, this function is used
++ *	when a driver wants to take over some existing consoles
++ *	and become default driver for newly opened ones.
++ *
++ *	take_over_console is basically a register followed by unbind
+  */
+ int take_over_console(const struct consw *csw, int first, int last, int deflt)
+ {
+ 	int err;
+ 
+ 	err = register_con_driver(csw, first, last);
+-	/* if we get an busy error we still want to bind the console driver
++	/*
++	 * If we get an busy error we still want to bind the console driver
+ 	 * and return success, as we may have unbound the console driver
+-	 * but not unregistered it.
+-	*/
++	 * but not unregistered it.
++	 */
+ 	if (err == -EBUSY)
+ 		err = 0;
+ 	if (!err)
+diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
+index 89c752a..d775bc9 100644
+--- a/drivers/usb/class/cdc-acm.c
++++ b/drivers/usb/class/cdc-acm.c
+@@ -1602,6 +1602,9 @@ static const struct usb_device_id acm_ids[] = {
+ 	{ USB_DEVICE(0x0572, 0x1340), /* Conexant CX93010-2x UCMxx */
+ 	.driver_info = NO_UNION_NORMAL,
+ 	},
++	{ USB_DEVICE(0x05f9, 0x4002), /* PSC Scanning, Magellan 800i */
++	.driver_info = NO_UNION_NORMAL,
++	},
+ 	{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */
+ 	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
+ 	},
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index fe7faf0..2aed077 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -867,6 +867,60 @@ static int hub_hub_status(struct usb_hub *hub,
+ 	return ret;
+ }
+ 
++static int hub_set_port_link_state(struct usb_hub *hub, int port1,
++			unsigned int link_status)
++{
++	return set_port_feature(hub->hdev,
++			port1 | (link_status << 3),
++			USB_PORT_FEAT_LINK_STATE);
++}
++
++/*
++ * If USB 3.0 ports are placed into the Disabled state, they will no longer
++ * detect any device connects or disconnects.  This is generally not what the
++ * USB core wants, since it expects a disabled port to produce a port status
++ * change event when a new device connects.
++ *
++ * Instead, set the link state to Disabled, wait for the link to settle into
++ * that state, clear any change bits, and then put the port into the RxDetect
++ * state.
++ */
++static int hub_usb3_port_disable(struct usb_hub *hub, int port1)
++{
++	int ret;
++	int total_time;
++	u16 portchange, portstatus;
++
++	if (!hub_is_superspeed(hub->hdev))
++		return -EINVAL;
++
++	ret = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_SS_DISABLED);
++	if (ret) {
++		dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
++				port1, ret);
++		return ret;
++	}
++
++	/* Wait for the link to enter the disabled state. */
++	for (total_time = 0; ; total_time += HUB_DEBOUNCE_STEP) {
++		ret = hub_port_status(hub, port1, &portstatus, &portchange);
++		if (ret < 0)
++			return ret;
++
++		if ((portstatus & USB_PORT_STAT_LINK_STATE) ==
++				USB_SS_PORT_LS_SS_DISABLED)
++			break;
++		if (total_time >= HUB_DEBOUNCE_TIMEOUT)
++			break;
++		msleep(HUB_DEBOUNCE_STEP);
++	}
++	if (total_time >= HUB_DEBOUNCE_TIMEOUT)
++		dev_warn(hub->intfdev, "Could not disable port %d after %d ms\n",
++				port1, total_time);
++
++	return hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_RX_DETECT);
++}
++
+ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
+ {
+ 	struct usb_device *hdev = hub->hdev;
+@@ -875,8 +929,13 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
+ 	if (hdev->children[port1-1] && set_state)
+ 		usb_set_device_state(hdev->children[port1-1],
+ 				USB_STATE_NOTATTACHED);
+-	if (!hub->error && !hub_is_superspeed(hub->hdev))
+-		ret = clear_port_feature(hdev, port1, USB_PORT_FEAT_ENABLE);
++	if (!hub->error) {
++		if (hub_is_superspeed(hub->hdev))
++			ret = hub_usb3_port_disable(hub, port1);
++		else
++			ret = clear_port_feature(hdev, port1,
++					USB_PORT_FEAT_ENABLE);
++	}
+ 	if (ret)
+ 		dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
+ 				port1, ret);
+@@ -2339,7 +2398,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)
+ #define HUB_SHORT_RESET_TIME	10
+ #define HUB_BH_RESET_TIME	50
+ #define HUB_LONG_RESET_TIME	200
+-#define HUB_RESET_TIMEOUT	500
++#define HUB_RESET_TIMEOUT	800
+ 
+ static int hub_port_reset(struct usb_hub *hub, int port1,
+ 			struct usb_device *udev, unsigned int delay, bool warm);
+@@ -2374,6 +2433,10 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
+ 		if (ret < 0)
+ 			return ret;
+ 
++		/* The port state is unknown until the reset completes. */
++		if ((portstatus & USB_PORT_STAT_RESET))
++			goto delay;
++
+ 		/*
+ 		 * Some buggy devices require a warm reset to be issued even
+ 		 * when the port appears not to be connected.
+@@ -2419,11 +2482,7 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
+ 			if ((portchange & USB_PORT_STAT_C_CONNECTION))
+ 				return -ENOTCONN;
+ 
+-			/* if we`ve finished resetting, then break out of
+-			 * the loop
+-			 */
+-			if (!(portstatus & USB_PORT_STAT_RESET) &&
+-			    (portstatus & USB_PORT_STAT_ENABLE)) {
++			if ((portstatus & USB_PORT_STAT_ENABLE)) {
+ 				if (hub_is_wusb(hub))
+ 					udev->speed = USB_SPEED_WIRELESS;
+ 				else if (hub_is_superspeed(hub->hdev))
+@@ -2437,10 +2496,15 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
+ 				return 0;
+ 			}
+ 		} else {
+-			if (portchange & USB_PORT_STAT_C_BH_RESET)
+-				return 0;
++			if (!(portstatus & USB_PORT_STAT_CONNECTION) ||
++					hub_port_warm_reset_required(hub,
++						portstatus))
++				return -ENOTCONN;
++
++			return 0;
+ 		}
+ 
++delay:
+ 		/* switch to the long delay after two short delay failures */
+ 		if (delay_time >= 2 * HUB_SHORT_RESET_TIME)
+ 			delay = HUB_LONG_RESET_TIME;
+@@ -2464,14 +2528,11 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
+ 			msleep(10 + 40);
+ 			update_devnum(udev, 0);
+ 			hcd = bus_to_hcd(udev->bus);
+-			if (hcd->driver->reset_device) {
+-				*status = hcd->driver->reset_device(hcd, udev);
+-				if (*status < 0) {
+-					dev_err(&udev->dev, "Cannot reset "
+-							"HCD device state\n");
+-					break;
+-				}
+-			}
++			/* The xHC may think the device is already reset,
++			 * so ignore the status.
++			 */
++			if (hcd->driver->reset_device)
++				hcd->driver->reset_device(hcd, udev);
+ 		}
+ 		/* FALL THROUGH */
+ 	case -ENOTCONN:
+@@ -2479,16 +2540,16 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
+ 		clear_port_feature(hub->hdev,
+ 				port1, USB_PORT_FEAT_C_RESET);
+ 		/* FIXME need disconnect() for NOTATTACHED device */
+-		if (warm) {
++		if (hub_is_superspeed(hub->hdev)) {
+ 			clear_port_feature(hub->hdev, port1,
+ 					USB_PORT_FEAT_C_BH_PORT_RESET);
+ 			clear_port_feature(hub->hdev, port1,
+ 					USB_PORT_FEAT_C_PORT_LINK_STATE);
+-		} else {
++		}
++		if (!warm)
+ 			usb_set_device_state(udev, *status
+ 					? USB_STATE_NOTATTACHED
+ 					: USB_STATE_DEFAULT);
+-		}
+ 		break;
+ 	}
+ }
+@@ -2676,6 +2737,23 @@ void usb_enable_ltm(struct usb_device *udev)
+ EXPORT_SYMBOL_GPL(usb_enable_ltm);
+ 
+ #ifdef	CONFIG_USB_SUSPEND
++/*
++ * usb_disable_function_remotewakeup - disable usb3.0
++ * device's function remote wakeup
++ * @udev: target device
++ *
++ * Assume there's only one function on the USB 3.0
++ * device and disable remote wake for the first
++ * interface. FIXME if the interface association
++ * descriptor shows there's more than one function.
++ */
++static int usb_disable_function_remotewakeup(struct usb_device *udev)
++{
++	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
++				USB_REQ_CLEAR_FEATURE, USB_RECIP_INTERFACE,
++				USB_INTRF_FUNC_SUSPEND,	0, NULL, 0,
++				USB_CTRL_SET_TIMEOUT);
++}
+ 
+ /*
+  * usb_port_suspend - suspend a usb device's upstream port
+@@ -2793,12 +2871,19 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
+ 		dev_dbg(hub->intfdev, "can't suspend port %d, status %d\n",
+ 				port1, status);
+ 		/* paranoia:  "should not happen" */
+-		if (udev->do_remote_wakeup)
+-			(void) usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+-				USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
+-				USB_DEVICE_REMOTE_WAKEUP, 0,
+-				NULL, 0,
+-				USB_CTRL_SET_TIMEOUT);
++		if (udev->do_remote_wakeup) {
++			if (!hub_is_superspeed(hub->hdev)) {
++				(void) usb_control_msg(udev,
++						usb_sndctrlpipe(udev, 0),
++						USB_REQ_CLEAR_FEATURE,
++						USB_RECIP_DEVICE,
++						USB_DEVICE_REMOTE_WAKEUP, 0,
++						NULL, 0,
++						USB_CTRL_SET_TIMEOUT);
++			} else
++				(void) usb_disable_function_remotewakeup(udev);
++
++		}
+ 
+ 		/* Try to enable USB2 hardware LPM again */
+ 		if (udev->usb2_hw_lpm_capable == 1)
+@@ -2837,7 +2922,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
+ static int finish_port_resume(struct usb_device *udev)
+ {
+ 	int	status = 0;
+-	u16	devstatus;
++	u16	devstatus = 0;
+ 
+ 	/* caller owns the udev device lock */
+ 	dev_dbg(&udev->dev, "%s\n",
+@@ -2882,21 +2967,37 @@ static int finish_port_resume(struct usb_device *udev)
+ 	if (status) {
+ 		dev_dbg(&udev->dev, "gone after usb resume? status %d\n",
+ 				status);
+-	} else if (udev->actconfig) {
+-		le16_to_cpus(&devstatus);
+-		if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) {
+-			status = usb_control_msg(udev,
+-					usb_sndctrlpipe(udev, 0),
+-					USB_REQ_CLEAR_FEATURE,
++	/*
++	 * There are a few quirky devices which violate the standard
++	 * by claiming to have remote wakeup enabled after a reset,
++	 * which crash if the feature is cleared, hence check for
++	 * udev->reset_resume
++	 */
++	} else if (udev->actconfig && !udev->reset_resume) {
++		if (!hub_is_superspeed(udev->parent)) {
++			le16_to_cpus(&devstatus);
++			if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP))
++				status = usb_control_msg(udev,
++						usb_sndctrlpipe(udev, 0),
++						USB_REQ_CLEAR_FEATURE,
+ 						USB_RECIP_DEVICE,
+-					USB_DEVICE_REMOTE_WAKEUP, 0,
+-					NULL, 0,
+-					USB_CTRL_SET_TIMEOUT);
+-			if (status)
+-				dev_dbg(&udev->dev,
+-					"disable remote wakeup, status %d\n",
+-					status);
++						USB_DEVICE_REMOTE_WAKEUP, 0,
++						NULL, 0,
++						USB_CTRL_SET_TIMEOUT);
++		} else {
++			status = usb_get_status(udev, USB_RECIP_INTERFACE, 0,
++					&devstatus);
++			le16_to_cpus(&devstatus);
++			if (!status && devstatus & (USB_INTRF_STAT_FUNC_RW_CAP
++					| USB_INTRF_STAT_FUNC_RW))
++				status =
++					usb_disable_function_remotewakeup(udev);
+ 		}
++
++		if (status)
++			dev_dbg(&udev->dev,
++				"disable remote wakeup, status %d\n",
++				status);
+ 		status = 0;
+ 	}
+ 	return status;
+@@ -4511,9 +4612,14 @@ static void hub_events(void)
+ 			 * SS.Inactive state.
+ 			 */
+ 			if (hub_port_warm_reset_required(hub, portstatus)) {
++				int status;
++
+ 				dev_dbg(hub_dev, "warm reset port %d\n", i);
+-				hub_port_reset(hub, i, NULL,
++				status = hub_port_reset(hub, i, NULL,
+ 						HUB_BH_RESET_TIME, true);
++				if (status < 0)
++					hub_port_disable(hub, i, 1);
++				connect_change = 0;
+ 			}
+ 
+ 			if (connect_change)
+diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
+index 0ab7da2..583150b 100644
+--- a/drivers/usb/core/message.c
++++ b/drivers/usb/core/message.c
+@@ -1808,29 +1808,8 @@ free_interfaces:
+ 		goto free_interfaces;
+ 	}
+ 
+-	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+-			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,
+-			      NULL, 0, USB_CTRL_SET_TIMEOUT);
+-	if (ret < 0) {
+-		/* All the old state is gone, so what else can we do?
+-		 * The device is probably useless now anyway.
+-		 */
+-		cp = NULL;
+-	}
+-
+-	dev->actconfig = cp;
+-	if (!cp) {
+-		usb_set_device_state(dev, USB_STATE_ADDRESS);
+-		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
+-		/* Leave LPM disabled while the device is unconfigured. */
+-		mutex_unlock(hcd->bandwidth_mutex);
+-		usb_autosuspend_device(dev);
+-		goto free_interfaces;
+-	}
+-	mutex_unlock(hcd->bandwidth_mutex);
+-	usb_set_device_state(dev, USB_STATE_CONFIGURED);
+-
+-	/* Initialize the new interface structures and the
++	/*
++	 * Initialize the new interface structures and the
+ 	 * hc/hcd/usbcore interface/endpoint state.
+ 	 */
+ 	for (i = 0; i < nintf; ++i) {
+@@ -1874,6 +1853,35 @@ free_interfaces:
+ 	}
+ 	kfree(new_interfaces);
+ 
++	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
++			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,
++			      NULL, 0, USB_CTRL_SET_TIMEOUT);
++	if (ret < 0 && cp) {
++		/*
++		 * All the old state is gone, so what else can we do?
++		 * The device is probably useless now anyway.
++		 */
++		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
++		for (i = 0; i < nintf; ++i) {
++			usb_disable_interface(dev, cp->interface[i], true);
++			put_device(&cp->interface[i]->dev);
++			cp->interface[i] = NULL;
++		}
++		cp = NULL;
++	}
++
++	dev->actconfig = cp;
++	mutex_unlock(hcd->bandwidth_mutex);
++
++	if (!cp) {
++		usb_set_device_state(dev, USB_STATE_ADDRESS);
++
++		/* Leave LPM disabled while the device is unconfigured. */
++		usb_autosuspend_device(dev);
++		return ret;
++	}
++	usb_set_device_state(dev, USB_STATE_CONFIGURED);
++
+ 	if (cp->string == NULL &&
+ 			!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
+ 		cp->string = usb_cache_string(dev, cp->desc.iConfiguration);
+diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
+index eb0fd10..b6c4084 100644
+--- a/drivers/usb/dwc3/gadget.c
++++ b/drivers/usb/dwc3/gadget.c
+@@ -1619,6 +1619,7 @@ static int __devinit dwc3_gadget_init_endpoints(struct dwc3 *dwc)
+ 
+ 		if (epnum == 0 || epnum == 1) {
+ 			dep->endpoint.maxpacket = 512;
++			dep->endpoint.maxburst = 1;
+ 			dep->endpoint.ops = &dwc3_gadget_ep0_ops;
+ 			if (!epnum)
+ 				dwc->gadget.ep0 = &dep->endpoint;
+diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
+index afdbb1c..4ad1f1c 100644
+--- a/drivers/usb/gadget/dummy_hcd.c
++++ b/drivers/usb/gadget/dummy_hcd.c
+@@ -126,10 +126,7 @@ static const char ep0name[] = "ep0";
+ static const char *const ep_name[] = {
+ 	ep0name,				/* everyone has ep0 */
+ 
+-	/* act like a net2280: high speed, six configurable endpoints */
+-	"ep-a", "ep-b", "ep-c", "ep-d", "ep-e", "ep-f",
+-
+-	/* or like pxa250: fifteen fixed function endpoints */
++	/* act like a pxa250: fifteen fixed function endpoints */
+ 	"ep1in-bulk", "ep2out-bulk", "ep3in-iso", "ep4out-iso", "ep5in-int",
+ 	"ep6in-bulk", "ep7out-bulk", "ep8in-iso", "ep9out-iso", "ep10in-int",
+ 	"ep11in-bulk", "ep12out-bulk", "ep13in-iso", "ep14out-iso",
+@@ -137,6 +134,10 @@ static const char *const ep_name[] = {
+ 
+ 	/* or like sa1100: two fixed function endpoints */
+ 	"ep1out-bulk", "ep2in-bulk",
++
++	/* and now some generic EPs so we have enough in multi config */
++	"ep3out", "ep4in", "ep5out", "ep6out", "ep7in", "ep8out", "ep9in",
++	"ep10out", "ep11out", "ep12in", "ep13out", "ep14in", "ep15out",
+ };
+ #define DUMMY_ENDPOINTS	ARRAY_SIZE(ep_name)
+ 
+diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
+index 30b908f..672c66a 100644
+--- a/drivers/usb/gadget/f_ecm.c
++++ b/drivers/usb/gadget/f_ecm.c
+@@ -808,9 +808,9 @@ fail:
+ 	/* we might as well release our claims on endpoints */
+ 	if (ecm->notify)
+ 		ecm->notify->driver_data = NULL;
+-	if (ecm->port.out_ep->desc)
++	if (ecm->port.out_ep)
+ 		ecm->port.out_ep->driver_data = NULL;
+-	if (ecm->port.in_ep->desc)
++	if (ecm->port.in_ep)
+ 		ecm->port.in_ep->driver_data = NULL;
+ 
+ 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
+diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c
+index 1a7b2dd..a9cf2052 100644
+--- a/drivers/usb/gadget/f_eem.c
++++ b/drivers/usb/gadget/f_eem.c
+@@ -319,10 +319,9 @@ fail:
+ 	if (f->hs_descriptors)
+ 		usb_free_descriptors(f->hs_descriptors);
+ 
+-	/* we might as well release our claims on endpoints */
+-	if (eem->port.out_ep->desc)
++	if (eem->port.out_ep)
+ 		eem->port.out_ep->driver_data = NULL;
+-	if (eem->port.in_ep->desc)
++	if (eem->port.in_ep)
+ 		eem->port.in_ep->driver_data = NULL;
+ 
+ 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
+diff --git a/drivers/usb/gadget/f_midi.c b/drivers/usb/gadget/f_midi.c
+index 2f7e8f2..1bf9596 100644
+--- a/drivers/usb/gadget/f_midi.c
++++ b/drivers/usb/gadget/f_midi.c
+@@ -416,6 +416,7 @@ static void f_midi_unbind(struct usb_configuration *c, struct usb_function *f)
+ 	midi->id = NULL;
+ 
+ 	usb_free_descriptors(f->descriptors);
++	usb_free_descriptors(f->hs_descriptors);
+ 	kfree(midi);
+ }
+ 
+diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
+index aab8ede..d7811ae 100644
+--- a/drivers/usb/gadget/f_ncm.c
++++ b/drivers/usb/gadget/f_ncm.c
+@@ -1259,9 +1259,9 @@ fail:
+ 	/* we might as well release our claims on endpoints */
+ 	if (ncm->notify)
+ 		ncm->notify->driver_data = NULL;
+-	if (ncm->port.out_ep->desc)
++	if (ncm->port.out_ep)
+ 		ncm->port.out_ep->driver_data = NULL;
+-	if (ncm->port.in_ep->desc)
++	if (ncm->port.in_ep)
+ 		ncm->port.in_ep->driver_data = NULL;
+ 
+ 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
+diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
+index 8ee9268..a6c19a4 100644
+--- a/drivers/usb/gadget/f_phonet.c
++++ b/drivers/usb/gadget/f_phonet.c
+@@ -531,7 +531,7 @@ int pn_bind(struct usb_configuration *c, struct usb_function *f)
+ 
+ 		req = usb_ep_alloc_request(fp->out_ep, GFP_KERNEL);
+ 		if (!req)
+-			goto err;
++			goto err_req;
+ 
+ 		req->complete = pn_rx_complete;
+ 		fp->out_reqv[i] = req;
+@@ -540,14 +540,18 @@ int pn_bind(struct usb_configuration *c, struct usb_function *f)
+ 	/* Outgoing USB requests */
+ 	fp->in_req = usb_ep_alloc_request(fp->in_ep, GFP_KERNEL);
+ 	if (!fp->in_req)
+-		goto err;
++		goto err_req;
+ 
+ 	INFO(cdev, "USB CDC Phonet function\n");
+ 	INFO(cdev, "using %s, OUT %s, IN %s\n", cdev->gadget->name,
+ 		fp->out_ep->name, fp->in_ep->name);
+ 	return 0;
+ 
++err_req:
++	for (i = 0; i < phonet_rxq_size && fp->out_reqv[i]; i++)
++		usb_ep_free_request(fp->out_ep, fp->out_reqv[i]);
+ err:
++
+ 	if (fp->out_ep)
+ 		fp->out_ep->driver_data = NULL;
+ 	if (fp->in_ep)
+diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
+index b1681e4..47953fe 100644
+--- a/drivers/usb/gadget/f_rndis.c
++++ b/drivers/usb/gadget/f_rndis.c
+@@ -803,9 +803,9 @@ fail:
+ 	/* we might as well release our claims on endpoints */
+ 	if (rndis->notify)
+ 		rndis->notify->driver_data = NULL;
+-	if (rndis->port.out_ep->desc)
++	if (rndis->port.out_ep)
+ 		rndis->port.out_ep->driver_data = NULL;
+-	if (rndis->port.in_ep->desc)
++	if (rndis->port.in_ep)
+ 		rndis->port.in_ep->driver_data = NULL;
+ 
+ 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
+diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
+index 21ab474..e5bb966 100644
+--- a/drivers/usb/gadget/f_subset.c
++++ b/drivers/usb/gadget/f_subset.c
+@@ -370,9 +370,9 @@ fail:
+ 		usb_free_descriptors(f->hs_descriptors);
+ 
+ 	/* we might as well release our claims on endpoints */
+-	if (geth->port.out_ep->desc)
++	if (geth->port.out_ep)
+ 		geth->port.out_ep->driver_data = NULL;
+-	if (geth->port.in_ep->desc)
++	if (geth->port.in_ep)
+ 		geth->port.in_ep->driver_data = NULL;
+ 
+ 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
+diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
+index 2a8bf06..10f13c1 100644
+--- a/drivers/usb/gadget/f_uvc.c
++++ b/drivers/usb/gadget/f_uvc.c
+@@ -417,7 +417,6 @@ uvc_register_video(struct uvc_device *uvc)
+ 		return -ENOMEM;
+ 
+ 	video->parent = &cdev->gadget->dev;
+-	video->minor = -1;
+ 	video->fops = &uvc_v4l2_fops;
+ 	video->release = video_device_release;
+ 	strncpy(video->name, cdev->gadget->name, sizeof(video->name));
+@@ -577,23 +576,12 @@ uvc_function_unbind(struct usb_configuration *c, struct usb_function *f)
+ 
+ 	INFO(cdev, "uvc_function_unbind\n");
+ 
+-	if (uvc->vdev) {
+-		if (uvc->vdev->minor == -1)
+-			video_device_release(uvc->vdev);
+-		else
+-			video_unregister_device(uvc->vdev);
+-		uvc->vdev = NULL;
+-	}
+-
+-	if (uvc->control_ep)
+-		uvc->control_ep->driver_data = NULL;
+-	if (uvc->video.ep)
+-		uvc->video.ep->driver_data = NULL;
++	video_unregister_device(uvc->vdev);
++	uvc->control_ep->driver_data = NULL;
++	uvc->video.ep->driver_data = NULL;
+ 
+-	if (uvc->control_req) {
+-		usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
+-		kfree(uvc->control_buf);
+-	}
++	usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
++	kfree(uvc->control_buf);
+ 
+ 	kfree(f->descriptors);
+ 	kfree(f->hs_descriptors);
+@@ -740,7 +728,22 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
+ 	return 0;
+ 
+ error:
+-	uvc_function_unbind(c, f);
++	if (uvc->vdev)
++		video_device_release(uvc->vdev);
++
++	if (uvc->control_ep)
++		uvc->control_ep->driver_data = NULL;
++	if (uvc->video.ep)
++		uvc->video.ep->driver_data = NULL;
++
++	if (uvc->control_req) {
++		usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
++		kfree(uvc->control_buf);
++	}
++
++	kfree(f->descriptors);
++	kfree(f->hs_descriptors);
++	kfree(f->ss_descriptors);
+ 	return ret;
+ }
+ 
+diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
+index c788022..a5d4c41 100644
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -623,7 +623,11 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
+ 			status = STS_PCD;
+ 		}
+ 	}
+-	/* FIXME autosuspend idle root hubs */
++
++	/* If a resume is in progress, make sure it can finish */
++	if (ehci->resuming_ports)
++		mod_timer(&hcd->rh_timer, jiffies + msecs_to_jiffies(25));
++
+ 	spin_unlock_irqrestore (&ehci->lock, flags);
+ 	return status ? retval : 0;
+ }
+diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
+index d7fe287..50fcc42 100644
+--- a/drivers/usb/host/ehci-omap.c
++++ b/drivers/usb/host/ehci-omap.c
+@@ -374,7 +374,7 @@ static const struct hc_driver ehci_omap_hc_driver = {
+ 	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+ };
+ 
+-MODULE_ALIAS("platform:omap-ehci");
++MODULE_ALIAS("platform:ehci-omap");
+ MODULE_AUTHOR("Texas Instruments, Inc.");
+ MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+ 
+diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
+index 2cb7d37..f42b68e 100644
+--- a/drivers/usb/host/ehci-pci.c
++++ b/drivers/usb/host/ehci-pci.c
+@@ -334,7 +334,8 @@ static bool usb_is_intel_switchable_ehci(struct pci_dev *pdev)
+ 		pdev->vendor == PCI_VENDOR_ID_INTEL &&
+ 		(pdev->device == 0x1E26 ||
+ 		 pdev->device == 0x8C2D ||
+-		 pdev->device == 0x8C26);
++		 pdev->device == 0x8C26 ||
++		 pdev->device == 0x9C26);
+ }
+ 
+ static void ehci_enable_xhci_companion(void)
+diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
+index 528a540..838e571 100644
+--- a/drivers/usb/host/ehci-sched.c
++++ b/drivers/usb/host/ehci-sched.c
+@@ -236,7 +236,7 @@ static inline unsigned char tt_start_uframe(struct ehci_hcd *ehci, __hc32 mask)
+ }
+ 
+ static const unsigned char
+-max_tt_usecs[] = { 125, 125, 125, 125, 125, 125, 30, 0 };
++max_tt_usecs[] = { 125, 125, 125, 125, 125, 125, 125, 25 };
+ 
+ /* carryover low/fullspeed bandwidth that crosses uframe boundries */
+ static inline void carryover_tt_bandwidth(unsigned short tt_usecs[8])
+diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
+index 39f9e4a..7893351 100644
+--- a/drivers/usb/host/pci-quirks.c
++++ b/drivers/usb/host/pci-quirks.c
+@@ -723,6 +723,7 @@ static int handshake(void __iomem *ptr, u32 mask, u32 done,
+ }
+ 
+ #define PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI	0x8C31
++#define PCI_DEVICE_ID_INTEL_LYNX_POINT_LP_XHCI	0x9C31
+ 
+ bool usb_is_intel_ppt_switchable_xhci(struct pci_dev *pdev)
+ {
+@@ -736,7 +737,8 @@ bool usb_is_intel_lpt_switchable_xhci(struct pci_dev *pdev)
+ {
+ 	return pdev->class == PCI_CLASS_SERIAL_USB_XHCI &&
+ 		pdev->vendor == PCI_VENDOR_ID_INTEL &&
+-		pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI;
++		(pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI ||
++		 pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_LP_XHCI);
+ }
+ 
+ bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
+@@ -778,6 +780,7 @@ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev)
+ 				"defaulting to EHCI.\n");
+ 		dev_warn(&xhci_pdev->dev,
+ 				"USB 3.0 devices will work at USB 2.0 speeds.\n");
++		usb_disable_xhci_ports(xhci_pdev);
+ 		return;
+ 	}
+ 
+diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
+index e4db350..3fe069f 100644
+--- a/drivers/usb/host/uhci-hcd.c
++++ b/drivers/usb/host/uhci-hcd.c
+@@ -447,6 +447,10 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
+ 		return IRQ_NONE;
+ 	uhci_writew(uhci, status, USBSTS);		/* Clear it */
+ 
++	spin_lock(&uhci->lock);
++	if (unlikely(!uhci->is_initialized))	/* not yet configured */
++		goto done;
++
+ 	if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) {
+ 		if (status & USBSTS_HSE)
+ 			dev_err(uhci_dev(uhci), "host system error, "
+@@ -455,7 +459,6 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
+ 			dev_err(uhci_dev(uhci), "host controller process "
+ 					"error, something bad happened!\n");
+ 		if (status & USBSTS_HCH) {
+-			spin_lock(&uhci->lock);
+ 			if (uhci->rh_state >= UHCI_RH_RUNNING) {
+ 				dev_err(uhci_dev(uhci),
+ 					"host controller halted, "
+@@ -473,15 +476,15 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
+ 				 * pending unlinks */
+ 				mod_timer(&hcd->rh_timer, jiffies);
+ 			}
+-			spin_unlock(&uhci->lock);
+ 		}
+ 	}
+ 
+-	if (status & USBSTS_RD)
++	if (status & USBSTS_RD) {
++		spin_unlock(&uhci->lock);
+ 		usb_hcd_poll_rh_status(hcd);
+-	else {
+-		spin_lock(&uhci->lock);
++	} else {
+ 		uhci_scan_schedule(uhci);
++ done:
+ 		spin_unlock(&uhci->lock);
+ 	}
+ 
+@@ -662,9 +665,9 @@ static int uhci_start(struct usb_hcd *hcd)
+ 	 */
+ 	mb();
+ 
++	spin_lock_irq(&uhci->lock);
+ 	configure_hc(uhci);
+ 	uhci->is_initialized = 1;
+-	spin_lock_irq(&uhci->lock);
+ 	start_rh(uhci);
+ 	spin_unlock_irq(&uhci->lock);
+ 	return 0;
+diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
+index d5eb357..abb9772 100644
+--- a/drivers/usb/host/xhci-hub.c
++++ b/drivers/usb/host/xhci-hub.c
+@@ -762,12 +762,39 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+ 			break;
+ 		case USB_PORT_FEAT_LINK_STATE:
+ 			temp = xhci_readl(xhci, port_array[wIndex]);
++
++			/* Disable port */
++			if (link_state == USB_SS_PORT_LS_SS_DISABLED) {
++				xhci_dbg(xhci, "Disable port %d\n", wIndex);
++				temp = xhci_port_state_to_neutral(temp);
++				/*
++				 * Clear all change bits, so that we get a new
++				 * connection event.
++				 */
++				temp |= PORT_CSC | PORT_PEC | PORT_WRC |
++					PORT_OCC | PORT_RC | PORT_PLC |
++					PORT_CEC;
++				xhci_writel(xhci, temp | PORT_PE,
++					port_array[wIndex]);
++				temp = xhci_readl(xhci, port_array[wIndex]);
++				break;
++			}
++
++			/* Put link in RxDetect (enable port) */
++			if (link_state == USB_SS_PORT_LS_RX_DETECT) {
++				xhci_dbg(xhci, "Enable port %d\n", wIndex);
++				xhci_set_link_state(xhci, port_array, wIndex,
++						link_state);
++				temp = xhci_readl(xhci, port_array[wIndex]);
++				break;
++			}
++
+ 			/* Software should not attempt to set
+-			 * port link state above '5' (Rx.Detect) and the port
++			 * port link state above '3' (U3) and the port
+ 			 * must be enabled.
+ 			 */
+ 			if ((temp & PORT_PE) == 0 ||
+-				(link_state > USB_SS_PORT_LS_RX_DETECT)) {
++				(link_state > USB_SS_PORT_LS_U3)) {
+ 				xhci_warn(xhci, "Cannot set link state.\n");
+ 				goto error;
+ 			}
+@@ -938,6 +965,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
+ 	int max_ports;
+ 	__le32 __iomem **port_array;
+ 	struct xhci_bus_state *bus_state;
++	bool reset_change = false;
+ 
+ 	max_ports = xhci_get_ports(hcd, &port_array);
+ 	bus_state = &xhci->bus_state[hcd_index(hcd)];
+@@ -969,6 +997,12 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
+ 			buf[(i + 1) / 8] |= 1 << (i + 1) % 8;
+ 			status = 1;
+ 		}
++		if ((temp & PORT_RC))
++			reset_change = true;
++	}
++	if (!status && !reset_change) {
++		xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);
++		clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
+ 	}
+ 	spin_unlock_irqrestore(&xhci->lock, flags);
+ 	return status ? retval : 0;
+diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
+index 487bc08..35616ff 100644
+--- a/drivers/usb/host/xhci-mem.c
++++ b/drivers/usb/host/xhci-mem.c
+@@ -205,7 +205,12 @@ static int xhci_alloc_segments_for_ring(struct xhci_hcd *xhci,
+ 
+ 		next = xhci_segment_alloc(xhci, cycle_state, flags);
+ 		if (!next) {
+-			xhci_free_segments_for_ring(xhci, *first);
++			prev = *first;
++			while (prev) {
++				next = prev->next;
++				xhci_segment_free(xhci, prev);
++				prev = next;
++			}
+ 			return -ENOMEM;
+ 		}
+ 		xhci_link_segments(xhci, prev, next, type);
+@@ -258,7 +263,7 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
+ 	return ring;
+ 
+ fail:
+-	xhci_ring_free(xhci, ring);
++	kfree(ring);
+ 	return NULL;
+ }
+ 
+@@ -1245,6 +1250,8 @@ static unsigned int xhci_microframes_to_exponent(struct usb_device *udev,
+ static unsigned int xhci_parse_microframe_interval(struct usb_device *udev,
+ 		struct usb_host_endpoint *ep)
+ {
++	if (ep->desc.bInterval == 0)
++		return 0;
+ 	return xhci_microframes_to_exponent(udev, ep,
+ 			ep->desc.bInterval, 0, 15);
+ }
+diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
+index 4f1e265..394984f7 100644
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -1698,7 +1698,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
+ 				faked_port_index + 1);
+ 		if (slot_id && xhci->devs[slot_id])
+ 			xhci_ring_device(xhci, slot_id);
+-		if (bus_state->port_remote_wakeup && (1 << faked_port_index)) {
++		if (bus_state->port_remote_wakeup & (1 << faked_port_index)) {
+ 			bus_state->port_remote_wakeup &=
+ 				~(1 << faked_port_index);
+ 			xhci_test_and_clear_bit(xhci, port_array,
+@@ -1725,6 +1725,15 @@ cleanup:
+ 	if (bogus_port_status)
+ 		return;
+ 
++	/*
++	 * xHCI port-status-change events occur when the "or" of all the
++	 * status-change bits in the portsc register changes from 0 to 1.
++	 * New status changes won't cause an event if any other change
++	 * bits are still set.  When an event occurs, switch over to
++	 * polling to avoid losing status changes.
++	 */
++	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);
++	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
+ 	spin_unlock(&xhci->lock);
+ 	/* Pass this up to the core */
+ 	usb_hcd_poll_rh_status(hcd);
+@@ -2578,6 +2587,8 @@ cleanup:
+ 				(trb_comp_code != COMP_STALL &&
+ 					trb_comp_code != COMP_BABBLE))
+ 				xhci_urb_free_priv(xhci, urb_priv);
++			else
++				kfree(urb_priv);
+ 
+ 			usb_hcd_unlink_urb_from_ep(bus_to_hcd(urb->dev->bus), urb);
+ 			if ((urb->actual_length != urb->transfer_buffer_length &&
+@@ -3069,11 +3080,11 @@ static u32 xhci_td_remainder(unsigned int remainder)
+ }
+ 
+ /*
+- * For xHCI 1.0 host controllers, TD size is the number of packets remaining in
+- * the TD (*not* including this TRB).
++ * For xHCI 1.0 host controllers, TD size is the number of max packet sized
++ * packets remaining in the TD (*not* including this TRB).
+  *
+  * Total TD packet count = total_packet_count =
+- *     roundup(TD size in bytes / wMaxPacketSize)
++ *     DIV_ROUND_UP(TD size in bytes / wMaxPacketSize)
+  *
+  * Packets transferred up to and including this TRB = packets_transferred =
+  *     rounddown(total bytes transferred including this TRB / wMaxPacketSize)
+@@ -3081,24 +3092,27 @@ static u32 xhci_td_remainder(unsigned int remainder)
+  * TD size = total_packet_count - packets_transferred
+  *
+  * It must fit in bits 21:17, so it can't be bigger than 31.
++ * The last TRB in a TD must have the TD size set to zero.
+  */
+-
+ static u32 xhci_v1_0_td_remainder(int running_total, int trb_buff_len,
+-		unsigned int total_packet_count, struct urb *urb)
++		unsigned int total_packet_count, struct urb *urb,
++		unsigned int num_trbs_left)
+ {
+ 	int packets_transferred;
+ 
+ 	/* One TRB with a zero-length data packet. */
+-	if (running_total == 0 && trb_buff_len == 0)
++	if (num_trbs_left == 0 || (running_total == 0 && trb_buff_len == 0))
+ 		return 0;
+ 
+ 	/* All the TRB queueing functions don't count the current TRB in
+ 	 * running_total.
+ 	 */
+ 	packets_transferred = (running_total + trb_buff_len) /
+-		usb_endpoint_maxp(&urb->ep->desc);
++		GET_MAX_PACKET(usb_endpoint_maxp(&urb->ep->desc));
+ 
+-	return xhci_td_remainder(total_packet_count - packets_transferred);
++	if ((total_packet_count - packets_transferred) > 31)
++		return 31 << 17;
++	return (total_packet_count - packets_transferred) << 17;
+ }
+ 
+ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+@@ -3125,7 +3139,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+ 
+ 	num_trbs = count_sg_trbs_needed(xhci, urb);
+ 	num_sgs = urb->num_mapped_sgs;
+-	total_packet_count = roundup(urb->transfer_buffer_length,
++	total_packet_count = DIV_ROUND_UP(urb->transfer_buffer_length,
+ 			usb_endpoint_maxp(&urb->ep->desc));
+ 
+ 	trb_buff_len = prepare_transfer(xhci, xhci->devs[slot_id],
+@@ -3208,7 +3222,8 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+ 					running_total);
+ 		} else {
+ 			remainder = xhci_v1_0_td_remainder(running_total,
+-					trb_buff_len, total_packet_count, urb);
++					trb_buff_len, total_packet_count, urb,
++					num_trbs - 1);
+ 		}
+ 		length_field = TRB_LEN(trb_buff_len) |
+ 			remainder |
+@@ -3316,7 +3331,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+ 	start_cycle = ep_ring->cycle_state;
+ 
+ 	running_total = 0;
+-	total_packet_count = roundup(urb->transfer_buffer_length,
++	total_packet_count = DIV_ROUND_UP(urb->transfer_buffer_length,
+ 			usb_endpoint_maxp(&urb->ep->desc));
+ 	/* How much data is in the first TRB? */
+ 	addr = (u64) urb->transfer_dma;
+@@ -3362,7 +3377,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+ 					running_total);
+ 		} else {
+ 			remainder = xhci_v1_0_td_remainder(running_total,
+-					trb_buff_len, total_packet_count, urb);
++					trb_buff_len, total_packet_count, urb,
++					num_trbs - 1);
+ 		}
+ 		length_field = TRB_LEN(trb_buff_len) |
+ 			remainder |
+@@ -3625,8 +3641,9 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+ 		addr = start_addr + urb->iso_frame_desc[i].offset;
+ 		td_len = urb->iso_frame_desc[i].length;
+ 		td_remain_len = td_len;
+-		total_packet_count = roundup(td_len,
+-				usb_endpoint_maxp(&urb->ep->desc));
++		total_packet_count = DIV_ROUND_UP(td_len,
++				GET_MAX_PACKET(
++					usb_endpoint_maxp(&urb->ep->desc)));
+ 		/* A zero-length transfer still involves at least one packet. */
+ 		if (total_packet_count == 0)
+ 			total_packet_count++;
+@@ -3648,9 +3665,11 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+ 		td = urb_priv->td[i];
+ 		for (j = 0; j < trbs_per_td; j++) {
+ 			u32 remainder = 0;
+-			field = TRB_TBC(burst_count) | TRB_TLBPC(residue);
++			field = 0;
+ 
+ 			if (first_trb) {
++				field = TRB_TBC(burst_count) |
++					TRB_TLBPC(residue);
+ 				/* Queue the isoc TRB */
+ 				field |= TRB_TYPE(TRB_ISOC);
+ 				/* Assume URB_ISO_ASAP is set */
+@@ -3704,7 +3723,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
+ 			} else {
+ 				remainder = xhci_v1_0_td_remainder(
+ 						running_total, trb_buff_len,
+-						total_packet_count, urb);
++						total_packet_count, urb,
++						(trbs_per_td - j - 1));
+ 			}
+ 			length_field = TRB_LEN(trb_buff_len) |
+ 				remainder |
+diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
+index a6e910b..b6586e3 100644
+--- a/drivers/usb/host/xhci.c
++++ b/drivers/usb/host/xhci.c
+@@ -480,7 +480,7 @@ static bool compliance_mode_recovery_timer_quirk_check(void)
+ 	if (strstr(dmi_product_name, "Z420") ||
+ 			strstr(dmi_product_name, "Z620") ||
+ 			strstr(dmi_product_name, "Z820") ||
+-			strstr(dmi_product_name, "Z1"))
++			strstr(dmi_product_name, "Z1 Workstation"))
+ 		return true;
+ 
+ 	return false;
+@@ -880,6 +880,11 @@ int xhci_suspend(struct xhci_hcd *xhci)
+ 	struct usb_hcd		*hcd = xhci_to_hcd(xhci);
+ 	u32			command;
+ 
++	/* Don't poll the roothubs on bus suspend. */
++	xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);
++	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
++	del_timer_sync(&hcd->rh_timer);
++
+ 	spin_lock_irq(&xhci->lock);
+ 	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+ 	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
+@@ -1064,6 +1069,11 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
+ 	if (xhci->quirks & XHCI_COMP_MODE_QUIRK)
+ 		compliance_mode_recovery_timer_init(xhci);
+ 
++	/* Re-enable port polling. */
++	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);
++	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
++	usb_hcd_poll_rh_status(hcd);
++
+ 	return retval;
+ }
+ #endif	/* CONFIG_PM */
+@@ -2253,7 +2263,7 @@ static bool xhci_is_async_ep(unsigned int ep_type)
+ 
+ static bool xhci_is_sync_in_ep(unsigned int ep_type)
+ {
+-	return (ep_type == ISOC_IN_EP || ep_type != INT_IN_EP);
++	return (ep_type == ISOC_IN_EP || ep_type == INT_IN_EP);
+ }
+ 
+ static unsigned int xhci_get_ss_bw_consumed(struct xhci_bw_info *ep_bw)
+diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
+index 8637c1f..c5835e8 100644
+--- a/drivers/usb/musb/cppi_dma.c
++++ b/drivers/usb/musb/cppi_dma.c
+@@ -1314,6 +1314,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
+ 
+ 	return IRQ_HANDLED;
+ }
++EXPORT_SYMBOL_GPL(cppi_interrupt);
+ 
+ /* Instantiate a software object representing a DMA controller. */
+ struct dma_controller *__init
+diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
+index 26f1bef..c5630c2 100644
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
+@@ -2402,10 +2402,7 @@ static int __init musb_init(void)
+ 	if (usb_disabled())
+ 		return 0;
+ 
+-	pr_info("%s: version " MUSB_VERSION ", "
+-		"?dma?"
+-		", "
+-		"otg (peripheral+host)",
++	pr_info("%s: version " MUSB_VERSION ", ?dma?, otg (peripheral+host)\n",
+ 		musb_driver_name);
+ 	return platform_driver_register(&musb_driver);
+ }
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+index 360bdeb..1f939cb 100644
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -590,6 +590,7 @@ static struct usb_device_id id_table_combined [] = {
+ 	/*
+ 	 * ELV devices:
+ 	 */
++	{ USB_DEVICE(FTDI_ELV_VID, FTDI_ELV_WS300_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_ELV_USR_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_ELV_MSM1_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_ELV_KL100_PID) },
+@@ -676,6 +677,7 @@ static struct usb_device_id id_table_combined [] = {
+ 	{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
+ 	{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
+ 	{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
+ 	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },
+@@ -881,6 +883,8 @@ static struct usb_device_id id_table_combined [] = {
+ 	{ USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
++	/* Crucible Devices */
++	{ USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
+ 	{ },					/* Optional parameter entry */
+ 	{ }					/* Terminating entry */
+ };
+@@ -1886,24 +1890,22 @@ static void ftdi_dtr_rts(struct usb_serial_port *port, int on)
+ {
+ 	struct ftdi_private *priv = usb_get_serial_port_data(port);
+ 
+-	mutex_lock(&port->serial->disc_mutex);
+-	if (!port->serial->disconnected) {
+-		/* Disable flow control */
+-		if (!on && usb_control_msg(port->serial->dev,
++	/* Disable flow control */
++	if (!on) {
++		if (usb_control_msg(port->serial->dev,
+ 			    usb_sndctrlpipe(port->serial->dev, 0),
+ 			    FTDI_SIO_SET_FLOW_CTRL_REQUEST,
+ 			    FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
+ 			    0, priv->interface, NULL, 0,
+ 			    WDR_TIMEOUT) < 0) {
+-			    dev_err(&port->dev, "error from flowcontrol urb\n");
++			dev_err(&port->dev, "error from flowcontrol urb\n");
+ 		}
+-		/* drop RTS and DTR */
+-		if (on)
+-			set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+-		else
+-			clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+ 	}
+-	mutex_unlock(&port->serial->disc_mutex);
++	/* drop RTS and DTR */
++	if (on)
++		set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
++	else
++		clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+ }
+ 
+ /*
+diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
+index 049b6e7..9d359e1 100644
+--- a/drivers/usb/serial/ftdi_sio_ids.h
++++ b/drivers/usb/serial/ftdi_sio_ids.h
+@@ -147,6 +147,11 @@
+ #define XSENS_CONVERTER_6_PID	0xD38E
+ #define XSENS_CONVERTER_7_PID	0xD38F
+ 
++/**
++ * Zolix (www.zolix.com.cb) product ids
++ */
++#define FTDI_OMNI1509			0xD491	/* Omni1509 embedded USB-serial */
++
+ /*
+  * NDI (www.ndigital.com) product ids
+  */
+@@ -204,7 +209,7 @@
+ 
+ /*
+  * ELV USB devices submitted by Christian Abt of ELV (www.elv.de).
+- * All of these devices use FTDI's vendor ID (0x0403).
++ * Almost all of these devices use FTDI's vendor ID (0x0403).
+  * Further IDs taken from ELV Windows .inf file.
+  *
+  * The previously included PID for the UO 100 module was incorrect.
+@@ -212,6 +217,8 @@
+  *
+  * Armin Laeuger originally sent the PID for the UM 100 module.
+  */
++#define FTDI_ELV_VID	0x1B1F	/* ELV AG */
++#define FTDI_ELV_WS300_PID	0xC006	/* eQ3 WS 300 PC II */
+ #define FTDI_ELV_USR_PID	0xE000	/* ELV Universal-Sound-Recorder */
+ #define FTDI_ELV_MSM1_PID	0xE001	/* ELV Mini-Sound-Modul */
+ #define FTDI_ELV_KL100_PID	0xE002	/* ELV Kfz-Leistungsmesser KL 100 */
+@@ -1259,3 +1266,9 @@
+  * ATI command output: Cinterion MC55i
+  */
+ #define FTDI_CINTERION_MC55I_PID	0xA951
++
++/*
++ * Product: Comet Caller ID decoder
++ * Manufacturer: Crucible Technologies
++ */
++#define FTDI_CT_COMET_PID	0x8e08
+diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
+index c088250..7e4ef87 100644
+--- a/drivers/usb/serial/mct_u232.c
++++ b/drivers/usb/serial/mct_u232.c
+@@ -507,19 +507,15 @@ static void mct_u232_dtr_rts(struct usb_serial_port *port, int on)
+ 	unsigned int control_state;
+ 	struct mct_u232_private *priv = usb_get_serial_port_data(port);
+ 
+-	mutex_lock(&port->serial->disc_mutex);
+-	if (!port->serial->disconnected) {
+-		/* drop DTR and RTS */
+-		spin_lock_irq(&priv->lock);
+-		if (on)
+-			priv->control_state |= TIOCM_DTR | TIOCM_RTS;
+-		else
+-			priv->control_state &= ~(TIOCM_DTR | TIOCM_RTS);
+-		control_state = priv->control_state;
+-		spin_unlock_irq(&priv->lock);
+-		mct_u232_set_modem_ctrl(port->serial, control_state);
+-	}
+-	mutex_unlock(&port->serial->disc_mutex);
++	spin_lock_irq(&priv->lock);
++	if (on)
++		priv->control_state |= TIOCM_DTR | TIOCM_RTS;
++	else
++		priv->control_state &= ~(TIOCM_DTR | TIOCM_RTS);
++	control_state = priv->control_state;
++	spin_unlock_irq(&priv->lock);
++
++	mct_u232_set_modem_ctrl(port, control_state);
+ }
+ 
+ static void mct_u232_close(struct usb_serial_port *port)
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
+index 56fed62..b8f2e3b 100644
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -243,6 +243,7 @@ static void option_instat_callback(struct urb *urb);
+ #define TELIT_PRODUCT_CC864_DUAL		0x1005
+ #define TELIT_PRODUCT_CC864_SINGLE		0x1006
+ #define TELIT_PRODUCT_DE910_DUAL		0x1010
++#define TELIT_PRODUCT_LE920			0x1200
+ 
+ /* ZTE PRODUCTS */
+ #define ZTE_VENDOR_ID				0x19d2
+@@ -289,6 +290,7 @@ static void option_instat_callback(struct urb *urb);
+ #define ALCATEL_VENDOR_ID			0x1bbb
+ #define ALCATEL_PRODUCT_X060S_X200		0x0000
+ #define ALCATEL_PRODUCT_X220_X500D		0x0017
++#define ALCATEL_PRODUCT_L100V			0x011e
+ 
+ #define PIRELLI_VENDOR_ID			0x1266
+ #define PIRELLI_PRODUCT_C100_1			0x1002
+@@ -430,9 +432,12 @@ static void option_instat_callback(struct urb *urb);
+ #define MEDIATEK_VENDOR_ID			0x0e8d
+ #define MEDIATEK_PRODUCT_DC_1COM		0x00a0
+ #define MEDIATEK_PRODUCT_DC_4COM		0x00a5
++#define MEDIATEK_PRODUCT_DC_4COM2		0x00a7
+ #define MEDIATEK_PRODUCT_DC_5COM		0x00a4
+ #define MEDIATEK_PRODUCT_7208_1COM		0x7101
+ #define MEDIATEK_PRODUCT_7208_2COM		0x7102
++#define MEDIATEK_PRODUCT_7103_2COM		0x7103
++#define MEDIATEK_PRODUCT_7106_2COM		0x7106
+ #define MEDIATEK_PRODUCT_FP_1COM		0x0003
+ #define MEDIATEK_PRODUCT_FP_2COM		0x0023
+ #define MEDIATEK_PRODUCT_FPDC_1COM		0x0043
+@@ -442,6 +447,18 @@ static void option_instat_callback(struct urb *urb);
+ #define CELLIENT_VENDOR_ID			0x2692
+ #define CELLIENT_PRODUCT_MEN200			0x9005
+ 
++/* Hyundai Petatel Inc. products */
++#define PETATEL_VENDOR_ID			0x1ff4
++#define PETATEL_PRODUCT_NP10T			0x600e
++
++/* TP-LINK Incorporated products */
++#define TPLINK_VENDOR_ID			0x2357
++#define TPLINK_PRODUCT_MA180			0x0201
++
++/* Changhong products */
++#define CHANGHONG_VENDOR_ID			0x2077
++#define CHANGHONG_PRODUCT_CH690			0x7001
++
+ /* some devices interfaces need special handling due to a number of reasons */
+ enum option_blacklist_reason {
+ 		OPTION_BLACKLIST_NONE = 0,
+@@ -463,6 +480,7 @@ static const struct option_blacklist_info four_g_w14_blacklist = {
+ 
+ static const struct option_blacklist_info alcatel_x200_blacklist = {
+ 	.sendsetup = BIT(0) | BIT(1),
++	.reserved = BIT(4),
+ };
+ 
+ static const struct option_blacklist_info zte_0037_blacklist = {
+@@ -523,6 +541,11 @@ static const struct option_blacklist_info zte_1255_blacklist = {
+ 	.reserved = BIT(3) | BIT(4),
+ };
+ 
++static const struct option_blacklist_info telit_le920_blacklist = {
++	.sendsetup = BIT(0),
++	.reserved = BIT(1) | BIT(5),
++};
++
+ static const struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
+ 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
+@@ -554,8 +577,14 @@ static const struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
+ 	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
+ 	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
++	{ USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
++		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
++	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),
+ 		.driver_info = (kernel_ulong_t) &net_intf1_blacklist },
++	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
+ 		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
+@@ -773,6 +802,8 @@ static const struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_DUAL) },
+ 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) },
+ 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) },
++	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),
++		.driver_info = (kernel_ulong_t)&telit_le920_blacklist },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
+ 		.driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+@@ -923,8 +954,10 @@ static const struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */
+ 	  .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) },
+-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff), /* ONDA MT8205 */
++	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
++	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */
++	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff),
+ 	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+@@ -1190,7 +1223,16 @@ static const struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
+ 	  .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
+ 	},
+-	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) },
++	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
++	  .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
++	{ USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052),
++	  .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
++	{ USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6),
++	  .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
++	{ USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7),
++	  .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
++	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
++	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+ 	{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
+ 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
+ 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
+@@ -1295,7 +1337,15 @@ static const struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FP_2COM, 0x0a, 0x00, 0x00) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_1COM, 0x0a, 0x00, 0x00) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_2COM, 0x0a, 0x00, 0x00) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7103_2COM, 0xff, 0x00, 0x00) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7106_2COM, 0x02, 0x02, 0x01) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
+ 	{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
++	{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) },
++	{ USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180),
++	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
++	{ USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) },
+ 	{ } /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, option_ids);
+diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
+index 93232ca..071b529 100644
+--- a/drivers/usb/serial/qcserial.c
++++ b/drivers/usb/serial/qcserial.c
+@@ -55,6 +55,7 @@ static const struct usb_device_id id_table[] = {
+ 	{DEVICE_G1K(0x05c6, 0x9221)},	/* Generic Gobi QDL device */
+ 	{DEVICE_G1K(0x05c6, 0x9231)},	/* Generic Gobi QDL device */
+ 	{DEVICE_G1K(0x1f45, 0x0001)},	/* Unknown Gobi QDL device */
++	{DEVICE_G1K(0x1bc7, 0x900e)},	/* Telit Gobi QDL device */
+ 
+ 	/* Gobi 2000 devices */
+ 	{USB_DEVICE(0x1410, 0xa010)},	/* Novatel Gobi 2000 QDL device */
+diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
+index ea69301..cf50c43 100644
+--- a/drivers/usb/serial/quatech2.c
++++ b/drivers/usb/serial/quatech2.c
+@@ -949,19 +949,17 @@ static void qt2_dtr_rts(struct usb_serial_port *port, int on)
+ 	struct usb_device *dev = port->serial->dev;
+ 	struct qt2_port_private *port_priv = usb_get_serial_port_data(port);
+ 
+-	mutex_lock(&port->serial->disc_mutex);
+-	if (!port->serial->disconnected) {
+-		/* Disable flow control */
+-		if (!on && qt2_setregister(dev, port_priv->device_port,
++	/* Disable flow control */
++	if (!on) {
++		if (qt2_setregister(dev, port_priv->device_port,
+ 					   UART_MCR, 0) < 0)
+ 			dev_warn(&port->dev, "error from flowcontrol urb\n");
+-		/* drop RTS and DTR */
+-		if (on)
+-			update_mctrl(port_priv, TIOCM_DTR | TIOCM_RTS, 0);
+-		else
+-			update_mctrl(port_priv, 0, TIOCM_DTR | TIOCM_RTS);
+ 	}
+-	mutex_unlock(&port->serial->disc_mutex);
++	/* drop RTS and DTR */
++	if (on)
++		update_mctrl(port_priv, TIOCM_DTR | TIOCM_RTS, 0);
++	else
++		update_mctrl(port_priv, 0, TIOCM_DTR | TIOCM_RTS);
+ }
+ 
+ static void qt2_update_msr(struct usb_serial_port *port, unsigned char *ch)
+diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
+index cf6d149..7d43f69 100644
+--- a/drivers/usb/serial/sierra.c
++++ b/drivers/usb/serial/sierra.c
+@@ -863,19 +863,13 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
+ 
+ static void sierra_dtr_rts(struct usb_serial_port *port, int on)
+ {
+-	struct usb_serial *serial = port->serial;
+ 	struct sierra_port_private *portdata;
+ 
+ 	portdata = usb_get_serial_port_data(port);
+ 	portdata->rts_state = on;
+ 	portdata->dtr_state = on;
+ 
+-	if (serial->dev) {
+-		mutex_lock(&serial->disc_mutex);
+-		if (!serial->disconnected)
+-			sierra_send_setup(port);
+-		mutex_unlock(&serial->disc_mutex);
+-	}
++	sierra_send_setup(port);
+ }
+ 
+ static int sierra_startup(struct usb_serial *serial)
+diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
+index fe3a8a0..9a13ea2 100644
+--- a/drivers/usb/serial/ssu100.c
++++ b/drivers/usb/serial/ssu100.c
+@@ -510,19 +510,16 @@ static void ssu100_dtr_rts(struct usb_serial_port *port, int on)
+ {
+ 	struct usb_device *dev = port->serial->dev;
+ 
+-	mutex_lock(&port->serial->disc_mutex);
+-	if (!port->serial->disconnected) {
+-		/* Disable flow control */
+-		if (!on &&
+-		    ssu100_setregister(dev, 0, UART_MCR, 0) < 0)
++	/* Disable flow control */
++	if (!on) {
++		if (ssu100_setregister(dev, 0, UART_MCR, 0) < 0)
+ 			dev_err(&port->dev, "error from flowcontrol urb\n");
+-		/* drop RTS and DTR */
+-		if (on)
+-			set_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
+-		else
+-			clear_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
+ 	}
+-	mutex_unlock(&port->serial->disc_mutex);
++	/* drop RTS and DTR */
++	if (on)
++		set_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
++	else
++		clear_mctrl(dev, TIOCM_DTR | TIOCM_RTS);
+ }
+ 
+ static void ssu100_update_msr(struct usb_serial_port *port, u8 msr)
+diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
+index 667c39c..771adbd 100644
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
+@@ -688,10 +688,20 @@ static int serial_carrier_raised(struct tty_port *port)
+ static void serial_dtr_rts(struct tty_port *port, int on)
+ {
+ 	struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);
+-	struct usb_serial_driver *drv = p->serial->type;
++	struct usb_serial *serial = p->serial;
++	struct usb_serial_driver *drv = serial->type;
+ 
+-	if (drv->dtr_rts)
++	if (!drv->dtr_rts)
++		return;
++	/*
++	 * Work-around bug in the tty-layer which can result in dtr_rts
++	 * being called after a disconnect (and tty_unregister_device
++	 * has returned). Remove once bug has been squashed.
++	 */
++	mutex_lock(&serial->disc_mutex);
++	if (!serial->disconnected)
+ 		drv->dtr_rts(p, on);
++	mutex_unlock(&serial->disc_mutex);
+ }
+ 
+ static const struct tty_port_operations serial_port_ops = {
+diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
+index 188b5b3..e9031a4 100644
+--- a/drivers/usb/serial/usb_wwan.c
++++ b/drivers/usb/serial/usb_wwan.c
+@@ -41,7 +41,6 @@ static bool debug;
+ 
+ void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
+ {
+-	struct usb_serial *serial = port->serial;
+ 	struct usb_wwan_port_private *portdata;
+ 	struct usb_wwan_intf_private *intfdata;
+ 
+@@ -51,12 +50,11 @@ void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
+ 		return;
+ 
+ 	portdata = usb_get_serial_port_data(port);
+-	mutex_lock(&serial->disc_mutex);
++	/* FIXME: locking */
+ 	portdata->rts_state = on;
+ 	portdata->dtr_state = on;
+-	if (serial->dev)
+-		intfdata->send_setup(port);
+-	mutex_unlock(&serial->disc_mutex);
++
++	intfdata->send_setup(port);
+ }
+ EXPORT_SYMBOL(usb_wwan_dtr_rts);
+ 
+diff --git a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c
+index 105d900..7ab9046 100644
+--- a/drivers/usb/storage/initializers.c
++++ b/drivers/usb/storage/initializers.c
+@@ -92,8 +92,8 @@ int usb_stor_ucr61s2b_init(struct us_data *us)
+ 	return 0;
+ }
+ 
+-/* This places the HUAWEI E220 devices in multi-port mode */
+-int usb_stor_huawei_e220_init(struct us_data *us)
++/* This places the HUAWEI usb dongles in multi-port mode */
++static int usb_stor_huawei_feature_init(struct us_data *us)
+ {
+ 	int result;
+ 
+@@ -104,3 +104,75 @@ int usb_stor_huawei_e220_init(struct us_data *us)
+ 	US_DEBUGP("Huawei mode set result is %d\n", result);
+ 	return 0;
+ }
++
++/*
++ * It will send a scsi switch command called rewind' to huawei dongle.
++ * When the dongle receives this command at the first time,
++ * it will reboot immediately. After rebooted, it will ignore this command.
++ * So it is  unnecessary to read its response.
++ */
++static int usb_stor_huawei_scsi_init(struct us_data *us)
++{
++	int result = 0;
++	int act_len = 0;
++	struct bulk_cb_wrap *bcbw = (struct bulk_cb_wrap *) us->iobuf;
++	char rewind_cmd[] = {0x11, 0x06, 0x20, 0x00, 0x00, 0x01, 0x01, 0x00,
++			0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
++
++	bcbw->Signature = cpu_to_le32(US_BULK_CB_SIGN);
++	bcbw->Tag = 0;
++	bcbw->DataTransferLength = 0;
++	bcbw->Flags = bcbw->Lun = 0;
++	bcbw->Length = sizeof(rewind_cmd);
++	memset(bcbw->CDB, 0, sizeof(bcbw->CDB));
++	memcpy(bcbw->CDB, rewind_cmd, sizeof(rewind_cmd));
++
++	result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe, bcbw,
++					US_BULK_CB_WRAP_LEN, &act_len);
++	US_DEBUGP("transfer actual length=%d, result=%d\n", act_len, result);
++	return result;
++}
++
++/*
++ * It tries to find the supported Huawei USB dongles.
++ * In Huawei, they assign the following product IDs
++ * for all of their mobile broadband dongles,
++ * including the new dongles in the future.
++ * So if the product ID is not included in this list,
++ * it means it is not Huawei's mobile broadband dongles.
++ */
++static int usb_stor_huawei_dongles_pid(struct us_data *us)
++{
++	struct usb_interface_descriptor *idesc;
++	int idProduct;
++
++	idesc = &us->pusb_intf->cur_altsetting->desc;
++	idProduct = le16_to_cpu(us->pusb_dev->descriptor.idProduct);
++	/* The first port is CDROM,
++	 * means the dongle in the single port mode,
++	 * and a switch command is required to be sent. */
++	if (idesc && idesc->bInterfaceNumber == 0) {
++		if ((idProduct == 0x1001)
++			|| (idProduct == 0x1003)
++			|| (idProduct == 0x1004)
++			|| (idProduct >= 0x1401 && idProduct <= 0x1500)
++			|| (idProduct >= 0x1505 && idProduct <= 0x1600)
++			|| (idProduct >= 0x1c02 && idProduct <= 0x2202)) {
++			return 1;
++		}
++	}
++	return 0;
++}
++
++int usb_stor_huawei_init(struct us_data *us)
++{
++	int result = 0;
++
++	if (usb_stor_huawei_dongles_pid(us)) {
++		if (le16_to_cpu(us->pusb_dev->descriptor.idProduct) >= 0x1446)
++			result = usb_stor_huawei_scsi_init(us);
++		else
++			result = usb_stor_huawei_feature_init(us);
++	}
++	return result;
++}
+diff --git a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h
+index 529327f..5376d4f 100644
+--- a/drivers/usb/storage/initializers.h
++++ b/drivers/usb/storage/initializers.h
+@@ -46,5 +46,5 @@ int usb_stor_euscsi_init(struct us_data *us);
+  * flash reader */
+ int usb_stor_ucr61s2b_init(struct us_data *us);
+ 
+-/* This places the HUAWEI E220 devices in multi-port mode */
+-int usb_stor_huawei_e220_init(struct us_data *us);
++/* This places the HUAWEI usb dongles in multi-port mode */
++int usb_stor_huawei_init(struct us_data *us);
+diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
+index 2c85530..65a6a75 100644
+--- a/drivers/usb/storage/unusual_cypress.h
++++ b/drivers/usb/storage/unusual_cypress.h
+@@ -31,7 +31,7 @@ UNUSUAL_DEV(  0x04b4, 0x6831, 0x0000, 0x9999,
+ 		"Cypress ISD-300LP",
+ 		USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
+ 
+-UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999,
++UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219,
+ 		"Super Top",
+ 		"USB 2.0  SATA BRIDGE",
+ 		USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
+diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
+index 8f98c9a..3be55cf 100644
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1527,335 +1527,10 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x0100,
+ /* Reported by fangxiaozhi <huananhu@huawei.com>
+  * This brings the HUAWEI data card devices into multi-port mode
+  */
+-UNUSUAL_DEV(  0x12d1, 0x1001, 0x0000, 0x0000,
++UNUSUAL_VENDOR_INTF(0x12d1, 0x08, 0x06, 0x50,
+ 		"HUAWEI MOBILE",
+ 		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1003, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1004, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1401, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1402, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1403, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1404, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1405, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1406, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1407, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1408, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1409, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x140A, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x140B, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x140C, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x140D, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x140E, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x140F, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1410, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1411, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1412, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1413, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1414, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1415, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1416, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1417, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1418, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1419, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x141A, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x141B, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x141C, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x141D, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x141E, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x141F, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1420, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1421, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1422, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1423, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1424, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1425, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1426, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1427, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1428, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1429, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x142A, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x142B, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x142C, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x142D, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x142E, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x142F, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1430, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1431, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1432, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1433, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1434, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1435, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1436, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1437, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1438, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x1439, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x143A, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x143B, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x143C, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x143D, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x143E, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
+-		0),
+-UNUSUAL_DEV(  0x12d1, 0x143F, 0x0000, 0x0000,
+-		"HUAWEI MOBILE",
+-		"Mass Storage",
+-		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_e220_init,
++		USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_huawei_init,
+ 		0),
+ 
+ /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
+diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
+index d012fe4..c34373e 100644
+--- a/drivers/usb/storage/usb.c
++++ b/drivers/usb/storage/usb.c
+@@ -120,6 +120,17 @@ MODULE_PARM_DESC(quirks, "supplemental list of device IDs and their quirks");
+ 	.useTransport = use_transport,	\
+ }
+ 
++#define UNUSUAL_VENDOR_INTF(idVendor, cl, sc, pr, \
++		vendor_name, product_name, use_protocol, use_transport, \
++		init_function, Flags) \
++{ \
++	.vendorName = vendor_name,	\
++	.productName = product_name,	\
++	.useProtocol = use_protocol,	\
++	.useTransport = use_transport,	\
++	.initFunction = init_function,	\
++}
++
+ static struct us_unusual_dev us_unusual_dev_list[] = {
+ #	include "unusual_devs.h"
+ 	{ }		/* Terminating entry */
+@@ -131,6 +142,7 @@ static struct us_unusual_dev for_dynamic_ids =
+ #undef UNUSUAL_DEV
+ #undef COMPLIANT_DEV
+ #undef USUAL_DEV
++#undef UNUSUAL_VENDOR_INTF
+ 
+ #ifdef CONFIG_LOCKDEP
+ 
+diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c
+index b969279..a9b5f2e 100644
+--- a/drivers/usb/storage/usual-tables.c
++++ b/drivers/usb/storage/usual-tables.c
+@@ -46,6 +46,20 @@
+ { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \
+   .driver_info = ((useType)<<24) }
+ 
++/* Define the device is matched with Vendor ID and interface descriptors */
++#define UNUSUAL_VENDOR_INTF(id_vendor, cl, sc, pr, \
++			vendorName, productName, useProtocol, useTransport, \
++			initFunction, flags) \
++{ \
++	.match_flags = USB_DEVICE_ID_MATCH_INT_INFO \
++				| USB_DEVICE_ID_MATCH_VENDOR, \
++	.idVendor    = (id_vendor), \
++	.bInterfaceClass = (cl), \
++	.bInterfaceSubClass = (sc), \
++	.bInterfaceProtocol = (pr), \
++	.driver_info = (flags) \
++}
++
+ struct usb_device_id usb_storage_usb_ids[] = {
+ #	include "unusual_devs.h"
+ 	{ }		/* Terminating entry */
+@@ -57,6 +71,7 @@ MODULE_DEVICE_TABLE(usb, usb_storage_usb_ids);
+ #undef UNUSUAL_DEV
+ #undef COMPLIANT_DEV
+ #undef USUAL_DEV
++#undef UNUSUAL_VENDOR_INTF
+ 
+ 
+ /*
+diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
+index ef82a0d..fd38945 100644
+--- a/drivers/vhost/vhost.c
++++ b/drivers/vhost/vhost.c
+@@ -1076,7 +1076,7 @@ static int translate_desc(struct vhost_dev *dev, u64 addr, u32 len,
+ 		}
+ 		_iov = iov + ret;
+ 		size = reg->memory_size - addr + reg->guest_phys_addr;
+-		_iov->iov_len = min((u64)len, size);
++		_iov->iov_len = min((u64)len - s, size);
+ 		_iov->iov_base = (void __user *)(unsigned long)
+ 			(reg->userspace_addr + addr - reg->guest_phys_addr);
+ 		s += size;
+diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
+index 77d1fdb..716daaa 100644
+--- a/drivers/video/backlight/adp8860_bl.c
++++ b/drivers/video/backlight/adp8860_bl.c
+@@ -783,7 +783,7 @@ static int adp8860_i2c_suspend(struct i2c_client *client, pm_message_t message)
+ 
+ static int adp8860_i2c_resume(struct i2c_client *client)
+ {
+-	adp8860_set_bits(client, ADP8860_MDCR, NSTBY);
++	adp8860_set_bits(client, ADP8860_MDCR, NSTBY | BLEN);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
+index edf7f91..f58a189 100644
+--- a/drivers/video/backlight/adp8870_bl.c
++++ b/drivers/video/backlight/adp8870_bl.c
+@@ -957,7 +957,7 @@ static int adp8870_i2c_suspend(struct i2c_client *client, pm_message_t message)
+ 
+ static int adp8870_i2c_resume(struct i2c_client *client)
+ {
+-	adp8870_set_bits(client, ADP8870_MDCR, NSTBY);
++	adp8870_set_bits(client, ADP8870_MDCR, NSTBY | BLEN);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index fdefa8f..0d4c192 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -529,6 +529,33 @@ static int search_for_mapped_con(void)
+ 	return retval;
+ }
+ 
++static int do_fbcon_takeover(int show_logo)
++{
++	int err, i;
++
++	if (!num_registered_fb)
++		return -ENODEV;
++
++	if (!show_logo)
++		logo_shown = FBCON_LOGO_DONTSHOW;
++
++	for (i = first_fb_vc; i <= last_fb_vc; i++)
++		con2fb_map[i] = info_idx;
++
++	err = do_take_over_console(&fb_con, first_fb_vc, last_fb_vc,
++				fbcon_is_default);
++
++	if (err) {
++		for (i = first_fb_vc; i <= last_fb_vc; i++)
++			con2fb_map[i] = -1;
++		info_idx = -1;
++	} else {
++		fbcon_has_console_bind = 1;
++	}
++
++	return err;
++}
++
+ static int fbcon_takeover(int show_logo)
+ {
+ 	int err, i;
+@@ -990,7 +1017,7 @@ static const char *fbcon_startup(void)
+ 	}
+ 
+ 	/* Setup default font */
+-	if (!p->fontdata) {
++	if (!p->fontdata && !vc->vc_font.data) {
+ 		if (!fontname[0] || !(font = find_font(fontname)))
+ 			font = get_default_font(info->var.xres,
+ 						info->var.yres,
+@@ -1000,6 +1027,8 @@ static const char *fbcon_startup(void)
+ 		vc->vc_font.height = font->height;
+ 		vc->vc_font.data = (void *)(p->fontdata = font->data);
+ 		vc->vc_font.charcount = 256; /* FIXME  Need to support more fonts */
++	} else {
++		p->fontdata = vc->vc_font.data;
+ 	}
+ 
+ 	cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
+@@ -1159,9 +1188,9 @@ static void fbcon_init(struct vc_data *vc, int init)
+ 	ops->p = &fb_display[fg_console];
+ }
+ 
+-static void fbcon_free_font(struct display *p)
++static void fbcon_free_font(struct display *p, bool freefont)
+ {
+-	if (p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
++	if (freefont && p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
+ 		kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int));
+ 	p->fontdata = NULL;
+ 	p->userfont = 0;
+@@ -1173,8 +1202,8 @@ static void fbcon_deinit(struct vc_data *vc)
+ 	struct fb_info *info;
+ 	struct fbcon_ops *ops;
+ 	int idx;
++	bool free_font = true;
+ 
+-	fbcon_free_font(p);
+ 	idx = con2fb_map[vc->vc_num];
+ 
+ 	if (idx == -1)
+@@ -1185,6 +1214,8 @@ static void fbcon_deinit(struct vc_data *vc)
+ 	if (!info)
+ 		goto finished;
+ 
++	if (info->flags & FBINFO_MISC_FIRMWARE)
++		free_font = false;
+ 	ops = info->fbcon_par;
+ 
+ 	if (!ops)
+@@ -1196,6 +1227,8 @@ static void fbcon_deinit(struct vc_data *vc)
+ 	ops->flags &= ~FBCON_FLAGS_INIT;
+ finished:
+ 
++	fbcon_free_font(p, free_font);
++
+ 	if (!con_is_bound(&fb_con))
+ 		fbcon_exit();
+ 
+@@ -2977,7 +3010,7 @@ static int fbcon_unbind(void)
+ {
+ 	int ret;
+ 
+-	ret = unbind_con_driver(&fb_con, first_fb_vc, last_fb_vc,
++	ret = do_unbind_con_driver(&fb_con, first_fb_vc, last_fb_vc,
+ 				fbcon_is_default);
+ 
+ 	if (!ret)
+@@ -3050,7 +3083,7 @@ static int fbcon_fb_unregistered(struct fb_info *info)
+ 		primary_device = -1;
+ 
+ 	if (!num_registered_fb)
+-		unregister_con_driver(&fb_con);
++		do_unregister_con_driver(&fb_con);
+ 
+ 	return 0;
+ }
+@@ -3115,7 +3148,7 @@ static int fbcon_fb_registered(struct fb_info *info)
+ 		}
+ 
+ 		if (info_idx != -1)
+-			ret = fbcon_takeover(1);
++			ret = do_fbcon_takeover(1);
+ 	} else {
+ 		for (i = first_fb_vc; i <= last_fb_vc; i++) {
+ 			if (con2fb_map_boot[i] == idx)
+diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
+index d449a74..5855d17 100644
+--- a/drivers/video/console/vgacon.c
++++ b/drivers/video/console/vgacon.c
+@@ -1064,7 +1064,7 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
+ 	unsigned short video_port_status = vga_video_port_reg + 6;
+ 	int font_select = 0x00, beg, i;
+ 	char *charmap;
+-	
++	bool clear_attribs = false;
+ 	if (vga_video_type != VIDEO_TYPE_EGAM) {
+ 		charmap = (char *) VGA_MAP_MEM(colourmap, 0);
+ 		beg = 0x0e;
+@@ -1169,12 +1169,6 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
+ 
+ 	/* if 512 char mode is already enabled don't re-enable it. */
+ 	if ((set) && (ch512 != vga_512_chars)) {
+-		/* attribute controller */
+-		for (i = 0; i < MAX_NR_CONSOLES; i++) {
+-			struct vc_data *c = vc_cons[i].d;
+-			if (c && c->vc_sw == &vga_con)
+-				c->vc_hi_font_mask = ch512 ? 0x0800 : 0;
+-		}
+ 		vga_512_chars = ch512;
+ 		/* 256-char: enable intensity bit
+ 		   512-char: disable intensity bit */
+@@ -1185,8 +1179,22 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
+ 		   it means, but it works, and it appears necessary */
+ 		inb_p(video_port_status);
+ 		vga_wattr(state->vgabase, VGA_AR_ENABLE_DISPLAY, 0);	
++		clear_attribs = true;
+ 	}
+ 	raw_spin_unlock_irq(&vga_lock);
++
++	if (clear_attribs) {
++		for (i = 0; i < MAX_NR_CONSOLES; i++) {
++			struct vc_data *c = vc_cons[i].d;
++			if (c && c->vc_sw == &vga_con) {
++				/* force hi font mask to 0, so we always clear
++				   the bit on either transition */
++				c->vc_hi_font_mask = 0x00;
++				clear_buffer_attributes(c);
++				c->vc_hi_font_mask = ch512 ? 0x0800 : 0;
++			}
++		}
++	}
+ 	return 0;
+ }
+ 
+diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
+index 0dff12a..afa804f 100644
+--- a/drivers/video/fbmem.c
++++ b/drivers/video/fbmem.c
+@@ -1651,7 +1651,9 @@ static int do_register_framebuffer(struct fb_info *fb_info)
+ 	event.info = fb_info;
+ 	if (!lock_fb_info(fb_info))
+ 		return -ENODEV;
++	console_lock();
+ 	fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
++	console_unlock();
+ 	unlock_fb_info(fb_info);
+ 	return 0;
+ }
+@@ -1667,8 +1669,10 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
+ 
+ 	if (!lock_fb_info(fb_info))
+ 		return -ENODEV;
++	console_lock();
+ 	event.info = fb_info;
+ 	ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
++	console_unlock();
+ 	unlock_fb_info(fb_info);
+ 
+ 	if (ret)
+@@ -1683,7 +1687,9 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
+ 	num_registered_fb--;
+ 	fb_cleanup_device(fb_info);
+ 	event.info = fb_info;
++	console_lock();
+ 	fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
++	console_unlock();
+ 
+ 	/* this may free fb info */
+ 	put_fb_info(fb_info);
+@@ -1854,11 +1860,8 @@ int fb_new_modelist(struct fb_info *info)
+ 	err = 1;
+ 
+ 	if (!list_empty(&info->modelist)) {
+-		if (!lock_fb_info(info))
+-			return -ENODEV;
+ 		event.info = info;
+ 		err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
+-		unlock_fb_info(info);
+ 	}
+ 
+ 	return err;
+diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
+index a55e366..ef476b0 100644
+--- a/drivers/video/fbsysfs.c
++++ b/drivers/video/fbsysfs.c
+@@ -177,6 +177,8 @@ static ssize_t store_modes(struct device *device,
+ 	if (i * sizeof(struct fb_videomode) != count)
+ 		return -EINVAL;
+ 
++	if (!lock_fb_info(fb_info))
++		return -ENODEV;
+ 	console_lock();
+ 	list_splice(&fb_info->modelist, &old_list);
+ 	fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
+@@ -188,6 +190,7 @@ static ssize_t store_modes(struct device *device,
+ 		fb_destroy_modelist(&old_list);
+ 
+ 	console_unlock();
++	unlock_fb_info(fb_info);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
+index 458c006..dbce2da 100644
+--- a/drivers/video/fsl-diu-fb.c
++++ b/drivers/video/fsl-diu-fb.c
+@@ -922,7 +922,7 @@ static u32 fsl_diu_get_pixel_format(unsigned int bits_per_pixel)
+ #define PF_COMP_0_MASK		0x0000000F
+ #define PF_COMP_0_SHIFT		0
+ 
+-#define MAKE_PF(alpha, red, blue, green, size, c0, c1, c2, c3) \
++#define MAKE_PF(alpha, red, green, blue, size, c0, c1, c2, c3) \
+ 	cpu_to_le32(PF_BYTE_F | (alpha << PF_ALPHA_C_SHIFT) | \
+ 	(blue << PF_BLUE_C_SHIFT) | (green << PF_GREEN_C_SHIFT) | \
+ 	(red << PF_RED_C_SHIFT) | (c3 << PF_COMP_3_SHIFT) | \
+@@ -932,10 +932,10 @@ static u32 fsl_diu_get_pixel_format(unsigned int bits_per_pixel)
+ 	switch (bits_per_pixel) {
+ 	case 32:
+ 		/* 0x88883316 */
+-		return MAKE_PF(3, 2, 0, 1, 3, 8, 8, 8, 8);
++		return MAKE_PF(3, 2, 1, 0, 3, 8, 8, 8, 8);
+ 	case 24:
+ 		/* 0x88082219 */
+-		return MAKE_PF(4, 0, 1, 2, 2, 0, 8, 8, 8);
++		return MAKE_PF(4, 0, 1, 2, 2, 8, 8, 8, 0);
+ 	case 16:
+ 		/* 0x65053118 */
+ 		return MAKE_PF(4, 2, 1, 0, 1, 5, 6, 5, 0);
+diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
+index 49619b4..f2a49ef 100644
+--- a/drivers/video/mxsfb.c
++++ b/drivers/video/mxsfb.c
+@@ -369,7 +369,8 @@ static void mxsfb_disable_controller(struct fb_info *fb_info)
+ 		loop--;
+ 	}
+ 
+-	writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR);
++	reg = readl(host->base + LCDC_VDCTRL4);
++	writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4);
+ 
+ 	clk_disable_unprepare(host->clk);
+ 
+diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
+index 5aa43c3..52bfd07 100644
+--- a/drivers/virtio/virtio_ring.c
++++ b/drivers/virtio/virtio_ring.c
+@@ -132,6 +132,13 @@ static int vring_add_indirect(struct vring_virtqueue *vq,
+ 	unsigned head;
+ 	int i;
+ 
++	/*
++	 * We require lowmem mappings for the descriptors because
++	 * otherwise virt_to_phys will give us bogus addresses in the
++	 * virtqueue.
++	 */
++	gfp &= ~(__GFP_HIGHMEM | __GFP_HIGH);
++
+ 	desc = kmalloc((out + in) * sizeof(struct vring_desc), gfp);
+ 	if (!desc)
+ 		return -ENOMEM;
+diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
+index b1f60a0..b2db77e 100644
+--- a/drivers/xen/evtchn.c
++++ b/drivers/xen/evtchn.c
+@@ -269,6 +269,14 @@ static int evtchn_bind_to_user(struct per_user_data *u, int port)
+ 				       u->name, (void *)(unsigned long)port);
+ 	if (rc >= 0)
+ 		rc = evtchn_make_refcounted(port);
++	else {
++		/* bind failed, should close the port now */
++		struct evtchn_close close;
++		close.port = port;
++		if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
++			BUG();
++		set_port_user(port, NULL);
++	}
+ 
+ 	return rc;
+ }
+@@ -277,6 +285,8 @@ static void evtchn_unbind_from_user(struct per_user_data *u, int port)
+ {
+ 	int irq = irq_from_evtchn(port);
+ 
++	BUG_ON(irq < 0);
++
+ 	unbind_from_irqhandler(irq, (void *)(unsigned long)port);
+ 
+ 	set_port_user(port, NULL);
+diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
+index 0067266..22be735 100644
+--- a/drivers/xen/grant-table.c
++++ b/drivers/xen/grant-table.c
+@@ -54,10 +54,6 @@
+ /* External tools reserve first few grant table entries. */
+ #define NR_RESERVED_ENTRIES 8
+ #define GNTTAB_LIST_END 0xffffffff
+-#define GREFS_PER_GRANT_FRAME \
+-(grant_table_version == 1 ?                      \
+-(PAGE_SIZE / sizeof(struct grant_entry_v1)) :   \
+-(PAGE_SIZE / sizeof(union grant_entry_v2)))
+ 
+ static grant_ref_t **gnttab_list;
+ static unsigned int nr_grant_frames;
+@@ -152,6 +148,7 @@ static struct gnttab_ops *gnttab_interface;
+ static grant_status_t *grstatus;
+ 
+ static int grant_table_version;
++static int grefs_per_grant_frame;
+ 
+ static struct gnttab_free_callback *gnttab_free_callback_list;
+ 
+@@ -766,12 +763,14 @@ static int grow_gnttab_list(unsigned int more_frames)
+ 	unsigned int new_nr_grant_frames, extra_entries, i;
+ 	unsigned int nr_glist_frames, new_nr_glist_frames;
+ 
++	BUG_ON(grefs_per_grant_frame == 0);
++
+ 	new_nr_grant_frames = nr_grant_frames + more_frames;
+-	extra_entries       = more_frames * GREFS_PER_GRANT_FRAME;
++	extra_entries       = more_frames * grefs_per_grant_frame;
+ 
+-	nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
++	nr_glist_frames = (nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP;
+ 	new_nr_glist_frames =
+-		(new_nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
++		(new_nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP;
+ 	for (i = nr_glist_frames; i < new_nr_glist_frames; i++) {
+ 		gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC);
+ 		if (!gnttab_list[i])
+@@ -779,12 +778,12 @@ static int grow_gnttab_list(unsigned int more_frames)
+ 	}
+ 
+ 
+-	for (i = GREFS_PER_GRANT_FRAME * nr_grant_frames;
+-	     i < GREFS_PER_GRANT_FRAME * new_nr_grant_frames - 1; i++)
++	for (i = grefs_per_grant_frame * nr_grant_frames;
++	     i < grefs_per_grant_frame * new_nr_grant_frames - 1; i++)
+ 		gnttab_entry(i) = i + 1;
+ 
+ 	gnttab_entry(i) = gnttab_free_head;
+-	gnttab_free_head = GREFS_PER_GRANT_FRAME * nr_grant_frames;
++	gnttab_free_head = grefs_per_grant_frame * nr_grant_frames;
+ 	gnttab_free_count += extra_entries;
+ 
+ 	nr_grant_frames = new_nr_grant_frames;
+@@ -904,7 +903,8 @@ EXPORT_SYMBOL_GPL(gnttab_unmap_refs);
+ 
+ static unsigned nr_status_frames(unsigned nr_grant_frames)
+ {
+-	return (nr_grant_frames * GREFS_PER_GRANT_FRAME + SPP - 1) / SPP;
++	BUG_ON(grefs_per_grant_frame == 0);
++	return (nr_grant_frames * grefs_per_grant_frame + SPP - 1) / SPP;
+ }
+ 
+ static int gnttab_map_frames_v1(unsigned long *frames, unsigned int nr_gframes)
+@@ -1062,6 +1062,7 @@ static void gnttab_request_version(void)
+ 	rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1);
+ 	if (rc == 0 && gsv.version == 2) {
+ 		grant_table_version = 2;
++		grefs_per_grant_frame = PAGE_SIZE / sizeof(union grant_entry_v2);
+ 		gnttab_interface = &gnttab_v2_ops;
+ 	} else if (grant_table_version == 2) {
+ 		/*
+@@ -1074,17 +1075,17 @@ static void gnttab_request_version(void)
+ 		panic("we need grant tables version 2, but only version 1 is available");
+ 	} else {
+ 		grant_table_version = 1;
++		grefs_per_grant_frame = PAGE_SIZE / sizeof(struct grant_entry_v1);
+ 		gnttab_interface = &gnttab_v1_ops;
+ 	}
+ 	printk(KERN_INFO "Grant tables using version %d layout.\n",
+ 		grant_table_version);
+ }
+ 
+-int gnttab_resume(void)
++static int gnttab_setup(void)
+ {
+ 	unsigned int max_nr_gframes;
+ 
+-	gnttab_request_version();
+ 	max_nr_gframes = gnttab_max_grant_frames();
+ 	if (max_nr_gframes < nr_grant_frames)
+ 		return -ENOSYS;
+@@ -1107,6 +1108,12 @@ int gnttab_resume(void)
+ 	return 0;
+ }
+ 
++int gnttab_resume(void)
++{
++	gnttab_request_version();
++	return gnttab_setup();
++}
++
+ int gnttab_suspend(void)
+ {
+ 	gnttab_interface->unmap_frames();
+@@ -1118,9 +1125,10 @@ static int gnttab_expand(unsigned int req_entries)
+ 	int rc;
+ 	unsigned int cur, extra;
+ 
++	BUG_ON(grefs_per_grant_frame == 0);
+ 	cur = nr_grant_frames;
+-	extra = ((req_entries + (GREFS_PER_GRANT_FRAME-1)) /
+-		 GREFS_PER_GRANT_FRAME);
++	extra = ((req_entries + (grefs_per_grant_frame-1)) /
++		 grefs_per_grant_frame);
+ 	if (cur + extra > gnttab_max_grant_frames())
+ 		return -ENOSPC;
+ 
+@@ -1138,21 +1146,23 @@ int gnttab_init(void)
+ 	unsigned int nr_init_grefs;
+ 	int ret;
+ 
++	gnttab_request_version();
+ 	nr_grant_frames = 1;
+ 	boot_max_nr_grant_frames = __max_nr_grant_frames();
+ 
+ 	/* Determine the maximum number of frames required for the
+ 	 * grant reference free list on the current hypervisor.
+ 	 */
++	BUG_ON(grefs_per_grant_frame == 0);
+ 	max_nr_glist_frames = (boot_max_nr_grant_frames *
+-			       GREFS_PER_GRANT_FRAME / RPP);
++			       grefs_per_grant_frame / RPP);
+ 
+ 	gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *),
+ 			      GFP_KERNEL);
+ 	if (gnttab_list == NULL)
+ 		return -ENOMEM;
+ 
+-	nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
++	nr_glist_frames = (nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP;
+ 	for (i = 0; i < nr_glist_frames; i++) {
+ 		gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL);
+ 		if (gnttab_list[i] == NULL) {
+@@ -1161,12 +1171,12 @@ int gnttab_init(void)
+ 		}
+ 	}
+ 
+-	if (gnttab_resume() < 0) {
++	if (gnttab_setup() < 0) {
+ 		ret = -ENODEV;
+ 		goto ini_nomem;
+ 	}
+ 
+-	nr_init_grefs = nr_grant_frames * GREFS_PER_GRANT_FRAME;
++	nr_init_grefs = nr_grant_frames * grefs_per_grant_frame;
+ 
+ 	for (i = NR_RESERVED_ENTRIES; i < nr_init_grefs - 1; i++)
+ 		gnttab_entry(i) = i + 1;
+diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
+index 790b3cd..772428d 100644
+--- a/fs/binfmt_misc.c
++++ b/fs/binfmt_misc.c
+@@ -176,7 +176,10 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+ 		goto _error;
+ 	bprm->argc ++;
+ 
+-	bprm->interp = iname;	/* for binfmt_script */
++	/* Update interp in case binfmt_script needs it. */
++	retval = bprm_change_interp(iname, bprm);
++	if (retval < 0)
++		goto _error;
+ 
+ 	interp_file = open_exec (iname);
+ 	retval = PTR_ERR (interp_file);
+diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
+index d3b8c1f..df49d48 100644
+--- a/fs/binfmt_script.c
++++ b/fs/binfmt_script.c
+@@ -82,7 +82,9 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
+ 	retval = copy_strings_kernel(1, &i_name, bprm);
+ 	if (retval) return retval; 
+ 	bprm->argc++;
+-	bprm->interp = interp;
++	retval = bprm_change_interp(interp, bprm);
++	if (retval < 0)
++		return retval;
+ 
+ 	/*
+ 	 * OK, now restart the process with the interpreter's dentry.
+diff --git a/fs/block_dev.c b/fs/block_dev.c
+index 38e721b..2577cf4 100644
+--- a/fs/block_dev.c
++++ b/fs/block_dev.c
+@@ -1047,6 +1047,7 @@ int revalidate_disk(struct gendisk *disk)
+ 
+ 	mutex_lock(&bdev->bd_mutex);
+ 	check_disk_size_change(disk, bdev);
++	bdev->bd_invalidated = 0;
+ 	mutex_unlock(&bdev->bd_mutex);
+ 	bdput(bdev);
+ 	return ret;
+diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
+index 1ced2d8..a2e0b94 100644
+--- a/fs/ceph/addr.c
++++ b/fs/ceph/addr.c
+@@ -267,6 +267,14 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg)
+ 	kfree(req->r_pages);
+ }
+ 
++static void ceph_unlock_page_vector(struct page **pages, int num_pages)
++{
++	int i;
++
++	for (i = 0; i < num_pages; i++)
++		unlock_page(pages[i]);
++}
++
+ /*
+  * start an async read(ahead) operation.  return nr_pages we submitted
+  * a read for on success, or negative error code.
+@@ -308,8 +316,8 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
+ 				    NULL, 0,
+ 				    ci->i_truncate_seq, ci->i_truncate_size,
+ 				    NULL, false, 1, 0);
+-	if (!req)
+-		return -ENOMEM;
++	if (IS_ERR(req))
++		return PTR_ERR(req);
+ 
+ 	/* build page vector */
+ 	nr_pages = len >> PAGE_CACHE_SHIFT;
+@@ -347,6 +355,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
+ 	return nr_pages;
+ 
+ out_pages:
++	ceph_unlock_page_vector(pages, nr_pages);
+ 	ceph_release_page_vector(pages, nr_pages);
+ out:
+ 	ceph_osdc_put_request(req);
+@@ -831,8 +840,8 @@ get_more_pages:
+ 					    ci->i_truncate_size,
+ 					    &inode->i_mtime, true, 1, 0);
+ 
+-				if (!req) {
+-					rc = -ENOMEM;
++				if (IS_ERR(req)) {
++					rc = PTR_ERR(req);
+ 					unlock_page(page);
+ 					break;
+ 				}
+diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
+index 620daad..e7d4077 100644
+--- a/fs/ceph/caps.c
++++ b/fs/ceph/caps.c
+@@ -1349,11 +1349,15 @@ int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask)
+ 		if (!ci->i_head_snapc)
+ 			ci->i_head_snapc = ceph_get_snap_context(
+ 				ci->i_snap_realm->cached_context);
+-		dout(" inode %p now dirty snapc %p\n", &ci->vfs_inode,
+-			ci->i_head_snapc);
++		dout(" inode %p now dirty snapc %p auth cap %p\n",
++		     &ci->vfs_inode, ci->i_head_snapc, ci->i_auth_cap);
+ 		BUG_ON(!list_empty(&ci->i_dirty_item));
+ 		spin_lock(&mdsc->cap_dirty_lock);
+-		list_add(&ci->i_dirty_item, &mdsc->cap_dirty);
++		if (ci->i_auth_cap)
++			list_add(&ci->i_dirty_item, &mdsc->cap_dirty);
++		else
++			list_add(&ci->i_dirty_item,
++				 &mdsc->cap_dirty_migrating);
+ 		spin_unlock(&mdsc->cap_dirty_lock);
+ 		if (ci->i_flushing_caps == 0) {
+ 			ihold(inode);
+@@ -2388,7 +2392,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
+ 			    &atime);
+ 
+ 	/* max size increase? */
+-	if (max_size != ci->i_max_size) {
++	if (ci->i_auth_cap == cap && max_size != ci->i_max_size) {
+ 		dout("max_size %lld -> %llu\n", ci->i_max_size, max_size);
+ 		ci->i_max_size = max_size;
+ 		if (max_size >= ci->i_wanted_max_size) {
+@@ -2745,6 +2749,7 @@ static void handle_cap_import(struct ceph_mds_client *mdsc,
+ 
+ 	/* make sure we re-request max_size, if necessary */
+ 	spin_lock(&ci->i_ceph_lock);
++	ci->i_wanted_max_size = 0;  /* reset */
+ 	ci->i_requested_max_size = 0;
+ 	spin_unlock(&ci->i_ceph_lock);
+ }
+@@ -2840,8 +2845,6 @@ void ceph_handle_caps(struct ceph_mds_session *session,
+ 	case CEPH_CAP_OP_IMPORT:
+ 		handle_cap_import(mdsc, inode, h, session,
+ 				  snaptrace, snaptrace_len);
+-		ceph_check_caps(ceph_inode(inode), 0, session);
+-		goto done_unlocked;
+ 	}
+ 
+ 	/* the rest require a cap */
+@@ -2858,6 +2861,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
+ 	switch (op) {
+ 	case CEPH_CAP_OP_REVOKE:
+ 	case CEPH_CAP_OP_GRANT:
++	case CEPH_CAP_OP_IMPORT:
+ 		handle_cap_grant(inode, h, session, cap, msg->middle);
+ 		goto done_unlocked;
+ 
+diff --git a/fs/ceph/file.c b/fs/ceph/file.c
+index ecebbc0..5840d2a 100644
+--- a/fs/ceph/file.c
++++ b/fs/ceph/file.c
+@@ -536,8 +536,8 @@ more:
+ 				    do_sync,
+ 				    ci->i_truncate_seq, ci->i_truncate_size,
+ 				    &mtime, false, 2, page_align);
+-	if (!req)
+-		return -ENOMEM;
++	if (IS_ERR(req))
++		return PTR_ERR(req);
+ 
+ 	if (file->f_flags & O_DIRECT) {
+ 		pages = ceph_get_direct_page_vector(data, num_pages, false);
+diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
+index 4b5762e..81613bc 100644
+--- a/fs/ceph/inode.c
++++ b/fs/ceph/inode.c
+@@ -1466,7 +1466,7 @@ void __ceph_do_pending_vmtruncate(struct inode *inode)
+ {
+ 	struct ceph_inode_info *ci = ceph_inode(inode);
+ 	u64 to;
+-	int wrbuffer_refs, wake = 0;
++	int wrbuffer_refs, finish = 0;
+ 
+ retry:
+ 	spin_lock(&ci->i_ceph_lock);
+@@ -1498,15 +1498,18 @@ retry:
+ 	truncate_inode_pages(inode->i_mapping, to);
+ 
+ 	spin_lock(&ci->i_ceph_lock);
+-	ci->i_truncate_pending--;
+-	if (ci->i_truncate_pending == 0)
+-		wake = 1;
++	if (to == ci->i_truncate_size) {
++		ci->i_truncate_pending = 0;
++		finish = 1;
++	}
+ 	spin_unlock(&ci->i_ceph_lock);
++	if (!finish)
++		goto retry;
+ 
+ 	if (wrbuffer_refs == 0)
+ 		ceph_check_caps(ci, CHECK_CAPS_AUTHONLY, NULL);
+-	if (wake)
+-		wake_up_all(&ci->i_cap_wq);
++
++	wake_up_all(&ci->i_cap_wq);
+ }
+ 
+ 
+diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
+index 1bcf712..0d9864f 100644
+--- a/fs/ceph/mds_client.c
++++ b/fs/ceph/mds_client.c
+@@ -1876,9 +1876,14 @@ finish:
+ static void __wake_requests(struct ceph_mds_client *mdsc,
+ 			    struct list_head *head)
+ {
+-	struct ceph_mds_request *req, *nreq;
++	struct ceph_mds_request *req;
++	LIST_HEAD(tmp_list);
++
++	list_splice_init(head, &tmp_list);
+ 
+-	list_for_each_entry_safe(req, nreq, head, r_wait) {
++	while (!list_empty(&tmp_list)) {
++		req = list_entry(tmp_list.next,
++				 struct ceph_mds_request, r_wait);
+ 		list_del_init(&req->r_wait);
+ 		__do_request(mdsc, req);
+ 	}
+diff --git a/fs/ceph/super.c b/fs/ceph/super.c
+index b982239..2f6212e 100644
+--- a/fs/ceph/super.c
++++ b/fs/ceph/super.c
+@@ -388,8 +388,6 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
+ 		seq_printf(m, ",mount_timeout=%d", opt->mount_timeout);
+ 	if (opt->osd_idle_ttl != CEPH_OSD_IDLE_TTL_DEFAULT)
+ 		seq_printf(m, ",osd_idle_ttl=%d", opt->osd_idle_ttl);
+-	if (opt->osd_timeout != CEPH_OSD_TIMEOUT_DEFAULT)
+-		seq_printf(m, ",osdtimeout=%d", opt->osd_timeout);
+ 	if (opt->osd_keepalive_timeout != CEPH_OSD_KEEPALIVE_DEFAULT)
+ 		seq_printf(m, ",osdkeepalivetimeout=%d",
+ 			   opt->osd_keepalive_timeout);
+diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
+index ce5cbd7..210fce2 100644
+--- a/fs/cifs/cifs_dfs_ref.c
++++ b/fs/cifs/cifs_dfs_ref.c
+@@ -226,6 +226,8 @@ compose_mount_options_out:
+ compose_mount_options_err:
+ 	kfree(mountdata);
+ 	mountdata = ERR_PTR(rc);
++	kfree(*devname);
++	*devname = NULL;
+ 	goto compose_mount_options_out;
+ }
+ 
+diff --git a/fs/direct-io.c b/fs/direct-io.c
+index f86c720..9202248 100644
+--- a/fs/direct-io.c
++++ b/fs/direct-io.c
+@@ -261,9 +261,9 @@ static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret, bool is
+ 		dio->end_io(dio->iocb, offset, transferred,
+ 			    dio->private, ret, is_async);
+ 	} else {
++		inode_dio_done(dio->inode);
+ 		if (is_async)
+ 			aio_complete(dio->iocb, ret, 0);
+-		inode_dio_done(dio->inode);
+ 	}
+ 
+ 	return ret;
+diff --git a/fs/eventpoll.c b/fs/eventpoll.c
+index eedec84..3b032dd 100644
+--- a/fs/eventpoll.c
++++ b/fs/eventpoll.c
+@@ -1285,7 +1285,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
+ 	 * otherwise we might miss an event that happens between the
+ 	 * f_op->poll() call and the new event set registering.
+ 	 */
+-	epi->event.events = event->events;
++	epi->event.events = event->events; /* need barrier below */
+ 	pt._key = event->events;
+ 	epi->event.data = event->data; /* protected by mtx */
+ 	if (epi->event.events & EPOLLWAKEUP) {
+@@ -1296,6 +1296,26 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
+ 	}
+ 
+ 	/*
++	 * The following barrier has two effects:
++	 *
++	 * 1) Flush epi changes above to other CPUs.  This ensures
++	 *    we do not miss events from ep_poll_callback if an
++	 *    event occurs immediately after we call f_op->poll().
++	 *    We need this because we did not take ep->lock while
++	 *    changing epi above (but ep_poll_callback does take
++	 *    ep->lock).
++	 *
++	 * 2) We also need to ensure we do not miss _past_ events
++	 *    when calling f_op->poll().  This barrier also
++	 *    pairs with the barrier in wq_has_sleeper (see
++	 *    comments for wq_has_sleeper).
++	 *
++	 * This barrier will now guarantee ep_poll_callback or f_op->poll
++	 * (or both) will notice the readiness of an item.
++	 */
++	smp_mb();
++
++	/*
+ 	 * Get current event bits. We can safely use the file* here because
+ 	 * its usage count has been increased by the caller of this function.
+ 	 */
+diff --git a/fs/exec.c b/fs/exec.c
+index fab2c6d..59896ae 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -1202,9 +1202,24 @@ void free_bprm(struct linux_binprm *bprm)
+ 		mutex_unlock(&current->signal->cred_guard_mutex);
+ 		abort_creds(bprm->cred);
+ 	}
++	/* If a binfmt changed the interp, free it. */
++	if (bprm->interp != bprm->filename)
++		kfree(bprm->interp);
+ 	kfree(bprm);
+ }
+ 
++int bprm_change_interp(char *interp, struct linux_binprm *bprm)
++{
++	/* If a binfmt changed the interp, free it first. */
++	if (bprm->interp != bprm->filename)
++		kfree(bprm->interp);
++	bprm->interp = kstrdup(interp, GFP_KERNEL);
++	if (!bprm->interp)
++		return -ENOMEM;
++	return 0;
++}
++EXPORT_SYMBOL(bprm_change_interp);
++
+ /*
+  * install the new credentials for this executable
+  */
+diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
+index a5c29bb..8535c45 100644
+--- a/fs/ext4/acl.c
++++ b/fs/ext4/acl.c
+@@ -410,8 +410,10 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,
+ 
+ retry:
+ 	handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
+-	if (IS_ERR(handle))
+-		return PTR_ERR(handle);
++	if (IS_ERR(handle)) {
++		error = PTR_ERR(handle);
++		goto release_and_out;
++	}
+ 	error = ext4_set_acl(handle, inode, type, acl);
+ 	ext4_journal_stop(handle);
+ 	if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
+diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
+index cf18217..2f2e0da 100644
+--- a/fs/ext4/balloc.c
++++ b/fs/ext4/balloc.c
+@@ -358,7 +358,7 @@ void ext4_validate_block_bitmap(struct super_block *sb,
+ }
+ 
+ /**
+- * ext4_read_block_bitmap()
++ * ext4_read_block_bitmap_nowait()
+  * @sb:			super block
+  * @block_group:	given block group
+  *
+@@ -457,6 +457,8 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)
+ 	struct buffer_head *bh;
+ 
+ 	bh = ext4_read_block_bitmap_nowait(sb, block_group);
++	if (!bh)
++		return NULL;
+ 	if (ext4_wait_block_bitmap(sb, block_group, bh)) {
+ 		put_bh(bh);
+ 		return NULL;
+@@ -482,11 +484,16 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
+ 
+ 	free_clusters  = percpu_counter_read_positive(fcc);
+ 	dirty_clusters = percpu_counter_read_positive(dcc);
+-	root_clusters = EXT4_B2C(sbi, ext4_r_blocks_count(sbi->s_es));
++
++	/*
++	 * r_blocks_count should always be multiple of the cluster ratio so
++	 * we are safe to do a plane bit shift only.
++	 */
++	root_clusters = ext4_r_blocks_count(sbi->s_es) >> sbi->s_cluster_bits;
+ 
+ 	if (free_clusters - (nclusters + root_clusters + dirty_clusters) <
+ 					EXT4_FREECLUSTERS_WATERMARK) {
+-		free_clusters  = EXT4_C2B(sbi, percpu_counter_sum_positive(fcc));
++		free_clusters  = percpu_counter_sum_positive(fcc);
+ 		dirty_clusters = percpu_counter_sum_positive(dcc);
+ 	}
+ 	/* Check whether we have space after accounting for current
+diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
+index 741bb94..31be24d 100644
+--- a/fs/ext4/extents.c
++++ b/fs/ext4/extents.c
+@@ -2176,13 +2176,14 @@ ext4_ext_in_cache(struct inode *inode, ext4_lblk_t block,
+  * removes index from the index block.
+  */
+ static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
+-			struct ext4_ext_path *path)
++			struct ext4_ext_path *path, int depth)
+ {
+ 	int err;
+ 	ext4_fsblk_t leaf;
+ 
+ 	/* free index block */
+-	path--;
++	depth--;
++	path = path + depth;
+ 	leaf = ext4_idx_pblock(path->p_idx);
+ 	if (unlikely(path->p_hdr->eh_entries == 0)) {
+ 		EXT4_ERROR_INODE(inode, "path->p_hdr->eh_entries == 0");
+@@ -2207,6 +2208,19 @@ static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
+ 
+ 	ext4_free_blocks(handle, inode, NULL, leaf, 1,
+ 			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);
++
++	while (--depth >= 0) {
++		if (path->p_idx != EXT_FIRST_INDEX(path->p_hdr))
++			break;
++		path--;
++		err = ext4_ext_get_access(handle, inode, path);
++		if (err)
++			break;
++		path->p_idx->ei_block = (path+1)->p_idx->ei_block;
++		err = ext4_ext_dirty(handle, inode, path);
++		if (err)
++			break;
++	}
+ 	return err;
+ }
+ 
+@@ -2540,7 +2554,7 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode,
+ 	/* if this leaf is free, then we should
+ 	 * remove it from index block above */
+ 	if (err == 0 && eh->eh_entries == 0 && path[depth].p_bh != NULL)
+-		err = ext4_ext_rm_idx(handle, inode, path + depth);
++		err = ext4_ext_rm_idx(handle, inode, path, depth);
+ 
+ out:
+ 	return err;
+@@ -2741,7 +2755,7 @@ cont:
+ 				/* index is empty, remove it;
+ 				 * handle must be already prepared by the
+ 				 * truncatei_leaf() */
+-				err = ext4_ext_rm_idx(handle, inode, path + i);
++				err = ext4_ext_rm_idx(handle, inode, path, i);
+ 			}
+ 			/* root level has p_bh == NULL, brelse() eats this */
+ 			brelse(path[i].p_bh);
+diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
+index cc2d77c..c7c6e09 100644
+--- a/fs/ext4/ialloc.c
++++ b/fs/ext4/ialloc.c
+@@ -753,7 +753,6 @@ got:
+ 
+ 		BUFFER_TRACE(block_bitmap_bh, "dirty block bitmap");
+ 		err = ext4_handle_dirty_metadata(handle, NULL, block_bitmap_bh);
+-		brelse(block_bitmap_bh);
+ 
+ 		/* recheck and clear flag under lock if we still need to */
+ 		ext4_lock_group(sb, group);
+@@ -766,6 +765,7 @@ got:
+ 			ext4_group_desc_csum_set(sb, group, gdp);
+ 		}
+ 		ext4_unlock_group(sb, group);
++		brelse(block_bitmap_bh);
+ 
+ 		if (err)
+ 			goto fail;
+diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
+index 2ce16af..7e424eb 100644
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -1501,6 +1501,8 @@ static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd)
+ 
+ 	index = mpd->first_page;
+ 	end   = mpd->next_page - 1;
++
++	pagevec_init(&pvec, 0);
+ 	while (index <= end) {
+ 		nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE);
+ 		if (nr_pages == 0)
+diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
+index b26410c..24e5c78 100644
+--- a/fs/ext4/mballoc.c
++++ b/fs/ext4/mballoc.c
+@@ -4128,7 +4128,7 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac)
+ 		/* The max size of hash table is PREALLOC_TB_SIZE */
+ 		order = PREALLOC_TB_SIZE - 1;
+ 	/* Add the prealloc space to lg */
+-	rcu_read_lock();
++	spin_lock(&lg->lg_prealloc_lock);
+ 	list_for_each_entry_rcu(tmp_pa, &lg->lg_prealloc_list[order],
+ 						pa_inode_list) {
+ 		spin_lock(&tmp_pa->pa_lock);
+@@ -4152,12 +4152,12 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac)
+ 	if (!added)
+ 		list_add_tail_rcu(&pa->pa_inode_list,
+ 					&lg->lg_prealloc_list[order]);
+-	rcu_read_unlock();
++	spin_unlock(&lg->lg_prealloc_lock);
+ 
+ 	/* Now trim the list to be not more than 8 elements */
+ 	if (lg_prealloc_count > 8) {
+ 		ext4_mb_discard_lg_preallocations(sb, lg,
+-						order, lg_prealloc_count);
++						  order, lg_prealloc_count);
+ 		return;
+ 	}
+ 	return ;
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 2b5fb60..f4665ec 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1643,9 +1643,7 @@ static int parse_options(char *options, struct super_block *sb,
+ 			 unsigned int *journal_ioprio,
+ 			 int is_remount)
+ {
+-#ifdef CONFIG_QUOTA
+ 	struct ext4_sb_info *sbi = EXT4_SB(sb);
+-#endif
+ 	char *p;
+ 	substring_t args[MAX_OPT_ARGS];
+ 	int token;
+@@ -1694,6 +1692,16 @@ static int parse_options(char *options, struct super_block *sb,
+ 		}
+ 	}
+ #endif
++	if (test_opt(sb, DIOREAD_NOLOCK)) {
++		int blocksize =
++			BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);
++
++		if (blocksize < PAGE_CACHE_SIZE) {
++			ext4_msg(sb, KERN_ERR, "can't mount with "
++				 "dioread_nolock if block size != PAGE_SIZE");
++			return 0;
++		}
++	}
+ 	return 1;
+ }
+ 
+@@ -2184,7 +2192,9 @@ static void ext4_orphan_cleanup(struct super_block *sb,
+ 				__func__, inode->i_ino, inode->i_size);
+ 			jbd_debug(2, "truncating inode %lu to %lld bytes\n",
+ 				  inode->i_ino, inode->i_size);
++			mutex_lock(&inode->i_mutex);
+ 			ext4_truncate(inode);
++			mutex_unlock(&inode->i_mutex);
+ 			nr_truncates++;
+ 		} else {
+ 			ext4_msg(sb, KERN_DEBUG,
+@@ -3409,15 +3419,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
+ 			clear_opt(sb, DELALLOC);
+ 	}
+ 
+-	blocksize = BLOCK_SIZE << le32_to_cpu(es->s_log_block_size);
+-	if (test_opt(sb, DIOREAD_NOLOCK)) {
+-		if (blocksize < PAGE_SIZE) {
+-			ext4_msg(sb, KERN_ERR, "can't mount with "
+-				 "dioread_nolock if block size != PAGE_SIZE");
+-			goto failed_mount;
+-		}
+-	}
+-
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -3459,6 +3460,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
+ 	if (!ext4_feature_set_ok(sb, (sb->s_flags & MS_RDONLY)))
+ 		goto failed_mount;
+ 
++	blocksize = BLOCK_SIZE << le32_to_cpu(es->s_log_block_size);
+ 	if (blocksize < EXT4_MIN_BLOCK_SIZE ||
+ 	    blocksize > EXT4_MAX_BLOCK_SIZE) {
+ 		ext4_msg(sb, KERN_ERR,
+@@ -4694,7 +4696,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
+ 	}
+ 
+ 	ext4_setup_system_zone(sb);
+-	if (sbi->s_journal == NULL)
++	if (sbi->s_journal == NULL && !(old_sb_flags & MS_RDONLY))
+ 		ext4_commit_super(sb, 1);
+ 
+ 	unlock_super(sb);
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index 2cdb98d..f039941 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -554,7 +554,7 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode,
+ 		error = ext4_handle_dirty_xattr_block(handle, inode, bh);
+ 		if (IS_SYNC(inode))
+ 			ext4_handle_sync(handle);
+-		dquot_free_block(inode, 1);
++		dquot_free_block(inode, EXT4_C2B(EXT4_SB(inode->i_sb), 1));
+ 		ea_bdebug(bh, "refcount now=%d; releasing",
+ 			  le32_to_cpu(BHDR(bh)->h_refcount));
+ 	}
+@@ -843,7 +843,8 @@ inserted:
+ 			else {
+ 				/* The old block is released after updating
+ 				   the inode. */
+-				error = dquot_alloc_block(inode, 1);
++				error = dquot_alloc_block(inode,
++						EXT4_C2B(EXT4_SB(sb), 1));
+ 				if (error)
+ 					goto cleanup;
+ 				error = ext4_journal_get_write_access(handle,
+@@ -939,7 +940,7 @@ cleanup:
+ 	return error;
+ 
+ cleanup_dquot:
+-	dquot_free_block(inode, 1);
++	dquot_free_block(inode, EXT4_C2B(EXT4_SB(sb), 1));
+ 	goto cleanup;
+ 
+ bad_block:
+diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
+index 324bc08..68cc9ef 100644
+--- a/fs/fuse/dir.c
++++ b/fs/fuse/dir.c
+@@ -682,7 +682,14 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
+ 
+ 		spin_lock(&fc->lock);
+ 		fi->attr_version = ++fc->attr_version;
+-		drop_nlink(inode);
++		/*
++		 * If i_nlink == 0 then unlink doesn't make sense, yet this can
++		 * happen if userspace filesystem is careless.  It would be
++		 * difficult to enforce correct nlink usage so just ignore this
++		 * condition here
++		 */
++		if (inode->i_nlink > 0)
++			drop_nlink(inode);
+ 		spin_unlock(&fc->lock);
+ 		fuse_invalidate_attr(inode);
+ 		fuse_invalidate_attr(dir);
+diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
+index fb1ab953..2fb20f5 100644
+--- a/fs/jbd2/transaction.c
++++ b/fs/jbd2/transaction.c
+@@ -209,7 +209,8 @@ repeat:
+ 		if (!new_transaction)
+ 			goto alloc_transaction;
+ 		write_lock(&journal->j_state_lock);
+-		if (!journal->j_running_transaction) {
++		if (!journal->j_running_transaction &&
++		    !journal->j_barrier_count) {
+ 			jbd2_get_transaction(journal, new_transaction);
+ 			new_transaction = NULL;
+ 		}
+diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
+index 0c96eb5..0331072 100644
+--- a/fs/jffs2/nodemgmt.c
++++ b/fs/jffs2/nodemgmt.c
+@@ -417,14 +417,16 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
+ 			spin_unlock(&c->erase_completion_lock);
+ 
+ 			ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);
+-			if (ret)
+-				return ret;
++
+ 			/* Just lock it again and continue. Nothing much can change because
+ 			   we hold c->alloc_sem anyway. In fact, it's not entirely clear why
+ 			   we hold c->erase_completion_lock in the majority of this function...
+ 			   but that's a question for another (more caffeine-rich) day. */
+ 			spin_lock(&c->erase_completion_lock);
+ 
++			if (ret)
++				return ret;
++
+ 			waste = jeb->free_size;
+ 			jffs2_link_node_ref(c, jeb,
+ 					    (jeb->offset + c->sector_size - waste) | REF_OBSOLETE,
+diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
+index 05d2912..a5657ff 100644
+--- a/fs/lockd/clntproc.c
++++ b/fs/lockd/clntproc.c
+@@ -551,6 +551,9 @@ again:
+ 		status = nlmclnt_block(block, req, NLMCLNT_POLL_TIMEOUT);
+ 		if (status < 0)
+ 			break;
++		/* Resend the blocking lock request after a server reboot */
++		if (resp->status ==  nlm_lck_denied_grace_period)
++			continue;
+ 		if (resp->status != nlm_lck_blocked)
+ 			break;
+ 	}
+diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
+index 1093968..62f18f7 100644
+--- a/fs/nfs/blocklayout/blocklayout.c
++++ b/fs/nfs/blocklayout/blocklayout.c
+@@ -1240,6 +1240,7 @@ static const struct nfs_pageio_ops bl_pg_write_ops = {
+ static struct pnfs_layoutdriver_type blocklayout_type = {
+ 	.id				= LAYOUT_BLOCK_VOLUME,
+ 	.name				= "LAYOUT_BLOCK_VOLUME",
++	.owner				= THIS_MODULE,
+ 	.read_pagelist			= bl_read_pagelist,
+ 	.write_pagelist			= bl_write_pagelist,
+ 	.alloc_layout_hdr		= bl_alloc_layout_hdr,
+diff --git a/fs/nfs/client.c b/fs/nfs/client.c
+index 0e7cd89..b59f1d8 100644
+--- a/fs/nfs/client.c
++++ b/fs/nfs/client.c
+@@ -614,8 +614,7 @@ EXPORT_SYMBOL_GPL(nfs_create_rpc_client);
+  */
+ static void nfs_destroy_server(struct nfs_server *server)
+ {
+-	if (!(server->flags & NFS_MOUNT_LOCAL_FLOCK) ||
+-			!(server->flags & NFS_MOUNT_LOCAL_FCNTL))
++	if (server->nlm_host)
+ 		nlmclnt_done(server->nlm_host);
+ }
+ 
+diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
+index 627f108..e210a66 100644
+--- a/fs/nfs/dir.c
++++ b/fs/nfs/dir.c
+@@ -1155,11 +1155,14 @@ static int nfs_dentry_delete(const struct dentry *dentry)
+ 
+ }
+ 
++/* Ensure that we revalidate inode->i_nlink */
+ static void nfs_drop_nlink(struct inode *inode)
+ {
+ 	spin_lock(&inode->i_lock);
+-	if (inode->i_nlink > 0)
+-		drop_nlink(inode);
++	/* drop the inode if we're reasonably sure this is the last link */
++	if (inode->i_nlink == 1)
++		clear_nlink(inode);
++	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATTR;
+ 	spin_unlock(&inode->i_lock);
+ }
+ 
+@@ -1174,8 +1177,8 @@ static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode)
+ 		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA;
+ 
+ 	if (dentry->d_flags & DCACHE_NFSFS_RENAMED) {
+-		drop_nlink(inode);
+ 		nfs_complete_unlink(dentry, inode);
++		nfs_drop_nlink(inode);
+ 	}
+ 	iput(inode);
+ }
+@@ -1646,10 +1649,8 @@ static int nfs_safe_remove(struct dentry *dentry)
+ 	if (inode != NULL) {
+ 		NFS_PROTO(inode)->return_delegation(inode);
+ 		error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
+-		/* The VFS may want to delete this inode */
+ 		if (error == 0)
+ 			nfs_drop_nlink(inode);
+-		nfs_mark_for_revalidate(inode);
+ 	} else
+ 		error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
+ 	if (error == -ENOENT)
+diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
+index dd057bc..fc8dc20 100644
+--- a/fs/nfs/namespace.c
++++ b/fs/nfs/namespace.c
+@@ -177,11 +177,31 @@ out_nofree:
+ 	return mnt;
+ }
+ 
++static int
++nfs_namespace_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++{
++	if (NFS_FH(dentry->d_inode)->size != 0)
++		return nfs_getattr(mnt, dentry, stat);
++	generic_fillattr(dentry->d_inode, stat);
++	return 0;
++}
++
++static int
++nfs_namespace_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	if (NFS_FH(dentry->d_inode)->size != 0)
++		return nfs_setattr(dentry, attr);
++	return -EACCES;
++}
++
+ const struct inode_operations nfs_mountpoint_inode_operations = {
+ 	.getattr	= nfs_getattr,
++	.setattr	= nfs_setattr,
+ };
+ 
+ const struct inode_operations nfs_referral_inode_operations = {
++	.getattr	= nfs_namespace_getattr,
++	.setattr	= nfs_namespace_setattr,
+ };
+ 
+ static void nfs_expire_automounts(struct work_struct *work)
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index 7bff871..5e61aac 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -5999,13 +5999,26 @@ static void nfs41_sequence_prepare(struct rpc_task *task, void *data)
+ 	rpc_call_start(task);
+ }
+ 
++static void nfs41_sequence_prepare_privileged(struct rpc_task *task, void *data)
++{
++	rpc_task_set_priority(task, RPC_PRIORITY_PRIVILEGED);
++	nfs41_sequence_prepare(task, data);
++}
++
+ static const struct rpc_call_ops nfs41_sequence_ops = {
+ 	.rpc_call_done = nfs41_sequence_call_done,
+ 	.rpc_call_prepare = nfs41_sequence_prepare,
+ 	.rpc_release = nfs41_sequence_release,
+ };
+ 
+-static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred)
++static const struct rpc_call_ops nfs41_sequence_privileged_ops = {
++	.rpc_call_done = nfs41_sequence_call_done,
++	.rpc_call_prepare = nfs41_sequence_prepare_privileged,
++	.rpc_release = nfs41_sequence_release,
++};
++
++static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred,
++					     const struct rpc_call_ops *seq_ops)
+ {
+ 	struct nfs4_sequence_data *calldata;
+ 	struct rpc_message msg = {
+@@ -6015,7 +6028,7 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, struct rpc_
+ 	struct rpc_task_setup task_setup_data = {
+ 		.rpc_client = clp->cl_rpcclient,
+ 		.rpc_message = &msg,
+-		.callback_ops = &nfs41_sequence_ops,
++		.callback_ops = seq_ops,
+ 		.flags = RPC_TASK_ASYNC | RPC_TASK_SOFT,
+ 	};
+ 
+@@ -6042,7 +6055,7 @@ static int nfs41_proc_async_sequence(struct nfs_client *clp, struct rpc_cred *cr
+ 
+ 	if ((renew_flags & NFS4_RENEW_TIMEOUT) == 0)
+ 		return 0;
+-	task = _nfs41_proc_sequence(clp, cred);
++	task = _nfs41_proc_sequence(clp, cred, &nfs41_sequence_ops);
+ 	if (IS_ERR(task))
+ 		ret = PTR_ERR(task);
+ 	else
+@@ -6056,7 +6069,7 @@ static int nfs4_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred)
+ 	struct rpc_task *task;
+ 	int ret;
+ 
+-	task = _nfs41_proc_sequence(clp, cred);
++	task = _nfs41_proc_sequence(clp, cred, &nfs41_sequence_privileged_ops);
+ 	if (IS_ERR(task)) {
+ 		ret = PTR_ERR(task);
+ 		goto out;
+diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
+index ea6d111..75bd459 100644
+--- a/fs/nfs/objlayout/objio_osd.c
++++ b/fs/nfs/objlayout/objio_osd.c
+@@ -640,6 +640,7 @@ static struct pnfs_layoutdriver_type objlayout_type = {
+ 	.flags                   = PNFS_LAYOUTRET_ON_SETATTR |
+ 				   PNFS_LAYOUTRET_ON_ERROR,
+ 
++	.owner		       	 = THIS_MODULE,
+ 	.alloc_layout_hdr        = objlayout_alloc_layout_hdr,
+ 	.free_layout_hdr         = objlayout_free_layout_hdr,
+ 
+diff --git a/fs/nfs/super.c b/fs/nfs/super.c
+index d8d7396..2a31c7f 100644
+--- a/fs/nfs/super.c
++++ b/fs/nfs/super.c
+@@ -1095,7 +1095,7 @@ static int nfs_get_option_str(substring_t args[], char **option)
+ {
+ 	kfree(*option);
+ 	*option = match_strdup(args);
+-	return !option;
++	return !*option;
+ }
+ 
+ static int nfs_get_option_ul(substring_t args[], unsigned long *option)
+diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
+index c9c1c0a..ac784eb 100644
+--- a/fs/nfsd/nfs4proc.c
++++ b/fs/nfsd/nfs4proc.c
+@@ -194,6 +194,7 @@ static __be32
+ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)
+ {
+ 	struct svc_fh *resfh;
++	int accmode;
+ 	__be32 status;
+ 
+ 	resfh = kmalloc(sizeof(struct svc_fh), GFP_KERNEL);
+@@ -253,9 +254,10 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
+ 	/* set reply cache */
+ 	fh_copy_shallow(&open->op_openowner->oo_owner.so_replay.rp_openfh,
+ 			&resfh->fh_handle);
+-	if (!open->op_created)
+-		status = do_open_permission(rqstp, resfh, open,
+-					    NFSD_MAY_NOP);
++	accmode = NFSD_MAY_NOP;
++	if (open->op_created)
++		accmode |= NFSD_MAY_OWNER_OVERRIDE;
++	status = do_open_permission(rqstp, resfh, open, accmode);
+ 	set_change_info(&open->op_cinfo, current_fh);
+ 	fh_dup2(current_fh, resfh);
+ out:
+diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
+index 5b3224c..b271e9d 100644
+--- a/fs/nfsd/nfs4state.c
++++ b/fs/nfsd/nfs4state.c
+@@ -1098,6 +1098,8 @@ free_client(struct nfs4_client *clp)
+ 	}
+ 	free_svc_cred(&clp->cl_cred);
+ 	kfree(clp->cl_name.data);
++	idr_remove_all(&clp->cl_stateids);
++	idr_destroy(&clp->cl_stateids);
+ 	kfree(clp);
+ }
+ 
+@@ -2341,7 +2343,7 @@ nfsd4_init_slabs(void)
+ 	if (openowner_slab == NULL)
+ 		goto out_nomem;
+ 	lockowner_slab = kmem_cache_create("nfsd4_lockowners",
+-			sizeof(struct nfs4_openowner), 0, 0, NULL);
++			sizeof(struct nfs4_lockowner), 0, 0, NULL);
+ 	if (lockowner_slab == NULL)
+ 		goto out_nomem;
+ 	file_slab = kmem_cache_create("nfsd4_files",
+diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
+index 6322df3..1e83186 100644
+--- a/fs/nfsd/nfs4xdr.c
++++ b/fs/nfsd/nfs4xdr.c
+@@ -2946,11 +2946,16 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
+ 	len = maxcount;
+ 	v = 0;
+ 	while (len > 0) {
+-		pn = resp->rqstp->rq_resused++;
++		pn = resp->rqstp->rq_resused;
++		if (!resp->rqstp->rq_respages[pn]) { /* ran out of pages */
++			maxcount -= len;
++			break;
++		}
+ 		resp->rqstp->rq_vec[v].iov_base =
+ 			page_address(resp->rqstp->rq_respages[pn]);
+ 		resp->rqstp->rq_vec[v].iov_len =
+ 			len < PAGE_SIZE ? len : PAGE_SIZE;
++		resp->rqstp->rq_resused++;
+ 		v++;
+ 		len -= PAGE_SIZE;
+ 	}
+@@ -2996,6 +3001,8 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd
+ 		return nfserr;
+ 	if (resp->xbuf->page_len)
+ 		return nfserr_resource;
++	if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused])
++		return nfserr_resource;
+ 
+ 	page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused++]);
+ 
+@@ -3045,6 +3052,8 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
+ 		return nfserr;
+ 	if (resp->xbuf->page_len)
+ 		return nfserr_resource;
++	if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused])
++		return nfserr_resource;
+ 
+ 	RESERVE_SPACE(NFS4_VERIFIER_SIZE);
+ 	savep = p;
+diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
+index 240473c..0d5e021 100644
+--- a/fs/nfsd/nfssvc.c
++++ b/fs/nfsd/nfssvc.c
+@@ -650,7 +650,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
+ 	}
+ 
+ 	/* Store reply in cache. */
+-	nfsd_cache_update(rqstp, proc->pc_cachetype, statp + 1);
++	nfsd_cache_update(rqstp, rqstp->rq_cachetype, statp + 1);
+ 	return 1;
+ }
+ 
+diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
+index a9269f1..e1b40c7 100644
+--- a/fs/nfsd/vfs.c
++++ b/fs/nfsd/vfs.c
+@@ -1485,13 +1485,19 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
+ 		case NFS3_CREATE_EXCLUSIVE:
+ 			if (   dchild->d_inode->i_mtime.tv_sec == v_mtime
+ 			    && dchild->d_inode->i_atime.tv_sec == v_atime
+-			    && dchild->d_inode->i_size  == 0 )
++			    && dchild->d_inode->i_size  == 0 ) {
++				if (created)
++					*created = 1;
+ 				break;
++			}
+ 		case NFS4_CREATE_EXCLUSIVE4_1:
+ 			if (   dchild->d_inode->i_mtime.tv_sec == v_mtime
+ 			    && dchild->d_inode->i_atime.tv_sec == v_atime
+-			    && dchild->d_inode->i_size  == 0 )
++			    && dchild->d_inode->i_size  == 0 ) {
++				if (created)
++					*created = 1;
+ 				goto set_attr;
++			}
+ 			 /* fallthru */
+ 		case NFS3_CREATE_GUARDED:
+ 			err = nfserr_exist;
+diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
+index fdb1807..f385935 100644
+--- a/fs/nilfs2/ioctl.c
++++ b/fs/nilfs2/ioctl.c
+@@ -664,8 +664,11 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
+ 	if (ret < 0)
+ 		printk(KERN_ERR "NILFS: GC failed during preparation: "
+ 			"cannot read source blocks: err=%d\n", ret);
+-	else
++	else {
++		if (nilfs_sb_need_update(nilfs))
++			set_nilfs_discontinued(nilfs);
+ 		ret = nilfs_clean_segments(inode->i_sb, argv, kbufs);
++	}
+ 
+ 	nilfs_remove_all_gcinodes(nilfs);
+ 	clear_nilfs_gc_running(nilfs);
+diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
+index 8445fbc..6f292dd 100644
+--- a/fs/notify/inotify/inotify_user.c
++++ b/fs/notify/inotify/inotify_user.c
+@@ -579,8 +579,6 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
+ 
+ 	/* don't allow invalid bits: we don't want flags set */
+ 	mask = inotify_arg_to_mask(arg);
+-	if (unlikely(!(mask & IN_ALL_EVENTS)))
+-		return -EINVAL;
+ 
+ 	fsn_mark = fsnotify_find_inode_mark(group, inode);
+ 	if (!fsn_mark)
+@@ -632,8 +630,6 @@ static int inotify_new_watch(struct fsnotify_group *group,
+ 
+ 	/* don't allow invalid bits: we don't want flags set */
+ 	mask = inotify_arg_to_mask(arg);
+-	if (unlikely(!(mask & IN_ALL_EVENTS)))
+-		return -EINVAL;
+ 
+ 	tmp_i_mark = kmem_cache_alloc(inotify_inode_mark_cachep, GFP_KERNEL);
+ 	if (unlikely(!tmp_i_mark))
+diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
+index 6577432..340bd02 100644
+--- a/fs/ocfs2/aops.c
++++ b/fs/ocfs2/aops.c
+@@ -593,9 +593,9 @@ static void ocfs2_dio_end_io(struct kiocb *iocb,
+ 	level = ocfs2_iocb_rw_locked_level(iocb);
+ 	ocfs2_rw_unlock(inode, level);
+ 
++	inode_dio_done(inode);
+ 	if (is_async)
+ 		aio_complete(iocb, ret, 0);
+-	inode_dio_done(inode);
+ }
+ 
+ /*
+diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
+index 4f7795f..88577eb 100644
+--- a/fs/ocfs2/dlmglue.c
++++ b/fs/ocfs2/dlmglue.c
+@@ -2545,6 +2545,7 @@ int ocfs2_super_lock(struct ocfs2_super *osb,
+ 	 * everything is up to the caller :) */
+ 	status = ocfs2_should_refresh_lock_res(lockres);
+ 	if (status < 0) {
++		ocfs2_cluster_unlock(osb, lockres, level);
+ 		mlog_errno(status);
+ 		goto bail;
+ 	}
+@@ -2553,8 +2554,10 @@ int ocfs2_super_lock(struct ocfs2_super *osb,
+ 
+ 		ocfs2_complete_lock_res_refresh(lockres, status);
+ 
+-		if (status < 0)
++		if (status < 0) {
++			ocfs2_cluster_unlock(osb, lockres, level);
+ 			mlog_errno(status);
++		}
+ 		ocfs2_track_lock_refresh(lockres);
+ 	}
+ bail:
+diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
+index f169da4..b7e74b5 100644
+--- a/fs/ocfs2/suballoc.c
++++ b/fs/ocfs2/suballoc.c
+@@ -642,7 +642,7 @@ ocfs2_block_group_alloc_discontig(handle_t *handle,
+ 	 * cluster groups will be staying in cache for the duration of
+ 	 * this operation.
+ 	 */
+-	ac->ac_allow_chain_relink = 0;
++	ac->ac_disable_chain_relink = 1;
+ 
+ 	/* Claim the first region */
+ 	status = ocfs2_block_group_claim_bits(osb, handle, ac, min_bits,
+@@ -1823,7 +1823,7 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
+ 	 * Do this *after* figuring out how many bits we're taking out
+ 	 * of our target group.
+ 	 */
+-	if (ac->ac_allow_chain_relink &&
++	if (!ac->ac_disable_chain_relink &&
+ 	    (prev_group_bh) &&
+ 	    (ocfs2_block_group_reasonably_empty(bg, res->sr_bits))) {
+ 		status = ocfs2_relink_block_group(handle, alloc_inode,
+@@ -1928,7 +1928,6 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,
+ 
+ 	victim = ocfs2_find_victim_chain(cl);
+ 	ac->ac_chain = victim;
+-	ac->ac_allow_chain_relink = 1;
+ 
+ 	status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits,
+ 				    res, &bits_left);
+@@ -1947,7 +1946,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,
+ 	 * searching each chain in order. Don't allow chain relinking
+ 	 * because we only calculate enough journal credits for one
+ 	 * relink per alloc. */
+-	ac->ac_allow_chain_relink = 0;
++	ac->ac_disable_chain_relink = 1;
+ 	for (i = 0; i < le16_to_cpu(cl->cl_next_free_rec); i ++) {
+ 		if (i == victim)
+ 			continue;
+diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h
+index b8afabf..a36d0aa 100644
+--- a/fs/ocfs2/suballoc.h
++++ b/fs/ocfs2/suballoc.h
+@@ -49,7 +49,7 @@ struct ocfs2_alloc_context {
+ 
+ 	/* these are used by the chain search */
+ 	u16    ac_chain;
+-	int    ac_allow_chain_relink;
++	int    ac_disable_chain_relink;
+ 	group_search_t *ac_group_search;
+ 
+ 	u64    ac_last_group;
+diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
+index 0ba9ea1..2e3ea30 100644
+--- a/fs/ocfs2/xattr.c
++++ b/fs/ocfs2/xattr.c
+@@ -7189,7 +7189,7 @@ int ocfs2_init_security_and_acl(struct inode *dir,
+ 	struct buffer_head *dir_bh = NULL;
+ 
+ 	ret = ocfs2_init_security_get(inode, dir, qstr, NULL);
+-	if (!ret) {
++	if (ret) {
+ 		mlog_errno(ret);
+ 		goto leave;
+ 	}
+diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
+index 2d1e0f3..12da9ee 100644
+--- a/fs/pstore/platform.c
++++ b/fs/pstore/platform.c
+@@ -96,6 +96,27 @@ static const char *get_reason_str(enum kmsg_dump_reason reason)
+ 	}
+ }
+ 
++bool pstore_cannot_block_path(enum kmsg_dump_reason reason)
++{
++	/*
++	 * In case of NMI path, pstore shouldn't be blocked
++	 * regardless of reason.
++	 */
++	if (in_nmi())
++		return true;
++
++	switch (reason) {
++	/* In panic case, other cpus are stopped by smp_send_stop(). */
++	case KMSG_DUMP_PANIC:
++	/* Emergency restart shouldn't be blocked by spin lock. */
++	case KMSG_DUMP_EMERG:
++		return true;
++	default:
++		return false;
++	}
++}
++EXPORT_SYMBOL_GPL(pstore_cannot_block_path);
++
+ /*
+  * callback from kmsg_dump. (s2,l2) has the most recently
+  * written bytes, older bytes are in (s1,l1). Save as much
+@@ -114,10 +135,12 @@ static void pstore_dump(struct kmsg_dumper *dumper,
+ 
+ 	why = get_reason_str(reason);
+ 
+-	if (in_nmi()) {
+-		is_locked = spin_trylock(&psinfo->buf_lock);
+-		if (!is_locked)
+-			pr_err("pstore dump routine blocked in NMI, may corrupt error record\n");
++	if (pstore_cannot_block_path(reason)) {
++		is_locked = spin_trylock_irqsave(&psinfo->buf_lock, flags);
++		if (!is_locked) {
++			pr_err("pstore dump routine blocked in %s path, may corrupt error record\n"
++				       , in_nmi() ? "NMI" : why);
++		}
+ 	} else
+ 		spin_lock_irqsave(&psinfo->buf_lock, flags);
+ 	oopscount++;
+@@ -143,9 +166,9 @@ static void pstore_dump(struct kmsg_dumper *dumper,
+ 		total += hsize + len;
+ 		part++;
+ 	}
+-	if (in_nmi()) {
++	if (pstore_cannot_block_path(reason)) {
+ 		if (is_locked)
+-			spin_unlock(&psinfo->buf_lock);
++			spin_unlock_irqrestore(&psinfo->buf_lock, flags);
+ 	} else
+ 		spin_unlock_irqrestore(&psinfo->buf_lock, flags);
+ }
+diff --git a/fs/splice.c b/fs/splice.c
+index 41514dd..c69fbb7 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -696,8 +696,10 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,
+ 		return -EINVAL;
+ 
+ 	more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
+-	if (sd->len < sd->total_len)
++
++	if (sd->len < sd->total_len && pipe->nrbufs > 1)
+ 		more |= MSG_SENDPAGE_NOTLAST;
++
+ 	return file->f_op->sendpage(file, buf->page, buf->offset,
+ 				    sd->len, &pos, more);
+ }
+diff --git a/fs/udf/inode.c b/fs/udf/inode.c
+index aa23346..585ee1c 100644
+--- a/fs/udf/inode.c
++++ b/fs/udf/inode.c
+@@ -574,6 +574,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
+ 	struct udf_inode_info *iinfo = UDF_I(inode);
+ 	int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
+ 	int lastblock = 0;
++	bool isBeyondEOF;
+ 
+ 	*err = 0;
+ 	*new = 0;
+@@ -653,7 +654,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
+ 	/* Are we beyond EOF? */
+ 	if (etype == -1) {
+ 		int ret;
+-
++		isBeyondEOF = 1;
+ 		if (count) {
+ 			if (c)
+ 				laarr[0] = laarr[1];
+@@ -696,6 +697,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
+ 		endnum = c + 1;
+ 		lastblock = 1;
+ 	} else {
++		isBeyondEOF = 0;
+ 		endnum = startnum = ((count > 2) ? 2 : count);
+ 
+ 		/* if the current extent is in position 0,
+@@ -738,10 +740,13 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
+ 				goal, err);
+ 		if (!newblocknum) {
+ 			brelse(prev_epos.bh);
++			brelse(cur_epos.bh);
++			brelse(next_epos.bh);
+ 			*err = -ENOSPC;
+ 			return 0;
+ 		}
+-		iinfo->i_lenExtents += inode->i_sb->s_blocksize;
++		if (isBeyondEOF)
++			iinfo->i_lenExtents += inode->i_sb->s_blocksize;
+ 	}
+ 
+ 	/* if the extent the requsted block is located in contains multiple
+@@ -768,6 +773,8 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
+ 	udf_update_extents(inode, laarr, startnum, endnum, &prev_epos);
+ 
+ 	brelse(prev_epos.bh);
++	brelse(cur_epos.bh);
++	brelse(next_epos.bh);
+ 
+ 	newblock = udf_get_pblock(inode->i_sb, newblocknum,
+ 				iinfo->i_location.partitionReferenceNum, 0);
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index e562dd4..1236b8c 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -86,11 +86,11 @@ xfs_destroy_ioend(
+ 	}
+ 
+ 	if (ioend->io_iocb) {
++		inode_dio_done(ioend->io_inode);
+ 		if (ioend->io_isasync) {
+ 			aio_complete(ioend->io_iocb, ioend->io_error ?
+ 					ioend->io_error : ioend->io_result, 0);
+ 		}
+-		inode_dio_done(ioend->io_inode);
+ 	}
+ 
+ 	mempool_free(ioend, xfs_ioend_pool);
+diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
+index ed6642a..25f01d0 100644
+--- a/include/asm-generic/tlb.h
++++ b/include/asm-generic/tlb.h
+@@ -78,6 +78,14 @@ struct mmu_gather_batch {
+ #define MAX_GATHER_BATCH	\
+ 	((PAGE_SIZE - sizeof(struct mmu_gather_batch)) / sizeof(void *))
+ 
++/*
++ * Limit the maximum number of mmu_gather batches to reduce a risk of soft
++ * lockups for non-preemptible kernels on huge machines when a lot of memory
++ * is zapped during unmapping.
++ * 10K pages freed at once should be safe even without a preemption point.
++ */
++#define MAX_GATHER_BATCH_COUNT	(10000UL/MAX_GATHER_BATCH)
++
+ /* struct mmu_gather is an opaque type used by the mm code for passing around
+  * any data needed by arch specific code for tlb_remove_page.
+  */
+@@ -96,6 +104,7 @@ struct mmu_gather {
+ 	struct mmu_gather_batch *active;
+ 	struct mmu_gather_batch	local;
+ 	struct page		*__pages[MMU_GATHER_BUNDLE];
++	unsigned int		batch_count;
+ };
+ 
+ #define HAVE_GENERIC_MMU_GATHER
+diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h
+index da64e15..6cdabb4 100644
+--- a/include/linux/auto_fs.h
++++ b/include/linux/auto_fs.h
+@@ -31,25 +31,16 @@
+ #define AUTOFS_MIN_PROTO_VERSION	AUTOFS_PROTO_VERSION
+ 
+ /*
+- * Architectures where both 32- and 64-bit binaries can be executed
+- * on 64-bit kernels need this.  This keeps the structure format
+- * uniform, and makes sure the wait_queue_token isn't too big to be
+- * passed back down to the kernel.
+- *
+- * This assumes that on these architectures:
+- * mode     32 bit    64 bit
+- * -------------------------
+- * int      32 bit    32 bit
+- * long     32 bit    64 bit
+- *
+- * If so, 32-bit user-space code should be backwards compatible.
++ * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
++ * back to the kernel via ioctl from userspace. On architectures where 32- and
++ * 64-bit userspace binaries can be executed it's important that the size of
++ * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we
++ * do not break the binary ABI interface by changing the structure size.
+  */
+-
+-#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
+- || defined(__powerpc__) || defined(__s390__)
+-typedef unsigned int autofs_wqt_t;
+-#else
++#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */
+ typedef unsigned long autofs_wqt_t;
++#else
++typedef unsigned int autofs_wqt_t;
+ #endif
+ 
+ /* Packet types */
+diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
+index 366422b..eb53e15 100644
+--- a/include/linux/binfmts.h
++++ b/include/linux/binfmts.h
+@@ -128,6 +128,7 @@ extern int setup_arg_pages(struct linux_binprm * bprm,
+ 			   unsigned long stack_top,
+ 			   int executable_stack);
+ extern int bprm_mm_init(struct linux_binprm *bprm);
++extern int bprm_change_interp(char *interp, struct linux_binprm *bprm);
+ extern int copy_strings_kernel(int argc, const char *const *argv,
+ 			       struct linux_binprm *bprm);
+ extern int prepare_bprm_creds(struct linux_binprm *bprm);
+diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
+index 4262478..317aff8 100644
+--- a/include/linux/ceph/libceph.h
++++ b/include/linux/ceph/libceph.h
+@@ -43,7 +43,6 @@ struct ceph_options {
+ 	struct ceph_entity_addr my_addr;
+ 	int mount_timeout;
+ 	int osd_idle_ttl;
+-	int osd_timeout;
+ 	int osd_keepalive_timeout;
+ 
+ 	/*
+@@ -63,7 +62,6 @@ struct ceph_options {
+  * defaults
+  */
+ #define CEPH_MOUNT_TIMEOUT_DEFAULT  60
+-#define CEPH_OSD_TIMEOUT_DEFAULT    60  /* seconds */
+ #define CEPH_OSD_KEEPALIVE_DEFAULT  5
+ #define CEPH_OSD_IDLE_TTL_DEFAULT    60
+ 
+diff --git a/include/linux/console.h b/include/linux/console.h
+index 7201ce4..f59e942 100644
+--- a/include/linux/console.h
++++ b/include/linux/console.h
+@@ -77,7 +77,9 @@ extern const struct consw prom_con;	/* SPARC PROM console */
+ int con_is_bound(const struct consw *csw);
+ int register_con_driver(const struct consw *csw, int first, int last);
+ int unregister_con_driver(const struct consw *csw);
++int do_unregister_con_driver(const struct consw *csw);
+ int take_over_console(const struct consw *sw, int first, int last, int deflt);
++int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
+ void give_up_console(const struct consw *sw);
+ #ifdef CONFIG_HW_CONSOLE
+ int con_debug_enter(struct vc_data *vc);
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 5782114..eee8b0b 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -539,18 +539,30 @@ extern int __init efi_setup_pcdp_console(char *);
+ #endif
+ 
+ /*
+- * We play games with efi_enabled so that the compiler will, if possible, remove
+- * EFI-related code altogether.
++ * We play games with efi_enabled so that the compiler will, if
++ * possible, remove EFI-related code altogether.
+  */
++#define EFI_BOOT		0	/* Were we booted from EFI? */
++#define EFI_SYSTEM_TABLES	1	/* Can we use EFI system tables? */
++#define EFI_CONFIG_TABLES	2	/* Can we use EFI config tables? */
++#define EFI_RUNTIME_SERVICES	3	/* Can we use runtime services? */
++#define EFI_MEMMAP		4	/* Can we use EFI memory map? */
++#define EFI_64BIT		5	/* Is the firmware 64-bit? */
++
+ #ifdef CONFIG_EFI
+ # ifdef CONFIG_X86
+-   extern int efi_enabled;
+-   extern bool efi_64bit;
++extern int efi_enabled(int facility);
+ # else
+-#  define efi_enabled 1
++static inline int efi_enabled(int facility)
++{
++	return 1;
++}
+ # endif
+ #else
+-# define efi_enabled 0
++static inline int efi_enabled(int facility)
++{
++	return 0;
++}
+ #endif
+ 
+ /*
+diff --git a/include/linux/freezer.h b/include/linux/freezer.h
+index d09af4b..ee89932 100644
+--- a/include/linux/freezer.h
++++ b/include/linux/freezer.h
+@@ -75,28 +75,62 @@ static inline bool cgroup_freezing(struct task_struct *task)
+  */
+ 
+ 
+-/* Tell the freezer not to count the current task as freezable. */
++/**
++ * freezer_do_not_count - tell freezer to ignore %current
++ *
++ * Tell freezers to ignore the current task when determining whether the
++ * target frozen state is reached.  IOW, the current task will be
++ * considered frozen enough by freezers.
++ *
++ * The caller shouldn't do anything which isn't allowed for a frozen task
++ * until freezer_cont() is called.  Usually, freezer[_do_not]_count() pair
++ * wrap a scheduling operation and nothing much else.
++ */
+ static inline void freezer_do_not_count(void)
+ {
+ 	current->flags |= PF_FREEZER_SKIP;
+ }
+ 
+-/*
+- * Tell the freezer to count the current task as freezable again and try to
+- * freeze it.
++/**
++ * freezer_count - tell freezer to stop ignoring %current
++ *
++ * Undo freezer_do_not_count().  It tells freezers that %current should be
++ * considered again and tries to freeze if freezing condition is already in
++ * effect.
+  */
+ static inline void freezer_count(void)
+ {
+ 	current->flags &= ~PF_FREEZER_SKIP;
++	/*
++	 * If freezing is in progress, the following paired with smp_mb()
++	 * in freezer_should_skip() ensures that either we see %true
++	 * freezing() or freezer_should_skip() sees !PF_FREEZER_SKIP.
++	 */
++	smp_mb();
+ 	try_to_freeze();
+ }
+ 
+-/*
+- * Check if the task should be counted as freezable by the freezer
++/**
++ * freezer_should_skip - whether to skip a task when determining frozen
++ *			 state is reached
++ * @p: task in quesion
++ *
++ * This function is used by freezers after establishing %true freezing() to
++ * test whether a task should be skipped when determining the target frozen
++ * state is reached.  IOW, if this function returns %true, @p is considered
++ * frozen enough.
+  */
+-static inline int freezer_should_skip(struct task_struct *p)
++static inline bool freezer_should_skip(struct task_struct *p)
+ {
+-	return !!(p->flags & PF_FREEZER_SKIP);
++	/*
++	 * The following smp_mb() paired with the one in freezer_count()
++	 * ensures that either freezer_count() sees %true freezing() or we
++	 * see cleared %PF_FREEZER_SKIP and return %false.  This makes it
++	 * impossible for a task to slip frozen state testing after
++	 * clearing %PF_FREEZER_SKIP.
++	 */
++	smp_mb();
++	return p->flags & PF_FREEZER_SKIP;
+ }
+ 
+ /*
+diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
+index 561e130..9b0c614 100644
+--- a/include/linux/if_vlan.h
++++ b/include/linux/if_vlan.h
+@@ -327,7 +327,7 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
+ 					struct vlan_hdr *vhdr)
+ {
+ 	__be16 proto;
+-	unsigned char *rawp;
++	unsigned short *rawp;
+ 
+ 	/*
+ 	 * Was a VLAN packet, grab the encapsulated protocol, which the layer
+@@ -340,8 +340,8 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
+ 		return;
+ 	}
+ 
+-	rawp = skb->data;
+-	if (*(unsigned short *) rawp == 0xFFFF)
++	rawp = (unsigned short *)(vhdr + 1);
++	if (*rawp == 0xFFFF)
+ 		/*
+ 		 * This is a magic hack to spot IPX packets. Older Novell
+ 		 * breaks the protocol design and runs IPX over 802.3 without
+diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
+index 1d1b1e1..ee2baf0 100644
+--- a/include/linux/mmu_notifier.h
++++ b/include/linux/mmu_notifier.h
+@@ -4,6 +4,7 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/mm_types.h>
++#include <linux/srcu.h>
+ 
+ struct mmu_notifier;
+ struct mmu_notifier_ops;
+diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
+index b5d1384..70473da 100644
+--- a/include/linux/page-flags.h
++++ b/include/linux/page-flags.h
+@@ -362,7 +362,7 @@ static inline void ClearPageCompound(struct page *page)
+  * pages on the LRU and/or pagecache.
+  */
+ TESTPAGEFLAG(Compound, compound)
+-__PAGEFLAG(Head, compound)
++__SETPAGEFLAG(Head, compound)  __CLEARPAGEFLAG(Head, compound)
+ 
+ /*
+  * PG_reclaim is used in combination with PG_compound to mark the
+@@ -374,8 +374,14 @@ __PAGEFLAG(Head, compound)
+  * PG_compound & PG_reclaim	=> Tail page
+  * PG_compound & ~PG_reclaim	=> Head page
+  */
++#define PG_head_mask ((1L << PG_compound))
+ #define PG_head_tail_mask ((1L << PG_compound) | (1L << PG_reclaim))
+ 
++static inline int PageHead(struct page *page)
++{
++	return ((page->flags & PG_head_tail_mask) == PG_head_mask);
++}
++
+ static inline int PageTail(struct page *page)
+ {
+ 	return ((page->flags & PG_head_tail_mask) == PG_head_tail_mask);
+diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
+index 8d3c427..50a6cbe 100644
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -1566,6 +1566,7 @@
+ #define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
+ #define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
+ #define PCI_DEVICE_ID_RICOH_R5C822	0x0822
++#define PCI_DEVICE_ID_RICOH_R5CE822	0xe822
+ #define PCI_DEVICE_ID_RICOH_R5CE823	0xe823
+ #define PCI_DEVICE_ID_RICOH_R5C832	0x0832
+ #define PCI_DEVICE_ID_RICOH_R5C843	0x0843
+diff --git a/include/linux/pstore.h b/include/linux/pstore.h
+index c892587..2e24e22 100644
+--- a/include/linux/pstore.h
++++ b/include/linux/pstore.h
+@@ -74,12 +74,18 @@ static inline void pstore_ftrace_call(unsigned long ip, unsigned long parent_ip)
+ 
+ #ifdef CONFIG_PSTORE
+ extern int pstore_register(struct pstore_info *);
++extern bool pstore_cannot_block_path(enum kmsg_dump_reason reason);
+ #else
+ static inline int
+ pstore_register(struct pstore_info *psi)
+ {
+ 	return -ENODEV;
+ }
++static inline bool
++pstore_cannot_block_path(enum kmsg_dump_reason reason)
++{
++	return false;
++}
+ #endif
+ 
+ #endif /*_LINUX_PSTORE_H*/
+diff --git a/include/linux/quota.h b/include/linux/quota.h
+index 524ede8..2a0327e 100644
+--- a/include/linux/quota.h
++++ b/include/linux/quota.h
+@@ -417,6 +417,7 @@ struct quota_module_name {
+ #define INIT_QUOTA_MODULE_NAMES {\
+ 	{QFMT_VFS_OLD, "quota_v1"},\
+ 	{QFMT_VFS_V0, "quota_v2"},\
++	{QFMT_VFS_V1, "quota_v2"},\
+ 	{0, NULL}}
+ 
+ #endif /* __KERNEL__ */
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index 23bddac..d2bbc12 100644
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -2684,7 +2684,16 @@ static inline void thread_group_cputime_init(struct signal_struct *sig)
+ extern void recalc_sigpending_and_wake(struct task_struct *t);
+ extern void recalc_sigpending(void);
+ 
+-extern void signal_wake_up(struct task_struct *t, int resume_stopped);
++extern void signal_wake_up_state(struct task_struct *t, unsigned int state);
++
++static inline void signal_wake_up(struct task_struct *t, bool resume)
++{
++	signal_wake_up_state(t, resume ? TASK_WAKEKILL : 0);
++}
++static inline void ptrace_signal_wake_up(struct task_struct *t, bool resume)
++{
++	signal_wake_up_state(t, resume ? __TASK_TRACED : 0);
++}
+ 
+ /*
+  * Wrappers for p->thread_info->cpu access. No-op on UP.
+diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
+index a54b825..6f8b026 100644
+--- a/include/linux/usb/audio.h
++++ b/include/linux/usb/audio.h
+@@ -384,14 +384,16 @@ static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_de
+ 						   int protocol)
+ {
+ 	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
+-	return desc->baSourceID[desc->bNrInPins + control_size];
++	return *(uac_processing_unit_bmControls(desc, protocol)
++			+ control_size);
+ }
+ 
+ static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
+ 						 int protocol)
+ {
+ 	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
+-	return &desc->baSourceID[desc->bNrInPins + control_size + 1];
++	return uac_processing_unit_bmControls(desc, protocol)
++			+ control_size + 1;
+ }
+ 
+ /* 4.5.2 Class-Specific AS Interface Descriptor */
+diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
+index d1d732c..17de73a 100644
+--- a/include/linux/usb/ch9.h
++++ b/include/linux/usb/ch9.h
+@@ -152,6 +152,12 @@
+ #define USB_INTRF_FUNC_SUSPEND_LP	(1 << (8 + 0))
+ #define USB_INTRF_FUNC_SUSPEND_RW	(1 << (8 + 1))
+ 
++/*
++ * Interface status, Figure 9-5 USB 3.0 spec
++ */
++#define USB_INTRF_STAT_FUNC_RW_CAP     1
++#define USB_INTRF_STAT_FUNC_RW         2
++
+ #define USB_ENDPOINT_HALT		0	/* IN/OUT will STALL */
+ 
+ /* Bit array elements as returned by the USB_REQ_GET_STATUS request. */
+diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
+index 50ae7d0..e8d6571 100644
+--- a/include/linux/vt_kern.h
++++ b/include/linux/vt_kern.h
+@@ -47,6 +47,7 @@ int con_set_cmap(unsigned char __user *cmap);
+ int con_get_cmap(unsigned char __user *cmap);
+ void scrollback(struct vc_data *vc, int lines);
+ void scrollfront(struct vc_data *vc, int lines);
++void clear_buffer_attributes(struct vc_data *vc);
+ void update_region(struct vc_data *vc, unsigned long start, int count);
+ void redraw_screen(struct vc_data *vc, int is_switch);
+ #define update_screen(x) redraw_screen(x, 0)
+@@ -130,6 +131,8 @@ void vt_event_post(unsigned int event, unsigned int old, unsigned int new);
+ int vt_waitactive(int n);
+ void change_console(struct vc_data *new_vc);
+ void reset_vc(struct vc_data *vc);
++extern int do_unbind_con_driver(const struct consw *csw, int first, int last,
++			     int deflt);
+ extern int unbind_con_driver(const struct consw *csw, int first, int last,
+ 			     int deflt);
+ int vty_init(const struct file_operations *console_fops);
+diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
+index 9e34c87..f071f50 100644
+--- a/include/net/inet6_hashtables.h
++++ b/include/net/inet6_hashtables.h
+@@ -28,16 +28,16 @@
+ 
+ struct inet_hashinfo;
+ 
+-/* I have no idea if this is a good hash for v6 or not. -DaveM */
+ static inline unsigned int inet6_ehashfn(struct net *net,
+ 				const struct in6_addr *laddr, const u16 lport,
+ 				const struct in6_addr *faddr, const __be16 fport)
+ {
+-	u32 ports = (lport ^ (__force u16)fport);
++	u32 ports = (((u32)lport) << 16) | (__force u32)fport;
+ 
+ 	return jhash_3words((__force u32)laddr->s6_addr32[3],
+-			    (__force u32)faddr->s6_addr32[3],
+-			    ports, inet_ehash_secret + net_hash_mix(net));
++			    ipv6_addr_jhash(faddr),
++			    ports,
++			    inet_ehash_secret + net_hash_mix(net));
+ }
+ 
+ static inline int inet6_sk_ehashfn(const struct sock *sk)
+diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
+index ba1d361..1832927 100644
+--- a/include/net/inet_connection_sock.h
++++ b/include/net/inet_connection_sock.h
+@@ -318,6 +318,7 @@ extern void inet_csk_reqsk_queue_prune(struct sock *parent,
+ 				       const unsigned long max_rto);
+ 
+ extern void inet_csk_destroy_sock(struct sock *sk);
++extern void inet_csk_prepare_forced_close(struct sock *sk);
+ 
+ /*
+  * LISTEN is a special case for poll..
+diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
+index 613cfa4..8eac4a9 100644
+--- a/include/net/inet_sock.h
++++ b/include/net/inet_sock.h
+@@ -203,6 +203,7 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
+ extern int inet_sk_rebuild_header(struct sock *sk);
+ 
+ extern u32 inet_ehash_secret;
++extern u32 ipv6_hash_secret;
+ extern void build_ehash_secret(void);
+ 
+ static inline unsigned int inet_ehashfn(struct net *net,
+diff --git a/include/net/ipv6.h b/include/net/ipv6.h
+index 01c34b3..640591f 100644
+--- a/include/net/ipv6.h
++++ b/include/net/ipv6.h
+@@ -15,6 +15,7 @@
+ 
+ #include <linux/ipv6.h>
+ #include <linux/hardirq.h>
++#include <linux/jhash.h>
+ #include <net/if_inet6.h>
+ #include <net/ndisc.h>
+ #include <net/flow.h>
+@@ -432,6 +433,17 @@ static inline u32 ipv6_addr_hash(const struct in6_addr *a)
+ #endif
+ }
+ 
++/* more secured version of ipv6_addr_hash() */
++static inline u32 ipv6_addr_jhash(const struct in6_addr *a)
++{
++	u32 v = (__force u32)a->s6_addr32[0] ^ (__force u32)a->s6_addr32[1];
++
++	return jhash_3words(v,
++			    (__force u32)a->s6_addr32[2],
++			    (__force u32)a->s6_addr32[3],
++			    ipv6_hash_secret);
++}
++
+ static inline bool ipv6_addr_loopback(const struct in6_addr *a)
+ {
+ 	return (a->s6_addr32[0] | a->s6_addr32[1] |
+diff --git a/include/net/sock.h b/include/net/sock.h
+index adb7da2..450a2af 100644
+--- a/include/net/sock.h
++++ b/include/net/sock.h
+@@ -1012,7 +1012,7 @@ static inline void sk_refcnt_debug_dec(struct sock *sk)
+ 	       sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks));
+ }
+ 
+-inline void sk_refcnt_debug_release(const struct sock *sk)
++static inline void sk_refcnt_debug_release(const struct sock *sk)
+ {
+ 	if (atomic_read(&sk->sk_refcnt) != 1)
+ 		printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n",
+diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
+index 5be8937..fca8bbe 100644
+--- a/include/target/target_core_base.h
++++ b/include/target/target_core_base.h
+@@ -734,6 +734,8 @@ struct se_subsystem_dev {
+ };
+ 
+ struct se_device {
++#define SE_DEV_LINK_MAGIC			0xfeeddeef
++	u32			dev_link_magic;
+ 	/* RELATIVE TARGET PORT IDENTIFER Counter */
+ 	u16			dev_rpti_counter;
+ 	/* Used for SAM Task Attribute ordering */
+@@ -820,6 +822,8 @@ struct se_port_stat_grps {
+ };
+ 
+ struct se_lun {
++#define SE_LUN_LINK_MAGIC			0xffff7771
++	u32			lun_link_magic;
+ 	/* See transport_lun_status_table */
+ 	enum transport_lun_status_table lun_status;
+ 	u32			lun_access;
+diff --git a/init/main.c b/init/main.c
+index d61ec54..5973f47 100644
+--- a/init/main.c
++++ b/init/main.c
+@@ -603,7 +603,7 @@ asmlinkage void __init start_kernel(void)
+ 	pidmap_init();
+ 	anon_vma_init();
+ #ifdef CONFIG_X86
+-	if (efi_enabled)
++	if (efi_enabled(EFI_RUNTIME_SERVICES))
+ 		efi_enter_virtual_mode();
+ #endif
+ 	thread_info_cache_init();
+@@ -631,7 +631,7 @@ asmlinkage void __init start_kernel(void)
+ 	acpi_early_init(); /* before LAPIC and SMP init */
+ 	sfi_init_late();
+ 
+-	if (efi_enabled)
++	if (efi_enabled(EFI_RUNTIME_SERVICES))
+ 		efi_free_boot_services();
+ 
+ 	ftrace_init();
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index ff2bce5..2cd3492 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -422,12 +422,20 @@ static void __put_css_set(struct css_set *cg, int taskexit)
+ 		struct cgroup *cgrp = link->cgrp;
+ 		list_del(&link->cg_link_list);
+ 		list_del(&link->cgrp_link_list);
++
++		/*
++		 * We may not be holding cgroup_mutex, and if cgrp->count is
++		 * dropped to 0 the cgroup can be destroyed at any time, hence
++		 * rcu_read_lock is used to keep it alive.
++		 */
++		rcu_read_lock();
+ 		if (atomic_dec_and_test(&cgrp->count) &&
+ 		    notify_on_release(cgrp)) {
+ 			if (taskexit)
+ 				set_bit(CGRP_RELEASABLE, &cgrp->flags);
+ 			check_for_release(cgrp);
+ 		}
++		rcu_read_unlock();
+ 
+ 		kfree(link);
+ 	}
+@@ -2635,9 +2643,7 @@ static int cgroup_create_dir(struct cgroup *cgrp, struct dentry *dentry,
+ 		dentry->d_fsdata = cgrp;
+ 		inc_nlink(parent->d_inode);
+ 		rcu_assign_pointer(cgrp->dentry, dentry);
+-		dget(dentry);
+ 	}
+-	dput(dentry);
+ 
+ 	return error;
+ }
+diff --git a/kernel/cpuset.c b/kernel/cpuset.c
+index f33c715..01abde2 100644
+--- a/kernel/cpuset.c
++++ b/kernel/cpuset.c
+@@ -2519,8 +2519,16 @@ void cpuset_print_task_mems_allowed(struct task_struct *tsk)
+ 
+ 	dentry = task_cs(tsk)->css.cgroup->dentry;
+ 	spin_lock(&cpuset_buffer_lock);
+-	snprintf(cpuset_name, CPUSET_NAME_LEN,
+-		 dentry ? (const char *)dentry->d_name.name : "/");
++
++	if (!dentry) {
++		strcpy(cpuset_name, "/");
++	} else {
++		spin_lock(&dentry->d_lock);
++		strlcpy(cpuset_name, (const char *)dentry->d_name.name,
++			CPUSET_NAME_LEN);
++		spin_unlock(&dentry->d_lock);
++	}
++
+ 	nodelist_scnprintf(cpuset_nodelist, CPUSET_NODELIST_LEN,
+ 			   tsk->mems_allowed);
+ 	printk(KERN_INFO "%s cpuset=%s mems_allowed=%s\n",
+diff --git a/kernel/futex.c b/kernel/futex.c
+index 19eb089..8879430 100644
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -2471,8 +2471,6 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
+ 	if (!futex_cmpxchg_enabled)
+ 		return -ENOSYS;
+ 
+-	WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
+-
+ 	rcu_read_lock();
+ 
+ 	ret = -ESRCH;
+diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
+index 83e368b..a9642d5 100644
+--- a/kernel/futex_compat.c
++++ b/kernel/futex_compat.c
+@@ -142,8 +142,6 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
+ 	if (!futex_cmpxchg_enabled)
+ 		return -ENOSYS;
+ 
+-	WARN_ONCE(1, "deprecated: get_robust_list will be deleted in 2013.\n");
+-
+ 	rcu_read_lock();
+ 
+ 	ret = -ESRCH;
+diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
+index 6db7a5e..cdd5607 100644
+--- a/kernel/hrtimer.c
++++ b/kernel/hrtimer.c
+@@ -640,21 +640,9 @@ static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base)
+  * and expiry check is done in the hrtimer_interrupt or in the softirq.
+  */
+ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
+-					    struct hrtimer_clock_base *base,
+-					    int wakeup)
++					    struct hrtimer_clock_base *base)
+ {
+-	if (base->cpu_base->hres_active && hrtimer_reprogram(timer, base)) {
+-		if (wakeup) {
+-			raw_spin_unlock(&base->cpu_base->lock);
+-			raise_softirq_irqoff(HRTIMER_SOFTIRQ);
+-			raw_spin_lock(&base->cpu_base->lock);
+-		} else
+-			__raise_softirq_irqoff(HRTIMER_SOFTIRQ);
+-
+-		return 1;
+-	}
+-
+-	return 0;
++	return base->cpu_base->hres_active && hrtimer_reprogram(timer, base);
+ }
+ 
+ static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)
+@@ -735,8 +723,7 @@ static inline int hrtimer_switch_to_hres(void) { return 0; }
+ static inline void
+ hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
+ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
+-					    struct hrtimer_clock_base *base,
+-					    int wakeup)
++					    struct hrtimer_clock_base *base)
+ {
+ 	return 0;
+ }
+@@ -995,8 +982,21 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+ 	 *
+ 	 * XXX send_remote_softirq() ?
+ 	 */
+-	if (leftmost && new_base->cpu_base == &__get_cpu_var(hrtimer_bases))
+-		hrtimer_enqueue_reprogram(timer, new_base, wakeup);
++	if (leftmost && new_base->cpu_base == &__get_cpu_var(hrtimer_bases)
++		&& hrtimer_enqueue_reprogram(timer, new_base)) {
++		if (wakeup) {
++			/*
++			 * We need to drop cpu_base->lock to avoid a
++			 * lock ordering issue vs. rq->lock.
++			 */
++			raw_spin_unlock(&new_base->cpu_base->lock);
++			raise_softirq_irqoff(HRTIMER_SOFTIRQ);
++			local_irq_restore(flags);
++			return ret;
++		} else {
++			__raise_softirq_irqoff(HRTIMER_SOFTIRQ);
++		}
++	}
+ 
+ 	unlock_hrtimer_base(timer, &flags);
+ 
+diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
+index 4c69326..e48caf8 100644
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -716,6 +716,7 @@ static void
+ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)
+ {
+ 	cpumask_var_t mask;
++	bool valid = true;
+ 
+ 	if (!test_and_clear_bit(IRQTF_AFFINITY, &action->thread_flags))
+ 		return;
+@@ -730,10 +731,18 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)
+ 	}
+ 
+ 	raw_spin_lock_irq(&desc->lock);
+-	cpumask_copy(mask, desc->irq_data.affinity);
++	/*
++	 * This code is triggered unconditionally. Check the affinity
++	 * mask pointer. For CPU_MASK_OFFSTACK=n this is optimized out.
++	 */
++	if (desc->irq_data.affinity)
++		cpumask_copy(mask, desc->irq_data.affinity);
++	else
++		valid = false;
+ 	raw_spin_unlock_irq(&desc->lock);
+ 
+-	set_cpus_allowed_ptr(current, mask);
++	if (valid)
++		set_cpus_allowed_ptr(current, mask);
+ 	free_cpumask_var(mask);
+ }
+ #else
+@@ -936,6 +945,16 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
+ 		 */
+ 		get_task_struct(t);
+ 		new->thread = t;
++		/*
++		 * Tell the thread to set its affinity. This is
++		 * important for shared interrupt handlers as we do
++		 * not invoke setup_affinity() for the secondary
++		 * handlers as everything is already set up. Even for
++		 * interrupts marked with IRQF_NO_BALANCE this is
++		 * correct as we want the thread to move to the cpu(s)
++		 * on which the requesting code placed the interrupt.
++		 */
++		set_bit(IRQTF_AFFINITY, &new->thread_flags);
+ 	}
+ 
+ 	if (!alloc_cpumask_var(&mask, GFP_KERNEL)) {
+diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
+index 611cd60..7b5f012 100644
+--- a/kernel/irq/spurious.c
++++ b/kernel/irq/spurious.c
+@@ -80,13 +80,11 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
+ 
+ 	/*
+ 	 * All handlers must agree on IRQF_SHARED, so we test just the
+-	 * first. Check for action->next as well.
++	 * first.
+ 	 */
+ 	action = desc->action;
+ 	if (!action || !(action->flags & IRQF_SHARED) ||
+-	    (action->flags & __IRQF_TIMER) ||
+-	    (action->handler(irq, action->dev_id) == IRQ_HANDLED) ||
+-	    !action->next)
++	    (action->flags & __IRQF_TIMER))
+ 		goto out;
+ 
+ 	/* Already running on another processor */
+@@ -104,6 +102,7 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
+ 	do {
+ 		if (handle_irq_event(desc) == IRQ_HANDLED)
+ 			ret = IRQ_HANDLED;
++		/* Make sure that there is still a valid action */
+ 		action = desc->action;
+ 	} while ((desc->istate & IRQS_PENDING) && action);
+ 	desc->istate &= ~IRQS_POLL_INPROGRESS;
+diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
+index 125cb67..acbb79c 100644
+--- a/kernel/posix-cpu-timers.c
++++ b/kernel/posix-cpu-timers.c
+@@ -1422,8 +1422,10 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags,
+ 		while (!signal_pending(current)) {
+ 			if (timer.it.cpu.expires.sched == 0) {
+ 				/*
+-				 * Our timer fired and was reset.
++				 * Our timer fired and was reset, below
++				 * deletion can not fail.
+ 				 */
++				posix_cpu_timer_del(&timer);
+ 				spin_unlock_irq(&timer.it_lock);
+ 				return 0;
+ 			}
+@@ -1441,9 +1443,26 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags,
+ 		 * We were interrupted by a signal.
+ 		 */
+ 		sample_to_timespec(which_clock, timer.it.cpu.expires, rqtp);
+-		posix_cpu_timer_set(&timer, 0, &zero_it, it);
++		error = posix_cpu_timer_set(&timer, 0, &zero_it, it);
++		if (!error) {
++			/*
++			 * Timer is now unarmed, deletion can not fail.
++			 */
++			posix_cpu_timer_del(&timer);
++		}
+ 		spin_unlock_irq(&timer.it_lock);
+ 
++		while (error == TIMER_RETRY) {
++			/*
++			 * We need to handle case when timer was or is in the
++			 * middle of firing. In other cases we already freed
++			 * resources.
++			 */
++			spin_lock_irq(&timer.it_lock);
++			error = posix_cpu_timer_del(&timer);
++			spin_unlock_irq(&timer.it_lock);
++		}
++
+ 		if ((it->it_value.tv_sec | it->it_value.tv_nsec) == 0) {
+ 			/*
+ 			 * It actually did fire already.
+diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
+index 69185ae..e885be1 100644
+--- a/kernel/posix-timers.c
++++ b/kernel/posix-timers.c
+@@ -639,6 +639,13 @@ static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags)
+ {
+ 	struct k_itimer *timr;
+ 
++	/*
++	 * timer_t could be any type >= int and we want to make sure any
++	 * @timer_id outside positive int range fails lookup.
++	 */
++	if ((unsigned long long)timer_id > INT_MAX)
++		return NULL;
++
+ 	rcu_read_lock();
+ 	timr = idr_find(&posix_timers_id, (int)timer_id);
+ 	if (timr) {
+diff --git a/kernel/ptrace.c b/kernel/ptrace.c
+index a232bb5..b96de86b4 100644
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -117,11 +117,45 @@ void __ptrace_unlink(struct task_struct *child)
+ 	 * TASK_KILLABLE sleeps.
+ 	 */
+ 	if (child->jobctl & JOBCTL_STOP_PENDING || task_is_traced(child))
+-		signal_wake_up(child, task_is_traced(child));
++		ptrace_signal_wake_up(child, true);
+ 
+ 	spin_unlock(&child->sighand->siglock);
+ }
+ 
++/* Ensure that nothing can wake it up, even SIGKILL */
++static bool ptrace_freeze_traced(struct task_struct *task)
++{
++	bool ret = false;
++
++	/* Lockless, nobody but us can set this flag */
++	if (task->jobctl & JOBCTL_LISTENING)
++		return ret;
++
++	spin_lock_irq(&task->sighand->siglock);
++	if (task_is_traced(task) && !__fatal_signal_pending(task)) {
++		task->state = __TASK_TRACED;
++		ret = true;
++	}
++	spin_unlock_irq(&task->sighand->siglock);
++
++	return ret;
++}
++
++static void ptrace_unfreeze_traced(struct task_struct *task)
++{
++	if (task->state != __TASK_TRACED)
++		return;
++
++	WARN_ON(!task->ptrace || task->parent != current);
++
++	spin_lock_irq(&task->sighand->siglock);
++	if (__fatal_signal_pending(task))
++		wake_up_state(task, __TASK_TRACED);
++	else
++		task->state = TASK_TRACED;
++	spin_unlock_irq(&task->sighand->siglock);
++}
++
+ /**
+  * ptrace_check_attach - check whether ptracee is ready for ptrace operation
+  * @child: ptracee to check for
+@@ -151,24 +185,29 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
+ 	 * be changed by us so it's not changing right after this.
+ 	 */
+ 	read_lock(&tasklist_lock);
+-	if ((child->ptrace & PT_PTRACED) && child->parent == current) {
++	if (child->ptrace && child->parent == current) {
++		WARN_ON(child->state == __TASK_TRACED);
+ 		/*
+ 		 * child->sighand can't be NULL, release_task()
+ 		 * does ptrace_unlink() before __exit_signal().
+ 		 */
+-		spin_lock_irq(&child->sighand->siglock);
+-		WARN_ON_ONCE(task_is_stopped(child));
+-		if (ignore_state || (task_is_traced(child) &&
+-				     !(child->jobctl & JOBCTL_LISTENING)))
++		if (ignore_state || ptrace_freeze_traced(child))
+ 			ret = 0;
+-		spin_unlock_irq(&child->sighand->siglock);
+ 	}
+ 	read_unlock(&tasklist_lock);
+ 
+-	if (!ret && !ignore_state)
+-		ret = wait_task_inactive(child, TASK_TRACED) ? 0 : -ESRCH;
++	if (!ret && !ignore_state) {
++		if (!wait_task_inactive(child, __TASK_TRACED)) {
++			/*
++			 * This can only happen if may_ptrace_stop() fails and
++			 * ptrace_stop() changes ->state back to TASK_RUNNING,
++			 * so we should not worry about leaking __TASK_TRACED.
++			 */
++			WARN_ON(child->state == __TASK_TRACED);
++			ret = -ESRCH;
++		}
++	}
+ 
+-	/* All systems go.. */
+ 	return ret;
+ }
+ 
+@@ -310,7 +349,7 @@ static int ptrace_attach(struct task_struct *task, long request,
+ 	 */
+ 	if (task_is_stopped(task) &&
+ 	    task_set_jobctl_pending(task, JOBCTL_TRAP_STOP | JOBCTL_TRAPPING))
+-		signal_wake_up(task, 1);
++		signal_wake_up_state(task, __TASK_STOPPED);
+ 
+ 	spin_unlock(&task->sighand->siglock);
+ 
+@@ -727,7 +766,7 @@ int ptrace_request(struct task_struct *child, long request,
+ 		 * tracee into STOP.
+ 		 */
+ 		if (likely(task_set_jobctl_pending(child, JOBCTL_TRAP_STOP)))
+-			signal_wake_up(child, child->jobctl & JOBCTL_LISTENING);
++			ptrace_signal_wake_up(child, child->jobctl & JOBCTL_LISTENING);
+ 
+ 		unlock_task_sighand(child, &flags);
+ 		ret = 0;
+@@ -753,7 +792,7 @@ int ptrace_request(struct task_struct *child, long request,
+ 			 * start of this trap and now.  Trigger re-trap.
+ 			 */
+ 			if (child->jobctl & JOBCTL_TRAP_NOTIFY)
+-				signal_wake_up(child, true);
++				ptrace_signal_wake_up(child, true);
+ 			ret = 0;
+ 		}
+ 		unlock_task_sighand(child, &flags);
+@@ -890,6 +929,8 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
+ 		goto out_put_task_struct;
+ 
+ 	ret = arch_ptrace(child, request, addr, data);
++	if (ret || request != PTRACE_DETACH)
++		ptrace_unfreeze_traced(child);
+ 
+  out_put_task_struct:
+ 	put_task_struct(child);
+@@ -1029,8 +1070,11 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
+ 
+ 	ret = ptrace_check_attach(child, request == PTRACE_KILL ||
+ 				  request == PTRACE_INTERRUPT);
+-	if (!ret)
++	if (!ret) {
+ 		ret = compat_arch_ptrace(child, request, addr, data);
++		if (ret || request != PTRACE_DETACH)
++			ptrace_unfreeze_traced(child);
++	}
+ 
+  out_put_task_struct:
+ 	put_task_struct(child);
+diff --git a/kernel/resource.c b/kernel/resource.c
+index 34d4588..73f35d4 100644
+--- a/kernel/resource.c
++++ b/kernel/resource.c
+@@ -763,6 +763,7 @@ static void __init __reserve_region_with_split(struct resource *root,
+ 	struct resource *parent = root;
+ 	struct resource *conflict;
+ 	struct resource *res = kzalloc(sizeof(*res), GFP_ATOMIC);
++	struct resource *next_res = NULL;
+ 
+ 	if (!res)
+ 		return;
+@@ -772,21 +773,46 @@ static void __init __reserve_region_with_split(struct resource *root,
+ 	res->end = end;
+ 	res->flags = IORESOURCE_BUSY;
+ 
+-	conflict = __request_resource(parent, res);
+-	if (!conflict)
+-		return;
++	while (1) {
+ 
+-	/* failed, split and try again */
+-	kfree(res);
++		conflict = __request_resource(parent, res);
++		if (!conflict) {
++			if (!next_res)
++				break;
++			res = next_res;
++			next_res = NULL;
++			continue;
++		}
+ 
+-	/* conflict covered whole area */
+-	if (conflict->start <= start && conflict->end >= end)
+-		return;
++		/* conflict covered whole area */
++		if (conflict->start <= res->start &&
++				conflict->end >= res->end) {
++			kfree(res);
++			WARN_ON(next_res);
++			break;
++		}
++
++		/* failed, split and try again */
++		if (conflict->start > res->start) {
++			end = res->end;
++			res->end = conflict->start - 1;
++			if (conflict->end < end) {
++				next_res = kzalloc(sizeof(*next_res),
++						GFP_ATOMIC);
++				if (!next_res) {
++					kfree(res);
++					break;
++				}
++				next_res->name = name;
++				next_res->start = conflict->end + 1;
++				next_res->end = end;
++				next_res->flags = IORESOURCE_BUSY;
++			}
++		} else {
++			res->start = conflict->end + 1;
++		}
++	}
+ 
+-	if (conflict->start > start)
+-		__reserve_region_with_split(root, start, conflict->start-1, name);
+-	if (conflict->end < end)
+-		__reserve_region_with_split(root, conflict->end+1, end, name);
+ }
+ 
+ void __init reserve_region_with_split(struct resource *root,
+diff --git a/kernel/sched/core.c b/kernel/sched/core.c
+index 1a48cdb..5eb6c96 100644
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -1686,7 +1686,8 @@ out:
+  */
+ int wake_up_process(struct task_struct *p)
+ {
+-	return try_to_wake_up(p, TASK_ALL, 0);
++	WARN_ON(task_is_stopped_or_traced(p));
++	return try_to_wake_up(p, TASK_NORMAL, 0);
+ }
+ EXPORT_SYMBOL(wake_up_process);
+ 
+diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
+index e0b7ba9..71e2fcc 100644
+--- a/kernel/sched/rt.c
++++ b/kernel/sched/rt.c
+@@ -566,7 +566,7 @@ static inline struct rt_bandwidth *sched_rt_bandwidth(struct rt_rq *rt_rq)
+ static int do_balance_runtime(struct rt_rq *rt_rq)
+ {
+ 	struct rt_bandwidth *rt_b = sched_rt_bandwidth(rt_rq);
+-	struct root_domain *rd = cpu_rq(smp_processor_id())->rd;
++	struct root_domain *rd = rq_of_rt_rq(rt_rq)->rd;
+ 	int i, weight, more = 0;
+ 	u64 rt_period;
+ 
+diff --git a/kernel/signal.c b/kernel/signal.c
+index be4f856..67b64be 100644
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -678,23 +678,17 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
+  * No need to set need_resched since signal event passing
+  * goes through ->blocked
+  */
+-void signal_wake_up(struct task_struct *t, int resume)
++void signal_wake_up_state(struct task_struct *t, unsigned int state)
+ {
+-	unsigned int mask;
+-
+ 	set_tsk_thread_flag(t, TIF_SIGPENDING);
+-
+ 	/*
+-	 * For SIGKILL, we want to wake it up in the stopped/traced/killable
++	 * TASK_WAKEKILL also means wake it up in the stopped/traced/killable
+ 	 * case. We don't check t->state here because there is a race with it
+ 	 * executing another processor and just now entering stopped state.
+ 	 * By using wake_up_state, we ensure the process will wake up and
+ 	 * handle its death signal.
+ 	 */
+-	mask = TASK_INTERRUPTIBLE;
+-	if (resume)
+-		mask |= TASK_WAKEKILL;
+-	if (!wake_up_state(t, mask))
++	if (!wake_up_state(t, state | TASK_INTERRUPTIBLE))
+ 		kick_process(t);
+ }
+ 
+@@ -842,7 +836,7 @@ static void ptrace_trap_notify(struct task_struct *t)
+ 	assert_spin_locked(&t->sighand->siglock);
+ 
+ 	task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY);
+-	signal_wake_up(t, t->jobctl & JOBCTL_LISTENING);
++	ptrace_signal_wake_up(t, t->jobctl & JOBCTL_LISTENING);
+ }
+ 
+ /*
+@@ -1797,6 +1791,10 @@ static inline int may_ptrace_stop(void)
+ 	 * If SIGKILL was already sent before the caller unlocked
+ 	 * ->siglock we must see ->core_state != NULL. Otherwise it
+ 	 * is safe to enter schedule().
++	 *
++	 * This is almost outdated, a task with the pending SIGKILL can't
++	 * block in TASK_TRACED. But PTRACE_EVENT_EXIT can be reported
++	 * after SIGKILL was already dequeued.
+ 	 */
+ 	if (unlikely(current->mm->core_state) &&
+ 	    unlikely(current->mm == current->parent->mm))
+@@ -1922,6 +1920,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
+ 		if (gstop_done)
+ 			do_notify_parent_cldstop(current, false, why);
+ 
++		/* tasklist protects us from ptrace_freeze_traced() */
+ 		__set_current_state(TASK_RUNNING);
+ 		if (clear_code)
+ 			current->exit_code = 0;
+diff --git a/kernel/smp.c b/kernel/smp.c
+index 29dd40a..69f38bd 100644
+--- a/kernel/smp.c
++++ b/kernel/smp.c
+@@ -33,6 +33,7 @@ struct call_function_data {
+ 	struct call_single_data	csd;
+ 	atomic_t		refs;
+ 	cpumask_var_t		cpumask;
++	cpumask_var_t		cpumask_ipi;
+ };
+ 
+ static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_function_data, cfd_data);
+@@ -56,6 +57,9 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ 		if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,
+ 				cpu_to_node(cpu)))
+ 			return notifier_from_errno(-ENOMEM);
++		if (!zalloc_cpumask_var_node(&cfd->cpumask_ipi, GFP_KERNEL,
++				cpu_to_node(cpu)))
++			return notifier_from_errno(-ENOMEM);
+ 		break;
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
+@@ -65,6 +69,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
+ 	case CPU_DEAD:
+ 	case CPU_DEAD_FROZEN:
+ 		free_cpumask_var(cfd->cpumask);
++		free_cpumask_var(cfd->cpumask_ipi);
+ 		break;
+ #endif
+ 	};
+@@ -526,6 +531,12 @@ void smp_call_function_many(const struct cpumask *mask,
+ 		return;
+ 	}
+ 
++	/*
++	 * After we put an entry into the list, data->cpumask
++	 * may be cleared again when another CPU sends another IPI for
++	 * a SMP function call, so data->cpumask will be zero.
++	 */
++	cpumask_copy(data->cpumask_ipi, data->cpumask);
+ 	raw_spin_lock_irqsave(&call_function.lock, flags);
+ 	/*
+ 	 * Place entry at the _HEAD_ of the list, so that any cpu still
+@@ -549,7 +560,7 @@ void smp_call_function_many(const struct cpumask *mask,
+ 	smp_mb();
+ 
+ 	/* Send a message to all CPUs in the map */
+-	arch_send_call_function_ipi_mask(data->cpumask);
++	arch_send_call_function_ipi_mask(data->cpumask_ipi);
+ 
+ 	/* Optionally wait for the CPUs to complete */
+ 	if (wait)
+diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
+index 65bdcf1..c2f6d47 100644
+--- a/kernel/sysctl_binary.c
++++ b/kernel/sysctl_binary.c
+@@ -1194,9 +1194,10 @@ static ssize_t bin_dn_node_address(struct file *file,
+ 
+ 		/* Convert the decnet address to binary */
+ 		result = -EIO;
+-		nodep = strchr(buf, '.') + 1;
++		nodep = strchr(buf, '.');
+ 		if (!nodep)
+ 			goto out;
++		++nodep;
+ 
+ 		area = simple_strtoul(buf, NULL, 10);
+ 		node = simple_strtoul(nodep, NULL, 10);
+diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
+index eb51d76..3f42652 100644
+--- a/kernel/timeconst.pl
++++ b/kernel/timeconst.pl
+@@ -369,10 +369,8 @@ if ($hz eq '--can') {
+ 		die "Usage: $0 HZ\n";
+ 	}
+ 
+-	@val = @{$canned_values{$hz}};
+-	if (!defined(@val)) {
+-		@val = compute_values($hz);
+-	}
++	$cv = $canned_values{$hz};
++	@val = defined($cv) ? @$cv : compute_values($hz);
+ 	output($hz, @val);
+ }
+ exit 0;
+diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
+index 781ecc2..384699f 100644
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -3835,35 +3835,49 @@ static void ftrace_init_module(struct module *mod,
+ 	ftrace_process_locs(mod, start, end);
+ }
+ 
+-static int ftrace_module_notify(struct notifier_block *self,
+-				unsigned long val, void *data)
++static int ftrace_module_notify_enter(struct notifier_block *self,
++				      unsigned long val, void *data)
+ {
+ 	struct module *mod = data;
+ 
+-	switch (val) {
+-	case MODULE_STATE_COMING:
++	if (val == MODULE_STATE_COMING)
+ 		ftrace_init_module(mod, mod->ftrace_callsites,
+ 				   mod->ftrace_callsites +
+ 				   mod->num_ftrace_callsites);
+-		break;
+-	case MODULE_STATE_GOING:
++	return 0;
++}
++
++static int ftrace_module_notify_exit(struct notifier_block *self,
++				     unsigned long val, void *data)
++{
++	struct module *mod = data;
++
++	if (val == MODULE_STATE_GOING)
+ 		ftrace_release_mod(mod);
+-		break;
+-	}
+ 
+ 	return 0;
+ }
+ #else
+-static int ftrace_module_notify(struct notifier_block *self,
+-				unsigned long val, void *data)
++static int ftrace_module_notify_enter(struct notifier_block *self,
++				      unsigned long val, void *data)
++{
++	return 0;
++}
++static int ftrace_module_notify_exit(struct notifier_block *self,
++				     unsigned long val, void *data)
+ {
+ 	return 0;
+ }
+ #endif /* CONFIG_MODULES */
+ 
+-struct notifier_block ftrace_module_nb = {
+-	.notifier_call = ftrace_module_notify,
+-	.priority = 0,
++struct notifier_block ftrace_module_enter_nb = {
++	.notifier_call = ftrace_module_notify_enter,
++	.priority = INT_MAX,	/* Run before anything that can use kprobes */
++};
++
++struct notifier_block ftrace_module_exit_nb = {
++	.notifier_call = ftrace_module_notify_exit,
++	.priority = INT_MIN,	/* Run after anything that can remove kprobes */
+ };
+ 
+ extern unsigned long __start_mcount_loc[];
+@@ -3897,9 +3911,13 @@ void __init ftrace_init(void)
+ 				  __start_mcount_loc,
+ 				  __stop_mcount_loc);
+ 
+-	ret = register_module_notifier(&ftrace_module_nb);
++	ret = register_module_notifier(&ftrace_module_enter_nb);
++	if (ret)
++		pr_warning("Failed to register trace ftrace module enter notifier\n");
++
++	ret = register_module_notifier(&ftrace_module_exit_nb);
+ 	if (ret)
+-		pr_warning("Failed to register trace ftrace module notifier\n");
++		pr_warning("Failed to register trace ftrace module exit notifier\n");
+ 
+ 	set_ftrace_early_filters();
+ 
+diff --git a/lib/atomic64.c b/lib/atomic64.c
+index 9785378..08a4f06 100644
+--- a/lib/atomic64.c
++++ b/lib/atomic64.c
+@@ -31,7 +31,11 @@
+ static union {
+ 	raw_spinlock_t lock;
+ 	char pad[L1_CACHE_BYTES];
+-} atomic64_lock[NR_LOCKS] __cacheline_aligned_in_smp;
++} atomic64_lock[NR_LOCKS] __cacheline_aligned_in_smp = {
++	[0 ... (NR_LOCKS - 1)] = {
++		.lock =  __RAW_SPIN_LOCK_UNLOCKED(atomic64_lock.lock),
++	},
++};
+ 
+ static inline raw_spinlock_t *lock_addr(const atomic64_t *v)
+ {
+@@ -173,14 +177,3 @@ int atomic64_add_unless(atomic64_t *v, long long a, long long u)
+ 	return ret;
+ }
+ EXPORT_SYMBOL(atomic64_add_unless);
+-
+-static int init_atomic64_lock(void)
+-{
+-	int i;
+-
+-	for (i = 0; i < NR_LOCKS; ++i)
+-		raw_spin_lock_init(&atomic64_lock[i].lock);
+-	return 0;
+-}
+-
+-pure_initcall(init_atomic64_lock);
+diff --git a/lib/digsig.c b/lib/digsig.c
+index 8c0e629..dc2be7e 100644
+--- a/lib/digsig.c
++++ b/lib/digsig.c
+@@ -162,6 +162,8 @@ static int digsig_verify_rsa(struct key *key,
+ 	memset(out1, 0, head);
+ 	memcpy(out1 + head, p, l);
+ 
++	kfree(p);
++
+ 	err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len);
+ 	if (err)
+ 		goto err;
+diff --git a/lib/idr.c b/lib/idr.c
+index 4046e29..e90d2d0 100644
+--- a/lib/idr.c
++++ b/lib/idr.c
+@@ -625,7 +625,14 @@ void *idr_get_next(struct idr *idp, int *nextidp)
+ 			return p;
+ 		}
+ 
+-		id += 1 << n;
++		/*
++		 * Proceed to the next layer at the current level.  Unlike
++		 * idr_for_each(), @id isn't guaranteed to be aligned to
++		 * layer boundary at this point and adding 1 << n may
++		 * incorrectly skip IDs.  Make sure we jump to the
++		 * beginning of the next layer using round_up().
++		 */
++		id = round_up(id + 1, 1 << n);
+ 		while (n < fls(id)) {
+ 			n += IDR_BITS;
+ 			p = *--paa;
+diff --git a/mm/compaction.c b/mm/compaction.c
+index 7fcd3a5..214944a 100644
+--- a/mm/compaction.c
++++ b/mm/compaction.c
+@@ -956,7 +956,7 @@ static int compact_node(int nid)
+ }
+ 
+ /* Compact all nodes in the system */
+-static int compact_nodes(void)
++static void compact_nodes(void)
+ {
+ 	int nid;
+ 
+@@ -965,8 +965,6 @@ static int compact_nodes(void)
+ 
+ 	for_each_online_node(nid)
+ 		compact_node(nid);
+-
+-	return COMPACT_COMPLETE;
+ }
+ 
+ /* The written value is actually unused, all memory is compacted */
+@@ -977,7 +975,7 @@ int sysctl_compaction_handler(struct ctl_table *table, int write,
+ 			void __user *buffer, size_t *length, loff_t *ppos)
+ {
+ 	if (write)
+-		return compact_nodes();
++		compact_nodes();
+ 
+ 	return 0;
+ }
+diff --git a/mm/fadvise.c b/mm/fadvise.c
+index 9b75a04..69f317d 100644
+--- a/mm/fadvise.c
++++ b/mm/fadvise.c
+@@ -17,6 +17,7 @@
+ #include <linux/fadvise.h>
+ #include <linux/writeback.h>
+ #include <linux/syscalls.h>
++#include <linux/swap.h>
+ 
+ #include <asm/unistd.h>
+ 
+@@ -120,9 +121,22 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
+ 		start_index = (offset+(PAGE_CACHE_SIZE-1)) >> PAGE_CACHE_SHIFT;
+ 		end_index = (endbyte >> PAGE_CACHE_SHIFT);
+ 
+-		if (end_index >= start_index)
+-			invalidate_mapping_pages(mapping, start_index,
++		if (end_index >= start_index) {
++			unsigned long count = invalidate_mapping_pages(mapping,
++						start_index, end_index);
++
++			/*
++			 * If fewer pages were invalidated than expected then
++			 * it is possible that some of the pages were on
++			 * a per-cpu pagevec for a remote CPU. Drain all
++			 * pagevecs and try again.
++			 */
++			if (count < (end_index - start_index + 1)) {
++				lru_add_drain_all();
++				invalidate_mapping_pages(mapping, start_index,
+ 						end_index);
++			}
++		}
+ 		break;
+ 	default:
+ 		ret = -EINVAL;
+diff --git a/mm/memory.c b/mm/memory.c
+index 5736170..29ffb5c 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
+@@ -182,10 +182,14 @@ static int tlb_next_batch(struct mmu_gather *tlb)
+ 		return 1;
+ 	}
+ 
++	if (tlb->batch_count == MAX_GATHER_BATCH_COUNT)
++		return 0;
++
+ 	batch = (void *)__get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);
+ 	if (!batch)
+ 		return 0;
+ 
++	tlb->batch_count++;
+ 	batch->next = NULL;
+ 	batch->nr   = 0;
+ 	batch->max  = MAX_GATHER_BATCH;
+@@ -214,6 +218,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, bool fullmm)
+ 	tlb->local.nr   = 0;
+ 	tlb->local.max  = ARRAY_SIZE(tlb->__pages);
+ 	tlb->active     = &tlb->local;
++	tlb->batch_count = 0;
+ 
+ #ifdef CONFIG_HAVE_RCU_TABLE_FREE
+ 	tlb->batch = NULL;
+diff --git a/mm/mempolicy.c b/mm/mempolicy.c
+index 01350d3..5e0fea1 100644
+--- a/mm/mempolicy.c
++++ b/mm/mempolicy.c
+@@ -2370,8 +2370,7 @@ void numa_default_policy(void)
+  */
+ 
+ /*
+- * "local" is pseudo-policy:  MPOL_PREFERRED with MPOL_F_LOCAL flag
+- * Used only for mpol_parse_str() and mpol_to_str()
++ * "local" is implemented internally by MPOL_PREFERRED with MPOL_F_LOCAL flag.
+  */
+ #define MPOL_LOCAL MPOL_MAX
+ static const char * const policy_modes[] =
+@@ -2386,28 +2385,21 @@ static const char * const policy_modes[] =
+ 
+ #ifdef CONFIG_TMPFS
+ /**
+- * mpol_parse_str - parse string to mempolicy
++ * mpol_parse_str - parse string to mempolicy, for tmpfs mpol mount option.
+  * @str:  string containing mempolicy to parse
+  * @mpol:  pointer to struct mempolicy pointer, returned on success.
+- * @no_context:  flag whether to "contextualize" the mempolicy
++ * @unused:  redundant argument, to be removed later.
+  *
+  * Format of input:
+  *	<mode>[=<flags>][:<nodelist>]
+  *
+- * if @no_context is true, save the input nodemask in w.user_nodemask in
+- * the returned mempolicy.  This will be used to "clone" the mempolicy in
+- * a specific context [cpuset] at a later time.  Used to parse tmpfs mpol
+- * mount option.  Note that if 'static' or 'relative' mode flags were
+- * specified, the input nodemask will already have been saved.  Saving
+- * it again is redundant, but safe.
+- *
+  * On success, returns 0, else 1
+  */
+-int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
++int mpol_parse_str(char *str, struct mempolicy **mpol, int unused)
+ {
+ 	struct mempolicy *new = NULL;
+ 	unsigned short mode;
+-	unsigned short uninitialized_var(mode_flags);
++	unsigned short mode_flags;
+ 	nodemask_t nodes;
+ 	char *nodelist = strchr(str, ':');
+ 	char *flags = strchr(str, '=');
+@@ -2495,24 +2487,23 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
+ 	if (IS_ERR(new))
+ 		goto out;
+ 
+-	if (no_context) {
+-		/* save for contextualization */
+-		new->w.user_nodemask = nodes;
+-	} else {
+-		int ret;
+-		NODEMASK_SCRATCH(scratch);
+-		if (scratch) {
+-			task_lock(current);
+-			ret = mpol_set_nodemask(new, &nodes, scratch);
+-			task_unlock(current);
+-		} else
+-			ret = -ENOMEM;
+-		NODEMASK_SCRATCH_FREE(scratch);
+-		if (ret) {
+-			mpol_put(new);
+-			goto out;
+-		}
+-	}
++	/*
++	 * Save nodes for mpol_to_str() to show the tmpfs mount options
++	 * for /proc/mounts, /proc/pid/mounts and /proc/pid/mountinfo.
++	 */
++	if (mode != MPOL_PREFERRED)
++		new->v.nodes = nodes;
++	else if (nodelist)
++		new->v.preferred_node = first_node(nodes);
++	else
++		new->flags |= MPOL_F_LOCAL;
++
++	/*
++	 * Save nodes for contextualization: this will be used to "clone"
++	 * the mempolicy in a specific context [cpuset] at a later time.
++	 */
++	new->w.user_nodemask = nodes;
++
+ 	err = 0;
+ 
+ out:
+@@ -2532,13 +2523,13 @@ out:
+  * @buffer:  to contain formatted mempolicy string
+  * @maxlen:  length of @buffer
+  * @pol:  pointer to mempolicy to be formatted
+- * @no_context:  "context free" mempolicy - use nodemask in w.user_nodemask
++ * @unused:  redundant argument, to be removed later.
+  *
+  * Convert a mempolicy into a string.
+  * Returns the number of characters in buffer (if positive)
+  * or an error (negative)
+  */
+-int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
++int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int unused)
+ {
+ 	char *p = buffer;
+ 	int l;
+@@ -2564,7 +2555,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
+ 	case MPOL_PREFERRED:
+ 		nodes_clear(nodes);
+ 		if (flags & MPOL_F_LOCAL)
+-			mode = MPOL_LOCAL;	/* pseudo-policy */
++			mode = MPOL_LOCAL;
+ 		else
+ 			node_set(pol->v.preferred_node, nodes);
+ 		break;
+@@ -2572,10 +2563,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
+ 	case MPOL_BIND:
+ 		/* Fall through */
+ 	case MPOL_INTERLEAVE:
+-		if (no_context)
+-			nodes = pol->w.user_nodemask;
+-		else
+-			nodes = pol->v.nodes;
++		nodes = pol->v.nodes;
+ 		break;
+ 
+ 	default:
+diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
+index 862b608..8d1ca2d 100644
+--- a/mm/mmu_notifier.c
++++ b/mm/mmu_notifier.c
+@@ -14,10 +14,14 @@
+ #include <linux/export.h>
+ #include <linux/mm.h>
+ #include <linux/err.h>
++#include <linux/srcu.h>
+ #include <linux/rcupdate.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
+ 
++/* global SRCU for all MMs */
++static struct srcu_struct srcu;
++
+ /*
+  * This function can't run concurrently against mmu_notifier_register
+  * because mm->mm_users > 0 during mmu_notifier_register and exit_mmap
+@@ -25,58 +29,61 @@
+  * in parallel despite there being no task using this mm any more,
+  * through the vmas outside of the exit_mmap context, such as with
+  * vmtruncate. This serializes against mmu_notifier_unregister with
+- * the mmu_notifier_mm->lock in addition to RCU and it serializes
+- * against the other mmu notifiers with RCU. struct mmu_notifier_mm
++ * the mmu_notifier_mm->lock in addition to SRCU and it serializes
++ * against the other mmu notifiers with SRCU. struct mmu_notifier_mm
+  * can't go away from under us as exit_mmap holds an mm_count pin
+  * itself.
+  */
+ void __mmu_notifier_release(struct mm_struct *mm)
+ {
+ 	struct mmu_notifier *mn;
+-	struct hlist_node *n;
++	int id;
+ 
+ 	/*
+-	 * RCU here will block mmu_notifier_unregister until
+-	 * ->release returns.
++	 * srcu_read_lock() here will block synchronize_srcu() in
++	 * mmu_notifier_unregister() until all registered
++	 * ->release() callouts this function makes have
++	 * returned.
+ 	 */
+-	rcu_read_lock();
+-	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist)
+-		/*
+-		 * if ->release runs before mmu_notifier_unregister it
+-		 * must be handled as it's the only way for the driver
+-		 * to flush all existing sptes and stop the driver
+-		 * from establishing any more sptes before all the
+-		 * pages in the mm are freed.
+-		 */
+-		if (mn->ops->release)
+-			mn->ops->release(mn, mm);
+-	rcu_read_unlock();
+-
++	id = srcu_read_lock(&srcu);
+ 	spin_lock(&mm->mmu_notifier_mm->lock);
+ 	while (unlikely(!hlist_empty(&mm->mmu_notifier_mm->list))) {
+ 		mn = hlist_entry(mm->mmu_notifier_mm->list.first,
+ 				 struct mmu_notifier,
+ 				 hlist);
++
+ 		/*
+-		 * We arrived before mmu_notifier_unregister so
+-		 * mmu_notifier_unregister will do nothing other than
+-		 * to wait ->release to finish and
+-		 * mmu_notifier_unregister to return.
++		 * Unlink.  This will prevent mmu_notifier_unregister()
++		 * from also making the ->release() callout.
+ 		 */
+ 		hlist_del_init_rcu(&mn->hlist);
++		spin_unlock(&mm->mmu_notifier_mm->lock);
++
++		/*
++		 * Clear sptes. (see 'release' description in mmu_notifier.h)
++		 */
++		if (mn->ops->release)
++			mn->ops->release(mn, mm);
++
++		spin_lock(&mm->mmu_notifier_mm->lock);
+ 	}
+ 	spin_unlock(&mm->mmu_notifier_mm->lock);
+ 
+ 	/*
+-	 * synchronize_rcu here prevents mmu_notifier_release to
+-	 * return to exit_mmap (which would proceed freeing all pages
+-	 * in the mm) until the ->release method returns, if it was
+-	 * invoked by mmu_notifier_unregister.
+-	 *
+-	 * The mmu_notifier_mm can't go away from under us because one
+-	 * mm_count is hold by exit_mmap.
++	 * All callouts to ->release() which we have done are complete.
++	 * Allow synchronize_srcu() in mmu_notifier_unregister() to complete
++	 */
++	srcu_read_unlock(&srcu, id);
++
++	/*
++	 * mmu_notifier_unregister() may have unlinked a notifier and may
++	 * still be calling out to it.	Additionally, other notifiers
++	 * may have been active via vmtruncate() et. al. Block here
++	 * to ensure that all notifier callouts for this mm have been
++	 * completed and the sptes are really cleaned up before returning
++	 * to exit_mmap().
+ 	 */
+-	synchronize_rcu();
++	synchronize_srcu(&srcu);
+ }
+ 
+ /*
+@@ -89,14 +96,14 @@ int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
+ {
+ 	struct mmu_notifier *mn;
+ 	struct hlist_node *n;
+-	int young = 0;
++	int young = 0, id;
+ 
+-	rcu_read_lock();
++	id = srcu_read_lock(&srcu);
+ 	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+ 		if (mn->ops->clear_flush_young)
+ 			young |= mn->ops->clear_flush_young(mn, mm, address);
+ 	}
+-	rcu_read_unlock();
++	srcu_read_unlock(&srcu, id);
+ 
+ 	return young;
+ }
+@@ -106,9 +113,9 @@ int __mmu_notifier_test_young(struct mm_struct *mm,
+ {
+ 	struct mmu_notifier *mn;
+ 	struct hlist_node *n;
+-	int young = 0;
++	int young = 0, id;
+ 
+-	rcu_read_lock();
++	id = srcu_read_lock(&srcu);
+ 	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+ 		if (mn->ops->test_young) {
+ 			young = mn->ops->test_young(mn, mm, address);
+@@ -116,7 +123,7 @@ int __mmu_notifier_test_young(struct mm_struct *mm,
+ 				break;
+ 		}
+ 	}
+-	rcu_read_unlock();
++	srcu_read_unlock(&srcu, id);
+ 
+ 	return young;
+ }
+@@ -126,8 +133,9 @@ void __mmu_notifier_change_pte(struct mm_struct *mm, unsigned long address,
+ {
+ 	struct mmu_notifier *mn;
+ 	struct hlist_node *n;
++	int id;
+ 
+-	rcu_read_lock();
++	id = srcu_read_lock(&srcu);
+ 	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+ 		if (mn->ops->change_pte)
+ 			mn->ops->change_pte(mn, mm, address, pte);
+@@ -138,7 +146,7 @@ void __mmu_notifier_change_pte(struct mm_struct *mm, unsigned long address,
+ 		else if (mn->ops->invalidate_page)
+ 			mn->ops->invalidate_page(mn, mm, address);
+ 	}
+-	rcu_read_unlock();
++	srcu_read_unlock(&srcu, id);
+ }
+ 
+ void __mmu_notifier_invalidate_page(struct mm_struct *mm,
+@@ -146,13 +154,14 @@ void __mmu_notifier_invalidate_page(struct mm_struct *mm,
+ {
+ 	struct mmu_notifier *mn;
+ 	struct hlist_node *n;
++	int id;
+ 
+-	rcu_read_lock();
++	id = srcu_read_lock(&srcu);
+ 	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+ 		if (mn->ops->invalidate_page)
+ 			mn->ops->invalidate_page(mn, mm, address);
+ 	}
+-	rcu_read_unlock();
++	srcu_read_unlock(&srcu, id);
+ }
+ 
+ void __mmu_notifier_invalidate_range_start(struct mm_struct *mm,
+@@ -160,13 +169,14 @@ void __mmu_notifier_invalidate_range_start(struct mm_struct *mm,
+ {
+ 	struct mmu_notifier *mn;
+ 	struct hlist_node *n;
++	int id;
+ 
+-	rcu_read_lock();
++	id = srcu_read_lock(&srcu);
+ 	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+ 		if (mn->ops->invalidate_range_start)
+ 			mn->ops->invalidate_range_start(mn, mm, start, end);
+ 	}
+-	rcu_read_unlock();
++	srcu_read_unlock(&srcu, id);
+ }
+ 
+ void __mmu_notifier_invalidate_range_end(struct mm_struct *mm,
+@@ -174,13 +184,14 @@ void __mmu_notifier_invalidate_range_end(struct mm_struct *mm,
+ {
+ 	struct mmu_notifier *mn;
+ 	struct hlist_node *n;
++	int id;
+ 
+-	rcu_read_lock();
++	id = srcu_read_lock(&srcu);
+ 	hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list, hlist) {
+ 		if (mn->ops->invalidate_range_end)
+ 			mn->ops->invalidate_range_end(mn, mm, start, end);
+ 	}
+-	rcu_read_unlock();
++	srcu_read_unlock(&srcu, id);
+ }
+ 
+ static int do_mmu_notifier_register(struct mmu_notifier *mn,
+@@ -192,6 +203,12 @@ static int do_mmu_notifier_register(struct mmu_notifier *mn,
+ 
+ 	BUG_ON(atomic_read(&mm->mm_users) <= 0);
+ 
++	/*
++	* Verify that mmu_notifier_init() already run and the global srcu is
++	* initialized.
++	*/
++	BUG_ON(!srcu.per_cpu_ref);
++
+ 	ret = -ENOMEM;
+ 	mmu_notifier_mm = kmalloc(sizeof(struct mmu_notifier_mm), GFP_KERNEL);
+ 	if (unlikely(!mmu_notifier_mm))
+@@ -274,8 +291,8 @@ void __mmu_notifier_mm_destroy(struct mm_struct *mm)
+ /*
+  * This releases the mm_count pin automatically and frees the mm
+  * structure if it was the last user of it. It serializes against
+- * running mmu notifiers with RCU and against mmu_notifier_unregister
+- * with the unregister lock + RCU. All sptes must be dropped before
++ * running mmu notifiers with SRCU and against mmu_notifier_unregister
++ * with the unregister lock + SRCU. All sptes must be dropped before
+  * calling mmu_notifier_unregister. ->release or any other notifier
+  * method may be invoked concurrently with mmu_notifier_unregister,
+  * and only after mmu_notifier_unregister returned we're guaranteed
+@@ -285,35 +302,43 @@ void mmu_notifier_unregister(struct mmu_notifier *mn, struct mm_struct *mm)
+ {
+ 	BUG_ON(atomic_read(&mm->mm_count) <= 0);
+ 
++	spin_lock(&mm->mmu_notifier_mm->lock);
+ 	if (!hlist_unhashed(&mn->hlist)) {
+-		/*
+-		 * RCU here will force exit_mmap to wait ->release to finish
+-		 * before freeing the pages.
+-		 */
+-		rcu_read_lock();
++		int id;
+ 
+ 		/*
+-		 * exit_mmap will block in mmu_notifier_release to
+-		 * guarantee ->release is called before freeing the
+-		 * pages.
++		 * Ensure we synchronize up with __mmu_notifier_release().
+ 		 */
++		id = srcu_read_lock(&srcu);
++
++		hlist_del_rcu(&mn->hlist);
++		spin_unlock(&mm->mmu_notifier_mm->lock);
++
+ 		if (mn->ops->release)
+ 			mn->ops->release(mn, mm);
+-		rcu_read_unlock();
+ 
+-		spin_lock(&mm->mmu_notifier_mm->lock);
+-		hlist_del_rcu(&mn->hlist);
++		/*
++		 * Allow __mmu_notifier_release() to complete.
++		 */
++		srcu_read_unlock(&srcu, id);
++	} else
+ 		spin_unlock(&mm->mmu_notifier_mm->lock);
+-	}
+ 
+ 	/*
+-	 * Wait any running method to finish, of course including
+-	 * ->release if it was run by mmu_notifier_relase instead of us.
++	 * Wait for any running method to finish, including ->release() if it
++	 * was run by __mmu_notifier_release() instead of us.
+ 	 */
+-	synchronize_rcu();
++	synchronize_srcu(&srcu);
+ 
+ 	BUG_ON(atomic_read(&mm->mm_count) <= 0);
+ 
+ 	mmdrop(mm);
+ }
+ EXPORT_SYMBOL_GPL(mmu_notifier_unregister);
++
++static int __init mmu_notifier_init(void)
++{
++	return init_srcu_struct(&srcu);
++}
++
++module_init(mmu_notifier_init);
+diff --git a/mm/page-writeback.c b/mm/page-writeback.c
+index 5ad5ce2..7a5f842 100644
+--- a/mm/page-writeback.c
++++ b/mm/page-writeback.c
+@@ -201,6 +201,18 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
+ 		     zone_reclaimable_pages(z) - z->dirty_balance_reserve;
+ 	}
+ 	/*
++	 * Unreclaimable memory (kernel memory or anonymous memory
++	 * without swap) can bring down the dirtyable pages below
++	 * the zone's dirty balance reserve and the above calculation
++	 * will underflow.  However we still want to add in nodes
++	 * which are below threshold (negative values) to get a more
++	 * accurate calculation but make sure that the total never
++	 * underflows.
++	 */
++	if ((long)x < 0)
++		x = 0;
++
++	/*
+ 	 * Make sure that the number of highmem pages is never larger
+ 	 * than the number of the total dirtyable memory. This can only
+ 	 * occur in very strange VM situations but we want to make sure
+@@ -222,8 +234,8 @@ static unsigned long global_dirtyable_memory(void)
+ {
+ 	unsigned long x;
+ 
+-	x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages() -
+-	    dirty_balance_reserve;
++	x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages();
++	x -= min(x, dirty_balance_reserve);
+ 
+ 	if (!vm_highmem_is_dirtyable)
+ 		x -= highmem_dirtyable_memory(x);
+@@ -290,9 +302,12 @@ static unsigned long zone_dirtyable_memory(struct zone *zone)
+ 	 * highmem zone can hold its share of dirty pages, so we don't
+ 	 * care about vm_highmem_is_dirtyable here.
+ 	 */
+-	return zone_page_state(zone, NR_FREE_PAGES) +
+-	       zone_reclaimable_pages(zone) -
+-	       zone->dirty_balance_reserve;
++	unsigned long nr_pages = zone_page_state(zone, NR_FREE_PAGES) +
++		zone_reclaimable_pages(zone);
++
++	/* don't allow this to underflow */
++	nr_pages -= min(nr_pages, zone->dirty_balance_reserve);
++	return nr_pages;
+ }
+ 
+ /**
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index d2d8f54..fa27e78 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -4315,10 +4315,11 @@ static void __meminit calculate_node_totalpages(struct pglist_data *pgdat,
+  * round what is now in bits to nearest long in bits, then return it in
+  * bytes.
+  */
+-static unsigned long __init usemap_size(unsigned long zonesize)
++static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned long zonesize)
+ {
+ 	unsigned long usemapsize;
+ 
++	zonesize += zone_start_pfn & (pageblock_nr_pages-1);
+ 	usemapsize = roundup(zonesize, pageblock_nr_pages);
+ 	usemapsize = usemapsize >> pageblock_order;
+ 	usemapsize *= NR_PAGEBLOCK_BITS;
+@@ -4328,17 +4329,19 @@ static unsigned long __init usemap_size(unsigned long zonesize)
+ }
+ 
+ static void __init setup_usemap(struct pglist_data *pgdat,
+-				struct zone *zone, unsigned long zonesize)
++				struct zone *zone,
++				unsigned long zone_start_pfn,
++				unsigned long zonesize)
+ {
+-	unsigned long usemapsize = usemap_size(zonesize);
++	unsigned long usemapsize = usemap_size(zone_start_pfn, zonesize);
+ 	zone->pageblock_flags = NULL;
+ 	if (usemapsize)
+ 		zone->pageblock_flags = alloc_bootmem_node_nopanic(pgdat,
+ 								   usemapsize);
+ }
+ #else
+-static inline void setup_usemap(struct pglist_data *pgdat,
+-				struct zone *zone, unsigned long zonesize) {}
++static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone,
++				unsigned long zone_start_pfn, unsigned long zonesize) {}
+ #endif /* CONFIG_SPARSEMEM */
+ 
+ #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
+@@ -4461,7 +4464,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
+ 			continue;
+ 
+ 		set_pageblock_order();
+-		setup_usemap(pgdat, zone, size);
++		setup_usemap(pgdat, zone, zone_start_pfn, size);
+ 		ret = init_currently_empty_zone(zone, zone_start_pfn,
+ 						size, MEMMAP_EARLY);
+ 		BUG_ON(ret);
+@@ -5455,7 +5458,7 @@ static inline int pfn_to_bitidx(struct zone *zone, unsigned long pfn)
+ 	pfn &= (PAGES_PER_SECTION-1);
+ 	return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS;
+ #else
+-	pfn = pfn - zone->zone_start_pfn;
++	pfn = pfn - round_down(zone->zone_start_pfn, pageblock_nr_pages);
+ 	return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS;
+ #endif /* CONFIG_SPARSEMEM */
+ }
+diff --git a/mm/shmem.c b/mm/shmem.c
+index 6607fee..1a497d1 100644
+--- a/mm/shmem.c
++++ b/mm/shmem.c
+@@ -2543,6 +2543,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
+ 	unsigned long inodes;
+ 	int error = -EINVAL;
+ 
++	config.mpol = NULL;
+ 	if (shmem_parse_options(data, &config, true))
+ 		return error;
+ 
+@@ -2567,8 +2568,13 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
+ 	sbinfo->max_inodes  = config.max_inodes;
+ 	sbinfo->free_inodes = config.max_inodes - inodes;
+ 
+-	mpol_put(sbinfo->mpol);
+-	sbinfo->mpol        = config.mpol;	/* transfers initial ref */
++	/*
++	 * Preserve previous mempolicy unless mpol remount option was specified.
++	 */
++	if (config.mpol) {
++		mpol_put(sbinfo->mpol);
++		sbinfo->mpol = config.mpol;	/* transfers initial ref */
++	}
+ out:
+ 	spin_unlock(&sbinfo->stat_lock);
+ 	return error;
+diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
+index 469daab..1476f26 100644
+--- a/net/batman-adv/bat_iv_ogm.c
++++ b/net/batman-adv/bat_iv_ogm.c
+@@ -119,7 +119,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)
+ 	unsigned int msecs;
+ 
+ 	msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;
+-	msecs += (random32() % 2 * BATADV_JITTER);
++	msecs += random32() % (2 * BATADV_JITTER);
+ 
+ 	return jiffies + msecs_to_jiffies(msecs);
+ }
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index 0b997c8..aeb0962 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -1789,6 +1789,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
+ 	for (i = 0; i < NUM_REASSEMBLY; i++)
+ 		kfree_skb(hdev->reassembly[i]);
+ 
++	cancel_work_sync(&hdev->power_on);
++
+ 	if (!test_bit(HCI_INIT, &hdev->flags) &&
+ 	    !test_bit(HCI_SETUP, &hdev->dev_flags)) {
+ 		hci_dev_lock(hdev);
+diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
+index 715d7e3..67d1893 100644
+--- a/net/bluetooth/hci_event.c
++++ b/net/bluetooth/hci_event.c
+@@ -2387,7 +2387,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
+ 	if (ev->opcode != HCI_OP_NOP)
+ 		del_timer(&hdev->cmd_timer);
+ 
+-	if (ev->ncmd) {
++	if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {
+ 		atomic_set(&hdev->cmd_cnt, 1);
+ 		if (!skb_queue_empty(&hdev->cmd_q))
+ 			queue_work(hdev->workqueue, &hdev->cmd_work);
+diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
+index ccd985d..03652f3 100644
+--- a/net/bluetooth/hidp/core.c
++++ b/net/bluetooth/hidp/core.c
+@@ -931,7 +931,7 @@ static int hidp_setup_hid(struct hidp_session *session,
+ 	hid->version = req->version;
+ 	hid->country = req->country;
+ 
+-	strncpy(hid->name, req->name, 128);
++	strncpy(hid->name, req->name, sizeof(req->name) - 1);
+ 	strncpy(hid->phys, batostr(&bt_sk(session->ctrl_sock->sk)->src), 64);
+ 	strncpy(hid->uniq, batostr(&bt_sk(session->ctrl_sock->sk)->dst), 64);
+ 
+diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
+index 1a17850..32893a0 100644
+--- a/net/bluetooth/rfcomm/sock.c
++++ b/net/bluetooth/rfcomm/sock.c
+@@ -467,7 +467,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f
+ 	long timeo;
+ 	int err = 0;
+ 
+-	lock_sock(sk);
++	lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
+ 
+ 	if (sk->sk_type != SOCK_STREAM) {
+ 		err = -EINVAL;
+@@ -504,7 +504,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f
+ 
+ 		release_sock(sk);
+ 		timeo = schedule_timeout(timeo);
+-		lock_sock(sk);
++		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
+ 	}
+ 	__set_current_state(TASK_RUNNING);
+ 	remove_wait_queue(sk_sleep(sk), &wait);
+diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
+index 2ac8d50..b7320fc 100644
+--- a/net/bluetooth/smp.c
++++ b/net/bluetooth/smp.c
+@@ -859,6 +859,19 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb)
+ 
+ 	skb_pull(skb, sizeof(code));
+ 
++	/*
++	 * The SMP context must be initialized for all other PDUs except
++	 * pairing and security requests. If we get any other PDU when
++	 * not initialized simply disconnect (done if this function
++	 * returns an error).
++	 */
++	if (code != SMP_CMD_PAIRING_REQ && code != SMP_CMD_SECURITY_REQ &&
++	    !conn->smp_chan) {
++		BT_ERR("Unexpected SMP command 0x%02x. Disconnecting.", code);
++		kfree_skb(skb);
++		return -ENOTSUPP;
++	}
++
+ 	switch (code) {
+ 	case SMP_CMD_PAIRING_REQ:
+ 		reason = smp_cmd_pairing_req(conn, skb);
+diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
+index 68e8f36..fe43bc7 100644
+--- a/net/bridge/br_netfilter.c
++++ b/net/bridge/br_netfilter.c
+@@ -265,6 +265,9 @@ static int br_parse_ip_options(struct sk_buff *skb)
+ 	struct net_device *dev = skb->dev;
+ 	u32 len;
+ 
++	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
++		goto inhdr_error;
++
+ 	iph = ip_hdr(skb);
+ 	opt = &(IPCB(skb)->opt);
+ 
+diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
+index fd30a60..a8aa2d5 100644
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -16,6 +16,7 @@
+ #include <linux/etherdevice.h>
+ #include <linux/llc.h>
+ #include <linux/slab.h>
++#include <linux/pkt_sched.h>
+ #include <net/net_namespace.h>
+ #include <net/llc.h>
+ #include <net/llc_pdu.h>
+@@ -40,6 +41,7 @@ static void br_send_bpdu(struct net_bridge_port *p,
+ 
+ 	skb->dev = p->dev;
+ 	skb->protocol = htons(ETH_P_802_2);
++	skb->priority = TC_PRIO_CONTROL;
+ 
+ 	skb_reserve(skb, LLC_RESERVE);
+ 	memcpy(__skb_put(skb, length), data, length);
+diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
+index a802029..ee71ea2 100644
+--- a/net/ceph/ceph_common.c
++++ b/net/ceph/ceph_common.c
+@@ -305,7 +305,6 @@ ceph_parse_options(char *options, const char *dev_name,
+ 
+ 	/* start with defaults */
+ 	opt->flags = CEPH_OPT_DEFAULT;
+-	opt->osd_timeout = CEPH_OSD_TIMEOUT_DEFAULT;
+ 	opt->osd_keepalive_timeout = CEPH_OSD_KEEPALIVE_DEFAULT;
+ 	opt->mount_timeout = CEPH_MOUNT_TIMEOUT_DEFAULT; /* seconds */
+ 	opt->osd_idle_ttl = CEPH_OSD_IDLE_TTL_DEFAULT;   /* seconds */
+@@ -391,7 +390,7 @@ ceph_parse_options(char *options, const char *dev_name,
+ 
+ 			/* misc */
+ 		case Opt_osdtimeout:
+-			opt->osd_timeout = intval;
++			pr_warning("ignoring deprecated osdtimeout option\n");
+ 			break;
+ 		case Opt_osdkeepalivetimeout:
+ 			opt->osd_keepalive_timeout = intval;
+diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
+index 3ef1759..e9f2159 100644
+--- a/net/ceph/messenger.c
++++ b/net/ceph/messenger.c
+@@ -506,6 +506,7 @@ static void reset_connection(struct ceph_connection *con)
+ {
+ 	/* reset connection, out_queue, msg_ and connect_seq */
+ 	/* discard existing out_queue and msg_seq */
++	dout("reset_connection %p\n", con);
+ 	ceph_msg_remove_list(&con->out_queue);
+ 	ceph_msg_remove_list(&con->out_sent);
+ 
+@@ -561,7 +562,7 @@ void ceph_con_open(struct ceph_connection *con,
+ 	mutex_lock(&con->mutex);
+ 	dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr));
+ 
+-	BUG_ON(con->state != CON_STATE_CLOSED);
++	WARN_ON(con->state != CON_STATE_CLOSED);
+ 	con->state = CON_STATE_PREOPEN;
+ 
+ 	con->peer_name.type = (__u8) entity_type;
+@@ -1506,13 +1507,6 @@ static int process_banner(struct ceph_connection *con)
+ 	return 0;
+ }
+ 
+-static void fail_protocol(struct ceph_connection *con)
+-{
+-	reset_connection(con);
+-	BUG_ON(con->state != CON_STATE_NEGOTIATING);
+-	con->state = CON_STATE_CLOSED;
+-}
+-
+ static int process_connect(struct ceph_connection *con)
+ {
+ 	u64 sup_feat = con->msgr->supported_features;
+@@ -1530,7 +1524,7 @@ static int process_connect(struct ceph_connection *con)
+ 		       ceph_pr_addr(&con->peer_addr.in_addr),
+ 		       sup_feat, server_feat, server_feat & ~sup_feat);
+ 		con->error_msg = "missing required protocol features";
+-		fail_protocol(con);
++		reset_connection(con);
+ 		return -1;
+ 
+ 	case CEPH_MSGR_TAG_BADPROTOVER:
+@@ -1541,7 +1535,7 @@ static int process_connect(struct ceph_connection *con)
+ 		       le32_to_cpu(con->out_connect.protocol_version),
+ 		       le32_to_cpu(con->in_reply.protocol_version));
+ 		con->error_msg = "protocol version mismatch";
+-		fail_protocol(con);
++		reset_connection(con);
+ 		return -1;
+ 
+ 	case CEPH_MSGR_TAG_BADAUTHORIZER:
+@@ -1631,11 +1625,11 @@ static int process_connect(struct ceph_connection *con)
+ 			       ceph_pr_addr(&con->peer_addr.in_addr),
+ 			       req_feat, server_feat, req_feat & ~server_feat);
+ 			con->error_msg = "missing required protocol features";
+-			fail_protocol(con);
++			reset_connection(con);
+ 			return -1;
+ 		}
+ 
+-		BUG_ON(con->state != CON_STATE_NEGOTIATING);
++		WARN_ON(con->state != CON_STATE_NEGOTIATING);
+ 		con->state = CON_STATE_OPEN;
+ 
+ 		con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
+@@ -2132,7 +2126,6 @@ more:
+ 		if (ret < 0)
+ 			goto out;
+ 
+-		BUG_ON(con->state != CON_STATE_CONNECTING);
+ 		con->state = CON_STATE_NEGOTIATING;
+ 
+ 		/*
+@@ -2160,7 +2153,7 @@ more:
+ 		goto more;
+ 	}
+ 
+-	BUG_ON(con->state != CON_STATE_OPEN);
++	WARN_ON(con->state != CON_STATE_OPEN);
+ 
+ 	if (con->in_base_pos < 0) {
+ 		/*
+@@ -2262,6 +2255,35 @@ static void queue_con(struct ceph_connection *con)
+ 	}
+ }
+ 
++static bool con_sock_closed(struct ceph_connection *con)
++{
++	if (!test_and_clear_bit(CON_FLAG_SOCK_CLOSED, &con->flags))
++		return false;
++
++#define CASE(x)								\
++	case CON_STATE_ ## x:						\
++		con->error_msg = "socket closed (con state " #x ")";	\
++		break;
++
++	switch (con->state) {
++	CASE(CLOSED);
++	CASE(PREOPEN);
++	CASE(CONNECTING);
++	CASE(NEGOTIATING);
++	CASE(OPEN);
++	CASE(STANDBY);
++	default:
++		pr_warning("%s con %p unrecognized state %lu\n",
++			__func__, con, con->state);
++		con->error_msg = "unrecognized con state";
++		BUG();
++		break;
++	}
++#undef CASE
++
++	return true;
++}
++
+ /*
+  * Do some work on a connection.  Drop a connection ref when we're done.
+  */
+@@ -2273,24 +2295,8 @@ static void con_work(struct work_struct *work)
+ 
+ 	mutex_lock(&con->mutex);
+ restart:
+-	if (test_and_clear_bit(CON_FLAG_SOCK_CLOSED, &con->flags)) {
+-		switch (con->state) {
+-		case CON_STATE_CONNECTING:
+-			con->error_msg = "connection failed";
+-			break;
+-		case CON_STATE_NEGOTIATING:
+-			con->error_msg = "negotiation failed";
+-			break;
+-		case CON_STATE_OPEN:
+-			con->error_msg = "socket closed";
+-			break;
+-		default:
+-			dout("unrecognized con state %d\n", (int)con->state);
+-			con->error_msg = "unrecognized con state";
+-			BUG();
+-		}
++	if (con_sock_closed(con))
+ 		goto fault;
+-	}
+ 
+ 	if (test_and_clear_bit(CON_FLAG_BACKOFF, &con->flags)) {
+ 		dout("con_work %p backing off\n", con);
+@@ -2356,12 +2362,12 @@ fault:
+ static void ceph_fault(struct ceph_connection *con)
+ 	__releases(con->mutex)
+ {
+-	pr_err("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
++	pr_warning("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
+ 	       ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg);
+ 	dout("fault %p state %lu to peer %s\n",
+ 	     con, con->state, ceph_pr_addr(&con->peer_addr.in_addr));
+ 
+-	BUG_ON(con->state != CON_STATE_CONNECTING &&
++	WARN_ON(con->state != CON_STATE_CONNECTING &&
+ 	       con->state != CON_STATE_NEGOTIATING &&
+ 	       con->state != CON_STATE_OPEN);
+ 
+diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
+index f7b56e2..eb9a444 100644
+--- a/net/ceph/osd_client.c
++++ b/net/ceph/osd_client.c
+@@ -221,7 +221,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
+ 	kref_init(&req->r_kref);
+ 	init_completion(&req->r_completion);
+ 	init_completion(&req->r_safe_completion);
+-	rb_init_node(&req->r_node);
++	RB_CLEAR_NODE(&req->r_node);
+ 	INIT_LIST_HEAD(&req->r_unsafe_item);
+ 	INIT_LIST_HEAD(&req->r_linger_item);
+ 	INIT_LIST_HEAD(&req->r_linger_osd);
+@@ -464,6 +464,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
+ {
+ 	struct ceph_osd_req_op ops[3];
+ 	struct ceph_osd_request *req;
++	int r;
+ 
+ 	ops[0].op = opcode;
+ 	ops[0].extent.truncate_seq = truncate_seq;
+@@ -482,10 +483,12 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
+ 					 use_mempool,
+ 					 GFP_NOFS, NULL, NULL);
+ 	if (!req)
+-		return NULL;
++		return ERR_PTR(-ENOMEM);
+ 
+ 	/* calculate max write size */
+-	calc_layout(osdc, vino, layout, off, plen, req, ops);
++	r = calc_layout(osdc, vino, layout, off, plen, req, ops);
++	if (r < 0)
++		return ERR_PTR(r);
+ 	req->r_file_layout = *layout;  /* keep a copy */
+ 
+ 	/* in case it differs from natural (file) alignment that
+@@ -578,7 +581,7 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc,
+ 
+ 	dout("__kick_osd_requests osd%d\n", osd->o_osd);
+ 	err = __reset_osd(osdc, osd);
+-	if (err == -EAGAIN)
++	if (err)
+ 		return;
+ 
+ 	list_for_each_entry(req, &osd->o_requests, r_osd_item) {
+@@ -605,14 +608,6 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc,
+ 	}
+ }
+ 
+-static void kick_osd_requests(struct ceph_osd_client *osdc,
+-			      struct ceph_osd *kickosd)
+-{
+-	mutex_lock(&osdc->request_mutex);
+-	__kick_osd_requests(osdc, kickosd);
+-	mutex_unlock(&osdc->request_mutex);
+-}
+-
+ /*
+  * If the osd connection drops, we need to resubmit all requests.
+  */
+@@ -626,7 +621,9 @@ static void osd_reset(struct ceph_connection *con)
+ 	dout("osd_reset osd%d\n", osd->o_osd);
+ 	osdc = osd->o_osdc;
+ 	down_read(&osdc->map_sem);
+-	kick_osd_requests(osdc, osd);
++	mutex_lock(&osdc->request_mutex);
++	__kick_osd_requests(osdc, osd);
++	mutex_unlock(&osdc->request_mutex);
+ 	send_queued(osdc);
+ 	up_read(&osdc->map_sem);
+ }
+@@ -645,6 +642,7 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum)
+ 	atomic_set(&osd->o_ref, 1);
+ 	osd->o_osdc = osdc;
+ 	osd->o_osd = onum;
++	RB_CLEAR_NODE(&osd->o_node);
+ 	INIT_LIST_HEAD(&osd->o_requests);
+ 	INIT_LIST_HEAD(&osd->o_linger_requests);
+ 	INIT_LIST_HEAD(&osd->o_osd_lru);
+@@ -748,6 +746,7 @@ static int __reset_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd)
+ 	if (list_empty(&osd->o_requests) &&
+ 	    list_empty(&osd->o_linger_requests)) {
+ 		__remove_osd(osdc, osd);
++		ret = -ENODEV;
+ 	} else if (memcmp(&osdc->osdmap->osd_addr[osd->o_osd],
+ 			  &osd->o_con.peer_addr,
+ 			  sizeof(osd->o_con.peer_addr)) == 0 &&
+@@ -874,9 +873,9 @@ static void __unregister_request(struct ceph_osd_client *osdc,
+ 			req->r_osd = NULL;
+ 	}
+ 
++	list_del_init(&req->r_req_lru_item);
+ 	ceph_osdc_put_request(req);
+ 
+-	list_del_init(&req->r_req_lru_item);
+ 	if (osdc->num_requests == 0) {
+ 		dout(" no requests, canceling timeout\n");
+ 		__cancel_osd_timeout(osdc);
+@@ -908,8 +907,8 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
+ 					struct ceph_osd_request *req)
+ {
+ 	dout("__unregister_linger_request %p\n", req);
++	list_del_init(&req->r_linger_item);
+ 	if (req->r_osd) {
+-		list_del_init(&req->r_linger_item);
+ 		list_del_init(&req->r_linger_osd);
+ 
+ 		if (list_empty(&req->r_osd->o_requests) &&
+@@ -1088,12 +1087,10 @@ static void handle_timeout(struct work_struct *work)
+ {
+ 	struct ceph_osd_client *osdc =
+ 		container_of(work, struct ceph_osd_client, timeout_work.work);
+-	struct ceph_osd_request *req, *last_req = NULL;
++	struct ceph_osd_request *req;
+ 	struct ceph_osd *osd;
+-	unsigned long timeout = osdc->client->options->osd_timeout * HZ;
+ 	unsigned long keepalive =
+ 		osdc->client->options->osd_keepalive_timeout * HZ;
+-	unsigned long last_stamp = 0;
+ 	struct list_head slow_osds;
+ 	dout("timeout\n");
+ 	down_read(&osdc->map_sem);
+@@ -1103,37 +1100,6 @@ static void handle_timeout(struct work_struct *work)
+ 	mutex_lock(&osdc->request_mutex);
+ 
+ 	/*
+-	 * reset osds that appear to be _really_ unresponsive.  this
+-	 * is a failsafe measure.. we really shouldn't be getting to
+-	 * this point if the system is working properly.  the monitors
+-	 * should mark the osd as failed and we should find out about
+-	 * it from an updated osd map.
+-	 */
+-	while (timeout && !list_empty(&osdc->req_lru)) {
+-		req = list_entry(osdc->req_lru.next, struct ceph_osd_request,
+-				 r_req_lru_item);
+-
+-		/* hasn't been long enough since we sent it? */
+-		if (time_before(jiffies, req->r_stamp + timeout))
+-			break;
+-
+-		/* hasn't been long enough since it was acked? */
+-		if (req->r_request->ack_stamp == 0 ||
+-		    time_before(jiffies, req->r_request->ack_stamp + timeout))
+-			break;
+-
+-		BUG_ON(req == last_req && req->r_stamp == last_stamp);
+-		last_req = req;
+-		last_stamp = req->r_stamp;
+-
+-		osd = req->r_osd;
+-		BUG_ON(!osd);
+-		pr_warning(" tid %llu timed out on osd%d, will reset osd\n",
+-			   req->r_tid, osd->o_osd);
+-		__kick_osd_requests(osdc, osd);
+-	}
+-
+-	/*
+ 	 * ping osds that are a bit slow.  this ensures that if there
+ 	 * is a break in the TCP connection we will notice, and reopen
+ 	 * a connection with that osd (from the fault callback).
+@@ -1304,7 +1270,7 @@ static void reset_changed_osds(struct ceph_osd_client *osdc)
+  * Requeue requests whose mapping to an OSD has changed.  If requests map to
+  * no osd, request a new map.
+  *
+- * Caller should hold map_sem for read and request_mutex.
++ * Caller should hold map_sem for read.
+  */
+ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
+ {
+@@ -1318,6 +1284,24 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
+ 	for (p = rb_first(&osdc->requests); p; ) {
+ 		req = rb_entry(p, struct ceph_osd_request, r_node);
+ 		p = rb_next(p);
++
++		/*
++		 * For linger requests that have not yet been
++		 * registered, move them to the linger list; they'll
++		 * be sent to the osd in the loop below.  Unregister
++		 * the request before re-registering it as a linger
++		 * request to ensure the __map_request() below
++		 * will decide it needs to be sent.
++		 */
++		if (req->r_linger && list_empty(&req->r_linger_item)) {
++			dout("%p tid %llu restart on osd%d\n",
++			     req, req->r_tid,
++			     req->r_osd ? req->r_osd->o_osd : -1);
++			__unregister_request(osdc, req);
++			__register_linger_request(osdc, req);
++			continue;
++		}
++
+ 		err = __map_request(osdc, req, force_resend);
+ 		if (err < 0)
+ 			continue;  /* error */
+@@ -1332,17 +1316,6 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
+ 				req->r_flags |= CEPH_OSD_FLAG_RETRY;
+ 			}
+ 		}
+-		if (req->r_linger && list_empty(&req->r_linger_item)) {
+-			/*
+-			 * register as a linger so that we will
+-			 * re-submit below and get a new tid
+-			 */
+-			dout("%p tid %llu restart on osd%d\n",
+-			     req, req->r_tid,
+-			     req->r_osd ? req->r_osd->o_osd : -1);
+-			__register_linger_request(osdc, req);
+-			__unregister_request(osdc, req);
+-		}
+ 	}
+ 
+ 	list_for_each_entry_safe(req, nreq, &osdc->req_linger,
+@@ -1350,6 +1323,7 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
+ 		dout("linger req=%p req->r_osd=%p\n", req, req->r_osd);
+ 
+ 		err = __map_request(osdc, req, force_resend);
++		dout("__map_request returned %d\n", err);
+ 		if (err == 0)
+ 			continue;  /* no change and no osd was specified */
+ 		if (err < 0)
+@@ -1362,8 +1336,8 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
+ 
+ 		dout("kicking lingering %p tid %llu osd%d\n", req, req->r_tid,
+ 		     req->r_osd ? req->r_osd->o_osd : -1);
+-		__unregister_linger_request(osdc, req);
+ 		__register_request(osdc, req);
++		__unregister_linger_request(osdc, req);
+ 	}
+ 	mutex_unlock(&osdc->request_mutex);
+ 
+@@ -1371,6 +1345,7 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
+ 		dout("%d requests for down osds, need new map\n", needmap);
+ 		ceph_monc_request_next_osdmap(&osdc->client->monc);
+ 	}
++	reset_changed_osds(osdc);
+ }
+ 
+ 
+@@ -1427,7 +1402,6 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
+ 				osdc->osdmap = newmap;
+ 			}
+ 			kick_requests(osdc, 0);
+-			reset_changed_osds(osdc);
+ 		} else {
+ 			dout("ignoring incremental map %u len %d\n",
+ 			     epoch, maplen);
+@@ -1597,6 +1571,7 @@ int ceph_osdc_create_event(struct ceph_osd_client *osdc,
+ 	event->data = data;
+ 	event->osdc = osdc;
+ 	INIT_LIST_HEAD(&event->osd_node);
++	RB_CLEAR_NODE(&event->node);
+ 	kref_init(&event->kref);   /* one ref for us */
+ 	kref_get(&event->kref);    /* one ref for the caller */
+ 	init_completion(&event->completion);
+@@ -1928,8 +1903,8 @@ int ceph_osdc_readpages(struct ceph_osd_client *osdc,
+ 				    CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,
+ 				    NULL, 0, truncate_seq, truncate_size, NULL,
+ 				    false, 1, page_align);
+-	if (!req)
+-		return -ENOMEM;
++	if (IS_ERR(req))
++		return PTR_ERR(req);
+ 
+ 	/* it may be a short read due to an object boundary */
+ 	req->r_pages = pages;
+@@ -1971,8 +1946,8 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,
+ 				    snapc, do_sync,
+ 				    truncate_seq, truncate_size, mtime,
+ 				    nofail, 1, page_align);
+-	if (!req)
+-		return -ENOMEM;
++	if (IS_ERR(req))
++		return PTR_ERR(req);
+ 
+ 	/* it may be a short write due to an object boundary */
+ 	req->r_pages = pages;
+diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
+index 5433fb0..f552aa4 100644
+--- a/net/ceph/osdmap.c
++++ b/net/ceph/osdmap.c
+@@ -645,10 +645,12 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
+ 	ceph_decode_32_safe(p, end, max, bad);
+ 	while (max--) {
+ 		ceph_decode_need(p, end, 4 + 1 + sizeof(pi->v), bad);
++		err = -ENOMEM;
+ 		pi = kzalloc(sizeof(*pi), GFP_NOFS);
+ 		if (!pi)
+ 			goto bad;
+ 		pi->id = ceph_decode_32(p);
++		err = -EINVAL;
+ 		ev = ceph_decode_8(p); /* encoding version */
+ 		if (ev > CEPH_PG_POOL_VERSION) {
+ 			pr_warning("got unknown v %d > %d of ceph_pg_pool\n",
+@@ -664,8 +666,13 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
+ 		__insert_pg_pool(&map->pg_pools, pi);
+ 	}
+ 
+-	if (version >= 5 && __decode_pool_names(p, end, map) < 0)
+-		goto bad;
++	if (version >= 5) {
++		err = __decode_pool_names(p, end, map);
++		if (err < 0) {
++			dout("fail to decode pool names");
++			goto bad;
++		}
++	}
+ 
+ 	ceph_decode_32_safe(p, end, map->pool_max, bad);
+ 
+@@ -745,7 +752,7 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
+ 	return map;
+ 
+ bad:
+-	dout("osdmap_decode fail\n");
++	dout("osdmap_decode fail err %d\n", err);
+ 	ceph_osdmap_destroy(map);
+ 	return ERR_PTR(err);
+ }
+@@ -839,6 +846,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
+ 		if (ev > CEPH_PG_POOL_VERSION) {
+ 			pr_warning("got unknown v %d > %d of ceph_pg_pool\n",
+ 				   ev, CEPH_PG_POOL_VERSION);
++			err = -EINVAL;
+ 			goto bad;
+ 		}
+ 		pi = __lookup_pg_pool(&map->pg_pools, pool);
+@@ -855,8 +863,11 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
+ 		if (err < 0)
+ 			goto bad;
+ 	}
+-	if (version >= 5 && __decode_pool_names(p, end, map) < 0)
+-		goto bad;
++	if (version >= 5) {
++		err = __decode_pool_names(p, end, map);
++		if (err < 0)
++			goto bad;
++	}
+ 
+ 	/* old_pool */
+ 	ceph_decode_32_safe(p, end, len, bad);
+@@ -932,15 +943,13 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
+ 			(void) __remove_pg_mapping(&map->pg_temp, pgid);
+ 
+ 			/* insert */
+-			if (pglen > (UINT_MAX - sizeof(*pg)) / sizeof(u32)) {
+-				err = -EINVAL;
++			err = -EINVAL;
++			if (pglen > (UINT_MAX - sizeof(*pg)) / sizeof(u32))
+ 				goto bad;
+-			}
++			err = -ENOMEM;
+ 			pg = kmalloc(sizeof(*pg) + sizeof(u32)*pglen, GFP_NOFS);
+-			if (!pg) {
+-				err = -ENOMEM;
++			if (!pg)
+ 				goto bad;
+-			}
+ 			pg->pgid = pgid;
+ 			pg->len = pglen;
+ 			for (j = 0; j < pglen; j++)
+diff --git a/net/core/datagram.c b/net/core/datagram.c
+index 0337e2b..368f9c3 100644
+--- a/net/core/datagram.c
++++ b/net/core/datagram.c
+@@ -187,7 +187,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
+ 		skb_queue_walk(queue, skb) {
+ 			*peeked = skb->peeked;
+ 			if (flags & MSG_PEEK) {
+-				if (*off >= skb->len) {
++				if (*off >= skb->len && skb->len) {
+ 					*off -= skb->len;
+ 					continue;
+ 				}
+diff --git a/net/core/pktgen.c b/net/core/pktgen.c
+index e356b8d..d7881b2 100644
+--- a/net/core/pktgen.c
++++ b/net/core/pktgen.c
+@@ -1797,10 +1797,13 @@ static ssize_t pktgen_thread_write(struct file *file,
+ 			return -EFAULT;
+ 		i += len;
+ 		mutex_lock(&pktgen_thread_lock);
+-		pktgen_add_device(t, f);
++		ret = pktgen_add_device(t, f);
+ 		mutex_unlock(&pktgen_thread_lock);
+-		ret = count;
+-		sprintf(pg_result, "OK: add_device=%s", f);
++		if (!ret) {
++			ret = count;
++			sprintf(pg_result, "OK: add_device=%s", f);
++		} else
++			sprintf(pg_result, "ERROR: can not add device %s", f);
+ 		goto out;
+ 	}
+ 
+diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
+index 9d8755e..a2ad320 100644
+--- a/net/core/sock_diag.c
++++ b/net/core/sock_diag.c
+@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ 	if (nlmsg_len(nlh) < sizeof(*req))
+ 		return -EINVAL;
+ 
++	if (req->sdiag_family >= AF_MAX)
++		return -EINVAL;
++
+ 	hndl = sock_diag_lock_handler(req->sdiag_family);
+ 	if (hndl == NULL)
+ 		err = -ENOENT;
+diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
+index 176ecdb..4f9f5eb 100644
+--- a/net/dccp/ipv4.c
++++ b/net/dccp/ipv4.c
+@@ -439,8 +439,8 @@ exit:
+ 	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
+ 	return NULL;
+ put_and_exit:
+-	bh_unlock_sock(newsk);
+-	sock_put(newsk);
++	inet_csk_prepare_forced_close(newsk);
++	dccp_done(newsk);
+ 	goto exit;
+ }
+ 
+diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
+index 56840b2..6e05981 100644
+--- a/net/dccp/ipv6.c
++++ b/net/dccp/ipv6.c
+@@ -585,7 +585,8 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
+ 	newinet->inet_rcv_saddr = LOOPBACK4_IPV6;
+ 
+ 	if (__inet_inherit_port(sk, newsk) < 0) {
+-		sock_put(newsk);
++		inet_csk_prepare_forced_close(newsk);
++		dccp_done(newsk);
+ 		goto out;
+ 	}
+ 	__inet6_hash(newsk, NULL);
+diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
+index fe4582c..26222ed 100644
+--- a/net/ipv4/af_inet.c
++++ b/net/ipv4/af_inet.c
+@@ -228,8 +228,12 @@ EXPORT_SYMBOL(inet_listen);
+ u32 inet_ehash_secret __read_mostly;
+ EXPORT_SYMBOL(inet_ehash_secret);
+ 
++u32 ipv6_hash_secret __read_mostly;
++EXPORT_SYMBOL(ipv6_hash_secret);
++
+ /*
+- * inet_ehash_secret must be set exactly once
++ * inet_ehash_secret must be set exactly once, and to a non nul value
++ * ipv6_hash_secret must be set exactly once.
+  */
+ void build_ehash_secret(void)
+ {
+@@ -239,7 +243,8 @@ void build_ehash_secret(void)
+ 		get_random_bytes(&rnd, sizeof(rnd));
+ 	} while (rnd == 0);
+ 
+-	cmpxchg(&inet_ehash_secret, 0, rnd);
++	if (cmpxchg(&inet_ehash_secret, 0, rnd) == 0)
++		get_random_bytes(&ipv6_hash_secret, sizeof(ipv6_hash_secret));
+ }
+ EXPORT_SYMBOL(build_ehash_secret);
+ 
+diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
+index 0405cc8..567c31f 100644
+--- a/net/ipv4/inet_connection_sock.c
++++ b/net/ipv4/inet_connection_sock.c
+@@ -679,6 +679,22 @@ void inet_csk_destroy_sock(struct sock *sk)
+ }
+ EXPORT_SYMBOL(inet_csk_destroy_sock);
+ 
++/* This function allows to force a closure of a socket after the call to
++ * tcp/dccp_create_openreq_child().
++ */
++void inet_csk_prepare_forced_close(struct sock *sk)
++{
++	/* sk_clone_lock locked the socket and set refcnt to 2 */
++	bh_unlock_sock(sk);
++	sock_put(sk);
++
++	/* The below has to be done to allow calling inet_csk_destroy_sock */
++	sock_set_flag(sk, SOCK_DEAD);
++	percpu_counter_inc(sk->sk_prot->orphan_count);
++	inet_sk(sk)->inet_num = 0;
++}
++EXPORT_SYMBOL(inet_csk_prepare_forced_close);
++
+ int inet_csk_listen_start(struct sock *sk, const int nr_table_entries)
+ {
+ 	struct inet_sock *inet = inet_sk(sk);
+diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
+index 14bbfcf..e95d72b 100644
+--- a/net/ipv4/ip_sockglue.c
++++ b/net/ipv4/ip_sockglue.c
+@@ -590,7 +590,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
+ 	case IP_TTL:
+ 		if (optlen < 1)
+ 			goto e_inval;
+-		if (val != -1 && (val < 0 || val > 255))
++		if (val != -1 && (val < 1 || val > 255))
+ 			goto e_inval;
+ 		inet->uc_ttl = val;
+ 		break;
+diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
+index 6232d47..920cb0b 100644
+--- a/net/ipv4/ping.c
++++ b/net/ipv4/ping.c
+@@ -328,8 +328,8 @@ void ping_err(struct sk_buff *skb, u32 info)
+ 	struct iphdr *iph = (struct iphdr *)skb->data;
+ 	struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2));
+ 	struct inet_sock *inet_sock;
+-	int type = icmph->type;
+-	int code = icmph->code;
++	int type = icmp_hdr(skb)->type;
++	int code = icmp_hdr(skb)->code;
+ 	struct net *net = dev_net(skb->dev);
+ 	struct sock *sk;
+ 	int harderr;
+diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
+index c92c4da..8d02e34 100644
+--- a/net/ipv4/tcp_input.c
++++ b/net/ipv4/tcp_input.c
+@@ -3531,6 +3531,11 @@ static bool tcp_process_frto(struct sock *sk, int flag)
+ 		}
+ 	} else {
+ 		if (!(flag & FLAG_DATA_ACKED) && (tp->frto_counter == 1)) {
++			if (!tcp_packets_in_flight(tp)) {
++				tcp_enter_frto_loss(sk, 2, flag);
++				return true;
++			}
++
+ 			/* Prevent sending of new data. */
+ 			tp->snd_cwnd = min(tp->snd_cwnd,
+ 					   tcp_packets_in_flight(tp));
+@@ -3579,6 +3584,24 @@ static bool tcp_process_frto(struct sock *sk, int flag)
+ 	return false;
+ }
+ 
++/* RFC 5961 7 [ACK Throttling] */
++static void tcp_send_challenge_ack(struct sock *sk)
++{
++	/* unprotected vars, we dont care of overwrites */
++	static u32 challenge_timestamp;
++	static unsigned int challenge_count;
++	u32 now = jiffies / HZ;
++
++	if (now != challenge_timestamp) {
++		challenge_timestamp = now;
++		challenge_count = 0;
++	}
++	if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
++		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
++		tcp_send_ack(sk);
++	}
++}
++
+ /* This routine deals with incoming acks, but not outgoing ones. */
+ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+ {
+@@ -3598,8 +3621,14 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+ 	/* If the ack is older than previous acks
+ 	 * then we can probably ignore it.
+ 	 */
+-	if (before(ack, prior_snd_una))
++	if (before(ack, prior_snd_una)) {
++		/* RFC 5961 5.2 [Blind Data Injection Attack].[Mitigation] */
++		if (before(ack, prior_snd_una - tp->max_window)) {
++			tcp_send_challenge_ack(sk);
++			return -1;
++		}
+ 		goto old_ack;
++	}
+ 
+ 	/* If the ack includes data we haven't sent yet, discard
+ 	 * this segment (RFC793 Section 3.9).
+@@ -5271,23 +5300,6 @@ out:
+ }
+ #endif /* CONFIG_NET_DMA */
+ 
+-static void tcp_send_challenge_ack(struct sock *sk)
+-{
+-	/* unprotected vars, we dont care of overwrites */
+-	static u32 challenge_timestamp;
+-	static unsigned int challenge_count;
+-	u32 now = jiffies / HZ;
+-
+-	if (now != challenge_timestamp) {
+-		challenge_timestamp = now;
+-		challenge_count = 0;
+-	}
+-	if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
+-		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
+-		tcp_send_ack(sk);
+-	}
+-}
+-
+ /* Does PAWS and seqno based validation of an incoming segment, flags will
+  * play significant role here.
+  */
+@@ -5340,11 +5352,6 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,
+ 		goto discard;
+ 	}
+ 
+-	/* ts_recent update must be made after we are sure that the packet
+-	 * is in window.
+-	 */
+-	tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);
+-
+ 	/* step 3: check security and precedence [ignored] */
+ 
+ 	/* step 4: Check for a SYN
+@@ -5579,6 +5586,11 @@ step5:
+ 	if (th->ack && tcp_ack(sk, skb, FLAG_SLOWPATH) < 0)
+ 		goto discard;
+ 
++	/* ts_recent update must be made after we are sure that the packet
++	 * is in window.
++	 */
++	tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);
++
+ 	tcp_rcv_rtt_measure_ts(sk, skb);
+ 
+ 	/* Process urgent data. */
+@@ -6106,6 +6118,11 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+ 	} else
+ 		goto discard;
+ 
++	/* ts_recent update must be made after we are sure that the packet
++	 * is in window.
++	 */
++	tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);
++
+ 	/* step 6: check the URG bit */
+ 	tcp_urg(sk, skb, th);
+ 
+diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
+index db7bfad..4705caf 100644
+--- a/net/ipv4/tcp_ipv4.c
++++ b/net/ipv4/tcp_ipv4.c
+@@ -1537,10 +1537,8 @@ exit:
+ 	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
+ 	return NULL;
+ put_and_exit:
+-	tcp_clear_xmit_timers(newsk);
+-	tcp_cleanup_congestion_control(newsk);
+-	bh_unlock_sock(newsk);
+-	sock_put(newsk);
++	inet_csk_prepare_forced_close(newsk);
++	tcp_done(newsk);
+ 	goto exit;
+ }
+ EXPORT_SYMBOL(tcp_v4_syn_recv_sock);
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index b10374d..fd82a30 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -1736,7 +1736,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
+ 			continue;
+ 		if ((rt->rt6i_flags & flags) != flags)
+ 			continue;
+-		if ((noflags != 0) && ((rt->rt6i_flags & flags) != 0))
++		if ((rt->rt6i_flags & noflags) != 0)
+ 			continue;
+ 		dst_hold(&rt->dst);
+ 		break;
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 5b2d63e..3d485ec 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -1287,10 +1287,10 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
+ 		cork->length = 0;
+ 		sk->sk_sndmsg_page = NULL;
+ 		sk->sk_sndmsg_off = 0;
+-		exthdrlen = (opt ? opt->opt_flen : 0) - rt->rt6i_nfheader_len;
++		exthdrlen = (opt ? opt->opt_flen : 0);
+ 		length += exthdrlen;
+ 		transhdrlen += exthdrlen;
+-		dst_exthdrlen = rt->dst.header_len;
++		dst_exthdrlen = rt->dst.header_len - rt->rt6i_nfheader_len;
+ 	} else {
+ 		rt = (struct rt6_info *)cork->dst;
+ 		fl6 = &inet->cork.fl.u.ip6;
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index 070a3ce..2ffaa7a 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -881,7 +881,7 @@ restart:
+ 	dst_hold(&rt->dst);
+ 	read_unlock_bh(&table->tb6_lock);
+ 
+-	if (!rt->n && !(rt->rt6i_flags & RTF_NONEXTHOP))
++	if (!rt->n && !(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_LOCAL)))
+ 		nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr);
+ 	else if (!(rt->dst.flags & DST_HOST))
+ 		nrt = rt6_alloc_clone(rt, &fl6->daddr);
+diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
+index 7e32d42..8b45fb4 100644
+--- a/net/ipv6/tcp_ipv6.c
++++ b/net/ipv6/tcp_ipv6.c
+@@ -1371,7 +1371,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
+ #endif
+ 
+ 	if (__inet_inherit_port(sk, newsk) < 0) {
+-		sock_put(newsk);
++		inet_csk_prepare_forced_close(newsk);
++		tcp_done(newsk);
+ 		goto out;
+ 	}
+ 	__inet6_hash(newsk, NULL);
+diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
+index a58c0b6..f985911 100644
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -151,7 +151,17 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
+ 			sta = sta_info_get(sdata, mac_addr);
+ 		else
+ 			sta = sta_info_get_bss(sdata, mac_addr);
+-		if (!sta) {
++		/*
++		 * The ASSOC test makes sure the driver is ready to
++		 * receive the key. When wpa_supplicant has roamed
++		 * using FT, it attempts to set the key before
++		 * association has completed, this rejects that attempt
++		 * so it will set the key again after assocation.
++		 *
++		 * TODO: accept the key if we have a station entry and
++		 *       add it to the device after the station.
++		 */
++		if (!sta || !test_sta_flag(sta, WLAN_STA_ASSOC)) {
+ 			ieee80211_key_free(sdata->local, key);
+ 			err = -ENOENT;
+ 			goto out_unlock;
+diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
+index a5894dd..c55eacc 100644
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -647,8 +647,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
+ 	sdata_info(sdata,
+ 		   "No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n");
+ 
+-	ieee80211_request_internal_scan(sdata,
+-			ifibss->ssid, ifibss->ssid_len, NULL);
++	ieee80211_request_ibss_scan(sdata, ifibss->ssid, ifibss->ssid_len,
++				    NULL);
+ }
+ 
+ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
+@@ -746,9 +746,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
+ 					IEEE80211_SCAN_INTERVAL)) {
+ 		sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
+ 
+-		ieee80211_request_internal_scan(sdata,
+-				ifibss->ssid, ifibss->ssid_len,
+-				ifibss->fixed_channel ? ifibss->channel : NULL);
++		ieee80211_request_ibss_scan(sdata, ifibss->ssid,
++					    ifibss->ssid_len, chan);
+ 	} else {
+ 		int interval = IEEE80211_SCAN_INTERVAL;
+ 
+diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
+index 642a2a3..fcab057 100644
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1239,9 +1239,9 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+ 
+ /* scan/BSS handling */
+ void ieee80211_scan_work(struct work_struct *work);
+-int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
+-				    const u8 *ssid, u8 ssid_len,
+-				    struct ieee80211_channel *chan);
++int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
++				const u8 *ssid, u8 ssid_len,
++				struct ieee80211_channel *chan);
+ int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
+ 			   struct cfg80211_scan_request *req);
+ void ieee80211_scan_cancel(struct ieee80211_local *local);
+@@ -1267,10 +1267,8 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata);
+ void ieee80211_sched_scan_stopped_work(struct work_struct *work);
+ 
+ /* off-channel helpers */
+-void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
+-				    bool offchannel_ps_enable);
+-void ieee80211_offchannel_return(struct ieee80211_local *local,
+-				 bool offchannel_ps_disable);
++void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local);
++void ieee80211_offchannel_return(struct ieee80211_local *local);
+ void ieee80211_roc_setup(struct ieee80211_local *local);
+ void ieee80211_start_next_roc(struct ieee80211_local *local);
+ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata);
+diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
+index 2138dc3..37e3028 100644
+--- a/net/mac80211/offchannel.c
++++ b/net/mac80211/offchannel.c
+@@ -102,8 +102,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata)
+ 	ieee80211_sta_reset_conn_monitor(sdata);
+ }
+ 
+-void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
+-				    bool offchannel_ps_enable)
++void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local)
+ {
+ 	struct ieee80211_sub_if_data *sdata;
+ 
+@@ -128,8 +127,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
+ 
+ 		if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
+ 			netif_tx_stop_all_queues(sdata->dev);
+-			if (offchannel_ps_enable &&
+-			    (sdata->vif.type == NL80211_IFTYPE_STATION) &&
++			if (sdata->vif.type == NL80211_IFTYPE_STATION &&
+ 			    sdata->u.mgd.associated)
+ 				ieee80211_offchannel_ps_enable(sdata);
+ 		}
+@@ -137,8 +135,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
+ 	mutex_unlock(&local->iflist_mtx);
+ }
+ 
+-void ieee80211_offchannel_return(struct ieee80211_local *local,
+-				 bool offchannel_ps_disable)
++void ieee80211_offchannel_return(struct ieee80211_local *local)
+ {
+ 	struct ieee80211_sub_if_data *sdata;
+ 
+@@ -151,11 +148,9 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
+ 			continue;
+ 
+ 		/* Tell AP we're back */
+-		if (offchannel_ps_disable &&
+-		    sdata->vif.type == NL80211_IFTYPE_STATION) {
+-			if (sdata->u.mgd.associated)
+-				ieee80211_offchannel_ps_disable(sdata);
+-		}
++		if (sdata->vif.type == NL80211_IFTYPE_STATION &&
++		    sdata->u.mgd.associated)
++			ieee80211_offchannel_ps_disable(sdata);
+ 
+ 		if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
+ 			/*
+@@ -376,7 +371,7 @@ void ieee80211_sw_roc_work(struct work_struct *work)
+ 			local->tmp_channel = NULL;
+ 			ieee80211_hw_config(local, 0);
+ 
+-			ieee80211_offchannel_return(local, true);
++			ieee80211_offchannel_return(local);
+ 		}
+ 
+ 		ieee80211_recalc_idle(local);
+diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
+index 839dd97..8719635 100644
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -310,7 +310,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted,
+ 	if (!was_hw_scan) {
+ 		ieee80211_configure_filter(local);
+ 		drv_sw_scan_complete(local);
+-		ieee80211_offchannel_return(local, true);
++		ieee80211_offchannel_return(local);
+ 	}
+ 
+ 	ieee80211_recalc_idle(local);
+@@ -355,7 +355,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
+ 	local->next_scan_state = SCAN_DECISION;
+ 	local->scan_channel_idx = 0;
+ 
+-	ieee80211_offchannel_stop_vifs(local, true);
++	ieee80211_offchannel_stop_vifs(local);
+ 
+ 	ieee80211_configure_filter(local);
+ 
+@@ -680,12 +680,8 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local,
+ 	local->scan_channel = NULL;
+ 	ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
+ 
+-	/*
+-	 * Re-enable vifs and beaconing.  Leave PS
+-	 * in off-channel state..will put that back
+-	 * on-channel at the end of scanning.
+-	 */
+-	ieee80211_offchannel_return(local, false);
++	/* disable PS */
++	ieee80211_offchannel_return(local);
+ 
+ 	*next_delay = HZ / 5;
+ 	/* afterwards, resume scan & go to next channel */
+@@ -695,8 +691,7 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local,
+ static void ieee80211_scan_state_resume(struct ieee80211_local *local,
+ 					unsigned long *next_delay)
+ {
+-	/* PS already is in off-channel mode */
+-	ieee80211_offchannel_stop_vifs(local, false);
++	ieee80211_offchannel_stop_vifs(local);
+ 
+ 	if (local->ops->flush) {
+ 		drv_flush(local, false);
+@@ -819,9 +814,9 @@ int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
+ 	return res;
+ }
+ 
+-int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
+-				    const u8 *ssid, u8 ssid_len,
+-				    struct ieee80211_channel *chan)
++int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
++				const u8 *ssid, u8 ssid_len,
++				struct ieee80211_channel *chan)
+ {
+ 	struct ieee80211_local *local = sdata->local;
+ 	int ret = -EBUSY;
+@@ -835,22 +830,36 @@ int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
+ 
+ 	/* fill internal scan request */
+ 	if (!chan) {
+-		int i, nchan = 0;
++		int i, max_n;
++		int n_ch = 0;
+ 
+ 		for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+ 			if (!local->hw.wiphy->bands[band])
+ 				continue;
+-			for (i = 0;
+-			     i < local->hw.wiphy->bands[band]->n_channels;
+-			     i++) {
+-				local->int_scan_req->channels[nchan] =
++
++			max_n = local->hw.wiphy->bands[band]->n_channels;
++			for (i = 0; i < max_n; i++) {
++				struct ieee80211_channel *tmp_ch =
+ 				    &local->hw.wiphy->bands[band]->channels[i];
+-				nchan++;
++
++				if (tmp_ch->flags & (IEEE80211_CHAN_NO_IBSS |
++						     IEEE80211_CHAN_DISABLED))
++					continue;
++
++				local->int_scan_req->channels[n_ch] = tmp_ch;
++				n_ch++;
+ 			}
+ 		}
+ 
+-		local->int_scan_req->n_channels = nchan;
++		if (WARN_ON_ONCE(n_ch == 0))
++			goto unlock;
++
++		local->int_scan_req->n_channels = n_ch;
+ 	} else {
++		if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IBSS |
++						IEEE80211_CHAN_DISABLED)))
++			goto unlock;
++
+ 		local->int_scan_req->channels[0] = chan;
+ 		local->int_scan_req->n_channels = 1;
+ 	}
+diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
+index 31aa8b8..cd7ca8d 100644
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -835,7 +835,7 @@ void sta_info_init(struct ieee80211_local *local)
+ 
+ void sta_info_stop(struct ieee80211_local *local)
+ {
+-	del_timer(&local->sta_cleanup);
++	del_timer_sync(&local->sta_cleanup);
+ 	sta_info_flush(local, NULL);
+ }
+ 
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
+index c5c9e2a..70f7e18 100644
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -2443,13 +2443,15 @@ static int packet_release(struct socket *sock)
+ 
+ 	packet_flush_mclist(sk);
+ 
+-	memset(&req_u, 0, sizeof(req_u));
+-
+-	if (po->rx_ring.pg_vec)
++	if (po->rx_ring.pg_vec) {
++		memset(&req_u, 0, sizeof(req_u));
+ 		packet_set_ring(sk, &req_u, 1, 0);
++	}
+ 
+-	if (po->tx_ring.pg_vec)
++	if (po->tx_ring.pg_vec) {
++		memset(&req_u, 0, sizeof(req_u));
+ 		packet_set_ring(sk, &req_u, 1, 1);
++	}
+ 
+ 	fanout_release(sk);
+ 
+diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
+index 9d75b77..e9ea2f3 100644
+--- a/net/sched/sch_htb.c
++++ b/net/sched/sch_htb.c
+@@ -874,7 +874,7 @@ ok:
+ 	q->now = psched_get_time();
+ 	start_at = jiffies;
+ 
+-	next_event = q->now + 5 * PSCHED_TICKS_PER_SEC;
++	next_event = q->now + 5LLU * PSCHED_TICKS_PER_SEC;
+ 
+ 	for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
+ 		/* common case optimization - skip event handler quickly */
+diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
+index 68a385d..58cd035 100644
+--- a/net/sctp/endpointola.c
++++ b/net/sctp/endpointola.c
+@@ -248,6 +248,8 @@ void sctp_endpoint_free(struct sctp_endpoint *ep)
+ /* Final destructor for endpoint.  */
+ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
+ {
++	int i;
++
+ 	SCTP_ASSERT(ep->base.dead, "Endpoint is not dead", return);
+ 
+ 	/* Free up the HMAC transform. */
+@@ -270,6 +272,9 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep)
+ 	sctp_inq_free(&ep->base.inqueue);
+ 	sctp_bind_addr_free(&ep->base.bind_addr);
+ 
++	for (i = 0; i < SCTP_HOW_MANY_SECRETS; ++i)
++		memset(&ep->secret_key[i], 0, SCTP_SECRET_SIZE);
++
+ 	/* Remove and free the port */
+ 	if (sctp_sk(ep->base.sk)->bind_hash)
+ 		sctp_put_port(ep->base.sk);
+diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
+index e7aa177c..e0902c9 100644
+--- a/net/sctp/outqueue.c
++++ b/net/sctp/outqueue.c
+@@ -223,7 +223,7 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q)
+ 
+ /* Free the outqueue structure and any related pending chunks.
+  */
+-void sctp_outq_teardown(struct sctp_outq *q)
++static void __sctp_outq_teardown(struct sctp_outq *q)
+ {
+ 	struct sctp_transport *transport;
+ 	struct list_head *lchunk, *temp;
+@@ -276,8 +276,6 @@ void sctp_outq_teardown(struct sctp_outq *q)
+ 		sctp_chunk_free(chunk);
+ 	}
+ 
+-	q->error = 0;
+-
+ 	/* Throw away any leftover control chunks. */
+ 	list_for_each_entry_safe(chunk, tmp, &q->control_chunk_list, list) {
+ 		list_del_init(&chunk->list);
+@@ -285,11 +283,17 @@ void sctp_outq_teardown(struct sctp_outq *q)
+ 	}
+ }
+ 
++void sctp_outq_teardown(struct sctp_outq *q)
++{
++	__sctp_outq_teardown(q);
++	sctp_outq_init(q->asoc, q);
++}
++
+ /* Free the outqueue structure and any related pending chunks.  */
+ void sctp_outq_free(struct sctp_outq *q)
+ {
+ 	/* Throw away leftover chunks. */
+-	sctp_outq_teardown(q);
++	__sctp_outq_teardown(q);
+ 
+ 	/* If we were kmalloc()'d, free the memory.  */
+ 	if (q->malloced)
+diff --git a/net/sctp/socket.c b/net/sctp/socket.c
+index cb54123..d32d86d 100644
+--- a/net/sctp/socket.c
++++ b/net/sctp/socket.c
+@@ -3375,7 +3375,7 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
+ 
+ 	ret = sctp_auth_set_key(sctp_sk(sk)->ep, asoc, authkey);
+ out:
+-	kfree(authkey);
++	kzfree(authkey);
+ 	return ret;
+ }
+ 
+diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
+index fa48c60..346c387 100644
+--- a/net/sunrpc/clnt.c
++++ b/net/sunrpc/clnt.c
+@@ -234,7 +234,7 @@ static struct rpc_clnt *rpc_get_client_for_event(struct net *net, int event)
+ 	spin_lock(&sn->rpc_client_lock);
+ 	list_for_each_entry(clnt, &sn->all_clients, cl_clients) {
+ 		if (clnt->cl_program->pipe_dir_name == NULL)
+-			break;
++			continue;
+ 		if (rpc_clnt_skip_event(clnt, event))
+ 			continue;
+ 		if (atomic_inc_not_zero(&clnt->cl_count) == 0)
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 21fde99..2a419f1 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1152,14 +1152,19 @@ static void rpc_kill_sb(struct super_block *sb)
+ 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ 
+ 	mutex_lock(&sn->pipefs_sb_lock);
++	if (sn->pipefs_sb != sb) {
++		mutex_unlock(&sn->pipefs_sb_lock);
++		goto out;
++	}
+ 	sn->pipefs_sb = NULL;
+ 	mutex_unlock(&sn->pipefs_sb_lock);
+-	put_net(net);
+ 	dprintk("RPC:	sending pipefs UMOUNT notification for net %p%s\n", net,
+ 								NET_NAME(net));
+ 	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+ 					   RPC_PIPEFS_UMOUNT,
+ 					   sb);
++	put_net(net);
++out:
+ 	kill_litter_super(sb);
+ }
+ 
+diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
+index 128494e..7fc5846 100644
+--- a/net/sunrpc/sched.c
++++ b/net/sunrpc/sched.c
+@@ -919,16 +919,35 @@ struct rpc_task *rpc_new_task(const struct rpc_task_setup *setup_data)
+ 	return task;
+ }
+ 
++/*
++ * rpc_free_task - release rpc task and perform cleanups
++ *
++ * Note that we free up the rpc_task _after_ rpc_release_calldata()
++ * in order to work around a workqueue dependency issue.
++ *
++ * Tejun Heo states:
++ * "Workqueue currently considers two work items to be the same if they're
++ * on the same address and won't execute them concurrently - ie. it
++ * makes a work item which is queued again while being executed wait
++ * for the previous execution to complete.
++ *
++ * If a work function frees the work item, and then waits for an event
++ * which should be performed by another work item and *that* work item
++ * recycles the freed work item, it can create a false dependency loop.
++ * There really is no reliable way to detect this short of verifying
++ * every memory free."
++ *
++ */
+ static void rpc_free_task(struct rpc_task *task)
+ {
+-	const struct rpc_call_ops *tk_ops = task->tk_ops;
+-	void *calldata = task->tk_calldata;
++	unsigned short tk_flags = task->tk_flags;
++
++	rpc_release_calldata(task->tk_ops, task->tk_calldata);
+ 
+-	if (task->tk_flags & RPC_TASK_DYNAMIC) {
++	if (tk_flags & RPC_TASK_DYNAMIC) {
+ 		dprintk("RPC: %5u freeing task\n", task->tk_pid);
+ 		mempool_free(task, rpc_task_mempool);
+ 	}
+-	rpc_release_calldata(tk_ops, calldata);
+ }
+ 
+ static void rpc_async_release(struct work_struct *work)
+@@ -938,8 +957,7 @@ static void rpc_async_release(struct work_struct *work)
+ 
+ static void rpc_release_resources_task(struct rpc_task *task)
+ {
+-	if (task->tk_rqstp)
+-		xprt_release(task);
++	xprt_release(task);
+ 	if (task->tk_msg.rpc_cred) {
+ 		put_rpccred(task->tk_msg.rpc_cred);
+ 		task->tk_msg.rpc_cred = NULL;
+diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
+index bac973a..3e74e01 100644
+--- a/net/sunrpc/svc_xprt.c
++++ b/net/sunrpc/svc_xprt.c
+@@ -814,7 +814,6 @@ static void svc_age_temp_xprts(unsigned long closure)
+ 	struct svc_serv *serv = (struct svc_serv *)closure;
+ 	struct svc_xprt *xprt;
+ 	struct list_head *le, *next;
+-	LIST_HEAD(to_be_aged);
+ 
+ 	dprintk("svc_age_temp_xprts\n");
+ 
+@@ -835,25 +834,15 @@ static void svc_age_temp_xprts(unsigned long closure)
+ 		if (atomic_read(&xprt->xpt_ref.refcount) > 1 ||
+ 		    test_bit(XPT_BUSY, &xprt->xpt_flags))
+ 			continue;
+-		svc_xprt_get(xprt);
+-		list_move(le, &to_be_aged);
++		list_del_init(le);
+ 		set_bit(XPT_CLOSE, &xprt->xpt_flags);
+ 		set_bit(XPT_DETACHED, &xprt->xpt_flags);
+-	}
+-	spin_unlock_bh(&serv->sv_lock);
+-
+-	while (!list_empty(&to_be_aged)) {
+-		le = to_be_aged.next;
+-		/* fiddling the xpt_list node is safe 'cos we're XPT_DETACHED */
+-		list_del_init(le);
+-		xprt = list_entry(le, struct svc_xprt, xpt_list);
+-
+ 		dprintk("queuing xprt %p for closing\n", xprt);
+ 
+ 		/* a thread will dequeue and close it soon */
+ 		svc_xprt_enqueue(xprt);
+-		svc_xprt_put(xprt);
+ 	}
++	spin_unlock_bh(&serv->sv_lock);
+ 
+ 	mod_timer(&serv->sv_temptimer, jiffies + svc_conn_age_period * HZ);
+ }
+diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
+index 5d7f61d..2480c01 100644
+--- a/net/sunrpc/xprt.c
++++ b/net/sunrpc/xprt.c
+@@ -1139,10 +1139,18 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt)
+ void xprt_release(struct rpc_task *task)
+ {
+ 	struct rpc_xprt	*xprt;
+-	struct rpc_rqst	*req;
++	struct rpc_rqst	*req = task->tk_rqstp;
+ 
+-	if (!(req = task->tk_rqstp))
++	if (req == NULL) {
++		if (task->tk_client) {
++			rcu_read_lock();
++			xprt = rcu_dereference(task->tk_client->cl_xprt);
++			if (xprt->snd_task == task)
++				xprt_release_write(xprt, task);
++			rcu_read_unlock();
++		}
+ 		return;
++	}
+ 
+ 	xprt = req->rq_xprt;
+ 	if (task->tk_ops->rpc_count_stats != NULL)
+diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
+index 49a464f..62fa2c5 100644
+--- a/security/integrity/evm/evm_crypto.c
++++ b/security/integrity/evm/evm_crypto.c
+@@ -205,9 +205,9 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name,
+ 		rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,
+ 					   &xattr_data,
+ 					   sizeof(xattr_data), 0);
+-	}
+-	else if (rc == -ENODATA)
++	} else if (rc == -ENODATA && inode->i_op->removexattr) {
+ 		rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM);
++	}
+ 	return rc;
+ }
+ 
+diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
+index 48d7c0a..bd3ba88 100644
+--- a/sound/arm/pxa2xx-ac97-lib.c
++++ b/sound/arm/pxa2xx-ac97-lib.c
+@@ -18,6 +18,7 @@
+ #include <linux/delay.h>
+ #include <linux/module.h>
+ #include <linux/io.h>
++#include <linux/gpio.h>
+ 
+ #include <sound/ac97_codec.h>
+ #include <sound/pxa2xx-lib.h>
+@@ -148,6 +149,8 @@ static inline void pxa_ac97_warm_pxa27x(void)
+ 
+ static inline void pxa_ac97_cold_pxa27x(void)
+ {
++	unsigned int timeout;
++
+ 	GCR &=  GCR_COLD_RST;  /* clear everything but nCRST */
+ 	GCR &= ~GCR_COLD_RST;  /* then assert nCRST */
+ 
+@@ -157,8 +160,10 @@ static inline void pxa_ac97_cold_pxa27x(void)
+ 	clk_enable(ac97conf_clk);
+ 	udelay(5);
+ 	clk_disable(ac97conf_clk);
+-	GCR = GCR_COLD_RST;
+-	udelay(50);
++	GCR = GCR_COLD_RST | GCR_WARM_RST;
++	timeout = 100;     /* wait for the codec-ready bit to be set */
++	while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)
++		mdelay(1);
+ }
+ #endif
+ 
+@@ -340,8 +345,21 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
+ 	}
+ 
+ 	if (cpu_is_pxa27x()) {
+-		/* Use GPIO 113 as AC97 Reset on Bulverde */
++		/*
++		 * This gpio is needed for a work-around to a bug in the ac97
++		 * controller during warm reset.  The direction and level is set
++		 * here so that it is an output driven high when switching from
++		 * AC97_nRESET alt function to generic gpio.
++		 */
++		ret = gpio_request_one(reset_gpio, GPIOF_OUT_INIT_HIGH,
++				       "pxa27x ac97 reset");
++		if (ret < 0) {
++			pr_err("%s: gpio_request_one() failed: %d\n",
++			       __func__, ret);
++			goto err_conf;
++		}
+ 		pxa27x_assert_ac97reset(reset_gpio, 0);
++
+ 		ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK");
+ 		if (IS_ERR(ac97conf_clk)) {
+ 			ret = PTR_ERR(ac97conf_clk);
+@@ -384,6 +402,8 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_probe);
+ 
+ void pxa2xx_ac97_hw_remove(struct platform_device *dev)
+ {
++	if (cpu_is_pxa27x())
++		gpio_free(reset_gpio);
+ 	GCR |= GCR_ACLINK_OFF;
+ 	free_irq(IRQ_AC97, NULL);
+ 	if (ac97conf_clk) {
+diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
+index ee895f3..be8c176 100644
+--- a/sound/pci/ali5451/ali5451.c
++++ b/sound/pci/ali5451/ali5451.c
+@@ -1435,7 +1435,7 @@ static snd_pcm_uframes_t snd_ali_pointer(struct snd_pcm_substream *substream)
+ 
+ 	spin_lock(&codec->reg_lock);
+ 	if (!pvoice->running) {
+-		spin_unlock_irq(&codec->reg_lock);
++		spin_unlock(&codec->reg_lock);
+ 		return 0;
+ 	}
+ 	outb(pvoice->number, ALI_REG(codec, ALI_GC_CIR));
+diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
+index 8f23374..c383243 100644
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -924,8 +924,12 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
+ 	if (!static_hdmi_pcm && eld->eld_valid) {
+ 		snd_hdmi_eld_update_pcm_info(eld, hinfo);
+ 		if (hinfo->channels_min > hinfo->channels_max ||
+-		    !hinfo->rates || !hinfo->formats)
++		    !hinfo->rates || !hinfo->formats) {
++			per_cvt->assigned = 0;
++			hinfo->nid = 0;
++			snd_hda_spdif_ctls_unassign(codec, pin_idx);
+ 			return -ENODEV;
++		}
+ 	}
+ 
+ 	/* Store the updated parameters */
+@@ -989,6 +993,7 @@ static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
+ 		"HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n",
+ 		codec->addr, pin_nid, eld->monitor_present, eld_valid);
+ 
++	eld->eld_valid = false;
+ 	if (eld_valid) {
+ 		if (!snd_hdmi_get_eld(eld, codec, pin_nid))
+ 			snd_hdmi_show_eld(eld);
+@@ -1245,6 +1250,9 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx)
+ 
+ 	if (pcmdev > 0)
+ 		sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);
++	if (!is_jack_detectable(codec, per_pin->pin_nid))
++		strncat(hdmi_str, " Phantom",
++			sizeof(hdmi_str) - strlen(hdmi_str) - 1);
+ 
+ 	return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0);
+ }
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index e1b7061..51bbe0d 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -4719,6 +4719,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),
+ 	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),
+ 	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),
++	SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST),
+ 	SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734),
+ 	SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),
+ 	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),
+@@ -5415,6 +5416,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
+ 	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),
+ 	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),
+ 	SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),
++	SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),
+ 
+ 	/* All Apple entries are in codec SSIDs */
+ 	SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC889_FIXUP_MBP_VREF),
+@@ -6562,8 +6564,8 @@ static void alc861vd_fixup_dallas(struct hda_codec *codec,
+ 				  const struct alc_fixup *fix, int action)
+ {
+ 	if (action == ALC_FIXUP_ACT_PRE_PROBE) {
+-		snd_hda_override_pin_caps(codec, 0x18, 0x00001714);
+-		snd_hda_override_pin_caps(codec, 0x19, 0x0000171c);
++		snd_hda_override_pin_caps(codec, 0x18, 0x00000734);
++		snd_hda_override_pin_caps(codec, 0x19, 0x0000073c);
+ 	}
+ }
+ 
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index 3d4722f..f206117 100644
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -1698,7 +1698,7 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
+ 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1658,
+ 			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
+ 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1659,
+-			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
++			  "HP Pavilion dv7", STAC_HP_DV7_4000),
+ 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165A,
+ 			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
+ 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165B,
+diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
+index 46b3629..f1dec07 100644
+--- a/sound/pci/rme32.c
++++ b/sound/pci/rme32.c
+@@ -1017,7 +1017,7 @@ static int snd_rme32_capture_close(struct snd_pcm_substream *substream)
+ 	spin_lock_irq(&rme32->lock);
+ 	rme32->capture_substream = NULL;
+ 	rme32->capture_periodsize = 0;
+-	spin_unlock(&rme32->lock);
++	spin_unlock_irq(&rme32->lock);
+ 	return 0;
+ }
+ 
+diff --git a/sound/soc/codecs/sigmadsp.c b/sound/soc/codecs/sigmadsp.c
+index 5be42bf..4068f24 100644
+--- a/sound/soc/codecs/sigmadsp.c
++++ b/sound/soc/codecs/sigmadsp.c
+@@ -225,7 +225,7 @@ EXPORT_SYMBOL(process_sigma_firmware);
+ static int sigma_action_write_regmap(void *control_data,
+ 	const struct sigma_action *sa, size_t len)
+ {
+-	return regmap_raw_write(control_data, le16_to_cpu(sa->addr),
++	return regmap_raw_write(control_data, be16_to_cpu(sa->addr),
+ 		sa->payload, len - 2);
+ }
+ 
+diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
+index a3acb7a..6275a2b 100644
+--- a/sound/soc/codecs/wm2000.c
++++ b/sound/soc/codecs/wm2000.c
+@@ -188,9 +188,9 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
+ 
+ 	ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY);
+ 	if (wm2000->speech_clarity)
+-		ret &= ~WM2000_SPEECH_CLARITY;
+-	else
+ 		ret |= WM2000_SPEECH_CLARITY;
++	else
++		ret &= ~WM2000_SPEECH_CLARITY;
+ 	wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret);
+ 
+ 	wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33);
+diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
+index c8bff6d..9932aac 100644
+--- a/sound/soc/codecs/wm2200.c
++++ b/sound/soc/codecs/wm2200.c
+@@ -897,8 +897,6 @@ static const char *wm2200_mixer_texts[] = {
+ 	"EQR",
+ 	"LHPF1",
+ 	"LHPF2",
+-	"LHPF3",
+-	"LHPF4",
+ 	"DSP1.1",
+ 	"DSP1.2",
+ 	"DSP1.3",
+@@ -931,7 +929,6 @@ static int wm2200_mixer_values[] = {
+ 	0x25,
+ 	0x50,   /* EQ */
+ 	0x51,
+-	0x52,
+ 	0x60,   /* LHPF1 */
+ 	0x61,   /* LHPF2 */
+ 	0x68,   /* DSP1 */
+@@ -993,9 +990,9 @@ SOC_DOUBLE_R_TLV("IN3 Volume", WM2200_IN3L_CONTROL, WM2200_IN3R_CONTROL,
+ 
+ SOC_DOUBLE_R("IN1 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_1L,
+ 	     WM2200_ADC_DIGITAL_VOLUME_1R, WM2200_IN1L_MUTE_SHIFT, 1, 1),
+-SOC_DOUBLE_R("IN2 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_1L,
++SOC_DOUBLE_R("IN2 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_2L,
+ 	     WM2200_ADC_DIGITAL_VOLUME_2R, WM2200_IN2L_MUTE_SHIFT, 1, 1),
+-SOC_DOUBLE_R("IN3 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_1L,
++SOC_DOUBLE_R("IN3 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_3L,
+ 	     WM2200_ADC_DIGITAL_VOLUME_3R, WM2200_IN3L_MUTE_SHIFT, 1, 1),
+ 
+ SOC_DOUBLE_R_TLV("IN1 Digital Volume", WM2200_ADC_DIGITAL_VOLUME_1L,
+@@ -1380,15 +1377,9 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+ 	case SND_SOC_DAIFMT_DSP_A:
+ 		fmt_val = 0;
+ 		break;
+-	case SND_SOC_DAIFMT_DSP_B:
+-		fmt_val = 1;
+-		break;
+ 	case SND_SOC_DAIFMT_I2S:
+ 		fmt_val = 2;
+ 		break;
+-	case SND_SOC_DAIFMT_LEFT_J:
+-		fmt_val = 3;
+-		break;
+ 	default:
+ 		dev_err(codec->dev, "Unsupported DAI format %d\n",
+ 			fmt & SND_SOC_DAIFMT_FORMAT_MASK);
+@@ -1440,7 +1431,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+ 			    WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV,
+ 			    lrclk);
+ 	snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5,
+-			    WM2200_AIF1_FMT_MASK << 1, fmt_val << 1);
++			    WM2200_AIF1_FMT_MASK, fmt_val);
+ 
+ 	return 0;
+ }
+diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
+index f481729..10d48cd 100644
+--- a/sound/soc/codecs/wm5100.c
++++ b/sound/soc/codecs/wm5100.c
+@@ -1279,15 +1279,9 @@ static int wm5100_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+ 	case SND_SOC_DAIFMT_DSP_A:
+ 		mask = 0;
+ 		break;
+-	case SND_SOC_DAIFMT_DSP_B:
+-		mask = 1;
+-		break;
+ 	case SND_SOC_DAIFMT_I2S:
+ 		mask = 2;
+ 		break;
+-	case SND_SOC_DAIFMT_LEFT_J:
+-		mask = 3;
+-		break;
+ 	default:
+ 		dev_err(codec->dev, "Unsupported DAI format %d\n",
+ 			fmt & SND_SOC_DAIFMT_FORMAT_MASK);
+diff --git a/sound/usb/midi.c b/sound/usb/midi.c
+index eeefbce..34b9bb7 100644
+--- a/sound/usb/midi.c
++++ b/sound/usb/midi.c
+@@ -116,6 +116,7 @@ struct snd_usb_midi {
+ 	struct list_head list;
+ 	struct timer_list error_timer;
+ 	spinlock_t disc_lock;
++	struct rw_semaphore disc_rwsem;
+ 	struct mutex mutex;
+ 	u32 usb_id;
+ 	int next_midi_device;
+@@ -125,8 +126,10 @@ struct snd_usb_midi {
+ 		struct snd_usb_midi_in_endpoint *in;
+ 	} endpoints[MIDI_MAX_ENDPOINTS];
+ 	unsigned long input_triggered;
+-	unsigned int opened;
++	bool autopm_reference;
++	unsigned int opened[2];
+ 	unsigned char disconnected;
++	unsigned char input_running;
+ 
+ 	struct snd_kcontrol *roland_load_ctl;
+ };
+@@ -148,7 +151,6 @@ struct snd_usb_midi_out_endpoint {
+ 		struct snd_usb_midi_out_endpoint* ep;
+ 		struct snd_rawmidi_substream *substream;
+ 		int active;
+-		bool autopm_reference;
+ 		uint8_t cable;		/* cable number << 4 */
+ 		uint8_t state;
+ #define STATE_UNKNOWN	0
+@@ -1033,29 +1035,58 @@ static void update_roland_altsetting(struct snd_usb_midi* umidi)
+ 	snd_usbmidi_input_start(&umidi->list);
+ }
+ 
+-static void substream_open(struct snd_rawmidi_substream *substream, int open)
++static int substream_open(struct snd_rawmidi_substream *substream, int dir,
++			  int open)
+ {
+ 	struct snd_usb_midi* umidi = substream->rmidi->private_data;
+ 	struct snd_kcontrol *ctl;
++	int err;
++
++	down_read(&umidi->disc_rwsem);
++	if (umidi->disconnected) {
++		up_read(&umidi->disc_rwsem);
++		return open ? -ENODEV : 0;
++	}
+ 
+ 	mutex_lock(&umidi->mutex);
+ 	if (open) {
+-		if (umidi->opened++ == 0 && umidi->roland_load_ctl) {
+-			ctl = umidi->roland_load_ctl;
+-			ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+-			snd_ctl_notify(umidi->card,
++		if (!umidi->opened[0] && !umidi->opened[1]) {
++			err = usb_autopm_get_interface(umidi->iface);
++			umidi->autopm_reference = err >= 0;
++			if (err < 0 && err != -EACCES) {
++				mutex_unlock(&umidi->mutex);
++				up_read(&umidi->disc_rwsem);
++				return -EIO;
++			}
++			if (umidi->roland_load_ctl) {
++				ctl = umidi->roland_load_ctl;
++				ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
++				snd_ctl_notify(umidi->card,
+ 				       SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
+-			update_roland_altsetting(umidi);
++				update_roland_altsetting(umidi);
++			}
+ 		}
++		umidi->opened[dir]++;
++		if (umidi->opened[1])
++			snd_usbmidi_input_start(&umidi->list);
+ 	} else {
+-		if (--umidi->opened == 0 && umidi->roland_load_ctl) {
+-			ctl = umidi->roland_load_ctl;
+-			ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+-			snd_ctl_notify(umidi->card,
++		umidi->opened[dir]--;
++		if (!umidi->opened[1])
++			snd_usbmidi_input_stop(&umidi->list);
++		if (!umidi->opened[0] && !umidi->opened[1]) {
++			if (umidi->roland_load_ctl) {
++				ctl = umidi->roland_load_ctl;
++				ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
++				snd_ctl_notify(umidi->card,
+ 				       SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
++			}
++			if (umidi->autopm_reference)
++				usb_autopm_put_interface(umidi->iface);
+ 		}
+ 	}
+ 	mutex_unlock(&umidi->mutex);
++	up_read(&umidi->disc_rwsem);
++	return 0;
+ }
+ 
+ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
+@@ -1063,7 +1094,6 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
+ 	struct snd_usb_midi* umidi = substream->rmidi->private_data;
+ 	struct usbmidi_out_port* port = NULL;
+ 	int i, j;
+-	int err;
+ 
+ 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
+ 		if (umidi->endpoints[i].out)
+@@ -1076,25 +1106,15 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
+ 		snd_BUG();
+ 		return -ENXIO;
+ 	}
+-	err = usb_autopm_get_interface(umidi->iface);
+-	port->autopm_reference = err >= 0;
+-	if (err < 0 && err != -EACCES)
+-		return -EIO;
++
+ 	substream->runtime->private_data = port;
+ 	port->state = STATE_UNKNOWN;
+-	substream_open(substream, 1);
+-	return 0;
++	return substream_open(substream, 0, 1);
+ }
+ 
+ static int snd_usbmidi_output_close(struct snd_rawmidi_substream *substream)
+ {
+-	struct snd_usb_midi* umidi = substream->rmidi->private_data;
+-	struct usbmidi_out_port *port = substream->runtime->private_data;
+-
+-	substream_open(substream, 0);
+-	if (port->autopm_reference)
+-		usb_autopm_put_interface(umidi->iface);
+-	return 0;
++	return substream_open(substream, 0, 0);
+ }
+ 
+ static void snd_usbmidi_output_trigger(struct snd_rawmidi_substream *substream, int up)
+@@ -1147,14 +1167,12 @@ static void snd_usbmidi_output_drain(struct snd_rawmidi_substream *substream)
+ 
+ static int snd_usbmidi_input_open(struct snd_rawmidi_substream *substream)
+ {
+-	substream_open(substream, 1);
+-	return 0;
++	return substream_open(substream, 1, 1);
+ }
+ 
+ static int snd_usbmidi_input_close(struct snd_rawmidi_substream *substream)
+ {
+-	substream_open(substream, 0);
+-	return 0;
++	return substream_open(substream, 1, 0);
+ }
+ 
+ static void snd_usbmidi_input_trigger(struct snd_rawmidi_substream *substream, int up)
+@@ -1403,9 +1421,12 @@ void snd_usbmidi_disconnect(struct list_head* p)
+ 	 * a timer may submit an URB. To reliably break the cycle
+ 	 * a flag under lock must be used
+ 	 */
++	down_write(&umidi->disc_rwsem);
+ 	spin_lock_irq(&umidi->disc_lock);
+ 	umidi->disconnected = 1;
+ 	spin_unlock_irq(&umidi->disc_lock);
++	up_write(&umidi->disc_rwsem);
++
+ 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
+ 		struct snd_usb_midi_endpoint* ep = &umidi->endpoints[i];
+ 		if (ep->out)
+@@ -2060,12 +2081,15 @@ void snd_usbmidi_input_stop(struct list_head* p)
+ 	unsigned int i, j;
+ 
+ 	umidi = list_entry(p, struct snd_usb_midi, list);
++	if (!umidi->input_running)
++		return;
+ 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
+ 		struct snd_usb_midi_endpoint* ep = &umidi->endpoints[i];
+ 		if (ep->in)
+ 			for (j = 0; j < INPUT_URBS; ++j)
+ 				usb_kill_urb(ep->in->urbs[j]);
+ 	}
++	umidi->input_running = 0;
+ }
+ 
+ static void snd_usbmidi_input_start_ep(struct snd_usb_midi_in_endpoint* ep)
+@@ -2090,8 +2114,11 @@ void snd_usbmidi_input_start(struct list_head* p)
+ 	int i;
+ 
+ 	umidi = list_entry(p, struct snd_usb_midi, list);
++	if (umidi->input_running || !umidi->opened[1])
++		return;
+ 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
+ 		snd_usbmidi_input_start_ep(umidi->endpoints[i].in);
++	umidi->input_running = 1;
+ }
+ 
+ /*
+@@ -2117,6 +2144,7 @@ int snd_usbmidi_create(struct snd_card *card,
+ 	umidi->usb_protocol_ops = &snd_usbmidi_standard_ops;
+ 	init_timer(&umidi->error_timer);
+ 	spin_lock_init(&umidi->disc_lock);
++	init_rwsem(&umidi->disc_rwsem);
+ 	mutex_init(&umidi->mutex);
+ 	umidi->usb_id = USB_ID(le16_to_cpu(umidi->dev->descriptor.idVendor),
+ 			       le16_to_cpu(umidi->dev->descriptor.idProduct));
+@@ -2229,9 +2257,6 @@ int snd_usbmidi_create(struct snd_card *card,
+ 	}
+ 
+ 	list_add_tail(&umidi->list, midi_list);
+-
+-	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
+-		snd_usbmidi_input_start_ep(umidi->endpoints[i].in);
+ 	return 0;
+ }
+ 
+diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
+index 298070e..41e8bfb 100644
+--- a/sound/usb/mixer.c
++++ b/sound/usb/mixer.c
+@@ -1259,16 +1259,23 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
+ 		}
+ 		channels = (hdr->bLength - 7) / csize - 1;
+ 		bmaControls = hdr->bmaControls;
++		if (hdr->bLength < 7 + csize) {
++			snd_printk(KERN_ERR "usbaudio: unit %u: "
++				   "invalid UAC_FEATURE_UNIT descriptor\n",
++				   unitid);
++			return -EINVAL;
++		}
+ 	} else {
+ 		struct uac2_feature_unit_descriptor *ftr = _ftr;
+ 		csize = 4;
+ 		channels = (hdr->bLength - 6) / 4 - 1;
+ 		bmaControls = ftr->bmaControls;
+-	}
+-
+-	if (hdr->bLength < 7 || !csize || hdr->bLength < 7 + csize) {
+-		snd_printk(KERN_ERR "usbaudio: unit %u: invalid UAC_FEATURE_UNIT descriptor\n", unitid);
+-		return -EINVAL;
++		if (hdr->bLength < 6 + csize) {
++			snd_printk(KERN_ERR "usbaudio: unit %u: "
++				   "invalid UAC_FEATURE_UNIT descriptor\n",
++				   unitid);
++			return -EINVAL;
++		}
+ 	}
+ 
+ 	/* parse the source unit */
+diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
+index d73ac9b..128eb0c 100644
+--- a/sound/usb/quirks-table.h
++++ b/sound/usb/quirks-table.h
+@@ -1658,7 +1658,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+ 	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+ 		/* .vendor_name = "Roland", */
+ 		/* .product_name = "A-PRO", */
+-		.ifnum = 1,
++		.ifnum = 0,
+ 		.type = QUIRK_MIDI_FIXED_ENDPOINT,
+ 		.data = & (const struct snd_usb_midi_endpoint_info) {
+ 			.out_cables = 0x0003,
+diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
+index 0f58b4b..b8d1ad1 100644
+--- a/sound/usb/quirks.c
++++ b/sound/usb/quirks.c
+@@ -387,11 +387,13 @@ static int snd_usb_fasttrackpro_boot_quirk(struct usb_device *dev)
+ 		 * rules
+ 		 */
+ 		err = usb_driver_set_configuration(dev, 2);
+-		if (err < 0) {
++		if (err < 0)
+ 			snd_printdd("error usb_driver_set_configuration: %d\n",
+ 				    err);
+-			return -ENODEV;
+-		}
++		/* Always return an error, so that we stop creating a device
++		   that will just be destroyed and recreated with a new
++		   configuration */
++		return -ENODEV;
+ 	} else
+ 		snd_printk(KERN_INFO "usb-audio: Fast Track Pro config OK\n");
+ 
+diff --git a/tools/perf/Makefile b/tools/perf/Makefile
+index 3657ab0..243ae64 100644
+--- a/tools/perf/Makefile
++++ b/tools/perf/Makefile
+@@ -225,13 +225,13 @@ $(OUTPUT)util/parse-events-flex.c: util/parse-events.l
+ 	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c
+ 
+ $(OUTPUT)util/parse-events-bison.c: util/parse-events.y
+-	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c
++	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_
+ 
+ $(OUTPUT)util/pmu-flex.c: util/pmu.l
+ 	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c
+ 
+ $(OUTPUT)util/pmu-bison.c: util/pmu.y
+-	$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c
++	$(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_
+ 
+ $(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c
+ $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c
+diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
+index 2bc5fbf..68a5f42 100644
+--- a/tools/perf/util/parse-events.y
++++ b/tools/perf/util/parse-events.y
+@@ -1,5 +1,4 @@
+ %pure-parser
+-%name-prefix "parse_events_"
+ %parse-param {void *_data}
+ %parse-param {void *scanner}
+ %lex-param {void* scanner}
+diff --git a/tools/perf/util/pmu.y b/tools/perf/util/pmu.y
+index 20ea77e..522943f 100644
+--- a/tools/perf/util/pmu.y
++++ b/tools/perf/util/pmu.y
+@@ -1,5 +1,4 @@
+ 
+-%name-prefix "perf_pmu_"
+ %parse-param {struct list_head *format}
+ %parse-param {char *name}
+ 
+diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
+index d617f69..cd197be 100644
+--- a/virt/kvm/kvm_main.c
++++ b/virt/kvm/kvm_main.c
+@@ -701,8 +701,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
+ 	int r;
+ 	gfn_t base_gfn;
+ 	unsigned long npages;
+-	unsigned long i;
+-	struct kvm_memory_slot *memslot;
++	struct kvm_memory_slot *memslot, *slot;
+ 	struct kvm_memory_slot old, new;
+ 	struct kvm_memslots *slots, *old_memslots;
+ 
+@@ -749,13 +748,11 @@ int __kvm_set_memory_region(struct kvm *kvm,
+ 
+ 	/* Check for overlaps */
+ 	r = -EEXIST;
+-	for (i = 0; i < KVM_MEMORY_SLOTS; ++i) {
+-		struct kvm_memory_slot *s = &kvm->memslots->memslots[i];
+-
+-		if (s == memslot || !s->npages)
++	kvm_for_each_memslot(slot, kvm->memslots) {
++		if (slot->id >= KVM_MEMORY_SLOTS || slot == memslot)
+ 			continue;
+-		if (!((base_gfn + npages <= s->base_gfn) ||
+-		      (base_gfn >= s->base_gfn + s->npages)))
++		if (!((base_gfn + npages <= slot->base_gfn) ||
++		      (base_gfn >= slot->base_gfn + slot->npages)))
+ 			goto out_free;
+ 	}
+ 
diff --git a/main/linux-vserver/patch-3.7.10-vs2.3.5.6.diff b/main/linux-vserver/patch-3.7.10-vs2.3.5.6.diff
new file mode 100644
index 000000000..a35ca32a0
--- /dev/null
+++ b/main/linux-vserver/patch-3.7.10-vs2.3.5.6.diff
@@ -0,0 +1,26174 @@
+diff -NurpP --minimal linux-3.7.10/Documentation/vserver/debug.txt linux-3.7.10-vs2.3.5.6/Documentation/vserver/debug.txt
+--- linux-3.7.10/Documentation/vserver/debug.txt	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/Documentation/vserver/debug.txt	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,154 @@
++
++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 %ld,%ld [mult=%d]"
++ 3   8	"ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
++	"ext3_has_free_blocks(%p): free=%lu, root=%lu"
++	"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_misc:
++
++ 0   1	"destroy_dqhash: %p [#0x%08x] c=%d"
++	"new_dqhash: %p [#0x%08x]"
++	"vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
++	"vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
++	"vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
++	"vroot_get_real_bdev not set"
++ 1   2	"cow_break_link(»%s«)"
++	"temp copy »%s«"
++ 2   4	"dentry_open(new): %p"
++	"dentry_open(old): %p"
++	"lookup_create(new): %p"
++	"old path »%s«"
++	"path_lookup(old): %d"
++	"vfs_create(new): %d"
++	"vfs_rename: %d"
++	"vfs_sendfile: %d"
++ 3   8	"fput(new_file=%p[#%d])"
++	"fput(old_file=%p[#%d])"
++ 4  10	"vx_info_kill(%p[#%d],%d,%d) = %d"
++	"vx_info_kill(%p[#%d],%d,%d)*"
++ 5  20	"vs_reboot(%p[#%d],%d)"
++ 6  40	"dropping task %p[#%u,%u] for %p[#%u,%u]"
++
++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.%d.%d]"
++ 5  20	"moved task %p into nxi:%p[#%d]"
++	"nx_migrate_task(%p,%p[#%d.%d.%d])"
++	"task_get_nx_info(%p)"
++ 6  40	"nx_clear_persistent(%p[#%d])"
++
++debug_quota:
++
++ 0   1	"quota_sync_dqh(%p,%d) discard inode %p"
++ 1   2	"quota_sync_dqh(%p,%d)"
++	"sync_dquots(%p,%d)"
++	"sync_dquots_dqh(%p,%d)"
++ 3   8	"do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
++
++debug_switch:
++
++ 0   1	"vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
++ 1   2	"vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
++ 4  10	"%s: (%s %s) returned %s with %d"
++
++debug_tag:
++
++ 7  80	"dx_parse_tag(»%s«): %d:#%d"
++	"dx_propagate_tag(%p[#%lu.%d]): %d,%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)"
++	"loc_vx_info(%d) = %p (found)"
++	"loc_vx_info(%d) = %p (new)"
++	"loc_vx_info(%d) = %p (not available)"
++ 1   2	"create_vx_info(%d)*"
++	"loc_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.%d.%d]"
++	"__vx_dynamic_id: [#%d]"
++ 5  20	"enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
++	"leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
++	"moved task %p into vxi:%p[#%d]"
++	"task_get_vx_info(%p)"
++	"vx_migrate_task(%p,%p[#%d.%d])"
++ 6  40	"vx_clear_persistent(%p[#%d])"
++	"vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
++	"vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++	"vx_set_persistent(%p[#%d])"
++	"vx_set_reaper(%p[#%d],%p[#%d,%d])"
++ 7  80	"vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
++
++
++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"
+diff -NurpP --minimal linux-3.7.10/Makefile linux-3.7.10-vs2.3.5.6/Makefile
+--- linux-3.7.10/Makefile	2013-03-02 09:54:53.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/Makefile	2013-03-02 17:55:53.000000000 +0000
+@@ -1,7 +1,7 @@
+ VERSION = 3
+ PATCHLEVEL = 7
+ SUBLEVEL = 10
+-EXTRAVERSION =
++EXTRAVERSION = -vs2.3.5.6
+ NAME = Terrified Chipmunk
+ 
+ # *DOCUMENTATION*
+diff -NurpP --minimal linux-3.7.10/arch/alpha/Kconfig linux-3.7.10-vs2.3.5.6/arch/alpha/Kconfig
+--- linux-3.7.10/arch/alpha/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/alpha/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
+ 	depends on VGA_HOSE
+ 	default y
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/alpha/kernel/systbls.S linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/systbls.S
+--- linux-3.7.10/arch/alpha/kernel/systbls.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/systbls.S	2012-12-18 15:13:16.000000000 +0000
+@@ -446,7 +446,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 */
+diff -NurpP --minimal linux-3.7.10/arch/alpha/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/traps.c
+--- linux-3.7.10/arch/alpha/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
+ #ifdef CONFIG_SMP
+ 	printk("CPU %d ", hard_smp_processor_id());
+ #endif
+-	printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
++	printk("%s(%d[#%u]): %s %ld\n", current->comm,
++		task_pid_nr(current), current->xid, str, err);
+ 	dik_show_regs(regs, r9_15);
+ 	add_taint(TAINT_DIE);
+ 	dik_show_trace((unsigned long *)(regs+1));
+diff -NurpP --minimal linux-3.7.10/arch/arm/Kconfig linux-3.7.10-vs2.3.5.6/arch/arm/Kconfig
+--- linux-3.7.10/arch/arm/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -2307,6 +2307,8 @@ source "fs/Kconfig"
+ 
+ source "arch/arm/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/arm/kernel/calls.S linux-3.7.10-vs2.3.5.6/arch/arm/kernel/calls.S
+--- linux-3.7.10/arch/arm/kernel/calls.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/kernel/calls.S	2012-12-18 15:13:16.000000000 +0000
+@@ -322,7 +322,7 @@
+ /* 310 */	CALL(sys_request_key)
+ 		CALL(sys_keyctl)
+ 		CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
+-/* vserver */	CALL(sys_ni_syscall)
++		CALL(sys_vserver)
+ 		CALL(sys_ioprio_set)
+ /* 315 */	CALL(sys_ioprio_get)
+ 		CALL(sys_inotify_init)
+diff -NurpP --minimal linux-3.7.10/arch/arm/kernel/process.c linux-3.7.10-vs2.3.5.6/arch/arm/kernel/process.c
+--- linux-3.7.10/arch/arm/kernel/process.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/kernel/process.c	2012-12-18 15:13:16.000000000 +0000
+@@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs)
+ void show_regs(struct pt_regs * regs)
+ {
+ 	printk("\n");
+-	printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
++	printk("Pid: %d[#%u], comm: %20s\n",
++		task_pid_nr(current), current->xid, current->comm);
+ 	__show_regs(regs);
+ 	dump_stack();
+ }
+diff -NurpP --minimal linux-3.7.10/arch/arm/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/arm/kernel/traps.c
+--- linux-3.7.10/arch/arm/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -249,8 +249,8 @@ static int __die(const char *str, int er
+ 
+ 	print_modules();
+ 	__show_regs(regs);
+-	printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
+-		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
++	printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
++		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+ 		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
+diff -NurpP --minimal linux-3.7.10/arch/cris/Kconfig linux-3.7.10-vs2.3.5.6/arch/cris/Kconfig
+--- linux-3.7.10/arch/cris/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/cris/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -670,6 +670,8 @@ source "drivers/staging/Kconfig"
+ 
+ source "arch/cris/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/h8300/Kconfig linux-3.7.10-vs2.3.5.6/arch/h8300/Kconfig
+--- linux-3.7.10/arch/h8300/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/h8300/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -217,6 +217,8 @@ source "fs/Kconfig"
+ 
+ source "arch/h8300/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/ia64/Kconfig linux-3.7.10-vs2.3.5.6/arch/ia64/Kconfig
+--- linux-3.7.10/arch/ia64/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -644,6 +644,8 @@ source "fs/Kconfig"
+ 
+ source "arch/ia64/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/entry.S linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/entry.S
+--- linux-3.7.10/arch/ia64/kernel/entry.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/entry.S	2012-12-18 15:13:16.000000000 +0000
+@@ -1714,7 +1714,7 @@ sys_call_table:
+ 	data8 sys_mq_notify
+ 	data8 sys_mq_getsetattr
+ 	data8 sys_kexec_load
+-	data8 sys_ni_syscall			// reserved for vserver
++	data8 sys_vserver
+ 	data8 sys_waitid			// 1270
+ 	data8 sys_add_key
+ 	data8 sys_request_key
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/process.c linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/process.c
+--- linux-3.7.10/arch/ia64/kernel/process.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/process.c	2012-12-18 15:13:16.000000000 +0000
+@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs)
+ 	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
+ 
+ 	print_modules();
+-	printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
+-			smp_processor_id(), current->comm);
++	printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
++			current->xid, smp_processor_id(), current->comm);
+ 	printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
+ 	       regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
+ 	       init_utsname()->release);
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/ptrace.c
+--- linux-3.7.10/arch/ia64/kernel/ptrace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/ptrace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/regset.h>
+ #include <linux/elf.h>
+ #include <linux/tracehook.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/traps.c
+--- linux-3.7.10/arch/ia64/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
+ 	put_cpu();
+ 
+ 	if (++die.lock_owner_depth < 3) {
+-		printk("%s[%d]: %s %ld [%d]\n",
+-		current->comm, task_pid_nr(current), str, err, ++die_counter);
++		printk("%s[%d[#%u]]: %s %ld [%d]\n",
++			current->comm, task_pid_nr(current), current->xid,
++			str, err, ++die_counter);
+ 		if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
+ 	            != NOTIFY_STOP)
+ 			show_regs(regs);
+@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
+ 			if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
+ 				last.time = current_jiffies + 5 * HZ;
+ 				printk(KERN_WARNING
+-		       			"%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+-		       			current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
++					"%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
++					current->comm, task_pid_nr(current), current->xid,
++					regs->cr_iip + ia64_psr(regs)->ri, isr);
+ 			}
+ 		}
+ 	}
+diff -NurpP --minimal linux-3.7.10/arch/m32r/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/m32r/kernel/traps.c
+--- linux-3.7.10/arch/m32r/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/m32r/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
+ 	} else {
+ 		printk("SPI: %08lx\n", sp);
+ 	}
+-	printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
+-		current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
++	printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
++		current->comm, task_pid_nr(current), current->xid,
++		0xffff & i, 4096+(unsigned long)current);
+ 
+ 	/*
+ 	 * When in-kernel, we also print out the stack and code at the
+diff -NurpP --minimal linux-3.7.10/arch/m68k/Kconfig linux-3.7.10-vs2.3.5.6/arch/m68k/Kconfig
+--- linux-3.7.10/arch/m68k/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/m68k/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -135,6 +135,8 @@ source "fs/Kconfig"
+ 
+ source "arch/m68k/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/mips/Kconfig linux-3.7.10-vs2.3.5.6/arch/mips/Kconfig
+--- linux-3.7.10/arch/mips/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -2574,6 +2574,8 @@ source "fs/Kconfig"
+ 
+ source "arch/mips/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/arch/mips/kernel/ptrace.c
+--- linux-3.7.10/arch/mips/kernel/ptrace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/ptrace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/security.h>
+ #include <linux/audit.h>
+ #include <linux/seccomp.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/byteorder.h>
+ #include <asm/cpu.h>
+@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi
+ 	void __user *datavp = (void __user *) data;
+ 	unsigned long __user *datalp = (void __user *) data;
+ 
++	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
++		goto out;
++
+ 	switch (request) {
+ 	/* when I and D space are separate, these will need to be fixed. */
+ 	case PTRACE_PEEKTEXT: /* read word at location addr. */
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall32-o32.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall32-o32.S
+--- linux-3.7.10/arch/mips/kernel/scall32-o32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall32-o32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -512,7 +512,7 @@ einval:	li	v0, -ENOSYS
+ 	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		5
+ 	sys	sys_ni_syscall		0	/* available, was setaltroot */
+ 	sys	sys_add_key		5	/* 4280 */
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall64-64.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-64.S
+--- linux-3.7.10/arch/mips/kernel/scall64-64.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-64.S	2012-12-18 15:13:16.000000000 +0000
+@@ -351,7 +351,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
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall64-n32.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-n32.S
+--- linux-3.7.10/arch/mips/kernel/scall64-n32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-n32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -350,7 +350,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	compat_sys_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall64-o32.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-o32.S
+--- linux-3.7.10/arch/mips/kernel/scall64-o32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-o32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -469,7 +469,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_32_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key			/* 4280 */
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/mips/kernel/traps.c
+--- linux-3.7.10/arch/mips/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs
+ 
+ 	__show_regs(regs);
+ 	print_modules();
+-	printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
+-	       current->comm, current->pid, current_thread_info(), current,
+-	      field, current_thread_info()->tp_value);
++	printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
++		current->comm, task_pid_nr(current), current->xid,
++		current_thread_info(), current,
++		field, current_thread_info()->tp_value);
+ 	if (cpu_has_userlocal) {
+ 		unsigned long tls;
+ 
+diff -NurpP --minimal linux-3.7.10/arch/parisc/Kconfig linux-3.7.10-vs2.3.5.6/arch/parisc/Kconfig
+--- linux-3.7.10/arch/parisc/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -284,6 +284,8 @@ source "fs/Kconfig"
+ 
+ source "arch/parisc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/parisc/kernel/syscall_table.S linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/syscall_table.S
+--- linux-3.7.10/arch/parisc/kernel/syscall_table.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/syscall_table.S	2012-12-18 15:13:16.000000000 +0000
+@@ -361,7 +361,7 @@
+ 	ENTRY_COMP(mbind)		/* 260 */
+ 	ENTRY_COMP(get_mempolicy)
+ 	ENTRY_COMP(set_mempolicy)
+-	ENTRY_SAME(ni_syscall)	/* 263: reserved for vserver */
++	ENTRY_DIFF(vserver)
+ 	ENTRY_SAME(add_key)
+ 	ENTRY_SAME(request_key)		/* 265 */
+ 	ENTRY_SAME(keyctl)
+diff -NurpP --minimal linux-3.7.10/arch/parisc/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/traps.c
+--- linux-3.7.10/arch/parisc/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
+ 		if (err == 0)
+ 			return; /* STFU */
+ 
+-		printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
+-			current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
++		printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
++			current->comm, task_pid_nr(current), current->xid,
++			str, err, regs->iaoq[0]);
+ #ifdef PRINT_USER_FAULTS
+ 		/* XXX for debugging only */
+ 		show_regs(regs);
+@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_
+ 		pdc_console_restart();
+ 	
+ 	if (err)
+-		printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
+-			current->comm, task_pid_nr(current), str, err);
++		printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
++			current->comm, task_pid_nr(current), current->xid, str, err);
+ 
+ 	/* Wot's wrong wif bein' racy? */
+ 	if (current->thread.flags & PARISC_KERNEL_DEATH) {
+diff -NurpP --minimal linux-3.7.10/arch/parisc/mm/fault.c linux-3.7.10-vs2.3.5.6/arch/parisc/mm/fault.c
+--- linux-3.7.10/arch/parisc/mm/fault.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/mm/fault.c	2012-12-18 15:13:16.000000000 +0000
+@@ -237,8 +237,9 @@ bad_area:
+ 
+ #ifdef PRINT_USER_FAULTS
+ 		printk(KERN_DEBUG "\n");
+-		printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
+-		    task_pid_nr(tsk), tsk->comm, code, address);
++		printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
++		    "command='%s' type=%lu address=0x%08lx\n",
++		    task_pid_nr(tsk), tsk->xid, tsk->comm, code, address);
+ 		if (vma) {
+ 			printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
+ 					vma->vm_start, vma->vm_end);
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/Kconfig linux-3.7.10-vs2.3.5.6/arch/powerpc/Kconfig
+--- linux-3.7.10/arch/powerpc/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -1014,6 +1014,8 @@ source "lib/Kconfig"
+ 
+ source "arch/powerpc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ config KEYS_COMPAT
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/include/uapi/asm/unistd.h linux-3.7.10-vs2.3.5.6/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.7.10/arch/powerpc/include/uapi/asm/unistd.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/include/uapi/asm/unistd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -275,7 +275,7 @@
+ #endif
+ #define __NR_rtas		255
+ #define __NR_sys_debug_setcontext 256
+-/* Number 257 is reserved for vserver */
++#define __NR_vserver		257
+ #define __NR_migrate_pages	258
+ #define __NR_mbind		259
+ #define __NR_get_mempolicy	260
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/kernel/process.c linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/process.c
+--- linux-3.7.10/arch/powerpc/kernel/process.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/process.c	2012-12-18 15:13:16.000000000 +0000
+@@ -660,8 +660,9 @@ void show_regs(struct pt_regs * regs)
+ #else
+ 		printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
+ #endif
+-	printk("TASK = %p[%d] '%s' THREAD: %p",
+-	       current, task_pid_nr(current), current->comm, task_thread_info(current));
++	printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
++	       current, task_pid_nr(current), current->xid,
++	       current->comm, task_thread_info(current));
+ 
+ #ifdef CONFIG_SMP
+ 	printk(" CPU: %d", raw_smp_processor_id());
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/traps.c
+--- linux-3.7.10/arch/powerpc/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1120,8 +1120,9 @@ void nonrecoverable_exception(struct pt_
+ 
+ void trace_syscall(struct pt_regs *regs)
+ {
+-	printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld    %s\n",
+-	       current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
++	printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld    %s\n",
++	       current, task_pid_nr(current), current->xid,
++	       regs->nip, regs->link, regs->gpr[0],
+ 	       regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/arch/s390/Kconfig linux-3.7.10-vs2.3.5.6/arch/s390/Kconfig
+--- linux-3.7.10/arch/s390/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -530,6 +530,8 @@ source "fs/Kconfig"
+ 
+ source "arch/s390/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/s390/include/asm/tlb.h linux-3.7.10-vs2.3.5.6/arch/s390/include/asm/tlb.h
+--- linux-3.7.10/arch/s390/include/asm/tlb.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/include/asm/tlb.h	2012-12-18 15:13:16.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++
+ #include <asm/processor.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+diff -NurpP --minimal linux-3.7.10/arch/s390/include/uapi/asm/unistd.h linux-3.7.10-vs2.3.5.6/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.7.10/arch/s390/include/uapi/asm/unistd.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/include/uapi/asm/unistd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -200,7 +200,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_statfs64		265
+ #define __NR_fstatfs64		266
+ #define __NR_remap_file_pages	267
+diff -NurpP --minimal linux-3.7.10/arch/s390/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/arch/s390/kernel/ptrace.c
+--- linux-3.7.10/arch/s390/kernel/ptrace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/kernel/ptrace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/tracehook.h>
+ #include <linux/seccomp.h>
+ #include <linux/compat.h>
++#include <linux/vs_base.h>
+ #include <trace/syscall.h>
+ #include <asm/segment.h>
+ #include <asm/page.h>
+diff -NurpP --minimal linux-3.7.10/arch/s390/kernel/syscalls.S linux-3.7.10-vs2.3.5.6/arch/s390/kernel/syscalls.S
+--- linux-3.7.10/arch/s390/kernel/syscalls.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/kernel/syscalls.S	2012-12-18 15:13:16.000000000 +0000
+@@ -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(sys_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)
+diff -NurpP --minimal linux-3.7.10/arch/sh/Kconfig linux-3.7.10-vs2.3.5.6/arch/sh/Kconfig
+--- linux-3.7.10/arch/sh/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sh/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -945,6 +945,8 @@ source "fs/Kconfig"
+ 
+ source "arch/sh/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/sh/kernel/irq.c linux-3.7.10-vs2.3.5.6/arch/sh/kernel/irq.c
+--- linux-3.7.10/arch/sh/kernel/irq.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sh/kernel/irq.c	2012-12-18 15:13:16.000000000 +0000
+@@ -14,6 +14,7 @@
+ #include <linux/ftrace.h>
+ #include <linux/delay.h>
+ #include <linux/ratelimit.h>
++// #include <linux/vs_context.h>
+ #include <asm/processor.h>
+ #include <asm/machvec.h>
+ #include <asm/uaccess.h>
+diff -NurpP --minimal linux-3.7.10/arch/sparc/Kconfig linux-3.7.10-vs2.3.5.6/arch/sparc/Kconfig
+--- linux-3.7.10/arch/sparc/Kconfig	2013-03-02 09:54:54.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/Kconfig	2013-03-02 15:26:03.000000000 +0000
+@@ -565,6 +565,8 @@ source "fs/Kconfig"
+ 
+ source "arch/sparc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/sparc/include/uapi/asm/unistd.h linux-3.7.10-vs2.3.5.6/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.7.10/arch/sparc/include/uapi/asm/unistd.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/include/uapi/asm/unistd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -332,7 +332,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
+diff -NurpP --minimal linux-3.7.10/arch/sparc/kernel/systbls_32.S linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_32.S
+--- linux-3.7.10/arch/sparc/kernel/systbls_32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -70,7 +70,7 @@ sys_call_table:
+ /*250*/	.long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
+ /*255*/	.long sys_sync_file_range, 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_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
+diff -NurpP --minimal linux-3.7.10/arch/sparc/kernel/systbls_64.S linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_64.S
+--- linux-3.7.10/arch/sparc/kernel/systbls_64.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_64.S	2012-12-18 15:13:16.000000000 +0000
+@@ -71,7 +71,7 @@ sys_call_table32:
+ /*250*/	.word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
+ 	.word sys32_sync_file_range, compat_sys_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, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
++	.word sys_timer_delete, compat_sys_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 sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat
+@@ -149,7 +149,7 @@ sys_call_table:
+ /*250*/	.word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
+ 	.word sys_sync_file_range, 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_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
+diff -NurpP --minimal linux-3.7.10/arch/um/Kconfig.rest linux-3.7.10-vs2.3.5.6/arch/um/Kconfig.rest
+--- linux-3.7.10/arch/um/Kconfig.rest	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/um/Kconfig.rest	2012-12-18 15:13:16.000000000 +0000
+@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
+ 
+ source "fs/Kconfig"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/um/include/shared/kern_constants.h linux-3.7.10-vs2.3.5.6/arch/um/include/shared/kern_constants.h
+--- linux-3.7.10/arch/um/include/shared/kern_constants.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/um/include/shared/kern_constants.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../include/generated/asm-offsets.h"
+diff -NurpP --minimal linux-3.7.10/arch/um/include/shared/user_constants.h linux-3.7.10-vs2.3.5.6/arch/um/include/shared/user_constants.h
+--- linux-3.7.10/arch/um/include/shared/user_constants.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/um/include/shared/user_constants.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,40 @@
++/*
++ * DO NOT MODIFY.
++ *
++ * This file was generated by arch/um/Makefile
++ *
++ */
++
++#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2)	# */
++#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err)	# */
++#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno)	# */
++#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long)	# */
++#define HOST_RBX 5 /* RBX	# */
++#define HOST_RCX 11 /* RCX	# */
++#define HOST_RDI 14 /* RDI	# */
++#define HOST_RSI 13 /* RSI	# */
++#define HOST_RDX 12 /* RDX	# */
++#define HOST_RBP 4 /* RBP	# */
++#define HOST_RAX 10 /* RAX	# */
++#define HOST_R8 9 /* R8	# */
++#define HOST_R9 8 /* R9	# */
++#define HOST_R10 7 /* R10	# */
++#define HOST_R11 6 /* R11	# */
++#define HOST_R12 3 /* R12	# */
++#define HOST_R13 2 /* R13	# */
++#define HOST_R14 1 /* R14	# */
++#define HOST_R15 0 /* R15	# */
++#define HOST_ORIG_RAX 15 /* ORIG_RAX	# */
++#define HOST_CS 17 /* CS	# */
++#define HOST_SS 20 /* SS	# */
++#define HOST_EFLAGS 18 /* EFLAGS	# */
++#define HOST_IP 16 /* RIP	# */
++#define HOST_SP 19 /* RSP	# */
++#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct)	# */
++#define UM_POLLIN 1 /* POLLIN	# */
++#define UM_POLLPRI 2 /* POLLPRI	# */
++#define UM_POLLOUT 4 /* POLLOUT	# */
++#define UM_PROT_READ 1 /* PROT_READ	# */
++#define UM_PROT_WRITE 2 /* PROT_WRITE	# */
++#define UM_PROT_EXEC 4 /* PROT_EXEC	# */
++
+diff -NurpP --minimal linux-3.7.10/arch/x86/Kconfig linux-3.7.10-vs2.3.5.6/arch/x86/Kconfig
+--- linux-3.7.10/arch/x86/Kconfig	2013-03-02 09:54:54.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/x86/Kconfig	2013-03-02 15:26:03.000000000 +0000
+@@ -2244,6 +2244,8 @@ source "fs/Kconfig"
+ 
+ source "arch/x86/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/x86/syscalls/syscall_32.tbl linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.7.10/arch/x86/syscalls/syscall_32.tbl	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_32.tbl	2012-12-18 15:13:16.000000000 +0000
+@@ -279,7 +279,7 @@
+ 270	i386	tgkill			sys_tgkill
+ 271	i386	utimes			sys_utimes			compat_sys_utimes
+ 272	i386	fadvise64_64		sys_fadvise64_64		sys32_fadvise64_64
+-273	i386	vserver
++273	i386	vserver			sys_vserver			sys32_vserver
+ 274	i386	mbind			sys_mbind
+ 275	i386	get_mempolicy		sys_get_mempolicy		compat_sys_get_mempolicy
+ 276	i386	set_mempolicy		sys_set_mempolicy
+diff -NurpP --minimal linux-3.7.10/arch/x86/syscalls/syscall_64.tbl linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.7.10/arch/x86/syscalls/syscall_64.tbl	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_64.tbl	2012-12-18 15:13:16.000000000 +0000
+@@ -242,7 +242,7 @@
+ 233	common	epoll_ctl		sys_epoll_ctl
+ 234	common	tgkill			sys_tgkill
+ 235	common	utimes			sys_utimes
+-236	64	vserver
++236	64	vserver			sys_vserver
+ 237	common	mbind			sys_mbind
+ 238	common	set_mempolicy		sys_set_mempolicy
+ 239	common	get_mempolicy		sys_get_mempolicy
+diff -NurpP --minimal linux-3.7.10/drivers/block/Kconfig linux-3.7.10-vs2.3.5.6/drivers/block/Kconfig
+--- linux-3.7.10/drivers/block/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -291,6 +291,13 @@ config BLK_DEV_CRYPTOLOOP
+ 
+ source "drivers/block/drbd/Kconfig"
+ 
++config BLK_DEV_VROOT
++	tristate "Virtual Root device support"
++	depends on QUOTACTL
++	---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
+diff -NurpP --minimal linux-3.7.10/drivers/block/Makefile linux-3.7.10-vs2.3.5.6/drivers/block/Makefile
+--- linux-3.7.10/drivers/block/Makefile	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/Makefile	2012-12-18 15:13:16.000000000 +0000
+@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK)	+= virtio_blk.o
+ obj-$(CONFIG_VIODASD)		+= viodasd.o
+ obj-$(CONFIG_BLK_DEV_SX8)	+= sx8.o
+ obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
++obj-$(CONFIG_BLK_DEV_VROOT)	+= vroot.o
+ 
+ obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
+ obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/
+diff -NurpP --minimal linux-3.7.10/drivers/block/loop.c linux-3.7.10-vs2.3.5.6/drivers/block/loop.c
+--- linux-3.7.10/drivers/block/loop.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/loop.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,6 +76,7 @@
+ #include <linux/sysfs.h>
+ #include <linux/miscdevice.h>
+ #include <linux/falloc.h>
++#include <linux/vs_context.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_devic
+ 	lo->lo_blocksize = lo_blocksize;
+ 	lo->lo_device = bdev;
+ 	lo->lo_flags = lo_flags;
++	lo->lo_xid = vx_current_xid();
+ 	lo->lo_backing_file = file;
+ 	lo->transfer = transfer_none;
+ 	lo->ioctl = NULL;
+@@ -1014,6 +1016,7 @@ static int loop_clr_fd(struct loop_devic
+ 	lo->lo_sizelimit = 0;
+ 	lo->lo_encrypt_key_size = 0;
+ 	lo->lo_thread = NULL;
++	lo->lo_xid = 0;
+ 	memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
+ 	memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
+ 	memset(lo->lo_file_name, 0, LO_NAME_SIZE);
+@@ -1055,7 +1058,7 @@ loop_set_status(struct loop_device *lo,
+ 
+ 	if (lo->lo_encrypt_key_size &&
+ 	    !uid_eq(lo->lo_key_owner, uid) &&
+-	    !capable(CAP_SYS_ADMIN))
++	    !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
+ 		return -EPERM;
+ 	if (lo->lo_state != Lo_bound)
+ 		return -ENXIO;
+@@ -1145,7 +1148,8 @@ loop_get_status(struct loop_device *lo,
+ 	memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
+ 	info->lo_encrypt_type =
+ 		lo->lo_encryption ? lo->lo_encryption->number : 0;
+-	if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
++	if (lo->lo_encrypt_key_size &&
++		vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
+ 		info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
+ 		memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
+ 		       lo->lo_encrypt_key_size);
+@@ -1505,6 +1509,11 @@ static int lo_open(struct block_device *
+ 		goto out;
+ 	}
+ 
++	if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
++		err = -EACCES;
++		goto out;
++	}
++
+ 	mutex_lock(&lo->lo_ctl_mutex);
+ 	lo->lo_refcnt++;
+ 	mutex_unlock(&lo->lo_ctl_mutex);
+diff -NurpP --minimal linux-3.7.10/drivers/block/vroot.c linux-3.7.10-vs2.3.5.6/drivers/block/vroot.c
+--- linux-3.7.10/drivers/block/vroot.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/vroot.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,291 @@
++/*
++ *  linux/drivers/block/vroot.c
++ *
++ *  written by Herbert Pötzl, 9/11/2002
++ *  ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ *
++ *  based on the loop.c code by Theodore Ts'o.
++ *
++ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/file.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
++#include <linux/slab.h>
++
++#include <linux/vroot.h>
++#include <linux/vs_context.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 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(VXD_CBIT(misc, 0),
++		"vroot[%d]_set_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	vr->vr_state = Vr_bound;
++	error = 0;
++
++ out_fput:
++	fput(file);
++ out:
++	return error;
++}
++
++static int vroot_clr_dev(
++	struct vroot_device *vr,
++	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(VXD_CBIT(misc, 0),
++		"vroot[%d]_clr_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	bdput(real_bdev);
++	vr->vr_state = Vr_unbound;
++	vr->vr_device = NULL;
++	return 0;
++}
++
++
++static int vr_ioctl(struct block_device *bdev, fmode_t mode,
++	unsigned int cmd, unsigned long arg)
++{
++	struct vroot_device *vr = bdev->bd_disk->private_data;
++	int err;
++
++	down(&vr->vr_ctl_mutex);
++	switch (cmd) {
++	case VROOT_SET_DEV:
++		err = vroot_set_dev(vr, bdev, arg);
++		break;
++	case VROOT_CLR_DEV:
++		err = vroot_clr_dev(vr, bdev);
++		break;
++	default:
++		err = -EINVAL;
++		break;
++	}
++	up(&vr->vr_ctl_mutex);
++	return err;
++}
++
++static int vr_open(struct block_device *bdev, fmode_t mode)
++{
++	struct vroot_device *vr = 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 gendisk *disk, fmode_t mode)
++{
++	struct vroot_device *vr = 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,
++};
++
++static void vroot_make_request(struct request_queue *q, struct bio *bio)
++{
++	printk("vroot_make_request %p, %p\n", q, bio);
++	bio_io_error(bio);
++}
++
++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(VXD_CBIT(misc, 0),
++		"vroot[%d]_get_real_bdev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	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 Pötzl");
++MODULE_DESCRIPTION ("Virtual Root Device Mapper");
++
++
++int __init vroot_init(void)
++{
++	int err, 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;
++
++	err = -ENOMEM;
++	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;
++		disks[i]->queue = blk_alloc_queue(GFP_KERNEL);
++		if (!disks[i]->queue)
++			goto out_mem3;
++		blk_queue_make_request(disks[i]->queue, vroot_make_request);
++	}
++
++	for (i = 0; i < max_vroot; i++) {
++		struct vroot_device *vr = &vroot_dev[i];
++		struct gendisk *disk = disks[i];
++
++		memset(vr, 0, sizeof(*vr));
++		sema_init(&vr->vr_ctl_mutex, 1);
++		vr->vr_number = i;
++		disk->major = VROOT_MAJOR;
++		disk->first_minor = i;
++		disk->fops = &vr_fops;
++		sprintf(disk->disk_name, "vroot%d", i);
++		disk->private_data = vr;
++	}
++
++	err = register_vroot_grb(&__vroot_get_real_bdev);
++	if (err)
++		goto out_mem3;
++
++	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 err;
++}
++
++void vroot_exit(void)
++{
++	int i;
++
++	if (unregister_vroot_grb(&__vroot_get_real_bdev))
++		printk(KERN_WARNING "vroot: cannot unregister grb\n");
++
++	for (i = 0; i < max_vroot; i++) {
++		del_gendisk(disks[i]);
++		put_disk(disks[i]);
++	}
++	unregister_blkdev(VROOT_MAJOR, "vroot");
++
++	kfree(disks);
++	kfree(vroot_dev);
++}
++
++module_init(vroot_init);
++module_exit(vroot_exit);
++
++#ifndef MODULE
++
++static int __init max_vroot_setup(char *str)
++{
++	max_vroot = simple_strtol(str, NULL, 0);
++	return 1;
++}
++
++__setup("max_vroot=", max_vroot_setup);
++
++#endif
++
+diff -NurpP --minimal linux-3.7.10/drivers/infiniband/Kconfig linux-3.7.10-vs2.3.5.6/drivers/infiniband/Kconfig
+--- linux-3.7.10/drivers/infiniband/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/infiniband/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
+ config INFINIBAND_ADDR_TRANS
+ 	bool
+ 	depends on INET
+-	depends on !(INFINIBAND = y && IPV6 = m)
++	depends on !(INFINIBAND = y && IPV6 = y)
+ 	default y
+ 
+ source "drivers/infiniband/hw/mthca/Kconfig"
+diff -NurpP --minimal linux-3.7.10/drivers/infiniband/core/addr.c linux-3.7.10-vs2.3.5.6/drivers/infiniband/core/addr.c
+--- linux-3.7.10/drivers/infiniband/core/addr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/infiniband/core/addr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr
+ 
+ 	if (ipv6_addr_any(&fl6.saddr)) {
+ 		ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
+-					 &fl6.daddr, 0, &fl6.saddr);
++					 &fl6.daddr, 0, &fl6.saddr, NULL);
+ 		if (ret)
+ 			goto put;
+ 
+diff -NurpP --minimal linux-3.7.10/drivers/md/dm-ioctl.c linux-3.7.10-vs2.3.5.6/drivers/md/dm-ioctl.c
+--- linux-3.7.10/drivers/md/dm-ioctl.c	2013-03-02 09:54:56.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/md/dm-ioctl.c	2013-02-05 01:14:43.000000000 +0000
+@@ -16,6 +16,7 @@
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
+ #include <linux/compat.h>
++#include <linux/vs_context.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell
+ 	unsigned int h = hash_str(str);
+ 
+ 	list_for_each_entry (hc, _name_buckets + h, name_list)
+-		if (!strcmp(hc->name, str)) {
++		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++			!strcmp(hc->name, str)) {
+ 			dm_get(hc->md);
+ 			return hc;
+ 		}
+@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell
+ 	unsigned int h = hash_str(str);
+ 
+ 	list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
+-		if (!strcmp(hc->uuid, str)) {
++		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++			!strcmp(hc->uuid, str)) {
+ 			dm_get(hc->md);
+ 			return hc;
+ 		}
+@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell
+ static struct hash_cell *__get_dev_cell(uint64_t dev)
+ {
+ 	struct mapped_device *md;
+-	struct hash_cell *hc;
++	struct hash_cell *hc = NULL;
+ 
+ 	md = dm_get_md(huge_decode_dev(dev));
+ 	if (!md)
+ 		return NULL;
+ 
+-	hc = dm_get_mdptr(md);
++	if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
++		hc = dm_get_mdptr(md);
++
+ 	if (!hc) {
+ 		dm_put(md);
+ 		return NULL;
+@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+ 
+ static int remove_all(struct dm_ioctl *param, size_t param_size)
+ {
++	if (!vx_check(0, VS_ADMIN))
++		return -EPERM;
++
+ 	dm_hash_remove_all(1);
+ 	param->data_size = 0;
+ 	return 0;
+@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl
+ 	 */
+ 	for (i = 0; i < NUM_BUCKETS; i++) {
+ 		list_for_each_entry (hc, _name_buckets + i, name_list) {
++			if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++				continue;
+ 			needed += sizeof(struct dm_name_list);
+ 			needed += strlen(hc->name) + 1;
+ 			needed += ALIGN_MASK;
+@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl
+ 	 */
+ 	for (i = 0; i < NUM_BUCKETS; i++) {
+ 		list_for_each_entry (hc, _name_buckets + i, name_list) {
++			if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (old_nl)
+ 				old_nl->next = (uint32_t) ((void *) nl -
+ 							   (void *) old_nl);
+@@ -1627,8 +1639,8 @@ static int ctl_ioctl(uint command, struc
+ 	ioctl_fn fn = NULL;
+ 	size_t input_param_size;
+ 
+-	/* only root can play with this */
+-	if (!capable(CAP_SYS_ADMIN))
++	/* only root and certain contexts can play with this */
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
+ 		return -EACCES;
+ 
+ 	if (_IOC_TYPE(command) != DM_IOCTL)
+diff -NurpP --minimal linux-3.7.10/drivers/md/dm.c linux-3.7.10-vs2.3.5.6/drivers/md/dm.c
+--- linux-3.7.10/drivers/md/dm.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/md/dm.c	2012-12-18 15:13:16.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <linux/idr.h>
+ #include <linux/hdreg.h>
+ #include <linux/delay.h>
++#include <linux/vs_base.h>
+ 
+ #include <trace/events/block.h>
+ 
+@@ -137,6 +138,7 @@ struct mapped_device {
+ 	rwlock_t map_lock;
+ 	atomic_t holders;
+ 	atomic_t open_count;
++	xid_t xid;
+ 
+ 	unsigned long flags;
+ 
+@@ -345,6 +347,7 @@ int dm_deleting_md(struct mapped_device
+ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
+ {
+ 	struct mapped_device *md;
++	int ret = -ENXIO;
+ 
+ 	spin_lock(&_minor_lock);
+ 
+@@ -353,18 +356,19 @@ static int dm_blk_open(struct block_devi
+ 		goto out;
+ 
+ 	if (test_bit(DMF_FREEING, &md->flags) ||
+-	    dm_deleting_md(md)) {
+-		md = NULL;
++	    dm_deleting_md(md))
++		goto out;
++
++	ret = -EACCES;
++	if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
+ 		goto out;
+-	}
+ 
+ 	dm_get(md);
+ 	atomic_inc(&md->open_count);
+-
++	ret = 0;
+ out:
+ 	spin_unlock(&_minor_lock);
+-
+-	return md ? 0 : -ENXIO;
++	return ret;
+ }
+ 
+ static int dm_blk_close(struct gendisk *disk, fmode_t mode)
+@@ -575,6 +579,14 @@ int dm_set_geometry(struct mapped_device
+ 	return 0;
+ }
+ 
++/*
++ * Get the xid associated with a dm device
++ */
++xid_t dm_get_xid(struct mapped_device *md)
++{
++	return md->xid;
++}
++
+ /*-----------------------------------------------------------------
+  * CRUD START:
+  *   A more elegant soln is in the works that uses the queue
+@@ -1852,6 +1864,7 @@ static struct mapped_device *alloc_dev(i
+ 	INIT_LIST_HEAD(&md->uevent_list);
+ 	spin_lock_init(&md->uevent_lock);
+ 
++	md->xid = vx_current_xid();
+ 	md->queue = blk_alloc_queue(GFP_KERNEL);
+ 	if (!md->queue)
+ 		goto bad_queue;
+diff -NurpP --minimal linux-3.7.10/drivers/md/dm.h linux-3.7.10-vs2.3.5.6/drivers/md/dm.h
+--- linux-3.7.10/drivers/md/dm.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/md/dm.h	2012-12-18 15:13:16.000000000 +0000
+@@ -46,6 +46,8 @@ struct dm_dev_internal {
+ struct dm_table;
+ struct dm_md_mempools;
+ 
++xid_t dm_get_xid(struct mapped_device *md);
++
+ /*-----------------------------------------------------------------
+  * Internal table functions.
+  *---------------------------------------------------------------*/
+diff -NurpP --minimal linux-3.7.10/drivers/net/tun.c linux-3.7.10-vs2.3.5.6/drivers/net/tun.c
+--- linux-3.7.10/drivers/net/tun.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/net/tun.c	2012-12-18 15:13:16.000000000 +0000
+@@ -64,6 +64,7 @@
+ #include <linux/nsproxy.h>
+ #include <linux/virtio_net.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_network.h>
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
+ #include <net/rtnetlink.h>
+@@ -123,6 +124,7 @@ struct tun_struct {
+ 	unsigned int 		flags;
+ 	kuid_t			owner;
+ 	kgid_t			group;
++	nid_t			nid;
+ 
+ 	struct net_device	*dev;
+ 	netdev_features_t	set_features;
+@@ -1034,6 +1036,7 @@ static void tun_setup(struct net_device
+ 
+ 	tun->owner = INVALID_UID;
+ 	tun->group = INVALID_GID;
++	tun->nid = nx_current_nid();
+ 
+ 	dev->ethtool_ops = &tun_ethtool_ops;
+ 	dev->destructor = tun_free_netdev;
+@@ -1198,7 +1201,7 @@ static int tun_set_iff(struct net *net,
+ 
+ 		if (((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
+ 		     (gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
+-		    !capable(CAP_NET_ADMIN))
++		     !cap_raised(current_cap(), CAP_NET_ADMIN))
+ 			return -EPERM;
+ 		err = security_tun_dev_attach(tun->socket.sk);
+ 		if (err < 0)
+@@ -1212,7 +1215,7 @@ static int tun_set_iff(struct net *net,
+ 		char *name;
+ 		unsigned long flags = 0;
+ 
+-		if (!capable(CAP_NET_ADMIN))
++		if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE))
+ 			return -EPERM;
+ 		err = security_tun_dev_create();
+ 		if (err < 0)
+@@ -1283,6 +1286,9 @@ static int tun_set_iff(struct net *net,
+ 
+ 		sk->sk_destruct = tun_sock_destruct;
+ 
++		if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P))
++			return -EPERM;
++
+ 		err = tun_attach(tun, file);
+ 		if (err < 0)
+ 			goto failed;
+@@ -1478,6 +1484,16 @@ static long __tun_chr_ioctl(struct file
+ 			  from_kgid(&init_user_ns, tun->group));
+ 		break;
+ 
++	case TUNSETNID:
++		if (!capable(CAP_CONTEXT))
++			return -EPERM;
++
++		/* Set nid owner of the device */
++		tun->nid = (nid_t) arg;
++
++		tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid);
++		break;
++
+ 	case TUNSETLINK:
+ 		/* Only allow setting the type when the interface is down */
+ 		if (tun->dev->flags & IFF_UP) {
+diff -NurpP --minimal linux-3.7.10/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7.10-vs2.3.5.6/drivers/staging/csr/csr_wifi_hip_xbv.c
+--- linux-3.7.10/drivers/staging/csr/csr_wifi_hip_xbv.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/staging/csr/csr_wifi_hip_xbv.c	2012-12-18 15:13:16.000000000 +0000
+@@ -55,7 +55,7 @@ typedef struct
+ {
+     char t_name[4];
+     u32     t_len;
+-} tag_t;
++} ctag_t;
+ 
+ 
+ #define TAG_EQ(i, v)    (((i)[0] == (v)[0]) &&  \
+@@ -90,7 +90,7 @@ typedef struct
+     u32 ptr;
+ } xbv_stack_t;
+ 
+-static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag);
++static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag);
+ static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len);
+ static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len);
+ static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack,
+@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf,
+ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo)
+ {
+     ct_t ct;
+-    tag_t tag;
++    ctag_t tag;
+     xbv_stack_t stack;
+ 
+     ct.dlpriv = dlpriv;
+@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len)
+ }
+ 
+ 
+-static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag)
++static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag)
+ {
+     u8 buf[8];
+     s32 n;
+diff -NurpP --minimal linux-3.7.10/drivers/tty/sysrq.c linux-3.7.10-vs2.3.5.6/drivers/tty/sysrq.c
+--- linux-3.7.10/drivers/tty/sysrq.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/tty/sysrq.c	2012-12-18 15:13:16.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/slab.h>
+ #include <linux/input.h>
+ #include <linux/uaccess.h>
++#include <linux/vserver/debug.h>
+ 
+ #include <asm/ptrace.h>
+ #include <asm/irq_regs.h>
+@@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op
+ 	.enable_mask	= SYSRQ_ENABLE_RTNICE,
+ };
+ 
++
++#ifdef CONFIG_VSERVER_DEBUG
++static void sysrq_handle_vxinfo(int key)
++{
++	dump_vx_info_inactive((key == 'x') ? 0 : 1);
++}
++
++static struct sysrq_key_op sysrq_showvxinfo_op = {
++	.handler	= sysrq_handle_vxinfo,
++	.help_msg	= "conteXt",
++	.action_msg	= "Show Context Info",
++	.enable_mask	= SYSRQ_ENABLE_DUMP,
++};
++#endif
++
+ /* Key Operations table and lock */
+ static DEFINE_SPINLOCK(sysrq_key_table_lock);
+ 
+@@ -453,7 +469,11 @@ static struct sysrq_key_op *sysrq_key_ta
+ 	&sysrq_showstate_blocked_op,	/* w */
+ 	/* x: May be registered on ppc/powerpc for xmon */
+ 	/* x: May be registered on sparc64 for global PMU dump */
++#ifdef CONFIG_VSERVER_DEBUG
++	&sysrq_showvxinfo_op,		/* x */
++#else
+ 	NULL,				/* x */
++#endif
+ 	/* y: May be registered on sparc64 for global register dump */
+ 	NULL,				/* y */
+ 	&sysrq_ftrace_dump_op,		/* z */
+@@ -468,6 +488,8 @@ static int sysrq_key_table_key2index(int
+ 		retval = key - '0';
+ 	else if ((key >= 'a') && (key <= 'z'))
+ 		retval = key + 10 - 'a';
++	else if ((key >= 'A') && (key <= 'Z'))
++		retval = key + 10 - 'A';
+ 	else
+ 		retval = -1;
+ 	return retval;
+diff -NurpP --minimal linux-3.7.10/drivers/tty/tty_io.c linux-3.7.10-vs2.3.5.6/drivers/tty/tty_io.c
+--- linux-3.7.10/drivers/tty/tty_io.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/tty/tty_io.c	2012-12-18 15:13:16.000000000 +0000
+@@ -104,6 +104,7 @@
+ 
+ #include <linux/kmod.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_pid.h>
+ 
+ #undef TTY_DEBUG_HANGUP
+ 
+@@ -2139,7 +2140,8 @@ static int tiocsti(struct tty_struct *tt
+ 	char ch, mbz = 0;
+ 	struct tty_ldisc *ld;
+ 
+-	if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
++	if (((current->signal->tty != tty) &&
++		!vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
+ 		return -EPERM;
+ 	if (get_user(ch, p))
+ 		return -EFAULT;
+@@ -2426,6 +2428,7 @@ static int tiocspgrp(struct tty_struct *
+ 		return -ENOTTY;
+ 	if (get_user(pgrp_nr, p))
+ 		return -EFAULT;
++	pgrp_nr = vx_rmap_pid(pgrp_nr);
+ 	if (pgrp_nr < 0)
+ 		return -EINVAL;
+ 	rcu_read_lock();
+diff -NurpP --minimal linux-3.7.10/fs/attr.c linux-3.7.10-vs2.3.5.6/fs/attr.c
+--- linux-3.7.10/fs/attr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/attr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,9 @@
+ #include <linux/security.h>
+ #include <linux/evm.h>
+ #include <linux/ima.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/vs_tag.h>
+ 
+ /**
+  * inode_change_ok - check if attribute changes to an inode are allowed
+@@ -75,6 +78,10 @@ int inode_change_ok(const struct inode *
+ 			return -EPERM;
+ 	}
+ 
++	/* check for inode tag permission */
++	if (dx_permission(inode, MAY_WRITE))
++		return -EACCES;
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(inode_change_ok);
+@@ -145,6 +152,8 @@ void setattr_copy(struct inode *inode, c
+ 		inode->i_uid = attr->ia_uid;
+ 	if (ia_valid & ATTR_GID)
+ 		inode->i_gid = attr->ia_gid;
++	if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++		inode->i_tag = attr->ia_tag;
+ 	if (ia_valid & ATTR_ATIME)
+ 		inode->i_atime = timespec_trunc(attr->ia_atime,
+ 						inode->i_sb->s_time_gran);
+@@ -174,7 +183,8 @@ int notify_change(struct dentry * dentry
+ 
+ 	WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex));
+ 
+-	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
++	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
++		ATTR_TAG | ATTR_TIMES_SET)) {
+ 		if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 			return -EPERM;
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/block_dev.c linux-3.7.10-vs2.3.5.6/fs/block_dev.c
+--- linux-3.7.10/fs/block_dev.c	2013-03-02 09:54:59.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/block_dev.c	2013-03-02 15:26:03.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <linux/namei.h>
+ #include <linux/log2.h>
+ #include <linux/cleancache.h>
++#include <linux/vs_device.h>
+ #include <asm/uaccess.h>
+ #include "internal.h"
+ 
+@@ -528,6 +529,7 @@ struct block_device *bdget(dev_t dev)
+ 		bdev->bd_invalidated = 0;
+ 		inode->i_mode = S_IFBLK;
+ 		inode->i_rdev = dev;
++		inode->i_mdev = dev;
+ 		inode->i_bdev = bdev;
+ 		inode->i_data.a_ops = &def_blk_aops;
+ 		mapping_set_gfp_mask(&inode->i_data, GFP_USER);
+@@ -574,6 +576,11 @@ EXPORT_SYMBOL(bdput);
+ static struct block_device *bd_acquire(struct inode *inode)
+ {
+ 	struct block_device *bdev;
++	dev_t mdev;
++
++	if (!vs_map_blkdev(inode->i_rdev, &mdev, DATTR_OPEN))
++		return NULL;
++	inode->i_mdev = mdev;
+ 
+ 	spin_lock(&bdev_lock);
+ 	bdev = inode->i_bdev;
+@@ -584,7 +591,7 @@ static struct block_device *bd_acquire(s
+ 	}
+ 	spin_unlock(&bdev_lock);
+ 
+-	bdev = bdget(inode->i_rdev);
++	bdev = bdget(mdev);
+ 	if (bdev) {
+ 		spin_lock(&bdev_lock);
+ 		if (!inode->i_bdev) {
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/ctree.h linux-3.7.10-vs2.3.5.6/fs/btrfs/ctree.h
+--- linux-3.7.10/fs/btrfs/ctree.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/ctree.h	2012-12-18 15:13:16.000000000 +0000
+@@ -692,11 +692,14 @@ struct btrfs_inode_item {
+ 	/* modification sequence number for NFS */
+ 	__le64 sequence;
+ 
++	__le16 tag;
+ 	/*
+ 	 * a little future expansion, for more than this we can
+ 	 * just grow the inode item and version it
+ 	 */
+-	__le64 reserved[4];
++	__le16 reserved16;
++	__le32 reserved32;
++	__le64 reserved[3];
+ 	struct btrfs_timespec atime;
+ 	struct btrfs_timespec ctime;
+ 	struct btrfs_timespec mtime;
+@@ -1757,6 +1760,8 @@ struct btrfs_ioctl_defrag_range_args {
+ #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
+ #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	(1 << 22)
+ 
++#define BTRFS_MOUNT_TAGGED		(1 << 24)
++
+ #define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)
+ #define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)
+ #define btrfs_test_opt(root, opt)	((root)->fs_info->mount_opt & \
+@@ -2025,6 +2030,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+ BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
+ BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
+ BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
++BTRFS_SETGET_FUNCS(inode_tag, struct btrfs_inode_item, tag, 16);
+ BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
+ BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
+ BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
+@@ -2078,6 +2084,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+ 
+ BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
+ 
++#define BTRFS_INODE_IXUNLINK		(1 << 24)
++#define BTRFS_INODE_BARRIER		(1 << 25)
++#define BTRFS_INODE_COW			(1 << 26)
++
+ 
+ BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
+ 
+@@ -3363,6 +3373,7 @@ extern const struct dentry_operations bt
+ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+ void btrfs_update_iflags(struct inode *inode);
+ void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
++int btrfs_sync_flags(struct inode *inode, int, int);
+ int btrfs_defrag_file(struct inode *inode, struct file *file,
+ 		      struct btrfs_ioctl_defrag_range_args *range,
+ 		      u64 newer_than, unsigned long max_pages);
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/disk-io.c linux-3.7.10-vs2.3.5.6/fs/btrfs/disk-io.c
+--- linux-3.7.10/fs/btrfs/disk-io.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/disk-io.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2197,6 +2197,9 @@ int open_ctree(struct super_block *sb,
+ 		goto fail_alloc;
+ 	}
+ 
++	if (btrfs_test_opt(tree_root, TAGGED))
++		sb->s_flags |= MS_TAGGED;
++
+ 	features = btrfs_super_incompat_flags(disk_super) &
+ 		~BTRFS_FEATURE_INCOMPAT_SUPP;
+ 	if (features) {
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/inode.c linux-3.7.10-vs2.3.5.6/fs/btrfs/inode.c
+--- linux-3.7.10/fs/btrfs/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <linux/slab.h>
+ #include <linux/ratelimit.h>
+ #include <linux/mount.h>
++#include <linux/vs_tag.h>
+ #include "compat.h"
+ #include "ctree.h"
+ #include "disk-io.h"
+@@ -2530,6 +2531,8 @@ static void btrfs_read_locked_inode(stru
+ 	struct btrfs_key location;
+ 	int maybe_acls;
+ 	u32 rdev;
++	uid_t uid;
++	gid_t gid;
+ 	int ret;
+ 	bool filled = false;
+ 
+@@ -2557,8 +2560,13 @@ static void btrfs_read_locked_inode(stru
+ 				    struct btrfs_inode_item);
+ 	inode->i_mode = btrfs_inode_mode(leaf, inode_item);
+ 	set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
+-	i_uid_write(inode, btrfs_inode_uid(leaf, inode_item));
+-	i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));
++
++	uid = btrfs_inode_uid(leaf, inode_item);
++	gid = btrfs_inode_gid(leaf, inode_item);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid,
++		btrfs_inode_tag(leaf, inode_item)));
+ 	btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
+ 
+ 	tspec = btrfs_inode_atime(inode_item);
+@@ -2648,8 +2656,16 @@ static void fill_inode_item(struct btrfs
+ 			    struct btrfs_inode_item *item,
+ 			    struct inode *inode)
+ {
+-	btrfs_set_inode_uid(leaf, item, i_uid_read(inode));
+-	btrfs_set_inode_gid(leaf, item, i_gid_read(inode));
++	uid_t uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	gid_t gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
++
++	btrfs_set_inode_uid(leaf, item, uid);
++	btrfs_set_inode_gid(leaf, item, gid);
++#ifdef CONFIG_TAGGING_INTERN
++	btrfs_set_inode_tag(leaf, item, i_tag_read(inode));
++#endif
+ 	btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
+ 	btrfs_set_inode_mode(leaf, item, inode->i_mode);
+ 	btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
+@@ -7786,11 +7802,13 @@ static const struct inode_operations btr
+ 	.listxattr	= btrfs_listxattr,
+ 	.removexattr	= btrfs_removexattr,
+ 	.permission	= btrfs_permission,
++	.sync_flags	= btrfs_sync_flags,
+ 	.get_acl	= btrfs_get_acl,
+ };
+ static const struct inode_operations btrfs_dir_ro_inode_operations = {
+ 	.lookup		= btrfs_lookup,
+ 	.permission	= btrfs_permission,
++	.sync_flags	= btrfs_sync_flags,
+ 	.get_acl	= btrfs_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/ioctl.c linux-3.7.10-vs2.3.5.6/fs/btrfs/ioctl.c
+--- linux-3.7.10/fs/btrfs/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl
+ {
+ 	unsigned int iflags = 0;
+ 
+-	if (flags & BTRFS_INODE_SYNC)
+-		iflags |= FS_SYNC_FL;
+ 	if (flags & BTRFS_INODE_IMMUTABLE)
+ 		iflags |= FS_IMMUTABLE_FL;
++	if (flags & BTRFS_INODE_IXUNLINK)
++		iflags |= FS_IXUNLINK_FL;
++
++	if (flags & BTRFS_INODE_SYNC)
++		iflags |= FS_SYNC_FL;
+ 	if (flags & BTRFS_INODE_APPEND)
+ 		iflags |= FS_APPEND_FL;
+ 	if (flags & BTRFS_INODE_NODUMP)
+@@ -94,28 +97,78 @@ static unsigned int btrfs_flags_to_ioctl
+ 	else if (flags & BTRFS_INODE_NOCOMPRESS)
+ 		iflags |= FS_NOCOMP_FL;
+ 
++	if (flags & BTRFS_INODE_BARRIER)
++		iflags |= FS_BARRIER_FL;
++	if (flags & BTRFS_INODE_COW)
++		iflags |= FS_COW_FL;
+ 	return iflags;
+ }
+ 
+ /*
+- * Update inode->i_flags based on the btrfs internal flags.
++ * Update inode->i_(v)flags based on the btrfs internal flags.
+  */
+ void btrfs_update_iflags(struct inode *inode)
+ {
+ 	struct btrfs_inode *ip = BTRFS_I(inode);
+ 
+-	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+-	if (ip->flags & BTRFS_INODE_SYNC)
+-		inode->i_flags |= S_SYNC;
+ 	if (ip->flags & BTRFS_INODE_IMMUTABLE)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (ip->flags & BTRFS_INODE_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++
++	if (ip->flags & BTRFS_INODE_SYNC)
++		inode->i_flags |= S_SYNC;
+ 	if (ip->flags & BTRFS_INODE_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	if (ip->flags & BTRFS_INODE_NOATIME)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (ip->flags & BTRFS_INODE_DIRSYNC)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (ip->flags & BTRFS_INODE_BARRIER)
++		inode->i_vflags |= V_BARRIER;
++	if (ip->flags & BTRFS_INODE_COW)
++		inode->i_vflags |= V_COW;
++}
++
++/*
++ * Update btrfs internal flags from inode->i_(v)flags.
++ */
++void btrfs_update_flags(struct inode *inode)
++{
++	struct btrfs_inode *ip = BTRFS_I(inode);
++
++	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	ip->flags &= ~(BTRFS_INODE_SYNC | BTRFS_INODE_APPEND |
++			BTRFS_INODE_IMMUTABLE | BTRFS_INODE_IXUNLINK |
++			BTRFS_INODE_NOATIME | BTRFS_INODE_DIRSYNC |
++			BTRFS_INODE_BARRIER | BTRFS_INODE_COW);
++
++	if (flags & S_IMMUTABLE)
++		ip->flags |= BTRFS_INODE_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->flags |= BTRFS_INODE_IXUNLINK;
++
++	if (flags & S_SYNC)
++		ip->flags |= BTRFS_INODE_SYNC;
++	if (flags & S_APPEND)
++		ip->flags |= BTRFS_INODE_APPEND;
++	if (flags & S_NOATIME)
++		ip->flags |= BTRFS_INODE_NOATIME;
++	if (flags & S_DIRSYNC)
++		ip->flags |= BTRFS_INODE_DIRSYNC;
++
++	if (vflags & V_BARRIER)
++		ip->flags |= BTRFS_INODE_BARRIER;
++	if (vflags & V_COW)
++		ip->flags |= BTRFS_INODE_COW;
+ }
+ 
+ /*
+@@ -131,6 +184,7 @@ void btrfs_inherit_iflags(struct inode *
+ 		return;
+ 
+ 	flags = BTRFS_I(dir)->flags;
++	flags &= ~BTRFS_INODE_BARRIER;
+ 
+ 	if (flags & BTRFS_INODE_NOCOMPRESS) {
+ 		BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
+@@ -146,6 +200,30 @@ void btrfs_inherit_iflags(struct inode *
+ 	btrfs_update_iflags(inode);
+ }
+ 
++int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct btrfs_inode *ip = BTRFS_I(inode);
++	struct btrfs_root *root = ip->root;
++	struct btrfs_trans_handle *trans;
++	int ret;
++
++	trans = btrfs_join_transaction(root);
++	BUG_ON(!trans);
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	btrfs_update_flags(inode);
++
++	ret = btrfs_update_inode(trans, root, inode);
++	BUG_ON(ret);
++
++	btrfs_update_iflags(inode);
++	inode->i_ctime = CURRENT_TIME;
++	btrfs_end_transaction(trans, root);
++
++	return 0;
++}
++
+ static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
+ {
+ 	struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
+@@ -208,21 +286,27 @@ static int btrfs_ioctl_setflags(struct f
+ 
+ 	flags = btrfs_mask_flags(inode->i_mode, flags);
+ 	oldflags = btrfs_flags_to_ioctl(ip->flags);
+-	if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
++	if ((flags ^ oldflags) & (FS_APPEND_FL |
++		FS_IMMUTABLE_FL | FS_IXUNLINK_FL)) {
+ 		if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 			ret = -EPERM;
+ 			goto out_unlock;
+ 		}
+ 	}
+ 
+-	if (flags & FS_SYNC_FL)
+-		ip->flags |= BTRFS_INODE_SYNC;
+-	else
+-		ip->flags &= ~BTRFS_INODE_SYNC;
+ 	if (flags & FS_IMMUTABLE_FL)
+ 		ip->flags |= BTRFS_INODE_IMMUTABLE;
+ 	else
+ 		ip->flags &= ~BTRFS_INODE_IMMUTABLE;
++	if (flags & FS_IXUNLINK_FL)
++		ip->flags |= BTRFS_INODE_IXUNLINK;
++	else
++		ip->flags &= ~BTRFS_INODE_IXUNLINK;
++
++	if (flags & FS_SYNC_FL)
++		ip->flags |= BTRFS_INODE_SYNC;
++	else
++		ip->flags &= ~BTRFS_INODE_SYNC;
+ 	if (flags & FS_APPEND_FL)
+ 		ip->flags |= BTRFS_INODE_APPEND;
+ 	else
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/super.c linux-3.7.10-vs2.3.5.6/fs/btrfs/super.c
+--- linux-3.7.10/fs/btrfs/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -312,7 +312,7 @@ enum {
+ 	Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
+ 	Opt_check_integrity, Opt_check_integrity_including_extent_data,
+ 	Opt_check_integrity_print_mask, Opt_fatal_errors,
+-	Opt_err,
++	Opt_tag, Opt_notag, Opt_tagid, Opt_err,
+ };
+ 
+ static match_table_t tokens = {
+@@ -352,6 +352,9 @@ static match_table_t tokens = {
+ 	{Opt_check_integrity_including_extent_data, "check_int_data"},
+ 	{Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
+ 	{Opt_fatal_errors, "fatal_errors=%s"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -614,6 +617,22 @@ int btrfs_parse_options(struct btrfs_roo
+ 				goto out;
+ 			}
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			printk(KERN_INFO "btrfs: use tagging\n");
++			btrfs_set_opt(info->mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			printk(KERN_INFO "btrfs: disabled tagging\n");
++			btrfs_clear_opt(info->mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			btrfs_set_opt(info->mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_err:
+ 			printk(KERN_INFO "btrfs: unrecognized mount option "
+ 			       "'%s'\n", p);
+@@ -1211,6 +1230,12 @@ static int btrfs_remount(struct super_bl
+ 	btrfs_resize_thread_pool(fs_info,
+ 		fs_info->thread_pool_size, old_thread_pool_size);
+ 
++	if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++		printk("btrfs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		return -EINVAL;
++	}
++
+ 	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+ 		return 0;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/char_dev.c linux-3.7.10-vs2.3.5.6/fs/char_dev.c
+--- linux-3.7.10/fs/char_dev.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/char_dev.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,8 @@
+ #include <linux/mutex.h>
+ #include <linux/backing-dev.h>
+ #include <linux/tty.h>
++#include <linux/vs_context.h>
++#include <linux/vs_device.h>
+ 
+ #include "internal.h"
+ 
+@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino
+ 	struct cdev *p;
+ 	struct cdev *new = NULL;
+ 	int ret = 0;
++	dev_t mdev;
++
++	if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
++		return -EPERM;
++	inode->i_mdev = mdev;
+ 
+ 	spin_lock(&cdev_lock);
+ 	p = inode->i_cdev;
+ 	if (!p) {
+ 		struct kobject *kobj;
+ 		int idx;
++
+ 		spin_unlock(&cdev_lock);
+-		kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
++
++		kobj = kobj_lookup(cdev_map, mdev, &idx);
+ 		if (!kobj)
+ 			return -ENXIO;
+ 		new = container_of(kobj, struct cdev, kobj);
+diff -NurpP --minimal linux-3.7.10/fs/dcache.c linux-3.7.10-vs2.3.5.6/fs/dcache.c
+--- linux-3.7.10/fs/dcache.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/dcache.c	2013-01-16 00:19:03.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/rculist_bl.h>
+ #include <linux/prefetch.h>
+ #include <linux/ratelimit.h>
++#include <linux/vs_limit.h>
+ #include "internal.h"
+ #include "mount.h"
+ 
+@@ -617,6 +618,8 @@ int d_invalidate(struct dentry * dentry)
+ 		spin_lock(&dentry->d_lock);
+ 	}
+ 
++	vx_dentry_dec(dentry);
++
+ 	/*
+ 	 * Somebody else still using it?
+ 	 *
+@@ -646,6 +649,7 @@ EXPORT_SYMBOL(d_invalidate);
+ static inline void __dget_dlock(struct dentry *dentry)
+ {
+ 	dentry->d_count++;
++	vx_dentry_inc(dentry);
+ }
+ 
+ static inline void __dget(struct dentry *dentry)
+@@ -1276,6 +1280,9 @@ struct dentry *__d_alloc(struct super_bl
+ 	struct dentry *dentry;
+ 	char *dname;
+ 
++	if (!vx_dentry_avail(1))
++		return NULL;
++
+ 	dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
+ 	if (!dentry)
+ 		return NULL;
+@@ -1308,6 +1315,7 @@ struct dentry *__d_alloc(struct super_bl
+ 
+ 	dentry->d_count = 1;
+ 	dentry->d_flags = 0;
++	vx_dentry_inc(dentry);
+ 	spin_lock_init(&dentry->d_lock);
+ 	seqcount_init(&dentry->d_seq);
+ 	dentry->d_inode = NULL;
+@@ -2012,6 +2020,7 @@ struct dentry *__d_lookup(struct dentry
+ 		}
+ 
+ 		dentry->d_count++;
++		vx_dentry_inc(dentry);
+ 		found = dentry;
+ 		spin_unlock(&dentry->d_lock);
+ 		break;
+diff -NurpP --minimal linux-3.7.10/fs/devpts/inode.c linux-3.7.10-vs2.3.5.6/fs/devpts/inode.c
+--- linux-3.7.10/fs/devpts/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/devpts/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/parser.h>
+ #include <linux/fsnotify.h>
+ #include <linux/seq_file.h>
++#include <linux/vs_base.h>
+ 
+ #define DEVPTS_DEFAULT_MODE 0600
+ /*
+@@ -36,6 +37,21 @@
+ #define DEVPTS_DEFAULT_PTMX_MODE 0000
+ #define PTMX_MINOR	2
+ 
++static int devpts_permission(struct inode *inode, int mask)
++{
++	int ret = -EACCES;
++
++	/* devpts is xid tagged */
++	if (vx_check((xid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT))
++		ret = generic_permission(inode, mask);
++	return ret;
++}
++
++static struct inode_operations devpts_file_inode_operations = {
++	.permission     = devpts_permission,
++};
++
++
+ /*
+  * sysctl support for setting limits on the number of Unix98 ptys allocated.
+  * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
+@@ -336,6 +352,34 @@ static int devpts_show_options(struct se
+ 	return 0;
+ }
+ 
++static int devpts_filter(struct dentry *de)
++{
++	xid_t xid = 0;
++
++	/* devpts is xid tagged */
++	if (de && de->d_inode)
++		xid = (xid_t)i_tag_read(de->d_inode);
++#ifdef CONFIG_VSERVER_WARN_DEVPTS
++	else
++		vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
++			de->d_name.len, de->d_name.name);
++#endif
++	return vx_check(xid, VS_WATCH_P | VS_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 const struct super_operations devpts_sops = {
+ 	.statfs		= simple_statfs,
+ 	.remount_fs	= devpts_remount,
+@@ -379,8 +423,10 @@ devpts_fill_super(struct super_block *s,
+ 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ 	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;
+ 	set_nlink(inode, 2);
++	/* devpts is xid tagged */
++	i_tag_write(inode, (tag_t)vx_current_xid());
+ 
+ 	s->s_root = d_make_root(inode);
+ 	if (s->s_root)
+@@ -572,6 +618,9 @@ int devpts_pty_new(struct inode *ptmx_in
+ 	inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
+ 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ 	init_special_inode(inode, S_IFCHR|opts->mode, device);
++	/* devpts is xid tagged */
++	i_tag_write(inode, (tag_t)vx_current_xid());
++	inode->i_op = &devpts_file_inode_operations;
+ 	inode->i_private = tty;
+ 	tty->driver_data = inode;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/balloc.c linux-3.7.10-vs2.3.5.6/fs/ext2/balloc.c
+--- linux-3.7.10/fs/ext2/balloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/balloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block
+ 			start = 0;
+ 		end = EXT2_BLOCKS_PER_GROUP(sb);
+ 	}
+-
+ 	BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
+ 
+ repeat:
+diff -NurpP --minimal linux-3.7.10/fs/ext2/ext2.h linux-3.7.10-vs2.3.5.6/fs/ext2/ext2.h
+--- linux-3.7.10/fs/ext2/ext2.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/ext2.h	2012-12-18 15:13:16.000000000 +0000
+@@ -244,8 +244,12 @@ struct ext2_group_desc
+ #define EXT2_NOTAIL_FL			FS_NOTAIL_FL	/* file tail should not be merged */
+ #define EXT2_DIRSYNC_FL			FS_DIRSYNC_FL	/* dirsync behaviour (directories only) */
+ #define EXT2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
++#define EXT2_IXUNLINK_FL		FS_IXUNLINK_FL	/* Immutable invert on unlink */
+ #define EXT2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
+ 
++#define EXT2_BARRIER_FL			FS_BARRIER_FL	/* Barrier for chroot() */
++#define EXT2_COW_FL			FS_COW_FL	/* Copy on Write marker */
++
+ #define EXT2_FL_USER_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
+ #define EXT2_FL_USER_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
+ 
+@@ -329,7 +333,8 @@ struct ext2_inode {
+ 			__u16	i_pad1;
+ 			__le16	l_i_uid_high;	/* these 2 fields    */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+-			__u32	l_i_reserved2;
++			__le16	l_i_tag;	/* Context Tag */
++			__u16	l_i_reserved2;
+ 		} linux2;
+ 		struct {
+ 			__u8	h_i_frag;	/* Fragment number */
+@@ -357,6 +362,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_tag	osd2.linux2.l_i_tag
+ #define i_reserved2	osd2.linux2.l_i_reserved2
+ 
+ /*
+@@ -384,6 +390,7 @@ struct ext2_inode {
+ #define EXT2_MOUNT_USRQUOTA		0x020000  /* user quota */
+ #define EXT2_MOUNT_GRPQUOTA		0x040000  /* group quota */
+ #define EXT2_MOUNT_RESERVATION		0x080000  /* Preallocation */
++#define EXT2_MOUNT_TAGGED		(1<<24)	  /* Enable Context Tags */
+ 
+ 
+ #define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt
+@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct
+ extern void ext2_get_inode_flags(struct ext2_inode_info *);
+ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		       u64 start, u64 len);
++extern int ext2_sync_flags(struct inode *, int, int);
+ 
+ /* ioctl.c */
+ extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
+diff -NurpP --minimal linux-3.7.10/fs/ext2/file.c linux-3.7.10-vs2.3.5.6/fs/ext2/file.c
+--- linux-3.7.10/fs/ext2/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
+ 	.setattr	= ext2_setattr,
+ 	.get_acl	= ext2_get_acl,
+ 	.fiemap		= ext2_fiemap,
++	.sync_flags	= ext2_sync_flags,
+ };
+diff -NurpP --minimal linux-3.7.10/fs/ext2/ialloc.c linux-3.7.10-vs2.3.5.6/fs/ext2/ialloc.c
+--- linux-3.7.10/fs/ext2/ialloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/ialloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/buffer_head.h>
+ #include <linux/random.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -547,6 +548,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/inode.c linux-3.7.10-vs2.3.5.6/fs/ext2/inode.c
+--- linux-3.7.10/fs/ext2/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <linux/mpage.h>
+ #include <linux/fiemap.h>
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "acl.h"
+ #include "xip.h"
+@@ -1165,7 +1166,7 @@ static void ext2_truncate_blocks(struct
+ 		return;
+ 	if (ext2_inode_is_fast_symlink(inode))
+ 		return;
+-	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++	if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ 		return;
+ 	__ext2_truncate_blocks(inode, offset);
+ }
+@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct 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_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++
++	if (flags & EXT2_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT2_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	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_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT2_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT2_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT2_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */
+ void ext2_get_inode_flags(struct ext2_inode_info *ei)
+ {
+ 	unsigned int flags = ei->vfs_inode.i_flags;
++	unsigned int vflags = ei->vfs_inode.i_vflags;
++
++	ei->i_flags &= ~(EXT2_SYNC_FL | EXT2_APPEND_FL |
++			EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL |
++			EXT2_NOATIME_FL | EXT2_DIRSYNC_FL |
++			EXT2_BARRIER_FL | EXT2_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		ei->i_flags |= EXT2_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		ei->i_flags |= EXT2_IXUNLINK_FL;
+ 
+-	ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL|
+-			EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		ei->i_flags |= EXT2_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		ei->i_flags |= EXT2_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		ei->i_flags |= EXT2_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		ei->i_flags |= EXT2_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		ei->i_flags |= EXT2_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		ei->i_flags |= EXT2_BARRIER_FL;
++	if (vflags & V_COW)
++		ei->i_flags |= EXT2_COW_FL;
+ }
+ 
+ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
+@@ -1321,8 +1347,10 @@ struct inode *ext2_iget (struct super_bl
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ 	}
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++		le16_to_cpu(raw_inode->i_raw_tag)));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 	inode->i_size = le32_to_cpu(raw_inode->i_size);
+ 	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
+@@ -1420,8 +1448,10 @@ static int __ext2_write_inode(struct ino
+ 	struct ext2_inode_info *ei = EXT2_I(inode);
+ 	struct super_block *sb = inode->i_sb;
+ 	ino_t ino = inode->i_ino;
+-	uid_t uid = i_uid_read(inode);
+-	gid_t gid = i_gid_read(inode);
++	uid_t uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	gid_t gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
+ 	struct buffer_head * bh;
+ 	struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
+ 	int n;
+@@ -1457,6 +1487,9 @@ static int __ext2_write_inode(struct ino
+ 		raw_inode->i_uid_high = 0;
+ 		raw_inode->i_gid_high = 0;
+ 	}
++#ifdef CONFIG_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
++#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);
+@@ -1537,7 +1570,8 @@ int ext2_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, iattr))
+ 		dquot_initialize(inode);
+ 	if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
+-	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
++	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
++	    (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
+ 		error = dquot_transfer(inode, iattr);
+ 		if (error)
+ 			return error;
+diff -NurpP --minimal linux-3.7.10/fs/ext2/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ext2/ioctl.c
+--- linux-3.7.10/fs/ext2/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,16 @@
+ #include <asm/uaccess.h>
+ 
+ 
++int ext2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext2_get_inode_flags(EXT2_I(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++	mark_inode_dirty(inode);
++	return 0;
++}
++
+ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext2_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		mutex_lock(&inode->i_mutex);
+ 		/* Is it quota file? Do not allow user to mess with it */
+ 		if (IS_NOQUOTA(inode)) {
+@@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * 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_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				ret = -EPERM;
+@@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
+ 			}
+ 		}
+ 
+-		flags = flags & EXT2_FL_USER_MODIFIABLE;
++		flags &= EXT2_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
+ 		ei->i_flags = flags;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/namei.c linux-3.7.10-vs2.3.5.6/fs/ext2/namei.c
+--- linux-3.7.10/fs/ext2/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -32,6 +32,7 @@
+ 
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct
+ 					(unsigned long) ino);
+ 			return ERR_PTR(-EIO);
+ 		}
++		dx_propagate_tag(nd, inode);
+ 	}
+ 	return d_splice_alias(inode, dentry);
+ }
+@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i
+ 	.removexattr	= generic_removexattr,
+ #endif
+ 	.setattr	= ext2_setattr,
++	.sync_flags	= ext2_sync_flags,
+ 	.get_acl	= ext2_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/super.c linux-3.7.10-vs2.3.5.6/fs/ext2/super.c
+--- linux-3.7.10/fs/ext2/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -395,7 +395,8 @@ enum {
+ 	Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
+ 	Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
+ 	Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
+-	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
++	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -423,6 +424,9 @@ static const match_table_t tokens = {
+ 	{Opt_acl, "acl"},
+ 	{Opt_noacl, "noacl"},
+ 	{Opt_xip, "xip"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_grpquota, "grpquota"},
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_quota, "quota"},
+@@ -506,6 +510,20 @@ static int parse_options(char *options,
+ 		case Opt_nouid32:
+ 			set_opt (sbi->s_mount_opt, NO_UID32);
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			clear_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_nocheck:
+ 			clear_opt (sbi->s_mount_opt, CHECK);
+ 			break;
+@@ -864,6 +882,8 @@ static int ext2_fill_super(struct super_
+ 	if (!parse_options((char *) data, sb))
+ 		goto failed_mount;
+ 
++	if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
+ 		 MS_POSIXACL : 0);
+@@ -1269,6 +1289,14 @@ static int ext2_remount (struct super_bl
+ 		err = -EINVAL;
+ 		goto restore_opts;
+ 	}
++
++	if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT2-fs: %s: tagging not permitted on remount.\n",
++		       sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
+ 
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+diff -NurpP --minimal linux-3.7.10/fs/ext3/ext3.h linux-3.7.10-vs2.3.5.6/fs/ext3/ext3.h
+--- linux-3.7.10/fs/ext3/ext3.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/ext3.h	2012-12-18 15:13:16.000000000 +0000
+@@ -151,10 +151,14 @@ 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_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ #define EXT3_RESERVED_FL		0x80000000 /* reserved for ext3 lib */
+ 
+-#define EXT3_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+-#define EXT3_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
++#define EXT3_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define EXT3_COW_FL			0x20000000 /* Copy on Write marker */
++
++#define EXT3_FL_USER_VISIBLE		0x0103DFFF /* User visible flags */
++#define EXT3_FL_USER_MODIFIABLE		0x010380FF /* User modifiable flags */
+ 
+ /* Flags that should be inherited by new inodes from their parent. */
+ #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
+@@ -290,7 +294,8 @@ struct ext3_inode {
+ 			__u16	i_pad1;
+ 			__le16	l_i_uid_high;	/* these 2 fields    */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+-			__u32	l_i_reserved2;
++			__le16	l_i_tag;	/* Context Tag */
++			__u16	l_i_reserved2;
+ 		} linux2;
+ 		struct {
+ 			__u8	h_i_frag;	/* Fragment number */
+@@ -320,6 +325,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_tag	osd2.linux2.l_i_tag
+ #define i_reserved2	osd2.linux2.l_i_reserved2
+ 
+ /*
+@@ -364,6 +370,7 @@ struct ext3_inode {
+ #define EXT3_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */
+ #define EXT3_MOUNT_DATA_ERR_ABORT	0x400000 /* Abort on file data write
+ 						  * error in ordered mode */
++#define EXT3_MOUNT_TAGGED		(1<<24) /* Enable Context Tags */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct
+ extern void ext3_set_aops(struct inode *inode);
+ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		       u64 start, u64 len);
++extern int ext3_sync_flags(struct inode *, int, int);
+ 
+ /* ioctl.c */
+ extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
+diff -NurpP --minimal linux-3.7.10/fs/ext3/file.c linux-3.7.10-vs2.3.5.6/fs/ext3/file.c
+--- linux-3.7.10/fs/ext3/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
+ #endif
+ 	.get_acl	= ext3_get_acl,
+ 	.fiemap		= ext3_fiemap,
++	.sync_flags	= ext3_sync_flags,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/ialloc.c linux-3.7.10-vs2.3.5.6/fs/ext3/ialloc.c
+--- linux-3.7.10/fs/ext3/ialloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/ialloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <linux/quotaops.h>
+ #include <linux/random.h>
++#include <linux/vs_tag.h>
+ 
+ #include "ext3.h"
+ #include "xattr.h"
+@@ -469,6 +470,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/inode.c linux-3.7.10-vs2.3.5.6/fs/ext3/inode.c
+--- linux-3.7.10/fs/ext3/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -27,6 +27,8 @@
+ #include <linux/writeback.h>
+ #include <linux/mpage.h>
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
++
+ #include "ext3.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -2848,36 +2850,60 @@ void ext3_set_inode_flags(struct 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_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++	if (flags & EXT3_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT3_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	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_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT3_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT3_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT3_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT3_I(inode)->i_flags */
+ void ext3_get_inode_flags(struct ext3_inode_info *ei)
+ {
+ 	unsigned int flags = ei->vfs_inode.i_flags;
++	unsigned int vflags = ei->vfs_inode.i_vflags;
++
++	ei->i_flags &= ~(EXT3_SYNC_FL | EXT3_APPEND_FL |
++			EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL |
++			EXT3_NOATIME_FL | EXT3_DIRSYNC_FL |
++			EXT3_BARRIER_FL | EXT3_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		ei->i_flags |= EXT3_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		ei->i_flags |= EXT3_IXUNLINK_FL;
+ 
+-	ei->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL|
+-			EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		ei->i_flags |= EXT3_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		ei->i_flags |= EXT3_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		ei->i_flags |= EXT3_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		ei->i_flags |= EXT3_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		ei->i_flags |= EXT3_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		ei->i_flags |= EXT3_BARRIER_FL;
++	if (vflags & V_COW)
++		ei->i_flags |= EXT3_COW_FL;
+ }
+ 
+ struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
+@@ -2915,8 +2941,10 @@ struct inode *ext3_iget(struct super_blo
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ 	}
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++		le16_to_cpu(raw_inode->i_raw_tag)));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 	inode->i_size = le32_to_cpu(raw_inode->i_size);
+ 	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
+@@ -3088,8 +3116,10 @@ again:
+ 
+ 	ext3_get_inode_flags(ei);
+ 	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+-	i_uid = i_uid_read(inode);
+-	i_gid = i_gid_read(inode);
++	i_uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	i_gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
+ 	if(!(test_opt(inode->i_sb, NO_UID32))) {
+ 		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
+ 		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
+@@ -3114,6 +3144,9 @@ again:
+ 		raw_inode->i_uid_high = 0;
+ 		raw_inode->i_gid_high = 0;
+ 	}
++#ifdef CONFIG_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
++#endif
+ 	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ 	disksize = cpu_to_le32(ei->i_disksize);
+ 	if (disksize != raw_inode->i_size) {
+@@ -3282,7 +3315,8 @@ int ext3_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, attr))
+ 		dquot_initialize(inode);
+ 	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+-	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++	    (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
+ 		handle_t *handle;
+ 
+ 		/* (user+group)*(old+new) structure, inode write (sb,
+@@ -3304,6 +3338,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_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		error = ext3_mark_inode_dirty(handle, inode);
+ 		ext3_journal_stop(handle);
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/ext3/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ext3/ioctl.c
+--- linux-3.7.10/fs/ext3/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -12,6 +12,34 @@
+ #include <asm/uaccess.h>
+ #include "ext3.h"
+ 
++
++int ext3_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	handle_t *handle = NULL;
++	struct ext3_iloc iloc;
++	int err;
++
++	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;
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext3_get_inode_flags(EXT3_I(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++
++	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++	ext3_journal_stop(handle);
++	return err;
++}
++
+ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext3_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		mutex_lock(&inode->i_mutex);
+ 
+ 		/* Is it quota file? Do not allow user to mess with it */
+@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * 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_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE))
+ 				goto flags_out;
+ 		}
+@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig
+ 		if (err)
+ 			goto flags_err;
+ 
+-		flags = flags & EXT3_FL_USER_MODIFIABLE;
++		flags &= EXT3_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
+ 		ei->i_flags = flags;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/namei.c linux-3.7.10-vs2.3.5.6/fs/ext3/namei.c
+--- linux-3.7.10/fs/ext3/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,8 @@
+  */
+ 
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
++
+ #include "ext3.h"
+ #include "namei.h"
+ #include "xattr.h"
+@@ -919,6 +921,7 @@ restart:
+ 					submit_bh(READ | REQ_META | REQ_PRIO,
+ 						  bh);
+ 				}
++		dx_propagate_tag(nd, inode);
+ 			}
+ 		}
+ 		if ((bh = bh_use[ra_ptr++]) == NULL)
+@@ -2528,6 +2531,7 @@ const struct inode_operations ext3_dir_i
+ 	.listxattr	= ext3_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext3_sync_flags,
+ 	.get_acl	= ext3_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/super.c linux-3.7.10-vs2.3.5.6/fs/ext3/super.c
+--- linux-3.7.10/fs/ext3/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -816,7 +816,8 @@ enum {
+ 	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
+ 	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
+ 	Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
+-	Opt_resize, Opt_usrquota, Opt_grpquota
++	Opt_resize, Opt_usrquota, Opt_grpquota,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -873,6 +874,9 @@ static const match_table_t tokens = {
+ 	{Opt_barrier, "barrier"},
+ 	{Opt_nobarrier, "nobarrier"},
+ 	{Opt_resize, "resize"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1038,6 +1042,20 @@ static int parse_options (char *options,
+ 		case Opt_nouid32:
+ 			set_opt (sbi->s_mount_opt, NO_UID32);
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			clear_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_nocheck:
+ 			clear_opt (sbi->s_mount_opt, CHECK);
+ 			break;
+@@ -1738,6 +1756,9 @@ static int ext3_fill_super (struct super
+ 			    NULL, 0))
+ 		goto failed_mount;
+ 
++	if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -2622,6 +2643,14 @@ static int ext3_remount (struct super_bl
+ 	if (test_opt(sb, ABORT))
+ 		ext3_abort(sb, __func__, "Abort forced by user");
+ 
++	if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT3-fs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext4/ext4.h linux-3.7.10-vs2.3.5.6/fs/ext4/ext4.h
+--- linux-3.7.10/fs/ext4/ext4.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/ext4.h	2012-12-18 15:13:16.000000000 +0000
+@@ -392,8 +392,12 @@ struct flex_groups {
+ #define EXT4_EXTENTS_FL			0x00080000 /* Inode uses extents */
+ #define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
+ #define EXT4_EOFBLOCKS_FL		0x00400000 /* Blocks allocated beyond EOF */
++#define EXT4_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ #define EXT4_RESERVED_FL		0x80000000 /* reserved for ext4 lib */
+ 
++#define EXT4_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define EXT4_COW_FL			0x20000000 /* Copy on Write marker */
++
+ #define EXT4_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
+ #define EXT4_FL_USER_MODIFIABLE		0x004B80FF /* User modifiable flags */
+ 
+@@ -665,7 +669,7 @@ struct ext4_inode {
+ 			__le16	l_i_uid_high;	/* these 2 fields */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+ 			__le16	l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
+-			__le16	l_i_reserved;
++			__le16	l_i_tag;	/* Context Tag */
+ 		} linux2;
+ 		struct {
+ 			__le16	h_i_reserved1;	/* Obsoleted fragment number/size which are removed in ext4 */
+@@ -783,6 +787,7 @@ do {									       \
+ #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_tag	osd2.linux2.l_i_tag
+ #define i_checksum_lo	osd2.linux2.l_i_checksum_lo
+ 
+ #elif defined(__GNU__)
+@@ -961,6 +966,7 @@ struct ext4_inode_info {
+ #define EXT4_MOUNT_POSIX_ACL		0x08000	/* POSIX Access Control Lists */
+ #define EXT4_MOUNT_NO_AUTO_DA_ALLOC	0x10000	/* No auto delalloc mapping */
+ #define EXT4_MOUNT_BARRIER		0x20000 /* Use block barriers */
++#define EXT4_MOUNT_TAGGED		0x40000 /* Enable Context Tags */
+ #define EXT4_MOUNT_QUOTA		0x80000 /* Some quota option set */
+ #define EXT4_MOUNT_USRQUOTA		0x100000 /* "old" user quota */
+ #define EXT4_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */
+@@ -2412,6 +2418,7 @@ extern int ext4_map_blocks(handle_t *han
+ 			   struct ext4_map_blocks *map, int flags);
+ extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 			__u64 start, __u64 len);
++extern int ext4_sync_flags(struct inode *, int, int);
+ /* move_extent.c */
+ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
+ 			     __u64 start_orig, __u64 start_donor,
+diff -NurpP --minimal linux-3.7.10/fs/ext4/file.c linux-3.7.10-vs2.3.5.6/fs/ext4/file.c
+--- linux-3.7.10/fs/ext4/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -334,5 +334,6 @@ const struct inode_operations ext4_file_
+ #endif
+ 	.get_acl	= ext4_get_acl,
+ 	.fiemap		= ext4_fiemap,
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext4/ialloc.c linux-3.7.10-vs2.3.5.6/fs/ext4/ialloc.c
+--- linux-3.7.10/fs/ext4/ialloc.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/ialloc.c	2013-02-05 01:14:43.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/random.h>
+ #include <linux/bitops.h>
+ #include <linux/blkdev.h>
++#include <linux/vs_tag.h>
+ #include <asm/byteorder.h>
+ 
+ #include "ext4.h"
+@@ -848,6 +849,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext4/inode.c linux-3.7.10-vs2.3.5.6/fs/ext4/inode.c
+--- linux-3.7.10/fs/ext4/inode.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/inode.c	2013-02-05 01:14:43.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/printk.h>
+ #include <linux/slab.h>
+ #include <linux/ratelimit.h>
++#include <linux/vs_tag.h>
+ 
+ #include "ext4_jbd2.h"
+ #include "xattr.h"
+@@ -3697,41 +3698,64 @@ void ext4_set_inode_flags(struct inode *
+ {
+ 	unsigned int flags = EXT4_I(inode)->i_flags;
+ 
+-	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++	if (flags & EXT4_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT4_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	if (flags & EXT4_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+ 	if (flags & EXT4_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+-	if (flags & EXT4_IMMUTABLE_FL)
+-		inode->i_flags |= S_IMMUTABLE;
+ 	if (flags & EXT4_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT4_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT4_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT4_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
+ void ext4_get_inode_flags(struct ext4_inode_info *ei)
+ {
+-	unsigned int vfs_fl;
++	unsigned int vfs_fl, vfs_vf;
+ 	unsigned long old_fl, new_fl;
+ 
+ 	do {
+ 		vfs_fl = ei->vfs_inode.i_flags;
++		vfs_vf = ei->vfs_inode.i_vflags;
+ 		old_fl = ei->i_flags;
+ 		new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
+ 				EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
+-				EXT4_DIRSYNC_FL);
++				EXT4_DIRSYNC_FL|EXT4_BARRIER_FL|
++				EXT4_COW_FL);
++
++		if (vfs_fl & S_IMMUTABLE)
++			new_fl |= EXT4_IMMUTABLE_FL;
++		if (vfs_fl & S_IXUNLINK)
++			new_fl |= EXT4_IXUNLINK_FL;
++
+ 		if (vfs_fl & S_SYNC)
+ 			new_fl |= EXT4_SYNC_FL;
+ 		if (vfs_fl & S_APPEND)
+ 			new_fl |= EXT4_APPEND_FL;
+-		if (vfs_fl & S_IMMUTABLE)
+-			new_fl |= EXT4_IMMUTABLE_FL;
+ 		if (vfs_fl & S_NOATIME)
+ 			new_fl |= EXT4_NOATIME_FL;
+ 		if (vfs_fl & S_DIRSYNC)
+ 			new_fl |= EXT4_DIRSYNC_FL;
++
++		if (vfs_vf & V_BARRIER)
++			new_fl |= EXT4_BARRIER_FL;
++		if (vfs_vf & V_COW)
++			new_fl |= EXT4_COW_FL;
+ 	} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
+ }
+ 
+@@ -3823,8 +3847,10 @@ struct inode *ext4_iget(struct super_blo
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ 	}
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++		le16_to_cpu(raw_inode->i_raw_tag)));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 
+ 	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */
+@@ -4048,8 +4074,10 @@ static int ext4_do_update_inode(handle_t
+ 
+ 	ext4_get_inode_flags(ei);
+ 	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+-	i_uid = i_uid_read(inode);
+-	i_gid = i_gid_read(inode);
++	i_uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	i_gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
+ 	if (!(test_opt(inode->i_sb, NO_UID32))) {
+ 		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
+ 		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
+@@ -4072,6 +4100,9 @@ static int ext4_do_update_inode(handle_t
+ 		raw_inode->i_uid_high = 0;
+ 		raw_inode->i_gid_high = 0;
+ 	}
++#ifdef CONFIG_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
++#endif
+ 	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ 
+ 	EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
+@@ -4260,7 +4291,8 @@ int ext4_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, attr))
+ 		dquot_initialize(inode);
+ 	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+-	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++	    (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
+ 		handle_t *handle;
+ 
+ 		/* (user+group)*(old+new) structure, inode write (sb,
+@@ -4282,6 +4314,8 @@ int ext4_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_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		error = ext4_mark_inode_dirty(handle, inode);
+ 		ext4_journal_stop(handle);
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/ext4/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ext4/ioctl.c
+--- linux-3.7.10/fs/ext4/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -14,12 +14,40 @@
+ #include <linux/compat.h>
+ #include <linux/mount.h>
+ #include <linux/file.h>
++#include <linux/vs_tag.h>
+ #include <asm/uaccess.h>
+ #include "ext4_jbd2.h"
+ #include "ext4.h"
+ 
+ #define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1)
+ 
++int ext4_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	handle_t *handle = NULL;
++	struct ext4_iloc iloc;
++	int err;
++
++	handle = ext4_journal_start(inode, 1);
++	if (IS_ERR(handle))
++		return PTR_ERR(handle);
++
++	if (IS_SYNC(inode))
++		ext4_handle_sync(handle);
++	err = ext4_reserve_inode_write(handle, inode, &iloc);
++	if (err)
++		goto flags_err;
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext4_get_inode_flags(EXT4_I(inode));
++	inode->i_ctime = ext4_current_time(inode);
++
++	err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++	ext4_journal_stop(handle);
++	return err;
++}
++
+ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext4_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		err = -EPERM;
+ 		mutex_lock(&inode->i_mutex);
+ 		/* Is it quota file? Do not allow user to mess with it */
+@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * This test looks nicer. Thanks to Pauline Middelink
+ 		 */
+-		if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
++		if ((oldflags & EXT4_IMMUTABLE_FL) ||
++			((flags ^ oldflags) & (EXT4_APPEND_FL |
++			EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE))
+ 				goto flags_out;
+ 		}
+diff -NurpP --minimal linux-3.7.10/fs/ext4/namei.c linux-3.7.10-vs2.3.5.6/fs/ext4/namei.c
+--- linux-3.7.10/fs/ext4/namei.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/namei.c	2013-02-05 01:14:43.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/buffer_head.h>
+ #include <linux/bio.h>
++#include <linux/vs_tag.h>
+ #include "ext4.h"
+ #include "ext4_jbd2.h"
+ 
+@@ -1232,6 +1233,7 @@ restart:
+ 					ll_rw_block(READ | REQ_META | REQ_PRIO,
+ 						    1, &bh);
+ 			}
++		dx_propagate_tag(nd, inode);
+ 		}
+ 		if ((bh = bh_use[ra_ptr++]) == NULL)
+ 			goto next;
+@@ -3052,6 +3054,7 @@ const struct inode_operations ext4_dir_i
+ #endif
+ 	.get_acl	= ext4_get_acl,
+ 	.fiemap         = ext4_fiemap,
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+ const struct inode_operations ext4_special_inode_operations = {
+diff -NurpP --minimal linux-3.7.10/fs/ext4/super.c linux-3.7.10-vs2.3.5.6/fs/ext4/super.c
+--- linux-3.7.10/fs/ext4/super.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/super.c	2013-02-05 01:15:45.000000000 +0000
+@@ -1222,7 +1222,7 @@ enum {
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
+-	Opt_max_dir_size_kb,
++	Opt_max_dir_size_kb, Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1302,6 +1302,9 @@ static const match_table_t tokens = {
+ 	{Opt_removed, "reservation"},	/* mount option from ext2/3 */
+ 	{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
+ 	{Opt_removed, "journal=%u"},	/* mount option from ext2/3 */
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1549,6 +1552,20 @@ static int handle_mount_opt(struct super
+ 			return -1;
+ 		*journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
+ 		return 1;
++#ifndef CONFIG_TAGGING_NONE
++	case Opt_tag:
++		set_opt(sb, TAGGED);
++		return 1;
++	case Opt_notag:
++		clear_opt(sb, TAGGED);
++		return 1;
++#endif
++#ifdef CONFIG_PROPAGATE
++	case Opt_tagid:
++		/* use args[0] */
++		set_opt(sb, TAGGED);
++		return 1;
++#endif
+ 	}
+ 
+ 	for (m = ext4_mount_opts; m->token != Opt_err; m++) {
+@@ -3456,6 +3473,9 @@ static int ext4_fill_super(struct super_
+ 			clear_opt(sb, DELALLOC);
+ 	}
+ 
++	if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -4620,6 +4640,14 @@ static int ext4_remount(struct super_blo
+ 	if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
+ 		ext4_abort(sb, "Abort forced by user");
+ 
++	if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT4-fs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/fcntl.c linux-3.7.10-vs2.3.5.6/fs/fcntl.c
+--- linux-3.7.10/fs/fcntl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/fcntl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/rcupdate.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/poll.h>
+ #include <asm/siginfo.h>
+@@ -378,6 +379,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
+ 
+ 	if (!f.file)
+ 		goto out;
++	if (!vx_files_avail(1))
++		goto out;
+ 
+ 	if (unlikely(f.file->f_mode & FMODE_PATH)) {
+ 		if (!check_fcntl_cmd(cmd))
+diff -NurpP --minimal linux-3.7.10/fs/file.c linux-3.7.10-vs2.3.5.6/fs/file.c
+--- linux-3.7.10/fs/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/rcupdate.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
+ 
+ struct fdtable_defer {
+ 	spinlock_t lock;
+@@ -364,6 +365,8 @@ struct files_struct *dup_fd(struct files
+ 		struct file *f = *old_fds++;
+ 		if (f) {
+ 			get_file(f);
++			/* TODO: 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
+@@ -429,9 +432,11 @@ static void close_files(struct files_str
+ 					filp_close(file, files);
+ 					cond_resched();
+ 				}
++				vx_openfd_dec(i);
+ 			}
+ 			i++;
+ 			set >>= 1;
++			cond_resched();
+ 		}
+ 	}
+ }
+@@ -573,6 +578,7 @@ repeat:
+ 	else
+ 		__clear_close_on_exec(fd, fdt);
+ 	error = fd;
++	vx_openfd_inc(fd);
+ #if 1
+ 	/* Sanity check */
+ 	if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
+@@ -603,6 +609,7 @@ static void __put_unused_fd(struct files
+ 	__clear_open_fd(fd, fdt);
+ 	if (fd < files->next_fd)
+ 		files->next_fd = fd;
++	vx_openfd_dec(fd);
+ }
+ 
+ void put_unused_fd(unsigned int fd)
+@@ -882,6 +889,8 @@ static int do_dup2(struct files_struct *
+ 
+ 	if (tofree)
+ 		filp_close(tofree, files);
++	else
++		vx_openfd_inc(fd);	/* fd was unused */
+ 
+ 	return fd;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/file_table.c linux-3.7.10-vs2.3.5.6/fs/file_table.c
+--- linux-3.7.10/fs/file_table.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/file_table.c	2013-01-16 00:19:03.000000000 +0000
+@@ -26,6 +26,8 @@
+ #include <linux/hardirq.h>
+ #include <linux/task_work.h>
+ #include <linux/ima.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
+ 
+ #include <linux/atomic.h>
+ 
+@@ -136,6 +138,8 @@ struct file *get_empty_filp(void)
+ 	spin_lock_init(&f->f_lock);
+ 	eventpoll_init_file(f);
+ 	/* f->f_version: 0 */
++	f->f_xid = vx_current_xid();
++	vx_files_inc(f);
+ 	return f;
+ 
+ over:
+@@ -257,6 +261,8 @@ static void __fput(struct file *file)
+ 		i_readcount_dec(inode);
+ 	if (file->f_mode & FMODE_WRITE)
+ 		drop_file_write_access(file);
++	vx_files_dec(file);
++	file->f_xid = 0;
+ 	file->f_path.dentry = NULL;
+ 	file->f_path.mnt = NULL;
+ 	file_free(file);
+@@ -343,6 +349,8 @@ void put_filp(struct file *file)
+ {
+ 	if (atomic_long_dec_and_test(&file->f_count)) {
+ 		security_file_free(file);
++		vx_files_dec(file);
++		file->f_xid = 0;
+ 		file_sb_list_del(file);
+ 		file_free(file);
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/fs_struct.c linux-3.7.10-vs2.3.5.6/fs/fs_struct.c
+--- linux-3.7.10/fs/fs_struct.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/fs_struct.c	2012-12-18 15:13:16.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/vserver/global.h>
+ #include "internal.h"
+ 
+ /*
+@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
+ {
+ 	path_put(&fs->root);
+ 	path_put(&fs->pwd);
++	atomic_dec(&vs_global_fs);
+ 	kmem_cache_free(fs_cachep, fs);
+ }
+ 
+@@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct
+ 		fs->pwd = old->pwd;
+ 		path_get(&fs->pwd);
+ 		spin_unlock(&old->lock);
++		atomic_inc(&vs_global_fs);
+ 	}
+ 	return fs;
+ }
+diff -NurpP --minimal linux-3.7.10/fs/gfs2/file.c linux-3.7.10-vs2.3.5.6/fs/gfs2/file.c
+--- linux-3.7.10/fs/gfs2/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/gfs2/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = {
+ 	[12] = GFS2_DIF_EXHASH,
+ 	[14] = GFS2_DIF_INHERIT_JDATA,
+ 	[17] = GFS2_DIF_TOPDIR,
++	[27] = GFS2_DIF_IXUNLINK,
++	[26] = GFS2_DIF_BARRIER,
++	[29] = GFS2_DIF_COW,
+ };
+ 
+ static const u32 gfs2_to_fsflags[32] = {
+@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = {
+ 	[gfs2fl_ExHash] = FS_INDEX_FL,
+ 	[gfs2fl_TopLevel] = FS_TOPDIR_FL,
+ 	[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
++	[gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
++	[gfs2fl_Barrier] = FS_BARRIER_FL,
++	[gfs2fl_Cow] = FS_COW_FL,
+ };
+ 
+ static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
+@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode *
+ {
+ 	struct gfs2_inode *ip = GFS2_I(inode);
+ 	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
+ 
+-	flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
+ 	if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
+ 		inode->i_flags |= S_NOSEC;
+ 	if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
+ 		flags |= S_IMMUTABLE;
++	if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
++		flags |= S_IXUNLINK;
++
+ 	if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
+ 		flags |= S_APPEND;
+ 	if (ip->i_diskflags & GFS2_DIF_NOATIME)
+@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode *
+ 	if (ip->i_diskflags & GFS2_DIF_SYNC)
+ 		flags |= S_SYNC;
+ 	inode->i_flags = flags;
++
++	vflags &= ~(V_BARRIER | V_COW);
++
++	if (ip->i_diskflags & GFS2_DIF_BARRIER)
++		vflags |= V_BARRIER;
++	if (ip->i_diskflags & GFS2_DIF_COW)
++		vflags |= V_COW;
++	inode->i_vflags = vflags;
++}
++
++void gfs2_get_inode_flags(struct inode *inode)
++{
++	struct gfs2_inode *ip = GFS2_I(inode);
++	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	ip->i_diskflags &= ~(GFS2_DIF_APPENDONLY |
++			GFS2_DIF_NOATIME | GFS2_DIF_SYNC |
++			GFS2_DIF_IMMUTABLE | GFS2_DIF_IXUNLINK |
++			GFS2_DIF_BARRIER | GFS2_DIF_COW);
++
++	if (flags & S_IMMUTABLE)
++		ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->i_diskflags |= GFS2_DIF_IXUNLINK;
++
++	if (flags & S_APPEND)
++		ip->i_diskflags |= GFS2_DIF_APPENDONLY;
++	if (flags & S_NOATIME)
++		ip->i_diskflags |= GFS2_DIF_NOATIME;
++	if (flags & S_SYNC)
++		ip->i_diskflags |= GFS2_DIF_SYNC;
++
++	if (vflags & V_BARRIER)
++		ip->i_diskflags |= GFS2_DIF_BARRIER;
++	if (vflags & V_COW)
++		ip->i_diskflags |= GFS2_DIF_COW;
+ }
+ 
+ /* Flags that can be set by user space */
+@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f
+ 	return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
+ }
+ 
++int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct gfs2_inode *ip = GFS2_I(inode);
++	struct gfs2_sbd *sdp = GFS2_SB(inode);
++	struct buffer_head *bh;
++	struct gfs2_holder gh;
++	int error;
++
++	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
++	if (error)
++		return error;
++	error = gfs2_trans_begin(sdp, RES_DINODE, 0);
++	if (error)
++		goto out;
++	error = gfs2_meta_inode_buffer(ip, &bh);
++	if (error)
++		goto out_trans_end;
++	gfs2_trans_add_bh(ip->i_gl, bh, 1);
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	gfs2_get_inode_flags(inode);
++	gfs2_dinode_out(ip, bh->b_data);
++	brelse(bh);
++	gfs2_set_aops(inode);
++out_trans_end:
++	gfs2_trans_end(sdp);
++out:
++	gfs2_glock_dq_uninit(&gh);
++	return error;
++}
++
+ static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	switch(cmd) {
+diff -NurpP --minimal linux-3.7.10/fs/gfs2/inode.h linux-3.7.10-vs2.3.5.6/fs/gfs2/inode.h
+--- linux-3.7.10/fs/gfs2/inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/gfs2/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
+ extern const struct file_operations gfs2_dir_fops_nolock;
+ 
+ extern void gfs2_set_inode_flags(struct inode *inode);
++extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
+  
+ #ifdef CONFIG_GFS2_FS_LOCKING_DLM
+ extern const struct file_operations gfs2_file_fops;
+diff -NurpP --minimal linux-3.7.10/fs/hostfs/hostfs.h linux-3.7.10-vs2.3.5.6/fs/hostfs/hostfs.h
+--- linux-3.7.10/fs/hostfs/hostfs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/hostfs/hostfs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -42,6 +42,7 @@ struct hostfs_iattr {
+ 	unsigned short	ia_mode;
+ 	uid_t		ia_uid;
+ 	gid_t		ia_gid;
++	tag_t		ia_tag;
+ 	loff_t		ia_size;
+ 	struct timespec	ia_atime;
+ 	struct timespec	ia_mtime;
+diff -NurpP --minimal linux-3.7.10/fs/inode.c linux-3.7.10-vs2.3.5.6/fs/inode.c
+--- linux-3.7.10/fs/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/prefetch.h>
+ #include <linux/buffer_head.h> /* for inode_has_buffers */
+ #include <linux/ratelimit.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
+ 
+ /*
+@@ -128,6 +129,8 @@ int inode_init_always(struct super_block
+ 	struct address_space *const mapping = &inode->i_data;
+ 
+ 	inode->i_sb = sb;
++
++	/* essential because of inode slab reuse */
+ 	inode->i_blkbits = sb->s_blocksize_bits;
+ 	inode->i_flags = 0;
+ 	atomic_set(&inode->i_count, 1);
+@@ -137,6 +140,7 @@ int inode_init_always(struct super_block
+ 	inode->i_opflags = 0;
+ 	i_uid_write(inode, 0);
+ 	i_gid_write(inode, 0);
++	i_tag_write(inode, 0);
+ 	atomic_set(&inode->i_writecount, 0);
+ 	inode->i_size = 0;
+ 	inode->i_blocks = 0;
+@@ -149,6 +153,7 @@ int inode_init_always(struct super_block
+ 	inode->i_bdev = NULL;
+ 	inode->i_cdev = NULL;
+ 	inode->i_rdev = 0;
++	inode->i_mdev = 0;
+ 	inode->dirtied_when = 0;
+ 
+ 	if (security_inode_alloc(inode))
+@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i
+ }
+ EXPORT_SYMBOL(__insert_inode_hash);
+ 
++EXPORT_SYMBOL_GPL(__iget);
++
+ /**
+  *	__remove_inode_hash - remove an inode from the hash
+  *	@inode: inode to unhash
+@@ -1804,9 +1811,11 @@ void init_special_inode(struct inode *in
+ 	if (S_ISCHR(mode)) {
+ 		inode->i_fop = &def_chr_fops;
+ 		inode->i_rdev = rdev;
++		inode->i_mdev = rdev;
+ 	} else if (S_ISBLK(mode)) {
+ 		inode->i_fop = &def_blk_fops;
+ 		inode->i_rdev = rdev;
++		inode->i_mdev = rdev;
+ 	} else if (S_ISFIFO(mode))
+ 		inode->i_fop = &def_fifo_fops;
+ 	else if (S_ISSOCK(mode))
+@@ -1835,6 +1844,7 @@ void inode_init_owner(struct inode *inod
+ 	} else
+ 		inode->i_gid = current_fsgid();
+ 	inode->i_mode = mode;
++	inode->i_tag = dx_current_fstag(inode->i_sb);
+ }
+ EXPORT_SYMBOL(inode_init_owner);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ioctl.c
+--- linux-3.7.10/fs/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,9 @@
+ #include <linux/writeback.h>
+ #include <linux/buffer_head.h>
+ #include <linux/falloc.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/ioctls.h>
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ioprio.c linux-3.7.10-vs2.3.5.6/fs/ioprio.c
+--- linux-3.7.10/fs/ioprio.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ioprio.c	2012-12-18 15:13:16.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/security.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_base.h>
+ 
+ int set_task_ioprio(struct task_struct *task, int ioprio)
+ {
+@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
+ 			else
+ 				pgrp = find_vpid(who);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				ret = set_task_ioprio(p, ioprio);
+ 				if (ret)
+ 					break;
+@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+ 			else
+ 				pgrp = find_vpid(who);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				tmpio = get_task_ioprio(p);
+ 				if (tmpio < 0)
+ 					continue;
+diff -NurpP --minimal linux-3.7.10/fs/jfs/file.c linux-3.7.10-vs2.3.5.6/fs/jfs/file.c
+--- linux-3.7.10/fs/jfs/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
+ 	if (is_quota_modification(inode, iattr))
+ 		dquot_initialize(inode);
+ 	if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
+-	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
++	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
++	    (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
+ 		rc = dquot_transfer(inode, iattr);
+ 		if (rc)
+ 			return rc;
+@@ -142,6 +143,7 @@ const struct inode_operations jfs_file_i
+ #ifdef CONFIG_JFS_POSIX_ACL
+ 	.get_acl	= jfs_get_acl,
+ #endif
++	.sync_flags	= jfs_sync_flags,
+ };
+ 
+ const struct file_operations jfs_file_operations = {
+diff -NurpP --minimal linux-3.7.10/fs/jfs/ioctl.c linux-3.7.10-vs2.3.5.6/fs/jfs/ioctl.c
+--- linux-3.7.10/fs/jfs/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -12,6 +12,7 @@
+ #include <linux/time.h>
+ #include <linux/sched.h>
+ #include <linux/blkdev.h>
++#include <linux/mount.h>
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+ 
+@@ -56,6 +57,16 @@ static long jfs_map_ext2(unsigned long f
+ }
+ 
+ 
++int jfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	jfs_get_inode_flags(JFS_IP(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++	mark_inode_dirty(inode);
++	return 0;
++}
++
+ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -89,6 +100,11 @@ long jfs_ioctl(struct file *filp, unsign
+ 		if (!S_ISDIR(inode->i_mode))
+ 			flags &= ~JFS_DIRSYNC_FL;
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		/* Is it quota file? Do not allow user to mess with it */
+ 		if (IS_NOQUOTA(inode)) {
+ 			err = -EPERM;
+@@ -106,8 +122,8 @@ long jfs_ioctl(struct file *filp, unsign
+ 		 * the relevant capability.
+ 		 */
+ 		if ((oldflags & JFS_IMMUTABLE_FL) ||
+-			((flags ^ oldflags) &
+-			(JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
++			((flags ^ oldflags) & (JFS_APPEND_FL |
++			JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				err = -EPERM;
+@@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign
+ 			}
+ 		}
+ 
+-		flags = flags & JFS_FL_USER_MODIFIABLE;
++		flags &= JFS_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
+ 		jfs_inode->mode2 = flags;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_dinode.h linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_dinode.h
+--- linux-3.7.10/fs/jfs/jfs_dinode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_dinode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -161,9 +161,13 @@ struct dinode {
+ 
+ #define JFS_APPEND_FL		0x01000000 /* writes to file may only append */
+ #define JFS_IMMUTABLE_FL	0x02000000 /* Immutable file */
++#define JFS_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ 
+-#define JFS_FL_USER_VISIBLE	0x03F80000
+-#define JFS_FL_USER_MODIFIABLE	0x03F80000
++#define JFS_BARRIER_FL		0x04000000 /* Barrier for chroot() */
++#define JFS_COW_FL		0x20000000 /* Copy on Write marker */
++
++#define JFS_FL_USER_VISIBLE	0x07F80000
++#define JFS_FL_USER_MODIFIABLE	0x07F80000
+ #define JFS_FL_INHERIT		0x03C80000
+ 
+ /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_filsys.h linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_filsys.h
+--- linux-3.7.10/fs/jfs/jfs_filsys.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_filsys.h	2012-12-18 15:13:16.000000000 +0000
+@@ -266,6 +266,7 @@
+ #define JFS_NAME_MAX	255
+ #define JFS_PATH_MAX	BPSIZE
+ 
++#define JFS_TAGGED		0x00800000	/* Context Tagging */
+ 
+ /*
+  *	file system state (superblock state)
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_imap.c linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_imap.c
+--- linux-3.7.10/fs/jfs/jfs_imap.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_imap.c	2012-12-18 15:13:16.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+ 
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod
+ {
+ 	struct jfs_inode_info *jfs_ip = JFS_IP(ip);
+ 	struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
++	kuid_t uid;
++	kgid_t gid;
+ 
+ 	jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
+ 	jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
+@@ -3078,14 +3081,19 @@ static int copy_from_dinode(struct dinod
+ 	}
+ 	set_nlink(ip, le32_to_cpu(dip->di_nlink));
+ 
+-	jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid));
++	uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid));
++	gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid));
++	ip->i_tag = make_ktag(&init_user_ns,
++		INOTAG_TAG(DX_TAG(ip), uid, gid, 0));
++
++	jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid);
+ 	if (!uid_valid(sbi->uid))
+ 		ip->i_uid = jfs_ip->saved_uid;
+ 	else {
+ 		ip->i_uid = sbi->uid;
+ 	}
+ 
+-	jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid));
++	jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid);
+ 	if (!gid_valid(sbi->gid))
+ 		ip->i_gid = jfs_ip->saved_gid;
+ 	else {
+@@ -3150,16 +3158,14 @@ 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);
+-	if (!uid_valid(sbi->uid))
+-		dip->di_uid = cpu_to_le32(i_uid_read(ip));
+-	else
+-		dip->di_uid =cpu_to_le32(from_kuid(&init_user_ns,
+-						   jfs_ip->saved_uid));
+-	if (!gid_valid(sbi->gid))
+-		dip->di_gid = cpu_to_le32(i_gid_read(ip));
+-	else
+-		dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns,
+-						    jfs_ip->saved_gid));
++	dip->di_uid = cpu_to_le32(from_kuid(&init_user_ns,
++		TAGINO_UID(DX_TAG(ip),
++		!uid_valid(sbi->uid) ? ip->i_uid : jfs_ip->saved_uid,
++		ip->i_tag)));
++	dip->di_gid = cpu_to_le32(from_kuid(&init_user_ns,
++		TAGINO_GID(DX_TAG(ip),
++		!gid_valid(sbi->gid) ? ip->i_gid : jfs_ip->saved_gid,
++		ip->i_tag)));
+ 	jfs_get_inode_flags(jfs_ip);
+ 	/*
+ 	 * mode2 is only needed for storing the higher order bits.
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_inode.c linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.c
+--- linux-3.7.10/fs/jfs/jfs_inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -18,6 +18,7 @@
+ 
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+ #include "jfs_filsys.h"
+@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i
+ {
+ 	unsigned int flags = JFS_IP(inode)->mode2;
+ 
+-	inode->i_flags &= ~(S_IMMUTABLE | S_APPEND |
+-		S_NOATIME | S_DIRSYNC | S_SYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+ 	if (flags & JFS_IMMUTABLE_FL)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (flags & JFS_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
++	if (flags & JFS_SYNC_FL)
++		inode->i_flags |= S_SYNC;
+ 	if (flags & JFS_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+ 	if (flags & JFS_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & JFS_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
+-	if (flags & JFS_SYNC_FL)
+-		inode->i_flags |= S_SYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & JFS_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & JFS_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
+ {
+ 	unsigned int flags = jfs_ip->vfs_inode.i_flags;
++	unsigned int vflags = jfs_ip->vfs_inode.i_vflags;
++
++	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL |
++			   JFS_APPEND_FL | JFS_NOATIME_FL |
++			   JFS_DIRSYNC_FL | JFS_SYNC_FL |
++			   JFS_BARRIER_FL | JFS_COW_FL);
+ 
+-	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |
+-			   JFS_DIRSYNC_FL | JFS_SYNC_FL);
+ 	if (flags & S_IMMUTABLE)
+ 		jfs_ip->mode2 |= JFS_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		jfs_ip->mode2 |= JFS_IXUNLINK_FL;
++
+ 	if (flags & S_APPEND)
+ 		jfs_ip->mode2 |= JFS_APPEND_FL;
+ 	if (flags & S_NOATIME)
+@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod
+ 		jfs_ip->mode2 |= JFS_DIRSYNC_FL;
+ 	if (flags & S_SYNC)
+ 		jfs_ip->mode2 |= JFS_SYNC_FL;
++
++	if (vflags & V_BARRIER)
++		jfs_ip->mode2 |= JFS_BARRIER_FL;
++	if (vflags & V_COW)
++		jfs_ip->mode2 |= JFS_COW_FL;
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_inode.h linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.h
+--- linux-3.7.10/fs/jfs/jfs_inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
+ extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
+ 	int fh_len, int fh_type);
+ extern void jfs_set_inode_flags(struct inode *);
++extern int jfs_sync_flags(struct inode *, int, int);
+ extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
+ extern int jfs_setattr(struct dentry *, struct iattr *);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/jfs/namei.c linux-3.7.10-vs2.3.5.6/fs/jfs/namei.c
+--- linux-3.7.10/fs/jfs/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/ctype.h>
+ #include <linux/quotaops.h>
+ #include <linux/exportfs.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_inode.h"
+@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
+ 			jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
+ 	}
+ 
++	dx_propagate_tag(nd, ip);
+ 	return d_splice_alias(ip, dentry);
+ }
+ 
+@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in
+ #ifdef CONFIG_JFS_POSIX_ACL
+ 	.get_acl	= jfs_get_acl,
+ #endif
++	.sync_flags	= jfs_sync_flags,
+ };
+ 
+ const struct file_operations jfs_dir_operations = {
+diff -NurpP --minimal linux-3.7.10/fs/jfs/super.c linux-3.7.10-vs2.3.5.6/fs/jfs/super.c
+--- linux-3.7.10/fs/jfs/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -199,7 +199,8 @@ enum {
+ 	Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
+ 	Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
+ 	Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
+-	Opt_discard, Opt_nodiscard, Opt_discard_minblk
++	Opt_discard, Opt_nodiscard, Opt_discard_minblk,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -209,6 +210,10 @@ static const match_table_t tokens = {
+ 	{Opt_resize, "resize=%u"},
+ 	{Opt_resize_nosize, "resize"},
+ 	{Opt_errors, "errors=%s"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
++	{Opt_tag, "tagxid"},
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_ignore, "quota"},
+ 	{Opt_usrquota, "usrquota"},
+@@ -385,7 +390,20 @@ static int parse_options(char *options,
+ 			}
+ 			break;
+ 		}
+-
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			*flag |= JFS_TAGGED;
++			break;
++		case Opt_notag:
++			*flag &= JFS_TAGGED;
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			*flag |= JFS_TAGGED;
++			break;
++#endif
+ 		default:
+ 			printk("jfs: Unrecognized mount option \"%s\" "
+ 					" or missing value\n", p);
+@@ -417,6 +435,12 @@ static int jfs_remount(struct super_bloc
+ 		return -EINVAL;
+ 	}
+ 
++	if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++		printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		return -EINVAL;
++	}
++
+ 	if (newLVSize) {
+ 		if (sb->s_flags & MS_RDONLY) {
+ 			pr_err("JFS: resize requires volume" \
+@@ -502,6 +526,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_TAGGED)
++		sb->s_flags |= MS_TAGGED;
+ 
+ 	if (newLVSize) {
+ 		pr_err("resize option for remount only\n");
+diff -NurpP --minimal linux-3.7.10/fs/libfs.c linux-3.7.10-vs2.3.5.6/fs/libfs.c
+--- linux-3.7.10/fs/libfs.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/libfs.c	2012-12-18 15:13:16.000000000 +0000
+@@ -135,7 +135,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_path.dentry;
+ 	struct dentry *cursor = filp->private_data;
+@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v
+ 			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
+ 				struct dentry *next;
+ 				next = list_entry(p, struct dentry, d_u.d_child);
++				if (filter && !filter(next))
++					continue;
+ 				spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
+ 				if (!simple_positive(next)) {
+ 					spin_unlock(&next->d_lock);
+@@ -192,6 +195,17 @@ 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;
+@@ -983,6 +997,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(mount_pseudo);
+ EXPORT_SYMBOL(simple_write_begin);
+diff -NurpP --minimal linux-3.7.10/fs/locks.c linux-3.7.10-vs2.3.5.6/fs/locks.c
+--- linux-3.7.10/fs/locks.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/locks.c	2012-12-18 15:13:16.000000000 +0000
+@@ -126,6 +126,8 @@
+ #include <linux/time.h>
+ #include <linux/rcupdate.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct
+ /* Allocate an empty lock structure. */
+ struct file_lock *locks_alloc_lock(void)
+ {
+-	struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++	struct file_lock *fl;
+ 
+-	if (fl)
+-		locks_init_lock_heads(fl);
++	if (!vx_locks_avail(1))
++		return NULL;
+ 
++	fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++
++	if (fl) {
++		locks_init_lock_heads(fl);
++		fl->fl_xid = -1;
++	}
+ 	return fl;
+ }
+ EXPORT_SYMBOL_GPL(locks_alloc_lock);
+@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f
+ 	BUG_ON(!list_empty(&fl->fl_block));
+ 	BUG_ON(!list_empty(&fl->fl_link));
+ 
++	vx_locks_dec(fl);
+ 	locks_release_private(fl);
+ 	kmem_cache_free(filelock_cache, fl);
+ }
+@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f
+ {
+ 	memset(fl, 0, sizeof(struct file_lock));
+ 	locks_init_lock_heads(fl);
++	fl->fl_xid = -1;
+ }
+ 
+ EXPORT_SYMBOL(locks_init_lock);
+@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n
+ 	new->fl_file = fl->fl_file;
+ 	new->fl_ops = fl->fl_ops;
+ 	new->fl_lmops = fl->fl_lmops;
++	new->fl_xid = fl->fl_xid;
+ 
+ 	locks_copy_private(new, fl);
+ }
+@@ -299,6 +310,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;
+@@ -438,6 +454,7 @@ static int lease_init(struct file *filp,
+ 
+ 	fl->fl_owner = current->files;
+ 	fl->fl_pid = current->tgid;
++	fl->fl_xid = vx_current_xid();
+ 
+ 	fl->fl_file = filp;
+ 	fl->fl_flags = FL_LEASE;
+@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str
+ 	if (fl == NULL)
+ 		return ERR_PTR(error);
+ 
++	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) {
+ 		locks_free_lock(fl);
+@@ -753,6 +775,7 @@ static int flock_lock_file(struct file *
+ 		lock_flocks();
+ 	}
+ 
++	new_fl->fl_xid = -1;
+ find_conflict:
+ 	for_each_lock(inode, before) {
+ 		struct file_lock *fl = *before;
+@@ -773,6 +796,7 @@ find_conflict:
+ 		goto out;
+ 	locks_copy_lock(new_fl, request);
+ 	locks_insert_lock(before, new_fl);
++	vx_locks_inc(new_fl);
+ 	new_fl = NULL;
+ 	error = 0;
+ 
+@@ -783,7 +807,8 @@ out:
+ 	return error;
+ }
+ 
+-static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
++static int __posix_lock_file(struct inode *inode, struct file_lock *request,
++	struct file_lock *conflock, xid_t xid)
+ {
+ 	struct file_lock *fl;
+ 	struct file_lock *new_fl = NULL;
+@@ -793,6 +818,8 @@ 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.
+@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod
+ 	    (request->fl_type != F_UNLCK ||
+ 	     request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
+ 		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_flocks();
+@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod
+ int posix_lock_file(struct file *filp, struct file_lock *fl,
+ 			struct file_lock *conflock)
+ {
+-	return __posix_lock_file(filp->f_path.dentry->d_inode, fl, conflock);
++	return __posix_lock_file(filp->f_path.dentry->d_inode,
++		fl, conflock, filp->f_xid);
+ }
+ EXPORT_SYMBOL(posix_lock_file);
+ 
+@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write,
+ 	fl.fl_end = offset + count - 1;
+ 
+ 	for (;;) {
+-		error = __posix_lock_file(inode, &fl, NULL);
++		error = __posix_lock_file(inode, &fl, NULL, filp->f_xid);
+ 		if (error != FILE_LOCK_DEFERRED)
+ 			break;
+ 		error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
+@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp,
+ 		goto out;
+ 
+ 	locks_insert_lock(before, lease);
++	vx_locks_inc(lease);
+ 	return 0;
+ 
+ out:
+@@ -1836,6 +1869,11 @@ int fcntl_setlk(unsigned int fd, struct
+ 	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.
+ 	 */
+@@ -1954,6 +1992,11 @@ int fcntl_setlk64(unsigned int fd, struc
+ 	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.
+ 	 */
+@@ -2219,8 +2262,11 @@ static int locks_show(struct seq_file *f
+ 
+ 	lock_get_status(f, fl, *((loff_t *)f->private), "");
+ 
+-	list_for_each_entry(bfl, &fl->fl_block, fl_block)
++	list_for_each_entry(bfl, &fl->fl_block, fl_block) {
++		if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		lock_get_status(f, bfl, *((loff_t *)f->private), " ->");
++	}
+ 
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/fs/mount.h linux-3.7.10-vs2.3.5.6/fs/mount.h
+--- linux-3.7.10/fs/mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -46,6 +46,7 @@ struct mount {
+ 	int mnt_expiry_mark;		/* true if marked for expiry */
+ 	int mnt_pinned;
+ 	int mnt_ghosts;
++	tag_t mnt_tag;			/* tagging used for vfsmount */
+ };
+ 
+ #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
+diff -NurpP --minimal linux-3.7.10/fs/namei.c linux-3.7.10-vs2.3.5.6/fs/namei.c
+--- linux-3.7.10/fs/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -34,6 +34,14 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/fs_struct.h>
+ #include <linux/posix_acl.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vs_device.h>
++#include <linux/vs_context.h>
++#include <linux/pid_namespace.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+@@ -266,6 +274,89 @@ static int check_acl(struct inode *inode
+ 	return -EAGAIN;
+ }
+ 
++static inline int dx_barrier(const struct inode *inode)
++{
++	if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
++		vxwprintk_task(1, "did hit the barrier.");
++		return 1;
++	}
++	return 0;
++}
++
++static int __dx_permission(const struct inode *inode, int mask)
++{
++	if (dx_barrier(inode))
++		return -EACCES;
++
++	if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
++		/* devpts is xid tagged */
++		if (S_ISDIR(inode->i_mode) ||
++		    vx_check((xid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P))
++			return 0;
++
++		/* just pretend we didn't find anything */
++		return -ENOENT;
++	}
++	else 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 out;
++
++		if ((mask & (MAY_WRITE | MAY_APPEND))) {
++			struct pid *pid;
++			struct task_struct *tsk;
++
++			if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
++			    vx_flags(VXF_STATE_SETUP, 0))
++				return 0;
++
++			pid = PROC_I(inode)->pid;
++			if (!pid)
++				goto out;
++
++			rcu_read_lock();
++			tsk = pid_task(pid, PIDTYPE_PID);
++			vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]",
++				  tsk, (tsk ? vx_task_xid(tsk) : 0));
++			if (tsk &&
++				vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) {
++				rcu_read_unlock();
++				return 0;
++			}
++			rcu_read_unlock();
++		}
++		else {
++			/* FIXME: Should we block some entries here? */
++			return 0;
++		}
++	}
++	else {
++		if (dx_notagcheck(inode->i_sb) ||
++		    dx_check((xid_t)i_tag_read(inode),
++			DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT))
++			return 0;
++	}
++
++out:
++	return -EACCES;
++}
++
++int dx_permission(const struct inode *inode, int mask)
++{
++	int ret = __dx_permission(inode, mask);
++	if (unlikely(ret)) {
++#ifndef	CONFIG_VSERVER_WARN_DEVPTS
++		if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC)
++#endif
++		    vxwprintk_task(1,
++			"denied [0x%x] access to inode %s:%p[#%d,%lu]",
++			mask, inode->i_sb->s_id, inode, inode->i_tag,
++			inode->i_ino);
++	}
++	return ret;
++}
++
+ /*
+  * This does the basic permission checking
+  */
+@@ -388,10 +479,14 @@ int __inode_permission(struct inode *ino
+ 		/*
+ 		 * Nobody gets write access to an immutable file.
+ 		 */
+-		if (IS_IMMUTABLE(inode))
++		if (IS_IMMUTABLE(inode) && !IS_COW(inode))
+ 			return -EACCES;
+ 	}
+ 
++	retval = dx_permission(inode, mask);
++	if (retval)
++		return retval;
++
+ 	retval = do_inode_permission(inode, mask);
+ 	if (retval)
+ 		return retval;
+@@ -1244,7 +1339,8 @@ static void follow_dotdot(struct nameida
+ 
+ 		if (nd->path.dentry == nd->root.dentry &&
+ 		    nd->path.mnt == nd->root.mnt) {
+-			break;
++			/* for sane '/' avoid follow_mount() */
++			return;
+ 		}
+ 		if (nd->path.dentry != nd->path.mnt->mnt_root) {
+ 			/* rare case of legitimate dget_parent()... */
+@@ -1393,6 +1489,9 @@ static int lookup_fast(struct nameidata
+ 				goto unlazy;
+ 			}
+ 		}
++
++		/* FIXME: check dx permission */
++
+ 		path->mnt = mnt;
+ 		path->dentry = dentry;
+ 		if (unlikely(!__follow_mount_rcu(nd, path, inode)))
+@@ -1428,6 +1527,8 @@ unlazy:
+ 		}
+ 	}
+ 
++	/* FIXME: check dx permission */
++
+ 	path->mnt = mnt;
+ 	path->dentry = dentry;
+ 	err = follow_managed(path, nd->flags);
+@@ -2258,7 +2359,7 @@ static int may_delete(struct inode *dir,
+ 	if (IS_APPEND(dir))
+ 		return -EPERM;
+ 	if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
+-	    IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
++		IS_IXORUNLINK(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
+ 		return -EPERM;
+ 	if (isdir) {
+ 		if (!S_ISDIR(victim->d_inode->i_mode))
+@@ -2337,19 +2438,25 @@ int vfs_create(struct inode *dir, struct
+ 		bool want_excl)
+ {
+ 	int error = may_create(dir, dentry);
+-	if (error)
++	if (error) {
++		vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
+ 		return error;
++	}
+ 
+ 	if (!dir->i_op->create)
+ 		return -EACCES;	/* shouldn't it be ENOSYS? */
+ 	mode &= S_IALLUGO;
+ 	mode |= S_IFREG;
+ 	error = security_inode_create(dir, dentry, mode);
+-	if (error)
++	if (error) {
++		vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
+ 		return error;
++	}
+ 	error = dir->i_op->create(dir, dentry, mode, want_excl);
+ 	if (!error)
+ 		fsnotify_create(dir, dentry);
++	else
++		vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error);
+ 	return error;
+ }
+ 
+@@ -2384,6 +2491,15 @@ static int may_open(struct path *path, i
+ 		break;
+ 	}
+ 
++#ifdef	CONFIG_VSERVER_COWBL
++	if (IS_COW(inode) &&
++		((flag & O_ACCMODE) != O_RDONLY)) {
++		if (IS_COW_LINK(inode))
++			return -EMLINK;
++		inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
++		mark_inode_dirty(inode);
++	}
++#endif
+ 	error = inode_permission(inode, acc_mode);
+ 	if (error)
+ 		return error;
+@@ -2886,6 +3002,16 @@ finish_open:
+ 	}
+ finish_open_created:
+ 	error = may_open(&nd->path, acc_mode, open_flag);
++#ifdef	CONFIG_VSERVER_COWBL
++	if (error == -EMLINK) {
++		struct dentry *dentry;
++		dentry = cow_break_link(name->name);
++		if (IS_ERR(dentry))
++			error = PTR_ERR(dentry);
++		else
++			dput(dentry);
++	}
++#endif
+ 	if (error)
+ 		goto out;
+ 	file->f_path.mnt = nd->path.mnt;
+@@ -2950,6 +3076,7 @@ static struct file *path_openat(int dfd,
+ 	int opened = 0;
+ 	int error;
+ 
++restart:
+ 	file = get_empty_filp();
+ 	if (!file)
+ 		return ERR_PTR(-ENFILE);
+@@ -2986,6 +3113,16 @@ static struct file *path_openat(int dfd,
+ 		error = do_last(nd, &path, file, op, &opened, pathname);
+ 		put_link(nd, &link, cookie);
+ 	}
++
++#ifdef	CONFIG_VSERVER_COWBL
++	if (error == -EMLINK) {
++		if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
++			path_put(&nd->root);
++		if (base)
++			fput(base);
++		goto restart;
++	}
++#endif
+ out:
+ 	if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
+ 		path_put(&nd->root);
+@@ -3090,6 +3227,11 @@ struct dentry *kern_path_create(int dfd,
+ 		goto fail;
+ 	}
+ 	*path = nd.path;
++	vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
++		path->dentry, path->dentry->d_name.len,
++		path->dentry->d_name.name, dentry,
++		dentry->d_name.len, dentry->d_name.name,
++		path->dentry->d_inode);
+ 	return dentry;
+ fail:
+ 	dput(dentry);
+@@ -3556,7 +3698,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->link)
+ 		return -EPERM;
+@@ -3945,6 +4087,275 @@ int vfs_follow_link(struct nameidata *nd
+ 	return __vfs_follow_link(nd, link);
+ }
+ 
++
++#ifdef	CONFIG_VSERVER_COWBL
++
++static inline
++long do_cow_splice(struct file *in, struct file *out, size_t len)
++{
++	loff_t ppos = 0;
++
++	return do_splice_direct(in, &ppos, out, len, 0);
++}
++
++struct dentry *cow_break_link(const char *pathname)
++{
++	int ret, mode, pathlen, redo = 0;
++	struct nameidata old_nd, dir_nd;
++	struct path dir_path, *old_path, *new_path;
++	struct dentry *dir, *old_dentry, *new_dentry = NULL;
++	struct file *old_file;
++	struct file *new_file;
++	char *to, *path, pad='\251';
++	loff_t size;
++
++	vxdprintk(VXD_CBIT(misc, 1),
++		"cow_break_link(" VS_Q("%s") ")", pathname);
++
++	path = kmalloc(PATH_MAX, GFP_KERNEL);
++	ret = -ENOMEM;
++	if (!path)
++		goto out;
++
++	/* old_nd.path will have refs to dentry and mnt */
++	ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"do_path_lookup(old): %d", ret);
++	if (ret < 0)
++		goto out_free_path;
++
++	/* dentry/mnt refs handed over to old_path */
++	old_path = &old_nd.path;
++	/* no explicit reference for old_dentry here */
++	old_dentry = old_path->dentry;
++
++	mode = old_dentry->d_inode->i_mode;
++	to = d_path(old_path, path, PATH_MAX-2);
++	pathlen = strlen(to);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to,
++		old_dentry,
++		old_dentry->d_name.len, old_dentry->d_name.name,
++		old_dentry->d_name.len);
++
++	to[pathlen + 1] = 0;
++retry:
++	new_dentry = NULL;
++	to[pathlen] = pad--;
++	ret = -ELOOP;
++	if (pad <= '\240')
++		goto out_rel_old;
++
++	vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
++
++	/* dir_nd.path will have refs to dentry and mnt */
++	ret = do_path_lookup(AT_FDCWD, to,
++		LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
++	vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret);
++	if (ret < 0)
++		goto retry;
++
++	/* this puppy downs the dir inode mutex if successful.
++	   dir_path will hold refs to dentry and mnt and
++	   we'll have get write access to the mnt */
++	new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0);
++	if (!new_dentry || IS_ERR(new_dentry)) {
++		path_put(&dir_nd.path);
++		vxdprintk(VXD_CBIT(misc, 2),
++			"kern_path_create(new) failed with %ld",
++			PTR_ERR(new_dentry));
++		goto retry;
++	}
++	vxdprintk(VXD_CBIT(misc, 2),
++		"kern_path_create(new): %p [" VS_Q("%.*s") ":%d]",
++		new_dentry,
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len);
++
++	/* take a reference on new_dentry */
++	dget(new_dentry);
++
++	/* dentry/mnt refs handed over to new_path */
++	new_path = &dir_path;
++
++	/* dentry for old/new dir */
++	dir = dir_nd.path.dentry;
++
++	/* give up reference on dir */
++	dput(new_path->dentry);
++
++	/* new_dentry already has a reference */
++	new_path->dentry = new_dentry;
++
++	ret = vfs_create(dir->d_inode, new_dentry, mode, 1);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"vfs_create(new): %d", ret);
++	if (ret == -EEXIST) {
++		mutex_unlock(&dir->d_inode->i_mutex);
++		path_put(&dir_nd.path);
++		mnt_drop_write(new_path->mnt);
++		path_put(new_path);
++		new_dentry = NULL;
++		goto retry;
++	}
++	else if (ret < 0)
++		goto out_unlock_new;
++
++	/* drop out early, ret passes ENOENT */
++	ret = -ENOENT;
++	if ((redo = d_unhashed(old_dentry)))
++		goto out_unlock_new;
++
++	/* doesn't change refs for old_path */
++	old_file = dentry_open(old_path, O_RDONLY, current_cred());
++	vxdprintk(VXD_CBIT(misc, 2),
++		"dentry_open(old): %p", old_file);
++	if (IS_ERR(old_file)) {
++		ret = PTR_ERR(old_file);
++		goto out_unlock_new;
++	}
++
++	/* doesn't change refs for new_path */
++	new_file = dentry_open(new_path, O_WRONLY, current_cred());
++	vxdprintk(VXD_CBIT(misc, 2),
++		"dentry_open(new): %p", new_file);
++	if (IS_ERR(new_file)) {
++		ret = PTR_ERR(new_file);
++		goto out_fput_old;
++	}
++
++	size = i_size_read(old_file->f_dentry->d_inode);
++	ret = do_cow_splice(old_file, new_file, size);
++	vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
++	if (ret < 0) {
++		goto out_fput_both;
++	} else if (ret < size) {
++		ret = -ENOSPC;
++		goto out_fput_both;
++	} else {
++		struct inode *old_inode = old_dentry->d_inode;
++		struct inode *new_inode = new_dentry->d_inode;
++		struct iattr attr = {
++			.ia_uid = old_inode->i_uid,
++			.ia_gid = old_inode->i_gid,
++			.ia_valid = ATTR_UID | ATTR_GID
++			};
++
++		setattr_copy(new_inode, &attr);
++		mark_inode_dirty(new_inode);
++	}
++
++	/* lock rename mutex */
++	mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++	/* drop out late */
++	ret = -ENOENT;
++	if ((redo = d_unhashed(old_dentry)))
++		goto out_unlock;
++
++	vxdprintk(VXD_CBIT(misc, 2),
++		"vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]",
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len,
++		old_dentry->d_name.len, old_dentry->d_name.name,
++		old_dentry->d_name.len);
++	ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry,
++		old_dentry->d_parent->d_inode, old_dentry);
++	vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
++
++out_unlock:
++	mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++out_fput_both:
++	vxdprintk(VXD_CBIT(misc, 3),
++		"fput(new_file=%p[#%ld])", new_file,
++		atomic_long_read(&new_file->f_count));
++	fput(new_file);
++
++out_fput_old:
++	vxdprintk(VXD_CBIT(misc, 3),
++		"fput(old_file=%p[#%ld])", old_file,
++		atomic_long_read(&old_file->f_count));
++	fput(old_file);
++
++out_unlock_new:
++	/* drop references from dir_nd.path */
++	path_put(&dir_nd.path);
++
++	/* drop write access to mnt */
++	mnt_drop_write(new_path->mnt);
++
++	/* unlock the inode mutex from kern_path_create() */
++	mutex_unlock(&dir->d_inode->i_mutex);
++	if (!ret)
++		goto out_redo;
++
++	/* error path cleanup */
++	vfs_unlink(dir->d_inode, new_dentry);
++
++out_redo:
++	if (!redo)
++		goto out_rel_both;
++
++	/* lookup dentry once again
++	   old_nd.path will be freed as old_path in out_rel_old */
++	ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++	if (ret)
++		goto out_rel_both;
++
++	/* drop reference on new_dentry */
++	dput(new_dentry);
++	new_dentry = old_path->dentry;
++	dget(new_dentry);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
++		new_dentry,
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len);
++
++out_rel_both:
++	if (new_path)
++		path_put(new_path);
++out_rel_old:
++	path_put(old_path);
++out_free_path:
++	kfree(path);
++out:
++	if (ret) {
++		dput(new_dentry);
++		new_dentry = ERR_PTR(ret);
++	}
++	vxdprintk(VXD_CBIT(misc, 3),
++		"cow_break_link returning with %p", new_dentry);
++	return new_dentry;
++}
++
++#endif
++
++int	vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer)
++{
++	struct path path;
++	struct vfsmount *vmnt;
++	char *pstr, *root;
++	int length = 0;
++
++	pstr = kmalloc(PATH_MAX, GFP_KERNEL);
++	if (!pstr)
++		return 0;
++
++	vmnt = &ns->root->mnt;
++	path.mnt = vmnt;
++	path.dentry = vmnt->mnt_root;
++	root = d_path(&path, pstr, PATH_MAX - 2);
++	length = sprintf(buffer + length,
++		"Namespace:\t%p [#%u]\n"
++		"RootPath:\t%s\n",
++		ns, atomic_read(&ns->count),
++		root);
++	kfree(pstr);
++	return length;
++}
++
+ /* get the link contents into pagecache */
+ static char *page_getlink(struct dentry * dentry, struct page **ppage)
+ {
+@@ -4068,3 +4479,4 @@ EXPORT_SYMBOL(vfs_symlink);
+ EXPORT_SYMBOL(vfs_unlink);
+ EXPORT_SYMBOL(dentry_unhash);
+ EXPORT_SYMBOL(generic_readlink);
++EXPORT_SYMBOL(vx_info_mnt_namespace);
+diff -NurpP --minimal linux-3.7.10/fs/namespace.c linux-3.7.10-vs2.3.5.6/fs/namespace.c
+--- linux-3.7.10/fs/namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,6 +20,11 @@
+ #include <linux/fs_struct.h>	/* get_fs_root et.al. */
+ #include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_context.h>
++#include <linux/vs_tag.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/global.h>
+ #include "pnode.h"
+ #include "internal.h"
+ 
+@@ -749,6 +754,10 @@ vfs_kern_mount(struct file_system_type *
+ 	if (!type)
+ 		return ERR_PTR(-ENODEV);
+ 
++	if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++		!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
++		return ERR_PTR(-EPERM);
++
+ 	mnt = alloc_vfsmnt(name);
+ 	if (!mnt)
+ 		return ERR_PTR(-ENOMEM);
+@@ -801,6 +810,7 @@ static struct mount *clone_mnt(struct mo
+ 	mnt->mnt.mnt_root = dget(root);
+ 	mnt->mnt_mountpoint = mnt->mnt.mnt_root;
+ 	mnt->mnt_parent = mnt;
++		mnt->mnt_tag = old->mnt_tag;
+ 	br_write_lock(&vfsmount_lock);
+ 	list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
+ 	br_write_unlock(&vfsmount_lock);
+@@ -1266,7 +1276,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+ 		goto dput_and_out;
+ 
+ 	retval = -EPERM;
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		goto dput_and_out;
+ 
+ 	retval = do_umount(mnt, flags);
+@@ -1292,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+ 
+ static int mount_is_safe(struct path *path)
+ {
+-	if (capable(CAP_SYS_ADMIN))
++	if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return 0;
+ 	return -EPERM;
+ #ifdef notyet
+@@ -1610,7 +1620,7 @@ static int do_change_type(struct path *p
+ 	int type;
+ 	int err = 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE))
+ 		return -EPERM;
+ 
+ 	if (path->dentry != path->mnt->mnt_root)
+@@ -1626,6 +1636,7 @@ static int do_change_type(struct path *p
+ 		if (err)
+ 			goto out_unlock;
+ 	}
++	// mnt->mnt_flags = mnt_flags;
+ 
+ 	br_write_lock(&vfsmount_lock);
+ 	for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
+@@ -1641,12 +1652,14 @@ static int do_change_type(struct path *p
+  * do loopback mount.
+  */
+ static int do_loopback(struct path *path, const char *old_name,
+-				int recurse)
++	tag_t tag, unsigned long flags, int mnt_flags)
+ {
+ 	LIST_HEAD(umount_list);
+ 	struct path old_path;
+ 	struct mount *mnt = NULL, *old;
+ 	int err = mount_is_safe(path);
++	int recurse = flags & MS_REC;
++
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+@@ -1715,13 +1728,13 @@ static int change_mount_flags(struct vfs
+  * on it - tough luck.
+  */
+ static int do_remount(struct path *path, int flags, int mnt_flags,
+-		      void *data)
++	void *data, xid_t xid)
+ {
+ 	int err;
+ 	struct super_block *sb = path->mnt->mnt_sb;
+ 	struct mount *mnt = real_mount(path->mnt);
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
+ 		return -EPERM;
+ 
+ 	if (!check_mnt(mnt))
+@@ -1770,7 +1783,7 @@ static int do_move_mount(struct path *pa
+ 	struct mount *p;
+ 	struct mount *old;
+ 	int err = 0;
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return -EPERM;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+@@ -1927,7 +1940,7 @@ static int do_new_mount(struct path *pat
+ 		return -EINVAL;
+ 
+ 	/* we need capabilities... */
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return -EPERM;
+ 
+ 	mnt = do_kern_mount(type, flags, name, data);
+@@ -2197,6 +2210,7 @@ long do_mount(const char *dev_name, cons
+ 	struct path path;
+ 	int retval = 0;
+ 	int mnt_flags = 0;
++	tag_t tag = 0;
+ 
+ 	/* Discard magic */
+ 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+@@ -2224,6 +2238,12 @@ long do_mount(const char *dev_name, cons
+ 	if (!(flags & MS_NOATIME))
+ 		mnt_flags |= MNT_RELATIME;
+ 
++	if (dx_parse_tag(data_page, &tag, 1, &mnt_flags, &flags)) {
++		/* FIXME: bind and re-mounts get the tag flag? */
++		if (flags & (MS_BIND|MS_REMOUNT))
++			flags |= MS_TAGID;
++	}
++
+ 	/* Separate the per-mountpoint flags */
+ 	if (flags & MS_NOSUID)
+ 		mnt_flags |= MNT_NOSUID;
+@@ -2240,15 +2260,17 @@ long do_mount(const char *dev_name, cons
+ 	if (flags & MS_RDONLY)
+ 		mnt_flags |= MNT_READONLY;
+ 
++	if (!capable(CAP_SYS_ADMIN))
++		mnt_flags |= MNT_NODEV;
+ 	flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN |
+ 		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
+ 		   MS_STRICTATIME);
+ 
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
+-				    data_page);
++				    data_page, tag);
+ 	else if (flags & MS_BIND)
+-		retval = do_loopback(&path, dev_name, flags & MS_REC);
++		retval = do_loopback(&path, dev_name, tag, flags, mnt_flags);
+ 	else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
+ 		retval = do_change_type(&path, flags);
+ 	else if (flags & MS_MOVE)
+@@ -2329,6 +2351,7 @@ static struct mnt_namespace *dup_mnt_ns(
+ 		q = next_mnt(q, new);
+ 	}
+ 	up_write(&namespace_sem);
++	atomic_inc(&vs_global_mnt_ns);
+ 
+ 	if (rootmnt)
+ 		mntput(rootmnt);
+@@ -2524,9 +2547,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+ 	error = -EINVAL;
+ 	new_mnt = real_mount(new.mnt);
+ 	root_mnt = real_mount(root.mnt);
+-	if (IS_MNT_SHARED(real_mount(old.mnt)) ||
++	if ((IS_MNT_SHARED(real_mount(old.mnt)) ||
+ 		IS_MNT_SHARED(new_mnt->mnt_parent) ||
+-		IS_MNT_SHARED(root_mnt->mnt_parent))
++		IS_MNT_SHARED(root_mnt->mnt_parent)) &&
++		!vx_flags(VXF_STATE_SETUP, 0))
+ 		goto out4;
+ 	if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
+ 		goto out4;
+@@ -2647,6 +2671,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+ 	br_write_unlock(&vfsmount_lock);
+ 	up_write(&namespace_sem);
+ 	release_mounts(&umount_list);
++	atomic_dec(&vs_global_mnt_ns);
+ 	kfree(ns);
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/fs/nfs/client.c linux-3.7.10-vs2.3.5.6/fs/nfs/client.c
+--- linux-3.7.10/fs/nfs/client.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/client.c	2013-01-16 00:19:03.000000000 +0000
+@@ -683,6 +683,9 @@ int nfs_init_server_rpcclient(struct nfs
+ 	if (server->flags & NFS_MOUNT_SOFT)
+ 		server->client->cl_softrtry = 1;
+ 
++	server->client->cl_tag = 0;
++	if (server->flags & NFS_MOUNT_TAGGED)
++		server->client->cl_tag = 1;
+ 	return 0;
+ }
+ EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
+@@ -862,6 +865,10 @@ static void nfs_server_set_fsinfo(struct
+ 		server->acdirmin = server->acdirmax = 0;
+ 	}
+ 
++	/* FIXME: needs fsinfo
++	if (server->flags & NFS_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;	*/
++
+ 	server->maxfilesize = fsinfo->maxfilesize;
+ 
+ 	server->time_delta = fsinfo->time_delta;
+diff -NurpP --minimal linux-3.7.10/fs/nfs/dir.c linux-3.7.10-vs2.3.5.6/fs/nfs/dir.c
+--- linux-3.7.10/fs/nfs/dir.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/dir.c	2013-01-16 00:19:03.000000000 +0000
+@@ -36,6 +36,7 @@
+ #include <linux/sched.h>
+ #include <linux/kmemleak.h>
+ #include <linux/xattr.h>
++#include <linux/vs_tag.h>
+ 
+ #include "delegation.h"
+ #include "iostat.h"
+@@ -1255,6 +1256,7 @@ struct dentry *nfs_lookup(struct inode *
+ 	/* Success: notify readdir to use READDIRPLUS */
+ 	nfs_advise_use_readdirplus(dir);
+ 
++	dx_propagate_tag(nd, inode);
+ no_entry:
+ 	res = d_materialise_unique(dentry, inode);
+ 	if (res != NULL) {
+diff -NurpP --minimal linux-3.7.10/fs/nfs/inode.c linux-3.7.10-vs2.3.5.6/fs/nfs/inode.c
+--- linux-3.7.10/fs/nfs/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <linux/compat.h>
+ #include <linux/freezer.h>
+ #include <linux/crc32.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct
+ 	if (inode->i_state & I_NEW) {
+ 		struct nfs_inode *nfsi = NFS_I(inode);
+ 		unsigned long now = jiffies;
++		uid_t uid;
++		gid_t gid;
+ 
+ 		/* We set i_ino for the few things that still rely on it,
+ 		 * such as stat(2) */
+@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct
+ 		inode->i_version = 0;
+ 		inode->i_size = 0;
+ 		clear_nlink(inode);
+-		inode->i_uid = -2;
+-		inode->i_gid = -2;
++		uid = -2;
++		gid = -2;
+ 		inode->i_blocks = 0;
+ 		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
+ 		nfsi->write_io = 0;
+@@ -358,11 +361,11 @@ nfs_fhget(struct super_block *sb, struct
+ 		else if (nfs_server_capable(inode, NFS_CAP_NLINK))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_OWNER)
+-			inode->i_uid = fattr->uid;
++			uid = fattr->uid;
+ 		else if (nfs_server_capable(inode, NFS_CAP_OWNER))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_GROUP)
+-			inode->i_gid = fattr->gid;
++			gid = fattr->gid;
+ 		else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
+@@ -373,6 +376,11 @@ nfs_fhget(struct super_block *sb, struct
+ 			 */
+ 			inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
+ 		}
++		inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++		inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++		inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0);
++				/* maybe fattr->xid someday */
++
+ 		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
+ 		nfsi->attrtimeo_timestamp = now;
+ 		nfsi->access_cache = RB_ROOT;
+@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino
+ 			inode->i_uid = attr->ia_uid;
+ 		if ((attr->ia_valid & ATTR_GID) != 0)
+ 			inode->i_gid = attr->ia_gid;
++		if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+ 		spin_unlock(&inode->i_lock);
+ 	}
+@@ -968,6 +978,9 @@ static int nfs_check_inode_attributes(st
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	loff_t cur_size, new_isize;
+ 	unsigned long invalid = 0;
++	uid_t uid;
++	gid_t gid;
++	tag_t tag;
+ 
+ 
+ 	if (nfs_have_delegated_attributes(inode))
+@@ -993,13 +1006,18 @@ static int nfs_check_inode_attributes(st
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
+ 	}
+ 
++	uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
++	gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
++	tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
++
+ 	/* Have any file permissions changed? */
+ 	if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO))
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+-	if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid)
++	if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid)
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+-	if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid)
++	if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid)
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
++		/* maybe check for tag too? */
+ 
+ 	/* Has the link count changed? */
+ 	if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
+@@ -1303,6 +1321,9 @@ static int nfs_update_inode(struct inode
+ 	unsigned long invalid = 0;
+ 	unsigned long now = jiffies;
+ 	unsigned long save_cache_validity;
++	uid_t uid;
++	gid_t gid;
++	tag_t tag;
+ 
+ 	dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
+ 			__func__, inode->i_sb->s_id, inode->i_ino,
+@@ -1404,6 +1425,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_PAGECACHE
+ 				| NFS_INO_REVAL_FORCED);
+ 
++	uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
++	tag = inode->i_tag;
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_ATIME)
+ 		memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
+@@ -1425,9 +1449,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_FORCED);
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
+-		if (inode->i_uid != fattr->uid) {
++		if (uid != fattr->uid) {
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+-			inode->i_uid = fattr->uid;
++			uid = fattr->uid;
+ 		}
+ 	} else if (server->caps & NFS_CAP_OWNER)
+ 		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1436,9 +1460,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_FORCED);
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
+-		if (inode->i_gid != fattr->gid) {
++		if (gid != fattr->gid) {
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+-			inode->i_gid = fattr->gid;
++			gid = fattr->gid;
+ 		}
+ 	} else if (server->caps & NFS_CAP_OWNER_GROUP)
+ 		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1446,6 +1470,10 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_INVALID_ACL
+ 				| NFS_INO_REVAL_FORCED);
+ 
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag);
++
+ 	if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
+ 		if (inode->i_nlink != fattr->nlink) {
+ 			invalid |= NFS_INO_INVALID_ATTR;
+diff -NurpP --minimal linux-3.7.10/fs/nfs/nfs3xdr.c linux-3.7.10-vs2.3.5.6/fs/nfs/nfs3xdr.c
+--- linux-3.7.10/fs/nfs/nfs3xdr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/nfs3xdr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/nfs3.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/nfsacl.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
+ 
+ #define NFSDBG_FACILITY		NFSDBG_XDR
+@@ -560,7 +561,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+  *		set_mtime	mtime;
+  *	};
+  */
+-static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr)
++static void encode_sattr3(struct xdr_stream *xdr,
++	const struct iattr *attr, int tag)
+ {
+ 	u32 nbytes;
+ 	__be32 *p;
+@@ -592,15 +594,19 @@ static void encode_sattr3(struct xdr_str
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+-	if (attr->ia_valid & ATTR_UID) {
++	if (attr->ia_valid & ATTR_UID ||
++		(tag && (attr->ia_valid & ATTR_TAG))) {
+ 		*p++ = xdr_one;
+-		*p++ = cpu_to_be32(attr->ia_uid);
++		*p++ = cpu_to_be32(TAGINO_UID(tag,
++			attr->ia_uid, attr->ia_tag));
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+-	if (attr->ia_valid & ATTR_GID) {
++	if (attr->ia_valid & ATTR_GID ||
++		(tag && (attr->ia_valid & ATTR_TAG))) {
+ 		*p++ = xdr_one;
+-		*p++ = cpu_to_be32(attr->ia_gid);
++		*p++ = cpu_to_be32(TAGINO_GID(tag,
++			attr->ia_gid, attr->ia_tag));
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+@@ -879,7 +885,7 @@ static void nfs3_xdr_enc_setattr3args(st
+ 				      const struct nfs3_sattrargs *args)
+ {
+ 	encode_nfs_fh3(xdr, args->fh);
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
+ 	encode_sattrguard3(xdr, args);
+ }
+ 
+@@ -1029,13 +1035,13 @@ static void nfs3_xdr_enc_write3args(stru
+  *	};
+  */
+ static void encode_createhow3(struct xdr_stream *xdr,
+-			      const struct nfs3_createargs *args)
++	const struct nfs3_createargs *args, int tag)
+ {
+ 	encode_uint32(xdr, args->createmode);
+ 	switch (args->createmode) {
+ 	case NFS3_CREATE_UNCHECKED:
+ 	case NFS3_CREATE_GUARDED:
+-		encode_sattr3(xdr, args->sattr);
++		encode_sattr3(xdr, args->sattr, tag);
+ 		break;
+ 	case NFS3_CREATE_EXCLUSIVE:
+ 		encode_createverf3(xdr, args->verifier);
+@@ -1050,7 +1056,7 @@ static void nfs3_xdr_enc_create3args(str
+ 				     const struct nfs3_createargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_createhow3(xdr, args);
++	encode_createhow3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1066,7 +1072,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+ 				    const struct nfs3_mkdirargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1083,9 +1089,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+  *	};
+  */
+ static void encode_symlinkdata3(struct xdr_stream *xdr,
+-				const struct nfs3_symlinkargs *args)
++	const struct nfs3_symlinkargs *args, int tag)
+ {
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, tag);
+ 	encode_nfspath3(xdr, args->pages, args->pathlen);
+ }
+ 
+@@ -1094,7 +1100,7 @@ static void nfs3_xdr_enc_symlink3args(st
+ 				      const struct nfs3_symlinkargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
+-	encode_symlinkdata3(xdr, args);
++	encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1122,24 +1128,24 @@ static void nfs3_xdr_enc_symlink3args(st
+  *	};
+  */
+ static void encode_devicedata3(struct xdr_stream *xdr,
+-			       const struct nfs3_mknodargs *args)
++	const struct nfs3_mknodargs *args, int tag)
+ {
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, tag);
+ 	encode_specdata3(xdr, args->rdev);
+ }
+ 
+ static void encode_mknoddata3(struct xdr_stream *xdr,
+-			      const struct nfs3_mknodargs *args)
++	const struct nfs3_mknodargs *args, int tag)
+ {
+ 	encode_ftype3(xdr, args->type);
+ 	switch (args->type) {
+ 	case NF3CHR:
+ 	case NF3BLK:
+-		encode_devicedata3(xdr, args);
++		encode_devicedata3(xdr, args, tag);
+ 		break;
+ 	case NF3SOCK:
+ 	case NF3FIFO:
+-		encode_sattr3(xdr, args->sattr);
++		encode_sattr3(xdr, args->sattr, tag);
+ 		break;
+ 	case NF3REG:
+ 	case NF3DIR:
+@@ -1154,7 +1160,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+ 				    const struct nfs3_mknodargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_mknoddata3(xdr, args);
++	encode_mknoddata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/fs/nfs/super.c linux-3.7.10-vs2.3.5.6/fs/nfs/super.c
+--- linux-3.7.10/fs/nfs/super.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/super.c	2013-02-05 01:14:43.000000000 +0000
+@@ -55,6 +55,7 @@
+ #include <linux/nsproxy.h>
+ #include <linux/rcupdate.h>
+ #include <linux/kthread.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -102,6 +103,7 @@ enum {
+ 	Opt_mountport,
+ 	Opt_mountvers,
+ 	Opt_minorversion,
++	Opt_tagid,
+ 
+ 	/* Mount options that take string arguments */
+ 	Opt_nfsvers,
+@@ -114,6 +116,9 @@ enum {
+ 	/* Special mount options */
+ 	Opt_userspace, Opt_deprecated, Opt_sloppy,
+ 
++	/* Linux-VServer tagging options */
++	Opt_tag, Opt_notag,
++
+ 	Opt_err
+ };
+ 
+@@ -183,6 +188,10 @@ static const match_table_t nfs_mount_opt
+ 	{ Opt_fscache_uniq, "fsc=%s" },
+ 	{ Opt_local_lock, "local_lock=%s" },
+ 
++	{ Opt_tag, "tag" },
++	{ Opt_notag, "notag" },
++	{ Opt_tagid, "tagid=%u" },
++
+ 	/* The following needs to be listed after all other options */
+ 	{ Opt_nfsvers, "v%s" },
+ 
+@@ -678,6 +687,7 @@ static void nfs_show_mount_options(struc
+ 		{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
+ 		{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
+ 		{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
++		{ NFS_MOUNT_TAGGED, ",tag", "" },
+ 		{ 0, NULL, NULL }
+ 	};
+ 	const struct proc_nfs_info *nfs_infop;
+@@ -1304,6 +1314,14 @@ static int nfs_parse_mount_options(char
+ 		case Opt_nomigration:
+ 			mnt->options &= NFS_OPTION_MIGRATION;
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			mnt->flags |= NFS_MOUNT_TAGGED;
++			break;
++		case Opt_notag:
++			mnt->flags &= ~NFS_MOUNT_TAGGED;
++			break;
++#endif
+ 
+ 		/*
+ 		 * options that take numeric values
+@@ -1390,6 +1408,12 @@ static int nfs_parse_mount_options(char
+ 				goto out_invalid_value;
+ 			mnt->minorversion = option;
+ 			break;
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			nfs_data.flags |= NFS_MOUNT_TAGGED;
++			break;
++#endif
+ 
+ 		/*
+ 		 * options that take text values
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/auth.c linux-3.7.10-vs2.3.5.6/fs/nfsd/auth.c
+--- linux-3.7.10/fs/nfsd/auth.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/auth.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2,6 +2,7 @@
+ 
+ #include <linux/sched.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_tag.h>
+ #include "nfsd.h"
+ #include "auth.h"
+ 
+@@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+ 
+ 	new->fsuid = rqstp->rq_cred.cr_uid;
+ 	new->fsgid = rqstp->rq_cred.cr_gid;
++	/* FIXME: this desperately needs a tag :)
++	new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
++			*/
+ 
+ 	rqgi = rqstp->rq_cred.cr_group_info;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/nfs3xdr.c linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs3xdr.c
+--- linux-3.7.10/fs/nfsd/nfs3xdr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs3xdr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
+ #include "xdr3.h"
+ #include "auth.h"
+ 
+@@ -95,6 +96,8 @@ static __be32 *
+ decode_sattr3(__be32 *p, struct iattr *iap)
+ {
+ 	u32	tmp;
++	uid_t	uid = 0;
++	gid_t	gid = 0;
+ 
+ 	iap->ia_valid = 0;
+ 
+@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i
+ 	}
+ 	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 = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++	iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++	iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ 	if (*p++) {
+ 		u64	newsize;
+ 
+@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
+ 	*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,
++		TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
++		stat->uid, stat->tag)));
++	*p++ = htonl((u32) nfsd_rgid(rqstp,
++		TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
++		stat->gid, stat->tag)));
+ 	if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
+ 		p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
+ 	} else {
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/nfs4xdr.c linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs4xdr.c
+--- linux-3.7.10/fs/nfsd/nfs4xdr.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs4xdr.c	2013-01-16 00:19:03.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include <linux/utsname.h>
+ #include <linux/pagemap.h>
+ #include <linux/sunrpc/svcauth_gss.h>
++#include <linux/vs_tag.h>
+ 
+ #include "idmap.h"
+ #include "acl.h"
+@@ -2351,14 +2352,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,
++			TAGINO_UID(DX_TAG(dentry->d_inode),
++			stat.uid, stat.tag), &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,
++			TAGINO_GID(DX_TAG(dentry->d_inode),
++			stat.gid, stat.tag), &p, &buflen);
+ 		if (status == nfserr_resource)
+ 			goto out_resource;
+ 		if (status)
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/nfsxdr.c linux-3.7.10-vs2.3.5.6/fs/nfsd/nfsxdr.c
+--- linux-3.7.10/fs/nfsd/nfsxdr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/nfsxdr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -6,6 +6,7 @@
+ 
+ #include "xdr.h"
+ #include "auth.h"
++#include <linux/vs_tag.h>
+ 
+ #define NFSDDBG_FACILITY		NFSDDBG_XDR
+ 
+@@ -88,6 +89,8 @@ static __be32 *
+ decode_sattr(__be32 *p, struct iattr *iap)
+ {
+ 	u32	tmp, tmp1;
++	uid_t	uid = 0;
++	gid_t	gid = 0;
+ 
+ 	iap->ia_valid = 0;
+ 
+@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia
+ 	}
+ 	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 = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++	iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++	iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ 	if ((tmp = ntohl(*p++)) != (u32)-1) {
+ 		iap->ia_valid |= ATTR_SIZE;
+ 		iap->ia_size = tmp;
+@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
+ 	*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,
++		TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
++	*p++ = htonl((u32) nfsd_rgid(rqstp,
++		TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
+ 
+ 	if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
+ 		*p++ = htonl(NFS_MAXPATHLEN);
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/dlmglue.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.c
+--- linux-3.7.10/fs/ocfs2/dlmglue.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.c	2013-03-02 15:26:03.000000000 +0000
+@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+ 	lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
+ 	lvb->lvb_iuid      = cpu_to_be32(inode->i_uid);
+ 	lvb->lvb_igid      = cpu_to_be32(inode->i_gid);
++	lvb->lvb_itag      = cpu_to_be16(inode->i_tag);
+ 	lvb->lvb_imode     = cpu_to_be16(inode->i_mode);
+ 	lvb->lvb_inlink    = cpu_to_be16(inode->i_nlink);
+ 	lvb->lvb_iatime_packed  =
+@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb
+ 
+ 	inode->i_uid     = be32_to_cpu(lvb->lvb_iuid);
+ 	inode->i_gid     = be32_to_cpu(lvb->lvb_igid);
++	inode->i_tag     = be16_to_cpu(lvb->lvb_itag);
+ 	inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
+ 	set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
+ 	ocfs2_unpack_timespec(&inode->i_atime,
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/dlmglue.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.h
+--- linux-3.7.10/fs/ocfs2/dlmglue.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.h	2012-12-18 15:13:16.000000000 +0000
+@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
+ 	__be16       lvb_inlink;
+ 	__be32       lvb_iattr;
+ 	__be32       lvb_igeneration;
+-	__be32       lvb_reserved2;
++	__be16       lvb_itag;
++	__be16       lvb_reserved2;
+ };
+ 
+ #define OCFS2_QINFO_LVB_VERSION 1
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/file.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/file.c
+--- linux-3.7.10/fs/ocfs2/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
+ 		attr->ia_valid &= ~ATTR_SIZE;
+ 
+ #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
+-			   | ATTR_GID | ATTR_UID | ATTR_MODE)
++			   | ATTR_GID | ATTR_UID | ATTR_TAG | ATTR_MODE)
+ 	if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
+ 		return 0;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/inode.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.c
+--- linux-3.7.10/fs/ocfs2/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <linux/highmem.h>
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/byteorder.h>
+ 
+@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
+ {
+ 	unsigned int flags = OCFS2_I(inode)->ip_attr;
+ 
+-	inode->i_flags &= ~(S_IMMUTABLE |
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
+ 		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+ 	if (flags & OCFS2_IMMUTABLE_FL)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (flags & OCFS2_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
+ 
+ 	if (flags & OCFS2_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & OCFS2_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & OCFS2_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & OCFS2_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to OCFS2_I(inode)->ip_attr */
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi)
+ {
+ 	unsigned int flags = oi->vfs_inode.i_flags;
++	unsigned int vflags = oi->vfs_inode.i_vflags;
++
++	oi->ip_attr &= ~(OCFS2_SYNC_FL | OCFS2_APPEND_FL |
++			OCFS2_IMMUTABLE_FL | OCFS2_IXUNLINK_FL |
++			OCFS2_NOATIME_FL | OCFS2_DIRSYNC_FL |
++			OCFS2_BARRIER_FL | OCFS2_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		oi->ip_attr |= OCFS2_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		oi->ip_attr |= OCFS2_IXUNLINK_FL;
+ 
+-	oi->ip_attr &= ~(OCFS2_SYNC_FL|OCFS2_APPEND_FL|
+-			OCFS2_IMMUTABLE_FL|OCFS2_NOATIME_FL|OCFS2_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		oi->ip_attr |= OCFS2_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		oi->ip_attr |= OCFS2_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		oi->ip_attr |= OCFS2_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		oi->ip_attr |= OCFS2_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		oi->ip_attr |= OCFS2_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		oi->ip_attr |= OCFS2_BARRIER_FL;
++	if (vflags & V_COW)
++		oi->ip_attr |= OCFS2_COW_FL;
+ }
+ 
+ struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
+@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode *
+ 	struct super_block *sb;
+ 	struct ocfs2_super *osb;
+ 	int use_plocks = 1;
++	uid_t uid;
++	gid_t gid;
+ 
+ 	sb = inode->i_sb;
+ 	osb = OCFS2_SB(sb);
+@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode *
+ 	inode->i_generation = le32_to_cpu(fe->i_generation);
+ 	inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
+ 	inode->i_mode = le16_to_cpu(fe->i_mode);
+-	inode->i_uid = le32_to_cpu(fe->i_uid);
+-	inode->i_gid = le32_to_cpu(fe->i_gid);
++	uid = le32_to_cpu(fe->i_uid);
++	gid = le32_to_cpu(fe->i_gid);
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
++		/* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
+ 
+ 	/* Fast symlinks will have i_size but no allocated clusters. */
+ 	if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/inode.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.h
+--- linux-3.7.10/fs/ocfs2/inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
+ 
+ void ocfs2_set_inode_flags(struct inode *inode);
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
++int ocfs2_sync_flags(struct inode *inode, int, int);
+ 
+ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
+ {
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/ioctl.c
+--- linux-3.7.10/fs/ocfs2/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
+ 	return status;
+ }
+ 
+-static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
++int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++	struct buffer_head *bh = NULL;
++	handle_t *handle = NULL;
++	int status;
++
++	status = ocfs2_inode_lock(inode, &bh, 1);
++	if (status < 0) {
++		mlog_errno(status);
++		return status;
++	}
++	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
++	if (IS_ERR(handle)) {
++		status = PTR_ERR(handle);
++		mlog_errno(status);
++		goto bail_unlock;
++	}
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ocfs2_get_inode_flags(OCFS2_I(inode));
++
++	status = ocfs2_mark_inode_dirty(handle, inode, bh);
++	if (status < 0)
++		mlog_errno(status);
++
++	ocfs2_commit_trans(osb, handle);
++bail_unlock:
++	ocfs2_inode_unlock(inode, 1);
++	brelse(bh);
++	return status;
++}
++
++int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
+ 				unsigned mask)
+ {
+ 	struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
+@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i
+ 	if (!S_ISDIR(inode->i_mode))
+ 		flags &= ~OCFS2_DIRSYNC_FL;
+ 
++	if (IS_BARRIER(inode)) {
++		vxwprintk_task(1, "messing with the barrier.");
++		goto bail_unlock;
++	}
++
+ 	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
+ 	if (IS_ERR(handle)) {
+ 		status = PTR_ERR(handle);
+@@ -879,6 +918,7 @@ bail:
+ 	return status;
+ }
+ 
++
+ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_path.dentry->d_inode;
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/namei.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/namei.c
+--- linux-3.7.10/fs/ocfs2/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/slab.h>
+ #include <linux/highmem.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ 
+ #include <cluster/masklog.h>
+ 
+@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i
+ 	struct ocfs2_dinode *fe = NULL;
+ 	struct ocfs2_extent_list *fel;
+ 	u16 feat;
++	tag_t tag;
+ 
+ 	*new_fe_bh = NULL;
+ 
+@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i
+ 	fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
+ 	fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
+ 	fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
+-	fe->i_uid = cpu_to_le32(inode->i_uid);
+-	fe->i_gid = cpu_to_le32(inode->i_gid);
++
++	tag = dx_current_fstag(osb->sb);
++	fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), inode->i_uid, tag));
++	fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), inode->i_gid, tag));
++	inode->i_tag = tag;
+ 	fe->i_mode = cpu_to_le16(inode->i_mode);
+ 	if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+ 		fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/ocfs2.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2.h
+--- linux-3.7.10/fs/ocfs2/ocfs2.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2.h	2012-12-18 15:13:16.000000000 +0000
+@@ -272,6 +272,7 @@ enum ocfs2_mount_options
+ 						     writes */
+ 	OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
+ 	OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
++	OCFS2_MOUNT_TAGGED = 1 << 15, /* use tagging */
+ };
+ 
+ #define OCFS2_OSB_SOFT_RO			0x0001
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/ocfs2_fs.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2_fs.h
+--- linux-3.7.10/fs/ocfs2/ocfs2_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -266,6 +266,11 @@
+ #define OCFS2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
+ #define OCFS2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
+ 
++#define OCFS2_IXUNLINK_FL		FS_IXUNLINK_FL	/* Immutable invert on unlink */
++
++#define OCFS2_BARRIER_FL		FS_BARRIER_FL	/* Barrier for chroot() */
++#define OCFS2_COW_FL			FS_COW_FL	/* Copy on Write marker */
++
+ #define OCFS2_FL_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
+ #define OCFS2_FL_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/super.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/super.c
+--- linux-3.7.10/fs/ocfs2/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -185,6 +185,7 @@ enum {
+ 	Opt_coherency_full,
+ 	Opt_resv_level,
+ 	Opt_dir_resv_level,
++	Opt_tag, Opt_notag, Opt_tagid,
+ 	Opt_err,
+ };
+ 
+@@ -216,6 +217,9 @@ static const match_table_t tokens = {
+ 	{Opt_coherency_full, "coherency=full"},
+ 	{Opt_resv_level, "resv_level=%u"},
+ 	{Opt_dir_resv_level, "dir_resv_level=%u"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL}
+ };
+ 
+@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl
+ 		goto out;
+ 	}
+ 
++	if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
++	    (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
++		ret = -EINVAL;
++		mlog(ML_ERROR, "Cannot change tagging on remount\n");
++		goto out;
++	}
++
+ 	/* We're going to/from readonly mode. */
+ 	if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+ 		/* Disable quota accounting before remounting RO */
+@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super
+ 
+ 	ocfs2_complete_mount_recovery(osb);
+ 
++	if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	if (ocfs2_mount_local(osb))
+ 		snprintf(nodestr, sizeof(nodestr), "local");
+ 	else
+@@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct su
+ 			    option < OCFS2_MAX_RESV_LEVEL)
+ 				mopt->dir_resv_level = option;
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++			break;
++		case Opt_notag:
++			mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++			break;
++#endif
+ 		default:
+ 			mlog(ML_ERROR,
+ 			     "Unrecognized mount option \"%s\" "
+diff -NurpP --minimal linux-3.7.10/fs/open.c linux-3.7.10-vs2.3.5.6/fs/open.c
+--- linux-3.7.10/fs/open.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/open.c	2012-12-18 15:13:16.000000000 +0000
+@@ -30,6 +30,11 @@
+ #include <linux/fs_struct.h>
+ #include <linux/ima.h>
+ #include <linux/dnotify.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vserver/dlimit.h>
+ 
+ #include "internal.h"
+ 
+@@ -74,6 +79,12 @@ static long do_sys_truncate(const char _
+ 	error = user_path(pathname, &path);
+ 	if (error)
+ 		goto out;
++
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (error)
++		goto dput_and_out;
++#endif
+ 	inode = path.dentry->d_inode;
+ 
+ 	/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
+@@ -492,6 +503,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+ 
+ 	error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
+ 	if (!error) {
++#ifdef CONFIG_VSERVER_COWBL
++		error = cow_check_and_break(&path);
++		if (!error)
++#endif
+ 		error = chmod_common(&path, mode);
+ 		path_put(&path);
+ 	}
+@@ -519,13 +534,13 @@ static int chown_common(struct path *pat
+ 		if (!uid_valid(uid))
+ 			return -EINVAL;
+ 		newattrs.ia_valid |= ATTR_UID;
+-		newattrs.ia_uid = uid;
++		newattrs.ia_uid = dx_map_uid(user);
+ 	}
+ 	if (group != (gid_t) -1) {
+ 		if (!gid_valid(gid))
+ 			return -EINVAL;
+ 		newattrs.ia_valid |= ATTR_GID;
+-		newattrs.ia_gid = gid;
++		newattrs.ia_gid = dx_map_gid(group);
+ 	}
+ 	if (!S_ISDIR(inode->i_mode))
+ 		newattrs.ia_valid |=
+@@ -558,6 +573,18 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+ 	error = mnt_want_write(path.mnt);
+ 	if (error)
+ 		goto out_release;
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
+ 	error = chown_common(&path, user, group);
+ 	mnt_drop_write(path.mnt);
+ out_release:
+diff -NurpP --minimal linux-3.7.10/fs/proc/array.c linux-3.7.10-vs2.3.5.6/fs/proc/array.c
+--- linux-3.7.10/fs/proc/array.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/array.c	2013-01-16 00:19:03.000000000 +0000
+@@ -82,6 +82,8 @@
+ #include <linux/ptrace.h>
+ #include <linux/tracehook.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+@@ -172,6 +174,9 @@ static inline void task_state(struct seq
+ 	rcu_read_lock();
+ 	ppid = pid_alive(p) ?
+ 		task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
++	if (unlikely(vx_current_initpid(p->pid)))
++		ppid = 0;
++
+ 	tpid = 0;
+ 	if (pid_alive(p)) {
+ 		struct task_struct *tracer = ptrace_parent(p);
+@@ -296,7 +301,7 @@ static inline void task_sig(struct seq_f
+ }
+ 
+ static void render_cap_t(struct seq_file *m, const char *header,
+-			kernel_cap_t *a)
++			struct vx_info *vxi, kernel_cap_t *a)
+ {
+ 	unsigned __capi;
+ 
+@@ -321,10 +326,11 @@ static inline void task_cap(struct seq_f
+ 	cap_bset	= cred->cap_bset;
+ 	rcu_read_unlock();
+ 
+-	render_cap_t(m, "CapInh:\t", &cap_inheritable);
+-	render_cap_t(m, "CapPrm:\t", &cap_permitted);
+-	render_cap_t(m, "CapEff:\t", &cap_effective);
+-	render_cap_t(m, "CapBnd:\t", &cap_bset);
++	/* FIXME: maybe move the p->vx_info masking to __task_cred() ? */
++	render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable);
++	render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted);
++	render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective);
++	render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
+ }
+ 
+ static inline void task_context_switch_counts(struct seq_file *m,
+@@ -346,6 +352,42 @@ static void task_cpus_allowed(struct seq
+ 	seq_putc(m, '\n');
+ }
+ 
++int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++			struct pid *pid, struct task_struct *task)
++{
++	seq_printf(m,	"Proxy:\t%p(%c)\n"
++			"Count:\t%u\n"
++			"uts:\t%p(%c)\n"
++			"ipc:\t%p(%c)\n"
++			"mnt:\t%p(%c)\n"
++			"pid:\t%p(%c)\n"
++			"net:\t%p(%c)\n",
++			task->nsproxy,
++			(task->nsproxy == init_task.nsproxy ? 'I' : '-'),
++			atomic_read(&task->nsproxy->count),
++			task->nsproxy->uts_ns,
++			(task->nsproxy->uts_ns == init_task.nsproxy->uts_ns ? 'I' : '-'),
++			task->nsproxy->ipc_ns,
++			(task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'),
++			task->nsproxy->mnt_ns,
++			(task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'),
++			task->nsproxy->pid_ns,
++			(task->nsproxy->pid_ns == init_task.nsproxy->pid_ns ? 'I' : '-'),
++			task->nsproxy->net_ns,
++			(task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-'));
++	return 0;
++}
++
++void task_vs_id(struct seq_file *m, struct task_struct *task)
++{
++	if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
++		return;
++
++	seq_printf(m, "VxID: %d\n", vx_task_xid(task));
++	seq_printf(m, "NxID: %d\n", nx_task_nid(task));
++}
++
++
+ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+ 			struct pid *pid, struct task_struct *task)
+ {
+@@ -362,6 +404,7 @@ int proc_pid_status(struct seq_file *m,
+ 	task_cap(m, task);
+ 	task_cpus_allowed(m, task);
+ 	cpuset_task_status_allowed(m, task);
++	task_vs_id(m, task);
+ 	task_context_switch_counts(m, task);
+ 	return 0;
+ }
+@@ -471,6 +514,17 @@ static int do_task_stat(struct seq_file
+ 	/* 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;
++	}
++
+ 	seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
+ 	seq_put_decimal_ll(m, ' ', ppid);
+ 	seq_put_decimal_ll(m, ' ', pgid);
+diff -NurpP --minimal linux-3.7.10/fs/proc/base.c linux-3.7.10-vs2.3.5.6/fs/proc/base.c
+--- linux-3.7.10/fs/proc/base.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/base.c	2012-12-18 15:13:16.000000000 +0000
+@@ -85,6 +85,8 @@
+ #include <linux/fs_struct.h>
+ #include <linux/slab.h>
+ #include <linux/flex_array.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ #ifdef CONFIG_HARDWALL
+ #include <asm/hardwall.h>
+ #endif
+@@ -950,11 +952,15 @@ static ssize_t oom_adj_write(struct file
+ 		oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
+ 
+ 	if (oom_adj < task->signal->oom_score_adj &&
+-	    !capable(CAP_SYS_RESOURCE)) {
++	    !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
+ 		err = -EACCES;
+ 		goto err_sighand;
+ 	}
+ 
++	/* prevent guest processes from circumventing the oom killer */
++	if (vx_current_xid() && (oom_adj == OOM_DISABLE))
++		oom_adj = OOM_ADJUST_MIN;
++
+ 	/*
+ 	 * /proc/pid/oom_adj is provided for legacy purposes, ask users to use
+ 	 * /proc/pid/oom_score_adj instead.
+@@ -1534,6 +1540,8 @@ struct inode *proc_pid_make_inode(struct
+ 		inode->i_gid = cred->egid;
+ 		rcu_read_unlock();
+ 	}
++	/* procfs is xid tagged */
++	i_tag_write(inode, (tag_t)vx_task_xid(task));
+ 	security_task_to_inode(task, inode);
+ 
+ out:
+@@ -1579,6 +1587,8 @@ int pid_getattr(struct vfsmount *mnt, st
+ 
+ /* dentry stuff */
+ 
++static unsigned name_to_int(struct dentry *dentry);
++
+ /*
+  *	Exceptional case: normally we are not allowed to unhash a busy
+  * directory. In this case, however, we can do it - no aliasing problems
+@@ -1607,6 +1617,12 @@ int pid_revalidate(struct dentry *dentry
+ 	task = get_proc_task(inode);
+ 
+ 	if (task) {
++		unsigned pid = name_to_int(dentry);
++
++		if (pid != ~0U && pid != vx_map_pid(task->pid)) {
++			put_task_struct(task);
++			goto drop;
++		}
+ 		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
+ 		    task_dumpable(task)) {
+ 			rcu_read_lock();
+@@ -1623,6 +1639,7 @@ int pid_revalidate(struct dentry *dentry
+ 		put_task_struct(task);
+ 		return 1;
+ 	}
++drop:
+ 	d_drop(dentry);
+ 	return 0;
+ }
+@@ -2065,6 +2082,13 @@ static struct dentry *proc_pident_lookup
+ 	if (!task)
+ 		goto out_no_task;
+ 
++	/* TODO: maybe we can come up with a generic approach? */
++	if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
++		(dentry->d_name.len == 5) &&
++		(!memcmp(dentry->d_name.name, "vinfo", 5) ||
++		!memcmp(dentry->d_name.name, "ninfo", 5)))
++		goto out;
++
+ 	/*
+ 	 * Yes, it does not scale. And it should not. Don't add
+ 	 * new entries into /proc/<tgid>/ without very good reasons.
+@@ -2451,7 +2475,7 @@ out_iput:
+ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
+ {
+ 	struct dentry *error;
+-	struct task_struct *task = get_proc_task(dir);
++	struct task_struct *task = get_proc_task_real(dir);
+ 	const struct pid_entry *p, *last;
+ 
+ 	error = ERR_PTR(-ENOENT);
+@@ -2639,6 +2663,9 @@ static int proc_pid_personality(struct s
+ static const struct file_operations proc_task_operations;
+ static const struct inode_operations proc_task_inode_operations;
+ 
++extern int proc_pid_vx_info(struct task_struct *, char *);
++extern int proc_pid_nx_info(struct task_struct *, char *);
++
+ static const struct pid_entry tgid_base_stuff[] = {
+ 	DIR("task",       S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
+ 	DIR("fd",         S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
+@@ -2705,6 +2732,8 @@ static const struct pid_entry tgid_base_
+ #ifdef CONFIG_CGROUPS
+ 	REG("cgroup",  S_IRUGO, proc_cgroup_operations),
+ #endif
++	INF("vinfo",      S_IRUGO, proc_pid_vx_info),
++	INF("ninfo",	  S_IRUGO, proc_pid_nx_info),
+ 	INF("oom_score",  S_IRUGO, proc_oom_score),
+ 	REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adj_operations),
+ 	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
+@@ -2729,6 +2758,7 @@ static const struct pid_entry tgid_base_
+ 	REG("gid_map",    S_IRUGO|S_IWUSR, proc_gid_map_operations),
+ 	REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
+ #endif
++	ONE("nsproxy",	S_IRUGO, proc_pid_nsproxy),
+ };
+ 
+ static int proc_tgid_base_readdir(struct file * filp,
+@@ -2923,7 +2953,7 @@ retry:
+ 	iter.task = NULL;
+ 	pid = find_ge_pid(iter.tgid, ns);
+ 	if (pid) {
+-		iter.tgid = pid_nr_ns(pid, ns);
++		iter.tgid = pid_unmapped_nr_ns(pid, ns);
+ 		iter.task = pid_task(pid, PIDTYPE_PID);
+ 		/* What we to know is if the pid we have find is the
+ 		 * pid of a thread_group_leader.  Testing for task
+@@ -2953,7 +2983,7 @@ static int proc_pid_fill_cache(struct fi
+ 	struct tgid_iter iter)
+ {
+ 	char name[PROC_NUMBUF];
+-	int len = snprintf(name, sizeof(name), "%d", iter.tgid);
++	int len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid));
+ 	return proc_fill_cache(filp, dirent, filldir, name, len,
+ 				proc_pid_instantiate, iter.task, NULL);
+ }
+@@ -2977,7 +3007,7 @@ int proc_pid_readdir(struct file * filp,
+ 		goto out_no_task;
+ 	nr = filp->f_pos - FIRST_PROCESS_ENTRY;
+ 
+-	reaper = get_proc_task(filp->f_path.dentry->d_inode);
++	reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
+ 	if (!reaper)
+ 		goto out_no_task;
+ 
+@@ -2999,6 +3029,8 @@ int proc_pid_readdir(struct file * filp,
+ 			__filldir = fake_filldir;
+ 
+ 		filp->f_pos = iter.tgid + TGID_OFFSET;
++		if (!vx_proc_task_visible(iter.task))
++			continue;
+ 		if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
+ 			put_task_struct(iter.task);
+ 			goto out;
+@@ -3161,6 +3193,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;
+ 
+ 	ns = dentry->d_sb->s_fs_info;
+ 	rcu_read_lock();
+diff -NurpP --minimal linux-3.7.10/fs/proc/generic.c linux-3.7.10-vs2.3.5.6/fs/proc/generic.c
+--- linux-3.7.10/fs/proc/generic.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/generic.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/bitops.h>
+ #include <linux/spinlock.h>
+ #include <linux/completion.h>
++#include <linux/vserver/inode.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro
+ 	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)) {
+ 			pde_get(de);
+ 			spin_unlock(&proc_subdir_lock);
+ 			error = -ENOMEM;
+ 			inode = proc_get_inode(dir->i_sb, de);
++			/* generic proc entries belong to the host */
++			i_tag_write(inode, 0);
+ 			goto out_unlock;
+ 		}
+ 	}
+@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr
+ 
+ 				/* filldir passes info to user space */
+ 				pde_get(de);
++				if (!vx_hide_check(0, de->vx_flags))
++					goto skip;
+ 				spin_unlock(&proc_subdir_lock);
+ 				if (filldir(dirent, de->name, de->namelen, filp->f_pos,
+ 					    de->low_ino, de->mode >> 12) < 0) {
+@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr
+ 					goto out;
+ 				}
+ 				spin_lock(&proc_subdir_lock);
++			skip:
+ 				filp->f_pos++;
+ 				next = de->next;
+ 				pde_put(de);
+@@ -625,6 +633,7 @@ static struct proc_dir_entry *__proc_cre
+ 	ent->namelen = len;
+ 	ent->mode = mode;
+ 	ent->nlink = nlink;
++	ent->vx_flags = IATTR_PROC_DEFAULT;
+ 	atomic_set(&ent->count, 1);
+ 	spin_lock_init(&ent->pde_unload_lock);
+ 	INIT_LIST_HEAD(&ent->pde_openers);
+@@ -648,7 +657,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;
+diff -NurpP --minimal linux-3.7.10/fs/proc/inode.c linux-3.7.10-vs2.3.5.6/fs/proc/inode.c
+--- linux-3.7.10/fs/proc/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -457,6 +457,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)
+diff -NurpP --minimal linux-3.7.10/fs/proc/internal.h linux-3.7.10-vs2.3.5.6/fs/proc/internal.h
+--- linux-3.7.10/fs/proc/internal.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/internal.h	2012-12-18 15:13:16.000000000 +0000
+@@ -11,6 +11,8 @@
+ 
+ #include <linux/sched.h>
+ #include <linux/proc_fs.h>
++#include <linux/vs_pid.h>
++
+ struct  ctl_table_header;
+ struct  mempolicy;
+ 
+@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi
+ 				struct pid *pid, struct task_struct *task);
+ extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+ 				struct pid *pid, struct task_struct *task);
++extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++				struct pid *pid, struct task_struct *task);
++
+ extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
+ 
+ extern const struct file_operations proc_tid_children_operations;
+@@ -87,11 +92,16 @@ static inline struct pid *proc_pid(struc
+ 	return PROC_I(inode)->pid;
+ }
+ 
+-static inline struct task_struct *get_proc_task(struct inode *inode)
++static inline struct task_struct *get_proc_task_real(struct inode *inode)
+ {
+ 	return get_pid_task(proc_pid(inode), PIDTYPE_PID);
+ }
+ 
++static inline struct task_struct *get_proc_task(struct inode *inode)
++{
++	return vx_get_proc_task(inode, proc_pid(inode));
++}
++
+ static inline int proc_fd(struct inode *inode)
+ {
+ 	return PROC_I(inode)->fd;
+diff -NurpP --minimal linux-3.7.10/fs/proc/loadavg.c linux-3.7.10-vs2.3.5.6/fs/proc/loadavg.c
+--- linux-3.7.10/fs/proc/loadavg.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/loadavg.c	2012-12-18 15:13:16.000000000 +0000
+@@ -12,15 +12,27 @@
+ 
+ static int loadavg_proc_show(struct seq_file *m, void *v)
+ {
++	unsigned long running;
++	unsigned int threads;
+ 	unsigned long avnrun[3];
+ 
+ 	get_avenrun(avnrun, FIXED_1/200, 0);
+ 
++	if (vx_flags(VXF_VIRT_LOAD, 0)) {
++		struct vx_info *vxi = current_vx_info();
++
++		running = atomic_read(&vxi->cvirt.nr_running);
++		threads = atomic_read(&vxi->cvirt.nr_threads);
++	} else {
++		running = nr_running();
++		threads = nr_threads;
++	}
++
+ 	seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
+ 		LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
+ 		LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
+ 		LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
+-		nr_running(), nr_threads,
++		running, threads,
+ 		task_active_pid_ns(current)->last_pid);
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/fs/proc/meminfo.c linux-3.7.10-vs2.3.5.6/fs/proc/meminfo.c
+--- linux-3.7.10/fs/proc/meminfo.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/meminfo.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
+ 	allowed = ((totalram_pages - hugetlb_total_pages())
+ 		* sysctl_overcommit_ratio / 100) + total_swap_pages;
+ 
+-	cached = global_page_state(NR_FILE_PAGES) -
++	cached = vx_flags(VXF_VIRT_MEM, 0) ?
++		vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) -
+ 			total_swapcache_pages - i.bufferram;
+ 	if (cached < 0)
+ 		cached = 0;
+diff -NurpP --minimal linux-3.7.10/fs/proc/root.c linux-3.7.10-vs2.3.5.6/fs/proc/root.c
+--- linux-3.7.10/fs/proc/root.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/root.c	2012-12-18 15:13:16.000000000 +0000
+@@ -19,9 +19,14 @@
+ #include <linux/mount.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/parser.h>
++#include <linux/vserver/inode.h>
+ 
+ #include "internal.h"
+ 
++struct proc_dir_entry *proc_virtual;
++
++extern void proc_vx_init(void);
++
+ static int proc_test_super(struct super_block *sb, void *data)
+ {
+ 	return sb->s_fs_info == data;
+@@ -189,6 +194,7 @@ void __init proc_root_init(void)
+ #endif
+ 	proc_mkdir("bus", NULL);
+ 	proc_sys_init();
++	proc_vx_init();
+ }
+ 
+ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
+@@ -255,6 +261,7 @@ struct proc_dir_entry proc_root = {
+ 	.proc_iops	= &proc_root_inode_operations, 
+ 	.proc_fops	= &proc_root_operations,
+ 	.parent		= &proc_root,
++	.vx_flags	= IATTR_ADMIN | IATTR_WATCH,
+ 	.name		= "/proc",
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/proc/stat.c linux-3.7.10-vs2.3.5.6/fs/proc/stat.c
+--- linux-3.7.10/fs/proc/stat.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/stat.c	2012-12-18 15:13:16.000000000 +0000
+@@ -9,8 +9,10 @@
+ #include <linux/slab.h>
+ #include <linux/time.h>
+ #include <linux/irqnr.h>
++#include <linux/vserver/cvirt.h>
+ #include <asm/cputime.h>
+ #include <linux/tick.h>
++#include <linux/cpuset.h>
+ 
+ #ifndef arch_irq_stat_cpu
+ #define arch_irq_stat_cpu(cpu) 0
+@@ -87,14 +89,26 @@ static int show_stat(struct seq_file *p,
+ 	u64 sum_softirq = 0;
+ 	unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
+ 	struct timespec boottime;
++	cpumask_var_t cpus_allowed;
++	bool virt_cpu = vx_flags(VXF_VIRT_CPU, 0);
+ 
+ 	user = nice = system = idle = iowait =
+ 		irq = softirq = steal = 0;
+ 	guest = guest_nice = 0;
+ 	getboottime(&boottime);
++
++	if (vx_flags(VXF_VIRT_UPTIME, 0))
++		vx_vsi_boottime(&boottime);
++
++	if (virt_cpu)
++		cpuset_cpus_allowed(current, cpus_allowed);
++
+ 	jif = boottime.tv_sec;
+ 
+ 	for_each_possible_cpu(i) {
++		if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
++			continue;
++
+ 		user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
+ 		nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
+ 		system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
+@@ -131,6 +145,9 @@ static int show_stat(struct seq_file *p,
+ 	seq_putc(p, '\n');
+ 
+ 	for_each_online_cpu(i) {
++		if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
++			continue;
++
+ 		/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
+ 		user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
+ 		nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
+diff -NurpP --minimal linux-3.7.10/fs/proc/uptime.c linux-3.7.10-vs2.3.5.6/fs/proc/uptime.c
+--- linux-3.7.10/fs/proc/uptime.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/uptime.c	2012-12-18 15:13:16.000000000 +0000
+@@ -5,6 +5,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/time.h>
+ #include <linux/kernel_stat.h>
++#include <linux/vserver/cvirt.h>
+ #include <asm/cputime.h>
+ 
+ static int uptime_proc_show(struct seq_file *m, void *v)
+@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f
+ 	nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
+ 	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
+ 	idle.tv_nsec = rem;
++
++	if (vx_flags(VXF_VIRT_UPTIME, 0))
++		vx_vsi_uptime(&uptime, &idle);
++
+ 	seq_printf(m, "%lu.%02lu %lu.%02lu\n",
+ 			(unsigned long) uptime.tv_sec,
+ 			(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
+diff -NurpP --minimal linux-3.7.10/fs/proc_namespace.c linux-3.7.10-vs2.3.5.6/fs/proc_namespace.c
+--- linux-3.7.10/fs/proc_namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc_namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
+ 		{ MS_SYNCHRONOUS, ",sync" },
+ 		{ MS_DIRSYNC, ",dirsync" },
+ 		{ MS_MANDLOCK, ",mand" },
++		{ MS_TAGGED, ",tag" },
++		{ MS_NOTAGCHECK, ",notagcheck" },
+ 		{ 0, NULL }
+ 	};
+ 	const struct proc_fs_info *fs_infop;
+@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil
+ 	seq_escape(m, s, " \t\n\\");
+ }
+ 
++#ifdef	CONFIG_VSERVER_EXTRA_MNT_CHECK
++
++static int mnt_is_reachable(struct vfsmount *vfsmnt)
++{
++	struct path root;
++	struct dentry *point;
++	struct mount *mnt = real_mount(vfsmnt);
++	struct mount *root_mnt;
++	int ret;
++
++	if (mnt == mnt->mnt_ns->root)
++		return 1;
++
++	br_read_lock(&vfsmount_lock);
++	root = current->fs->root;
++	root_mnt = real_mount(root.mnt);
++	point = root.dentry;
++
++	while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
++		point = mnt->mnt_mountpoint;
++		mnt = mnt->mnt_parent;
++	}
++
++	ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
++
++	br_read_unlock(&vfsmount_lock);
++
++	return ret;
++}
++
++#else
++#define	mnt_is_reachable(v)	(1)
++#endif
++
+ static void show_type(struct seq_file *m, struct super_block *sb)
+ {
+ 	mangle(m, sb->s_type->name);
+@@ -96,6 +132,17 @@ static int show_vfsmnt(struct seq_file *
+ 	struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
+ 	struct super_block *sb = mnt_path.dentry->d_sb;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
++	if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++		mnt == current->fs->root.mnt) {
++		seq_puts(m, "/dev/root / ");
++		goto type;
++	}
++
+ 	if (sb->s_op->show_devname) {
+ 		err = sb->s_op->show_devname(m, mnt_path.dentry);
+ 		if (err)
+@@ -106,6 +153,7 @@ static int show_vfsmnt(struct seq_file *
+ 	seq_putc(m, ' ');
+ 	seq_path(m, &mnt_path, " \t\n\\");
+ 	seq_putc(m, ' ');
++type:
+ 	show_type(m, sb);
+ 	seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
+ 	err = show_sb_opts(m, sb);
+@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil
+ 	struct path root = p->root;
+ 	int err = 0;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
+ 	seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
+ 		   MAJOR(sb->s_dev), MINOR(sb->s_dev));
+ 	if (sb->s_op->show_path)
+@@ -187,6 +240,17 @@ static int show_vfsstat(struct seq_file
+ 	struct super_block *sb = mnt_path.dentry->d_sb;
+ 	int err = 0;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
++	if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++		mnt == current->fs->root.mnt) {
++		seq_puts(m, "device /dev/root mounted on / ");
++		goto type;
++	}
++
+ 	/* device */
+ 	if (sb->s_op->show_devname) {
+ 		seq_puts(m, "device ");
+@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file
+ 	seq_puts(m, " mounted on ");
+ 	seq_path(m, &mnt_path, " \t\n\\");
+ 	seq_putc(m, ' ');
+-
++type:
+ 	/* file system type */
+ 	seq_puts(m, "with fstype ");
+ 	show_type(m, sb);
+diff -NurpP --minimal linux-3.7.10/fs/quota/dquot.c linux-3.7.10-vs2.3.5.6/fs/quota/dquot.c
+--- linux-3.7.10/fs/quota/dquot.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/quota/dquot.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1582,6 +1582,9 @@ int __dquot_alloc_space(struct inode *in
+ 	struct dquot **dquots = inode->i_dquot;
+ 	int reserve = flags & DQUOT_SPACE_RESERVE;
+ 
++	if ((ret = dl_alloc_space(inode, number)))
++		return ret;
++
+ 	/*
+ 	 * First test before acquiring mutex - solves deadlocks when we
+ 	 * re-enter the quota code and are already holding the mutex
+@@ -1637,6 +1640,9 @@ int dquot_alloc_inode(const struct inode
+ 	struct dquot_warn warn[MAXQUOTAS];
+ 	struct dquot * const *dquots = inode->i_dquot;
+ 
++	if ((ret = dl_alloc_inode(inode)))
++		return ret;
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode))
+@@ -1708,6 +1714,8 @@ void __dquot_free_space(struct inode *in
+ 	struct dquot **dquots = inode->i_dquot;
+ 	int reserve = flags & DQUOT_SPACE_RESERVE;
+ 
++	dl_free_space(inode, number);
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode)) {
+@@ -1752,6 +1760,8 @@ void dquot_free_inode(const struct inode
+ 	struct dquot_warn warn[MAXQUOTAS];
+ 	struct dquot * const *dquots = inode->i_dquot;
+ 
++	dl_free_inode(inode);
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode))
+diff -NurpP --minimal linux-3.7.10/fs/quota/quota.c linux-3.7.10-vs2.3.5.6/fs/quota/quota.c
+--- linux-3.7.10/fs/quota/quota.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/quota/quota.c	2012-12-18 15:13:16.000000000 +0000
+@@ -8,6 +8,7 @@
+ #include <linux/fs.h>
+ #include <linux/namei.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
+ #include <asm/current.h>
+ #include <linux/uaccess.h>
+ #include <linux/kernel.h>
+@@ -37,7 +38,7 @@ static int check_quotactl_permission(str
+ 			break;
+ 		/*FALLTHROUGH*/
+ 	default:
+-		if (!capable(CAP_SYS_ADMIN))
++		if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ 			return -EPERM;
+ 	}
+ 
+@@ -307,6 +308,46 @@ static int do_quotactl(struct super_bloc
+ 	}
+ }
+ 
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++
++#include <linux/vroot.h>
++#include <linux/major.h>
++#include <linux/module.h>
++#include <linux/kallsyms.h>
++#include <linux/vserver/debug.h>
++
++static vroot_grb_func *vroot_get_real_bdev = NULL;
++
++static DEFINE_SPINLOCK(vroot_grb_lock);
++
++int register_vroot_grb(vroot_grb_func *func) {
++	int ret = -EBUSY;
++
++	spin_lock(&vroot_grb_lock);
++	if (!vroot_get_real_bdev) {
++		vroot_get_real_bdev = func;
++		ret = 0;
++	}
++	spin_unlock(&vroot_grb_lock);
++	return ret;
++}
++EXPORT_SYMBOL(register_vroot_grb);
++
++int unregister_vroot_grb(vroot_grb_func *func) {
++	int ret = -EINVAL;
++
++	spin_lock(&vroot_grb_lock);
++	if (vroot_get_real_bdev) {
++		vroot_get_real_bdev = NULL;
++		ret = 0;
++	}
++	spin_unlock(&vroot_grb_lock);
++	return ret;
++}
++EXPORT_SYMBOL(unregister_vroot_grb);
++
++#endif
++
+ /* Return 1 if 'cmd' will block on frozen filesystem */
+ static int quotactl_cmd_write(int cmd)
+ {
+@@ -339,6 +380,22 @@ static struct super_block *quotactl_bloc
+ 	putname(tmp);
+ 	if (IS_ERR(bdev))
+ 		return ERR_CAST(bdev);
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++	if (bdev && bdev->bd_inode &&
++		imajor(bdev->bd_inode) == VROOT_MAJOR) {
++		struct block_device *bdnew = (void *)-EINVAL;
++
++		if (vroot_get_real_bdev)
++			bdnew = vroot_get_real_bdev(bdev);
++		else
++			vxdprintk(VXD_CBIT(misc, 0),
++					"vroot_get_real_bdev not set");
++		bdput(bdev);
++		if (IS_ERR(bdnew))
++			return ERR_PTR(PTR_ERR(bdnew));
++		bdev = bdnew;
++	}
++#endif
+ 	if (quotactl_cmd_write(cmd))
+ 		sb = get_super_thawed(bdev);
+ 	else
+diff -NurpP --minimal linux-3.7.10/fs/stat.c linux-3.7.10-vs2.3.5.6/fs/stat.c
+--- linux-3.7.10/fs/stat.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/stat.c	2012-12-18 15:13:16.000000000 +0000
+@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
+ 	stat->nlink = inode->i_nlink;
+ 	stat->uid = inode->i_uid;
+ 	stat->gid = inode->i_gid;
++	stat->tag = inode->i_tag;
+ 	stat->rdev = inode->i_rdev;
+ 	stat->size = i_size_read(inode);
+ 	stat->atime = inode->i_atime;
+diff -NurpP --minimal linux-3.7.10/fs/statfs.c linux-3.7.10-vs2.3.5.6/fs/statfs.c
+--- linux-3.7.10/fs/statfs.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/statfs.c	2012-12-18 15:13:16.000000000 +0000
+@@ -7,6 +7,8 @@
+ #include <linux/statfs.h>
+ #include <linux/security.h>
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_dlimit.h>
+ #include "internal.h"
+ 
+ static int flags_by_mnt(int mnt_flags)
+@@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr
+ 	retval = dentry->d_sb->s_op->statfs(dentry, buf);
+ 	if (retval == 0 && buf->f_frsize == 0)
+ 		buf->f_frsize = buf->f_bsize;
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		vx_vsi_statfs(dentry->d_sb, buf);
+ 	return retval;
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/fs/super.c linux-3.7.10-vs2.3.5.6/fs/super.c
+--- linux-3.7.10/fs/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -34,6 +34,8 @@
+ #include <linux/cleancache.h>
+ #include <linux/fsnotify.h>
+ #include <linux/lockdep.h>
++#include <linux/magic.h>
++#include <linux/vs_context.h>
+ #include "internal.h"
+ 
+ 
+@@ -1119,6 +1121,13 @@ mount_fs(struct file_system_type *type,
+ 	WARN_ON(sb->s_bdi == &default_backing_dev_info);
+ 	sb->s_flags |= MS_BORN;
+ 
++	error = -EPERM;
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) &&
++		!sb->s_bdev &&
++		(sb->s_magic != PROC_SUPER_MAGIC) &&
++		(sb->s_magic != DEVPTS_SUPER_MAGIC))
++		goto out_sb;
++
+ 	error = security_sb_kern_mount(sb, flags, secdata);
+ 	if (error)
+ 		goto out_sb;
+diff -NurpP --minimal linux-3.7.10/fs/sysfs/mount.c linux-3.7.10-vs2.3.5.6/fs/sysfs/mount.c
+--- linux-3.7.10/fs/sysfs/mount.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/sysfs/mount.c	2012-12-18 15:13:16.000000000 +0000
+@@ -47,7 +47,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;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/utimes.c linux-3.7.10-vs2.3.5.6/fs/utimes.c
+--- linux-3.7.10/fs/utimes.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/utimes.c	2012-12-18 15:13:16.000000000 +0000
+@@ -8,6 +8,8 @@
+ #include <linux/stat.h>
+ #include <linux/utime.h>
+ #include <linux/syscalls.h>
++#include <linux/mount.h>
++#include <linux/vs_cowbl.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+ 
+@@ -52,12 +54,18 @@ static int utimes_common(struct path *pa
+ {
+ 	int error;
+ 	struct iattr newattrs;
+-	struct inode *inode = path->dentry->d_inode;
++	struct inode *inode;
+ 
+ 	error = mnt_want_write(path->mnt);
+ 	if (error)
+ 		goto out;
+ 
++	error = cow_check_and_break(path);
++	if (error)
++		goto mnt_drop_write_and_out;
++
++	inode = path->dentry->d_inode;
++
+ 	if (times && times[0].tv_nsec == UTIME_NOW &&
+ 		     times[1].tv_nsec == UTIME_NOW)
+ 		times = NULL;
+diff -NurpP --minimal linux-3.7.10/fs/xattr.c linux-3.7.10-vs2.3.5.6/fs/xattr.c
+--- linux-3.7.10/fs/xattr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xattr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/audit.h>
+ #include <linux/vmalloc.h>
+ #include <linux/posix_acl_xattr.h>
++#include <linux/mount.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -52,7 +53,7 @@ xattr_permission(struct inode *inode, co
+ 	 * The trusted.* namespace can only be accessed by privileged users.
+ 	 */
+ 	if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) {
+-		if (!capable(CAP_SYS_ADMIN))
++		if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED))
+ 			return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
+ 		return 0;
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_dinode.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_dinode.h
+--- linux-3.7.10/fs/xfs/xfs_dinode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_dinode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
+ 	__be32		di_nlink;	/* number of links to file */
+ 	__be16		di_projid_lo;	/* lower part of owner's project id */
+ 	__be16		di_projid_hi;	/* higher part owner's project id */
+-	__u8		di_pad[6];	/* unused, zeroed space */
++	__u8		di_pad[2];	/* unused, zeroed space */
++	__be16		di_tag;		/* context tagging */
++	__be16		di_vflags;	/* vserver specific flags */
+ 	__be16		di_flushiter;	/* incremented on flush */
+ 	xfs_timestamp_t	di_atime;	/* time last accessed */
+ 	xfs_timestamp_t	di_mtime;	/* time last modified */
+@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s
+ #define XFS_DIFLAG_EXTSZINHERIT_BIT 12	/* inherit inode extent size */
+ #define XFS_DIFLAG_NODEFRAG_BIT     13	/* do not reorganize/defragment */
+ #define XFS_DIFLAG_FILESTREAM_BIT   14  /* use filestream allocator */
++#define XFS_DIFLAG_IXUNLINK_BIT     15	/* Immutable inver on 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)
+@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s
+ #define XFS_DIFLAG_EXTSZINHERIT  (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
+ #define XFS_DIFLAG_NODEFRAG      (1 << XFS_DIFLAG_NODEFRAG_BIT)
+ #define XFS_DIFLAG_FILESTREAM    (1 << XFS_DIFLAG_FILESTREAM_BIT)
++#define XFS_DIFLAG_IXUNLINK      (1 << XFS_DIFLAG_IXUNLINK_BIT)
+ 
+ #ifdef CONFIG_XFS_RT
+ #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
+@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s
+ 	 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_EXTSIZE | \
+-	 XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM)
++	 XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \
++	 XFS_DIFLAG_IXUNLINK)
++
++#define XFS_DIVFLAG_BARRIER	0x01
++#define XFS_DIVFLAG_COW		0x02
+ 
+ #endif	/* __XFS_DINODE_H__ */
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_fs.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_fs.h
+--- linux-3.7.10/fs/xfs/xfs_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -67,6 +67,9 @@ struct fsxattr {
+ #define XFS_XFLAG_EXTSZINHERIT	0x00001000	/* inherit inode extent size */
+ #define XFS_XFLAG_NODEFRAG	0x00002000  	/* do not defragment */
+ #define XFS_XFLAG_FILESTREAM	0x00004000	/* use filestream allocator */
++#define XFS_XFLAG_IXUNLINK	0x00008000	/* immutable invert on unlink */
++#define XFS_XFLAG_BARRIER	0x10000000	/* chroot() barrier */
++#define XFS_XFLAG_COW		0x20000000	/* copy on write mark */
+ #define XFS_XFLAG_HASATTR	0x80000000	/* no DIFLAG for this	*/
+ 
+ /*
+@@ -302,7 +305,8 @@ typedef struct xfs_bstat {
+ #define	bs_projid	bs_projid_lo	/* (previously just bs_projid)	*/
+ 	__u16		bs_forkoff;	/* inode fork offset in bytes	*/
+ 	__u16		bs_projid_hi;	/* higher part of project id	*/
+-	unsigned char	bs_pad[10];	/* pad space, unused		*/
++	unsigned char	bs_pad[8];	/* pad space, unused		*/
++	__u16		bs_tag;		/* context tagging		*/
+ 	__u32		bs_dmevmask;	/* DMIG event mask		*/
+ 	__u16		bs_dmstate;	/* DMIG state info		*/
+ 	__u16		bs_aextents;	/* attribute number of extents	*/
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_ialloc.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ialloc.c
+--- linux-3.7.10/fs/xfs/xfs_ialloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ialloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -37,7 +37,6 @@
+ #include "xfs_error.h"
+ #include "xfs_bmap.h"
+ 
+-
+ /*
+  * Allocation group level functions.
+  */
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_inode.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.c
+--- linux-3.7.10/fs/xfs/xfs_inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ #include <linux/log2.h>
++#include <linux/vs_tag.h>
+ 
+ #include "xfs.h"
+ #include "xfs_fs.h"
+@@ -563,15 +564,25 @@ xfs_iformat_btree(
+ STATIC void
+ xfs_dinode_from_disk(
+ 	xfs_icdinode_t		*to,
+-	xfs_dinode_t		*from)
++	xfs_dinode_t		*from,
++	int			tagged)
+ {
++	uint32_t uid, gid, tag;
++
+ 	to->di_magic = be16_to_cpu(from->di_magic);
+ 	to->di_mode = be16_to_cpu(from->di_mode);
+ 	to->di_version = from ->di_version;
+ 	to->di_format = from->di_format;
+ 	to->di_onlink = be16_to_cpu(from->di_onlink);
+-	to->di_uid = be32_to_cpu(from->di_uid);
+-	to->di_gid = be32_to_cpu(from->di_gid);
++
++	uid = be32_to_cpu(from->di_uid);
++	gid = be32_to_cpu(from->di_gid);
++	tag = be16_to_cpu(from->di_tag);
++
++	to->di_uid = INOTAG_UID(tagged, uid, gid);
++	to->di_gid = INOTAG_GID(tagged, uid, gid);
++	to->di_tag = INOTAG_TAG(tagged, uid, gid, tag);
++
+ 	to->di_nlink = be32_to_cpu(from->di_nlink);
+ 	to->di_projid_lo = be16_to_cpu(from->di_projid_lo);
+ 	to->di_projid_hi = be16_to_cpu(from->di_projid_hi);
+@@ -593,21 +604,26 @@ xfs_dinode_from_disk(
+ 	to->di_dmevmask	= be32_to_cpu(from->di_dmevmask);
+ 	to->di_dmstate	= be16_to_cpu(from->di_dmstate);
+ 	to->di_flags	= be16_to_cpu(from->di_flags);
++	to->di_vflags	= be16_to_cpu(from->di_vflags);
+ 	to->di_gen	= be32_to_cpu(from->di_gen);
+ }
+ 
+ void
+ xfs_dinode_to_disk(
+ 	xfs_dinode_t		*to,
+-	xfs_icdinode_t		*from)
++	xfs_icdinode_t		*from,
++	int			tagged)
+ {
+ 	to->di_magic = cpu_to_be16(from->di_magic);
+ 	to->di_mode = cpu_to_be16(from->di_mode);
+ 	to->di_version = from ->di_version;
+ 	to->di_format = from->di_format;
+ 	to->di_onlink = cpu_to_be16(from->di_onlink);
+-	to->di_uid = cpu_to_be32(from->di_uid);
+-	to->di_gid = cpu_to_be32(from->di_gid);
++
++	to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag));
++	to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag));
++	to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag));
++
+ 	to->di_nlink = cpu_to_be32(from->di_nlink);
+ 	to->di_projid_lo = cpu_to_be16(from->di_projid_lo);
+ 	to->di_projid_hi = cpu_to_be16(from->di_projid_hi);
+@@ -629,12 +645,14 @@ xfs_dinode_to_disk(
+ 	to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
+ 	to->di_dmstate = cpu_to_be16(from->di_dmstate);
+ 	to->di_flags = cpu_to_be16(from->di_flags);
++	to->di_vflags = cpu_to_be16(from->di_vflags);
+ 	to->di_gen = cpu_to_be32(from->di_gen);
+ }
+ 
+ STATIC uint
+ _xfs_dic2xflags(
+-	__uint16_t		di_flags)
++	__uint16_t		di_flags,
++	__uint16_t		di_vflags)
+ {
+ 	uint			flags = 0;
+ 
+@@ -645,6 +663,8 @@ _xfs_dic2xflags(
+ 			flags |= XFS_XFLAG_PREALLOC;
+ 		if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ 			flags |= XFS_XFLAG_IMMUTABLE;
++		if (di_flags & XFS_DIFLAG_IXUNLINK)
++			flags |= XFS_XFLAG_IXUNLINK;
+ 		if (di_flags & XFS_DIFLAG_APPEND)
+ 			flags |= XFS_XFLAG_APPEND;
+ 		if (di_flags & XFS_DIFLAG_SYNC)
+@@ -669,6 +689,10 @@ _xfs_dic2xflags(
+ 			flags |= XFS_XFLAG_FILESTREAM;
+ 	}
+ 
++	if (di_vflags & XFS_DIVFLAG_BARRIER)
++		flags |= FS_BARRIER_FL;
++	if (di_vflags & XFS_DIVFLAG_COW)
++		flags |= FS_COW_FL;
+ 	return flags;
+ }
+ 
+@@ -678,7 +702,7 @@ xfs_ip2xflags(
+ {
+ 	xfs_icdinode_t		*dic = &ip->i_d;
+ 
+-	return _xfs_dic2xflags(dic->di_flags) |
++	return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) |
+ 				(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
+ }
+ 
+@@ -686,7 +710,8 @@ uint
+ xfs_dic2xflags(
+ 	xfs_dinode_t		*dip)
+ {
+-	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) |
++	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags),
++				be16_to_cpu(dip->di_vflags)) |
+ 				(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
+ }
+ 
+@@ -740,7 +765,8 @@ xfs_iread(
+ 	 * Otherwise, just get the truly permanent information.
+ 	 */
+ 	if (dip->di_mode) {
+-		xfs_dinode_from_disk(&ip->i_d, dip);
++		xfs_dinode_from_disk(&ip->i_d, dip,
++			mp->m_flags & XFS_MOUNT_TAGGED);
+ 		error = xfs_iformat(ip, dip);
+ 		if (error)  {
+ #ifdef DEBUG
+@@ -927,6 +953,7 @@ xfs_ialloc(
+ 	ASSERT(ip->i_d.di_nlink == nlink);
+ 	ip->i_d.di_uid = current_fsuid();
+ 	ip->i_d.di_gid = current_fsgid();
++	ip->i_d.di_tag = current_fstag(&ip->i_vnode);
+ 	xfs_set_projid(ip, prid);
+ 	memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
+ 
+@@ -986,6 +1013,7 @@ xfs_ialloc(
+ 	ip->i_d.di_dmevmask = 0;
+ 	ip->i_d.di_dmstate = 0;
+ 	ip->i_d.di_flags = 0;
++	ip->i_d.di_vflags = 0;
+ 	flags = XFS_ILOG_CORE;
+ 	switch (mode & S_IFMT) {
+ 	case S_IFIFO:
+@@ -1668,6 +1696,7 @@ xfs_ifree(
+ 	}
+ 	ip->i_d.di_mode = 0;		/* mark incore inode as free */
+ 	ip->i_d.di_flags = 0;
++	ip->i_d.di_vflags = 0;
+ 	ip->i_d.di_dmevmask = 0;
+ 	ip->i_d.di_forkoff = 0;		/* mark the attr fork not in use */
+ 	ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
+@@ -1834,7 +1863,6 @@ xfs_iroot_realloc(
+ 	return;
+ }
+ 
+-
+ /*
+  * This is called when the amount of space needed for if_data
+  * is increased or decreased.  The change in size is indicated by
+@@ -2522,7 +2550,8 @@ xfs_iflush_int(
+ 	 * because if the inode is dirty at all the core must
+ 	 * be.
+ 	 */
+-	xfs_dinode_to_disk(dip, &ip->i_d);
++	xfs_dinode_to_disk(dip, &ip->i_d,
++		mp->m_flags & XFS_MOUNT_TAGGED);
+ 
+ 	/* Wrap, we never let the log put out DI_MAX_FLUSH */
+ 	if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_inode.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.h
+--- linux-3.7.10/fs/xfs/xfs_inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
+ 	__uint32_t	di_nlink;	/* number of links to file */
+ 	__uint16_t	di_projid_lo;	/* lower part of owner's project id */
+ 	__uint16_t	di_projid_hi;	/* higher part of owner's project id */
+-	__uint8_t	di_pad[6];	/* unused, zeroed space */
++	__uint8_t	di_pad[2];	/* unused, zeroed space */
++	__uint16_t	di_tag;		/* context tagging */
++	__uint16_t	di_vflags;	/* vserver specific flags */
+ 	__uint16_t	di_flushiter;	/* incremented on flush */
+ 	xfs_ictimestamp_t di_atime;	/* time last accessed */
+ 	xfs_ictimestamp_t di_mtime;	/* time last modified */
+@@ -561,7 +563,7 @@ int		xfs_imap_to_bp(struct xfs_mount *,
+ int		xfs_iread(struct xfs_mount *, struct xfs_trans *,
+ 			  struct xfs_inode *, uint);
+ void		xfs_dinode_to_disk(struct xfs_dinode *,
+-				   struct xfs_icdinode *);
++				   struct xfs_icdinode *, int);
+ void		xfs_idestroy_fork(struct xfs_inode *, int);
+ void		xfs_idata_realloc(struct xfs_inode *, int, int);
+ void		xfs_iroot_realloc(struct xfs_inode *, int, int);
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_ioctl.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.c
+--- linux-3.7.10/fs/xfs/xfs_ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -26,7 +26,7 @@
+ #include "xfs_bmap_btree.h"
+ #include "xfs_dinode.h"
+ #include "xfs_inode.h"
+-#include "xfs_ioctl.h"
++// #include "xfs_ioctl.h"
+ #include "xfs_rtalloc.h"
+ #include "xfs_itable.h"
+ #include "xfs_error.h"
+@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags(
+ 		xflags |= XFS_XFLAG_IMMUTABLE;
+ 	else
+ 		xflags &= ~XFS_XFLAG_IMMUTABLE;
++	if (flags & FS_IXUNLINK_FL)
++		xflags |= XFS_XFLAG_IXUNLINK;
++	else
++		xflags &= ~XFS_XFLAG_IXUNLINK;
+ 	if (flags & FS_APPEND_FL)
+ 		xflags |= XFS_XFLAG_APPEND;
+ 	else
+@@ -790,6 +794,8 @@ xfs_di2lxflags(
+ 
+ 	if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ 		flags |= FS_IMMUTABLE_FL;
++	if (di_flags & XFS_DIFLAG_IXUNLINK)
++		flags |= FS_IXUNLINK_FL;
+ 	if (di_flags & XFS_DIFLAG_APPEND)
+ 		flags |= FS_APPEND_FL;
+ 	if (di_flags & XFS_DIFLAG_SYNC)
+@@ -850,6 +856,8 @@ xfs_set_diflags(
+ 	di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
+ 	if (xflags & XFS_XFLAG_IMMUTABLE)
+ 		di_flags |= XFS_DIFLAG_IMMUTABLE;
++	if (xflags & XFS_XFLAG_IXUNLINK)
++		di_flags |= XFS_DIFLAG_IXUNLINK;
+ 	if (xflags & XFS_XFLAG_APPEND)
+ 		di_flags |= XFS_DIFLAG_APPEND;
+ 	if (xflags & XFS_XFLAG_SYNC)
+@@ -892,6 +900,10 @@ xfs_diflags_to_linux(
+ 		inode->i_flags |= S_IMMUTABLE;
+ 	else
+ 		inode->i_flags &= ~S_IMMUTABLE;
++	if (xflags & XFS_XFLAG_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++	else
++		inode->i_flags &= ~S_IXUNLINK;
+ 	if (xflags & XFS_XFLAG_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	else
+@@ -1396,10 +1408,18 @@ xfs_file_ioctl(
+ 	case XFS_IOC_FSGETXATTRA:
+ 		return xfs_ioc_fsgetxattr(ip, 1, arg);
+ 	case XFS_IOC_FSSETXATTR:
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -XFS_ERROR(EACCES);
++		}
+ 		return xfs_ioc_fssetxattr(ip, filp, arg);
+ 	case XFS_IOC_GETXFLAGS:
+ 		return xfs_ioc_getxflags(ip, arg);
+ 	case XFS_IOC_SETXFLAGS:
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -XFS_ERROR(EACCES);
++		}
+ 		return xfs_ioc_setxflags(ip, filp, arg);
+ 
+ 	case XFS_IOC_FSSETDM: {
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_ioctl.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.h
+--- linux-3.7.10/fs/xfs/xfs_ioctl.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.h	2012-12-18 15:13:16.000000000 +0000
+@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
+ 	void __user		*uhandle,
+ 	u32			hlen);
+ 
++extern int
++xfs_sync_flags(
++	struct inode		*inode,
++	int			flags,
++	int			vflags);
++
+ extern long
+ xfs_file_ioctl(
+ 	struct file		*filp,
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_iops.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_iops.c
+--- linux-3.7.10/fs/xfs/xfs_iops.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_iops.c	2012-12-18 15:13:16.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include "xfs_bmap_btree.h"
+ #include "xfs_dinode.h"
+ #include "xfs_inode.h"
++#include "xfs_ioctl.h"
+ #include "xfs_bmap.h"
+ #include "xfs_rtalloc.h"
+ #include "xfs_error.h"
+@@ -46,6 +47,7 @@
+ #include <linux/security.h>
+ #include <linux/fiemap.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+ 
+ static int
+ xfs_initxattrs(
+@@ -421,6 +423,7 @@ xfs_vn_getattr(
+ 	stat->nlink = ip->i_d.di_nlink;
+ 	stat->uid = ip->i_d.di_uid;
+ 	stat->gid = ip->i_d.di_gid;
++	stat->tag = ip->i_d.di_tag;
+ 	stat->ino = ip->i_ino;
+ 	stat->atime = inode->i_atime;
+ 	stat->mtime = inode->i_mtime;
+@@ -1033,6 +1036,7 @@ static const struct inode_operations xfs
+ 	.listxattr		= xfs_vn_listxattr,
+ 	.fiemap			= xfs_vn_fiemap,
+ 	.update_time		= xfs_vn_update_time,
++	.sync_flags		= xfs_sync_flags,
+ };
+ 
+ static const struct inode_operations xfs_dir_inode_operations = {
+@@ -1059,6 +1063,7 @@ static const struct inode_operations xfs
+ 	.removexattr		= generic_removexattr,
+ 	.listxattr		= xfs_vn_listxattr,
+ 	.update_time		= xfs_vn_update_time,
++	.sync_flags		= xfs_sync_flags,
+ };
+ 
+ static const struct inode_operations xfs_dir_ci_inode_operations = {
+@@ -1110,6 +1115,10 @@ xfs_diflags_to_iflags(
+ 		inode->i_flags |= S_IMMUTABLE;
+ 	else
+ 		inode->i_flags &= ~S_IMMUTABLE;
++	if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++	else
++		inode->i_flags &= ~S_IXUNLINK;
+ 	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	else
+@@ -1122,6 +1131,15 @@ xfs_diflags_to_iflags(
+ 		inode->i_flags |= S_NOATIME;
+ 	else
+ 		inode->i_flags &= ~S_NOATIME;
++
++	if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER)
++		inode->i_vflags |= V_BARRIER;
++	else
++		inode->i_vflags &= ~V_BARRIER;
++	if (ip->i_d.di_vflags & XFS_DIVFLAG_COW)
++		inode->i_vflags |= V_COW;
++	else
++		inode->i_vflags &= ~V_COW;
+ }
+ 
+ /*
+@@ -1153,6 +1171,7 @@ xfs_setup_inode(
+ 	set_nlink(inode, ip->i_d.di_nlink);
+ 	inode->i_uid	= ip->i_d.di_uid;
+ 	inode->i_gid	= ip->i_d.di_gid;
++	inode->i_tag    = ip->i_d.di_tag;
+ 
+ 	switch (inode->i_mode & S_IFMT) {
+ 	case S_IFBLK:
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_itable.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_itable.c
+--- linux-3.7.10/fs/xfs/xfs_itable.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_itable.c	2012-12-18 15:13:16.000000000 +0000
+@@ -96,6 +96,7 @@ xfs_bulkstat_one_int(
+ 	buf->bs_mode = dic->di_mode;
+ 	buf->bs_uid = dic->di_uid;
+ 	buf->bs_gid = dic->di_gid;
++	buf->bs_tag = dic->di_tag;
+ 	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;
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_linux.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_linux.h
+--- linux-3.7.10/fs/xfs/xfs_linux.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_linux.h	2012-12-18 15:13:16.000000000 +0000
+@@ -121,6 +121,7 @@
+ 
+ #define current_cpu()		(raw_smp_processor_id())
+ #define current_pid()		(current->pid)
++#define current_fstag(vp)	(dx_current_fstag((vp)->i_sb))
+ #define current_test_flags(f)	(current->flags & (f))
+ #define current_set_flags_nested(sp, f)		\
+ 		(*(sp) = current->flags, current->flags |= (f))
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_log_recover.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_log_recover.c
+--- linux-3.7.10/fs/xfs/xfs_log_recover.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_log_recover.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2(
+ 	}
+ 
+ 	/* The core is in in-core format */
+-	xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr);
++	xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr,
++		mp->m_flags & XFS_MOUNT_TAGGED);
+ 
+ 	/* the rest is in on-disk format */
+ 	if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_mount.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_mount.h
+--- linux-3.7.10/fs/xfs/xfs_mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -246,6 +246,7 @@ typedef struct xfs_mount {
+ 						   allocator */
+ #define XFS_MOUNT_NOATTR2	(1ULL << 25)	/* disable use of attr2 format */
+ 
++#define XFS_MOUNT_TAGGED	(1ULL << 31)	/* context tagging */
+ 
+ /*
+  * Default minimum read and write sizes.
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_super.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_super.c
+--- linux-3.7.10/fs/xfs/xfs_super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
+ #define MNTOPT_NODELAYLOG  "nodelaylog"	/* Delayed logging disabled */
+ #define MNTOPT_DISCARD	   "discard"	/* Discard unused blocks */
+ #define MNTOPT_NODISCARD   "nodiscard"	/* Do not discard unused blocks */
++#define MNTOPT_TAGXID	"tagxid"	/* context tagging for inodes */
++#define MNTOPT_TAGGED	"tag"		/* context tagging for inodes */
++#define MNTOPT_NOTAGTAG	"notag"		/* do not use context tagging */
+ 
+ /*
+  * Table driven mount option parser.
+@@ -126,6 +129,8 @@ enum {
+ 	Opt_nobarrier,
+ 	Opt_inode64,
+ 	Opt_inode32,
++	Opt_tag,
++	Opt_notag,
+ 	Opt_err
+ };
+ 
+@@ -134,6 +139,9 @@ static const match_table_t tokens = {
+ 	{Opt_nobarrier, "nobarrier"},
+ 	{Opt_inode64, "inode64"},
+ 	{Opt_inode32, "inode32"},
++	{Opt_tag, "tagxid"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
+ 	{Opt_err, NULL}
+ };
+ 
+@@ -383,6 +391,19 @@ xfs_parseargs(
+ 		} else if (!strcmp(this_char, "irixsgid")) {
+ 			xfs_warn(mp,
+ 	"irixsgid is now a sysctl(2) variable, option is deprecated.");
++#ifndef CONFIG_TAGGING_NONE
++		} else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++		} else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) {
++			mp->m_flags &= ~XFS_MOUNT_TAGGED;
++		} else if (!strcmp(this_char, MNTOPT_TAGXID)) {
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++#endif
++#ifdef CONFIG_PROPAGATE
++		} else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++			/* use value */
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++#endif
+ 		} else {
+ 			xfs_warn(mp, "unknown mount option [%s].", this_char);
+ 			return EINVAL;
+@@ -1149,6 +1170,16 @@ xfs_fs_remount(
+ 		case Opt_inode32:
+ 			mp->m_maxagi = xfs_set_inode32(mp);
+ 			break;
++		case Opt_tag:
++			if (!(sb->s_flags & MS_TAGGED)) {
++				printk(KERN_INFO
++					"XFS: %s: tagging not permitted on remount.\n",
++					sb->s_id);
++				return -EINVAL;
++			}
++			break;
++		case Opt_notag:
++			break;
+ 		default:
+ 			/*
+ 			 * Logically we would return an error here to prevent
+@@ -1368,6 +1399,9 @@ xfs_fs_fill_super(
+ 	if (error)
+ 		goto out_free_sb;
+ 
++	if (mp->m_flags & XFS_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	/*
+ 	 * we must configure the block size in the superblock before we run the
+ 	 * full mount process as the mount process can lookup and cache inodes.
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_vnodeops.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_vnodeops.c
+--- linux-3.7.10/fs/xfs/xfs_vnodeops.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_vnodeops.c	2012-12-18 15:13:16.000000000 +0000
+@@ -103,6 +103,77 @@ xfs_readlink_bmap(
+ 	return error;
+ }
+ 
++
++STATIC void
++xfs_get_inode_flags(
++	xfs_inode_t	*ip)
++{
++	struct inode 	*inode = VFS_I(ip);
++	unsigned int 	flags = inode->i_flags;
++	unsigned int 	vflags = inode->i_vflags;
++
++	if (flags & S_IMMUTABLE)
++		ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE;
++	else
++		ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK;
++	else
++		ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK;
++
++	if (vflags & V_BARRIER)
++		ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER;
++	else
++		ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER;
++	if (vflags & V_COW)
++		ip->i_d.di_vflags |= XFS_DIVFLAG_COW;
++	else
++		ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW;
++}
++
++int
++xfs_sync_flags(
++	struct inode		*inode,
++	int			flags,
++	int			vflags)
++{
++	struct xfs_inode	*ip = XFS_I(inode);
++	struct xfs_mount	*mp = ip->i_mount;
++	struct xfs_trans        *tp;
++	unsigned int		lock_flags = 0;
++	int			code;
++
++	tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE);
++	code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0);
++	if (code)
++		goto error_out;
++
++	xfs_ilock(ip, XFS_ILOCK_EXCL);
++	xfs_trans_ijoin(tp, ip, 0);
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	xfs_get_inode_flags(ip);
++
++	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
++	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
++
++	XFS_STATS_INC(xs_ig_attrchg);
++
++	if (mp->m_flags & XFS_MOUNT_WSYNC)
++		xfs_trans_set_sync(tp);
++	code = xfs_trans_commit(tp, 0);
++	xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	return code;
++
++error_out:
++	xfs_trans_cancel(tp, 0);
++	if (lock_flags)
++		xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	return code;
++}
++
++
+ int
+ xfs_readlink(
+ 	xfs_inode_t     *ip,
+diff -NurpP --minimal linux-3.7.10/include/linux/cred.h linux-3.7.10-vs2.3.5.6/include/linux/cred.h
+--- linux-3.7.10/include/linux/cred.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/cred.h	2012-12-18 15:13:16.000000000 +0000
+@@ -157,6 +157,7 @@ extern void exit_creds(struct task_struc
+ extern int copy_creds(struct task_struct *, unsigned long);
+ extern const struct cred *get_task_cred(struct task_struct *);
+ extern struct cred *cred_alloc_blank(void);
++extern struct cred *__prepare_creds(const struct cred *);
+ extern struct cred *prepare_creds(void);
+ extern struct cred *prepare_exec_creds(void);
+ extern int commit_creds(struct cred *);
+@@ -210,6 +211,31 @@ static inline void validate_process_cred
+ }
+ #endif
+ 
++static inline void set_cred_subscribers(struct cred *cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	atomic_set(&cred->subscribers, n);
++#endif
++}
++
++static inline int read_cred_subscribers(const struct cred *cred)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	return atomic_read(&cred->subscribers);
++#else
++	return 0;
++#endif
++}
++
++static inline void alter_cred_subscribers(const struct cred *_cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	struct cred *cred = (struct cred *) _cred;
++
++	atomic_add(n, &cred->subscribers);
++#endif
++}
++
+ /**
+  * get_new_cred - Get a reference on a new set of credentials
+  * @cred: The new credentials to reference
+diff -NurpP --minimal linux-3.7.10/include/linux/devpts_fs.h linux-3.7.10-vs2.3.5.6/include/linux/devpts_fs.h
+--- linux-3.7.10/include/linux/devpts_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/devpts_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
+ 
+ #endif
+ 
+-
+ #endif /* _LINUX_DEVPTS_FS_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/fs.h linux-3.7.10-vs2.3.5.6/include/linux/fs.h
+--- linux-3.7.10/include/linux/fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -210,6 +210,7 @@ typedef void (dio_iodone_t)(struct kiocb
+ #define ATTR_KILL_PRIV	(1 << 14)
+ #define ATTR_OPEN	(1 << 15) /* Truncating from open(O_TRUNC) */
+ #define ATTR_TIMES_SET	(1 << 16)
++#define ATTR_TAG	(1 << 17)
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -225,6 +226,7 @@ struct iattr {
+ 	umode_t		ia_mode;
+ 	kuid_t		ia_uid;
+ 	kgid_t		ia_gid;
++	ktag_t		ia_tag;
+ 	loff_t		ia_size;
+ 	struct timespec	ia_atime;
+ 	struct timespec	ia_mtime;
+@@ -522,7 +524,9 @@ struct inode {
+ 	unsigned short		i_opflags;
+ 	kuid_t			i_uid;
+ 	kgid_t			i_gid;
+-	unsigned int		i_flags;
++	ktag_t			i_tag;
++	unsigned short		i_flags;
++	unsigned short		i_vflags;
+ 
+ #ifdef CONFIG_FS_POSIX_ACL
+ 	struct posix_acl	*i_acl;
+@@ -551,6 +555,7 @@ struct inode {
+ 		unsigned int __i_nlink;
+ 	};
+ 	dev_t			i_rdev;
++	dev_t			i_mdev;
+ 	loff_t			i_size;
+ 	struct timespec		i_atime;
+ 	struct timespec		i_mtime;
+@@ -701,6 +706,11 @@ static inline gid_t i_gid_read(const str
+ 	return from_kgid(&init_user_ns, inode->i_gid);
+ }
+ 
++static inline tag_t i_tag_read(const struct inode *inode)
++{
++	return from_ktag(&init_user_ns, inode->i_tag);
++}
++
+ static inline void i_uid_write(struct inode *inode, uid_t uid)
+ {
+ 	inode->i_uid = make_kuid(&init_user_ns, uid);
+@@ -711,14 +721,19 @@ static inline void i_gid_write(struct in
+ 	inode->i_gid = make_kgid(&init_user_ns, gid);
+ }
+ 
++static inline void i_tag_write(struct inode *inode, tag_t tag)
++{
++	inode->i_tag = make_ktag(&init_user_ns, tag);
++}
++
+ static inline unsigned iminor(const struct inode *inode)
+ {
+-	return MINOR(inode->i_rdev);
++	return MINOR(inode->i_mdev);
+ }
+ 
+ static inline unsigned imajor(const struct inode *inode)
+ {
+-	return MAJOR(inode->i_rdev);
++	return MAJOR(inode->i_mdev);
+ }
+ 
+ extern struct block_device *I_BDEV(struct inode *inode);
+@@ -785,6 +800,7 @@ struct file {
+ 	loff_t			f_pos;
+ 	struct fown_struct	f_owner;
+ 	const struct cred	*f_cred;
++	xid_t			f_xid;
+ 	struct file_ra_state	f_ra;
+ 
+ 	u64			f_version;
+@@ -936,6 +952,7 @@ struct file_lock {
+ 	struct file *fl_file;
+ 	loff_t fl_start;
+ 	loff_t fl_end;
++	xid_t fl_xid;
+ 
+ 	struct fasync_struct *	fl_fasync; /* for lease break notifications */
+ 	/* for lease breaks: */
+@@ -1570,6 +1587,7 @@ struct inode_operations {
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ 	int (*removexattr) (struct dentry *, const char *);
++	int (*sync_flags) (struct inode *, int, int);
+ 	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
+ 		      u64 len);
+ 	int (*update_time)(struct inode *, struct timespec *, int);
+@@ -1584,6 +1602,7 @@ ssize_t rw_copy_check_uvector(int type,
+ 			      unsigned long nr_segs, unsigned long fast_segs,
+ 			      struct iovec *fast_pointer,
+ 			      struct iovec **ret_pointer);
++ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
+ 
+ extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
+ extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
+@@ -1637,6 +1656,14 @@ struct super_operations {
+ #define S_IMA		1024	/* Inode has an associated IMA struct */
+ #define S_AUTOMOUNT	2048	/* Automount/referral quasi-directory */
+ #define S_NOSEC		4096	/* no suid or xattr security attributes */
++#define S_IXUNLINK	8192	/* Immutable Invert on unlink */
++
++/* Linux-VServer related Inode flags */
++
++#define V_VALID		1
++#define V_XATTR		2
++#define V_BARRIER	4	/* Barrier for chroot() */
++#define V_COW		8	/* Copy on Write */
+ 
+ /*
+  * Note that nosuid etc flags are inode-specific: setting some file-system
+@@ -1661,10 +1688,13 @@ struct super_operations {
+ #define IS_MANDLOCK(inode)	__IS_FLG(inode, MS_MANDLOCK)
+ #define IS_NOATIME(inode)	__IS_FLG(inode, MS_RDONLY|MS_NOATIME)
+ #define IS_I_VERSION(inode)	__IS_FLG(inode, MS_I_VERSION)
++#define IS_TAGGED(inode)	__IS_FLG(inode, MS_TAGGED)
+ 
+ #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_IXUNLINK(inode)	((inode)->i_flags & S_IXUNLINK)
++#define IS_IXORUNLINK(inode)	((IS_IXUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
+ #define IS_POSIXACL(inode)	__IS_FLG(inode, MS_POSIXACL)
+ 
+ #define IS_DEADDIR(inode)	((inode)->i_flags & S_DEAD)
+@@ -1675,6 +1705,16 @@ struct super_operations {
+ #define IS_AUTOMOUNT(inode)	((inode)->i_flags & S_AUTOMOUNT)
+ #define IS_NOSEC(inode)		((inode)->i_flags & S_NOSEC)
+ 
++#define IS_BARRIER(inode)	(S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER))
++
++#ifdef CONFIG_VSERVER_COWBL
++#  define IS_COW(inode)		(IS_IXUNLINK(inode) && IS_IMMUTABLE(inode))
++#  define IS_COW_LINK(inode)	(S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
++#else
++#  define IS_COW(inode)		(0)
++#  define IS_COW_LINK(inode)	(0)
++#endif
++
+ /*
+  * Inode state bits.  Protected by inode->i_lock
+  *
+@@ -1900,6 +1940,9 @@ extern int rw_verify_area(int, struct fi
+ extern int locks_mandatory_locked(struct inode *);
+ extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
+ 
++#define ATTR_FLAG_BARRIER	512	/* Barrier for chroot() */
++#define ATTR_FLAG_IXUNLINK	1024	/* Immutable invert on unlink */
++
+ /*
+  * Candidates for mandatory locking have the setgid bit set
+  * but no group execute bit -  an otherwise meaningless combination.
+@@ -2504,6 +2547,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_setattr(struct dentry *, struct iattr *);
+ extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+ extern int simple_statfs(struct dentry *, struct kstatfs *);
+diff -NurpP --minimal linux-3.7.10/include/linux/init_task.h linux-3.7.10-vs2.3.5.6/include/linux/init_task.h
+--- linux-3.7.10/include/linux/init_task.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/init_task.h	2012-12-18 15:13:16.000000000 +0000
+@@ -210,6 +210,10 @@ extern struct task_group root_task_group
+ 	INIT_TRACE_RECURSION						\
+ 	INIT_TASK_RCU_PREEMPT(tsk)					\
+ 	INIT_CPUSET_SEQ							\
++	.xid		= 0,						\
++	.vx_info	= NULL,						\
++	.nid		= 0,						\
++	.nx_info	= NULL,						\
+ }
+ 
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/ipc.h linux-3.7.10-vs2.3.5.6/include/linux/ipc.h
+--- linux-3.7.10/include/linux/ipc.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/ipc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -16,6 +16,7 @@ struct kern_ipc_perm
+ 	key_t		key;
+ 	kuid_t		uid;
+ 	kgid_t		gid;
++	xid_t		xid;
+ 	kuid_t		cuid;
+ 	kgid_t		cgid;
+ 	umode_t		mode; 
+diff -NurpP --minimal linux-3.7.10/include/linux/ipc_namespace.h linux-3.7.10-vs2.3.5.6/include/linux/ipc_namespace.h
+--- linux-3.7.10/include/linux/ipc_namespace.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/ipc_namespace.h	2012-12-18 15:13:16.000000000 +0000
+@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_
+ 
+ #if defined(CONFIG_IPC_NS)
+ extern struct ipc_namespace *copy_ipcs(unsigned long flags,
+-				       struct task_struct *tsk);
++				       struct ipc_namespace *old_ns,
++				       struct user_namespace *user_ns);
+ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
+ {
+ 	if (ns)
+@@ -144,12 +145,13 @@ static inline struct ipc_namespace *get_
+ extern void put_ipc_ns(struct ipc_namespace *ns);
+ #else
+ static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
+-					      struct task_struct *tsk)
++					      struct ipc_namespace *old_ns,
++					      struct user_namespace *user_ns)
+ {
+ 	if (flags & CLONE_NEWIPC)
+ 		return ERR_PTR(-EINVAL);
+ 
+-	return tsk->nsproxy->ipc_ns;
++	return old_ns;
+ }
+ 
+ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
+diff -NurpP --minimal linux-3.7.10/include/linux/loop.h linux-3.7.10-vs2.3.5.6/include/linux/loop.h
+--- linux-3.7.10/include/linux/loop.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/loop.h	2012-12-18 15:13:16.000000000 +0000
+@@ -41,6 +41,7 @@ struct loop_device {
+ 	struct loop_func_table *lo_encryption;
+ 	__u32           lo_init[2];
+ 	kuid_t		lo_key_owner;	/* Who set the key */
++	xid_t		lo_xid;
+ 	int		(*ioctl)(struct loop_device *, int cmd, 
+ 				 unsigned long arg); 
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/memcontrol.h linux-3.7.10-vs2.3.5.6/include/linux/memcontrol.h
+--- linux-3.7.10/include/linux/memcontrol.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/memcontrol.h	2012-12-18 15:13:16.000000000 +0000
+@@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg
+ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
+ extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
+ 
++extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member);
++extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member);
++
++extern s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem);
++
+ static inline
+ bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
+ {
+diff -NurpP --minimal linux-3.7.10/include/linux/mm_types.h linux-3.7.10-vs2.3.5.6/include/linux/mm_types.h
+--- linux-3.7.10/include/linux/mm_types.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/mm_types.h	2012-12-18 15:13:16.000000000 +0000
+@@ -365,6 +365,7 @@ struct mm_struct {
+ 
+ 	/* Architecture-specific MM context */
+ 	mm_context_t context;
++	struct vx_info *mm_vx_info;
+ 
+ 	unsigned long flags; /* Must use atomic bitops to access the bits */
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/mmzone.h linux-3.7.10-vs2.3.5.6/include/linux/mmzone.h
+--- linux-3.7.10/include/linux/mmzone.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/mmzone.h	2012-12-18 15:13:16.000000000 +0000
+@@ -735,6 +735,13 @@ typedef struct pglist_data {
+ 	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
+ })
+ 
++#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)
++
++#define node_end_pfn(nid) ({\
++	pg_data_t *__pgdat = NODE_DATA(nid);\
++	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
++})
++
+ #include <linux/memory_hotplug.h>
+ 
+ extern struct mutex zonelists_mutex;
+diff -NurpP --minimal linux-3.7.10/include/linux/mount.h linux-3.7.10-vs2.3.5.6/include/linux/mount.h
+--- linux-3.7.10/include/linux/mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -47,6 +47,9 @@ struct mnt_namespace;
+ 
+ #define MNT_INTERNAL	0x4000
+ 
++#define MNT_TAGID	0x10000
++#define MNT_NOTAG	0x20000
++
+ struct vfsmount {
+ 	struct dentry *mnt_root;	/* root of the mounted tree */
+ 	struct super_block *mnt_sb;	/* pointer to superblock */
+diff -NurpP --minimal linux-3.7.10/include/linux/net.h linux-3.7.10-vs2.3.5.6/include/linux/net.h
+--- linux-3.7.10/include/linux/net.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/net.h	2012-12-18 15:13:16.000000000 +0000
+@@ -38,6 +38,7 @@ struct net;
+ #define SOCK_PASSCRED		3
+ #define SOCK_PASSSEC		4
+ #define SOCK_EXTERNALLY_ALLOCATED 5
++#define SOCK_USER_SOCKET	6
+ 
+ #ifndef ARCH_HAS_SOCKET_TYPES
+ /**
+diff -NurpP --minimal linux-3.7.10/include/linux/netdevice.h linux-3.7.10-vs2.3.5.6/include/linux/netdevice.h
+--- linux-3.7.10/include/linux/netdevice.h	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/netdevice.h	2013-02-19 14:41:41.000000000 +0000
+@@ -1640,6 +1640,7 @@ extern void		netdev_resync_ops(struct ne
+ 
+ extern struct net_device	*dev_get_by_index(struct net *net, int ifindex);
+ extern struct net_device	*__dev_get_by_index(struct net *net, int ifindex);
++extern struct net_device	*dev_get_by_index_real_rcu(struct net *net, int ifindex);
+ extern struct net_device	*dev_get_by_index_rcu(struct net *net, int ifindex);
+ extern int		dev_restart(struct net_device *dev);
+ #ifdef CONFIG_NETPOLL_TRAP
+diff -NurpP --minimal linux-3.7.10/include/linux/nsproxy.h linux-3.7.10-vs2.3.5.6/include/linux/nsproxy.h
+--- linux-3.7.10/include/linux/nsproxy.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/nsproxy.h	2012-12-18 15:13:16.000000000 +0000
+@@ -3,6 +3,7 @@
+ 
+ #include <linux/spinlock.h>
+ #include <linux/sched.h>
++#include <linux/vserver/debug.h>
+ 
+ struct mnt_namespace;
+ struct uts_namespace;
+@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro
+ }
+ 
+ int copy_namespaces(unsigned long flags, struct task_struct *tsk);
++struct nsproxy *copy_nsproxy(struct nsproxy *orig);
+ void exit_task_namespaces(struct task_struct *tsk);
+ void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
+ void free_nsproxy(struct nsproxy *ns);
+@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned
+ 	struct fs_struct *);
+ int __init nsproxy_cache_init(void);
+ 
+-static inline void put_nsproxy(struct nsproxy *ns)
++#define	get_nsproxy(n)	__get_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __get_nsproxy(struct nsproxy *ns,
++	const char *_file, int _line)
+ {
+-	if (atomic_dec_and_test(&ns->count)) {
+-		free_nsproxy(ns);
+-	}
++	vxlprintk(VXD_CBIT(space, 0), "get_nsproxy(%p[%u])",
++		ns, atomic_read(&ns->count), _file, _line);
++	atomic_inc(&ns->count);
+ }
+ 
+-static inline void get_nsproxy(struct nsproxy *ns)
++#define	put_nsproxy(n)	__put_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __put_nsproxy(struct nsproxy *ns,
++	const char *_file, int _line)
+ {
+-	atomic_inc(&ns->count);
++	vxlprintk(VXD_CBIT(space, 0), "put_nsproxy(%p[%u])",
++		ns, atomic_read(&ns->count), _file, _line);
++	if (atomic_dec_and_test(&ns->count)) {
++		free_nsproxy(ns);
++	}
+ }
+ 
+ #endif
+diff -NurpP --minimal linux-3.7.10/include/linux/pid.h linux-3.7.10-vs2.3.5.6/include/linux/pid.h
+--- linux-3.7.10/include/linux/pid.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/pid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -8,7 +8,8 @@ enum pid_type
+ 	PIDTYPE_PID,
+ 	PIDTYPE_PGID,
+ 	PIDTYPE_SID,
+-	PIDTYPE_MAX
++	PIDTYPE_MAX,
++	PIDTYPE_REALPID
+ };
+ 
+ /*
+@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p
+ }
+ 
+ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns);
+ pid_t pid_vnr(struct pid *pid);
+ 
+ #define do_each_pid_task(pid, type, task)				\
+diff -NurpP --minimal linux-3.7.10/include/linux/proc_fs.h linux-3.7.10-vs2.3.5.6/include/linux/proc_fs.h
+--- linux-3.7.10/include/linux/proc_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/proc_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -54,6 +54,7 @@ struct proc_dir_entry {
+ 	nlink_t nlink;
+ 	kuid_t uid;
+ 	kgid_t gid;
++	int vx_flags;
+ 	loff_t size;
+ 	const struct inode_operations *proc_iops;
+ 	/*
+@@ -252,12 +253,18 @@ extern const struct proc_ns_operations n
+ extern const struct proc_ns_operations utsns_operations;
+ extern const struct proc_ns_operations ipcns_operations;
+ 
++struct vx_info;
++struct nx_info;
++
+ union proc_op {
+ 	int (*proc_get_link)(struct dentry *, struct path *);
+ 	int (*proc_read)(struct task_struct *task, char *page);
+ 	int (*proc_show)(struct seq_file *m,
+ 		struct pid_namespace *ns, struct pid *pid,
+ 		struct task_struct *task);
++	int (*proc_vs_read)(char *page);
++	int (*proc_vxi_read)(struct vx_info *vxi, char *page);
++	int (*proc_nxi_read)(struct nx_info *nxi, char *page);
+ };
+ 
+ struct ctl_table_header;
+@@ -265,6 +272,7 @@ struct ctl_table;
+ 
+ struct proc_inode {
+ 	struct pid *pid;
++	int vx_flags;
+ 	int fd;
+ 	union proc_op op;
+ 	struct proc_dir_entry *pde;
+diff -NurpP --minimal linux-3.7.10/include/linux/quotaops.h linux-3.7.10-vs2.3.5.6/include/linux/quotaops.h
+--- linux-3.7.10/include/linux/quotaops.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/quotaops.h	2012-12-18 15:13:16.000000000 +0000
+@@ -8,6 +8,7 @@
+ #define _LINUX_QUOTAOPS_
+ 
+ #include <linux/fs.h>
++#include <linux/vs_dlimit.h>
+ 
+ #define DQUOT_SPACE_WARN	0x1
+ #define DQUOT_SPACE_RESERVE	0x2
+@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino
+ 
+ static inline int dquot_alloc_inode(const struct inode *inode)
+ {
+-	return 0;
++	return dl_alloc_inode(inode);
+ }
+ 
+ static inline void dquot_free_inode(const struct inode *inode)
+ {
++	dl_free_inode(inode);
+ }
+ 
+ static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
+@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct
+ static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
+ 		int flags)
+ {
++	int ret = 0;
++
++	if ((ret = dl_alloc_space(inode, number)))
++		return ret;
+ 	if (!(flags & DQUOT_SPACE_RESERVE))
+ 		inode_add_bytes(inode, number);
+ 	return 0;
+@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st
+ {
+ 	if (!(flags & DQUOT_SPACE_RESERVE))
+ 		inode_sub_bytes(inode, number);
++	dl_free_space(inode, number);
+ }
+ 
+ static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
+diff -NurpP --minimal linux-3.7.10/include/linux/sched.h linux-3.7.10-vs2.3.5.6/include/linux/sched.h
+--- linux-3.7.10/include/linux/sched.h	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sched.h	2013-02-05 01:14:43.000000000 +0000
+@@ -1378,6 +1378,14 @@ struct task_struct {
+ #endif
+ 	struct seccomp seccomp;
+ 
++/* vserver context data */
++	struct vx_info *vx_info;
++	struct nx_info *nx_info;
++
++	xid_t xid;
++	nid_t nid;
++	tag_t tag;
++
+ /* Thread group tracking */
+    	u32 parent_exec_id;
+    	u32 self_exec_id;
+@@ -1627,6 +1635,11 @@ struct pid_namespace;
+ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
+ 			struct pid_namespace *ns);
+ 
++#include <linux/vserver/base.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/pid.h>
++
+ static inline pid_t task_pid_nr(struct task_struct *tsk)
+ {
+ 	return tsk->pid;
+@@ -1640,7 +1653,8 @@ static inline pid_t task_pid_nr_ns(struc
+ 
+ static inline pid_t task_pid_vnr(struct task_struct *tsk)
+ {
+-	return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++	// return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++	return vx_map_pid(__task_pid_nr_ns(tsk, PIDTYPE_PID, NULL));
+ }
+ 
+ 
+@@ -1653,7 +1667,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+ 
+ static inline pid_t task_tgid_vnr(struct task_struct *tsk)
+ {
+-	return pid_vnr(task_tgid(tsk));
++	return vx_map_tgid(pid_vnr(task_tgid(tsk)));
+ }
+ 
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/shmem_fs.h linux-3.7.10-vs2.3.5.6/include/linux/shmem_fs.h
+--- linux-3.7.10/include/linux/shmem_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/shmem_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -9,6 +9,9 @@
+ 
+ /* inode in-kernel data */
+ 
++#define TMPFS_SUPER_MAGIC	0x01021994
++
++
+ struct shmem_inode_info {
+ 	spinlock_t		lock;
+ 	unsigned long		flags;
+diff -NurpP --minimal linux-3.7.10/include/linux/stat.h linux-3.7.10-vs2.3.5.6/include/linux/stat.h
+--- linux-3.7.10/include/linux/stat.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/stat.h	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@ struct kstat {
+ 	unsigned int	nlink;
+ 	kuid_t		uid;
+ 	kgid_t		gid;
++	tag_t		tag;
+ 	dev_t		rdev;
+ 	loff_t		size;
+ 	struct timespec  atime;
+diff -NurpP --minimal linux-3.7.10/include/linux/sunrpc/auth.h linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/auth.h
+--- linux-3.7.10/include/linux/sunrpc/auth.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/auth.h	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ struct auth_cred {
+ 	uid_t	uid;
+ 	gid_t	gid;
++	tag_t	tag;
+ 	struct group_info *group_info;
+ 	const char *principal;
+ 	unsigned char machine_cred : 1;
+diff -NurpP --minimal linux-3.7.10/include/linux/sunrpc/clnt.h linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/clnt.h
+--- linux-3.7.10/include/linux/sunrpc/clnt.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/clnt.h	2012-12-18 15:13:16.000000000 +0000
+@@ -49,7 +49,8 @@ struct rpc_clnt {
+ 	unsigned int		cl_softrtry : 1,/* soft timeouts */
+ 				cl_discrtry : 1,/* disconnect before retry */
+ 				cl_autobind : 1,/* use getport() */
+-				cl_chatty   : 1;/* be verbose */
++				cl_chatty   : 1,/* be verbose */
++				cl_tag      : 1;/* context tagging */
+ 
+ 	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */
+ 	const struct rpc_timeout *cl_timeout;	/* Timeout strategy */
+diff -NurpP --minimal linux-3.7.10/include/linux/sysfs.h linux-3.7.10-vs2.3.5.6/include/linux/sysfs.h
+--- linux-3.7.10/include/linux/sysfs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sysfs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -19,6 +19,8 @@
+ #include <linux/kobject_ns.h>
+ #include <linux/atomic.h>
+ 
++#define SYSFS_SUPER_MAGIC	0x62656572
++
+ struct kobject;
+ struct module;
+ enum kobj_ns_type;
+diff -NurpP --minimal linux-3.7.10/include/linux/types.h linux-3.7.10-vs2.3.5.6/include/linux/types.h
+--- linux-3.7.10/include/linux/types.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/types.h	2012-12-18 15:13:16.000000000 +0000
+@@ -32,6 +32,9 @@ 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;
++typedef unsigned int		tag_t;
+ 
+ typedef unsigned long		uintptr_t;
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/uidgid.h linux-3.7.10-vs2.3.5.6/include/linux/uidgid.h
+--- linux-3.7.10/include/linux/uidgid.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/uidgid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -23,13 +23,17 @@ typedef struct {
+ 	uid_t val;
+ } kuid_t;
+ 
+-
+ typedef struct {
+ 	gid_t val;
+ } kgid_t;
+ 
++typedef struct {
++	tag_t val;
++} ktag_t;
++
+ #define KUIDT_INIT(value) (kuid_t){ value }
+ #define KGIDT_INIT(value) (kgid_t){ value }
++#define KTAGT_INIT(value) (ktag_t){ value }
+ 
+ static inline uid_t __kuid_val(kuid_t uid)
+ {
+@@ -41,10 +45,16 @@ static inline gid_t __kgid_val(kgid_t gi
+ 	return gid.val;
+ }
+ 
++static inline tag_t __ktag_val(ktag_t tag)
++{
++	return tag.val;
++}
++
+ #else
+ 
+ typedef uid_t kuid_t;
+ typedef gid_t kgid_t;
++typedef tag_t ktag_t;
+ 
+ static inline uid_t __kuid_val(kuid_t uid)
+ {
+@@ -56,16 +66,24 @@ static inline gid_t __kgid_val(kgid_t gi
+ 	return gid;
+ }
+ 
++static inline tag_t __ktag_val(ktag_t tag)
++{
++	return tag;
++}
++
+ #define KUIDT_INIT(value) ((kuid_t) value )
+ #define KGIDT_INIT(value) ((kgid_t) value )
++#define KTAGT_INIT(value) ((ktag_t) value )
+ 
+ #endif
+ 
+ #define GLOBAL_ROOT_UID KUIDT_INIT(0)
+ #define GLOBAL_ROOT_GID KGIDT_INIT(0)
++#define GLOBAL_ROOT_TAG KTAGT_INIT(0)
+ 
+ #define INVALID_UID KUIDT_INIT(-1)
+ #define INVALID_GID KGIDT_INIT(-1)
++#define INVALID_TAG KTAGT_INIT(-1)
+ 
+ static inline bool uid_eq(kuid_t left, kuid_t right)
+ {
+@@ -77,6 +95,11 @@ static inline bool gid_eq(kgid_t left, k
+ 	return __kgid_val(left) == __kgid_val(right);
+ }
+ 
++static inline bool tag_eq(ktag_t left, ktag_t right)
++{
++	return __ktag_val(left) == __ktag_val(right);
++}
++
+ static inline bool uid_gt(kuid_t left, kuid_t right)
+ {
+ 	return __kuid_val(left) > __kuid_val(right);
+@@ -127,13 +150,21 @@ static inline bool gid_valid(kgid_t gid)
+ 	return !gid_eq(gid, INVALID_GID);
+ }
+ 
++static inline bool tag_valid(ktag_t tag)
++{
++	return !tag_eq(tag, INVALID_TAG);
++}
++
+ #ifdef CONFIG_USER_NS
+ 
+ extern kuid_t make_kuid(struct user_namespace *from, uid_t uid);
+ extern kgid_t make_kgid(struct user_namespace *from, gid_t gid);
++extern krag_t make_ktag(struct user_namespace *from, gid_t gid);
+ 
+ extern uid_t from_kuid(struct user_namespace *to, kuid_t uid);
+ extern gid_t from_kgid(struct user_namespace *to, kgid_t gid);
++extern tag_t from_ktag(struct user_namespace *to, ktag_t tag);
++
+ extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid);
+ extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid);
+ 
+@@ -159,6 +190,11 @@ static inline kgid_t make_kgid(struct us
+ 	return KGIDT_INIT(gid);
+ }
+ 
++static inline ktag_t make_ktag(struct user_namespace *from, tag_t tag)
++{
++	return KTAGT_INIT(tag);
++}
++
+ static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
+ {
+ 	return __kuid_val(kuid);
+@@ -169,6 +205,11 @@ static inline gid_t from_kgid(struct use
+ 	return __kgid_val(kgid);
+ }
+ 
++static inline tag_t from_ktag(struct user_namespace *to, ktag_t ktag)
++{
++	return __ktag_val(ktag);
++}
++
+ static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
+ {
+ 	uid_t uid = from_kuid(to, kuid);
+diff -NurpP --minimal linux-3.7.10/include/linux/utsname.h linux-3.7.10-vs2.3.5.6/include/linux/utsname.h
+--- linux-3.7.10/include/linux/utsname.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/utsname.h	2012-12-18 15:13:16.000000000 +0000
+@@ -33,7 +33,8 @@ static inline void get_uts_ns(struct uts
+ }
+ 
+ extern struct uts_namespace *copy_utsname(unsigned long flags,
+-					  struct task_struct *tsk);
++					  struct uts_namespace *old_ns,
++					  struct user_namespace *user_ns);
+ extern void free_uts_ns(struct kref *kref);
+ 
+ static inline void put_uts_ns(struct uts_namespace *ns)
+@@ -50,12 +51,13 @@ static inline void put_uts_ns(struct uts
+ }
+ 
+ static inline struct uts_namespace *copy_utsname(unsigned long flags,
+-						 struct task_struct *tsk)
++						 struct uts_namespace *old_ns,
++						 struct user_namespace *user_ns)
+ {
+ 	if (flags & CLONE_NEWUTS)
+ 		return ERR_PTR(-EINVAL);
+ 
+-	return tsk->nsproxy->uts_ns;
++	return old_ns;
+ }
+ #endif
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/vroot.h linux-3.7.10-vs2.3.5.6/include/linux/vroot.h
+--- linux-3.7.10/include/linux/vroot.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vroot.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,51 @@
++
++/*
++ * include/linux/vroot.h
++ *
++ * written by Herbert Pötzl, 9/11/2002
++ * ported to 2.6 by Herbert Pötzl, 30/12/2004
++ *
++ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * 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;
++};
++
++
++typedef struct block_device *(vroot_grb_func)(struct block_device *);
++
++extern int register_vroot_grb(vroot_grb_func *);
++extern int unregister_vroot_grb(vroot_grb_func *);
++
++#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 */
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_base.h linux-3.7.10-vs2.3.5.6/include/linux/vs_base.h
+--- linux-3.7.10/include/linux/vs_base.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_base.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VS_BASE_H
++#define _VS_BASE_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_context.h linux-3.7.10-vs2.3.5.6/include/linux/vs_context.h
+--- linux-3.7.10/include/linux/vs_context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_context.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,242 @@
++#ifndef _VS_CONTEXT_H
++#define _VS_CONTEXT_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/history.h"
++#include "vserver/debug.h"
++
++#include <linux/sched.h>
++
++
++#define get_vx_info(i) __get_vx_info(i, __FILE__, __LINE__, __HERE__)
++
++static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __put_vx_info(struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++		atomic_inc(&vxi->vx_usecnt);
++	}
++	*vxp = vxi;
++}
++
++
++#define set_vx_info(p, i) \
++	__set_vx_info(p, i, __FILE__, __LINE__, __HERE__)
++
++static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	atomic_inc(&vxi->vx_usecnt);
++	vxo = xchg(vxp, vxi);
++	BUG_ON(vxo);
++}
++
++
++#define clr_vx_info(p) __clr_vx_info(p, __FILE__, __LINE__, __HERE__)
++
++static inline void __clr_vx_info(struct vx_info **vxp,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __claim_vx_info(struct vx_info *vxi,
++	struct task_struct *task,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __release_vx_info(struct vx_info *vxi,
++	struct task_struct *task,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++	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);
++}
++
++
++#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__)
++
++static inline void __enter_vx_info(struct vx_info *vxi,
++	struct vx_info_save *vxis, const char *_file, int _line)
++{
++	vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
++		vxi, vxi ? vxi->vx_id : 0, vxis, current,
++		current->xid, current->vx_info, _file, _line);
++	vxis->vxi = xchg(&current->vx_info, vxi);
++	vxis->xid = current->xid;
++	current->xid = vxi ? vxi->vx_id : 0;
++}
++
++#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__)
++
++static inline void __leave_vx_info(struct vx_info_save *vxis,
++	const char *_file, int _line)
++{
++	vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
++		vxis, vxis->xid, vxis->vxi, current,
++		current->xid, current->vx_info, _file, _line);
++	(void)xchg(&current->vx_info, vxis->vxi);
++	current->xid = vxis->xid;
++}
++
++
++static inline void __enter_vx_admin(struct vx_info_save *vxis)
++{
++	vxis->vxi = xchg(&current->vx_info, NULL);
++	vxis->xid = xchg(&current->xid, (xid_t)0);
++}
++
++static inline void __leave_vx_admin(struct vx_info_save *vxis)
++{
++	(void)xchg(&current->xid, vxis->xid);
++	(void)xchg(&current->vx_info, vxis->vxi);
++}
++
++#define task_is_init(p) \
++	__task_is_init(p, __FILE__, __LINE__, __HERE__)
++
++static inline int __task_is_init(struct task_struct *p,
++	const char *_file, int _line, void *_here)
++{
++	int is_init = is_global_init(p);
++
++	task_lock(p);
++	if (p->vx_info)
++		is_init = p->vx_info->vx_initpid == p->pid;
++	task_unlock(p);
++	return is_init;
++}
++
++extern void exit_vx_info(struct task_struct *, int);
++extern void exit_vx_info_early(struct task_struct *, int);
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_cowbl.h linux-3.7.10-vs2.3.5.6/include/linux/vs_cowbl.h
+--- linux-3.7.10/include/linux/vs_cowbl.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_cowbl.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,48 @@
++#ifndef _VS_COWBL_H
++#define _VS_COWBL_H
++
++#include <linux/fs.h>
++#include <linux/dcache.h>
++#include <linux/namei.h>
++#include <linux/slab.h>
++
++extern struct dentry *cow_break_link(const char *pathname);
++
++static inline int cow_check_and_break(struct path *path)
++{
++	struct inode *inode = path->dentry->d_inode;
++	int error = 0;
++
++	/* do we need this check? */
++	if (IS_RDONLY(inode))
++		return -EROFS;
++
++	if (IS_COW(inode)) {
++		if (IS_COW_LINK(inode)) {
++			struct dentry *new_dentry, *old_dentry = path->dentry;
++			char *pp, *buf;
++
++			buf = kmalloc(PATH_MAX, GFP_KERNEL);
++			if (!buf) {
++				return -ENOMEM;
++			}
++			pp = d_path(path, buf, PATH_MAX);
++			new_dentry = cow_break_link(pp);
++			kfree(buf);
++			if (!IS_ERR(new_dentry)) {
++				path->dentry = new_dentry;
++				dput(old_dentry);
++			} else
++				error = PTR_ERR(new_dentry);
++		} else {
++			inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
++			inode->i_ctime = CURRENT_TIME;
++			mark_inode_dirty(inode);
++		}
++	}
++	return error;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_cvirt.h linux-3.7.10-vs2.3.5.6/include/linux/vs_cvirt.h
+--- linux-3.7.10/include/linux/vs_cvirt.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_cvirt.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,50 @@
++#ifndef _VS_CVIRT_H
++#define _VS_CVIRT_H
++
++#include "vserver/cvirt.h"
++#include "vserver/context.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++
++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
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_device.h linux-3.7.10-vs2.3.5.6/include/linux/vs_device.h
+--- linux-3.7.10/include/linux/vs_device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_device.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,45 @@
++#ifndef _VS_DEVICE_H
++#define _VS_DEVICE_H
++
++#include "vserver/base.h"
++#include "vserver/device.h"
++#include "vserver/debug.h"
++
++
++#ifdef CONFIG_VSERVER_DEVICE
++
++int vs_map_device(struct vx_info *, dev_t, dev_t *, umode_t);
++
++#define vs_device_perm(v, d, m, p) \
++	((vs_map_device(current_vx_info(), d, NULL, m) & (p)) == (p))
++
++#else
++
++static inline
++int vs_map_device(struct vx_info *vxi,
++	dev_t device, dev_t *target, umode_t mode)
++{
++	if (target)
++		*target = device;
++	return ~0;
++}
++
++#define vs_device_perm(v, d, m, p) ((p) == (p))
++
++#endif
++
++
++#define vs_map_chrdev(d, t, p) \
++	((vs_map_device(current_vx_info(), d, t, S_IFCHR) & (p)) == (p))
++#define vs_map_blkdev(d, t, p) \
++	((vs_map_device(current_vx_info(), d, t, S_IFBLK) & (p)) == (p))
++
++#define vs_chrdev_perm(d, p) \
++	vs_device_perm(current_vx_info(), d, S_IFCHR, p)
++#define vs_blkdev_perm(d, p) \
++	vs_device_perm(current_vx_info(), d, S_IFBLK, p)
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_dlimit.h linux-3.7.10-vs2.3.5.6/include/linux/vs_dlimit.h
+--- linux-3.7.10/include/linux/vs_dlimit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_dlimit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,215 @@
++#ifndef _VS_DLIMIT_H
++#define _VS_DLIMIT_H
++
++#include <linux/fs.h>
++
++#include "vserver/dlimit.h"
++#include "vserver/base.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_tag : 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_tag : 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,
++	tag_t tag, 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, tag);
++	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, tag, __dlimit_char(dli), (long long)nr,
++		ret, file, line);
++	return ret ? -ENOSPC : 0;
++}
++
++static inline void __dl_free_space(struct super_block *sb,
++	tag_t tag, dlsize_t nr, const char *_file, int _line)
++{
++	struct dl_info *dli = NULL;
++
++	if (nr == 0)
++		goto out;
++	dli = locate_dl_info(sb, tag);
++	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, tag, __dlimit_char(dli), (long long)nr,
++		_file, _line);
++}
++
++static inline int __dl_alloc_inode(struct super_block *sb,
++	tag_t tag, const char *_file, int _line)
++{
++	struct dl_info *dli;
++	int ret = 0;
++
++	dli = locate_dl_info(sb, tag);
++	if (!dli)
++		goto out;
++
++	spin_lock(&dli->dl_lock);
++	dli->dl_inodes_used++;
++	ret = (dli->dl_inodes_used > dli->dl_inodes_total);
++	spin_unlock(&dli->dl_lock);
++	put_dl_info(dli);
++out:
++	vxlprintk(VXD_CBIT(dlim, 0),
++		"ALLOC (%p,#%d)%c inode (%d)",
++		sb, tag, __dlimit_char(dli), ret, _file, _line);
++	return ret ? -ENOSPC : 0;
++}
++
++static inline void __dl_free_inode(struct super_block *sb,
++	tag_t tag, const char *_file, int _line)
++{
++	struct dl_info *dli;
++
++	dli = locate_dl_info(sb, tag);
++	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, tag, __dlimit_char(dli), _file, _line);
++}
++
++static inline void __dl_adjust_block(struct super_block *sb, tag_t tag,
++	unsigned long long *free_blocks, unsigned long long *root_blocks,
++	const char *_file, int _line)
++{
++	struct dl_info *dli;
++	uint64_t broot, bfree;
++
++	dli = locate_dl_info(sb, tag);
++	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 %lld,%lld [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 dl_prealloc_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_alloc_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_reserve_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_claim_space(in, bytes) (0)
++
++#define dl_release_space(in, bytes) \
++	__dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_free_space(in, bytes) \
++	__dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++
++
++#define dl_alloc_inode(in) \
++	__dl_alloc_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
++
++#define dl_free_inode(in) \
++	__dl_free_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
++
++
++#define dl_adjust_block(sb, tag, fb, rb) \
++	__dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_inet.h linux-3.7.10-vs2.3.5.6/include/linux/vs_inet.h
+--- linux-3.7.10/include/linux/vs_inet.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_inet.h	2013-01-04 23:27:50.000000000 +0000
+@@ -0,0 +1,364 @@
++#ifndef _VS_INET_H
++#define _VS_INET_H
++
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
++
++#define IPI_LOOPBACK	htonl(INADDR_LOOPBACK)
++
++#define NXAV4(a)	NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
++			NIPQUAD((a)->mask), (a)->type
++#define NXAV4_FMT	"[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
++
++#define NIPQUAD(addr) \
++	((unsigned char *)&addr)[0], \
++	((unsigned char *)&addr)[1], \
++	((unsigned char *)&addr)[2], \
++	((unsigned char *)&addr)[3]
++
++#define NIPQUAD_FMT "%u.%u.%u.%u"
++
++
++static inline
++int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
++{
++	__be32 ip = nxa->ip[0].s_addr;
++	__be32 mask = nxa->mask.s_addr;
++	__be32 bcast = ip | ~mask;
++	int ret = 0;
++
++	switch (nxa->type & tmask) {
++	case NXA_TYPE_MASK:
++		ret = (ip == (addr & mask));
++		break;
++	case NXA_TYPE_ADDR:
++		ret = 3;
++		if (addr == ip)
++			break;
++		/* fall through to broadcast */
++	case NXA_MOD_BCAST:
++		ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
++		break;
++	case NXA_TYPE_RANGE:
++		ret = ((nxa->ip[0].s_addr <= addr) &&
++			(nxa->ip[1].s_addr > addr));
++		break;
++	case NXA_TYPE_ANY:
++		ret = 2;
++		break;
++	}
++
++	vxdprintk(VXD_CBIT(net, 0),
++		"v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
++		nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
++	return ret;
++}
++
++static inline
++int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
++{
++	struct nx_addr_v4 *nxa;
++	unsigned long irqflags;
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++
++	ret = 2;
++	/* allow 127.0.0.1 when remapping lback */
++	if ((tmask & NXA_LOOPBACK) &&
++		(addr == IPI_LOOPBACK) &&
++		nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++		goto out;
++	ret = 3;
++	/* check for lback address */
++	if ((tmask & NXA_MOD_LBACK) &&
++		(nxi->v4_lback.s_addr == addr))
++		goto out;
++	ret = 4;
++	/* check for broadcast address */
++	if ((tmask & NXA_MOD_BCAST) &&
++		(nxi->v4_bcast.s_addr == addr))
++		goto out;
++	ret = 5;
++
++	/* check for v4 addresses */
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (nxa = &nxi->v4; nxa; nxa = nxa->next)
++		if (v4_addr_match(nxa, addr, tmask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++out:
++	vxdprintk(VXD_CBIT(net, 0),
++		"v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
++		nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
++	return ret;
++}
++
++static inline
++int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
++{
++	/* FIXME: needs full range checks */
++	return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
++}
++
++static inline
++int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
++{
++	struct nx_addr_v4 *ptr;
++	unsigned long irqflags;
++	int ret = 1;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (ptr = &nxi->v4; ptr; ptr = ptr->next)
++		if (v4_nx_addr_match(ptr, nxa, mask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	return ret;
++}
++
++#include <net/inet_sock.h>
++
++/*
++ *	Check if a given address matches for a socket
++ *
++ *	nxi:		the socket's nx_info if any
++ *	addr:		to be verified address
++ */
++static inline
++int v4_sock_addr_match (
++	struct nx_info *nxi,
++	struct inet_sock *inet,
++	__be32 addr)
++{
++	__be32 saddr = inet->inet_rcv_saddr;
++	__be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
++
++	if (addr && (saddr == addr || bcast == addr))
++		return 1;
++	if (!saddr)
++		return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
++	return 0;
++}
++
++
++/* inet related checks and helpers */
++
++
++struct in_ifaddr;
++struct net_device;
++struct sock;
++
++#ifdef CONFIG_INET
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_sock.h>
++#include <net/inet_timewait_sock.h>
++
++
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
++
++
++/*
++ *	check if address is covered by socket
++ *
++ *	sk:	the socket to check against
++ *	addr:	the address in question (must be != 0)
++ */
++
++static inline
++int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
++{
++	struct nx_info *nxi = sk->sk_nx_info;
++	__be32 saddr = sk_rcv_saddr(sk);
++
++	vxdprintk(VXD_CBIT(net, 5),
++		"__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
++		sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
++		(sk->sk_socket?sk->sk_socket->flags:0));
++
++	if (saddr) {		/* direct address match */
++		return v4_addr_match(nxa, saddr, -1);
++	} else if (nxi) {	/* match against nx_info */
++		return v4_nx_addr_in_nx_info(nxi, nxa, -1);
++	} else {		/* unrestricted any socket */
++		return 1;
++	}
++}
++
++
++
++static inline
++int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
++{
++	vxdprintk(VXD_CBIT(net, 1),
++		"nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d",
++		nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
++		nxi ? dev_in_nx_info(dev, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (dev_in_nx_info(dev, nxi))
++		return 1;
++	return 0;
++}
++
++
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (!ifa)
++		return 0;
++	return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
++}
++
++static inline
++int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
++{
++	vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
++		nxi, nxi ? nxi->nx_id : 0, ifa,
++		nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (v4_ifa_in_nx_info(ifa, nxi))
++		return 1;
++	return 0;
++}
++
++
++struct nx_v4_sock_addr {
++	__be32 saddr;	/* Address used for validation */
++	__be32 baddr;	/* Address used for socket bind */
++};
++
++static inline
++int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
++	struct nx_v4_sock_addr *nsa)
++{
++	struct sock *sk = &inet->sk;
++	struct nx_info *nxi = sk->sk_nx_info;
++	__be32 saddr = addr->sin_addr.s_addr;
++	__be32 baddr = saddr;
++
++	vxdprintk(VXD_CBIT(net, 3),
++		"inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
++		sk, sk->sk_nx_info, sk->sk_socket,
++		(sk->sk_socket ? sk->sk_socket->flags : 0),
++		NIPQUAD(saddr));
++
++	if (nxi) {
++		if (saddr == INADDR_ANY) {
++			if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
++				baddr = nxi->v4.ip[0].s_addr;
++		} else if (saddr == IPI_LOOPBACK) {
++			if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++				baddr = nxi->v4_lback.s_addr;
++		} else if (!ipv4_is_multicast(saddr) ||
++			!nx_info_ncaps(nxi, NXC_MULTICAST)) {
++			/* normal address bind */
++			if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
++				return -EADDRNOTAVAIL;
++		}
++	}
++
++	vxdprintk(VXD_CBIT(net, 3),
++		"inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
++		sk, NIPQUAD(saddr), NIPQUAD(baddr));
++
++	nsa->saddr = saddr;
++	nsa->baddr = baddr;
++	return 0;
++}
++
++static inline
++void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
++{
++	inet->inet_saddr = nsa->baddr;
++	inet->inet_rcv_saddr = nsa->baddr;
++}
++
++
++/*
++ *      helper to simplify inet_lookup_listener
++ *
++ *      nxi:	the socket's nx_info if any
++ *      addr:	to be verified address
++ *      saddr:	socket address
++ */
++static inline int v4_inet_addr_match (
++	struct nx_info *nxi,
++	__be32 addr,
++	__be32 saddr)
++{
++	if (addr && (saddr == addr))
++		return 1;
++	if (!saddr)
++		return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
++	return 0;
++}
++
++static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
++{
++	if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
++		(addr == nxi->v4_lback.s_addr))
++		return IPI_LOOPBACK;
++	return addr;
++}
++
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (NX_IPV4(nxi))
++		return 1;
++	if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++		return 1;
++	return 0;
++}
++
++#else /* CONFIG_INET */
++
++static inline
++int nx_dev_visible(struct nx_info *n, struct net_device *d)
++{
++	return 1;
++}
++
++static inline
++int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++	return 1;
++}
++
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++	return 1;
++}
++
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++	return 0;
++}
++
++#endif /* CONFIG_INET */
++
++#define current_nx_info_has_v4() \
++	nx_info_has_v4(current_nx_info())
++
++#else
++// #warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_inet6.h linux-3.7.10-vs2.3.5.6/include/linux/vs_inet6.h
+--- linux-3.7.10/include/linux/vs_inet6.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_inet6.h	2013-01-04 23:27:50.000000000 +0000
+@@ -0,0 +1,257 @@
++#ifndef _VS_INET6_H
++#define _VS_INET6_H
++
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
++
++#include <net/ipv6.h>
++
++#define NXAV6(a)	&(a)->ip, &(a)->mask, (a)->prefix, (a)->type
++#define NXAV6_FMT	"[%pI6/%pI6/%d:%04x]"
++
++
++#ifdef	CONFIG_IPV6
++
++static inline
++int v6_addr_match(struct nx_addr_v6 *nxa,
++	const struct in6_addr *addr, uint16_t mask)
++{
++	int ret = 0;
++
++	switch (nxa->type & mask) {
++	case NXA_TYPE_MASK:
++		ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
++		break;
++	case NXA_TYPE_ADDR:
++		ret = ipv6_addr_equal(&nxa->ip, addr);
++		break;
++	case NXA_TYPE_ANY:
++		ret = 1;
++		break;
++	}
++	vxdprintk(VXD_CBIT(net, 0),
++		"v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
++		nxa, NXAV6(nxa), addr, mask, ret);
++	return ret;
++}
++
++static inline
++int v6_addr_in_nx_info(struct nx_info *nxi,
++	const struct in6_addr *addr, uint16_t mask)
++{
++	struct nx_addr_v6 *nxa;
++	unsigned long irqflags;
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (nxa = &nxi->v6; nxa; nxa = nxa->next)
++		if (v6_addr_match(nxa, addr, mask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++out:
++	vxdprintk(VXD_CBIT(net, 0),
++		"v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
++		nxi, nxi ? nxi->nx_id : 0, addr, mask, ret);
++	return ret;
++}
++
++static inline
++int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
++{
++	/* FIXME: needs full range checks */
++	return v6_addr_match(nxa, &addr->ip, mask);
++}
++
++static inline
++int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
++{
++	struct nx_addr_v6 *ptr;
++	unsigned long irqflags;
++	int ret = 1;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (ptr = &nxi->v6; ptr; ptr = ptr->next)
++		if (v6_nx_addr_match(ptr, nxa, mask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	return ret;
++}
++
++
++/*
++ *	Check if a given address matches for a socket
++ *
++ *	nxi:		the socket's nx_info if any
++ *	addr:		to be verified address
++ */
++static inline
++int v6_sock_addr_match (
++	struct nx_info *nxi,
++	struct inet_sock *inet,
++	struct in6_addr *addr)
++{
++	struct sock *sk = &inet->sk;
++	struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	if (!ipv6_addr_any(addr) &&
++		ipv6_addr_equal(saddr, addr))
++		return 1;
++	if (ipv6_addr_any(saddr))
++		return v6_addr_in_nx_info(nxi, addr, -1);
++	return 0;
++}
++
++/*
++ *	check if address is covered by socket
++ *
++ *	sk:	the socket to check against
++ *	addr:	the address in question (must be != 0)
++ */
++
++static inline
++int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
++{
++	struct nx_info *nxi = sk->sk_nx_info;
++	struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	vxdprintk(VXD_CBIT(net, 5),
++		"__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
++		sk, NXAV6(nxa), nxi, saddr, sk->sk_socket,
++		(sk->sk_socket?sk->sk_socket->flags:0));
++
++	if (!ipv6_addr_any(saddr)) {	/* direct address match */
++		return v6_addr_match(nxa, saddr, -1);
++	} else if (nxi) {		/* match against nx_info */
++		return v6_nx_addr_in_nx_info(nxi, nxa, -1);
++	} else {			/* unrestricted any socket */
++		return 1;
++	}
++}
++
++
++/* inet related checks and helpers */
++
++
++struct in_ifaddr;
++struct net_device;
++struct sock;
++
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_timewait_sock.h>
++
++
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
++
++
++
++static inline
++int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (!ifa)
++		return 0;
++	return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
++}
++
++static inline
++int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
++{
++	vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d",
++		nxi, nxi ? nxi->nx_id : 0, ifa,
++		nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (v6_ifa_in_nx_info(ifa, nxi))
++		return 1;
++	return 0;
++}
++
++
++struct nx_v6_sock_addr {
++	struct in6_addr saddr;	/* Address used for validation */
++	struct in6_addr baddr;	/* Address used for socket bind */
++};
++
++static inline
++int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
++	struct nx_v6_sock_addr *nsa)
++{
++	// struct sock *sk = &inet->sk;
++	// struct nx_info *nxi = sk->sk_nx_info;
++	struct in6_addr saddr = addr->sin6_addr;
++	struct in6_addr baddr = saddr;
++
++	nsa->saddr = saddr;
++	nsa->baddr = baddr;
++	return 0;
++}
++
++static inline
++void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
++{
++	// struct sock *sk = &inet->sk;
++	// struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	// *saddr = nsa->baddr;
++	// inet->inet_saddr = nsa->baddr;
++}
++
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (NX_IPV6(nxi))
++		return 1;
++	return 0;
++}
++
++#else /* CONFIG_IPV6 */
++
++static inline
++int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
++{
++	return 1;
++}
++
++
++static inline
++int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++	return 1;
++}
++
++static inline
++int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++	return 1;
++}
++
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++	return 0;
++}
++
++#endif /* CONFIG_IPV6 */
++
++#define current_nx_info_has_v6() \
++	nx_info_has_v6(current_nx_info())
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_limit.h linux-3.7.10-vs2.3.5.6/include/linux/vs_limit.h
+--- linux-3.7.10/include/linux/vs_limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_limit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,140 @@
++#ifndef _VS_LIMIT_H
++#define _VS_LIMIT_H
++
++#include "vserver/limit.h"
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/context.h"
++#include "vserver/limit_int.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__)
++
++
++#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)
++
++
++/* 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__)
++
++
++#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)
++
++
++/* dentry limits */
++
++#define vx_dentry_inc(d) do {						\
++	if ((d)->d_count == 1)						\
++		vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY);	\
++	} while (0)
++
++#define vx_dentry_dec(d) do {						\
++	if ((d)->d_count == 0)						\
++		vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY);	\
++	} while (0)
++
++#define vx_dentry_avail(n) \
++	vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
++
++
++/* 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)
++
++
++#define vx_semary_inc(a) \
++	vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
++
++#define vx_semary_dec(a) \
++	vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
++
++
++#define vx_nsems_add(a,n) \
++	vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++
++#define vx_nsems_sub(a,n) \
++	vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_network.h linux-3.7.10-vs2.3.5.6/include/linux/vs_network.h
+--- linux-3.7.10/include/linux/vs_network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_network.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,169 @@
++#ifndef _NX_VS_NETWORK_H
++#define _NX_VS_NETWORK_H
++
++#include "vserver/context.h"
++#include "vserver/network.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++#include <linux/sched.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;
++}
++
++
++static inline void exit_nx_info(struct task_struct *p)
++{
++	if (p->nx_info)
++		release_nx_info(p->nx_info, p);
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_pid.h linux-3.7.10-vs2.3.5.6/include/linux/vs_pid.h
+--- linux-3.7.10/include/linux/vs_pid.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_pid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,50 @@
++#ifndef _VS_PID_H
++#define _VS_PID_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/pid.h"
++#include <linux/pid_namespace.h>
++
++
++#define VXF_FAKE_INIT	(VXF_INFO_INIT | VXF_STATE_INIT)
++
++static inline
++int vx_proc_task_visible(struct task_struct *task)
++{
++	if ((task->pid == 1) &&
++		!vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
++		/* show a blend through init */
++		goto visible;
++	if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
++		goto visible;
++	return 0;
++visible:
++	return 1;
++}
++
++#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
++
++
++static inline
++struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
++{
++	struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
++
++	if (task && !vx_proc_task_visible(task)) {
++		vxdprintk(VXD_CBIT(misc, 6),
++			"dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
++			task, task->xid, task->pid,
++			current, current->xid, current->pid);
++		put_task_struct(task);
++		task = NULL;
++	}
++	return task;
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_sched.h linux-3.7.10-vs2.3.5.6/include/linux/vs_sched.h
+--- linux-3.7.10/include/linux/vs_sched.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_sched.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,40 @@
++#ifndef _VS_SCHED_H
++#define _VS_SCHED_H
++
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/sched.h"
++
++
++#define MAX_PRIO_BIAS		 20
++#define MIN_PRIO_BIAS		-20
++
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi)
++		prio += vx_cpu(vxi, sched_pc).prio_bias;
++	return prio;
++}
++
++static inline void vx_account_user(struct vx_info *vxi,
++	cputime_t cputime, int nice)
++{
++	if (!vxi)
++		return;
++	vx_cpu(vxi, sched_pc).user_ticks += cputime;
++}
++
++static inline void vx_account_system(struct vx_info *vxi,
++	cputime_t cputime, int idle)
++{
++	if (!vxi)
++		return;
++	vx_cpu(vxi, sched_pc).sys_ticks += cputime;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_socket.h linux-3.7.10-vs2.3.5.6/include/linux/vs_socket.h
+--- linux-3.7.10/include/linux/vs_socket.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_socket.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,67 @@
++#ifndef _VS_SOCKET_H
++#define _VS_SOCKET_H
++
++#include "vserver/debug.h"
++#include "vserver/base.h"
++#include "vserver/cacct.h"
++#include "vserver/context.h"
++#include "vserver/tag.h"
++
++
++/* socket accounting */
++
++#include <linux/socket.h>
++
++static inline int vx_sock_type(int family)
++{
++	switch (family) {
++	case PF_UNSPEC:
++		return VXA_SOCK_UNSPEC;
++	case PF_UNIX:
++		return VXA_SOCK_UNIX;
++	case PF_INET:
++		return VXA_SOCK_INET;
++	case PF_INET6:
++		return VXA_SOCK_INET6;
++	case PF_PACKET:
++		return VXA_SOCK_PACKET;
++	default:
++		return VXA_SOCK_OTHER;
++	}
++}
++
++#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_long_inc(&vxi->cacct.sock[type][pos].count);
++		atomic_long_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
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_tag.h linux-3.7.10-vs2.3.5.6/include/linux/vs_tag.h
+--- linux-3.7.10/include/linux/vs_tag.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_tag.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,47 @@
++#ifndef _VS_TAG_H
++#define _VS_TAG_H
++
++#include <linux/vserver/tag.h>
++
++/* check conditions */
++
++#define DX_ADMIN	0x0001
++#define DX_WATCH	0x0002
++#define DX_HOSTID	0x0008
++
++#define DX_IDENT	0x0010
++
++#define DX_ARG_MASK	0x0010
++
++
++#define dx_task_tag(t)	((t)->tag)
++
++#define dx_current_tag() dx_task_tag(current)
++
++#define dx_check(c, m)	__dx_check(dx_current_tag(), c, m)
++
++#define dx_weak_check(c, m)	((m) ? dx_check(c, m) : 1)
++
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++{
++	if (mode & DX_ARG_MASK) {
++		if ((mode & DX_IDENT) && (id == cid))
++			return 1;
++	}
++	return (((mode & DX_ADMIN) && (cid == 0)) ||
++		((mode & DX_WATCH) && (cid == 1)) ||
++		((mode & DX_HOSTID) && (id == 0)));
++}
++
++struct inode;
++int dx_permission(const struct inode *inode, int mask);
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_time.h linux-3.7.10-vs2.3.5.6/include/linux/vs_time.h
+--- linux-3.7.10/include/linux/vs_time.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_time.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VS_TIME_H
++#define _VS_TIME_H
++
++
++/* time faking stuff */
++
++#ifdef CONFIG_VSERVER_VTIME
++
++extern void vx_adjust_timespec(struct timespec *ts);
++extern int vx_settimeofday(const struct timespec *ts);
++
++#else
++#define	vx_adjust_timespec(t)	do { } while (0)
++#define	vx_settimeofday(t)	do_settimeofday(t)
++#endif
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/base.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/base.h
+--- linux-3.7.10/include/linux/vserver/base.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/base.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,178 @@
++#ifndef _VSERVER_BASE_H
++#define _VSERVER_BASE_H
++
++
++/* context state changes */
++
++enum {
++	VSC_STARTUP = 1,
++	VSC_SHUTDOWN,
++
++	VSC_NETUP,
++	VSC_NETDOWN,
++};
++
++
++
++#define vx_task_xid(t)	((t)->xid)
++
++#define vx_current_xid() vx_task_xid(current)
++
++#define current_vx_info() (current->vx_info)
++
++
++#define nx_task_nid(t)	((t)->nid)
++
++#define nx_current_nid() nx_task_nid(current)
++
++#define current_nx_info() (current->nx_info)
++
++
++/* generic flag merging */
++
++#define vs_check_flags(v, m, f)	(((v) & (m)) ^ (f))
++
++#define vs_mask_flags(v, f, m)	(((v) & ~(m)) | ((f) & (m)))
++
++#define vs_mask_mask(v, f, m)	(((v) & ~(m)) | ((v) & (f) & (m)))
++
++#define vs_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) \
++	vs_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))
++
++
++
++/* network flags */
++
++#define __nx_flags(n)	((n) ? (n)->nx_flags : 0)
++
++#define nx_current_flags()	__nx_flags(current_nx_info())
++
++#define nx_info_flags(n, m, f) \
++	vs_check_flags(__nx_flags(n), 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)
++
++
++/* network caps */
++
++#define __nx_ncaps(n)	((n) ? (n)->nx_ncaps : 0)
++
++#define nx_current_ncaps()	__nx_ncaps(current_nx_info())
++
++#define nx_info_ncaps(n, c)	(__nx_ncaps(n) & (c))
++
++#define nx_ncaps(c)	nx_info_ncaps(current_nx_info(), c)
++
++
++/* context mask capabilities */
++
++#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)
++
++
++/* context bcap mask */
++
++#define __vx_bcaps(v)		((v)->vx_bcaps)
++
++#define vx_current_bcaps()	__vx_bcaps(current_vx_info())
++
++
++/* mask given bcaps */
++
++#define vx_info_mbcaps(v, c)	((v) ? cap_intersect(__vx_bcaps(v), c) : c)
++
++#define vx_mbcaps(c)		vx_info_mbcaps(current_vx_info(), c)
++
++
++/* masked cap_bset */
++
++#define vx_info_cap_bset(v)	vx_info_mbcaps(v, current->cap_bset)
++
++#define vx_current_cap_bset()	vx_info_cap_bset(current_vx_info())
++
++#if 0
++#define vx_info_mbcap(v, b) \
++	(!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
++	vx_info_bcaps(v, b) : (b))
++
++#define task_vx_mbcap(t, b) \
++	vx_info_mbcap((t)->vx_info, (t)->b)
++
++#define vx_mbcap(b)	task_vx_mbcap(current, b)
++#endif
++
++#define vx_cap_raised(v, c, f)	cap_raised(vx_info_mbcaps(v, c), f)
++
++#define vx_capable(b, c) (capable(b) || \
++	(cap_raised(current_cap(), b) && vx_ccaps(c)))
++
++#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \
++	(cap_raised(current_cap(), b) && vx_ccaps(c)))
++
++#define nx_capable(b, c) (capable(b) || \
++	(cap_raised(current_cap(), b) && nx_ncaps(c)))
++
++#define vx_task_initpid(t, n) \
++	((t)->vx_info && \
++	((t)->vx_info->vx_initpid == (n)))
++
++#define vx_current_initpid(n)	vx_task_initpid(current, n)
++
++
++/* context unshare mask */
++
++#define __vx_umask(v)		((v)->vx_umask)
++
++#define vx_current_umask()	__vx_umask(current_vx_info())
++
++#define vx_can_unshare(b, f) (capable(b) || \
++	(cap_raised(current_cap(), b) && \
++	!((f) & ~vx_current_umask())))
++
++
++#define __vx_wmask(v)		((v)->vx_wmask)
++
++#define vx_current_wmask()	__vx_wmask(current_vx_info())
++
++
++#define __vx_state(v)	((v) ? ((v)->vx_state) : 0)
++
++#define vx_info_state(v, m)	(__vx_state(v) & (m))
++
++
++#define __nx_state(n)	((n) ? ((n)->nx_state) : 0)
++
++#define nx_info_state(n, m)	(__nx_state(n) & (m))
++
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct.h
+--- linux-3.7.10/include/linux/vserver/cacct.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,15 @@
++#ifndef _VSERVER_CACCT_H
++#define _VSERVER_CACCT_H
++
++
++enum sock_acc_field {
++	VXA_SOCK_UNSPEC = 0,
++	VXA_SOCK_UNIX,
++	VXA_SOCK_INET,
++	VXA_SOCK_INET6,
++	VXA_SOCK_PACKET,
++	VXA_SOCK_OTHER,
++	VXA_SOCK_SIZE	/* array size */
++};
++
++#endif	/* _VSERVER_CACCT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_cmd.h
+--- linux-3.7.10/include/linux/vserver/cacct_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_CACCT_CMD_H
++#define _VSERVER_CACCT_CMD_H
++
++
++#include <linux/compiler.h>
++#include <uapi/vserver/cacct_cmd.h>
++
++extern int vc_sock_stat(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_def.h
+--- linux-3.7.10/include/linux/vserver/cacct_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,43 @@
++#ifndef _VSERVER_CACCT_DEF_H
++#define _VSERVER_CACCT_DEF_H
++
++#include <asm/atomic.h>
++#include <linux/vserver/cacct.h>
++
++
++struct _vx_sock_acc {
++	atomic_long_t count;
++	atomic_long_t total;
++};
++
++/* context sub struct */
++
++struct _vx_cacct {
++	struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
++	atomic_t slab[8];
++	atomic_t page[6][8];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++{
++	int i, j;
++
++	printk("\t_vx_cacct:");
++	for (i = 0; i < 6; i++) {
++		struct _vx_sock_acc *ptr = cacct->sock[i];
++
++		printk("\t [%d] =", i);
++		for (j = 0; j < 3; j++) {
++			printk(" [%d] = %8lu, %8lu", j,
++				atomic_long_read(&ptr[j].count),
++				atomic_long_read(&ptr[j].total));
++		}
++		printk("\n");
++	}
++}
++
++#endif
++
++#endif	/* _VSERVER_CACCT_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct_int.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_int.h
+--- linux-3.7.10/include/linux/vserver/cacct_int.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_int.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _VSERVER_CACCT_INT_H
++#define _VSERVER_CACCT_INT_H
++
++static inline
++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++	return atomic_long_read(&cacct->sock[type][pos].count);
++}
++
++
++static inline
++unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++{
++	return atomic_long_read(&cacct->sock[type][pos].total);
++}
++
++#endif	/* _VSERVER_CACCT_INT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/check.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/check.h
+--- linux-3.7.10/include/linux/vserver/check.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/check.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,89 @@
++#ifndef _VSERVER_CHECK_H
++#define _VSERVER_CHECK_H
++
++
++#define MAX_S_CONTEXT	65535	/* Arbitrary limit */
++
++#ifdef	CONFIG_VSERVER_DYNAMIC_IDS
++#define MIN_D_CONTEXT	49152	/* dynamic contexts start here */
++#else
++#define MIN_D_CONTEXT	65536
++#endif
++
++/* check conditions */
++
++#define VS_ADMIN	0x0001
++#define VS_WATCH	0x0002
++#define VS_HIDE		0x0004
++#define VS_HOSTID	0x0008
++
++#define VS_IDENT	0x0010
++#define VS_EQUIV	0x0020
++#define VS_PARENT	0x0040
++#define VS_CHILD	0x0080
++
++#define VS_ARG_MASK	0x00F0
++
++#define VS_DYNAMIC	0x0100
++#define VS_STATIC	0x0200
++
++#define VS_ATR_MASK	0x0F00
++
++#ifdef	CONFIG_VSERVER_PRIVACY
++#define VS_ADMIN_P	(0)
++#define VS_WATCH_P	(0)
++#else
++#define VS_ADMIN_P	VS_ADMIN
++#define VS_WATCH_P	VS_WATCH
++#endif
++
++#define VS_HARDIRQ	0x1000
++#define VS_SOFTIRQ	0x2000
++#define VS_IRQ		0x4000
++
++#define VS_IRQ_MASK	0xF000
++
++#include <linux/hardirq.h>
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __vs_check(int cid, int id, unsigned int mode)
++{
++	if (mode & VS_ARG_MASK) {
++		if ((mode & VS_IDENT) && (id == cid))
++			return 1;
++	}
++	if (mode & VS_ATR_MASK) {
++		if ((mode & VS_DYNAMIC) &&
++			(id >= MIN_D_CONTEXT) &&
++			(id <= MAX_S_CONTEXT))
++			return 1;
++		if ((mode & VS_STATIC) &&
++			(id > 1) && (id < MIN_D_CONTEXT))
++			return 1;
++	}
++	if (mode & VS_IRQ_MASK) {
++		if ((mode & VS_IRQ) && unlikely(in_interrupt()))
++			return 1;
++		if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
++			return 1;
++		if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
++			return 1;
++	}
++	return (((mode & VS_ADMIN) && (cid == 0)) ||
++		((mode & VS_WATCH) && (cid == 1)) ||
++		((mode & VS_HOSTID) && (id == 0)));
++}
++
++#define vx_check(c, m)	__vs_check(vx_current_xid(), c, (m) | VS_IRQ)
++
++#define vx_weak_check(c, m)	((m) ? vx_check(c, m) : 1)
++
++
++#define nx_check(c, m)	__vs_check(nx_current_nid(), c, m)
++
++#define nx_weak_check(c, m)	((m) ? nx_check(c, m) : 1)
++
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/context.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/context.h
+--- linux-3.7.10/include/linux/vserver/context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/context.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,110 @@
++#ifndef _VSERVER_CONTEXT_H
++#define _VSERVER_CONTEXT_H
++
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <uapi/vserver/context.h>
++
++#include "limit_def.h"
++#include "sched_def.h"
++#include "cvirt_def.h"
++#include "cacct_def.h"
++#include "device_def.h"
++
++#define VX_SPACES	2
++
++struct _vx_info_pc {
++	struct _vx_sched_pc sched_pc;
++	struct _vx_cvirt_pc cvirt_pc;
++};
++
++struct _vx_space {
++	unsigned long vx_nsmask;		/* assignment mask */
++	struct nsproxy *vx_nsproxy;             /* private namespaces */
++	struct fs_struct *vx_fs;                /* private namespace fs */
++	const struct cred *vx_cred;             /* task credentials */
++};
++
++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 _vx_space space[VX_SPACES];	/* namespace store */
++
++	uint64_t vx_flags;			/* context flags */
++	uint64_t vx_ccaps;			/* context caps (vserver) */
++	uint64_t vx_umask;			/* unshare mask (guest) */
++	uint64_t vx_wmask;			/* warn mask (guest) */
++	kernel_cap_t vx_bcaps;			/* bounding caps (system) */
++
++	struct task_struct *vx_reaper;		/* guest reaper process */
++	pid_t vx_initpid;			/* PID of guest init */
++	int64_t vx_badness_bias;		/* OOM points bias */
++
++	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 */
++
++	struct _vx_device dmap;			/* default device map targets */
++
++#ifndef CONFIG_SMP
++	struct _vx_info_pc info_pc;		/* per cpu data */
++#else
++	struct _vx_info_pc *ptr_pc;		/* per cpu array */
++#endif
++
++	wait_queue_head_t vx_wait;		/* context exit waitqueue */
++	int reboot_cmd;				/* last sys_reboot() cmd */
++	int exit_code;				/* last process exit code */
++
++	char vx_name[65];			/* vserver name */
++};
++
++#ifndef CONFIG_SMP
++#define	vx_ptr_pc(vxi)		(&(vxi)->info_pc)
++#define	vx_per_cpu(vxi, v, id)	vx_ptr_pc(vxi)->v
++#else
++#define	vx_ptr_pc(vxi)		((vxi)->ptr_pc)
++#define	vx_per_cpu(vxi, v, id)	per_cpu_ptr(vx_ptr_pc(vxi), id)->v
++#endif
++
++#define	vx_cpu(vxi, v)		vx_per_cpu(vxi, v, smp_processor_id())
++
++
++struct vx_info_save {
++	struct vx_info *vxi;
++	xid_t xid;
++};
++
++
++/* status flags */
++
++#define VXS_HASHED	0x0001
++#define VXS_PAUSED	0x0010
++#define VXS_SHUTDOWN	0x0100
++#define VXS_HELPER	0x1000
++#define VXS_RELEASED	0x8000
++
++
++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 *lookup_vx_info(int);
++extern struct vx_info *lookup_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 *, int);
++
++extern long vs_state_change(struct vx_info *, unsigned int);
++
++
++#endif	/* _VSERVER_CONTEXT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/context_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/context_cmd.h
+--- linux-3.7.10/include/linux/vserver/context_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/context_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,33 @@
++#ifndef _VSERVER_CONTEXT_CMD_H
++#define _VSERVER_CONTEXT_CMD_H
++
++#include <uapi/vserver/context_cmd.h>
++
++extern int vc_task_xid(uint32_t);
++
++extern int vc_vx_info(struct vx_info *, void __user *);
++
++extern int vc_ctx_stat(struct vx_info *, void __user *);
++
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
++
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
++
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
++
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
++
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
++
++extern int vc_get_wmask(struct vx_info *, void __user *);
++extern int vc_set_wmask(struct vx_info *, void __user *);
++
++extern int vc_get_badness(struct vx_info *, void __user *);
++extern int vc_set_badness(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cvirt.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt.h
+--- linux-3.7.10/include/linux/vserver/cvirt.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,18 @@
++#ifndef _VSERVER_CVIRT_H
++#define _VSERVER_CVIRT_H
++
++struct timespec;
++
++void vx_vsi_boottime(struct timespec *);
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++int vx_do_syslog(int, char __user *, int);
++
++#endif	/* _VSERVER_CVIRT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cvirt_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_cmd.h
+--- linux-3.7.10/include/linux/vserver/cvirt_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_CVIRT_CMD_H
++#define _VSERVER_CVIRT_CMD_H
++
++
++#include <linux/compiler.h>
++#include <uapi/vserver/cvirt_cmd.h>
++
++extern int vc_set_vhi_name(struct vx_info *, void __user *);
++extern int vc_get_vhi_name(struct vx_info *, void __user *);
++
++extern int vc_virt_stat(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cvirt_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_def.h
+--- linux-3.7.10/include/linux/vserver/cvirt_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,80 @@
++#ifndef _VSERVER_CVIRT_DEF_H
++#define _VSERVER_CVIRT_DEF_H
++
++#include <linux/jiffies.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 {
++	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_ts;	/* time offset to the host */
++	struct timespec bias_idle;
++	struct timespec bias_uptime;	/* context creation point */
++	uint64_t bias_clock;		/* offset in clock_t */
++
++	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 calculated */
++	uint32_t load[3];		/* load averages 1,5,15 */
++
++	atomic_t total_forks;		/* number of forks so far */
++
++	struct _vx_syslog syslog;
++};
++
++struct _vx_cvirt_pc {
++	struct _vx_usage_stat cpustat;
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
++{
++	printk("\t_vx_cvirt:\n");
++	printk("\t threads: %4d, %4d, %4d, %4d\n",
++		atomic_read(&cvirt->nr_threads),
++		atomic_read(&cvirt->nr_running),
++		atomic_read(&cvirt->nr_uninterruptible),
++		atomic_read(&cvirt->nr_onhold));
++	/* add rest here */
++	printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
++}
++
++#endif
++
++#endif	/* _VSERVER_CVIRT_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/debug.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug.h
+--- linux-3.7.10/include/linux/vserver/debug.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,145 @@
++#ifndef _VSERVER_DEBUG_H
++#define _VSERVER_DEBUG_H
++
++
++#define VXD_CBIT(n, m)	(vs_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n, m)	(vs_debug_ ## n > (m))
++#define VXD_MASK(n, m)	(vs_debug_ ## n & (m))
++
++#define VXD_DEV(d)	(d), (d)->bd_inode->i_ino,		\
++			imajor((d)->bd_inode), iminor((d)->bd_inode)
++#define VXF_DEV		"%p[%lu,%d:%d]"
++
++#if	defined(CONFIG_QUOTES_UTF8)
++#define	VS_Q_LQM	"\xc2\xbb"
++#define	VS_Q_RQM	"\xc2\xab"
++#elif	defined(CONFIG_QUOTES_ASCII)
++#define	VS_Q_LQM	"\x27"
++#define	VS_Q_RQM	"\x27"
++#else
++#define	VS_Q_LQM	"\xbb"
++#define	VS_Q_RQM	"\xab"
++#endif
++
++#define	VS_Q(f)		VS_Q_LQM f VS_Q_RQM
++
++
++#define vxd_path(p)						\
++	({ static char _buffer[PATH_MAX];			\
++	   d_path(p, _buffer, sizeof(_buffer)); })
++
++#define vxd_cond_path(n)					\
++	((n) ? vxd_path(&(n)->path) : "<null>" )
++
++
++#ifdef	CONFIG_VSERVER_DEBUG
++
++extern unsigned int vs_debug_switch;
++extern unsigned int vs_debug_xid;
++extern unsigned int vs_debug_nid;
++extern unsigned int vs_debug_tag;
++extern unsigned int vs_debug_net;
++extern unsigned int vs_debug_limit;
++extern unsigned int vs_debug_cres;
++extern unsigned int vs_debug_dlim;
++extern unsigned int vs_debug_quota;
++extern unsigned int vs_debug_cvirt;
++extern unsigned int vs_debug_space;
++extern unsigned int vs_debug_perm;
++extern unsigned int vs_debug_misc;
++
++
++#define VX_LOGLEVEL	"vxD: "
++#define VX_PROC_FMT	"%p: "
++#define VX_PROCESS	current
++
++#define vxdprintk(c, f, x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_LOGLEVEL VX_PROC_FMT f "\n",	\
++				VX_PROCESS , ##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)
++
++
++struct vx_info;
++
++void dump_vx_info(struct vx_info *, int);
++void dump_vx_info_inactive(int);
++
++#else	/* CONFIG_VSERVER_DEBUG */
++
++#define vs_debug_switch	0
++#define vs_debug_xid	0
++#define vs_debug_nid	0
++#define vs_debug_tag	0
++#define vs_debug_net	0
++#define vs_debug_limit	0
++#define vs_debug_cres	0
++#define vs_debug_dlim	0
++#define vs_debug_quota	0
++#define vs_debug_cvirt	0
++#define vs_debug_space	0
++#define vs_debug_perm	0
++#define vs_debug_misc	0
++
++#define vxdprintk(x...) do { } while (0)
++#define vxlprintk(x...) do { } while (0)
++#define vxfprintk(x...) do { } while (0)
++
++#endif	/* CONFIG_VSERVER_DEBUG */
++
++
++#ifdef	CONFIG_VSERVER_WARN
++
++#define VX_WARNLEVEL	KERN_WARNING "vxW: "
++#define VX_WARN_TASK	"[" VS_Q("%s") ",%u:#%u|%u|%u] "
++#define VX_WARN_XID	"[xid #%u] "
++#define VX_WARN_NID	"[nid #%u] "
++#define VX_WARN_TAG	"[tag #%u] "
++
++#define vxwprintk(c, f, x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_WARNLEVEL f "\n", ##x);	\
++	} while (0)
++
++#else	/* CONFIG_VSERVER_WARN */
++
++#define vxwprintk(x...) do { } while (0)
++
++#endif	/* CONFIG_VSERVER_WARN */
++
++#define vxwprintk_task(c, f, x...)				\
++	vxwprintk(c, VX_WARN_TASK f,				\
++		current->comm, current->pid,			\
++		current->xid, current->nid, current->tag, ##x)
++#define vxwprintk_xid(c, f, x...)				\
++	vxwprintk(c, VX_WARN_XID f, current->xid, x)
++#define vxwprintk_nid(c, f, x...)				\
++	vxwprintk(c, VX_WARN_NID f, current->nid, x)
++#define vxwprintk_tag(c, f, x...)				\
++	vxwprintk(c, VX_WARN_TAG f, current->tag, x)
++
++#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 /* _VSERVER_DEBUG_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/debug_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug_cmd.h
+--- linux-3.7.10/include/linux/vserver/debug_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_DEBUG_CMD_H
++#define _VSERVER_DEBUG_CMD_H
++
++#include <uapi/vserver/debug_cmd.h>
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_read_history_v0_x32 {
++	uint32_t index;
++	uint32_t count;
++	compat_uptr_t data_ptr;
++};
++
++struct	vcmd_read_monitor_v0_x32 {
++	uint32_t index;
++	uint32_t count;
++	compat_uptr_t data_ptr;
++};
++
++#endif  /* CONFIG_COMPAT */
++
++extern int vc_dump_history(uint32_t);
++
++extern int vc_read_history(uint32_t, void __user *);
++extern int vc_read_monitor(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_read_history_x32(uint32_t, void __user *);
++extern int vc_read_monitor_x32(uint32_t, void __user *);
++
++#endif  /* CONFIG_COMPAT */
++
++#endif	/* _VSERVER_DEBUG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/device.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/device.h
+--- linux-3.7.10/include/linux/vserver/device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/device.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,9 @@
++#ifndef _VSERVER_DEVICE_H
++#define _VSERVER_DEVICE_H
++
++
++#include <uapi/vserver/device.h>
++
++#else	/* _VSERVER_DEVICE_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_DEVICE_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/device_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_cmd.h
+--- linux-3.7.10/include/linux/vserver/device_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,31 @@
++#ifndef _VSERVER_DEVICE_CMD_H
++#define _VSERVER_DEVICE_CMD_H
++
++#include <uapi/vserver/device_cmd.h>
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_set_mapping_v0_x32 {
++	compat_uptr_t device_ptr;
++	compat_uptr_t target_ptr;
++	uint32_t flags;
++};
++
++#endif	/* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_set_mapping(struct vx_info *, void __user *);
++extern int vc_unset_mapping(struct vx_info *, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_set_mapping_x32(struct vx_info *, void __user *);
++extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* _VSERVER_DEVICE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/device_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_def.h
+--- linux-3.7.10/include/linux/vserver/device_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _VSERVER_DEVICE_DEF_H
++#define _VSERVER_DEVICE_DEF_H
++
++#include <linux/types.h>
++
++struct vx_dmap_target {
++	dev_t target;
++	uint32_t flags;
++};
++
++struct _vx_device {
++#ifdef CONFIG_VSERVER_DEVICE
++	struct vx_dmap_target targets[2];
++#endif
++};
++
++#endif	/* _VSERVER_DEVICE_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/dlimit.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit.h
+--- linux-3.7.10/include/linux/vserver/dlimit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,54 @@
++#ifndef _VSERVER_DLIMIT_H
++#define _VSERVER_DLIMIT_H
++
++#include "switch.h"
++
++
++#ifdef	__KERNEL__
++
++/*      keep in sync with CDLIM_INFINITY	*/
++
++#define DLIM_INFINITY		(~0ULL)
++
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++
++struct super_block;
++
++struct dl_info {
++	struct hlist_node dl_hlist;		/* linked list of contexts */
++	struct rcu_head dl_rcu;			/* the rcu head */
++	tag_t dl_tag;				/* context tag */
++	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 */
++
++	unsigned long long dl_space_used;	/* used space in bytes */
++	unsigned long long dl_space_total;	/* maximum space in bytes */
++	unsigned long dl_inodes_used;		/* used inodes */
++	unsigned long 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 *, tag_t);
++
++
++struct kstatfs;
++
++extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
++
++typedef uint64_t dlsize_t;
++
++#endif	/* __KERNEL__ */
++#else	/* _VSERVER_DLIMIT_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_DLIMIT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/dlimit_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit_cmd.h
+--- linux-3.7.10/include/linux/vserver/dlimit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,46 @@
++#ifndef _VSERVER_DLIMIT_CMD_H
++#define _VSERVER_DLIMIT_CMD_H
++
++#include <uapi/vserver/dlimit_cmd.h>
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++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	/* _VSERVER_DLIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/global.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/global.h
+--- linux-3.7.10/include/linux/vserver/global.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/global.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VSERVER_GLOBAL_H
++#define _VSERVER_GLOBAL_H
++
++
++extern atomic_t vx_global_ctotal;
++extern atomic_t vx_global_cactive;
++
++extern atomic_t nx_global_ctotal;
++extern atomic_t nx_global_cactive;
++
++extern atomic_t vs_global_nsproxy;
++extern atomic_t vs_global_fs;
++extern atomic_t vs_global_mnt_ns;
++extern atomic_t vs_global_uts_ns;
++extern atomic_t vs_global_user_ns;
++extern atomic_t vs_global_pid_ns;
++
++
++#endif /* _VSERVER_GLOBAL_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/history.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/history.h
+--- linux-3.7.10/include/linux/vserver/history.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/history.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,197 @@
++#ifndef _VSERVER_HISTORY_H
++#define _VSERVER_HISTORY_H
++
++
++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 _vxhe_vxi {
++	struct vx_info *ptr;
++	unsigned xid;
++	unsigned usecnt;
++	unsigned tasks;
++};
++
++struct _vxhe_set_clr {
++	void *data;
++};
++
++struct _vxhe_loc_lookup {
++	unsigned arg;
++};
++
++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;
++	};
++};
++
++#ifdef	CONFIG_VSERVER_HISTORY
++
++extern unsigned volatile int vxh_active;
++
++struct _vx_hist_entry *vxh_advance(void *loc);
++
++
++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	__HERE__ current_text_addr()
++
++#define __VXH_BODY(__type, __data, __here)	\
++	struct _vx_hist_entry *entry;		\
++						\
++	preempt_disable();			\
++	entry = vxh_advance(__here);		\
++	__data;					\
++	entry->type = __type;			\
++	preempt_enable();
++
++
++	/* pass vxi only */
++
++#define __VXH_SMPL				\
++	__vxh_copy_vxi(entry, vxi)
++
++static inline
++void	__vxh_smpl(struct vx_info *vxi, int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_SMPL, __here)
++}
++
++	/* pass vxi and data (void *) */
++
++#define __VXH_DATA				\
++	__vxh_copy_vxi(entry, vxi);		\
++	entry->sc.data = data
++
++static inline
++void	__vxh_data(struct vx_info *vxi, void *data,
++			int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_DATA, __here)
++}
++
++	/* pass vxi and arg (long) */
++
++#define __VXH_LONG				\
++	__vxh_copy_vxi(entry, vxi);		\
++	entry->ll.arg = arg
++
++static inline
++void	__vxh_long(struct vx_info *vxi, long arg,
++			int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_LONG, __here)
++}
++
++
++static inline
++void	__vxh_throw_oops(void *__here)
++{
++	__VXH_BODY(VXH_THROW_OOPS, {}, __here);
++	/* prevent further acquisition */
++	vxh_active = 0;
++}
++
++
++#define vxh_throw_oops()	__vxh_throw_oops(__HERE__);
++
++#define __vxh_get_vx_info(v, h)	__vxh_smpl(v, VXH_GET_VX_INFO, h);
++#define __vxh_put_vx_info(v, h)	__vxh_smpl(v, VXH_PUT_VX_INFO, h);
++
++#define __vxh_init_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_INIT_VX_INFO, h);
++#define __vxh_set_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_SET_VX_INFO, h);
++#define __vxh_clr_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_CLR_VX_INFO, h);
++
++#define __vxh_claim_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
++#define __vxh_release_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
++
++#define vxh_alloc_vx_info(v) \
++	__vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
++#define vxh_dealloc_vx_info(v) \
++	__vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
++
++#define vxh_hash_vx_info(v) \
++	__vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
++#define vxh_unhash_vx_info(v) \
++	__vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
++
++#define vxh_loc_vx_info(v, l) \
++	__vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
++#define vxh_lookup_vx_info(v, l) \
++	__vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
++#define vxh_create_vx_info(v, l) \
++	__vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
++
++extern void vxh_dump_history(void);
++
++
++#else  /* CONFIG_VSERVER_HISTORY */
++
++#define	__HERE__	0
++
++#define vxh_throw_oops()		do { } while (0)
++
++#define __vxh_get_vx_info(v, h)		do { } while (0)
++#define __vxh_put_vx_info(v, h)		do { } while (0)
++
++#define __vxh_init_vx_info(v, d, h)	do { } while (0)
++#define __vxh_set_vx_info(v, d, h)	do { } while (0)
++#define __vxh_clr_vx_info(v, d, h)	do { } while (0)
++
++#define __vxh_claim_vx_info(v, d, h)	do { } while (0)
++#define __vxh_release_vx_info(v, d, h)	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(v, l)		do { } while (0)
++#define vxh_lookup_vx_info(v, l)	do { } while (0)
++#define vxh_create_vx_info(v, l)	do { } while (0)
++
++#define vxh_dump_history()		do { } while (0)
++
++
++#endif /* CONFIG_VSERVER_HISTORY */
++
++#endif /* _VSERVER_HISTORY_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/inode.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode.h
+--- linux-3.7.10/include/linux/vserver/inode.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VSERVER_INODE_H
++#define _VSERVER_INODE_H
++
++#include <uapi/vserver/inode.h>
++
++
++#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)
++
++#else	/* _VSERVER_INODE_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_INODE_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/inode_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode_cmd.h
+--- linux-3.7.10/include/linux/vserver/inode_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,36 @@
++#ifndef _VSERVER_INODE_CMD_H
++#define _VSERVER_INODE_CMD_H
++
++#include <uapi/vserver/inode_cmd.h>
++
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_ctx_iattr_v1_x32 {
++	compat_uptr_t name_ptr;
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++#endif	/* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_get_iattr(void __user *);
++extern int vc_set_iattr(void __user *);
++
++extern int vc_fget_iattr(uint32_t, void __user *);
++extern int vc_fset_iattr(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_get_iattr_x32(void __user *);
++extern int vc_set_iattr_x32(void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* _VSERVER_INODE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit.h
+--- linux-3.7.10/include/linux/vserver/limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,61 @@
++#ifndef _VSERVER_LIMIT_H
++#define _VSERVER_LIMIT_H
++
++#include <uapi/vserver/limit.h>
++
++
++#define	VLIM_NOCHECK	((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
++
++/*	keep in sync with CRLIM_INFINITY */
++
++#define	VLIM_INFINITY	(~0ULL)
++
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
++#ifndef RLIM_INFINITY
++#warning RLIM_INFINITY is undefined
++#endif
++
++#define __rlim_val(l, r, v)	((l)->res[r].v)
++
++#define __rlim_soft(l, r)	__rlim_val(l, r, soft)
++#define __rlim_hard(l, r)	__rlim_val(l, r, hard)
++
++#define __rlim_rcur(l, r)	__rlim_val(l, r, rcur)
++#define __rlim_rmin(l, r)	__rlim_val(l, r, rmin)
++#define __rlim_rmax(l, r)	__rlim_val(l, r, rmax)
++
++#define __rlim_lhit(l, r)	__rlim_val(l, r, lhit)
++#define __rlim_hit(l, r)	atomic_inc(&__rlim_lhit(l, r))
++
++typedef atomic_long_t rlim_atomic_t;
++typedef unsigned long rlim_t;
++
++#define __rlim_get(l, r)	atomic_long_read(&__rlim_rcur(l, r))
++#define __rlim_set(l, r, v)	atomic_long_set(&__rlim_rcur(l, r), v)
++#define __rlim_inc(l, r)	atomic_long_inc(&__rlim_rcur(l, r))
++#define __rlim_dec(l, r)	atomic_long_dec(&__rlim_rcur(l, r))
++#define __rlim_add(l, r, v)	atomic_long_add(v, &__rlim_rcur(l, r))
++#define __rlim_sub(l, r, v)	atomic_long_sub(v, &__rlim_rcur(l, r))
++
++
++#if	(RLIM_INFINITY == VLIM_INFINITY)
++#define	VX_VLIM(r) ((long long)(long)(r))
++#define	VX_RLIM(v) ((rlim_t)(v))
++#else
++#define	VX_VLIM(r) (((r) == RLIM_INFINITY) \
++		? VLIM_INFINITY : (long long)(r))
++#define	VX_RLIM(v) (((v) == VLIM_INFINITY) \
++		? RLIM_INFINITY : (rlim_t)(v))
++#endif
++
++struct sysinfo;
++
++void vx_vsi_meminfo(struct sysinfo *);
++void vx_vsi_swapinfo(struct sysinfo *);
++long vx_vsi_cached(struct sysinfo *);
++
++#define NUM_LIMITS	24
++
++#endif	/* _VSERVER_LIMIT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_cmd.h
+--- linux-3.7.10/include/linux/vserver/limit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,35 @@
++#ifndef _VSERVER_LIMIT_CMD_H
++#define _VSERVER_LIMIT_CMD_H
++
++#include <uapi/vserver/limit_cmd.h>
++
++
++#ifdef	CONFIG_IA32_EMULATION
++
++struct	vcmd_ctx_rlimit_v0_x32 {
++	uint32_t id;
++	uint64_t minimum;
++	uint64_t softlimit;
++	uint64_t maximum;
++} __attribute__ ((packed));
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++#include <linux/compiler.h>
++
++extern int vc_get_rlimit_mask(uint32_t, void __user *);
++extern int vc_get_rlimit(struct vx_info *, void __user *);
++extern int vc_set_rlimit(struct vx_info *, void __user *);
++extern int vc_reset_hits(struct vx_info *, void __user *);
++extern int vc_reset_minmax(struct vx_info *, void __user *);
++
++extern int vc_rlimit_stat(struct vx_info *, void __user *);
++
++#ifdef	CONFIG_IA32_EMULATION
++
++extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
++extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++#endif	/* _VSERVER_LIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_def.h
+--- linux-3.7.10/include/linux/vserver/limit_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,47 @@
++#ifndef _VSERVER_LIMIT_DEF_H
++#define _VSERVER_LIMIT_DEF_H
++
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
++#include "limit.h"
++
++
++struct _vx_res_limit {
++	rlim_t soft;		/* Context soft limit */
++	rlim_t hard;		/* Context hard limit */
++
++	rlim_atomic_t rcur;	/* Current value */
++	rlim_t rmin;		/* Context minimum */
++	rlim_t rmax;		/* Context maximum */
++
++	atomic_t lhit;		/* Limit hits */
++};
++
++/* context sub struct */
++
++struct _vx_limit {
++	struct _vx_res_limit res[NUM_LIMITS];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_limit(struct _vx_limit *limit)
++{
++	int i;
++
++	printk("\t_vx_limit:");
++	for (i = 0; i < NUM_LIMITS; i++) {
++		printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
++			i, (unsigned long)__rlim_get(limit, i),
++			(unsigned long)__rlim_rmin(limit, i),
++			(unsigned long)__rlim_rmax(limit, i),
++			(long)__rlim_soft(limit, i),
++			(long)__rlim_hard(limit, i),
++			atomic_read(&__rlim_lhit(limit, i)));
++	}
++}
++
++#endif
++
++#endif	/* _VSERVER_LIMIT_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit_int.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_int.h
+--- linux-3.7.10/include/linux/vserver/limit_int.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_int.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,193 @@
++#ifndef _VSERVER_LIMIT_INT_H
++#define _VSERVER_LIMIT_INT_H
++
++#define VXD_RCRES_COND(r)	VXD_CBIT(cres, r)
++#define VXD_RLIMIT_COND(r)	VXD_CBIT(limit, r)
++
++extern const char *vlimit_name[NUM_LIMITS];
++
++static inline void __vx_acc_cres(struct vx_info *vxi,
++	int res, int dir, void *_data, char *_file, int _line)
++{
++	if (VXD_RCRES_COND(res))
++		vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			(dir > 0) ? "++" : "--", _data, _file, _line);
++	if (!vxi)
++		return;
++
++	if (dir > 0)
++		__rlim_inc(&vxi->limit, res);
++	else
++		__rlim_dec(&vxi->limit, res);
++}
++
++static inline void __vx_add_cres(struct vx_info *vxi,
++	int res, int amount, void *_data, char *_file, int _line)
++{
++	if (VXD_RCRES_COND(res))
++		vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			amount, _data, _file, _line);
++	if (amount == 0)
++		return;
++	if (!vxi)
++		return;
++	__rlim_add(&vxi->limit, res, amount);
++}
++
++static inline
++int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
++{
++	int cond = (value > __rlim_rmax(limit, res));
++
++	if (cond)
++		__rlim_rmax(limit, res) = value;
++	return cond;
++}
++
++static inline
++int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
++{
++	int cond = (value < __rlim_rmin(limit, res));
++
++	if (cond)
++		__rlim_rmin(limit, res) = value;
++	return cond;
++}
++
++static inline
++void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
++{
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++}
++
++
++/*	return values:
++	 +1 ... no limit hit
++	 -1 ... over soft limit
++	  0 ... over hard limit		*/
++
++static inline int __vx_cres_avail(struct vx_info *vxi,
++	int res, int num, char *_file, int _line)
++{
++	struct _vx_limit *limit;
++	rlim_t value;
++
++	if (VXD_RLIMIT_COND(res))
++		vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_soft(&vxi->limit, res) : -1),
++			(vxi ? (long)__rlim_hard(&vxi->limit, res) : -1),
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			num, _file, _line);
++	if (!vxi)
++		return 1;
++
++	limit = &vxi->limit;
++	value = __rlim_get(limit, res);
++
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++
++	if (num == 0)
++		return 1;
++
++	if (__rlim_soft(limit, res) == RLIM_INFINITY)
++		return -1;
++	if (value + num <= __rlim_soft(limit, res))
++		return -1;
++
++	if (__rlim_hard(limit, res) == RLIM_INFINITY)
++		return 1;
++	if (value + num <= __rlim_hard(limit, res))
++		return 1;
++
++	__rlim_hit(limit, res);
++	return 0;
++}
++
++
++static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
++
++static inline
++rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
++{
++	rlim_t value, sum = 0;
++	int res;
++
++	while ((res = *array++)) {
++		value = __rlim_get(limit, res);
++		__vx_cres_fixup(limit, res, value);
++		sum += value;
++	}
++	return sum;
++}
++
++static inline
++rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
++{
++	rlim_t value = __vx_cres_array_sum(limit, array + 1);
++	int res = *array;
++
++	if (value == __rlim_get(limit, res))
++		return value;
++
++	__rlim_set(limit, res, value);
++	/* now adjust min/max */
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++
++	return value;
++}
++
++static inline int __vx_cres_array_avail(struct vx_info *vxi,
++	const int *array, int num, char *_file, int _line)
++{
++	struct _vx_limit *limit;
++	rlim_t value = 0;
++	int res;
++
++	if (num == 0)
++		return 1;
++	if (!vxi)
++		return 1;
++
++	limit = &vxi->limit;
++	res = *array;
++	value = __vx_cres_array_sum(limit, array + 1);
++
++	__rlim_set(limit, res, value);
++	__vx_cres_fixup(limit, res, value);
++
++	return __vx_cres_avail(vxi, res, num, _file, _line);
++}
++
++
++static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
++{
++	rlim_t value;
++	int res;
++
++	/* complex resources first */
++	if ((id < 0) || (id == RLIMIT_RSS))
++		__vx_cres_array_fixup(limit, VLA_RSS);
++
++	for (res = 0; res < NUM_LIMITS; res++) {
++		if ((id > 0) && (res != id))
++			continue;
++
++		value = __rlim_get(limit, res);
++		__vx_cres_fixup(limit, res, value);
++
++		/* not supposed to happen, maybe warn? */
++		if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
++			__rlim_rmax(limit, res) = __rlim_hard(limit, res);
++	}
++}
++
++
++#endif	/* _VSERVER_LIMIT_INT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/monitor.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/monitor.h
+--- linux-3.7.10/include/linux/vserver/monitor.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/monitor.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,6 @@
++#ifndef _VSERVER_MONITOR_H
++#define _VSERVER_MONITOR_H
++
++#include <uapi/vserver/monitor.h>
++
++#endif /* _VSERVER_MONITOR_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/network.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/network.h
+--- linux-3.7.10/include/linux/vserver/network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/network.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,76 @@
++#ifndef _VSERVER_NETWORK_H
++#define _VSERVER_NETWORK_H
++
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
++#include <uapi/vserver/network.h>
++
++struct nx_addr_v4 {
++	struct nx_addr_v4 *next;
++	struct in_addr ip[2];
++	struct in_addr mask;
++	uint16_t type;
++	uint16_t flags;
++};
++
++struct nx_addr_v6 {
++	struct nx_addr_v6 *next;
++	struct in6_addr ip;
++	struct in6_addr mask;
++	uint32_t prefix;
++	uint16_t type;
++	uint16_t flags;
++};
++
++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 */
++
++	spinlock_t addr_lock;		/* protect address changes */
++	struct in_addr v4_lback;	/* Loopback address */
++	struct in_addr v4_bcast;	/* Broadcast address */
++	struct nx_addr_v4 v4;		/* First/Single ipv4 address */
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 v6;		/* First/Single ipv6 address */
++#endif
++	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 *lookup_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 sock;
++
++
++#define NX_IPV4(n)	((n)->v4.type != NXA_TYPE_NONE)
++#ifdef  CONFIG_IPV6
++#define NX_IPV6(n)	((n)->v6.type != NXA_TYPE_NONE)
++#else
++#define NX_IPV6(n)	(0)
++#endif
++
++#endif	/* _VSERVER_NETWORK_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/network_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/network_cmd.h
+--- linux-3.7.10/include/linux/vserver/network_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/network_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_NETWORK_CMD_H
++#define _VSERVER_NETWORK_CMD_H
++
++#include <uapi/vserver/network_cmd.h>
++
++extern int vc_task_nid(uint32_t);
++
++extern int vc_nx_info(struct nx_info *, void __user *);
++
++extern int vc_net_create(uint32_t, void __user *);
++extern int vc_net_migrate(struct nx_info *, void __user *);
++
++extern int vc_net_add(struct nx_info *, void __user *);
++extern int vc_net_remove(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_add_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_rem_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv6(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv4(struct nx_info *, void __user *);
++extern int vc_get_match_ipv4(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv6(struct nx_info *, void __user *);
++extern int vc_get_match_ipv6(struct nx_info *, void __user *);
++
++extern int vc_get_nflags(struct nx_info *, void __user *);
++extern int vc_set_nflags(struct nx_info *, void __user *);
++
++extern int vc_get_ncaps(struct nx_info *, void __user *);
++extern int vc_set_ncaps(struct nx_info *, void __user *);
++
++#endif	/* _VSERVER_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/percpu.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/percpu.h
+--- linux-3.7.10/include/linux/vserver/percpu.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/percpu.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_PERCPU_H
++#define _VSERVER_PERCPU_H
++
++#include "cvirt_def.h"
++#include "sched_def.h"
++
++struct	_vx_percpu {
++	struct _vx_cvirt_pc cvirt;
++	struct _vx_sched_pc sched;
++};
++
++#define	PERCPU_PERCTX	(sizeof(struct _vx_percpu))
++
++#endif	/* _VSERVER_PERCPU_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/pid.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/pid.h
+--- linux-3.7.10/include/linux/vserver/pid.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/pid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,51 @@
++#ifndef _VSERVER_PID_H
++#define _VSERVER_PID_H
++
++/* 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;
++}
++
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/sched.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched.h
+--- linux-3.7.10/include/linux/vserver/sched.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _VSERVER_SCHED_H
++#define _VSERVER_SCHED_H
++
++
++#ifdef	__KERNEL__
++
++struct timespec;
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++	struct _vx_sched_pc *sched_pc);
++
++#endif	/* __KERNEL__ */
++#else	/* _VSERVER_SCHED_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_SCHED_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/sched_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_cmd.h
+--- linux-3.7.10/include/linux/vserver/sched_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,11 @@
++#ifndef _VSERVER_SCHED_CMD_H
++#define _VSERVER_SCHED_CMD_H
++
++
++#include <linux/compiler.h>
++#include <uapi/vserver/sched_cmd.h>
++
++extern int vc_set_prio_bias(struct vx_info *, void __user *);
++extern int vc_get_prio_bias(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_SCHED_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/sched_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_def.h
+--- linux-3.7.10/include/linux/vserver/sched_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,38 @@
++#ifndef _VSERVER_SCHED_DEF_H
++#define _VSERVER_SCHED_DEF_H
++
++#include <linux/spinlock.h>
++#include <linux/jiffies.h>
++#include <linux/cpumask.h>
++#include <asm/atomic.h>
++#include <asm/param.h>
++
++
++/* context sub struct */
++
++struct _vx_sched {
++	int prio_bias;			/* bias offset for priority */
++
++	cpumask_t update;		/* CPUs which should update */
++};
++
++struct _vx_sched_pc {
++	int prio_bias;			/* bias offset for priority */
++
++	uint64_t user_ticks;		/* token tick events */
++	uint64_t sys_ticks;		/* token tick events */
++	uint64_t hold_ticks;		/* token ticks paused */
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_sched(struct _vx_sched *sched)
++{
++	printk("\t_vx_sched:\n");
++	printk("\t priority = %4d\n", sched->prio_bias);
++}
++
++#endif
++
++#endif	/* _VSERVER_SCHED_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/signal.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal.h
+--- linux-3.7.10/include/linux/vserver/signal.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_H
++#define _VSERVER_SIGNAL_H
++
++
++#ifdef	__KERNEL__
++
++struct vx_info;
++
++int vx_info_kill(struct vx_info *, int, int);
++
++#endif	/* __KERNEL__ */
++#else	/* _VSERVER_SIGNAL_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_SIGNAL_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/signal_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal_cmd.h
+--- linux-3.7.10/include/linux/vserver/signal_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_CMD_H
++#define _VSERVER_SIGNAL_CMD_H
++
++#include <uapi/vserver/signal_cmd.h>
++
++
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
++
++
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
++
++#endif	/* _VSERVER_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/space.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/space.h
+--- linux-3.7.10/include/linux/vserver/space.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/space.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,12 @@
++#ifndef _VSERVER_SPACE_H
++#define _VSERVER_SPACE_H
++
++#include <linux/types.h>
++
++struct vx_info;
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
++
++#else	/* _VSERVER_SPACE_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_SPACE_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/space_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/space_cmd.h
+--- linux-3.7.10/include/linux/vserver/space_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/space_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_SPACE_CMD_H
++#define _VSERVER_SPACE_CMD_H
++
++#include <uapi/vserver/space_cmd.h>
++
++
++extern int vc_enter_space_v1(struct vx_info *, void __user *);
++extern int vc_set_space_v1(struct vx_info *, void __user *);
++extern int vc_enter_space(struct vx_info *, void __user *);
++extern int vc_set_space(struct vx_info *, void __user *);
++extern int vc_get_space_mask(void __user *, int);
++
++#endif	/* _VSERVER_SPACE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/switch.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/switch.h
+--- linux-3.7.10/include/linux/vserver/switch.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/switch.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,8 @@
++#ifndef _VSERVER_SWITCH_H
++#define _VSERVER_SWITCH_H
++
++
++#include <linux/errno.h>
++#include <uapi/vserver/switch.h>
++
++#endif	/* _VSERVER_SWITCH_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/tag.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag.h
+--- linux-3.7.10/include/linux/vserver/tag.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,143 @@
++#ifndef _DX_TAG_H
++#define _DX_TAG_H
++
++#include <linux/types.h>
++
++
++#define DX_TAG(in)	(IS_TAGGED(in))
++
++
++#ifdef CONFIG_TAG_NFSD
++#define DX_TAG_NFSD	1
++#else
++#define DX_TAG_NFSD	0
++#endif
++
++
++#ifdef CONFIG_TAGGING_NONE
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	(0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_GID16
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0x0000FFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	\
++	((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_ID24
++
++#define MAX_UID		0x00FFFFFF
++#define MAX_GID		0x00FFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	\
++	((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag)	\
++	((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_UID16
++
++#define MAX_UID		0x0000FFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	\
++	((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_INTERN
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (tag) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb)	\
++	((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
++#else
++#define dx_current_fstag(sb)	(0)
++#endif
++
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag)	(0)
++#else
++#define TAGINO_TAG(cond, tag)	((cond) ? (tag) : 0)
++#endif
++
++#define INOTAG_UID(cond, uid, gid)	\
++	((cond) ? ((uid) & MAX_UID) : (uid))
++#define INOTAG_GID(cond, uid, gid)	\
++	((cond) ? ((gid) & MAX_GID) : (gid))
++
++
++static inline uid_t dx_map_uid(uid_t uid)
++{
++	if ((uid > MAX_UID) && (uid != -1))
++		uid = -2;
++	return (uid & MAX_UID);
++}
++
++static inline gid_t dx_map_gid(gid_t gid)
++{
++	if ((gid > MAX_GID) && (gid != -1))
++		gid = -2;
++	return (gid & MAX_GID);
++}
++
++struct peer_tag {
++	int32_t xid;
++	int32_t nid;
++};
++
++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
++
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++		 unsigned long *flags);
++
++#ifdef	CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++
++#define dx_propagate_tag(n, i)	__dx_propagate_tag(n, i)
++
++#else
++#define dx_propagate_tag(n, i)	do { } while (0)
++#endif
++
++#endif /* _DX_TAG_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/tag_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag_cmd.h
+--- linux-3.7.10/include/linux/vserver/tag_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_TAG_CMD_H
++#define _VSERVER_TAG_CMD_H
++
++#include <uapi/vserver/tag_cmd.h>
++
++extern int vc_task_tag(uint32_t);
++
++extern int vc_tag_migrate(uint32_t);
++
++#endif	/* _VSERVER_TAG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/net/addrconf.h linux-3.7.10-vs2.3.5.6/include/net/addrconf.h
+--- linux-3.7.10/include/net/addrconf.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/addrconf.h	2012-12-18 15:13:16.000000000 +0000
+@@ -81,7 +81,8 @@ extern int			ipv6_dev_get_saddr(struct n
+ 					       const struct net_device *dev,
+ 					       const struct in6_addr *daddr,
+ 					       unsigned int srcprefs,
+-					       struct in6_addr *saddr);
++					       struct in6_addr *saddr,
++					       struct nx_info *nxi);
+ extern int			ipv6_get_lladdr(struct net_device *dev,
+ 						struct in6_addr *addr,
+ 						unsigned char banned_flags);
+diff -NurpP --minimal linux-3.7.10/include/net/af_unix.h linux-3.7.10-vs2.3.5.6/include/net/af_unix.h
+--- linux-3.7.10/include/net/af_unix.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/af_unix.h	2012-12-18 15:13:16.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/socket.h>
+ #include <linux/un.h>
+ #include <linux/mutex.h>
++#include <linux/vs_base.h>
+ #include <net/sock.h>
+ 
+ extern void unix_inflight(struct file *fp);
+diff -NurpP --minimal linux-3.7.10/include/net/inet_timewait_sock.h linux-3.7.10-vs2.3.5.6/include/net/inet_timewait_sock.h
+--- linux-3.7.10/include/net/inet_timewait_sock.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/inet_timewait_sock.h	2012-12-18 15:13:16.000000000 +0000
+@@ -112,6 +112,10 @@ struct inet_timewait_sock {
+ #define tw_net			__tw_common.skc_net
+ #define tw_daddr        	__tw_common.skc_daddr
+ #define tw_rcv_saddr    	__tw_common.skc_rcv_saddr
++#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
+ 	int			tw_timeout;
+ 	volatile unsigned char	tw_substate;
+ 	unsigned char		tw_rcv_wscale;
+diff -NurpP --minimal linux-3.7.10/include/net/ip6_route.h linux-3.7.10-vs2.3.5.6/include/net/ip6_route.h
+--- linux-3.7.10/include/net/ip6_route.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/ip6_route.h	2012-12-18 15:13:16.000000000 +0000
+@@ -97,7 +97,8 @@ extern int			ip6_route_get_saddr(struct
+ 						    struct rt6_info *rt,
+ 						    const struct in6_addr *daddr,
+ 						    unsigned int prefs,
+-						    struct in6_addr *saddr);
++						    struct in6_addr *saddr,
++						    struct nx_info *nxi);
+ 
+ extern struct rt6_info		*rt6_lookup(struct net *net,
+ 					    const struct in6_addr *daddr,
+diff -NurpP --minimal linux-3.7.10/include/net/route.h linux-3.7.10-vs2.3.5.6/include/net/route.h
+--- linux-3.7.10/include/net/route.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/route.h	2012-12-18 15:13:16.000000000 +0000
+@@ -204,6 +204,9 @@ static inline void ip_rt_put(struct rtab
+ 		dst_release(&rt->dst);
+ }
+ 
++#include <linux/vs_base.h>
++#include <linux/vs_inet.h>
++
+ #define IPTOS_RT_MASK	(IPTOS_TOS_MASK & ~3)
+ 
+ extern const __u8 ip_tos2prio[16];
+@@ -253,6 +256,9 @@ static inline void ip_route_connect_init
+ 			   protocol, flow_flags, dst, src, dport, sport);
+ }
+ 
++extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
++	struct flowi4 *);
++
+ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
+ 					      __be32 dst, __be32 src, u32 tos,
+ 					      int oif, u8 protocol,
+@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co
+ {
+ 	struct net *net = sock_net(sk);
+ 	struct rtable *rt;
++	struct nx_info *nx_info = current_nx_info();
+ 
+ 	ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
+ 			      sport, dport, sk, can_sleep);
+ 
+-	if (!dst || !src) {
++	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));
++
++	rt = ip_v4_find_src(net, nx_info, fl4);
++	if (IS_ERR(rt))
++		return rt;
++	ip_rt_put(rt);
++
++	if (!fl4->daddr || !fl4->saddr) {
+ 		rt = __ip_route_output_key(net, fl4);
+ 		if (IS_ERR(rt))
+ 			return rt;
+diff -NurpP --minimal linux-3.7.10/include/net/sock.h linux-3.7.10-vs2.3.5.6/include/net/sock.h
+--- linux-3.7.10/include/net/sock.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/sock.h	2012-12-18 15:13:16.000000000 +0000
+@@ -171,6 +171,10 @@ struct sock_common {
+ #ifdef CONFIG_NET_NS
+ 	struct net	 	*skc_net;
+ #endif
++	xid_t			skc_xid;
++	struct vx_info		*skc_vx_info;
++	nid_t			skc_nid;
++	struct nx_info		*skc_nx_info;
+ 	/*
+ 	 * fields between dontcopy_begin/dontcopy_end
+ 	 * are not copied in sock_copy()
+@@ -283,6 +287,10 @@ struct sock {
+ #define sk_bind_node		__sk_common.skc_bind_node
+ #define sk_prot			__sk_common.skc_prot
+ #define sk_net			__sk_common.skc_net
++#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
+ 	socket_lock_t		sk_lock;
+ 	struct sk_buff_head	sk_receive_queue;
+ 	/*
+diff -NurpP --minimal linux-3.7.10/include/uapi/Kbuild linux-3.7.10-vs2.3.5.6/include/uapi/Kbuild
+--- linux-3.7.10/include/uapi/Kbuild	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/Kbuild	2012-12-18 15:13:16.000000000 +0000
+@@ -12,3 +12,4 @@ header-y += video/
+ header-y += drm/
+ header-y += xen/
+ header-y += scsi/
++header-y += vserver/
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/capability.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/capability.h
+--- linux-3.7.10/include/uapi/linux/capability.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/capability.h	2012-12-18 15:13:16.000000000 +0000
+@@ -259,6 +259,7 @@ struct vfs_cap_data {
+    arbitrary SCSI commands */
+ /* Allow setting encryption key on loopback filesystem */
+ /* Allow setting zone reclaim policy */
++/* Allow the selection of a security context */
+ 
+ #define CAP_SYS_ADMIN        21
+ 
+@@ -345,7 +346,12 @@ struct vfs_cap_data {
+ 
+ #define CAP_LAST_CAP         CAP_BLOCK_SUSPEND
+ 
+-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
++/* Allow context manipulations */
++/* Allow changing context info on files */
++
++#define CAP_CONTEXT	     63
++
++#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
+ 
+ /*
+  * Bit location of each capability (used by user-space library and kernel)
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/fs.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/fs.h
+--- linux-3.7.10/include/uapi/linux/fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -86,6 +86,9 @@ struct inodes_stat_t {
+ #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
+ #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
+ #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
++#define MS_TAGGED	(1<<25) /* use generic inode tagging */
++#define MS_TAGID	(1<<26) /* use specific tag for this mount */
++#define MS_NOTAGCHECK	(1<<27) /* don't check tags */
+ #define MS_NOSEC	(1<<28)
+ #define MS_BORN		(1<<29)
+ #define MS_ACTIVE	(1<<30)
+@@ -189,11 +192,14 @@ struct inodes_stat_t {
+ #define FS_EXTENT_FL			0x00080000 /* Extents */
+ #define FS_DIRECTIO_FL			0x00100000 /* Use direct i/o */
+ #define FS_NOCOW_FL			0x00800000 /* Do not cow file */
++#define FS_IXUNLINK_FL			0x08000000 /* Immutable invert on unlink */
+ #define FS_RESERVED_FL			0x80000000 /* reserved for ext2 lib */
+ 
+-#define FS_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+-#define FS_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
++#define FS_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define FS_COW_FL			0x20000000 /* Copy on Write marker */
+ 
++#define FS_FL_USER_VISIBLE		0x0103DFFF /* User visible flags */
++#define FS_FL_USER_MODIFIABLE		0x010380FF /* User modifiable flags */
+ 
+ #define SYNC_FILE_RANGE_WAIT_BEFORE	1
+ #define SYNC_FILE_RANGE_WRITE		2
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/gfs2_ondisk.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.7.10/include/uapi/linux/gfs2_ondisk.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/gfs2_ondisk.h	2012-12-18 15:13:16.000000000 +0000
+@@ -225,6 +225,9 @@ enum {
+ 	gfs2fl_Sync		= 8,
+ 	gfs2fl_System		= 9,
+ 	gfs2fl_TopLevel		= 10,
++	gfs2fl_IXUnlink         = 16,
++	gfs2fl_Barrier          = 17,
++	gfs2fl_Cow              = 18,
+ 	gfs2fl_TruncInProg	= 29,
+ 	gfs2fl_InheritDirectio	= 30,
+ 	gfs2fl_InheritJdata	= 31,
+@@ -242,6 +245,9 @@ enum {
+ #define GFS2_DIF_SYNC			0x00000100
+ #define GFS2_DIF_SYSTEM			0x00000200 /* New in gfs2 */
+ #define GFS2_DIF_TOPDIR			0x00000400 /* New in gfs2 */
++#define GFS2_DIF_IXUNLINK               0x00010000
++#define GFS2_DIF_BARRIER                0x00020000
++#define GFS2_DIF_COW                    0x00040000
+ #define GFS2_DIF_TRUNC_IN_PROG		0x20000000 /* New in gfs2 */
+ #define GFS2_DIF_INHERIT_DIRECTIO	0x40000000 /* only in gfs1 */
+ #define GFS2_DIF_INHERIT_JDATA		0x80000000
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/if_tun.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/if_tun.h
+--- linux-3.7.10/include/uapi/linux/if_tun.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/if_tun.h	2012-12-18 15:13:16.000000000 +0000
+@@ -53,6 +53,7 @@
+ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
+ #define TUNGETVNETHDRSZ _IOR('T', 215, int)
+ #define TUNSETVNETHDRSZ _IOW('T', 216, int)
++#define TUNSETNID     _IOW('T', 217, int)
+ 
+ /* TUNSETIFF ifr flags */
+ #define IFF_TUN		0x0001
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/major.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/major.h
+--- linux-3.7.10/include/uapi/linux/major.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/major.h	2012-12-18 15:13:16.000000000 +0000
+@@ -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
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/nfs_mount.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/nfs_mount.h
+--- linux-3.7.10/include/uapi/linux/nfs_mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/nfs_mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -63,7 +63,8 @@ struct nfs_mount_data {
+ #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+ #define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
+ #define NFS_MOUNT_UNSHARED	0x8000	/* 5 */
+-#define NFS_MOUNT_FLAGMASK	0xFFFF
++#define NFS_MOUNT_TAGGED	0x10000	/* context tagging */
++#define NFS_MOUNT_FLAGMASK	0x1FFFF
+ 
+ /* The following are for internal use only */
+ #define NFS_MOUNT_LOOKUP_CACHE_NONEG	0x10000
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/reboot.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/reboot.h
+--- linux-3.7.10/include/uapi/linux/reboot.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/reboot.h	2012-12-18 15:13:16.000000000 +0000
+@@ -33,7 +33,7 @@
+ #define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
+ #define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
+ #define	LINUX_REBOOT_CMD_KEXEC		0x45584543
+-
++#define	LINUX_REBOOT_CMD_OOM		0xDEADBEEF
+ 
+ 
+ #endif /* _UAPI_LINUX_REBOOT_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/sysctl.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/sysctl.h
+--- linux-3.7.10/include/uapi/linux/sysctl.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/sysctl.h	2012-12-18 15:13:16.000000000 +0000
+@@ -60,6 +60,7 @@ enum
+ 	CTL_ABI=9,		/* Binary emulation */
+ 	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
+ 	CTL_ARLAN=254,		/* arlan wireless driver */
++	CTL_VSERVER=4242,	/* Linux-VServer debug */
+ 	CTL_S390DBF=5677,	/* s390 debug */
+ 	CTL_SUNRPC=7249,	/* sunrpc debug */
+ 	CTL_PM=9899,		/* frv power management */
+@@ -94,6 +95,7 @@ enum
+ 
+ 	KERN_PANIC=15,		/* int: panic timeout */
+ 	KERN_REALROOTDEV=16,	/* real root device to mount after initrd */
++	KERN_VSHELPER=17,	/* string: path to vshelper policy agent */
+ 
+ 	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
+ 	KERN_CTLALTDEL=22,	/* int: allow ctl-alt-del to reboot */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/Kbuild linux-3.7.10-vs2.3.5.6/include/uapi/vserver/Kbuild
+--- linux-3.7.10/include/uapi/vserver/Kbuild	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/Kbuild	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,9 @@
++
++header-y += context_cmd.h network_cmd.h space_cmd.h \
++	cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
++	inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
++	debug_cmd.h device_cmd.h
++
++header-y += switch.h context.h network.h monitor.h \
++	limit.h inode.h device.h
++
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/cacct_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cacct_cmd.h
+--- linux-3.7.10/include/uapi/vserver/cacct_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cacct_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,15 @@
++#ifndef _UAPI_VS_CACCT_CMD_H
++#define _UAPI_VS_CACCT_CMD_H
++
++
++/* virtual host info name commands */
++
++#define VCMD_sock_stat		VC_CMD(VSTAT, 5, 0)
++
++struct	vcmd_sock_stat_v0 {
++	uint32_t field;
++	uint32_t count[3];
++	uint64_t total[3];
++};
++
++#endif /* _UAPI_VS_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/context.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context.h
+--- linux-3.7.10/include/uapi/vserver/context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,80 @@
++#ifndef _UAPI_VS_CONTEXT_H
++#define _UAPI_VS_CONTEXT_H
++
++#include <linux/types.h>
++#include <linux/capability.h>
++
++
++/* context flags */
++
++#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_VIRT_TIME		0x00100000
++
++#define VXF_HIDE_MOUNT		0x01000000
++/* was	VXF_HIDE_NETIF		0x02000000 */
++#define VXF_HIDE_VINFO		0x04000000
++
++#define VXF_STATE_SETUP		(1ULL << 32)
++#define VXF_STATE_INIT		(1ULL << 33)
++#define VXF_STATE_ADMIN		(1ULL << 34)
++
++#define VXF_SC_HELPER		(1ULL << 36)
++#define VXF_REBOOT_KILL		(1ULL << 37)
++#define VXF_PERSISTENT		(1ULL << 38)
++
++#define VXF_FORK_RSS		(1ULL << 48)
++#define VXF_PROLIFIC		(1ULL << 49)
++
++#define VXF_IGNEG_NICE		(1ULL << 52)
++
++#define VXF_ONE_TIME		(0x0007ULL << 32)
++
++#define VXF_INIT_SET		(VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
++
++
++/* context migration */
++
++#define VXM_SET_INIT		0x00000001
++#define VXM_SET_REAPER		0x00000002
++
++/* context caps */
++
++#define VXC_SET_UTSNAME		0x00000001
++#define VXC_SET_RLIMIT		0x00000002
++#define VXC_FS_SECURITY		0x00000004
++#define VXC_FS_TRUSTED		0x00000008
++#define VXC_TIOCSTI		0x00000010
++
++/* was	VXC_RAW_ICMP		0x00000100 */
++#define VXC_SYSLOG		0x00001000
++#define VXC_OOM_ADJUST		0x00002000
++#define VXC_AUDIT_CONTROL	0x00004000
++
++#define VXC_SECURE_MOUNT	0x00010000
++#define VXC_SECURE_REMOUNT	0x00020000
++#define VXC_BINARY_MOUNT	0x00040000
++
++#define VXC_QUOTA_CTL		0x00100000
++#define VXC_ADMIN_MAPPER	0x00200000
++#define VXC_ADMIN_CLOOP		0x00400000
++
++#define VXC_KTHREAD		0x01000000
++#define VXC_NAMESPACE		0x02000000
++
++#endif /* _UAPI_VS_CONTEXT_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/context_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context_cmd.h
+--- linux-3.7.10/include/uapi/vserver/context_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,115 @@
++#ifndef _UAPI_VS_CONTEXT_CMD_H
++#define _UAPI_VS_CONTEXT_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_xid		VC_CMD(VINFO, 1, 0)
++
++
++#define VCMD_vx_info		VC_CMD(VINFO, 5, 0)
++
++struct	vcmd_vx_info_v0 {
++	uint32_t xid;
++	uint32_t initpid;
++	/* more to come */
++};
++
++
++#define VCMD_ctx_stat		VC_CMD(VSTAT, 0, 0)
++
++struct	vcmd_ctx_stat_v0 {
++	uint32_t usecnt;
++	uint32_t tasks;
++	/* more to come */
++};
++
++
++/* 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_v0	VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate	VC_CMD(PROCMIG, 1, 1)
++
++struct	vcmd_ctx_migrate {
++	uint64_t flagword;
++};
++
++
++
++/* 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;
++};
++
++
++
++/* context caps commands */
++
++#define VCMD_get_ccaps		VC_CMD(FLAGS, 3, 1)
++#define VCMD_set_ccaps		VC_CMD(FLAGS, 4, 1)
++
++struct	vcmd_ctx_caps_v1 {
++	uint64_t ccaps;
++	uint64_t cmask;
++};
++
++
++
++/* bcaps commands */
++
++#define VCMD_get_bcaps		VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps		VC_CMD(FLAGS, 10, 0)
++
++struct	vcmd_bcaps {
++	uint64_t bcaps;
++	uint64_t bmask;
++};
++
++
++
++/* umask commands */
++
++#define VCMD_get_umask		VC_CMD(FLAGS, 13, 0)
++#define VCMD_set_umask		VC_CMD(FLAGS, 14, 0)
++
++struct	vcmd_umask {
++	uint64_t umask;
++	uint64_t mask;
++};
++
++
++
++/* wmask commands */
++
++#define VCMD_get_wmask		VC_CMD(FLAGS, 15, 0)
++#define VCMD_set_wmask		VC_CMD(FLAGS, 16, 0)
++
++struct	vcmd_wmask {
++	uint64_t wmask;
++	uint64_t mask;
++};
++
++
++
++/* OOM badness */
++
++#define VCMD_get_badness	VC_CMD(MEMCTRL, 5, 0)
++#define VCMD_set_badness	VC_CMD(MEMCTRL, 6, 0)
++
++struct	vcmd_badness_v0 {
++	int64_t bias;
++};
++
++#endif /* _UAPI_VS_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/cvirt_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.7.10/include/uapi/vserver/cvirt_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cvirt_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,41 @@
++#ifndef _UAPI_VS_CVIRT_CMD_H
++#define _UAPI_VS_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,
++};
++
++
++
++#define VCMD_virt_stat		VC_CMD(VSTAT, 3, 0)
++
++struct	vcmd_virt_stat_v0 {
++	uint64_t offset;
++	uint64_t uptime;
++	uint32_t nr_threads;
++	uint32_t nr_running;
++	uint32_t nr_uninterruptible;
++	uint32_t nr_onhold;
++	uint32_t nr_forks;
++	uint32_t load[3];
++};
++
++#endif /* _UAPI_VS_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/debug_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/debug_cmd.h
+--- linux-3.7.10/include/uapi/vserver/debug_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/debug_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,24 @@
++#ifndef _UAPI_VS_DEBUG_CMD_H
++#define _UAPI_VS_DEBUG_CMD_H
++
++
++/* debug commands */
++
++#define VCMD_dump_history	VC_CMD(DEBUG, 1, 0)
++
++#define VCMD_read_history	VC_CMD(DEBUG, 5, 0)
++#define VCMD_read_monitor	VC_CMD(DEBUG, 6, 0)
++
++struct  vcmd_read_history_v0 {
++	uint32_t index;
++	uint32_t count;
++	char __user *data;
++};
++
++struct  vcmd_read_monitor_v0 {
++	uint32_t index;
++	uint32_t count;
++	char __user *data;
++};
++
++#endif /* _UAPI_VS_DEBUG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/device.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device.h
+--- linux-3.7.10/include/uapi/vserver/device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,12 @@
++#ifndef _UAPI_VS_DEVICE_H
++#define _UAPI_VS_DEVICE_H
++
++
++#define DATTR_CREATE	0x00000001
++#define DATTR_OPEN	0x00000002
++
++#define DATTR_REMAP	0x00000010
++
++#define DATTR_MASK	0x00000013
++
++#endif	/* _UAPI_VS_DEVICE_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/device_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device_cmd.h
+--- linux-3.7.10/include/uapi/vserver/device_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,16 @@
++#ifndef _UAPI_VS_DEVICE_CMD_H
++#define _UAPI_VS_DEVICE_CMD_H
++
++
++/*  device vserver commands */
++
++#define VCMD_set_mapping	VC_CMD(DEVICE, 1, 0)
++#define VCMD_unset_mapping	VC_CMD(DEVICE, 2, 0)
++
++struct	vcmd_set_mapping_v0 {
++	const char __user *device;
++	const char __user *target;
++	uint32_t flags;
++};
++
++#endif /* _UAPI_VS_DEVICE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/dlimit_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.7.10/include/uapi/vserver/dlimit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/dlimit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,67 @@
++#ifndef _UAPI_VS_DLIMIT_CMD_H
++#define _UAPI_VS_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;
++};
++
++#define CDLIM_UNSET		((uint32_t)0UL)
++#define CDLIM_INFINITY		((uint32_t)~0UL)
++#define CDLIM_KEEP		((uint32_t)~1UL)
++
++#define DLIME_UNIT	0
++#define DLIME_KILO	1
++#define DLIME_MEGA	2
++#define DLIME_GIGA	3
++
++#define DLIMF_SHIFT	0x10
++
++#define DLIMS_USED	0
++#define DLIMS_TOTAL	2
++
++static inline
++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
++{
++	int exp = (flags & DLIMF_SHIFT) ?
++		(flags >> shift) & DLIME_GIGA : DLIME_KILO;
++	return ((uint64_t)val) << (10 * exp);
++}
++
++static inline
++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
++{
++	int exp = 0;
++
++	if (*flags & DLIMF_SHIFT) {
++		while (val > (1LL << 32) && (exp < 3)) {
++			val >>= 10;
++			exp++;
++		}
++		*flags &= ~(DLIME_GIGA << shift);
++		*flags |= exp << shift;
++	} else
++		val >>= 10;
++	return val;
++}
++
++#endif /* _UAPI_VS_DLIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/inode.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode.h
+--- linux-3.7.10/include/uapi/vserver/inode.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _UAPI_VS_INODE_H
++#define _UAPI_VS_INODE_H
++
++
++#define IATTR_TAG	0x01000000
++
++#define IATTR_ADMIN	0x00000001
++#define IATTR_WATCH	0x00000002
++#define IATTR_HIDE	0x00000004
++#define IATTR_FLAGS	0x00000007
++
++#define IATTR_BARRIER	0x00010000
++#define IATTR_IXUNLINK	0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++#define IATTR_COW	0x00080000
++
++
++/* inode ioctls */
++
++#define FIOC_GETXFLG	_IOR('x', 5, long)
++#define FIOC_SETXFLG	_IOW('x', 6, long)
++
++#endif	/* _UAPI_VS_INODE_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/inode_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode_cmd.h
+--- linux-3.7.10/include/uapi/vserver/inode_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,26 @@
++#ifndef _UAPI_VS_INODE_CMD_H
++#define _UAPI_VS_INODE_CMD_H
++
++
++/*  inode vserver commands */
++
++#define VCMD_get_iattr		VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr		VC_CMD(INODE, 2, 1)
++
++#define VCMD_fget_iattr		VC_CMD(INODE, 3, 0)
++#define VCMD_fset_iattr		VC_CMD(INODE, 4, 0)
++
++struct	vcmd_ctx_iattr_v1 {
++	const char __user *name;
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++struct	vcmd_ctx_fiattr_v0 {
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++#endif /* _UAPI_VS_INODE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/limit.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit.h
+--- linux-3.7.10/include/uapi/vserver/limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_LIMIT_H
++#define _UAPI_VS_LIMIT_H
++
++
++#define VLIMIT_NSOCK	16
++#define VLIMIT_OPENFD	17
++#define VLIMIT_ANON	18
++#define VLIMIT_SHMEM	19
++#define VLIMIT_SEMARY	20
++#define VLIMIT_NSEMS	21
++#define VLIMIT_DENTRY	22
++#define VLIMIT_MAPPED	23
++
++#endif /* _UAPI_VS_LIMIT_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/limit_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit_cmd.h
+--- linux-3.7.10/include/uapi/vserver/limit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,40 @@
++#ifndef _UAPI_VS_LIMIT_CMD_H
++#define _UAPI_VS_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)
++#define VCMD_reset_hits		VC_CMD(RLIMIT, 7, 0)
++#define VCMD_reset_minmax	VC_CMD(RLIMIT, 9, 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 VCMD_rlimit_stat	VC_CMD(VSTAT, 1, 0)
++
++struct	vcmd_rlimit_stat_v0 {
++	uint32_t id;
++	uint32_t hits;
++	uint64_t value;
++	uint64_t minimum;
++	uint64_t maximum;
++};
++
++#define CRLIM_UNSET		(0ULL)
++#define CRLIM_INFINITY		(~0ULL)
++#define CRLIM_KEEP		(~1ULL)
++
++#endif /* _UAPI_VS_LIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/monitor.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/monitor.h
+--- linux-3.7.10/include/uapi/vserver/monitor.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/monitor.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,96 @@
++#ifndef _UAPI_VS_MONITOR_H
++#define _UAPI_VS_MONITOR_H
++
++#include <linux/types.h>
++
++
++enum {
++	VXM_UNUSED = 0,
++
++	VXM_SYNC = 0x10,
++
++	VXM_UPDATE = 0x20,
++	VXM_UPDATE_1,
++	VXM_UPDATE_2,
++
++	VXM_RQINFO_1 = 0x24,
++	VXM_RQINFO_2,
++
++	VXM_ACTIVATE = 0x40,
++	VXM_DEACTIVATE,
++	VXM_IDLE,
++
++	VXM_HOLD = 0x44,
++	VXM_UNHOLD,
++
++	VXM_MIGRATE = 0x48,
++	VXM_RESCHED,
++
++	/* all other bits are flags */
++	VXM_SCHED = 0x80,
++};
++
++struct _vxm_update_1 {
++	uint32_t tokens_max;
++	uint32_t fill_rate;
++	uint32_t interval;
++};
++
++struct _vxm_update_2 {
++	uint32_t tokens_min;
++	uint32_t fill_rate;
++	uint32_t interval;
++};
++
++struct _vxm_rqinfo_1 {
++	uint16_t running;
++	uint16_t onhold;
++	uint16_t iowait;
++	uint16_t uintr;
++	uint32_t idle_tokens;
++};
++
++struct _vxm_rqinfo_2 {
++	uint32_t norm_time;
++	uint32_t idle_time;
++	uint32_t idle_skip;
++};
++
++struct _vxm_sched {
++	uint32_t tokens;
++	uint32_t norm_time;
++	uint32_t idle_time;
++};
++
++struct _vxm_task {
++	uint16_t pid;
++	uint16_t state;
++};
++
++struct _vxm_event {
++	uint32_t jif;
++	union {
++		uint32_t seq;
++		uint32_t sec;
++	};
++	union {
++		uint32_t tokens;
++		uint32_t nsec;
++		struct _vxm_task tsk;
++	};
++};
++
++struct _vx_mon_entry {
++	uint16_t type;
++	uint16_t xid;
++	union {
++		struct _vxm_event ev;
++		struct _vxm_sched sd;
++		struct _vxm_update_1 u1;
++		struct _vxm_update_2 u2;
++		struct _vxm_rqinfo_1 q1;
++		struct _vxm_rqinfo_2 q2;
++	};
++};
++
++#endif /* _UAPI_VS_MONITOR_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/network.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network.h
+--- linux-3.7.10/include/uapi/vserver/network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,76 @@
++#ifndef _UAPI_VS_NETWORK_H
++#define _UAPI_VS_NETWORK_H
++
++#include <linux/types.h>
++
++
++#define MAX_N_CONTEXT	65535	/* Arbitrary limit */
++
++
++/* network flags */
++
++#define NXF_INFO_PRIVATE	0x00000008
++
++#define NXF_SINGLE_IP		0x00000100
++#define NXF_LBACK_REMAP		0x00000200
++#define NXF_LBACK_ALLOW		0x00000400
++
++#define NXF_HIDE_NETIF		0x02000000
++#define NXF_HIDE_LBACK		0x04000000
++
++#define NXF_STATE_SETUP		(1ULL << 32)
++#define NXF_STATE_ADMIN		(1ULL << 34)
++
++#define NXF_SC_HELPER		(1ULL << 36)
++#define NXF_PERSISTENT		(1ULL << 38)
++
++#define NXF_ONE_TIME		(0x0005ULL << 32)
++
++
++#define	NXF_INIT_SET		(__nxf_init_set())
++
++static inline uint64_t __nxf_init_set(void) {
++	return	  NXF_STATE_ADMIN
++#ifdef	CONFIG_VSERVER_AUTO_LBACK
++		| NXF_LBACK_REMAP
++		| NXF_HIDE_LBACK
++#endif
++#ifdef	CONFIG_VSERVER_AUTO_SINGLE
++		| NXF_SINGLE_IP
++#endif
++		| NXF_HIDE_NETIF;
++}
++
++
++/* network caps */
++
++#define NXC_TUN_CREATE		0x00000001
++
++#define NXC_RAW_ICMP		0x00000100
++
++#define NXC_MULTICAST		0x00001000
++
++
++/* address types */
++
++#define NXA_TYPE_IPV4		0x0001
++#define NXA_TYPE_IPV6		0x0002
++
++#define NXA_TYPE_NONE		0x0000
++#define NXA_TYPE_ANY		0x00FF
++
++#define NXA_TYPE_ADDR		0x0010
++#define NXA_TYPE_MASK		0x0020
++#define NXA_TYPE_RANGE		0x0040
++
++#define NXA_MASK_ALL		(NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
++
++#define NXA_MOD_BCAST		0x0100
++#define NXA_MOD_LBACK		0x0200
++
++#define NXA_LOOPBACK		0x1000
++
++#define NXA_MASK_BIND		(NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
++#define NXA_MASK_SHOW		(NXA_MASK_ALL | NXA_LOOPBACK)
++
++#endif /* _UAPI_VS_NETWORK_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/network_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network_cmd.h
+--- linux-3.7.10/include/uapi/vserver/network_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,123 @@
++#ifndef _UAPI_VS_NETWORK_CMD_H
++#define _UAPI_VS_NETWORK_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_nid		VC_CMD(VINFO, 2, 0)
++
++
++#define VCMD_nx_info		VC_CMD(VINFO, 6, 0)
++
++struct	vcmd_nx_info_v0 {
++	uint32_t nid;
++	/* more to come */
++};
++
++
++#include <linux/in.h>
++#include <linux/in6.h>
++
++#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;
++	struct in_addr ip[4];
++	struct in_addr mask[4];
++};
++
++#define VCMD_net_add_ipv4_v1	VC_CMD(NETALT, 1, 1)
++#define VCMD_net_rem_ipv4_v1	VC_CMD(NETALT, 2, 1)
++
++struct	vcmd_net_addr_ipv4_v1 {
++	uint16_t type;
++	uint16_t flags;
++	struct in_addr ip;
++	struct in_addr mask;
++};
++
++#define VCMD_net_add_ipv4	VC_CMD(NETALT, 1, 2)
++#define VCMD_net_rem_ipv4	VC_CMD(NETALT, 2, 2)
++
++struct	vcmd_net_addr_ipv4_v2 {
++	uint16_t type;
++	uint16_t flags;
++	struct in_addr ip;
++	struct in_addr ip2;
++	struct in_addr mask;
++};
++
++#define VCMD_net_add_ipv6	VC_CMD(NETALT, 3, 1)
++#define VCMD_net_remove_ipv6	VC_CMD(NETALT, 4, 1)
++
++struct	vcmd_net_addr_ipv6_v1 {
++	uint16_t type;
++	uint16_t flags;
++	uint32_t prefix;
++	struct in6_addr ip;
++	struct in6_addr mask;
++};
++
++#define VCMD_add_match_ipv4	VC_CMD(NETALT, 5, 0)
++#define VCMD_get_match_ipv4	VC_CMD(NETALT, 6, 0)
++
++struct	vcmd_match_ipv4_v0 {
++	uint16_t type;
++	uint16_t flags;
++	uint16_t parent;
++	uint16_t prefix;
++	struct in_addr ip;
++	struct in_addr ip2;
++	struct in_addr mask;
++};
++
++#define VCMD_add_match_ipv6	VC_CMD(NETALT, 7, 0)
++#define VCMD_get_match_ipv6	VC_CMD(NETALT, 8, 0)
++
++struct	vcmd_match_ipv6_v0 {
++	uint16_t type;
++	uint16_t flags;
++	uint16_t parent;
++	uint16_t prefix;
++	struct in6_addr ip;
++	struct in6_addr ip2;
++	struct in6_addr mask;
++};
++
++
++
++
++/* 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;
++};
++
++
++
++/* 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;
++};
++
++#endif /* _UAPI_VS_NETWORK_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/sched_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/sched_cmd.h
+--- linux-3.7.10/include/uapi/vserver/sched_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/sched_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _UAPI_VS_SCHED_CMD_H
++#define _UAPI_VS_SCHED_CMD_H
++
++
++struct	vcmd_prio_bias {
++	int32_t cpu_id;
++	int32_t prio_bias;
++};
++
++#define VCMD_set_prio_bias	VC_CMD(SCHED, 4, 0)
++#define VCMD_get_prio_bias	VC_CMD(SCHED, 5, 0)
++
++#endif /* _UAPI_VS_SCHED_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/signal_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/signal_cmd.h
+--- linux-3.7.10/include/uapi/vserver/signal_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/signal_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,31 @@
++#ifndef _UAPI_VS_SIGNAL_CMD_H
++#define _UAPI_VS_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 reboot_cmd;
++	int32_t exit_code;
++};
++
++
++/*  process alteration commands */
++
++#define VCMD_get_pflags		VC_CMD(PROCALT, 5, 0)
++#define VCMD_set_pflags		VC_CMD(PROCALT, 6, 0)
++
++struct	vcmd_pflags_v0 {
++	uint32_t flagword;
++	uint32_t mask;
++};
++
++#endif /* _UAPI_VS_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/space_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/space_cmd.h
+--- linux-3.7.10/include/uapi/vserver/space_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/space_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,28 @@
++#ifndef _UAPI_VS_SPACE_CMD_H
++#define _UAPI_VS_SPACE_CMD_H
++
++
++#define VCMD_enter_space_v0	VC_CMD(PROCALT, 1, 0)
++#define VCMD_enter_space_v1	VC_CMD(PROCALT, 1, 1)
++#define VCMD_enter_space	VC_CMD(PROCALT, 1, 2)
++
++#define VCMD_set_space_v0	VC_CMD(PROCALT, 3, 0)
++#define VCMD_set_space_v1	VC_CMD(PROCALT, 3, 1)
++#define VCMD_set_space		VC_CMD(PROCALT, 3, 2)
++
++#define VCMD_get_space_mask_v0	VC_CMD(PROCALT, 4, 0)
++
++#define VCMD_get_space_mask	VC_CMD(VSPACE, 0, 1)
++#define VCMD_get_space_default	VC_CMD(VSPACE, 1, 0)
++
++
++struct	vcmd_space_mask_v1 {
++	uint64_t mask;
++};
++
++struct	vcmd_space_mask_v2 {
++	uint64_t mask;
++	uint32_t index;
++};
++
++#endif /* _UAPI_VS_SPACE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/switch.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/switch.h
+--- linux-3.7.10/include/uapi/vserver/switch.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/switch.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,90 @@
++#ifndef _UAPI_VS_SWITCH_H
++#define _UAPI_VS_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  |       |       |       | |DEVICE |       |
++  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 |       |       |       |       |MEMCTRL|       | |SWAP   |       |
++	 |     16|     17|     18|     19|     20|     21| |     22|     23|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  NETWORK|       |VNET   |NETALT |NETMIG |NETCTL |       | |SERIAL |       |
++	 |     24|     25|     26|     27|     28|     29| |     30|     31|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  DISK   |       |       |       |TAGMIG |DLIMIT |       | |INODE  |       |
++  VFS    |     32|     33|     34|     35|     36|     37| |     38|     39|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  OTHER  |VSTAT  |       |       |       |       |       | |VINFO  |       |
++	 |     40|     41|     42|     43|     44|     45| |     46|     47|
++  =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
++  SPECIAL|EVENT  |       |       |       |FLAGS  |       | |VSPACE |       |
++	 |     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_DEVICE		6
++
++#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_MEMCTRL		20
++
++#define VC_CAT_VNET		25
++#define VC_CAT_NETALT		26
++#define VC_CAT_NETMIG		27
++#define VC_CAT_NETCTRL		28
++
++#define VC_CAT_TAGMIG		35
++#define VC_CAT_DLIMIT		36
++#define VC_CAT_INODE		38
++
++#define VC_CAT_VSTAT		40
++#define VC_CAT_VINFO		46
++#define VC_CAT_EVENT		48
++
++#define VC_CAT_FLAGS		52
++#define VC_CAT_VSPACE		54
++#define VC_CAT_DEBUG		56
++#define VC_CAT_RLIMIT		60
++
++#define VC_CAT_SYSTEST		61
++#define VC_CAT_COMPAT		63
++
++/*  query version */
++
++#define VCMD_get_version	VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci		VC_CMD(VERSION, 1, 0)
++
++#endif /* _UAPI_VS_SWITCH_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/tag_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/tag_cmd.h
+--- linux-3.7.10/include/uapi/vserver/tag_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/tag_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_TAG_CMD_H
++#define _UAPI_VS_TAG_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_tag		VC_CMD(VINFO, 3, 0)
++
++
++/* context commands */
++
++#define VCMD_tag_migrate	VC_CMD(TAGMIG, 1, 0)
++
++#endif /* _UAPI_VS_TAG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/init/Kconfig linux-3.7.10-vs2.3.5.6/init/Kconfig
+--- linux-3.7.10/init/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/init/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -699,6 +699,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
+ menuconfig CGROUPS
+ 	boolean "Control Group support"
+ 	depends on EVENTFD
++	default y
+ 	help
+ 	  This option adds support for grouping sets of processes together, for
+ 	  use with process control subsystems such as Cpusets, CFS, memory
+@@ -964,6 +965,7 @@ config USER_NS
+ 	bool "User namespace (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL
+ 	depends on UIDGID_CONVERTED
++	depends on VSERVER_DISABLED
+ 	select UIDGID_STRICT_TYPE_CHECKS
+ 
+ 	default n
+diff -NurpP --minimal linux-3.7.10/init/main.c linux-3.7.10-vs2.3.5.6/init/main.c
+--- linux-3.7.10/init/main.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/init/main.c	2013-02-05 01:14:43.000000000 +0000
+@@ -70,6 +70,7 @@
+ #include <linux/perf_event.h>
+ #include <linux/file.h>
+ #include <linux/ptrace.h>
++#include <linux/vserver/percpu.h>
+ 
+ #include <asm/io.h>
+ #include <asm/bugs.h>
+diff -NurpP --minimal linux-3.7.10/ipc/mqueue.c linux-3.7.10-vs2.3.5.6/ipc/mqueue.c
+--- linux-3.7.10/ipc/mqueue.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/mqueue.c	2012-12-18 15:13:16.000000000 +0000
+@@ -35,6 +35,8 @@
+ #include <linux/ipc_namespace.h>
+ #include <linux/user_namespace.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ #include <net/sock.h>
+ #include "util.h"
+@@ -76,6 +78,7 @@ struct mqueue_inode_info {
+ 	struct pid* notify_owner;
+ 	struct user_namespace *notify_user_ns;
+ 	struct user_struct *user;	/* user who created, for accounting */
++	struct vx_info *vxi;
+ 	struct sock *notify_sock;
+ 	struct sk_buff *notify_cookie;
+ 
+@@ -234,6 +237,7 @@ static struct inode *mqueue_get_inode(st
+ 	if (S_ISREG(mode)) {
+ 		struct mqueue_inode_info *info;
+ 		unsigned long mq_bytes, mq_treesize;
++		struct vx_info *vxi = current_vx_info();
+ 
+ 		inode->i_fop = &mqueue_file_operations;
+ 		inode->i_size = FILENT_SIZE;
+@@ -247,6 +251,7 @@ static struct inode *mqueue_get_inode(st
+ 		info->notify_user_ns = NULL;
+ 		info->qsize = 0;
+ 		info->user = NULL;	/* set when all is ok */
++		info->vxi = NULL;
+ 		info->msg_tree = RB_ROOT;
+ 		info->node_cache = NULL;
+ 		memset(&info->attr, 0, sizeof(info->attr));
+@@ -280,17 +285,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 > rlimit(RLIMIT_MSGQUEUE)) {
++		    u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) ||
++		    !vx_ipcmsg_avail(vxi, mq_bytes)) {
+ 			spin_unlock(&mq_lock);
+ 			/* mqueue_evict_inode() releases info->messages */
+ 			ret = -EMFILE;
+ 			goto out_inode;
+ 		}
+ 		u->mq_bytes += mq_bytes;
++		vx_ipcmsg_add(vxi, u, mq_bytes);
+ 		spin_unlock(&mq_lock);
+ 
+ 		/* all is ok */
+ 		info->user = get_uid(u);
++		info->vxi = get_vx_info(vxi);
+ 	} else if (S_ISDIR(mode)) {
+ 		inc_nlink(inode);
+ 		/* Some things misbehave if size == 0 on a directory */
+@@ -394,8 +402,11 @@ static void mqueue_evict_inode(struct in
+ 
+ 	user = info->user;
+ 	if (user) {
++		struct vx_info *vxi = info->vxi;
++
+ 		spin_lock(&mq_lock);
+ 		user->mq_bytes -= mq_bytes;
++		vx_ipcmsg_sub(vxi, user, mq_bytes);
+ 		/*
+ 		 * get_ns_from_inode() ensures that the
+ 		 * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
+@@ -405,6 +416,7 @@ static void mqueue_evict_inode(struct in
+ 		if (ipc_ns)
+ 			ipc_ns->mq_queues_count--;
+ 		spin_unlock(&mq_lock);
++		put_vx_info(vxi);
+ 		free_uid(user);
+ 	}
+ 	if (ipc_ns)
+diff -NurpP --minimal linux-3.7.10/ipc/msg.c linux-3.7.10-vs2.3.5.6/ipc/msg.c
+--- linux-3.7.10/ipc/msg.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/msg.c	2012-12-18 15:13:16.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace *
+ 
+ 	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);
+diff -NurpP --minimal linux-3.7.10/ipc/namespace.c linux-3.7.10-vs2.3.5.6/ipc/namespace.c
+--- linux-3.7.10/ipc/namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -13,11 +13,12 @@
+ #include <linux/mount.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_fs.h>
++#include <linux/vs_base.h>
++#include <linux/vserver/global.h>
+ 
+ #include "util.h"
+ 
+-static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
+-					   struct ipc_namespace *old_ns)
++static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns)
+ {
+ 	struct ipc_namespace *ns;
+ 	int err;
+@@ -46,19 +47,19 @@ static struct ipc_namespace *create_ipc_
+ 	ipcns_notify(IPCNS_CREATED);
+ 	register_ipcns_notifier(ns);
+ 
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
++	// ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
++	ns->user_ns = get_user_ns(user_ns);
+ 
+ 	return ns;
+ }
+ 
+ struct ipc_namespace *copy_ipcs(unsigned long flags,
+-				struct task_struct *tsk)
++				struct ipc_namespace *old_ns,
++				struct user_namespace *user_ns)
+ {
+-	struct ipc_namespace *ns = tsk->nsproxy->ipc_ns;
+-
+ 	if (!(flags & CLONE_NEWIPC))
+-		return get_ipc_ns(ns);
+-	return create_ipc_ns(tsk, ns);
++		return get_ipc_ns(old_ns);
++	return create_ipc_ns(user_ns);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/ipc/sem.c linux-3.7.10-vs2.3.5.6/ipc/sem.c
+--- linux-3.7.10/ipc/sem.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/sem.c	2012-12-18 15:13:16.000000000 +0000
+@@ -86,6 +86,8 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ #include "util.h"
+@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace *
+ 
+ 	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);
+@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace *
+ 		return id;
+ 	}
+ 	ns->used_sems += nsems;
++	/* FIXME: obsoleted? */
++	vx_semary_inc(sma);
++	vx_nsems_add(sma, nsems);
+ 
+ 	sma->sem_base = (struct sem *) &sma[1];
+ 
+@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace
+ 
+ 	wake_up_sem_queue_do(&tasks);
+ 	ns->used_sems -= sma->sem_nsems;
++	/* FIXME: obsoleted? */
++	vx_nsems_sub(sma, sma->sem_nsems);
++	vx_semary_dec(sma);
+ 	security_sem_free(sma);
+ 	ipc_rcu_putref(sma);
+ }
+diff -NurpP --minimal linux-3.7.10/ipc/shm.c linux-3.7.10-vs2.3.5.6/ipc/shm.c
+--- linux-3.7.10/ipc/shm.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/shm.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,8 @@
+ #include <linux/nsproxy.h>
+ #include <linux/mount.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru
+  */
+ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
+ {
+-	ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++	struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
++	int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++
++	vx_ipcshm_sub(vxi, shp, numpages);
++	ns->shm_tot -= numpages;
++
+ 	shm_rmid(ns, shp);
+ 	shm_unlock(shp);
+ 	if (!is_file_hugepages(shp->shm_file))
+@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names
+ 						shp->mlock_user);
+ 	fput (shp->shm_file);
+ 	security_shm_free(shp);
++	put_vx_info(vxi);
+ 	ipc_rcu_putref(shp);
+ }
+ 
+@@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace *
+ 	if (ns->shm_tot + numpages > ns->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_perm.mode = (shmflg & S_IRWXUGO);
+ 	shp->mlock_user = NULL;
+ 
+@@ -533,6 +545,7 @@ static int newseg(struct ipc_namespace *
+ 	ns->shm_tot += numpages;
+ 	error = shp->shm_perm.id;
+ 	shm_unlock(shp);
++	vx_ipcshm_add(current_vx_info(), key, numpages);
+ 	return error;
+ 
+ no_id:
+diff -NurpP --minimal linux-3.7.10/kernel/Makefile linux-3.7.10-vs2.3.5.6/kernel/Makefile
+--- linux-3.7.10/kernel/Makefile	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/Makefile	2012-12-18 15:13:16.000000000 +0000
+@@ -24,6 +24,7 @@ endif
+ 
+ obj-y += sched/
+ obj-y += power/
++obj-y += vserver/
+ 
+ ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
+ obj-$(CONFIG_X86) += kcmp.o
+diff -NurpP --minimal linux-3.7.10/kernel/auditsc.c linux-3.7.10-vs2.3.5.6/kernel/auditsc.c
+--- linux-3.7.10/kernel/auditsc.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/auditsc.c	2013-02-05 01:14:43.000000000 +0000
+@@ -2372,7 +2372,7 @@ int audit_set_loginuid(kuid_t loginuid)
+ 	if (uid_valid(task->loginuid))
+ 		return -EPERM;
+ #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+-	if (!capable(CAP_AUDIT_CONTROL))
++	if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
+ 		return -EPERM;
+ #endif  /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/capability.c linux-3.7.10-vs2.3.5.6/kernel/capability.c
+--- linux-3.7.10/kernel/capability.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/capability.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_context.h>
+ #include <asm/uaccess.h>
+ 
+ /*
+@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h
+ 	return 0;
+ }
+ 
++
+ /*
+  * The only thing that can change the capabilities of the current
+  * process is the current process. As such, we can't be in this code
+@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta
+ 	return (ret == 0);
+ }
+ 
++#include <linux/vserver/base.h>
++
+ /**
+  * has_capability_noaudit - Does a task have a capability (unaudited) in the
+  * initial user ns
+diff -NurpP --minimal linux-3.7.10/kernel/compat.c linux-3.7.10-vs2.3.5.6/kernel/compat.c
+--- linux-3.7.10/kernel/compat.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/compat.c	2012-12-18 15:13:16.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <linux/times.h>
+ #include <linux/ptrace.h>
+ #include <linux/gfp.h>
++#include <linux/vs_time.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -1054,7 +1055,7 @@ asmlinkage long compat_sys_stime(compat_
+ 	if (err)
+ 		return err;
+ 
+-	do_settimeofday(&tv);
++	vx_settimeofday(&tv);
+ 	return 0;
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/cred.c linux-3.7.10-vs2.3.5.6/kernel/cred.c
+--- linux-3.7.10/kernel/cred.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/cred.c	2012-12-18 15:13:16.000000000 +0000
+@@ -70,31 +70,6 @@ struct cred init_cred = {
+ #endif
+ };
+ 
+-static inline void set_cred_subscribers(struct cred *cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	atomic_set(&cred->subscribers, n);
+-#endif
+-}
+-
+-static inline int read_cred_subscribers(const struct cred *cred)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	return atomic_read(&cred->subscribers);
+-#else
+-	return 0;
+-#endif
+-}
+-
+-static inline void alter_cred_subscribers(const struct cred *_cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	struct cred *cred = (struct cred *) _cred;
+-
+-	atomic_add(n, &cred->subscribers);
+-#endif
+-}
+-
+ /*
+  * Dispose of the shared task group credentials
+  */
+@@ -284,21 +259,16 @@ error:
+  *
+  * Call commit_creds() or abort_creds() to clean up.
+  */
+-struct cred *prepare_creds(void)
++struct cred *__prepare_creds(const struct cred *old)
+ {
+-	struct task_struct *task = current;
+-	const struct cred *old;
+ 	struct cred *new;
+ 
+-	validate_process_creds();
+-
+ 	new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
+ 	if (!new)
+ 		return NULL;
+ 
+ 	kdebug("prepare_creds() alloc %p", new);
+ 
+-	old = task->cred;
+ 	memcpy(new, old, sizeof(struct cred));
+ 
+ 	atomic_set(&new->usage, 1);
+@@ -326,6 +296,13 @@ error:
+ 	abort_creds(new);
+ 	return NULL;
+ }
++
++struct cred *prepare_creds(void)
++{
++	validate_process_creds();
++
++	return __prepare_creds(current->cred);
++}
+ EXPORT_SYMBOL(prepare_creds);
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/kernel/exit.c linux-3.7.10-vs2.3.5.6/kernel/exit.c
+--- linux-3.7.10/kernel/exit.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/exit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -48,6 +48,10 @@
+ #include <linux/fs_struct.h>
+ #include <linux/init_task.h>
+ #include <linux/perf_event.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/oom.h>
+@@ -616,15 +620,25 @@ static struct task_struct *find_new_reap
+ 	__acquires(&tasklist_lock)
+ {
+ 	struct pid_namespace *pid_ns = task_active_pid_ns(father);
+-	struct task_struct *thread;
++	struct vx_info *vxi = task_get_vx_info(father);
++	struct task_struct *thread = father;
++	struct task_struct *reaper;
+ 
+-	thread = father;
+ 	while_each_thread(father, thread) {
+ 		if (thread->flags & PF_EXITING)
+ 			continue;
+ 		if (unlikely(pid_ns->child_reaper == father))
+ 			pid_ns->child_reaper = thread;
+-		return thread;
++		reaper = thread;
++		goto out_put;
++	}
++
++	reaper = pid_ns->child_reaper;
++	if (vxi) {
++		BUG_ON(!vxi->vx_reaper);
++		if (vxi->vx_reaper != init_pid_ns.child_reaper &&
++		    vxi->vx_reaper != father)
++			reaper = vxi->vx_reaper;
+ 	}
+ 
+ 	if (unlikely(pid_ns->child_reaper == father)) {
+@@ -662,7 +676,9 @@ static struct task_struct *find_new_reap
+ 		}
+ 	}
+ 
+-	return pid_ns->child_reaper;
++out_put:
++	put_vx_info(vxi);
++	return reaper;
+ }
+ 
+ /*
+@@ -713,10 +729,15 @@ static void forget_original_parent(struc
+ 	list_for_each_entry_safe(p, n, &father->children, sibling) {
+ 		struct task_struct *t = p;
+ 		do {
+-			t->real_parent = reaper;
++			struct task_struct *new_parent = reaper;
++
++			if (unlikely(p == reaper))
++				new_parent = task_active_pid_ns(p)->child_reaper;
++
++			t->real_parent = new_parent;
+ 			if (t->parent == father) {
+ 				BUG_ON(t->ptrace);
+-				t->parent = t->real_parent;
++				t->parent = new_parent;
+ 			}
+ 			if (t->pdeath_signal)
+ 				group_send_sig_info(t->pdeath_signal,
+@@ -923,6 +944,9 @@ void do_exit(long code)
+ 	 */
+ 	ptrace_put_breakpoints(tsk);
+ 
++	/* needs to stay before exit_notify() */
++	exit_vx_info_early(tsk, code);
++
+ 	exit_notify(tsk, group_dead);
+ #ifdef CONFIG_NUMA
+ 	task_lock(tsk);
+@@ -976,10 +1000,15 @@ void do_exit(long code)
+ 	smp_mb();
+ 	raw_spin_unlock_wait(&tsk->pi_lock);
+ 
++	/* needs to stay after exit_notify() */
++	exit_vx_info(tsk, code);
++	exit_nx_info(tsk);
++
+ 	/* causes final put_task_struct in finish_task_switch(). */
+ 	tsk->state = TASK_DEAD;
+ 	tsk->flags |= PF_NOFREEZE;	/* tell freezer to ignore us */
+ 	schedule();
++	printk("bad task: %p [%lx]\n", current, current->state);
+ 	BUG();
+ 	/* Avoid "noreturn function does return".  */
+ 	for (;;)
+diff -NurpP --minimal linux-3.7.10/kernel/fork.c linux-3.7.10-vs2.3.5.6/kernel/fork.c
+--- linux-3.7.10/kernel/fork.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/fork.c	2013-01-16 00:19:28.000000000 +0000
+@@ -70,6 +70,9 @@
+ #include <linux/khugepaged.h>
+ #include <linux/signalfd.h>
+ #include <linux/uprobes.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/pgalloc.h>
+@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk)
+ 	arch_release_thread_info(tsk->stack);
+ 	free_thread_info(tsk->stack);
+ 	rt_mutex_debug_task_free(tsk);
++	clr_vx_info(&tsk->vx_info);
++	clr_nx_info(&tsk->nx_info);
+ 	ftrace_graph_exit_task(tsk);
+ 	put_seccomp_filter(tsk);
+ 	arch_release_task_struct(tsk);
+@@ -545,6 +550,7 @@ static struct mm_struct *mm_init(struct
+ 	if (likely(!mm_alloc_pgd(mm))) {
+ 		mm->def_flags = 0;
+ 		mmu_notifier_mm_init(mm);
++		set_vx_info(&mm->mm_vx_info, p->vx_info);
+ 		return mm;
+ 	}
+ 
+@@ -597,6 +603,7 @@ void __mmdrop(struct mm_struct *mm)
+ 	destroy_context(mm);
+ 	mmu_notifier_mm_destroy(mm);
+ 	check_mm(mm);
++	clr_vx_info(&mm->mm_vx_info);
+ 	free_mm(mm);
+ }
+ EXPORT_SYMBOL_GPL(__mmdrop);
+@@ -816,6 +823,7 @@ struct mm_struct *dup_mm(struct task_str
+ 		goto fail_nomem;
+ 
+ 	memcpy(mm, oldmm, sizeof(*mm));
++	mm->mm_vx_info = NULL;
+ 	mm_init_cpumask(mm);
+ 
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+@@ -854,6 +862,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 NULL;
+@@ -1135,6 +1144,8 @@ static struct task_struct *copy_process(
+ {
+ 	int retval;
+ 	struct task_struct *p;
++	struct vx_info *vxi;
++	struct nx_info *nxi;
+ 
+ 	if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
+ 		return ERR_PTR(-EINVAL);
+@@ -1182,7 +1193,12 @@ static struct task_struct *copy_process(
+ 	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
+ 	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
+ #endif
++	init_vx_info(&p->vx_info, current_vx_info());
++	init_nx_info(&p->nx_info, current_nx_info());
++
+ 	retval = -EAGAIN;
++	if (!vx_nproc_avail(1))
++		goto bad_fork_free;
+ 	if (atomic_read(&p->real_cred->user->processes) >=
+ 			task_rlimit(p, RLIMIT_NPROC)) {
+ 		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+@@ -1451,6 +1467,18 @@ static struct task_struct *copy_process(
+ 
+ 	total_forks++;
+ 	spin_unlock(&current->sighand->siglock);
++
++	/* 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);
+ 	proc_fork_connector(p);
+ 	cgroup_post_fork(p);
+diff -NurpP --minimal linux-3.7.10/kernel/kthread.c linux-3.7.10-vs2.3.5.6/kernel/kthread.c
+--- linux-3.7.10/kernel/kthread.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/kthread.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/slab.h>
+ #include <linux/freezer.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+ 
+ static DEFINE_SPINLOCK(kthread_create_lock);
+diff -NurpP --minimal linux-3.7.10/kernel/nsproxy.c linux-3.7.10-vs2.3.5.6/kernel/nsproxy.c
+--- linux-3.7.10/kernel/nsproxy.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/nsproxy.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,11 +20,14 @@
+ #include <linux/mnt_namespace.h>
+ #include <linux/utsname.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vserver/global.h>
++#include <linux/vserver/debug.h>
+ #include <net/net_namespace.h>
+ #include <linux/ipc_namespace.h>
+ #include <linux/proc_fs.h>
+ #include <linux/file.h>
+ #include <linux/syscalls.h>
++#include "../fs/mount.h"
+ 
+ static struct kmem_cache *nsproxy_cachep;
+ 
+@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp
+ 	struct nsproxy *nsproxy;
+ 
+ 	nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+-	if (nsproxy)
++	if (nsproxy) {
+ 		atomic_set(&nsproxy->count, 1);
++		atomic_inc(&vs_global_nsproxy);
++	}
++	vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
+ 	return nsproxy;
+ }
+ 
+@@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsp
+  * Return the newly created nsproxy.  Do not attach this to the task,
+  * leave it to the caller to do proper locking and attach it to task.
+  */
+-static struct nsproxy *create_new_namespaces(unsigned long flags,
+-			struct task_struct *tsk, struct fs_struct *new_fs)
++static struct nsproxy *unshare_namespaces(unsigned long flags,
++			struct nsproxy *orig,
++			struct fs_struct *new_fs,
++			struct user_namespace *new_user,
++			struct pid_namespace *new_pid)
+ {
+ 	struct nsproxy *new_nsp;
+ 	int err;
+@@ -66,31 +75,31 @@ static struct nsproxy *create_new_namesp
+ 	if (!new_nsp)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, new_fs);
++	new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs);
+ 	if (IS_ERR(new_nsp->mnt_ns)) {
+ 		err = PTR_ERR(new_nsp->mnt_ns);
+ 		goto out_ns;
+ 	}
+ 
+-	new_nsp->uts_ns = copy_utsname(flags, tsk);
++	new_nsp->uts_ns = copy_utsname(flags, orig->uts_ns, new_user);
+ 	if (IS_ERR(new_nsp->uts_ns)) {
+ 		err = PTR_ERR(new_nsp->uts_ns);
+ 		goto out_uts;
+ 	}
+ 
+-	new_nsp->ipc_ns = copy_ipcs(flags, tsk);
++	new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns, new_user);
+ 	if (IS_ERR(new_nsp->ipc_ns)) {
+ 		err = PTR_ERR(new_nsp->ipc_ns);
+ 		goto out_ipc;
+ 	}
+ 
+-	new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
++	new_nsp->pid_ns = copy_pid_ns(flags, new_pid);
+ 	if (IS_ERR(new_nsp->pid_ns)) {
+ 		err = PTR_ERR(new_nsp->pid_ns);
+ 		goto out_pid;
+ 	}
+ 
+-	new_nsp->net_ns = copy_net_ns(flags, tsk->nsproxy->net_ns);
++	new_nsp->net_ns = copy_net_ns(flags, orig->net_ns);
+ 	if (IS_ERR(new_nsp->net_ns)) {
+ 		err = PTR_ERR(new_nsp->net_ns);
+ 		goto out_net;
+@@ -115,6 +124,40 @@ out_ns:
+ 	return ERR_PTR(err);
+ }
+ 
++static struct nsproxy *create_new_namespaces(unsigned long flags,
++			struct task_struct *tsk, struct fs_struct *new_fs)
++{
++	return unshare_namespaces(flags, tsk->nsproxy,
++		new_fs, task_cred_xxx(tsk, user_ns),
++		task_active_pid_ns(tsk));
++}
++
++/*
++ * copies the nsproxy, setting refcount to 1, and grabbing a
++ * reference to all contained namespaces.
++ */
++struct nsproxy *copy_nsproxy(struct nsproxy *orig)
++{
++	struct nsproxy *ns = create_nsproxy();
++
++	if (ns) {
++		memcpy(ns, orig, sizeof(struct nsproxy));
++		atomic_set(&ns->count, 1);
++
++		if (ns->mnt_ns)
++			get_mnt_ns(ns->mnt_ns);
++		if (ns->uts_ns)
++			get_uts_ns(ns->uts_ns);
++		if (ns->ipc_ns)
++			get_ipc_ns(ns->ipc_ns);
++		if (ns->pid_ns)
++			get_pid_ns(ns->pid_ns);
++		if (ns->net_ns)
++			get_net(ns->net_ns);
++	}
++	return ns;
++}
++
+ /*
+  * called from clone.  This now handles copy for nsproxy and all
+  * namespaces therein.
+@@ -122,9 +165,12 @@ out_ns:
+ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
+ {
+ 	struct nsproxy *old_ns = tsk->nsproxy;
+-	struct nsproxy *new_ns;
++	struct nsproxy *new_ns = NULL;
+ 	int err = 0;
+ 
++	vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])",
++		flags, tsk, old_ns);
++
+ 	if (!old_ns)
+ 		return 0;
+ 
+@@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags,
+ 				CLONE_NEWPID | CLONE_NEWNET)))
+ 		return 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN)) {
++	if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) {
+ 		err = -EPERM;
+ 		goto out;
+ 	}
+@@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags,
+ 
+ out:
+ 	put_nsproxy(old_ns);
++	vxdprintk(VXD_CBIT(space, 3),
++		"copy_namespaces(0x%08lx,%p[%p]) = %d [%p]",
++		flags, tsk, old_ns, err, new_ns);
+ 	return err;
+ }
+ 
+@@ -174,7 +223,9 @@ void free_nsproxy(struct nsproxy *ns)
+ 		put_ipc_ns(ns->ipc_ns);
+ 	if (ns->pid_ns)
+ 		put_pid_ns(ns->pid_ns);
+-	put_net(ns->net_ns);
++	if (ns->net_ns)
++		put_net(ns->net_ns);
++	atomic_dec(&vs_global_nsproxy);
+ 	kmem_cache_free(nsproxy_cachep, ns);
+ }
+ 
+@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned
+ {
+ 	int err = 0;
+ 
++	vxdprintk(VXD_CBIT(space, 4),
++		"unshare_nsproxy_namespaces(0x%08lx,[%p])",
++		unshare_flags, current->nsproxy);
++
+ 	if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
+ 			       CLONE_NEWNET)))
+ 		return 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags))
+ 		return -EPERM;
+ 
+ 	*new_nsp = create_new_namespaces(unshare_flags, current,
+diff -NurpP --minimal linux-3.7.10/kernel/pid.c linux-3.7.10-vs2.3.5.6/kernel/pid.c
+--- linux-3.7.10/kernel/pid.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/pid.c	2012-12-18 15:13:16.000000000 +0000
+@@ -36,6 +36,7 @@
+ #include <linux/pid_namespace.h>
+ #include <linux/init_task.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_pid.h>
+ 
+ #define pid_hashfn(nr, ns)	\
+ 	hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
+@@ -344,7 +345,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+ 
+ struct pid *find_vpid(int nr)
+ {
+-	return find_pid_ns(nr, current->nsproxy->pid_ns);
++	return find_pid_ns(vx_rmap_pid(nr), current->nsproxy->pid_ns);
+ }
+ EXPORT_SYMBOL_GPL(find_vpid);
+ 
+@@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *ol
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
+ 	struct task_struct *result = NULL;
++
++	if (type == PIDTYPE_REALPID)
++		type = PIDTYPE_PID;
+ 	if (pid) {
+ 		struct hlist_node *first;
+ 		first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
+@@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns(
+ 	rcu_lockdep_assert(rcu_read_lock_held(),
+ 			   "find_task_by_pid_ns() needs rcu_read_lock()"
+ 			   " protection");
+-	return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
++	return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
+ }
+ 
+ struct task_struct *find_task_by_vpid(pid_t vnr)
+@@ -467,7 +471,7 @@ struct pid *find_get_pid(pid_t nr)
+ }
+ EXPORT_SYMBOL_GPL(find_get_pid);
+ 
+-pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns)
+ {
+ 	struct upid *upid;
+ 	pid_t nr = 0;
+@@ -481,6 +485,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
+ }
+ EXPORT_SYMBOL_GPL(pid_nr_ns);
+ 
++pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
++{
++	return vx_map_pid(pid_unmapped_nr_ns(pid, ns));
++}
++
+ pid_t pid_vnr(struct pid *pid)
+ {
+ 	return pid_nr_ns(pid, current->nsproxy->pid_ns);
+diff -NurpP --minimal linux-3.7.10/kernel/pid_namespace.c linux-3.7.10-vs2.3.5.6/kernel/pid_namespace.c
+--- linux-3.7.10/kernel/pid_namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/pid_namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/reboot.h>
+ #include <linux/export.h>
++#include <linux/vserver/global.h>
+ 
+ #define BITS_PER_PAGE		(PAGE_SIZE*8)
+ 
+@@ -100,6 +101,7 @@ static struct pid_namespace *create_pid_
+ 		goto out_free_map;
+ 
+ 	kref_init(&ns->kref);
++	atomic_inc(&vs_global_pid_ns);
+ 	ns->level = level;
+ 	ns->parent = get_pid_ns(parent_pid_ns);
+ 
+@@ -131,6 +133,7 @@ static void destroy_pid_namespace(struct
+ 
+ 	for (i = 0; i < PIDMAP_ENTRIES; i++)
+ 		kfree(ns->pidmap[i].page);
++	atomic_dec(&vs_global_pid_ns);
+ 	kmem_cache_free(pid_ns_cachep, ns);
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/posix-timers.c linux-3.7.10-vs2.3.5.6/kernel/posix-timers.c
+--- linux-3.7.10/kernel/posix-timers.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/posix-timers.c	2012-12-18 15:13:16.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <linux/wait.h>
+ #include <linux/workqueue.h>
+ #include <linux/export.h>
++#include <linux/vs_context.h>
+ 
+ /*
+  * Management arrays for POSIX timers.	 Timers are kept in slab memory
+@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t
+ {
+ 	struct task_struct *task;
+ 	int shared, ret = -1;
++
+ 	/*
+ 	 * FIXME: if ->sigq is queued we can race with
+ 	 * dequeue_signal()->do_schedule_next_timer().
+@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t
+ 	rcu_read_lock();
+ 	task = pid_task(timr->it_pid, PIDTYPE_PID);
+ 	if (task) {
++		struct vx_info_save vxis;
++		struct vx_info *vxi;
++
++		vxi = get_vx_info(task->vx_info);
++		enter_vx_info(vxi, &vxis);
+ 		shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
+ 		ret = send_sigqueue(timr->sigq, task, shared);
++		leave_vx_info(&vxis);
++		put_vx_info(vxi);
+ 	}
+ 	rcu_read_unlock();
++
+ 	/* If we failed to send the signal the timer stops. */
+ 	return ret > 0;
+ }
+diff -NurpP --minimal linux-3.7.10/kernel/printk.c linux-3.7.10-vs2.3.5.6/kernel/printk.c
+--- linux-3.7.10/kernel/printk.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/printk.c	2013-01-16 00:19:03.000000000 +0000
+@@ -42,6 +42,7 @@
+ #include <linux/notifier.h>
+ #include <linux/rculist.h>
+ #include <linux/poll.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -818,7 +819,7 @@ static int check_syslog_permissions(int
+ 		return 0;
+ 
+ 	if (syslog_action_restricted(type)) {
+-		if (capable(CAP_SYSLOG))
++		if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
+ 			return 0;
+ 		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
+ 		if (capable(CAP_SYS_ADMIN)) {
+@@ -1112,12 +1113,9 @@ int do_syslog(int type, char __user *buf
+ 	if (error)
+ 		return error;
+ 
+-	switch (type) {
+-	case SYSLOG_ACTION_CLOSE:	/* Close log */
+-		break;
+-	case SYSLOG_ACTION_OPEN:	/* Open log */
+-		break;
+-	case SYSLOG_ACTION_READ:	/* Read from log */
++	if ((type == SYSLOG_ACTION_READ) ||
++	    (type == SYSLOG_ACTION_READ_ALL) ||
++	    (type == SYSLOG_ACTION_READ_CLEAR)) {
+ 		error = -EINVAL;
+ 		if (!buf || len < 0)
+ 			goto out;
+@@ -1128,6 +1126,16 @@ int do_syslog(int type, char __user *buf
+ 			error = -EFAULT;
+ 			goto out;
+ 		}
++	}
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		return vx_do_syslog(type, buf, len);
++
++	switch (type) {
++	case SYSLOG_ACTION_CLOSE:	/* Close log */
++		break;
++	case SYSLOG_ACTION_OPEN:	/* Open log */
++		break;
++	case SYSLOG_ACTION_READ:	/* Read from log */
+ 		error = wait_event_interruptible(log_wait,
+ 						 syslog_seq != log_next_seq);
+ 		if (error)
+@@ -1140,16 +1148,6 @@ int do_syslog(int type, char __user *buf
+ 		/* FALL THRU */
+ 	/* Read last kernel messages */
+ 	case SYSLOG_ACTION_READ_ALL:
+-		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;
+-		}
+ 		error = syslog_print_all(buf, len, clear);
+ 		break;
+ 	/* Clear ring buffer */
+diff -NurpP --minimal linux-3.7.10/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/kernel/ptrace.c
+--- linux-3.7.10/kernel/ptrace.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/ptrace.c	2013-02-05 01:14:43.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/uaccess.h>
+ #include <linux/regset.h>
++#include <linux/vs_context.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/cn_proc.h>
+ 
+@@ -256,6 +257,11 @@ ok:
+ 		dumpable = get_dumpable(task->mm);
+ 	if (!dumpable  && !ptrace_has_cap(task_user_ns(task), mode))
+ 		return -EPERM;
++	if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
++		return -EPERM;
++	if (!vx_check(task->xid, VS_IDENT) &&
++		!task_vx_flags(task, VXF_STATE_ADMIN, 0))
++		return -EACCES;
+ 
+ 	return security_ptrace_access_check(task, mode);
+ }
+diff -NurpP --minimal linux-3.7.10/kernel/sched/core.c linux-3.7.10-vs2.3.5.6/kernel/sched/core.c
+--- linux-3.7.10/kernel/sched/core.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sched/core.c	2013-02-05 01:14:43.000000000 +0000
+@@ -72,6 +72,8 @@
+ #include <linux/slab.h>
+ #include <linux/init_task.h>
+ #include <linux/binfmts.h>
++#include <linux/vs_sched.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <asm/switch_to.h>
+ #include <asm/tlb.h>
+@@ -2031,9 +2033,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+  */
+ void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
+ {
+-	loads[0] = (avenrun[0] + offset) << shift;
+-	loads[1] = (avenrun[1] + offset) << shift;
+-	loads[2] = (avenrun[2] + offset) << shift;
++	if (vx_flags(VXF_VIRT_LOAD, 0)) {
++		struct vx_info *vxi = current_vx_info();
++
++		loads[0] = (vxi->cvirt.load[0] + offset) << shift;
++		loads[1] = (vxi->cvirt.load[1] + offset) << shift;
++		loads[2] = (vxi->cvirt.load[2] + offset) << shift;
++	} else {
++		loads[0] = (avenrun[0] + offset) << shift;
++		loads[1] = (avenrun[1] + offset) << shift;
++		loads[2] = (avenrun[2] + offset) << shift;
++	}
+ }
+ 
+ static long calc_load_fold_active(struct rq *this_rq)
+@@ -3597,7 +3607,7 @@ SYSCALL_DEFINE1(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)
+diff -NurpP --minimal linux-3.7.10/kernel/sched/cputime.c linux-3.7.10-vs2.3.5.6/kernel/sched/cputime.c
+--- linux-3.7.10/kernel/sched/cputime.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sched/cputime.c	2012-12-18 15:13:16.000000000 +0000
+@@ -3,6 +3,7 @@
+ #include <linux/tsacct_kern.h>
+ #include <linux/kernel_stat.h>
+ #include <linux/static_key.h>
++#include <linux/vs_sched.h>
+ #include "sched.h"
+ 
+ 
+@@ -150,14 +151,17 @@ static inline void task_group_account_fi
+ void account_user_time(struct task_struct *p, cputime_t cputime,
+ 		       cputime_t cputime_scaled)
+ {
++	struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
++	int nice = (TASK_NICE(p) > 0);
+ 	int index;
+ 
+ 	/* Add user time to process. */
+ 	p->utime += cputime;
+ 	p->utimescaled += cputime_scaled;
++	vx_account_user(vxi, cputime, nice);
+ 	account_group_user_time(p, cputime);
+ 
+-	index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
++	index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
+ 
+ 	/* Add user time to cpustat. */
+ 	task_group_account_field(p, index, (__force u64) cputime);
+@@ -204,9 +208,12 @@ static inline
+ void __account_system_time(struct task_struct *p, cputime_t cputime,
+ 			cputime_t cputime_scaled, int index)
+ {
++	struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
++
+ 	/* Add system time to process. */
+ 	p->stime += cputime;
+ 	p->stimescaled += cputime_scaled;
++	vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
+ 	account_group_system_time(p, cputime);
+ 
+ 	/* Add system time to cpustat. */
+diff -NurpP --minimal linux-3.7.10/kernel/sched/fair.c linux-3.7.10-vs2.3.5.6/kernel/sched/fair.c
+--- linux-3.7.10/kernel/sched/fair.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sched/fair.c	2012-12-18 15:13:16.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/slab.h>
+ #include <linux/profile.h>
+ #include <linux/interrupt.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <trace/events/sched.h>
+ 
+@@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+ 		__enqueue_entity(cfs_rq, se);
+ 	se->on_rq = 1;
+ 
++	if (entity_is_task(se))
++		vx_activate_task(task_of(se));
+ 	if (cfs_rq->nr_running == 1) {
+ 		list_add_leaf_cfs_rq(cfs_rq);
+ 		check_enqueue_throttle(cfs_rq);
+@@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+ 	if (se != cfs_rq->curr)
+ 		__dequeue_entity(cfs_rq, se);
+ 	se->on_rq = 0;
++	if (entity_is_task(se))
++		vx_deactivate_task(task_of(se));
+ 	update_cfs_load(cfs_rq, 0);
+ 	account_entity_dequeue(cfs_rq, se);
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/signal.c linux-3.7.10-vs2.3.5.6/kernel/signal.c
+--- linux-3.7.10/kernel/signal.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/signal.c	2013-02-05 01:14:43.000000000 +0000
+@@ -31,6 +31,8 @@
+ #include <linux/nsproxy.h>
+ #include <linux/user_namespace.h>
+ #include <linux/uprobes.h>
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/signal.h>
+ 
+@@ -785,9 +787,18 @@ static int check_kill_permission(int sig
+ 	struct pid *sid;
+ 	int error;
+ 
++	vxdprintk(VXD_CBIT(misc, 7),
++		"check_kill_permission(%d,%p,%p[#%u,%u])",
++		sig, info, t, vx_task_xid(t), t->pid);
++
+ 	if (!valid_signal(sig))
+ 		return -EINVAL;
+ 
++/*	FIXME: needed? if so, why?
++	if ((info != SEND_SIG_NOINFO) &&
++		(is_si_special(info) || !si_fromuser(info)))
++		goto skip;	*/
++
+ 	if (!si_fromuser(info))
+ 		return 0;
+ 
+@@ -811,6 +822,20 @@ static int check_kill_permission(int sig
+ 		}
+ 	}
+ 
++	error = -EPERM;
++	if (t->pid == 1 && current->xid)
++		return error;
++
++	error = -ESRCH;
++	/* FIXME: we shouldn't return ESRCH ever, to avoid
++		  loops, maybe ENOENT or EACCES? */
++	if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
++		vxdprintk(current->xid || VXD_CBIT(misc, 7),
++			"signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
++			sig, info, t, vx_task_xid(t), t->pid, current->xid);
++		return error;
++	}
++/* skip: */
+ 	return security_task_kill(t, info, sig, 0);
+ }
+ 
+@@ -1346,7 +1371,7 @@ int kill_pid_info(int sig, struct siginf
+ 	rcu_read_lock();
+ retry:
+ 	p = pid_task(pid, PIDTYPE_PID);
+-	if (p) {
++	if (p && vx_check(vx_task_xid(p), VS_IDENT)) {
+ 		error = group_send_sig_info(sig, info, p);
+ 		if (unlikely(error == -ESRCH))
+ 			/*
+@@ -1394,7 +1419,7 @@ int kill_pid_info_as_cred(int sig, struc
+ 
+ 	rcu_read_lock();
+ 	p = pid_task(pid, PIDTYPE_PID);
+-	if (!p) {
++	if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
+ 		ret = -ESRCH;
+ 		goto out_unlock;
+ 	}
+@@ -1446,8 +1471,10 @@ static int kill_something_info(int sig,
+ 		struct task_struct * p;
+ 
+ 		for_each_process(p) {
+-			if (task_pid_vnr(p) > 1 &&
+-					!same_thread_group(p, current)) {
++			if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
++				task_pid_vnr(p) > 1 &&
++				!same_thread_group(p, current) &&
++				!vx_current_initpid(p->pid)) {
+ 				int err = group_send_sig_info(sig, info, p);
+ 				++count;
+ 				if (err != -EPERM)
+@@ -2307,6 +2334,11 @@ relock:
+ 				!sig_kernel_only(signr))
+ 			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
+diff -NurpP --minimal linux-3.7.10/kernel/softirq.c linux-3.7.10-vs2.3.5.6/kernel/softirq.c
+--- linux-3.7.10/kernel/softirq.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/softirq.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/smp.h>
+ #include <linux/smpboot.h>
+ #include <linux/tick.h>
++#include <linux/vs_context.h>
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/irq.h>
+diff -NurpP --minimal linux-3.7.10/kernel/sys.c linux-3.7.10-vs2.3.5.6/kernel/sys.c
+--- linux-3.7.10/kernel/sys.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sys.c	2012-12-18 15:13:16.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/kprobes.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_pid.h>
+ 
+ #include <linux/kmsg_dump.h>
+ /* Move somewhere else to avoid recompiling? */
+@@ -154,7 +155,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);
+@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
+ 			else
+ 				pgrp = task_pgrp(current);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				error = set_one_prio(p, niceval, error);
+ 			} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
+ 			break;
+@@ -270,6 +276,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+ 			else
+ 				pgrp = task_pgrp(current);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				niceval = 20 - task_nice(p);
+ 				if (niceval > retval)
+ 					retval = niceval;
+@@ -422,6 +430,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+ 
+ static DEFINE_MUTEX(reboot_mutex);
+ 
++long vs_reboot(unsigned int, void __user *);
++
+ /*
+  * Reboot system call: for obvious reasons only root may call it,
+  * and even root needs to set up some magic numbers in the registers
+@@ -463,6 +473,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+ 	if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
+ 		cmd = LINUX_REBOOT_CMD_HALT;
+ 
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		return vs_reboot(cmd, arg);
++
+ 	mutex_lock(&reboot_mutex);
+ 	switch (cmd) {
+ 	case LINUX_REBOOT_CMD_RESTART:
+@@ -1370,7 +1383,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+ 	int errno;
+ 	char tmp[__NEW_UTS_LEN];
+ 
+-	if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++	if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++		CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ 		return -EPERM;
+ 
+ 	if (len < 0 || len > __NEW_UTS_LEN)
+@@ -1421,7 +1435,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+ 	int errno;
+ 	char tmp[__NEW_UTS_LEN];
+ 
+-	if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++	if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++		CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ 		return -EPERM;
+ 	if (len < 0 || len > __NEW_UTS_LEN)
+ 		return -EINVAL;
+@@ -1540,7 +1555,7 @@ int do_prlimit(struct task_struct *tsk,
+ 		/* Keep the capable check against init_user_ns until
+ 		   cgroups can contain all limits */
+ 		if (new_rlim->rlim_max > rlim->rlim_max &&
+-				!capable(CAP_SYS_RESOURCE))
++			!vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ 			retval = -EPERM;
+ 		if (!retval)
+ 			retval = security_task_setrlimit(tsk->group_leader,
+@@ -1593,7 +1608,8 @@ static int check_prlimit_permission(stru
+ 	    gid_eq(cred->gid, tcred->sgid) &&
+ 	    gid_eq(cred->gid, tcred->gid))
+ 		return 0;
+-	if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
++	if (vx_ns_capable(tcred->user_ns,
++		CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ 		return 0;
+ 
+ 	return -EPERM;
+diff -NurpP --minimal linux-3.7.10/kernel/sysctl.c linux-3.7.10-vs2.3.5.6/kernel/sysctl.c
+--- linux-3.7.10/kernel/sysctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sysctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -82,6 +82,7 @@
+ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+ #include <linux/lockdep.h>
+ #endif
++extern char vshelper_path[];
+ #ifdef CONFIG_CHR_DEV_SG
+ #include <scsi/sg.h>
+ #endif
+@@ -574,6 +575,13 @@ static struct ctl_table kern_table[] = {
+ 		.proc_handler	= proc_dostring,
+ 	},
+ #endif
++	{
++		.procname	= "vshelper",
++		.data		= &vshelper_path,
++		.maxlen		= 256,
++		.mode		= 0644,
++		.proc_handler	= &proc_dostring,
++	},
+ #ifdef CONFIG_CHR_DEV_SG
+ 	{
+ 		.procname	= "sg-big-buff",
+diff -NurpP --minimal linux-3.7.10/kernel/sysctl_binary.c linux-3.7.10-vs2.3.5.6/kernel/sysctl_binary.c
+--- linux-3.7.10/kernel/sysctl_binary.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sysctl_binary.c	2012-12-18 15:13:16.000000000 +0000
+@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
+ 
+ 	{ CTL_INT,	KERN_PANIC,			"panic" },
+ 	{ CTL_INT,	KERN_REALROOTDEV,		"real-root-dev" },
++	{ CTL_STR,	KERN_VSHELPER,			"vshelper" },
+ 
+ 	{ CTL_STR,	KERN_SPARC_REBOOT,		"reboot-cmd" },
+ 	{ CTL_INT,	KERN_CTLALTDEL,			"ctrl-alt-del" },
+diff -NurpP --minimal linux-3.7.10/kernel/time/timekeeping.c linux-3.7.10-vs2.3.5.6/kernel/time/timekeeping.c
+--- linux-3.7.10/kernel/time/timekeeping.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/time/timekeeping.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/time.h>
+ #include <linux/tick.h>
+ #include <linux/stop_machine.h>
++#include <linux/vs_time.h>
+ 
+ 
+ static struct timekeeper timekeeper;
+@@ -243,6 +244,7 @@ void getnstimeofday(struct timespec *ts)
+ 
+ 	ts->tv_nsec = 0;
+ 	timespec_add_ns(ts, nsecs);
++	vx_adjust_timespec(ts);
+ }
+ EXPORT_SYMBOL(getnstimeofday);
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/time.c linux-3.7.10-vs2.3.5.6/kernel/time.c
+--- linux-3.7.10/kernel/time.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/time.c	2012-12-18 15:13:16.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/fs.h>
+ #include <linux/math64.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_time.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -92,7 +93,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
+ 	if (err)
+ 		return err;
+ 
+-	do_settimeofday(&tv);
++	vx_settimeofday(&tv);
+ 	return 0;
+ }
+ 
+@@ -172,7 +173,7 @@ int do_sys_settimeofday(const struct tim
+ 		}
+ 	}
+ 	if (tv)
+-		return do_settimeofday(tv);
++		return vx_settimeofday(tv);
+ 	return 0;
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/timer.c linux-3.7.10-vs2.3.5.6/kernel/timer.c
+--- linux-3.7.10/kernel/timer.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/timer.c	2012-12-18 15:13:16.000000000 +0000
+@@ -40,6 +40,10 @@
+ #include <linux/irq_work.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
++#include <linux/vs_base.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/sched.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+diff -NurpP --minimal linux-3.7.10/kernel/user_namespace.c linux-3.7.10-vs2.3.5.6/kernel/user_namespace.c
+--- linux-3.7.10/kernel/user_namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/user_namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/uaccess.h>
+ #include <linux/ctype.h>
+ #include <linux/projid.h>
++#include <linux/vserver/global.h>
+ 
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ 
+@@ -53,6 +54,7 @@ int create_user_ns(struct cred *new)
+ 		return -ENOMEM;
+ 
+ 	kref_init(&ns->kref);
++	atomic_inc(&vs_global_user_ns);
+ 	ns->parent = parent_ns;
+ 	ns->owner = owner;
+ 	ns->group = group;
+@@ -85,6 +87,9 @@ void free_user_ns(struct kref *kref)
+ 
+ 	parent = ns->parent;
+ 	kmem_cache_free(user_ns_cachep, ns);
++
++	/* FIXME: maybe move into destroyer? */
++	atomic_dec(&vs_global_user_ns);
+ 	put_user_ns(parent);
+ }
+ EXPORT_SYMBOL(free_user_ns);
+diff -NurpP --minimal linux-3.7.10/kernel/utsname.c linux-3.7.10-vs2.3.5.6/kernel/utsname.c
+--- linux-3.7.10/kernel/utsname.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/utsname.c	2012-12-18 15:13:16.000000000 +0000
+@@ -16,14 +16,17 @@
+ #include <linux/slab.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_fs.h>
++#include <linux/vserver/global.h>
+ 
+ static struct uts_namespace *create_uts_ns(void)
+ {
+ 	struct uts_namespace *uts_ns;
+ 
+ 	uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
+-	if (uts_ns)
++	if (uts_ns) {
+ 		kref_init(&uts_ns->kref);
++		atomic_inc(&vs_global_uts_ns);
++	}
+ 	return uts_ns;
+ }
+ 
+@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_
+  * @old_ns: namespace to clone
+  * Return NULL on error (failure to kmalloc), new ns otherwise
+  */
+-static struct uts_namespace *clone_uts_ns(struct task_struct *tsk,
+-					  struct uts_namespace *old_ns)
++static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns,
++					  struct user_namespace *old_user)
+ {
+ 	struct uts_namespace *ns;
+ 
+@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n
+ 
+ 	down_read(&uts_sem);
+ 	memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
++	ns->user_ns = get_user_ns(old_user);
+ 	up_read(&uts_sem);
+ 	return ns;
+ }
+@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n
+  * versa.
+  */
+ struct uts_namespace *copy_utsname(unsigned long flags,
+-				   struct task_struct *tsk)
++				   struct uts_namespace *old_ns,
++				   struct user_namespace *user_ns)
+ {
+-	struct uts_namespace *old_ns = tsk->nsproxy->uts_ns;
+ 	struct uts_namespace *new_ns;
+ 
+ 	BUG_ON(!old_ns);
+@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig
+ 	if (!(flags & CLONE_NEWUTS))
+ 		return old_ns;
+ 
+-	new_ns = clone_uts_ns(tsk, old_ns);
++	new_ns = clone_uts_ns(old_ns, user_ns);
+ 
+ 	put_uts_ns(old_ns);
+ 	return new_ns;
+@@ -78,6 +81,7 @@ void free_uts_ns(struct kref *kref)
+ 
+ 	ns = container_of(kref, struct uts_namespace, kref);
+ 	put_user_ns(ns->user_ns);
++	atomic_dec(&vs_global_uts_ns);
+ 	kfree(ns);
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/Kconfig linux-3.7.10-vs2.3.5.6/kernel/vserver/Kconfig
+--- linux-3.7.10/kernel/vserver/Kconfig	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,233 @@
++#
++# Linux VServer configuration
++#
++
++menu "Linux VServer"
++
++config	VSERVER_AUTO_LBACK
++	bool    "Automatically Assign Loopback IP"
++	default y
++	help
++	  Automatically assign a guest specific loopback
++	  IP and add it to the kernel network stack on
++	  startup.
++
++config	VSERVER_AUTO_SINGLE
++	bool	"Automatic Single IP Special Casing"
++	depends on EXPERIMENTAL
++	default y
++	help
++	  This allows network contexts with a single IP to
++	  automatically remap 0.0.0.0 bindings to that IP,
++	  avoiding further network checks and improving
++	  performance.
++
++	  (note: such guests do not allow to change the ip
++	   on the fly and do not show loopback addresses)
++
++config	VSERVER_COWBL
++	bool	"Enable COW Immutable Link Breaking"
++	default y
++	help
++	  This enables the COW (Copy-On-Write) link break code.
++	  It allows you to treat unified files like normal files
++	  when writing to them (which will implicitely break the
++	  link and create a copy of the unified file)
++
++config	VSERVER_VTIME
++	bool	"Enable Virtualized Guest Time"
++	depends on EXPERIMENTAL
++	default n
++	help
++	  This enables per guest time offsets to allow for
++	  adjusting the system clock individually per guest.
++	  this adds some overhead to the time functions and
++	  therefore should not be enabled without good reason.
++
++config	VSERVER_DEVICE
++	bool	"Enable Guest Device Mapping"
++	depends on EXPERIMENTAL
++	default n
++	help
++	  This enables generic device remapping.
++
++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)
++
++choice
++	prompt	"Persistent Inode Tagging"
++	default	TAGGING_ID24
++	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	TAGGING_NONE
++	bool	"Disabled"
++	help
++	  do not store per-context information in inodes.
++
++config	TAGGING_UID16
++	bool	"UID16/GID32"
++	help
++	  reduces UID to 16 bit, but leaves GID at 32 bit.
++
++config	TAGGING_GID16
++	bool	"UID32/GID16"
++	help
++	  reduces GID to 16 bit, but leaves UID at 32 bit.
++
++config	TAGGING_ID24
++	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	TAGGING_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)
++
++endchoice
++
++config	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 tagging specified above.
++	  (will require patched clients too)
++
++config	VSERVER_PRIVACY
++	bool	"Honor Privacy Aspects of Guests"
++	default n
++	help
++	  When enabled, most context checks will disallow
++	  access to structures assigned to a specific context,
++	  like ptys or loop devices.
++
++config	VSERVER_CONTEXTS
++	int	"Maximum number of Contexts (1-65533)"	if EMBEDDED
++	range 1 65533
++	default "768"	if 64BIT
++	default "256"
++	help
++	  This setting will optimize certain data structures
++	  and memory allocations according to the expected
++	  maximum.
++
++	  note: this is not a strict upper limit.
++
++config	VSERVER_WARN
++	bool	"VServer Warnings"
++	default y
++	help
++	  This enables various runtime warnings, which will
++	  notify about potential manipulation attempts or
++	  resource shortage. It is generally considered to
++	  be a good idea to have that enabled.
++
++config	VSERVER_WARN_DEVPTS
++	bool	"VServer DevPTS Warnings"
++	depends on VSERVER_WARN
++	default y
++	help
++	  This enables DevPTS related warnings, issued when a
++	  process inside a context tries to lookup or access
++	  a dynamic pts from the host or a different context.
++
++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 very 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.
++
++config	VSERVER_EXTRA_MNT_CHECK
++	bool	"Extra Checks for Reachability"
++	default n
++	help
++	  Set this to yes if you want to do extra checks for
++	  vfsmount reachability in the proc filesystem code.
++	  This shouldn't be required on any setup utilizing
++	  mnt namespaces.
++
++choice
++	prompt	"Quotes used in debug and warn messages"
++	default	QUOTES_ISO8859
++
++config	QUOTES_ISO8859
++	bool	"Extended ASCII (ISO 8859) angle quotes"
++	help
++	  This uses the extended ASCII characters \xbb
++	  and \xab for quoting file and process names.
++
++config	QUOTES_UTF8
++	bool	"UTF-8 angle quotes"
++	help
++	  This uses the the UTF-8 sequences for angle
++	  quotes to quote file and process names.
++
++config	QUOTES_ASCII
++	bool	"ASCII single quotes"
++	help
++	  This uses the ASCII single quote character
++	  (\x27) to quote file and process names.
++
++endchoice
++
++endmenu
++
++
++config	VSERVER
++	bool
++	default y
++	select NAMESPACES
++	select UTS_NS
++	select IPC_NS
++#	select USER_NS
++	select SYSVIPC
++
++config	VSERVER_SECURITY
++	bool
++	depends on SECURITY
++	default y
++	select SECURITY_CAPABILITIES
++
++config	VSERVER_DISABLED
++	bool
++	default n
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/Makefile linux-3.7.10-vs2.3.5.6/kernel/vserver/Makefile
+--- linux-3.7.10/kernel/vserver/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/Makefile	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,18 @@
++#
++# Makefile for the Linux vserver routines.
++#
++
++
++obj-y		+= vserver.o
++
++vserver-y	:= switch.o context.o space.o sched.o network.o inode.o \
++		   limit.o cvirt.o cacct.o signal.o helper.o init.o \
++		   dlimit.o tag.o
++
++vserver-$(CONFIG_INET) += inet.o
++vserver-$(CONFIG_PROC_FS) += proc.o
++vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
++vserver-$(CONFIG_VSERVER_HISTORY) += history.o
++vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
++vserver-$(CONFIG_VSERVER_DEVICE) += device.o
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cacct.c linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct.c
+--- linux-3.7.10/kernel/vserver/cacct.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,42 @@
++/*
++ *  linux/kernel/vserver/cacct.c
++ *
++ *  Virtual Server: Context Accounting
++ *
++ *  Copyright (C) 2006-2007 Herbert Pötzl
++ *
++ *  V0.01  added accounting stats
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/cacct_cmd.h>
++#include <linux/vserver/cacct_int.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++int vc_sock_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_sock_stat_v0 vc_data;
++	int j, field;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	field = vc_data.field;
++	if ((field < 0) || (field >= VXA_SOCK_SIZE))
++		return -EINVAL;
++
++	for (j = 0; j < 3; j++) {
++		vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
++		vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cacct_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_init.h
+--- linux-3.7.10/kernel/vserver/cacct_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,25 @@
++
++
++static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
++{
++	int i, j;
++
++
++	for (i = 0; i < VXA_SOCK_SIZE; i++) {
++		for (j = 0; j < 3; j++) {
++			atomic_long_set(&cacct->sock[i][j].count, 0);
++			atomic_long_set(&cacct->sock[i][j].total, 0);
++		}
++	}
++	for (i = 0; i < 8; i++)
++		atomic_set(&cacct->slab[i], 0);
++	for (i = 0; i < 5; i++)
++		for (j = 0; j < 4; j++)
++			atomic_set(&cacct->page[i][j], 0);
++}
++
++static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
++{
++	return;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cacct_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_proc.h
+--- linux-3.7.10/kernel/vserver/cacct_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,53 @@
++#ifndef _VX_CACCT_PROC_H
++#define _VX_CACCT_PROC_H
++
++#include <linux/vserver/cacct_int.h>
++
++
++#define VX_SOCKA_TOP	\
++	"Type\t    recv #/bytes\t\t   send #/bytes\t\t    fail #/bytes\n"
++
++static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
++{
++	int i, j, length = 0;
++	static char *type[VXA_SOCK_SIZE] = {
++		"UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
++	};
++
++	length += sprintf(buffer + length, VX_SOCKA_TOP);
++	for (i = 0; i < VXA_SOCK_SIZE; i++) {
++		length += sprintf(buffer + length, "%s:", type[i]);
++		for (j = 0; j < 3; j++) {
++			length += sprintf(buffer + length,
++				"\t%10lu/%-10lu",
++				vx_sock_count(cacct, i, j),
++				vx_sock_total(cacct, i, j));
++		}
++		buffer[length++] = '\n';
++	}
++
++	length += sprintf(buffer + length, "\n");
++	length += sprintf(buffer + length,
++		"slab:\t %8u %8u %8u %8u\n",
++		atomic_read(&cacct->slab[1]),
++		atomic_read(&cacct->slab[4]),
++		atomic_read(&cacct->slab[0]),
++		atomic_read(&cacct->slab[2]));
++
++	length += sprintf(buffer + length, "\n");
++	for (i = 0; i < 5; i++) {
++		length += sprintf(buffer + length,
++			"page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
++			atomic_read(&cacct->page[i][0]),
++			atomic_read(&cacct->page[i][1]),
++			atomic_read(&cacct->page[i][2]),
++			atomic_read(&cacct->page[i][3]),
++			atomic_read(&cacct->page[i][4]),
++			atomic_read(&cacct->page[i][5]),
++			atomic_read(&cacct->page[i][6]),
++			atomic_read(&cacct->page[i][7]));
++	}
++	return length;
++}
++
++#endif	/* _VX_CACCT_PROC_H */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/context.c linux-3.7.10-vs2.3.5.6/kernel/vserver/context.c
+--- linux-3.7.10/kernel/vserver/context.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/context.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,1119 @@
++/*
++ *  linux/kernel/vserver/context.c
++ *
++ *  Virtual Server: Context Support
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  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
++ *  V0.12  referenced context store
++ *  V0.13  separate per cpu data
++ *  V0.14  changed vcmds to vxi arg
++ *  V0.15  added context stat
++ *  V0.16  have __create claim() the vxi
++ *  V0.17  removed older and legacy stuff
++ *  V0.18  added user credentials
++ *  V0.19  added warn mask
++ *
++ */
++
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <linux/security.h>
++#include <linux/pid_namespace.h>
++#include <linux/capability.h>
++
++#include <linux/vserver/context.h>
++#include <linux/vserver/network.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/limit_int.h>
++#include <linux/vserver/space.h>
++#include <linux/init_task.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/context_cmd.h>
++
++#include "cvirt_init.h"
++#include "cacct_init.h"
++#include "limit_init.h"
++#include "sched_init.h"
++
++
++atomic_t vx_global_ctotal	= ATOMIC_INIT(0);
++atomic_t vx_global_cactive	= ATOMIC_INIT(0);
++
++
++/*	now inactive context structures */
++
++static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
++
++static DEFINE_SPINLOCK(vx_info_inactive_lock);
++
++
++/*	__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;
++	int cpu, index;
++
++	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));
++#ifdef CONFIG_SMP
++	new->ptr_pc = alloc_percpu(struct _vx_info_pc);
++	if (!new->ptr_pc)
++		goto error;
++#endif
++	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);
++
++	/* prepare reaper */
++	get_task_struct(init_pid_ns.child_reaper);
++	new->vx_reaper = init_pid_ns.child_reaper;
++	new->vx_badness_bias = 0;
++
++	/* 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);
++
++	/* per cpu data structures */
++	for_each_possible_cpu(cpu) {
++		vx_info_init_sched_pc(
++			&vx_per_cpu(new, sched_pc, cpu), cpu);
++		vx_info_init_cvirt_pc(
++			&vx_per_cpu(new, cvirt_pc, cpu), cpu);
++	}
++
++	new->vx_flags = VXF_INIT_SET;
++	new->vx_bcaps = CAP_FULL_SET;	// maybe ~CAP_SETPCAP
++	new->vx_ccaps = 0;
++	new->vx_umask = 0;
++	new->vx_wmask = 0;
++
++	new->reboot_cmd = 0;
++	new->exit_code = 0;
++
++	// preconfig spaces
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &new->space[index];
++
++		// filesystem
++		spin_lock(&init_fs.lock);
++		init_fs.users++;
++		spin_unlock(&init_fs.lock);
++		space->vx_fs = &init_fs;
++
++		/* FIXME: do we want defaults? */
++		// space->vx_real_cred = 0;
++		// space->vx_cred = 0;
++	}
++
++
++	vxdprintk(VXD_CBIT(xid, 0),
++		"alloc_vx_info(%d) = %p", xid, new);
++	vxh_alloc_vx_info(new);
++	atomic_inc(&vx_global_ctotal);
++	return new;
++#ifdef CONFIG_SMP
++error:
++	kfree(new);
++	return 0;
++#endif
++}
++
++/*	__dealloc_vx_info()
++
++	* final disposal of vx_info				*/
++
++static void __dealloc_vx_info(struct vx_info *vxi)
++{
++#ifdef	CONFIG_VSERVER_WARN
++	struct vx_info_save vxis;
++	int cpu;
++#endif
++	vxdprintk(VXD_CBIT(xid, 0),
++		"dealloc_vx_info(%p)", vxi);
++	vxh_dealloc_vx_info(vxi);
++
++#ifdef	CONFIG_VSERVER_WARN
++	enter_vx_info(vxi, &vxis);
++	vx_info_exit_limit(&vxi->limit);
++	vx_info_exit_sched(&vxi->sched);
++	vx_info_exit_cvirt(&vxi->cvirt);
++	vx_info_exit_cacct(&vxi->cacct);
++
++	for_each_possible_cpu(cpu) {
++		vx_info_exit_sched_pc(
++			&vx_per_cpu(vxi, sched_pc, cpu), cpu);
++		vx_info_exit_cvirt_pc(
++			&vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
++	}
++	leave_vx_info(&vxis);
++#endif
++
++	vxi->vx_id = -1;
++	vxi->vx_state |= VXS_RELEASED;
++
++#ifdef CONFIG_SMP
++	free_percpu(vxi->ptr_pc);
++#endif
++	kfree(vxi);
++	atomic_dec(&vx_global_ctotal);
++}
++
++static void __shutdown_vx_info(struct vx_info *vxi)
++{
++	struct nsproxy *nsproxy;
++	struct fs_struct *fs;
++	struct cred *cred;
++	int index, kill;
++
++	might_sleep();
++
++	vxi->vx_state |= VXS_SHUTDOWN;
++	vs_state_change(vxi, VSC_SHUTDOWN);
++
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &vxi->space[index];
++
++		nsproxy = xchg(&space->vx_nsproxy, NULL);
++		if (nsproxy)
++			put_nsproxy(nsproxy);
++
++		fs = xchg(&space->vx_fs, NULL);
++		spin_lock(&fs->lock);
++		kill = !--fs->users;
++		spin_unlock(&fs->lock);
++		if (kill)
++			free_fs_struct(fs);
++
++		cred = (struct cred *)xchg(&space->vx_cred, NULL);
++		if (cred)
++			abort_creds(cred);
++	}
++}
++
++/* exported stuff */
++
++void free_vx_info(struct vx_info *vxi)
++{
++	unsigned long flags;
++	unsigned index;
++
++	/* check for reference counts first */
++	BUG_ON(atomic_read(&vxi->vx_usecnt));
++	BUG_ON(atomic_read(&vxi->vx_tasks));
++
++	/* context must not be hashed */
++	BUG_ON(vx_info_state(vxi, VXS_HASHED));
++
++	/* context shutdown is mandatory */
++	BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
++
++	/* spaces check */
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &vxi->space[index];
++
++		BUG_ON(space->vx_nsproxy);
++		BUG_ON(space->vx_fs);
++		// BUG_ON(space->vx_real_cred);
++		// BUG_ON(space->vx_cred);
++	}
++
++	spin_lock_irqsave(&vx_info_inactive_lock, flags);
++	hlist_del(&vxi->vx_hlist);
++	spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++
++	__dealloc_vx_info(vxi);
++}
++
++
++/*	hash table for vx_info hash */
++
++#define VX_HASH_SIZE	13
++
++static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
++	{ [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
++
++static DEFINE_SPINLOCK(vx_info_hash_lock);
++
++
++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);
++	atomic_inc(&vx_global_cactive);
++}
++
++/*	__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)
++{
++	unsigned long flags;
++
++	vxd_assert_lock(&vx_info_hash_lock);
++	vxdprintk(VXD_CBIT(xid, 4),
++		"__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
++		atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
++	vxh_unhash_vx_info(vxi);
++
++	/* context must be hashed */
++	BUG_ON(!vx_info_state(vxi, VXS_HASHED));
++	/* but without tasks */
++	BUG_ON(atomic_read(&vxi->vx_tasks));
++
++	vxi->vx_state &= ~VXS_HASHED;
++	hlist_del_init(&vxi->vx_hlist);
++	spin_lock_irqsave(&vx_info_inactive_lock, flags);
++	hlist_add_head(&vxi->vx_hlist, &vx_info_inactive);
++	spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++	atomic_dec(&vx_global_cactive);
++}
++
++
++/*	__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;
++}
++
++
++/*	__create_vx_info()
++
++	* create the requested context
++	* get(), claim() 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);
++
++	/* static context requested */
++	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;
++	}
++	/* new context */
++	vxdprintk(VXD_CBIT(xid, 0),
++		"create_vx_info(%d) = %p (new)", id, new);
++	claim_vx_info(new, NULL);
++	__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)
++{
++	spin_lock(&vx_info_hash_lock);
++	__unhash_vx_info(vxi);
++	spin_unlock(&vx_info_hash_lock);
++	__shutdown_vx_info(vxi);
++	__wakeup_vx_info(vxi);
++}
++
++
++/*	lookup_vx_info()
++
++	* search for a vx_info and get() it
++	* negative id means current				*/
++
++struct vx_info *lookup_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_PROC_FS
++
++/*	get_xid_list()
++
++	* get a subset of hashed xids for proc
++	* assumes size is at least one				*/
++
++int get_xid_list(int index, unsigned int *xids, int size)
++{
++	int hindex, nr_xids = 0;
++
++	/* only show current and children */
++	if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
++		if (index > 0)
++			return 0;
++		xids[nr_xids] = vx_current_xid();
++		return 1;
++	}
++
++	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
++
++#ifdef	CONFIG_VSERVER_DEBUG
++
++void	dump_vx_info_inactive(int level)
++{
++	struct hlist_node *entry, *next;
++
++	hlist_for_each_safe(entry, next, &vx_info_inactive) {
++		struct vx_info *vxi =
++			list_entry(entry, struct vx_info, vx_hlist);
++
++		dump_vx_info(vxi, level);
++	}
++}
++
++#endif
++
++#if 0
++int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
++{
++	struct user_struct *new_user, *old_user;
++
++	if (!p || !vxi)
++		BUG();
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++		return -EACCES;
++
++	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;
++}
++#endif
++
++#if 0
++void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
++{
++	// p->cap_effective &= vxi->vx_cap_bset;
++	p->cap_effective =
++		cap_intersect(p->cap_effective, vxi->cap_bset);
++	// p->cap_inheritable &= vxi->vx_cap_bset;
++	p->cap_inheritable =
++		cap_intersect(p->cap_inheritable, vxi->cap_bset);
++	// p->cap_permitted &= vxi->vx_cap_bset;
++	p->cap_permitted =
++		cap_intersect(p->cap_permitted, vxi->cap_bset);
++}
++#endif
++
++
++#include <linux/file.h>
++#include <linux/fdtable.h>
++
++static int vx_openfd_task(struct task_struct *tsk)
++{
++	struct files_struct *files = tsk->files;
++	struct fdtable *fdt;
++	const unsigned long *bptr;
++	int count, total;
++
++	/* no rcu_read_lock() because of spin_lock() */
++	spin_lock(&files->file_lock);
++	fdt = files_fdtable(files);
++	bptr = fdt->open_fds;
++	count = fdt->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;
++}
++
++
++/*	for *space compatibility */
++
++asmlinkage long sys_unshare(unsigned long);
++
++/*
++ *	migrate task to new context
++ *	gets vxi, puts old_vxi on change
++ *	optionally unshares namespaces (hack)
++ */
++
++int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare)
++{
++	struct vx_info *old_vxi;
++	int ret = 0;
++
++	if (!p || !vxi)
++		BUG();
++
++	vxdprintk(VXD_CBIT(xid, 5),
++		"vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
++		vxi->vx_id, atomic_read(&vxi->vx_usecnt));
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) &&
++		!vx_info_flags(vxi, VXF_STATE_SETUP, 0))
++		return -EACCES;
++
++	if (vx_info_state(vxi, VXS_SHUTDOWN))
++		return -EFAULT;
++
++	old_vxi = task_get_vx_info(p);
++	if (old_vxi == vxi)
++		goto out;
++
++//	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);
++			__rlim_dec(&old_vxi->limit, RLIMIT_NPROC);
++			/* FIXME: what about the struct files here? */
++			__rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd);
++			/* account for the executable */
++			__rlim_dec(&old_vxi->limit, VLIMIT_DENTRY);
++		}
++		atomic_inc(&vxi->cvirt.nr_threads);
++		atomic_inc(&vxi->cvirt.nr_running);
++		__rlim_inc(&vxi->limit, RLIMIT_NPROC);
++		/* FIXME: what about the struct files here? */
++		__rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd);
++		/* account for the executable */
++		__rlim_inc(&vxi->limit, VLIMIT_DENTRY);
++
++		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_cap_bset(vxi, p);
++		task_unlock(p);
++
++		/* hack for *spaces to provide compatibility */
++		if (unshare) {
++			struct nsproxy *old_nsp, *new_nsp;
++
++			ret = unshare_nsproxy_namespaces(
++				CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
++				&new_nsp, NULL);
++			if (ret)
++				goto out;
++
++			old_nsp = xchg(&p->nsproxy, new_nsp);
++			vx_set_space(vxi,
++				CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0);
++			put_nsproxy(old_nsp);
++		}
++	}
++out:
++	put_vx_info(old_vxi);
++	return ret;
++}
++
++int vx_set_reaper(struct vx_info *vxi, struct task_struct *p)
++{
++	struct task_struct *old_reaper;
++	struct vx_info *reaper_vxi;
++
++	if (!vxi)
++		return -EINVAL;
++
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_set_reaper(%p[#%d],%p[#%d,%d])",
++		vxi, vxi->vx_id, p, p->xid, p->pid);
++
++	old_reaper = vxi->vx_reaper;
++	if (old_reaper == p)
++		return 0;
++
++	reaper_vxi = task_get_vx_info(p);
++	if (reaper_vxi && reaper_vxi != vxi) {
++		vxwprintk(1,
++			"Unsuitable reaper [" VS_Q("%s") ",%u:#%u] "
++			"for [xid #%u]",
++			p->comm, p->pid, p->xid, vx_current_xid());
++		goto out;
++	}
++
++	/* set new child reaper */
++	get_task_struct(p);
++	vxi->vx_reaper = p;
++	put_task_struct(old_reaper);
++out:
++	put_vx_info(reaper_vxi);
++	return 0;
++}
++
++int vx_set_init(struct vx_info *vxi, struct task_struct *p)
++{
++	if (!vxi)
++		return -EINVAL;
++
++	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_flags &= ~VXF_STATE_INIT;
++	// vxi->vx_initpid = p->tgid;
++	vxi->vx_initpid = p->pid;
++	return 0;
++}
++
++void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_exit_init(%p[#%d],%p[#%d,%d,%d])",
++		vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
++
++	vxi->exit_code = code;
++	vxi->vx_initpid = 0;
++}
++
++
++void vx_set_persistent(struct vx_info *vxi)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
++
++	get_vx_info(vxi);
++	claim_vx_info(vxi, NULL);
++}
++
++void vx_clear_persistent(struct vx_info *vxi)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
++
++	release_vx_info(vxi, NULL);
++	put_vx_info(vxi);
++}
++
++void vx_update_persistent(struct vx_info *vxi)
++{
++	if (vx_info_flags(vxi, VXF_PERSISTENT, 0))
++		vx_set_persistent(vxi);
++	else
++		vx_clear_persistent(vxi);
++}
++
++
++/*	task must be current or locked		*/
++
++void	exit_vx_info(struct task_struct *p, int code)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi) {
++		atomic_dec(&vxi->cvirt.nr_threads);
++		vx_nproc_dec(p);
++
++		vxi->exit_code = code;
++		release_vx_info(vxi, p);
++	}
++}
++
++void	exit_vx_info_early(struct task_struct *p, int code)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi) {
++		if (vxi->vx_initpid == p->pid)
++			vx_exit_init(vxi, p, code);
++		if (vxi->vx_reaper == p)
++			vx_set_reaper(vxi, init_pid_ns.child_reaper);
++	}
++}
++
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++#include <asm/uaccess.h>
++
++
++int vc_task_xid(uint32_t id)
++{
++	xid_t xid;
++
++	if (id) {
++		struct task_struct *tsk;
++
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		xid = (tsk) ? tsk->xid : -ESRCH;
++		rcu_read_unlock();
++	} else
++		xid = vx_current_xid();
++	return xid;
++}
++
++
++int vc_vx_info(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vx_info_v0 vc_data;
++
++	vc_data.xid = vxi->vx_id;
++	vc_data.initpid = vxi->vx_initpid;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++int vc_ctx_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_stat_v0 vc_data;
++
++	vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
++	vc_data.tasks = atomic_read(&vxi->vx_tasks);
++
++	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 (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if ((xid > MAX_S_CONTEXT) || (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;
++
++	ret = -ENOEXEC;
++	if (vs_state_change(new_vxi, VSC_STARTUP))
++		goto out;
++
++	ret = vx_migrate_task(current, new_vxi, (!data));
++	if (ret)
++		goto out;
++
++	/* return context id on success */
++	ret = new_vxi->vx_id;
++
++	/* get a reference for persistent contexts */
++	if ((vc_data.flagword & VXF_PERSISTENT))
++		vx_set_persistent(new_vxi);
++out:
++	release_vx_info(new_vxi, NULL);
++	put_vx_info(new_vxi);
++	return ret;
++}
++
++
++int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
++	int ret;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = vx_migrate_task(current, vxi, 0);
++	if (ret)
++		return ret;
++	if (vc_data.flagword & VXM_SET_INIT)
++		ret = vx_set_init(vxi, current);
++	if (ret)
++		return ret;
++	if (vc_data.flagword & VXM_SET_REAPER)
++		ret = vx_set_reaper(vxi, current);
++	return ret;
++}
++
++
++int vc_get_cflags(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_flags_v0 vc_data;
++
++	vc_data.flagword = vxi->vx_flags;
++
++	/* special STATE flag handling */
++	vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_cflags(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_flags_v0 vc_data;
++	uint64_t mask, trigger;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special STATE flag handling */
++	mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
++	trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
++
++	if (vxi == current_vx_info()) {
++		/* if (trigger & VXF_STATE_SETUP)
++			vx_mask_cap_bset(vxi, current); */
++		if (trigger & VXF_STATE_INIT) {
++			int ret;
++
++			ret = vx_set_init(vxi, current);
++			if (ret)
++				return ret;
++			ret = vx_set_reaper(vxi, current);
++			if (ret)
++				return ret;
++		}
++	}
++
++	vxi->vx_flags = vs_mask_flags(vxi->vx_flags,
++		vc_data.flagword, mask);
++	if (trigger & VXF_PERSISTENT)
++		vx_update_persistent(vxi);
++
++	return 0;
++}
++
++
++static inline uint64_t caps_from_cap_t(kernel_cap_t c)
++{
++	uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32);
++
++	// printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v);
++	return v;
++}
++
++static inline kernel_cap_t cap_t_from_caps(uint64_t v)
++{
++	kernel_cap_t c = __cap_empty_set;
++
++	c.cap[0] = v & 0xFFFFFFFF;
++	c.cap[1] = (v >> 32) & 0xFFFFFFFF;
++
++	// printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]);
++	return c;
++}
++
++
++static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
++{
++	if (bcaps)
++		*bcaps = caps_from_cap_t(vxi->vx_bcaps);
++	if (ccaps)
++		*ccaps = vxi->vx_ccaps;
++
++	return 0;
++}
++
++int vc_get_ccaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_caps_v1 vc_data;
++	int ret;
++
++	ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
++	if (ret)
++		return ret;
++	vc_data.cmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++static int do_set_caps(struct vx_info *vxi,
++	uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
++{
++	uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps);
++
++#if 0
++	printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n",
++		bcaps, bmask, ccaps, cmask);
++#endif
++	vxi->vx_bcaps = cap_t_from_caps(
++		vs_mask_flags(bcold, bcaps, bmask));
++	vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
++
++	return 0;
++}
++
++int vc_set_ccaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_caps_v1 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
++}
++
++int vc_get_bcaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_bcaps vc_data;
++	int ret;
++
++	ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
++	if (ret)
++		return ret;
++	vc_data.bmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_bcaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_bcaps vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
++}
++
++
++int vc_get_umask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_umask vc_data;
++
++	vc_data.umask = vxi->vx_umask;
++	vc_data.mask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_umask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_umask vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
++		vc_data.umask, vc_data.mask);
++	return 0;
++}
++
++
++int vc_get_wmask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wmask vc_data;
++
++	vc_data.wmask = vxi->vx_wmask;
++	vc_data.mask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_wmask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wmask vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask,
++		vc_data.wmask, vc_data.mask);
++	return 0;
++}
++
++
++int vc_get_badness(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_badness_v0 vc_data;
++
++	vc_data.bias = vxi->vx_badness_bias;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_badness(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_badness_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_badness_bias = vc_data.bias;
++	return 0;
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(free_vx_info);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cvirt.c linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt.c
+--- linux-3.7.10/kernel/vserver/cvirt.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,313 @@
++/*
++ *  linux/kernel/vserver/cvirt.c
++ *
++ *  Virtual Server: Context Virtualization
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  broken out from limit.c
++ *  V0.02  added utsname stuff
++ *  V0.03  changed vcmds to vxi arg
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/utsname.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vserver/switch.h>
++#include <linux/vserver/cvirt_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++void vx_vsi_boottime(struct timespec *boottime)
++{
++	struct vx_info *vxi = current_vx_info();
++
++	set_normalized_timespec(boottime,
++		boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
++		boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
++	return;
++}
++
++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;
++	unsigned long flags;
++
++	spin_lock_irqsave(&vxi->cvirt.load_lock, flags);
++
++	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_irqrestore(&vxi->cvirt.load_lock, flags);
++}
++
++
++/*
++ * 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)
++{
++	struct nsproxy *nsproxy;
++	struct uts_namespace *uts;
++
++	if (id == VHIN_CONTEXT)
++		return vxi->vx_name;
++
++	nsproxy = vxi->space[0].vx_nsproxy;
++	if (!nsproxy)
++		return NULL;
++
++	uts = nsproxy->uts_ns;
++	if (!uts)
++		return NULL;
++
++	switch (id) {
++	case VHIN_SYSNAME:
++		return uts->name.sysname;
++	case VHIN_NODENAME:
++		return uts->name.nodename;
++	case VHIN_RELEASE:
++		return uts->name.release;
++	case VHIN_VERSION:
++		return uts->name.version;
++	case VHIN_MACHINE:
++		return uts->name.machine;
++	case VHIN_DOMAINNAME:
++		return uts->name.domainname;
++	default:
++		return NULL;
++	}
++	return NULL;
++}
++
++int vc_set_vhi_name(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vhi_name_v0 vc_data;
++	char *name;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	name = vx_vhi_name(vxi, vc_data.field);
++	if (!name)
++		return -EINVAL;
++
++	memcpy(name, vc_data.name, 65);
++	return 0;
++}
++
++int vc_get_vhi_name(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vhi_name_v0 vc_data;
++	char *name;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	name = vx_vhi_name(vxi, vc_data.field);
++	if (!name)
++		return -EINVAL;
++
++	memcpy(vc_data.name, name, 65);
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++int vc_virt_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_virt_stat_v0 vc_data;
++	struct _vx_cvirt *cvirt = &vxi->cvirt;
++	struct timespec uptime;
++
++	do_posix_clock_monotonic_gettime(&uptime);
++	set_normalized_timespec(&uptime,
++		uptime.tv_sec - cvirt->bias_uptime.tv_sec,
++		uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
++
++	vc_data.offset = timespec_to_ns(&cvirt->bias_ts);
++	vc_data.uptime = timespec_to_ns(&uptime);
++	vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
++	vc_data.nr_running = atomic_read(&cvirt->nr_running);
++	vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
++	vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold);
++	vc_data.nr_forks = atomic_read(&cvirt->total_forks);
++	vc_data.load[0] = cvirt->load[0];
++	vc_data.load[1] = cvirt->load[1];
++	vc_data.load[2] = cvirt->load[2];
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++#ifdef CONFIG_VSERVER_VTIME
++
++/* virtualized time base */
++
++void vx_adjust_timespec(struct timespec *ts)
++{
++	struct vx_info *vxi;
++
++	if (!vx_flags(VXF_VIRT_TIME, 0))
++		return;
++
++	vxi = current_vx_info();
++	ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
++	ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
++
++	if (ts->tv_nsec >= NSEC_PER_SEC) {
++		ts->tv_sec++;
++		ts->tv_nsec -= NSEC_PER_SEC;
++	} else if (ts->tv_nsec < 0) {
++		ts->tv_sec--;
++		ts->tv_nsec += NSEC_PER_SEC;
++	}
++}
++
++int vx_settimeofday(const struct timespec *ts)
++{
++	struct timespec ats, delta;
++	struct vx_info *vxi;
++
++	if (!vx_flags(VXF_VIRT_TIME, 0))
++		return do_settimeofday(ts);
++
++	getnstimeofday(&ats);
++	delta = timespec_sub(*ts, ats);
++
++	vxi = current_vx_info();
++	vxi->cvirt.bias_ts = timespec_add(vxi->cvirt.bias_ts, delta);
++	return 0;
++}
++
++#endif
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cvirt_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_init.h
+--- linux-3.7.10/kernel/vserver/cvirt_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,70 @@
++
++
++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);
++	cvirt->bias_ts.tv_sec = 0;
++	cvirt->bias_ts.tv_nsec = 0;
++
++	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);
++
++	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_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
++{
++	// cvirt_pc->cpustat = { 0 };
++}
++
++static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
++{
++#ifdef	CONFIG_VSERVER_WARN
++	int value;
++#endif
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
++		"!!! cvirt: %p[nr_threads] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
++		"!!! cvirt: %p[nr_running] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
++		"!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
++		"!!! cvirt: %p[nr_onhold] = %d on exit.",
++		cvirt, value);
++	return;
++}
++
++static inline
++void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
++{
++	return;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cvirt_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_proc.h
+--- linux-3.7.10/kernel/vserver/cvirt_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,123 @@
++#ifndef _VX_CVIRT_PROC_H
++#define _VX_CVIRT_PROC_H
++
++#include <linux/nsproxy.h>
++#include <linux/mnt_namespace.h>
++#include <linux/ipc_namespace.h>
++#include <linux/utsname.h>
++#include <linux/ipc.h>
++
++extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
++
++static inline
++int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
++{
++	struct mnt_namespace *ns;
++	struct uts_namespace *uts;
++	struct ipc_namespace *ipc;
++	int length = 0;
++
++	if (!nsproxy)
++		goto out;
++
++	length += sprintf(buffer + length,
++		"NSProxy:\t%p [%p,%p,%p]\n",
++		nsproxy, nsproxy->mnt_ns,
++		nsproxy->uts_ns, nsproxy->ipc_ns);
++
++	ns = nsproxy->mnt_ns;
++	if (!ns)
++		goto skip_ns;
++
++	length += vx_info_mnt_namespace(ns, buffer + length);
++
++skip_ns:
++
++	uts = nsproxy->uts_ns;
++	if (!uts)
++		goto skip_uts;
++
++	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, uts->name.sysname,
++		__NEW_UTS_LEN, uts->name.nodename,
++		__NEW_UTS_LEN, uts->name.release,
++		__NEW_UTS_LEN, uts->name.version,
++		__NEW_UTS_LEN, uts->name.machine,
++		__NEW_UTS_LEN, uts->name.domainname);
++skip_uts:
++
++	ipc = nsproxy->ipc_ns;
++	if (!ipc)
++		goto skip_ipc;
++
++	length += sprintf(buffer + length,
++		"SEMS:\t\t%d %d %d %d  %d\n"
++		"MSG:\t\t%d %d %d\n"
++		"SHM:\t\t%lu %lu  %d %d\n",
++		ipc->sem_ctls[0], ipc->sem_ctls[1],
++		ipc->sem_ctls[2], ipc->sem_ctls[3],
++		ipc->used_sems,
++		ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
++		(unsigned long)ipc->shm_ctlmax,
++		(unsigned long)ipc->shm_ctlall,
++		ipc->shm_ctlmni, ipc->shm_tot);
++skip_ipc:
++out:
++	return length;
++}
++
++
++#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)));
++
++	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
++int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
++	char *buffer, int cpu)
++{
++	int length = 0;
++	return length;
++}
++
++#endif	/* _VX_CVIRT_PROC_H */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/debug.c linux-3.7.10-vs2.3.5.6/kernel/vserver/debug.c
+--- linux-3.7.10/kernel/vserver/debug.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/debug.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,32 @@
++/*
++ *  kernel/vserver/debug.c
++ *
++ *  Copyright (C) 2005-2007 Herbert Pötzl
++ *
++ *  V0.01  vx_info dump support
++ *
++ */
++
++#include <linux/module.h>
++
++#include <linux/vserver/context.h>
++
++
++void	dump_vx_info(struct vx_info *vxi, int level)
++{
++	printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
++		atomic_read(&vxi->vx_usecnt),
++		atomic_read(&vxi->vx_tasks),
++		vxi->vx_state);
++	if (level > 0) {
++		__dump_vx_limit(&vxi->limit);
++		__dump_vx_sched(&vxi->sched);
++		__dump_vx_cvirt(&vxi->cvirt);
++		__dump_vx_cacct(&vxi->cacct);
++	}
++	printk("---\n");
++}
++
++
++EXPORT_SYMBOL_GPL(dump_vx_info);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/device.c linux-3.7.10-vs2.3.5.6/kernel/vserver/device.c
+--- linux-3.7.10/kernel/vserver/device.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/device.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,443 @@
++/*
++ *  linux/kernel/vserver/device.c
++ *
++ *  Linux-VServer: Device Support
++ *
++ *  Copyright (C) 2006  Herbert Pötzl
++ *  Copyright (C) 2007  Daniel Hokka Zakrisson
++ *
++ *  V0.01  device mapping basics
++ *  V0.02  added defaults
++ *
++ */
++
++#include <linux/slab.h>
++#include <linux/rcupdate.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/hash.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++#include <linux/vserver/base.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/device.h>
++#include <linux/vserver/device_cmd.h>
++
++
++#define DMAP_HASH_BITS	4
++
++
++struct vs_mapping {
++	union {
++		struct hlist_node hlist;
++		struct list_head list;
++	} u;
++#define dm_hlist	u.hlist
++#define dm_list		u.list
++	xid_t xid;
++	dev_t device;
++	struct vx_dmap_target target;
++};
++
++
++static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
++
++static DEFINE_SPINLOCK(dmap_main_hash_lock);
++
++static struct vx_dmap_target dmap_defaults[2] = {
++	{ .flags = DATTR_OPEN },
++	{ .flags = DATTR_OPEN },
++};
++
++
++struct kmem_cache *dmap_cachep __read_mostly;
++
++int __init dmap_cache_init(void)
++{
++	dmap_cachep = kmem_cache_create("dmap_cache",
++		sizeof(struct vs_mapping), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	return 0;
++}
++
++__initcall(dmap_cache_init);
++
++
++static inline unsigned int __hashval(dev_t dev, int bits)
++{
++	return hash_long((unsigned long)dev, bits);
++}
++
++
++/*	__hash_mapping()
++ *	add the mapping to the hash table
++ */
++static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct hlist_head *head, *hash = dmap_main_hash;
++	int device = vdm->device;
++
++	spin_lock(hash_lock);
++	vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x",
++		vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target);
++
++	head = &hash[__hashval(device, DMAP_HASH_BITS)];
++	hlist_add_head(&vdm->dm_hlist, head);
++	spin_unlock(hash_lock);
++}
++
++
++static inline int __mode_to_default(umode_t mode)
++{
++	switch (mode) {
++	case S_IFBLK:
++		return 0;
++	case S_IFCHR:
++		return 1;
++	default:
++		BUG();
++	}
++}
++
++
++/*	__set_default()
++ *	set a default
++ */
++static inline void __set_default(struct vx_info *vxi, umode_t mode,
++	struct vx_dmap_target *vdmt)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	spin_lock(hash_lock);
++
++	if (vxi)
++		vxi->dmap.targets[__mode_to_default(mode)] = *vdmt;
++	else
++		dmap_defaults[__mode_to_default(mode)] = *vdmt;
++
++
++	spin_unlock(hash_lock);
++
++	vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x",
++		  vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags);
++}
++
++
++/*	__remove_default()
++ *	remove a default
++ */
++static inline int __remove_default(struct vx_info *vxi, umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	spin_lock(hash_lock);
++
++	if (vxi)
++		vxi->dmap.targets[__mode_to_default(mode)].flags = 0;
++	else	/* remove == reset */
++		dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode;
++
++	spin_unlock(hash_lock);
++	return 0;
++}
++
++
++/*	__find_mapping()
++ *	find a mapping in the hash table
++ *
++ *	caller must hold hash_lock
++ */
++static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode,
++	struct vs_mapping **local, struct vs_mapping **global)
++{
++	struct hlist_head *hash = dmap_main_hash;
++	struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)];
++	struct hlist_node *pos;
++	struct vs_mapping *vdm;
++
++	*local = NULL;
++	if (global)
++		*global = NULL;
++
++	hlist_for_each(pos, head) {
++		vdm = hlist_entry(pos, struct vs_mapping, dm_hlist);
++
++		if ((vdm->device == device) &&
++			!((vdm->target.flags ^ mode) & S_IFMT)) {
++			if (vdm->xid == xid) {
++				*local = vdm;
++				return 1;
++			} else if (global && vdm->xid == 0)
++				*global = vdm;
++		}
++	}
++
++	if (global && *global)
++		return 0;
++	else
++		return -ENOENT;
++}
++
++
++/*	__lookup_mapping()
++ *	find a mapping and store the result in target and flags
++ */
++static inline int __lookup_mapping(struct vx_info *vxi,
++	dev_t device, dev_t *target, int *flags, umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct vs_mapping *vdm, *global;
++	struct vx_dmap_target *vdmt;
++	int ret = 0;
++	xid_t xid = vxi->vx_id;
++	int index;
++
++	spin_lock(hash_lock);
++	if (__find_mapping(xid, device, mode, &vdm, &global) > 0) {
++		ret = 1;
++		vdmt = &vdm->target;
++		goto found;
++	}
++
++	index = __mode_to_default(mode);
++	if (vxi && vxi->dmap.targets[index].flags) {
++		ret = 2;
++		vdmt = &vxi->dmap.targets[index];
++	} else if (global) {
++		ret = 3;
++		vdmt = &global->target;
++		goto found;
++	} else {
++		ret = 4;
++		vdmt = &dmap_defaults[index];
++	}
++
++found:
++	if (target && (vdmt->flags & DATTR_REMAP))
++		*target = vdmt->target;
++	else if (target)
++		*target = device;
++	if (flags)
++		*flags = vdmt->flags;
++
++	spin_unlock(hash_lock);
++
++	return ret;
++}
++
++
++/*	__remove_mapping()
++ *	remove a mapping from the hash table
++ */
++static inline int __remove_mapping(struct vx_info *vxi, dev_t device,
++	umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct vs_mapping *vdm = NULL;
++	int ret = 0;
++
++	spin_lock(hash_lock);
++
++	ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm,
++		NULL);
++	vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x",
++		vxi, vxi ? vxi->vx_id : 0, device, mode);
++	if (ret < 0)
++		goto out;
++	hlist_del(&vdm->dm_hlist);
++
++out:
++	spin_unlock(hash_lock);
++	if (vdm)
++		kmem_cache_free(dmap_cachep, vdm);
++	return ret;
++}
++
++
++
++int vs_map_device(struct vx_info *vxi,
++	dev_t device, dev_t *target, umode_t mode)
++{
++	int ret, flags = DATTR_MASK;
++
++	if (!vxi) {
++		if (target)
++			*target = device;
++		goto out;
++	}
++	ret = __lookup_mapping(vxi, device, target, &flags, mode);
++	vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d",
++		device, target ? *target : 0, flags, mode, ret);
++out:
++	return (flags & DATTR_MASK);
++}
++
++
++
++static int do_set_mapping(struct vx_info *vxi,
++	dev_t device, dev_t target, int flags, umode_t mode)
++{
++	if (device) {
++		struct vs_mapping *new;
++
++		new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL);
++		if (!new)
++			return -ENOMEM;
++
++		INIT_HLIST_NODE(&new->dm_hlist);
++		new->device = device;
++		new->target.target = target;
++		new->target.flags = flags | mode;
++		new->xid = (vxi ? vxi->vx_id : 0);
++
++		vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags);
++		__hash_mapping(vxi, new);
++	} else {
++		struct vx_dmap_target new = {
++			.target = target,
++			.flags = flags | mode,
++		};
++		__set_default(vxi, mode, &new);
++	}
++	return 0;
++}
++
++
++static int do_unset_mapping(struct vx_info *vxi,
++	dev_t device, dev_t target, int flags, umode_t mode)
++{
++	int ret = -EINVAL;
++
++	if (device) {
++		ret = __remove_mapping(vxi, device, mode);
++		if (ret < 0)
++			goto out;
++	} else {
++		ret = __remove_default(vxi, mode);
++		if (ret < 0)
++			goto out;
++	}
++
++out:
++	return ret;
++}
++
++
++static inline int __user_device(const char __user *name, dev_t *dev,
++	umode_t *mode)
++{
++	struct nameidata nd;
++	int ret;
++
++	if (!name) {
++		*dev = 0;
++		return 0;
++	}
++	ret = user_lpath(name, &nd.path);
++	if (ret)
++		return ret;
++	if (nd.path.dentry->d_inode) {
++		*dev = nd.path.dentry->d_inode->i_rdev;
++		*mode = nd.path.dentry->d_inode->i_mode;
++	}
++	path_put(&nd.path);
++	return 0;
++}
++
++static inline int __mapping_mode(dev_t device, dev_t target,
++	umode_t device_mode, umode_t target_mode, umode_t *mode)
++{
++	if (device)
++		*mode = device_mode & S_IFMT;
++	else if (target)
++		*mode = target_mode & S_IFMT;
++	else
++		return -EINVAL;
++
++	/* if both given, device and target mode have to match */
++	if (device && target &&
++		((device_mode ^ target_mode) & S_IFMT))
++		return -EINVAL;
++	return 0;
++}
++
++
++static inline int do_mapping(struct vx_info *vxi, const char __user *device_path,
++	const char __user *target_path, int flags, int set)
++{
++	dev_t device = ~0, target = ~0;
++	umode_t device_mode = 0, target_mode = 0, mode;
++	int ret;
++
++	ret = __user_device(device_path, &device, &device_mode);
++	if (ret)
++		return ret;
++	ret = __user_device(target_path, &target, &target_mode);
++	if (ret)
++		return ret;
++
++	ret = __mapping_mode(device, target,
++		device_mode, target_mode, &mode);
++	if (ret)
++		return ret;
++
++	if (set)
++		return do_set_mapping(vxi, device, target,
++			flags, mode);
++	else
++		return do_unset_mapping(vxi, device, target,
++			flags, mode);
++}
++
++
++int vc_set_mapping(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, vc_data.device, vc_data.target,
++		vc_data.flags, 1);
++}
++
++int vc_unset_mapping(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, vc_data.device, vc_data.target,
++		vc_data.flags, 0);
++}
++
++
++#ifdef	CONFIG_COMPAT
++
++int vc_set_mapping_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++		compat_ptr(vc_data.target_ptr), vc_data.flags, 1);
++}
++
++int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++		compat_ptr(vc_data.target_ptr), vc_data.flags, 0);
++}
++
++#endif	/* CONFIG_COMPAT */
++
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/dlimit.c linux-3.7.10-vs2.3.5.6/kernel/vserver/dlimit.c
+--- linux-3.7.10/kernel/vserver/dlimit.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/dlimit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,531 @@
++/*
++ *  linux/kernel/vserver/dlimit.c
++ *
++ *  Virtual Server: Context Disk Limits
++ *
++ *  Copyright (C) 2004-2009  Herbert Pötzl
++ *
++ *  V0.01  initial version
++ *  V0.02  compat32 splitup
++ *  V0.03  extended interface
++ *
++ */
++
++#include <linux/statfs.h>
++#include <linux/sched.h>
++#include <linux/namei.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vserver/dlimit_cmd.h>
++#include <linux/slab.h>
++// #include <linux/gfp.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, tag_t tag)
++{
++	struct dl_info *new = NULL;
++
++	vxdprintk(VXD_CBIT(dlim, 5),
++		"alloc_dl_info(%p,%d)*", sb, tag);
++
++	/* 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_tag = tag;
++	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, tag, 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_tag = -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 DEFINE_SPINLOCK(dl_info_hash_lock);
++
++
++static inline unsigned int __hashval(struct super_block *sb, tag_t tag)
++{
++	return ((tag ^ (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_tag);
++	get_dl_info(dli);
++	head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)];
++	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_tag);
++	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, tag_t tag)
++{
++	struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
++	struct hlist_node *pos;
++	struct dl_info *dli;
++
++	hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) {
++
++		if (dli->dl_tag == tag && dli->dl_sb == sb) {
++			return dli;
++		}
++	}
++	return NULL;
++}
++
++
++struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag)
++{
++	struct dl_info *dli;
++
++	rcu_read_lock();
++	dli = get_dl_info(__lookup_dl_info(sb, tag));
++	vxdprintk(VXD_CBIT(dlim, 7),
++		"locate_dl_info(%p,#%d) = %p", sb, tag, 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");
++}
++
++
++
++
++static int do_addrem_dlimit(uint32_t id, const char __user *name,
++	uint32_t flags, int add)
++{
++	struct path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.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_put(&path);
++	}
++	return ret;
++}
++
++int vc_add_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_base_v0 vc_data;
++
++	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 (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 (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 (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 path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.dentry->d_inode->i_sb))
++			goto out_release;
++
++		/* sanity checks */
++		if ((reserved != CDLIM_KEEP &&
++			reserved > 100) ||
++			(inodes_used != CDLIM_KEEP &&
++			inodes_used > inodes_total) ||
++			(space_used != 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 != CDLIM_KEEP)
++			dli->dl_inodes_used = inodes_used;
++		if (inodes_total != CDLIM_KEEP)
++			dli->dl_inodes_total = inodes_total;
++		if (space_used != CDLIM_KEEP)
++			dli->dl_space_used = dlimit_space_32to64(
++				space_used, flags, DLIMS_USED);
++
++		if (space_total == CDLIM_INFINITY)
++			dli->dl_space_total = DLIM_INFINITY;
++		else if (space_total != CDLIM_KEEP)
++			dli->dl_space_total = dlimit_space_32to64(
++				space_total, flags, DLIMS_TOTAL);
++
++		if (reserved != CDLIM_KEEP)
++			dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
++
++		spin_unlock(&dli->dl_lock);
++
++		put_dl_info(dli);
++		ret = 0;
++
++	out_release:
++		path_put(&path);
++	}
++	return ret;
++}
++
++int vc_set_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_v0 vc_data;
++
++	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 (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 path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.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 = dlimit_space_64to32(
++			dli->dl_space_used, flags, DLIMS_USED);
++
++		if (dli->dl_space_total == DLIM_INFINITY)
++			*space_total = CDLIM_INFINITY;
++		else
++			*space_total = dlimit_space_64to32(
++				dli->dl_space_total, flags, DLIMS_TOTAL);
++
++		*reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
++		spin_unlock(&dli->dl_lock);
++
++		put_dl_info(dli);
++		ret = -EFAULT;
++
++		ret = 0;
++	out_release:
++		path_put(&path);
++	}
++	return ret;
++}
++
++
++int vc_get_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_v0 vc_data;
++	int ret;
++
++	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 (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, dx_current_tag());
++	if (!dli)
++		return;
++
++	spin_lock(&dli->dl_lock);
++	if (dli->dl_inodes_total == (unsigned long)DLIM_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 == DLIM_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);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/helper.c linux-3.7.10-vs2.3.5.6/kernel/vserver/helper.c
+--- linux-3.7.10/kernel/vserver/helper.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/helper.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,229 @@
++/*
++ *  linux/kernel/vserver/helper.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic helper
++ *
++ */
++
++#include <linux/kmod.h>
++#include <linux/reboot.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/signal.h>
++
++
++char vshelper_path[255] = "/sbin/vshelper";
++
++static int vshelper_init(struct subprocess_info *info, struct cred *new_cred)
++{
++	current->flags &= ~PF_THREAD_BOUND;
++	return 0;
++}
++
++static int do_vshelper(char *name, char *argv[], char *envp[], int sync)
++{
++	int ret;
++
++	if ((ret = call_usermodehelper_fns(name, argv, envp,
++		sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC,
++		vshelper_init, NULL, NULL))) {
++		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_helper(struct vx_info *vxi, int cmd, void __user *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};
++
++	if (vx_info_state(vxi, VXS_HELPER))
++		return -EAGAIN;
++	vxi->vx_state |= VXS_HELPER;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
++
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++	snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", current_uid());
++	snprintf(pid_buf, sizeof(pid_buf), "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;
++
++	case LINUX_REBOOT_CMD_OOM:
++		argv[1] = "oom";
++		break;
++
++	default:
++		vxi->vx_state &= ~VXS_HELPER;
++		return 0;
++	}
++
++	ret = do_vshelper(vshelper_path, argv, envp, 0);
++	vxi->vx_state &= ~VXS_HELPER;
++	__wakeup_vx_info(vxi);
++	return (ret) ? -EPERM : 0;
++}
++
++
++long vs_reboot(unsigned int cmd, void __user *arg)
++{
++	struct vx_info *vxi = current_vx_info();
++	long ret = 0;
++
++	vxdprintk(VXD_CBIT(misc, 5),
++		"vs_reboot(%p[#%d],%u)",
++		vxi, vxi ? vxi->vx_id : 0, cmd);
++
++	ret = vs_reboot_helper(vxi, cmd, arg);
++	if (ret)
++		return ret;
++
++	vxi->reboot_cmd = cmd;
++	if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++		switch (cmd) {
++		case LINUX_REBOOT_CMD_RESTART:
++		case LINUX_REBOOT_CMD_HALT:
++		case LINUX_REBOOT_CMD_POWER_OFF:
++			vx_info_kill(vxi, 0, SIGKILL);
++			vx_info_kill(vxi, 1, SIGKILL);
++		default:
++			break;
++		}
++	}
++	return 0;
++}
++
++long vs_oom_action(unsigned int cmd)
++{
++	struct vx_info *vxi = current_vx_info();
++	long ret = 0;
++
++	vxdprintk(VXD_CBIT(misc, 5),
++		"vs_oom_action(%p[#%d],%u)",
++		vxi, vxi ? vxi->vx_id : 0, cmd);
++
++	ret = vs_reboot_helper(vxi, cmd, NULL);
++	if (ret)
++		return ret;
++
++	vxi->reboot_cmd = cmd;
++	if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++		vx_info_kill(vxi, 0, SIGKILL);
++		vx_info_kill(vxi, 1, SIGKILL);
++	}
++	return 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_SC_HELPER, 0))
++		return 0;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++
++	switch (cmd) {
++	case VSC_STARTUP:
++		argv[1] = "startup";
++		break;
++	case VSC_SHUTDOWN:
++		argv[1] = "shutdown";
++		break;
++	default:
++		return 0;
++	}
++
++	return do_vshelper(vshelper_path, argv, envp, 1);
++}
++
++
++/*
++ *      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_SC_HELPER, 0))
++		return 0;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id);
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++
++	switch (cmd) {
++	case VSC_NETUP:
++		argv[1] = "netup";
++		break;
++	case VSC_NETDOWN:
++		argv[1] = "netdown";
++		break;
++	default:
++		return 0;
++	}
++
++	return do_vshelper(vshelper_path, argv, envp, 1);
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/history.c linux-3.7.10-vs2.3.5.6/kernel/vserver/history.c
+--- linux-3.7.10/kernel/vserver/history.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/history.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,258 @@
++/*
++ *  kernel/vserver/history.c
++ *
++ *  Virtual Context History Backtrace
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *  V0.02  hash/unhash and trace
++ *  V0.03  preemption fixes
++ *
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++
++#include <linux/vserver/context.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/debug_cmd.h>
++#include <linux/vserver/history.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;
++}
++
++EXPORT_SYMBOL_GPL(vxh_advance);
++
++
++#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, cpu;
++
++	printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
++		atomic_read(&sequence), NR_CPUS);
++
++	for (i = 0; i < VXH_SIZE; i++) {
++		for_each_online_cpu(cpu) {
++			struct _vx_history *hist =
++				&per_cpu(vx_history_buffer, cpu);
++			unsigned int index = (hist->counter - i) % VXH_SIZE;
++			struct _vx_hist_entry *entry = &hist->entry[index];
++
++			vxh_dump_entry(entry, cpu);
++		}
++	}
++}
++
++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;
++}
++
++
++int do_read_history(struct __user _vx_hist_entry *data,
++	int cpu, uint32_t *index, uint32_t *count)
++{
++	int pos, ret = 0;
++	struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
++	int end = hist->counter;
++	int start = end - VXH_SIZE + 2;
++	int idx = *index;
++
++	/* special case: get current pos */
++	if (!*count) {
++		*index = end;
++		return 0;
++	}
++
++	/* have we lost some data? */
++	if (idx < start)
++		idx = start;
++
++	for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
++		struct _vx_hist_entry *entry =
++			&hist->entry[idx % VXH_SIZE];
++
++		/* send entry to userspace */
++		ret = copy_to_user(&data[pos], entry, sizeof(*entry));
++		if (ret)
++			break;
++	}
++	/* save new index and count */
++	*index = idx;
++	*count = pos;
++	return ret ? ret : (*index < end);
++}
++
++int vc_read_history(uint32_t id, void __user *data)
++{
++	struct vcmd_read_history_v0 vc_data;
++	int ret;
++
++	if (id >= NR_CPUS)
++		return -EINVAL;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
++		id, &vc_data.index, &vc_data.count);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++#ifdef	CONFIG_COMPAT
++
++int vc_read_history_x32(uint32_t id, void __user *data)
++{
++	struct vcmd_read_history_v0_x32 vc_data;
++	int ret;
++
++	if (id >= NR_CPUS)
++		return -EINVAL;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_read_history((struct __user _vx_hist_entry *)
++		compat_ptr(vc_data.data_ptr),
++		id, &vc_data.index, &vc_data.count);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/inet.c linux-3.7.10-vs2.3.5.6/kernel/vserver/inet.c
+--- linux-3.7.10/kernel/vserver/inet.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/inet.c	2013-02-05 01:41:48.000000000 +0000
+@@ -0,0 +1,236 @@
++
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/export.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
++#include <linux/vserver/debug.h>
++#include <net/route.h>
++#include <net/addrconf.h>
++
++
++int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
++{
++	int ret = 0;
++
++	if (!nxi1 || !nxi2 || nxi1 == nxi2)
++		ret = 1;
++	else {
++		struct nx_addr_v4 *ptr;
++		unsigned long irqflags;
++
++		spin_lock_irqsave(&nxi1->addr_lock, irqflags);
++		for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
++			if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
++				ret = 1;
++				break;
++			}
++		}
++		spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
++	}
++
++	vxdprintk(VXD_CBIT(net, 2),
++		"nx_v4_addr_conflict(%p,%p): %d",
++		nxi1, nxi2, ret);
++
++	return ret;
++}
++
++
++#ifdef	CONFIG_IPV6
++
++int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
++{
++	int ret = 0;
++
++	if (!nxi1 || !nxi2 || nxi1 == nxi2)
++		ret = 1;
++	else {
++		struct nx_addr_v6 *ptr;
++		unsigned long irqflags;
++
++		spin_lock_irqsave(&nxi1->addr_lock, irqflags);
++		for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
++			if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
++				ret = 1;
++				break;
++			}
++		}
++		spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
++	}
++
++	vxdprintk(VXD_CBIT(net, 2),
++		"nx_v6_addr_conflict(%p,%p): %d",
++		nxi1, nxi2, ret);
++
++	return ret;
++}
++
++#endif
++
++int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	struct in_device *in_dev;
++	struct in_ifaddr **ifap;
++	struct in_ifaddr *ifa;
++	int ret = 0;
++
++	if (!dev)
++		goto out;
++	in_dev = in_dev_get(dev);
++	if (!in_dev)
++		goto out;
++
++	for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
++		ifap = &ifa->ifa_next) {
++		if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) {
++			ret = 1;
++			break;
++		}
++	}
++	in_dev_put(in_dev);
++out:
++	return ret;
++}
++
++
++#ifdef	CONFIG_IPV6
++
++int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	struct inet6_dev *in_dev;
++	struct inet6_ifaddr *ifa;
++	int ret = 0;
++
++	if (!dev)
++		goto out;
++	in_dev = in6_dev_get(dev);
++	if (!in_dev)
++		goto out;
++
++	// for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL;
++	list_for_each_entry(ifa, &in_dev->addr_list, if_list) {
++		if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) {
++			ret = 1;
++			break;
++		}
++	}
++	in6_dev_put(in_dev);
++out:
++	return ret;
++}
++
++#endif
++
++int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++	if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi))
++		goto out;
++#ifdef	CONFIG_IPV6
++	ret = 2;
++	if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi))
++		goto out;
++#endif
++	ret = 0;
++out:
++	vxdprintk(VXD_CBIT(net, 3),
++		"dev_in_nx_info(%p,%p[#%d]) = %d",
++		dev, nxi, nxi ? nxi->nx_id : 0, ret);
++	return ret;
++}
++
++struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi,
++	struct flowi4 *fl4)
++{
++	struct rtable *rt;
++
++	if (!nxi)
++		return NULL;
++
++	/* FIXME: handle lback only case */
++	if (!NX_IPV4(nxi))
++		return ERR_PTR(-EPERM);
++
++	vxdprintk(VXD_CBIT(net, 4),
++		"ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
++		nxi, nxi ? nxi->nx_id : 0,
++		NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr));
++
++	/* single IP is unconditional */
++	if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) &&
++		(fl4->saddr == INADDR_ANY))
++		fl4->saddr = nxi->v4.ip[0].s_addr;
++
++	if (fl4->saddr == INADDR_ANY) {
++		struct nx_addr_v4 *ptr;
++		__be32 found = 0;
++
++		rt = __ip_route_output_key(net, fl4);
++		if (!IS_ERR(rt)) {
++			found = fl4->saddr;
++			ip_rt_put(rt);
++			vxdprintk(VXD_CBIT(net, 4),
++				"ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found));
++			if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND))
++				goto found;
++		}
++
++		WARN_ON_ONCE(in_irq());
++		spin_lock(&nxi->addr_lock);
++		for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
++			__be32 primary = ptr->ip[0].s_addr;
++			__be32 mask = ptr->mask.s_addr;
++			__be32 neta = primary & mask;
++
++			vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: "
++				NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary),
++				NIPQUAD(mask), NIPQUAD(neta));
++			if ((found & mask) != neta)
++				continue;
++
++			fl4->saddr = primary;
++			rt = __ip_route_output_key(net, fl4);
++			vxdprintk(VXD_CBIT(net, 4),
++				"ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary));
++			if (!IS_ERR(rt)) {
++				found = fl4->saddr;
++				ip_rt_put(rt);
++				if (found == primary)
++					goto found_unlock;
++			}
++		}
++		/* still no source ip? */
++		found = ipv4_is_loopback(fl4->daddr)
++			? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
++	found_unlock:
++		spin_unlock(&nxi->addr_lock);
++	found:
++		/* assign src ip to flow */
++		fl4->saddr = found;
++
++	} else {
++		if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
++			return ERR_PTR(-EPERM);
++	}
++
++	if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
++		if (ipv4_is_loopback(fl4->daddr))
++			fl4->daddr = nxi->v4_lback.s_addr;
++		if (ipv4_is_loopback(fl4->saddr))
++			fl4->saddr = nxi->v4_lback.s_addr;
++	} else if (ipv4_is_loopback(fl4->daddr) &&
++		!nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
++		return ERR_PTR(-EPERM);
++
++	return NULL;
++}
++
++EXPORT_SYMBOL_GPL(ip_v4_find_src);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/init.c linux-3.7.10-vs2.3.5.6/kernel/vserver/init.c
+--- linux-3.7.10/kernel/vserver/init.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/init.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,45 @@
++/*
++ *  linux/kernel/init.c
++ *
++ *  Virtual Server Init
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *
++ */
++
++#include <linux/init.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;
++}
++
++/* FIXME: GFP_ZONETYPES gone
++long vx_slab[GFP_ZONETYPES]; */
++long vx_area;
++
++
++module_init(init_vserver);
++module_exit(exit_vserver);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/inode.c linux-3.7.10-vs2.3.5.6/kernel/vserver/inode.c
+--- linux-3.7.10/kernel/vserver/inode.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,437 @@
++/*
++ *  linux/kernel/vserver/inode.c
++ *
++ *  Virtual Server: File System Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  separated from vcontext V0.05
++ *  V0.02  moved to tag (instead of xid)
++ *
++ */
++
++#include <linux/tty.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/fs.h>
++#include <linux/file.h>
++#include <linux/mount.h>
++#include <linux/parser.h>
++#include <linux/namei.h>
++#include <linux/vserver/inode.h>
++#include <linux/vserver/inode_cmd.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
++
++#include <asm/uaccess.h>
++
++
++static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
++{
++	struct proc_dir_entry *entry;
++
++	if (!in || !in->i_sb)
++		return -ESRCH;
++
++	*flags = IATTR_TAG
++		| (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
++		| (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
++		| (IS_BARRIER(in) ? IATTR_BARRIER : 0)
++		| (IS_COW(in) ? IATTR_COW : 0);
++	*mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW;
++
++	if (S_ISDIR(in->i_mode))
++		*mask |= IATTR_BARRIER;
++
++	if (IS_TAGGED(in)) {
++		*tag = i_tag_read(in);
++		*mask |= IATTR_TAG;
++	}
++
++	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:
++		*tag = i_tag_read(in);
++		*mask |= IATTR_TAG;
++		break;
++
++	default:
++		break;
++	}
++	return 0;
++}
++
++int vc_get_iattr(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(vc_data.name, &path);
++	if (!ret) {
++		ret = __vc_get_iattr(path.dentry->d_inode,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++	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(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
++	if (!ret) {
++		ret = __vc_get_iattr(path.dentry->d_inode,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
++
++int vc_fget_iattr(uint32_t fd, void __user *data)
++{
++	struct file *filp;
++	struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	filp = fget(fd);
++	if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++		return -EBADF;
++
++	ret = __vc_get_iattr(filp->f_dentry->d_inode,
++		&vc_data.tag, &vc_data.flags, &vc_data.mask);
++
++	fput(filp);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++
++static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
++{
++	struct inode *in = de->d_inode;
++	int error = 0, is_proc = 0, has_tag = 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_tag = IS_TAGGED(in) ||
++		(in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
++	if ((*mask & IATTR_TAG) && !has_tag)
++		return -EINVAL;
++
++	mutex_lock(&in->i_mutex);
++	if (*mask & IATTR_TAG) {
++		attr.ia_tag = *tag;
++		attr.ia_valid |= ATTR_TAG;
++	}
++
++	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_IMMUTABLE | IATTR_IXUNLINK |
++		IATTR_BARRIER | IATTR_COW)) {
++		int iflags = in->i_flags;
++		int vflags = in->i_vflags;
++
++		if (*mask & IATTR_IMMUTABLE) {
++			if (*flags & IATTR_IMMUTABLE)
++				iflags |= S_IMMUTABLE;
++			else
++				iflags &= ~S_IMMUTABLE;
++		}
++		if (*mask & IATTR_IXUNLINK) {
++			if (*flags & IATTR_IXUNLINK)
++				iflags |= S_IXUNLINK;
++			else
++				iflags &= ~S_IXUNLINK;
++		}
++		if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
++			if (*flags & IATTR_BARRIER)
++				vflags |= V_BARRIER;
++			else
++				vflags &= ~V_BARRIER;
++		}
++		if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) {
++			if (*flags & IATTR_COW)
++				vflags |= V_COW;
++			else
++				vflags &= ~V_COW;
++		}
++		if (in->i_op && in->i_op->sync_flags) {
++			error = in->i_op->sync_flags(in, iflags, vflags);
++			if (error)
++				goto out;
++		}
++	}
++
++	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) {
++				setattr_copy(in, &attr);
++				mark_inode_dirty(in);
++			}
++		}
++	}
++
++out:
++	mutex_unlock(&in->i_mutex);
++	return error;
++}
++
++int vc_set_iattr(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(vc_data.name, &path);
++	if (!ret) {
++		ret = __vc_set_iattr(path.dentry,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#ifdef	CONFIG_COMPAT
++
++int vc_set_iattr_x32(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1_x32 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
++	if (!ret) {
++		ret = __vc_set_iattr(path.dentry,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
++int vc_fset_iattr(uint32_t fd, void __user *data)
++{
++	struct file *filp;
++	struct vcmd_ctx_fiattr_v0 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	filp = fget(fd);
++	if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++		return -EBADF;
++
++	ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag,
++		&vc_data.flags, &vc_data.mask);
++
++	fput(filp);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++
++enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err };
++
++static match_table_t tokens = {
++	{Opt_notagcheck, "notagcheck"},
++#ifdef	CONFIG_PROPAGATE
++	{Opt_notag, "notag"},
++	{Opt_tag, "tag"},
++	{Opt_tagid, "tagid=%u"},
++#endif
++	{Opt_err, NULL}
++};
++
++
++static void __dx_parse_remove(char *string, char *opt)
++{
++	char *p = strstr(string, opt);
++	char *q = p;
++
++	if (p) {
++		while (*q != '\0' && *q != ',')
++			q++;
++		while (*q)
++			*p++ = *q++;
++		while (*p)
++			*p++ = '\0';
++	}
++}
++
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++		 unsigned long *flags)
++{
++	int set = 0;
++	substring_t args[MAX_OPT_ARGS];
++	int token;
++	char *s, *p, *opts;
++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
++	int option = 0;
++#endif
++
++	if (!string)
++		return 0;
++	s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
++	if (!s)
++		return 0;
++
++	opts = s;
++	while ((p = strsep(&opts, ",")) != NULL) {
++		token = match_token(p, tokens, args);
++
++		switch (token) {
++#ifdef CONFIG_PROPAGATE
++		case Opt_tag:
++			if (tag)
++				*tag = 0;
++			if (remove)
++				__dx_parse_remove(s, "tag");
++			*mnt_flags |= MNT_TAGID;
++			set |= MNT_TAGID;
++			break;
++		case Opt_notag:
++			if (remove)
++				__dx_parse_remove(s, "notag");
++			*mnt_flags |= MNT_NOTAG;
++			set |= MNT_NOTAG;
++			break;
++		case Opt_tagid:
++			if (tag && !match_int(args, &option))
++				*tag = option;
++			if (remove)
++				__dx_parse_remove(s, "tagid");
++			*mnt_flags |= MNT_TAGID;
++			set |= MNT_TAGID;
++			break;
++#endif	/* CONFIG_PROPAGATE */
++		case Opt_notagcheck:
++			if (remove)
++				__dx_parse_remove(s, "notagcheck");
++			*flags |= MS_NOTAGCHECK;
++			set |= MS_NOTAGCHECK;
++			break;
++		}
++		vxdprintk(VXD_CBIT(tag, 7),
++			"dx_parse_tag(" VS_Q("%s") "): %d:#%d",
++			p, token, option);
++	}
++	if (set)
++		strcpy(string, s);
++	kfree(s);
++	return set;
++}
++
++#ifdef	CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
++{
++	tag_t new_tag = 0;
++	struct vfsmount *mnt;
++	int propagate;
++
++	if (!nd)
++		return;
++	mnt = nd->path.mnt;
++	if (!mnt)
++		return;
++
++	propagate = (mnt->mnt_flags & MNT_TAGID);
++	if (propagate)
++		new_tag = mnt->mnt_tag;
++
++	vxdprintk(VXD_CBIT(tag, 7),
++		"dx_propagate_tag(%p[#%lu.%d]): %d,%d",
++		inode, inode->i_ino, inode->i_tag,
++		new_tag, (propagate) ? 1 : 0);
++
++	if (propagate)
++		i_tag_write(inode, new_tag);
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(__dx_propagate_tag);
++
++#endif	/* CONFIG_PROPAGATE */
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/limit.c linux-3.7.10-vs2.3.5.6/kernel/vserver/limit.c
+--- linux-3.7.10/kernel/vserver/limit.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/limit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,345 @@
++/*
++ *  linux/kernel/vserver/limit.c
++ *
++ *  Virtual Server: Context Limits
++ *
++ *  Copyright (C) 2004-2010  Herbert Pötzl
++ *
++ *  V0.01  broken out from vcontext V0.05
++ *  V0.02  changed vcmds to vxi arg
++ *  V0.03  added memory cgroup support
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/module.h>
++#include <linux/memcontrol.h>
++#include <linux/res_counter.h>
++#include <linux/vs_limit.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/limit_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++const char *vlimit_name[NUM_LIMITS] = {
++	[RLIMIT_CPU]		= "CPU",
++	[RLIMIT_NPROC]		= "NPROC",
++	[RLIMIT_NOFILE]		= "NOFILE",
++	[RLIMIT_LOCKS]		= "LOCKS",
++	[RLIMIT_SIGPENDING]	= "SIGP",
++	[RLIMIT_MSGQUEUE]	= "MSGQ",
++
++	[VLIMIT_NSOCK]		= "NSOCK",
++	[VLIMIT_OPENFD]		= "OPENFD",
++	[VLIMIT_SHMEM]		= "SHMEM",
++	[VLIMIT_DENTRY]		= "DENTRY",
++};
++
++EXPORT_SYMBOL_GPL(vlimit_name);
++
++#define MASK_ENTRY(x)	(1 << (x))
++
++const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
++		/* minimum */
++	0
++	,	/* softlimit */
++	0
++	,       /* maximum */
++	MASK_ENTRY( RLIMIT_NPROC	) |
++	MASK_ENTRY( RLIMIT_NOFILE	) |
++	MASK_ENTRY( RLIMIT_LOCKS	) |
++	MASK_ENTRY( RLIMIT_MSGQUEUE	) |
++
++	MASK_ENTRY( VLIMIT_NSOCK	) |
++	MASK_ENTRY( VLIMIT_OPENFD	) |
++	MASK_ENTRY( VLIMIT_SHMEM	) |
++	MASK_ENTRY( VLIMIT_DENTRY	) |
++	0
++};
++		/* accounting only */
++uint32_t account_mask =
++	MASK_ENTRY( VLIMIT_SEMARY	) |
++	MASK_ENTRY( VLIMIT_NSEMS	) |
++	MASK_ENTRY( VLIMIT_MAPPED	) |
++	0;
++
++
++static int is_valid_vlimit(int id)
++{
++	uint32_t mask = vlimit_mask.minimum |
++		vlimit_mask.softlimit | vlimit_mask.maximum;
++	return mask & (1 << id);
++}
++
++static int is_accounted_vlimit(int id)
++{
++	if (is_valid_vlimit(id))
++		return 1;
++	return account_mask & (1 << id);
++}
++
++
++static inline uint64_t vc_get_soft(struct vx_info *vxi, int id)
++{
++	rlim_t limit = __rlim_soft(&vxi->limit, id);
++	return VX_VLIM(limit);
++}
++
++static inline uint64_t vc_get_hard(struct vx_info *vxi, int id)
++{
++	rlim_t limit = __rlim_hard(&vxi->limit, id);
++	return VX_VLIM(limit);
++}
++
++static int do_get_rlimit(struct vx_info *vxi, uint32_t id,
++	uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum)
++{
++	if (!is_valid_vlimit(id))
++		return -EINVAL;
++
++	if (minimum)
++		*minimum = CRLIM_UNSET;
++	if (softlimit)
++		*softlimit = vc_get_soft(vxi, id);
++	if (maximum)
++		*maximum = vc_get_hard(vxi, id);
++	return 0;
++}
++
++int vc_get_rlimit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0 vc_data;
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_get_rlimit(vxi, vc_data.id,
++		&vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++static int do_set_rlimit(struct vx_info *vxi, uint32_t id,
++	uint64_t minimum, uint64_t softlimit, uint64_t maximum)
++{
++	if (!is_valid_vlimit(id))
++		return -EINVAL;
++
++	if (maximum != CRLIM_KEEP)
++		__rlim_hard(&vxi->limit, id) = VX_RLIM(maximum);
++	if (softlimit != CRLIM_KEEP)
++		__rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit);
++
++	/* clamp soft limit */
++	if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id))
++		__rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id);
++
++	return 0;
++}
++
++int vc_set_rlimit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_rlimit(vxi, vc_data.id,
++		vc_data.minimum, vc_data.softlimit, vc_data.maximum);
++}
++
++#ifdef	CONFIG_IA32_EMULATION
++
++int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_rlimit(vxi, vc_data.id,
++		vc_data.minimum, vc_data.softlimit, vc_data.maximum);
++}
++
++int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0_x32 vc_data;
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_get_rlimit(vxi, vc_data.id,
++		&vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++
++int vc_get_rlimit_mask(uint32_t id, void __user *data)
++{
++	if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
++		return -EFAULT;
++	return 0;
++}
++
++
++static inline void vx_reset_hits(struct _vx_limit *limit)
++{
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		atomic_set(&__rlim_lhit(limit, lim), 0);
++	}
++}
++
++int vc_reset_hits(struct vx_info *vxi, void __user *data)
++{
++	vx_reset_hits(&vxi->limit);
++	return 0;
++}
++
++static inline void vx_reset_minmax(struct _vx_limit *limit)
++{
++	rlim_t value;
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		value = __rlim_get(limit, lim);
++		__rlim_rmax(limit, lim) = value;
++		__rlim_rmin(limit, lim) = value;
++	}
++}
++
++int vc_reset_minmax(struct vx_info *vxi, void __user *data)
++{
++	vx_reset_minmax(&vxi->limit);
++	return 0;
++}
++
++
++int vc_rlimit_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_rlimit_stat_v0 vc_data;
++	struct _vx_limit *limit = &vxi->limit;
++	int id;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	id = vc_data.id;
++	if (!is_accounted_vlimit(id))
++		return -EINVAL;
++
++	vx_limit_fixup(limit, id);
++	vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
++	vc_data.value = __rlim_get(limit, id);
++	vc_data.minimum = __rlim_rmin(limit, id);
++	vc_data.maximum = __rlim_rmax(limit, id);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++void vx_vsi_meminfo(struct sysinfo *val)
++{
++#ifdef	CONFIG_MEMCG
++	struct mem_cgroup *mcg;
++	u64 res_limit, res_usage;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
++	if (!mcg)
++		goto out;
++
++	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++
++	if (res_limit != RESOURCE_MAX)
++		val->totalram = (res_limit >> PAGE_SHIFT);
++	val->freeram = val->totalram - (res_usage >> PAGE_SHIFT);
++	val->bufferram = 0;
++	val->totalhigh = 0;
++	val->freehigh = 0;
++out:
++#endif	/* CONFIG_MEMCG */
++	return;
++}
++
++void vx_vsi_swapinfo(struct sysinfo *val)
++{
++#ifdef	CONFIG_MEMCG
++#ifdef	CONFIG_MEMCG_SWAP
++	struct mem_cgroup *mcg;
++	u64 res_limit, res_usage, memsw_limit, memsw_usage;
++	s64 swap_limit, swap_usage;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
++	if (!mcg)
++		goto out;
++
++	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++	memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT);
++	memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE);
++
++	/* memory unlimited */
++	if (res_limit == RESOURCE_MAX)
++		goto out;
++
++	swap_limit = memsw_limit - res_limit;
++	/* we have a swap limit? */
++	if (memsw_limit != RESOURCE_MAX)
++		val->totalswap = swap_limit >> PAGE_SHIFT;
++
++	/* calculate swap part */
++	swap_usage = (memsw_usage > res_usage) ?
++		memsw_usage - res_usage : 0;
++
++	/* total shown minus usage gives free swap */
++	val->freeswap = (swap_usage < swap_limit) ?
++		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
++out:
++#else	/* !CONFIG_MEMCG_SWAP */
++	val->totalswap = 0;
++	val->freeswap = 0;
++#endif	/* !CONFIG_MEMCG_SWAP */
++#endif	/* CONFIG_MEMCG */
++	return;
++}
++
++long vx_vsi_cached(struct sysinfo *val)
++{
++	long cache = 0;
++#ifdef	CONFIG_MEMCG
++	struct mem_cgroup *mcg;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
++	if (!mcg)
++		goto out;
++
++	cache = mem_cgroup_stat_read_cache(mcg);
++out:
++#endif
++	return cache;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/limit_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_init.h
+--- linux-3.7.10/kernel/vserver/limit_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,31 @@
++
++
++static inline void vx_info_init_limit(struct _vx_limit *limit)
++{
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		__rlim_soft(limit, lim) = RLIM_INFINITY;
++		__rlim_hard(limit, lim) = RLIM_INFINITY;
++		__rlim_set(limit, lim, 0);
++		atomic_set(&__rlim_lhit(limit, lim), 0);
++		__rlim_rmin(limit, lim) = 0;
++		__rlim_rmax(limit, lim) = 0;
++	}
++}
++
++static inline void vx_info_exit_limit(struct _vx_limit *limit)
++{
++	rlim_t value;
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		if ((1 << lim) & VLIM_NOCHECK)
++			continue;
++		value = __rlim_get(limit, lim);
++		vxwprintk_xid(value,
++			"!!! limit: %p[%s,%d] = %ld on exit.",
++			limit, vlimit_name[lim], lim, (long)value);
++	}
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/limit_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_proc.h
+--- linux-3.7.10/kernel/vserver/limit_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,57 @@
++#ifndef _VX_LIMIT_PROC_H
++#define _VX_LIMIT_PROC_H
++
++#include <linux/vserver/limit_int.h>
++
++
++#define VX_LIMIT_FMT	":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
++#define VX_LIMIT_TOP	\
++	"Limit\t current\t     min/max\t\t    soft/hard\t\thits\n"
++
++#define VX_LIMIT_ARG(r)				\
++	(unsigned long)__rlim_get(limit, r),	\
++	(unsigned long)__rlim_rmin(limit, r),	\
++	(unsigned long)__rlim_rmax(limit, r),	\
++	VX_VLIM(__rlim_soft(limit, r)),		\
++	VX_VLIM(__rlim_hard(limit, r)),		\
++	atomic_read(&__rlim_lhit(limit, r))
++
++static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
++{
++	vx_limit_fixup(limit, -1);
++	return sprintf(buffer, VX_LIMIT_TOP
++		"PROC"	VX_LIMIT_FMT
++		"VM"	VX_LIMIT_FMT
++		"VML"	VX_LIMIT_FMT
++		"RSS"	VX_LIMIT_FMT
++		"ANON"	VX_LIMIT_FMT
++		"RMAP"	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
++		"SEMA"	VX_LIMIT_FMT
++		"SEMS"	VX_LIMIT_FMT
++		"DENT"	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(VLIMIT_MAPPED),
++		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),
++		VX_LIMIT_ARG(VLIMIT_SEMARY),
++		VX_LIMIT_ARG(VLIMIT_NSEMS),
++		VX_LIMIT_ARG(VLIMIT_DENTRY));
++}
++
++#endif	/* _VX_LIMIT_PROC_H */
++
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/network.c linux-3.7.10-vs2.3.5.6/kernel/vserver/network.c
+--- linux-3.7.10/kernel/vserver/network.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/network.c	2013-01-04 23:27:50.000000000 +0000
+@@ -0,0 +1,1053 @@
++/*
++ *  linux/kernel/vserver/network.c
++ *
++ *  Virtual Server: Network Support
++ *
++ *  Copyright (C) 2003-2007  Herbert Pötzl
++ *
++ *  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
++ *  V0.06  changed vcmds to nxi arg
++ *  V0.07  have __create claim() the nxi
++ *
++ */
++
++#include <linux/err.h>
++#include <linux/slab.h>
++#include <linux/rcupdate.h>
++#include <net/ipv6.h>
++
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/network_cmd.h>
++
++
++atomic_t nx_global_ctotal	= ATOMIC_INIT(0);
++atomic_t nx_global_cactive	= ATOMIC_INIT(0);
++
++static struct kmem_cache *nx_addr_v4_cachep = NULL;
++static struct kmem_cache *nx_addr_v6_cachep = NULL;
++
++
++static int __init init_network(void)
++{
++	nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache",
++		sizeof(struct nx_addr_v4), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache",
++		sizeof(struct nx_addr_v6), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	return 0;
++}
++
++
++/*	__alloc_nx_addr_v4()					*/
++
++static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void)
++{
++	struct nx_addr_v4 *nxa = kmem_cache_alloc(
++		nx_addr_v4_cachep, GFP_KERNEL);
++
++	if (!IS_ERR(nxa))
++		memset(nxa, 0, sizeof(*nxa));
++	return nxa;
++}
++
++/*	__dealloc_nx_addr_v4()					*/
++
++static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa)
++{
++	kmem_cache_free(nx_addr_v4_cachep, nxa);
++}
++
++/*	__dealloc_nx_addr_v4_all()				*/
++
++static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa)
++{
++	while (nxa) {
++		struct nx_addr_v4 *next = nxa->next;
++
++		__dealloc_nx_addr_v4(nxa);
++		nxa = next;
++	}
++}
++
++
++#ifdef CONFIG_IPV6
++
++/*	__alloc_nx_addr_v6()					*/
++
++static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void)
++{
++	struct nx_addr_v6 *nxa = kmem_cache_alloc(
++		nx_addr_v6_cachep, GFP_KERNEL);
++
++	if (!IS_ERR(nxa))
++		memset(nxa, 0, sizeof(*nxa));
++	return nxa;
++}
++
++/*	__dealloc_nx_addr_v6()					*/
++
++static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa)
++{
++	kmem_cache_free(nx_addr_v6_cachep, nxa);
++}
++
++/*	__dealloc_nx_addr_v6_all()				*/
++
++static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa)
++{
++	while (nxa) {
++		struct nx_addr_v6 *next = nxa->next;
++
++		__dealloc_nx_addr_v6(nxa);
++		nxa = next;
++	}
++}
++
++#endif	/* CONFIG_IPV6 */
++
++/*	__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);
++	spin_lock_init(&new->addr_lock);
++	new->nx_state = 0;
++
++	new->nx_flags = NXF_INIT_SET;
++
++	/* rest of init goes here */
++
++	new->v4_lback.s_addr = htonl(INADDR_LOOPBACK);
++	new->v4_bcast.s_addr = htonl(INADDR_BROADCAST);
++
++	vxdprintk(VXD_CBIT(nid, 0),
++		"alloc_nx_info(%d) = %p", nid, new);
++	atomic_inc(&nx_global_ctotal);
++	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));
++
++	__dealloc_nx_addr_v4_all(nxi->v4.next);
++#ifdef CONFIG_IPV6
++	__dealloc_nx_addr_v6_all(nxi->v6.next);
++#endif
++
++	nxi->nx_state |= NXS_RELEASED;
++	kfree(nxi);
++	atomic_dec(&nx_global_ctotal);
++}
++
++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_read(&nxi->nx_tasks));
++
++	__dealloc_nx_info(nxi);
++}
++
++
++void __nx_set_lback(struct nx_info *nxi)
++{
++	int nid = nxi->nx_id;
++	__be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
++
++	nxi->v4_lback.s_addr = lback;
++}
++
++extern int __nx_inet_add_lback(__be32 addr);
++extern int __nx_inet_del_lback(__be32 addr);
++
++
++/*	hash table for nx_info hash */
++
++#define NX_HASH_SIZE	13
++
++struct hlist_head nx_info_hash[NX_HASH_SIZE];
++
++static DEFINE_SPINLOCK(nx_info_hash_lock);
++
++
++static inline unsigned int __hashval(nid_t nid)
++{
++	return (nid % NX_HASH_SIZE);
++}
++
++
++
++/*	__hash_nx_info()
++
++	* add the nxi to the global hash table
++	* requires the hash_lock to be held			*/
++
++static inline void __hash_nx_info(struct nx_info *nxi)
++{
++	struct hlist_head *head;
++
++	vxd_assert_lock(&nx_info_hash_lock);
++	vxdprintk(VXD_CBIT(nid, 4),
++		"__hash_nx_info: %p[#%d]", nxi, nxi->nx_id);
++
++	/* context must not be hashed */
++	BUG_ON(nx_info_state(nxi, NXS_HASHED));
++
++	nxi->nx_state |= NXS_HASHED;
++	head = &nx_info_hash[__hashval(nxi->nx_id)];
++	hlist_add_head(&nxi->nx_hlist, head);
++	atomic_inc(&nx_global_cactive);
++}
++
++/*	__unhash_nx_info()
++
++	* remove the nxi from the global hash table
++	* requires the hash_lock to be held			*/
++
++static inline void __unhash_nx_info(struct nx_info *nxi)
++{
++	vxd_assert_lock(&nx_info_hash_lock);
++	vxdprintk(VXD_CBIT(nid, 4),
++		"__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
++		atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
++
++	/* context must be hashed */
++	BUG_ON(!nx_info_state(nxi, NXS_HASHED));
++	/* but without tasks */
++	BUG_ON(atomic_read(&nxi->nx_tasks));
++
++	nxi->nx_state &= ~NXS_HASHED;
++	hlist_del(&nxi->nx_hlist);
++	atomic_dec(&nx_global_cactive);
++}
++
++
++/*	__lookup_nx_info()
++
++	* requires the hash_lock to be held
++	* doesn't increment the nx_refcnt			*/
++
++static inline struct nx_info *__lookup_nx_info(nid_t nid)
++{
++	struct hlist_head *head = &nx_info_hash[__hashval(nid)];
++	struct hlist_node *pos;
++	struct nx_info *nxi;
++
++	vxd_assert_lock(&nx_info_hash_lock);
++	hlist_for_each(pos, head) {
++		nxi = hlist_entry(pos, struct nx_info, nx_hlist);
++
++		if (nxi->nx_id == nid)
++			goto found;
++	}
++	nxi = NULL;
++found:
++	vxdprintk(VXD_CBIT(nid, 0),
++		"__lookup_nx_info(#%u): %p[#%u]",
++		nid, nxi, nxi ? nxi->nx_id : 0);
++	return nxi;
++}
++
++
++/*	__create_nx_info()
++
++	* create the requested context
++	* get(), claim() and hash it				*/
++
++static struct nx_info *__create_nx_info(int id)
++{
++	struct nx_info *new, *nxi = NULL;
++
++	vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id);
++
++	if (!(new = __alloc_nx_info(id)))
++		return ERR_PTR(-ENOMEM);
++
++	/* required to make dynamic xids unique */
++	spin_lock(&nx_info_hash_lock);
++
++	/* static context requested */
++	if ((nxi = __lookup_nx_info(id))) {
++		vxdprintk(VXD_CBIT(nid, 0),
++			"create_nx_info(%d) = %p (already there)", id, nxi);
++		if (nx_info_flags(nxi, NXF_STATE_SETUP, 0))
++			nxi = ERR_PTR(-EBUSY);
++		else
++			nxi = ERR_PTR(-EEXIST);
++		goto out_unlock;
++	}
++	/* new context */
++	vxdprintk(VXD_CBIT(nid, 0),
++		"create_nx_info(%d) = %p (new)", id, new);
++	claim_nx_info(new, NULL);
++	__nx_set_lback(new);
++	__hash_nx_info(get_nx_info(new));
++	nxi = new, new = NULL;
++
++out_unlock:
++	spin_unlock(&nx_info_hash_lock);
++	if (new)
++		__dealloc_nx_info(new);
++	return nxi;
++}
++
++
++
++/*	exported stuff						*/
++
++
++void unhash_nx_info(struct nx_info *nxi)
++{
++	__shutdown_nx_info(nxi);
++	spin_lock(&nx_info_hash_lock);
++	__unhash_nx_info(nxi);
++	spin_unlock(&nx_info_hash_lock);
++}
++
++/*	lookup_nx_info()
++
++	* search for a nx_info and get() it
++	* negative id means current				*/
++
++struct nx_info *lookup_nx_info(int id)
++{
++	struct nx_info *nxi = NULL;
++
++	if (id < 0) {
++		nxi = get_nx_info(current_nx_info());
++	} else if (id > 1) {
++		spin_lock(&nx_info_hash_lock);
++		nxi = get_nx_info(__lookup_nx_info(id));
++		spin_unlock(&nx_info_hash_lock);
++	}
++	return nxi;
++}
++
++/*	nid_is_hashed()
++
++	* verify that nid is still hashed			*/
++
++int nid_is_hashed(nid_t nid)
++{
++	int hashed;
++
++	spin_lock(&nx_info_hash_lock);
++	hashed = (__lookup_nx_info(nid) != NULL);
++	spin_unlock(&nx_info_hash_lock);
++	return hashed;
++}
++
++
++#ifdef	CONFIG_PROC_FS
++
++/*	get_nid_list()
++
++	* get a subset of hashed nids for proc
++	* assumes size is at least one				*/
++
++int get_nid_list(int index, unsigned int *nids, int size)
++{
++	int hindex, nr_nids = 0;
++
++	/* only show current and children */
++	if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
++		if (index > 0)
++			return 0;
++		nids[nr_nids] = nx_current_nid();
++		return 1;
++	}
++
++	for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) {
++		struct hlist_head *head = &nx_info_hash[hindex];
++		struct hlist_node *pos;
++
++		spin_lock(&nx_info_hash_lock);
++		hlist_for_each(pos, head) {
++			struct nx_info *nxi;
++
++			if (--index > 0)
++				continue;
++
++			nxi = hlist_entry(pos, struct nx_info, nx_hlist);
++			nids[nr_nids] = nxi->nx_id;
++			if (++nr_nids >= size) {
++				spin_unlock(&nx_info_hash_lock);
++				goto out;
++			}
++		}
++		/* keep the lock time short */
++		spin_unlock(&nx_info_hash_lock);
++	}
++out:
++	return nr_nids;
++}
++#endif
++
++
++/*
++ *	migrate task to new network
++ *	gets nxi, puts old_nxi on change
++ */
++
++int nx_migrate_task(struct task_struct *p, struct nx_info *nxi)
++{
++	struct nx_info *old_nxi;
++	int ret = 0;
++
++	if (!p || !nxi)
++		BUG();
++
++	vxdprintk(VXD_CBIT(nid, 5),
++		"nx_migrate_task(%p,%p[#%d.%d.%d])",
++		p, nxi, nxi->nx_id,
++		atomic_read(&nxi->nx_usecnt),
++		atomic_read(&nxi->nx_tasks));
++
++	if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) &&
++		!nx_info_flags(nxi, NXF_STATE_SETUP, 0))
++		return -EACCES;
++
++	if (nx_info_state(nxi, NXS_SHUTDOWN))
++		return -EFAULT;
++
++	/* maybe disallow this completely? */
++	old_nxi = task_get_nx_info(p);
++	if (old_nxi == nxi)
++		goto out;
++
++	task_lock(p);
++	if (old_nxi)
++		clr_nx_info(&p->nx_info);
++	claim_nx_info(nxi, p);
++	set_nx_info(&p->nx_info, nxi);
++	p->nid = nxi->nx_id;
++	task_unlock(p);
++
++	vxdprintk(VXD_CBIT(nid, 5),
++		"moved task %p into nxi:%p[#%d]",
++		p, nxi, nxi->nx_id);
++
++	if (old_nxi)
++		release_nx_info(old_nxi, p);
++	ret = 0;
++out:
++	put_nx_info(old_nxi);
++	return ret;
++}
++
++
++void nx_set_persistent(struct nx_info *nxi)
++{
++	vxdprintk(VXD_CBIT(nid, 6),
++		"nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
++
++	get_nx_info(nxi);
++	claim_nx_info(nxi, NULL);
++}
++
++void nx_clear_persistent(struct nx_info *nxi)
++{
++	vxdprintk(VXD_CBIT(nid, 6),
++		"nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
++
++	release_nx_info(nxi, NULL);
++	put_nx_info(nxi);
++}
++
++void nx_update_persistent(struct nx_info *nxi)
++{
++	if (nx_info_flags(nxi, NXF_PERSISTENT, 0))
++		nx_set_persistent(nxi);
++	else
++		nx_clear_persistent(nxi);
++}
++
++/* vserver syscall commands below here */
++
++/* taks nid and nx_info functions */
++
++#include <asm/uaccess.h>
++
++
++int vc_task_nid(uint32_t id)
++{
++	nid_t nid;
++
++	if (id) {
++		struct task_struct *tsk;
++
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		nid = (tsk) ? tsk->nid : -ESRCH;
++		rcu_read_unlock();
++	} else
++		nid = nx_current_nid();
++	return nid;
++}
++
++
++int vc_nx_info(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_nx_info_v0 vc_data;
++
++	vc_data.nid = nxi->nx_id;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++/* network functions */
++
++int vc_net_create(uint32_t nid, void __user *data)
++{
++	struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET };
++	struct nx_info *new_nxi;
++	int ret;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if ((nid > MAX_S_CONTEXT) || (nid < 2))
++		return -EINVAL;
++
++	new_nxi = __create_nx_info(nid);
++	if (IS_ERR(new_nxi))
++		return PTR_ERR(new_nxi);
++
++	/* initial flags */
++	new_nxi->nx_flags = vc_data.flagword;
++
++	ret = -ENOEXEC;
++	if (vs_net_change(new_nxi, VSC_NETUP))
++		goto out;
++
++	ret = nx_migrate_task(current, new_nxi);
++	if (ret)
++		goto out;
++
++	/* return context id on success */
++	ret = new_nxi->nx_id;
++
++	/* get a reference for persistent contexts */
++	if ((vc_data.flagword & NXF_PERSISTENT))
++		nx_set_persistent(new_nxi);
++out:
++	release_nx_info(new_nxi, NULL);
++	put_nx_info(new_nxi);
++	return ret;
++}
++
++
++int vc_net_migrate(struct nx_info *nxi, void __user *data)
++{
++	return nx_migrate_task(current, nxi);
++}
++
++
++static inline
++struct nx_addr_v4 *__find_v4_addr(struct nx_info *nxi,
++	__be32 ip, __be32 ip2, __be32 mask, uint16_t type, uint16_t flags,
++	struct nx_addr_v4 **prev)
++{
++	struct nx_addr_v4 *nxa = &nxi->v4;
++
++	for (; nxa; nxa = nxa->next) {
++		if ((nxa->ip[0].s_addr == ip) &&
++		    (nxa->ip[1].s_addr == ip2) &&
++		    (nxa->mask.s_addr == mask) &&
++		    (nxa->type == type) &&
++		    (nxa->flags == flags))
++		    return nxa;
++
++		/* save previous entry */
++		if (prev)
++			*prev = nxa;
++	}
++	return NULL;
++}
++
++int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
++	uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v4 *nxa = NULL;
++	struct nx_addr_v4 *new = __alloc_nx_addr_v4();
++	unsigned long irqflags;
++	int ret = -EEXIST;
++
++	if (IS_ERR(new))
++		return PTR_ERR(new);
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa))
++		goto out_unlock;
++
++	if (NX_IPV4(nxi)) {
++		nxa->next = new;
++		nxa = new;
++		new = NULL;
++
++		/* remove single ip for ip list */
++		nxi->nx_flags &= ~NXF_SINGLE_IP;
++	}
++
++	nxa->ip[0].s_addr = ip;
++	nxa->ip[1].s_addr = ip2;
++	nxa->mask.s_addr = mask;
++	nxa->type = type;
++	nxa->flags = flags;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	if (new)
++		__dealloc_nx_addr_v4(new);
++	return ret;
++}
++
++int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
++	uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v4 *nxa = NULL;
++	struct nx_addr_v4 *old = NULL;
++	unsigned long irqflags;
++	int ret = 0;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	switch (type) {
++	case NXA_TYPE_ADDR:
++		old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa);
++		if (old) {
++			if (nxa) {
++				nxa->next = old->next;
++				old->next = NULL;
++			} else {
++				if (old->next) {
++					nxa = old;
++					old = old->next;
++					*nxa = *old;
++					old->next = NULL;
++				} else {
++					memset(old, 0, sizeof(*old));
++					old = NULL;
++				}
++			}
++		} else
++			ret = -ESRCH;
++		break;
++
++	case NXA_TYPE_ANY:
++		nxa = &nxi->v4;
++		old = nxa->next;
++		memset(nxa, 0, sizeof(*nxa));
++		break;
++
++	default:
++		ret = -EINVAL;
++	}
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	__dealloc_nx_addr_v4_all(old);
++	return ret;
++}
++
++
++int vc_net_add(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_v0 vc_data;
++	int index, ret = 0;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_IPV4:
++		if ((vc_data.count < 1) || (vc_data.count > 4))
++			return -EINVAL;
++
++		index = 0;
++		while (index < vc_data.count) {
++			ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0,
++				vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0);
++			if (ret)
++				return ret;
++			index++;
++		}
++		ret = index;
++		break;
++
++	case NXA_TYPE_IPV4|NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip[0];
++		ret = 1;
++		break;
++
++	case NXA_TYPE_IPV4|NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip[0];
++		ret = 1;
++		break;
++
++	default:
++		ret = -EINVAL;
++		break;
++	}
++	return ret;
++}
++
++int vc_net_remove(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_v0 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ANY:
++		return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0);
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++
++int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++	case NXA_TYPE_MASK:
++		return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0,
++			vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++	case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip;
++		break;
++
++	case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip;
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_add_ipv4(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v2 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++	case NXA_TYPE_MASK:
++	case NXA_TYPE_RANGE:
++		return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
++			vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++	case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip;
++		break;
++
++	case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip;
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0,
++		vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++}
++
++int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v2 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
++		vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++}
++
++#ifdef CONFIG_IPV6
++
++static inline
++struct nx_addr_v6 *__find_v6_addr(struct nx_info *nxi,
++	struct in6_addr *ip, struct in6_addr *mask,
++	uint32_t prefix, uint16_t type, uint16_t flags,
++	struct nx_addr_v6 **prev)
++{
++	struct nx_addr_v6 *nxa = &nxi->v6;
++
++	for (; nxa; nxa = nxa->next) {
++		if (ipv6_addr_equal(&nxa->ip, ip) &&
++		    ipv6_addr_equal(&nxa->mask, mask) &&
++		    (nxa->prefix == prefix) &&
++		    (nxa->type == type) &&
++		    (nxa->flags == flags))
++		    return nxa;
++
++		/* save previous entry */
++		if (prev)
++			*prev = nxa;
++	}
++	return NULL;
++}
++
++
++int do_add_v6_addr(struct nx_info *nxi,
++	struct in6_addr *ip, struct in6_addr *mask,
++	uint32_t prefix, uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v6 *nxa = NULL;
++	struct nx_addr_v6 *new = __alloc_nx_addr_v6();
++	unsigned long irqflags;
++	int ret = -EEXIST;
++
++	if (IS_ERR(new))
++		return PTR_ERR(new);
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa))
++		goto out_unlock;
++
++	if (NX_IPV6(nxi)) {
++		nxa->next = new;
++		nxa = new;
++		new = NULL;
++	}
++
++	nxa->ip = *ip;
++	nxa->mask = *mask;
++	nxa->prefix = prefix;
++	nxa->type = type;
++	nxa->flags = flags;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	if (new)
++		__dealloc_nx_addr_v6(new);
++	return ret;
++}
++
++int do_remove_v6_addr(struct nx_info *nxi,
++	struct in6_addr *ip, struct in6_addr *mask,
++	uint32_t prefix, uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v6 *nxa = NULL;
++	struct nx_addr_v6 *old = NULL;
++	unsigned long irqflags;
++	int ret = 0;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	switch (type) {
++	case NXA_TYPE_ADDR:
++		old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa);
++		if (old) {
++			if (nxa) {
++				nxa->next = old->next;
++				old->next = NULL;
++			} else {
++				if (old->next) {
++					nxa = old;
++					old = old->next;
++					*nxa = *old;
++					old->next = NULL;
++				} else {
++					memset(old, 0, sizeof(*old));
++					old = NULL;
++				}
++			}
++		} else
++			ret = -ESRCH;
++		break;
++
++	case NXA_TYPE_ANY:
++		nxa = &nxi->v6;
++		old = nxa->next;
++		memset(nxa, 0, sizeof(*nxa));
++		break;
++
++	default:
++		ret = -EINVAL;
++	}
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	__dealloc_nx_addr_v6_all(old);
++	return ret;
++}
++
++int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv6_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++		memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++		/* fallthrough */
++	case NXA_TYPE_MASK:
++		return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++			vc_data.prefix, vc_data.type, vc_data.flags);
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv6_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++		memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++		/* fallthrough */
++	case NXA_TYPE_MASK:
++		return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++			vc_data.prefix, vc_data.type, vc_data.flags);
++	case NXA_TYPE_ANY:
++		return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0);
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++#endif	/* CONFIG_IPV6 */
++
++
++int vc_get_nflags(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_flags_v0 vc_data;
++
++	vc_data.flagword = nxi->nx_flags;
++
++	/* special STATE flag handling */
++	vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_nflags(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_flags_v0 vc_data;
++	uint64_t mask, trigger;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special STATE flag handling */
++	mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
++	trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword);
++
++	nxi->nx_flags = vs_mask_flags(nxi->nx_flags,
++		vc_data.flagword, mask);
++	if (trigger & NXF_PERSISTENT)
++		nx_update_persistent(nxi);
++
++	return 0;
++}
++
++int vc_get_ncaps(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_caps_v0 vc_data;
++
++	vc_data.ncaps = nxi->nx_ncaps;
++	vc_data.cmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_ncaps(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_caps_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
++		vc_data.ncaps, vc_data.cmask);
++	return 0;
++}
++
++
++#include <linux/module.h>
++
++module_init(init_network);
++
++EXPORT_SYMBOL_GPL(free_nx_info);
++EXPORT_SYMBOL_GPL(unhash_nx_info);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/proc.c linux-3.7.10-vs2.3.5.6/kernel/vserver/proc.c
+--- linux-3.7.10/kernel/vserver/proc.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/proc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,1110 @@
++/*
++ *  linux/kernel/vserver/proc.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *  V0.02  adaptation vs1.3.0
++ *  V0.03  proc permissions
++ *  V0.04  locking/generic
++ *  V0.05  next generation procfs
++ *  V0.06  inode validation
++ *  V0.07  generic rewrite vid
++ *  V0.08  remove inode type
++ *  V0.09  added u/wmask info
++ *
++ */
++
++#include <linux/proc_fs.h>
++#include <linux/fs_struct.h>
++#include <linux/mount.h>
++#include <linux/namei.h>
++#include <asm/unistd.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_cvirt.h>
++
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
++
++#include <linux/vserver/global.h>
++
++#include "cvirt_proc.h"
++#include "cacct_proc.h"
++#include "limit_proc.h"
++#include "sched_proc.h"
++#include "vci_config.h"
++
++
++static inline char *print_cap_t(char *buffer, kernel_cap_t *c)
++{
++	unsigned __capi;
++
++	CAP_FOR_EACH_U32(__capi) {
++		buffer += sprintf(buffer, "%08x",
++			c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]);
++	}
++	return buffer;
++}
++
++
++static struct proc_dir_entry *proc_virtual;
++
++static struct proc_dir_entry *proc_virtnet;
++
++
++/* first the actual feeds */
++
++
++static int proc_vci(char *buffer)
++{
++	return sprintf(buffer,
++		"VCIVersion:\t%04x:%04x\n"
++		"VCISyscall:\t%d\n"
++		"VCIKernel:\t%08x\n",
++		VCI_VERSION >> 16,
++		VCI_VERSION & 0xFFFF,
++		__NR_vserver,
++		vci_kernel_config());
++}
++
++static int proc_virtual_info(char *buffer)
++{
++	return proc_vci(buffer);
++}
++
++static int proc_virtual_status(char *buffer)
++{
++	return sprintf(buffer,
++		"#CTotal:\t%d\n"
++		"#CActive:\t%d\n"
++		"#NSProxy:\t%d\t%d %d %d %d %d %d\n"
++		"#InitTask:\t%d\t%d %d\n",
++		atomic_read(&vx_global_ctotal),
++		atomic_read(&vx_global_cactive),
++		atomic_read(&vs_global_nsproxy),
++		atomic_read(&vs_global_fs),
++		atomic_read(&vs_global_mnt_ns),
++		atomic_read(&vs_global_uts_ns),
++		atomic_read(&nr_ipc_ns),
++		atomic_read(&vs_global_user_ns),
++		atomic_read(&vs_global_pid_ns),
++		atomic_read(&init_task.usage),
++		atomic_read(&init_task.nsproxy->count),
++		init_task.fs->users);
++}
++
++
++int proc_vxi_info(struct vx_info *vxi, char *buffer)
++{
++	int length;
++
++	length = sprintf(buffer,
++		"ID:\t%d\n"
++		"Info:\t%p\n"
++		"Init:\t%d\n"
++		"OOM:\t%lld\n",
++		vxi->vx_id,
++		vxi,
++		vxi->vx_initpid,
++		vxi->vx_badness_bias);
++	return length;
++}
++
++int proc_vxi_status(struct vx_info *vxi, char *buffer)
++{
++	char *orig = buffer;
++
++	buffer += sprintf(buffer,
++		"UseCnt:\t%d\n"
++		"Tasks:\t%d\n"
++		"Flags:\t%016llx\n",
++		atomic_read(&vxi->vx_usecnt),
++		atomic_read(&vxi->vx_tasks),
++		(unsigned long long)vxi->vx_flags);
++
++	buffer += sprintf(buffer, "BCaps:\t");
++	buffer = print_cap_t(buffer, &vxi->vx_bcaps);
++	buffer += sprintf(buffer, "\n");
++
++	buffer += sprintf(buffer,
++		"CCaps:\t%016llx\n"
++		"Umask:\t%16llx\n"
++		"Wmask:\t%16llx\n"
++		"Spaces:\t%08lx %08lx\n",
++		(unsigned long long)vxi->vx_ccaps,
++		(unsigned long long)vxi->vx_umask,
++		(unsigned long long)vxi->vx_wmask,
++		vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
++	return buffer - orig;
++}
++
++int proc_vxi_limit(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_limit(&vxi->limit, buffer);
++}
++
++int proc_vxi_sched(struct vx_info *vxi, char *buffer)
++{
++	int cpu, length;
++
++	length = vx_info_proc_sched(&vxi->sched, buffer);
++	for_each_online_cpu(cpu) {
++		length += vx_info_proc_sched_pc(
++			&vx_per_cpu(vxi, sched_pc, cpu),
++			buffer + length, cpu);
++	}
++	return length;
++}
++
++int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer);
++}
++
++int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer);
++}
++
++int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
++{
++	int cpu, length;
++
++	vx_update_load(vxi);
++	length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
++	for_each_online_cpu(cpu) {
++		length += vx_info_proc_cvirt_pc(
++			&vx_per_cpu(vxi, cvirt_pc, cpu),
++			buffer + length, cpu);
++	}
++	return length;
++}
++
++int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_cacct(&vxi->cacct, buffer);
++}
++
++
++static int proc_virtnet_info(char *buffer)
++{
++	return proc_vci(buffer);
++}
++
++static int proc_virtnet_status(char *buffer)
++{
++	return sprintf(buffer,
++		"#CTotal:\t%d\n"
++		"#CActive:\t%d\n",
++		atomic_read(&nx_global_ctotal),
++		atomic_read(&nx_global_cactive));
++}
++
++int proc_nxi_info(struct nx_info *nxi, char *buffer)
++{
++	struct nx_addr_v4 *v4a;
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 *v6a;
++#endif
++	int length, i;
++
++	length = sprintf(buffer,
++		"ID:\t%d\n"
++		"Info:\t%p\n"
++		"Bcast:\t" NIPQUAD_FMT "\n"
++		"Lback:\t" NIPQUAD_FMT "\n",
++		nxi->nx_id,
++		nxi,
++		NIPQUAD(nxi->v4_bcast.s_addr),
++		NIPQUAD(nxi->v4_lback.s_addr));
++
++	if (!NX_IPV4(nxi))
++		goto skip_v4;
++	for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++		length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n",
++			i, NXAV4(v4a));
++skip_v4:
++#ifdef	CONFIG_IPV6
++	if (!NX_IPV6(nxi))
++		goto skip_v6;
++	for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++		length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n",
++			i, NXAV6(v6a));
++skip_v6:
++#endif
++	return length;
++}
++
++int proc_nxi_status(struct nx_info *nxi, char *buffer)
++{
++	int length;
++
++	length = sprintf(buffer,
++		"UseCnt:\t%d\n"
++		"Tasks:\t%d\n"
++		"Flags:\t%016llx\n"
++		"NCaps:\t%016llx\n",
++		atomic_read(&nxi->nx_usecnt),
++		atomic_read(&nxi->nx_tasks),
++		(unsigned long long)nxi->nx_flags,
++		(unsigned long long)nxi->nx_ncaps);
++	return length;
++}
++
++
++
++/* here the inode helpers */
++
++struct vs_entry {
++	int len;
++	char *name;
++	mode_t mode;
++	struct inode_operations *iop;
++	struct file_operations *fop;
++	union proc_op op;
++};
++
++static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p)
++{
++	struct inode *inode = new_inode(sb);
++
++	if (!inode)
++		goto out;
++
++	inode->i_mode = p->mode;
++	if (p->iop)
++		inode->i_op = p->iop;
++	if (p->fop)
++		inode->i_fop = p->fop;
++
++	set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1);
++	inode->i_flags |= S_IMMUTABLE;
++
++	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
++
++	inode->i_uid = 0;
++	inode->i_gid = 0;
++	inode->i_tag = 0;
++out:
++	return inode;
++}
++
++static struct dentry *vs_proc_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	struct vs_entry *p = ptr;
++	struct inode *inode = vs_proc_make_inode(dir->i_sb, p);
++	struct dentry *error = ERR_PTR(-EINVAL);
++
++	if (!inode)
++		goto out;
++
++	PROC_I(inode)->op = p->op;
++	PROC_I(inode)->fd = id;
++	d_add(dentry, inode);
++	error = NULL;
++out:
++	return error;
++}
++
++/* Lookups */
++
++typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *);
++
++/*
++ * Fill a directory entry.
++ *
++ * If possible create the dcache entry and derive our inode number and
++ * file type from dcache entry.
++ *
++ * Since all of the proc inode numbers are dynamically generated, the inode
++ * numbers do not exist until the inode is cache.  This means creating the
++ * the dcache entry in readdir is necessary to keep the inode numbers
++ * reported by readdir in sync with the inode numbers reported
++ * by stat.
++ */
++static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
++	char *name, int len, instantiate_t instantiate, int id, void *ptr)
++{
++	struct dentry *child, *dir = filp->f_dentry;
++	struct inode *inode;
++	struct qstr qname;
++	ino_t ino = 0;
++	unsigned type = DT_UNKNOWN;
++
++	qname.name = name;
++	qname.len  = len;
++	qname.hash = full_name_hash(name, len);
++
++	child = d_lookup(dir, &qname);
++	if (!child) {
++		struct dentry *new;
++		new = d_alloc(dir, &qname);
++		if (new) {
++			child = instantiate(dir->d_inode, new, id, ptr);
++			if (child)
++				dput(new);
++			else
++				child = new;
++		}
++	}
++	if (!child || IS_ERR(child) || !child->d_inode)
++		goto end_instantiate;
++	inode = child->d_inode;
++	if (inode) {
++		ino = inode->i_ino;
++		type = inode->i_mode >> 12;
++	}
++	dput(child);
++end_instantiate:
++	if (!ino)
++		ino = find_inode_number(dir, &qname);
++	if (!ino)
++		ino = 1;
++	return filldir(dirent, name, len, filp->f_pos, ino, type);
++}
++
++
++
++/* get and revalidate vx_info/xid */
++
++static inline
++struct vx_info *get_proc_vx_info(struct inode *inode)
++{
++	return lookup_vx_info(PROC_I(inode)->fd);
++}
++
++static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
++{
++	struct inode *inode = dentry->d_inode;
++	xid_t xid = PROC_I(inode)->fd;
++
++	if (flags & LOOKUP_RCU)	/* FIXME: can be dropped? */
++		return -ECHILD;
++
++	if (!xid || xid_is_hashed(xid))
++		return 1;
++	d_drop(dentry);
++	return 0;
++}
++
++
++/* get and revalidate nx_info/nid */
++
++static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
++{
++	struct inode *inode = dentry->d_inode;
++	nid_t nid = PROC_I(inode)->fd;
++
++	if (flags & LOOKUP_RCU)	/* FIXME: can be dropped? */
++		return -ECHILD;
++
++	if (!nid || nid_is_hashed(nid))
++		return 1;
++	d_drop(dentry);
++	return 0;
++}
++
++
++
++#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
++
++static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(PROC_I(inode)->fd);
++
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		return -ENOMEM;
++
++	BUG_ON(!PROC_I(inode)->op.proc_vs_read);
++	length = PROC_I(inode)->op.proc_vs_read((char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++	return length;
++}
++
++static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	struct vx_info *vxi = NULL;
++	xid_t xid = PROC_I(inode)->fd;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(!xid);
++	vxi = lookup_vx_info(xid);
++	if (!vxi)
++		goto out;
++
++	length = -ENOMEM;
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		goto out_put;
++
++	BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
++	length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++out_put:
++	put_vx_info(vxi);
++out:
++	return length;
++}
++
++static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	struct nx_info *nxi = NULL;
++	nid_t nid = PROC_I(inode)->fd;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(!nid);
++	nxi = lookup_nx_info(nid);
++	if (!nxi)
++		goto out;
++
++	length = -ENOMEM;
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		goto out_put;
++
++	BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
++	length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++out_put:
++	put_nx_info(nxi);
++out:
++	return length;
++}
++
++
++
++/* here comes the lower level */
++
++
++#define NOD(NAME, MODE, IOP, FOP, OP) {	\
++	.len  = sizeof(NAME) - 1,	\
++	.name = (NAME),			\
++	.mode = MODE,			\
++	.iop  = IOP,			\
++	.fop  = FOP,			\
++	.op   = OP,			\
++}
++
++
++#define DIR(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFDIR | (MODE)),			\
++		&proc_ ## OTYPE ## _inode_operations,	\
++		&proc_ ## OTYPE ## _file_operations, { } )
++
++#define INF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_vs_info_file_operations,		\
++		{ .proc_vs_read = &proc_##OTYPE } )
++
++#define VINF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_vx_info_file_operations,		\
++		{ .proc_vxi_read = &proc_##OTYPE } )
++
++#define NINF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_nx_info_file_operations,		\
++		{ .proc_nxi_read = &proc_##OTYPE } )
++
++
++static struct file_operations proc_vs_info_file_operations = {
++	.read =		proc_vs_info_read,
++};
++
++static struct file_operations proc_vx_info_file_operations = {
++	.read =		proc_vx_info_read,
++};
++
++static struct dentry_operations proc_xid_dentry_operations = {
++	.d_revalidate =	proc_xid_revalidate,
++};
++
++static struct vs_entry vx_base_stuff[] = {
++	VINF("info",	S_IRUGO, vxi_info),
++	VINF("status",	S_IRUGO, vxi_status),
++	VINF("limit",	S_IRUGO, vxi_limit),
++	VINF("sched",	S_IRUGO, vxi_sched),
++	VINF("nsproxy",	S_IRUGO, vxi_nsproxy0),
++	VINF("nsproxy1",S_IRUGO, vxi_nsproxy1),
++	VINF("cvirt",	S_IRUGO, vxi_cvirt),
++	VINF("cacct",	S_IRUGO, vxi_cacct),
++	{}
++};
++
++
++
++
++static struct dentry *proc_xid_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	dentry->d_op = &proc_xid_dentry_operations;
++	return vs_proc_instantiate(dir, dentry, id, ptr);
++}
++
++static struct dentry *proc_xid_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = vx_base_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (!p->name)
++		goto out;
++
++	error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
++out:
++	return error;
++}
++
++static int proc_xid_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = vx_base_stuff;
++	int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto out;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, PROC_I(inode)->fd, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 1;
++}
++
++
++
++static struct file_operations proc_nx_info_file_operations = {
++	.read =		proc_nx_info_read,
++};
++
++static struct dentry_operations proc_nid_dentry_operations = {
++	.d_revalidate =	proc_nid_revalidate,
++};
++
++static struct vs_entry nx_base_stuff[] = {
++	NINF("info",	S_IRUGO, nxi_info),
++	NINF("status",	S_IRUGO, nxi_status),
++	{}
++};
++
++
++static struct dentry *proc_nid_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	dentry->d_op = &proc_nid_dentry_operations;
++	return vs_proc_instantiate(dir, dentry, id, ptr);
++}
++
++static struct dentry *proc_nid_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = nx_base_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (!p->name)
++		goto out;
++
++	error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
++out:
++	return error;
++}
++
++static int proc_nid_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = nx_base_stuff;
++	int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto out;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, PROC_I(inode)->fd, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 1;
++}
++
++
++#define MAX_MULBY10	((~0U - 9) / 10)
++
++static inline int atovid(const char *str, int len)
++{
++	int vid, c;
++
++	vid = 0;
++	while (len-- > 0) {
++		c = *str - '0';
++		str++;
++		if (c > 9)
++			return -1;
++		if (vid >= MAX_MULBY10)
++			return -1;
++		vid *= 10;
++		vid += c;
++		if (!vid)
++			return -1;
++	}
++	return vid;
++}
++
++/* now the upper level (virtual) */
++
++
++static struct file_operations proc_xid_file_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_xid_readdir,
++};
++
++static struct inode_operations proc_xid_inode_operations = {
++	.lookup =	proc_xid_lookup,
++};
++
++static struct vs_entry vx_virtual_stuff[] = {
++	INF("info",	S_IRUGO, virtual_info),
++	INF("status",	S_IRUGO, virtual_status),
++	DIR(NULL,	S_IRUGO | S_IXUGO, xid),
++};
++
++
++static struct dentry *proc_virtual_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = vx_virtual_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++	int id = 0;
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (p->name)
++		goto instantiate;
++
++	id = atovid(dentry->d_name.name, dentry->d_name.len);
++	if ((id < 0) || !xid_is_hashed(id))
++		goto out;
++
++instantiate:
++	error = proc_xid_instantiate(dir, dentry, id, p);
++out:
++	return error;
++}
++
++static struct file_operations proc_nid_file_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_nid_readdir,
++};
++
++static struct inode_operations proc_nid_inode_operations = {
++	.lookup =	proc_nid_lookup,
++};
++
++static struct vs_entry nx_virtnet_stuff[] = {
++	INF("info",	S_IRUGO, virtnet_info),
++	INF("status",	S_IRUGO, virtnet_status),
++	DIR(NULL,	S_IRUGO | S_IXUGO, nid),
++};
++
++
++static struct dentry *proc_virtnet_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = nx_virtnet_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++	int id = 0;
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (p->name)
++		goto instantiate;
++
++	id = atovid(dentry->d_name.name, dentry->d_name.len);
++	if ((id < 0) || !nid_is_hashed(id))
++		goto out;
++
++instantiate:
++	error = proc_nid_instantiate(dir, dentry, id, p);
++out:
++	return error;
++}
++
++
++#define PROC_MAXVIDS 32
++
++int proc_virtual_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = vx_virtual_stuff;
++	int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	unsigned int xid_array[PROC_MAXVIDS];
++	char buf[PROC_NUMBUF];
++	unsigned int nr_xids, i;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto entries;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, 0, p))
++				goto out;
++			pos++;
++		}
++	entries:
++		index = pos - size;
++		p = &vx_virtual_stuff[size - 1];
++		nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
++		for (i = 0; i < nr_xids; i++) {
++			int n, xid = xid_array[i];
++			unsigned int j = PROC_NUMBUF;
++
++			n = xid;
++			do
++				buf[--j] = '0' + (n % 10);
++			while (n /= 10);
++
++			if (proc_fill_cache(filp, dirent, filldir,
++				buf + j, PROC_NUMBUF - j,
++				vs_proc_instantiate, xid, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 0;
++}
++
++static int proc_virtual_getattr(struct vfsmount *mnt,
++	struct dentry *dentry, struct kstat *stat)
++{
++	struct inode *inode = dentry->d_inode;
++
++	generic_fillattr(inode, stat);
++	stat->nlink = 2 + atomic_read(&vx_global_cactive);
++	return 0;
++}
++
++static struct file_operations proc_virtual_dir_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_virtual_readdir,
++};
++
++static struct inode_operations proc_virtual_dir_inode_operations = {
++	.getattr =	proc_virtual_getattr,
++	.lookup =	proc_virtual_lookup,
++};
++
++
++
++
++
++int proc_virtnet_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = nx_virtnet_stuff;
++	int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	unsigned int nid_array[PROC_MAXVIDS];
++	char buf[PROC_NUMBUF];
++	unsigned int nr_nids, i;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto entries;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, 0, p))
++				goto out;
++			pos++;
++		}
++	entries:
++		index = pos - size;
++		p = &nx_virtnet_stuff[size - 1];
++		nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
++		for (i = 0; i < nr_nids; i++) {
++			int n, nid = nid_array[i];
++			unsigned int j = PROC_NUMBUF;
++
++			n = nid;
++			do
++				buf[--j] = '0' + (n % 10);
++			while (n /= 10);
++
++			if (proc_fill_cache(filp, dirent, filldir,
++				buf + j, PROC_NUMBUF - j,
++				vs_proc_instantiate, nid, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 0;
++}
++
++static int proc_virtnet_getattr(struct vfsmount *mnt,
++	struct dentry *dentry, struct kstat *stat)
++{
++	struct inode *inode = dentry->d_inode;
++
++	generic_fillattr(inode, stat);
++	stat->nlink = 2 + atomic_read(&nx_global_cactive);
++	return 0;
++}
++
++static struct file_operations proc_virtnet_dir_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_virtnet_readdir,
++};
++
++static struct inode_operations proc_virtnet_dir_inode_operations = {
++	.getattr =	proc_virtnet_getattr,
++	.lookup =	proc_virtnet_lookup,
++};
++
++
++
++void proc_vx_init(void)
++{
++	struct proc_dir_entry *ent;
++
++	ent = proc_mkdir("virtual", 0);
++	if (ent) {
++		ent->proc_fops = &proc_virtual_dir_operations;
++		ent->proc_iops = &proc_virtual_dir_inode_operations;
++	}
++	proc_virtual = ent;
++
++	ent = proc_mkdir("virtnet", 0);
++	if (ent) {
++		ent->proc_fops = &proc_virtnet_dir_operations;
++		ent->proc_iops = &proc_virtnet_dir_inode_operations;
++	}
++	proc_virtnet = ent;
++}
++
++
++
++
++/* per pid info */
++
++
++int proc_pid_vx_info(struct task_struct *p, char *buffer)
++{
++	struct vx_info *vxi;
++	char *orig = buffer;
++
++	buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p));
++
++	vxi = task_get_vx_info(p);
++	if (!vxi)
++		goto out;
++
++	buffer += sprintf(buffer, "BCaps:\t");
++	buffer = print_cap_t(buffer, &vxi->vx_bcaps);
++	buffer += sprintf(buffer, "\n");
++	buffer += sprintf(buffer, "CCaps:\t%016llx\n",
++		(unsigned long long)vxi->vx_ccaps);
++	buffer += sprintf(buffer, "CFlags:\t%016llx\n",
++		(unsigned long long)vxi->vx_flags);
++	buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid);
++
++	put_vx_info(vxi);
++out:
++	return buffer - orig;
++}
++
++
++int proc_pid_nx_info(struct task_struct *p, char *buffer)
++{
++	struct nx_info *nxi;
++	struct nx_addr_v4 *v4a;
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 *v6a;
++#endif
++	char *orig = buffer;
++	int i;
++
++	buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p));
++
++	nxi = task_get_nx_info(p);
++	if (!nxi)
++		goto out;
++
++	buffer += sprintf(buffer, "NCaps:\t%016llx\n",
++		(unsigned long long)nxi->nx_ncaps);
++	buffer += sprintf(buffer, "NFlags:\t%016llx\n",
++		(unsigned long long)nxi->nx_flags);
++
++	buffer += sprintf(buffer,
++		"V4Root[bcast]:\t" NIPQUAD_FMT "\n",
++		NIPQUAD(nxi->v4_bcast.s_addr));
++	buffer += sprintf (buffer,
++		"V4Root[lback]:\t" NIPQUAD_FMT "\n",
++		NIPQUAD(nxi->v4_lback.s_addr));
++	if (!NX_IPV4(nxi))
++		goto skip_v4;
++	for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++		buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n",
++			i, NXAV4(v4a));
++skip_v4:
++#ifdef	CONFIG_IPV6
++	if (!NX_IPV6(nxi))
++		goto skip_v6;
++	for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++		buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n",
++			i, NXAV6(v6a));
++skip_v6:
++#endif
++	put_nx_info(nxi);
++out:
++	return buffer - orig;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sched.c linux-3.7.10-vs2.3.5.6/kernel/vserver/sched.c
+--- linux-3.7.10/kernel/vserver/sched.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sched.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,83 @@
++/*
++ *  linux/kernel/vserver/sched.c
++ *
++ *  Virtual Server: Scheduler Support
++ *
++ *  Copyright (C) 2004-2010  Herbert Pötzl
++ *
++ *  V0.01  adapted Sam Vilains version to 2.6.3
++ *  V0.02  removed legacy interface
++ *  V0.03  changed vcmds to vxi arg
++ *  V0.04  removed older and legacy interfaces
++ *  V0.05  removed scheduler code/commands
++ *
++ */
++
++#include <linux/vs_context.h>
++#include <linux/vs_sched.h>
++#include <linux/cpumask.h>
++#include <linux/vserver/sched_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++	struct _vx_sched_pc *sched_pc)
++{
++	sched_pc->prio_bias = sched->prio_bias;
++}
++
++static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data)
++{
++	int cpu;
++
++	if (data->prio_bias > MAX_PRIO_BIAS)
++		data->prio_bias = MAX_PRIO_BIAS;
++	if (data->prio_bias < MIN_PRIO_BIAS)
++		data->prio_bias = MIN_PRIO_BIAS;
++
++	if (data->cpu_id != ~0) {
++		vxi->sched.update = cpumask_of_cpu(data->cpu_id);
++		cpumask_and(&vxi->sched.update, &vxi->sched.update,
++			cpu_online_mask);
++	} else
++		cpumask_copy(&vxi->sched.update, cpu_online_mask);
++
++	for_each_cpu_mask(cpu, vxi->sched.update)
++		vx_update_sched_param(&vxi->sched,
++			&vx_per_cpu(vxi, sched_pc, cpu));
++	return 0;
++}
++
++int vc_set_prio_bias(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_prio_bias vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_prio_bias(vxi, &vc_data);
++}
++
++int vc_get_prio_bias(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_prio_bias vc_data;
++	struct _vx_sched_pc *pcd;
++	int cpu;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	cpu = vc_data.cpu_id;
++
++	if (!cpu_possible(cpu))
++		return -EINVAL;
++
++	pcd = &vx_per_cpu(vxi, sched_pc, cpu);
++	vc_data.prio_bias = pcd->prio_bias;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sched_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_init.h
+--- linux-3.7.10/kernel/vserver/sched_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,27 @@
++
++static inline void vx_info_init_sched(struct _vx_sched *sched)
++{
++	/* scheduling; hard code starting values as constants */
++	sched->prio_bias = 0;
++}
++
++static inline
++void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++	sched_pc->prio_bias = 0;
++
++	sched_pc->user_ticks = 0;
++	sched_pc->sys_ticks = 0;
++	sched_pc->hold_ticks = 0;
++}
++
++static inline void vx_info_exit_sched(struct _vx_sched *sched)
++{
++	return;
++}
++
++static inline
++void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++	return;
++}
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sched_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_proc.h
+--- linux-3.7.10/kernel/vserver/sched_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,32 @@
++#ifndef _VX_SCHED_PROC_H
++#define _VX_SCHED_PROC_H
++
++
++static inline
++int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
++{
++	int length = 0;
++
++	length += sprintf(buffer,
++		"PrioBias:\t%8d\n",
++		sched->prio_bias);
++	return length;
++}
++
++static inline
++int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
++	char *buffer, int cpu)
++{
++	int length = 0;
++
++	length += sprintf(buffer + length,
++		"cpu %d: %lld %lld %lld", cpu,
++		(unsigned long long)sched_pc->user_ticks,
++		(unsigned long long)sched_pc->sys_ticks,
++		(unsigned long long)sched_pc->hold_ticks);
++	length += sprintf(buffer + length,
++		" %d\n", sched_pc->prio_bias);
++	return length;
++}
++
++#endif	/* _VX_SCHED_PROC_H */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/signal.c linux-3.7.10-vs2.3.5.6/kernel/vserver/signal.c
+--- linux-3.7.10/kernel/vserver/signal.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/signal.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,134 @@
++/*
++ *  linux/kernel/vserver/signal.c
++ *
++ *  Virtual Server: Signal Support
++ *
++ *  Copyright (C) 2003-2007  Herbert Pötzl
++ *
++ *  V0.01  broken out from vcontext V0.05
++ *  V0.02  changed vcmds to vxi arg
++ *  V0.03  adjusted siginfo for kill
++ *
++ */
++
++#include <asm/uaccess.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/signal_cmd.h>
++
++
++int vx_info_kill(struct vx_info *vxi, int pid, int sig)
++{
++	int retval, count = 0;
++	struct task_struct *p;
++	struct siginfo *sip = SEND_SIG_PRIV;
++
++	retval = -ESRCH;
++	vxdprintk(VXD_CBIT(misc, 4),
++		"vx_info_kill(%p[#%d],%d,%d)*",
++		vxi, vxi->vx_id, pid, sig);
++	read_lock(&tasklist_lock);
++	switch (pid) {
++	case  0:
++	case -1:
++		for_each_process(p) {
++			int err = 0;
++
++			if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 ||
++				(pid && vxi->vx_initpid == p->pid))
++				continue;
++
++			err = group_send_sig_info(sig, sip, p);
++			++count;
++			if (err != -EPERM)
++				retval = err;
++		}
++		break;
++
++	case 1:
++		if (vxi->vx_initpid) {
++			pid = vxi->vx_initpid;
++			/* for now, only SIGINT to private init ... */
++			if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++				/* ... as long as there are tasks left */
++				(atomic_read(&vxi->vx_tasks) > 1))
++				sig = SIGINT;
++		}
++		/* fallthrough */
++	default:
++		rcu_read_lock();
++		p = find_task_by_real_pid(pid);
++		rcu_read_unlock();
++		if (p) {
++			if (vx_task_xid(p) == vxi->vx_id)
++				retval = group_send_sig_info(sig, sip, p);
++		}
++		break;
++	}
++	read_unlock(&tasklist_lock);
++	vxdprintk(VXD_CBIT(misc, 4),
++		"vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
++		vxi, vxi->vx_id, pid, sig, (long)sip, retval);
++	return retval;
++}
++
++int vc_ctx_kill(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_kill_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special check to allow guest shutdown */
++	if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++		/* forbid killall pid=0 when init is present */
++		(((vc_data.pid < 1) && vxi->vx_initpid) ||
++		(vc_data.pid > 1)))
++		return -EACCES;
++
++	return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
++}
++
++
++static int __wait_exit(struct vx_info *vxi)
++{
++	DECLARE_WAITQUEUE(wait, current);
++	int ret = 0;
++
++	add_wait_queue(&vxi->vx_wait, &wait);
++	set_current_state(TASK_INTERRUPTIBLE);
++
++wait:
++	if (vx_info_state(vxi,
++		VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
++		goto out;
++	if (signal_pending(current)) {
++		ret = -ERESTARTSYS;
++		goto out;
++	}
++	schedule();
++	goto wait;
++
++out:
++	set_current_state(TASK_RUNNING);
++	remove_wait_queue(&vxi->vx_wait, &wait);
++	return ret;
++}
++
++
++
++int vc_wait_exit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wait_exit_v0 vc_data;
++	int ret;
++
++	ret = __wait_exit(vxi);
++	vc_data.reboot_cmd = vxi->reboot_cmd;
++	vc_data.exit_code = vxi->exit_code;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/space.c linux-3.7.10-vs2.3.5.6/kernel/vserver/space.c
+--- linux-3.7.10/kernel/vserver/space.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/space.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,436 @@
++/*
++ *  linux/kernel/vserver/space.c
++ *
++ *  Virtual Server: Context Space Support
++ *
++ *  Copyright (C) 2003-2010  Herbert Pötzl
++ *
++ *  V0.01  broken out from context.c 0.07
++ *  V0.02  added task locking for namespace
++ *  V0.03  broken out vx_enter_namespace
++ *  V0.04  added *space support and commands
++ *  V0.05  added credential support
++ *
++ */
++
++#include <linux/utsname.h>
++#include <linux/nsproxy.h>
++#include <linux/err.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
++#include <asm/uaccess.h>
++
++#include <linux/vs_context.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/space_cmd.h>
++
++atomic_t vs_global_nsproxy	= ATOMIC_INIT(0);
++atomic_t vs_global_fs		= ATOMIC_INIT(0);
++atomic_t vs_global_mnt_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_uts_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_user_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_pid_ns	= ATOMIC_INIT(0);
++
++
++/* namespace functions */
++
++#include <linux/mnt_namespace.h>
++#include <linux/user_namespace.h>
++#include <linux/pid_namespace.h>
++#include <linux/ipc_namespace.h>
++#include <net/net_namespace.h>
++#include "../fs/mount.h"
++
++
++static const struct vcmd_space_mask_v1 space_mask_v0 = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++		0
++};
++
++static const struct vcmd_space_mask_v1 space_mask = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++#ifdef	CONFIG_PID_NS
++		CLONE_NEWPID |
++#endif
++#ifdef	CONFIG_NET_NS
++		CLONE_NEWNET |
++#endif
++		0
++};
++
++static const struct vcmd_space_mask_v1 default_space_mask = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++#ifdef	CONFIG_PID_NS
++//		CLONE_NEWPID |
++#endif
++		0
++};
++
++/*
++ *	build a new nsproxy mix
++ *      assumes that both proxies are 'const'
++ *	does not touch nsproxy refcounts
++ *	will hold a reference on the result.
++ */
++
++struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
++	struct nsproxy *new_nsproxy, unsigned long mask)
++{
++	struct mnt_namespace *old_ns;
++	struct uts_namespace *old_uts;
++	struct ipc_namespace *old_ipc;
++#ifdef	CONFIG_PID_NS
++	struct pid_namespace *old_pid;
++#endif
++#ifdef	CONFIG_NET_NS
++	struct net *old_net;
++#endif
++	struct nsproxy *nsproxy;
++
++	nsproxy = copy_nsproxy(old_nsproxy);
++	if (!nsproxy)
++		goto out;
++
++	if (mask & CLONE_NEWNS) {
++		old_ns = nsproxy->mnt_ns;
++		nsproxy->mnt_ns = new_nsproxy->mnt_ns;
++		if (nsproxy->mnt_ns)
++			get_mnt_ns(nsproxy->mnt_ns);
++	} else
++		old_ns = NULL;
++
++	if (mask & CLONE_NEWUTS) {
++		old_uts = nsproxy->uts_ns;
++		nsproxy->uts_ns = new_nsproxy->uts_ns;
++		if (nsproxy->uts_ns)
++			get_uts_ns(nsproxy->uts_ns);
++	} else
++		old_uts = NULL;
++
++	if (mask & CLONE_NEWIPC) {
++		old_ipc = nsproxy->ipc_ns;
++		nsproxy->ipc_ns = new_nsproxy->ipc_ns;
++		if (nsproxy->ipc_ns)
++			get_ipc_ns(nsproxy->ipc_ns);
++	} else
++		old_ipc = NULL;
++
++#ifdef	CONFIG_PID_NS
++	if (mask & CLONE_NEWPID) {
++		old_pid = nsproxy->pid_ns;
++		nsproxy->pid_ns = new_nsproxy->pid_ns;
++		if (nsproxy->pid_ns)
++			get_pid_ns(nsproxy->pid_ns);
++	} else
++		old_pid = NULL;
++#endif
++#ifdef	CONFIG_NET_NS
++	if (mask & CLONE_NEWNET) {
++		old_net = nsproxy->net_ns;
++		nsproxy->net_ns = new_nsproxy->net_ns;
++		if (nsproxy->net_ns)
++			get_net(nsproxy->net_ns);
++	} else
++		old_net = NULL;
++#endif
++	if (old_ns)
++		put_mnt_ns(old_ns);
++	if (old_uts)
++		put_uts_ns(old_uts);
++	if (old_ipc)
++		put_ipc_ns(old_ipc);
++#ifdef	CONFIG_PID_NS
++	if (old_pid)
++		put_pid_ns(old_pid);
++#endif
++#ifdef	CONFIG_NET_NS
++	if (old_net)
++		put_net(old_net);
++#endif
++out:
++	return nsproxy;
++}
++
++
++/*
++ *	merge two nsproxy structs into a new one.
++ *	will hold a reference on the result.
++ */
++
++static inline
++struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
++	struct nsproxy *proxy, unsigned long mask)
++{
++	struct nsproxy null_proxy = { .mnt_ns = NULL };
++
++	if (!proxy)
++		return NULL;
++
++	if (mask) {
++		/* vs_mix_nsproxy returns with reference */
++		return vs_mix_nsproxy(old ? old : &null_proxy,
++			proxy, mask);
++	}
++	get_nsproxy(proxy);
++	return proxy;
++}
++
++
++int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
++{
++	struct nsproxy *proxy, *proxy_cur, *proxy_new;
++	struct fs_struct *fs_cur, *fs = NULL;
++	struct _vx_space *space;
++	int ret, kill = 0;
++
++	vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
++		vxi, vxi->vx_id, mask, index);
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++		return -EACCES;
++
++	if (index >= VX_SPACES)
++		return -EINVAL;
++
++	space = &vxi->space[index];
++
++	if (!mask)
++		mask = space->vx_nsmask;
++
++	if ((mask & space->vx_nsmask) != mask)
++		return -EINVAL;
++
++	if (mask & CLONE_FS) {
++		fs = copy_fs_struct(space->vx_fs);
++		if (!fs)
++			return -ENOMEM;
++	}
++	proxy = space->vx_nsproxy;
++
++	vxdprintk(VXD_CBIT(space, 9),
++		"vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
++		vxi, vxi->vx_id, mask, index, proxy, fs);
++
++	task_lock(current);
++	fs_cur = current->fs;
++
++	if (mask & CLONE_FS) {
++		spin_lock(&fs_cur->lock);
++		current->fs = fs;
++		kill = !--fs_cur->users;
++		spin_unlock(&fs_cur->lock);
++	}
++
++	proxy_cur = current->nsproxy;
++	get_nsproxy(proxy_cur);
++	task_unlock(current);
++
++	if (kill)
++		free_fs_struct(fs_cur);
++
++	proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
++	if (IS_ERR(proxy_new)) {
++		ret = PTR_ERR(proxy_new);
++		goto out_put;
++	}
++
++	proxy_new = xchg(&current->nsproxy, proxy_new);
++
++	if (mask & CLONE_NEWUSER) {
++		struct cred *cred;
++
++		vxdprintk(VXD_CBIT(space, 10),
++			"vx_enter_space(%p[#%u],%p) cred (%p,%p)",
++			vxi, vxi->vx_id, space->vx_cred,
++			current->real_cred, current->cred);
++
++		if (space->vx_cred) {
++			cred = __prepare_creds(space->vx_cred);
++			if (cred)
++				commit_creds(cred);
++		}
++	}
++
++	ret = 0;
++
++	if (proxy_new)
++		put_nsproxy(proxy_new);
++out_put:
++	if (proxy_cur)
++		put_nsproxy(proxy_cur);
++	return ret;
++}
++
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
++{
++	struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
++	struct fs_struct *fs_vxi, *fs = NULL;
++	struct _vx_space *space;
++	int ret, kill = 0;
++
++	vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
++		vxi, vxi->vx_id, mask, index);
++
++	if ((mask & space_mask.mask) != mask)
++		return -EINVAL;
++
++	if (index >= VX_SPACES)
++		return -EINVAL;
++
++	space = &vxi->space[index];
++
++	proxy_vxi = space->vx_nsproxy;
++	fs_vxi = space->vx_fs;
++
++	if (mask & CLONE_FS) {
++		fs = copy_fs_struct(current->fs);
++		if (!fs)
++			return -ENOMEM;
++	}
++
++	task_lock(current);
++
++	if (mask & CLONE_FS) {
++		spin_lock(&fs_vxi->lock);
++		space->vx_fs = fs;
++		kill = !--fs_vxi->users;
++		spin_unlock(&fs_vxi->lock);
++	}
++
++	proxy_cur = current->nsproxy;
++	get_nsproxy(proxy_cur);
++	task_unlock(current);
++
++	if (kill)
++		free_fs_struct(fs_vxi);
++
++	proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
++	if (IS_ERR(proxy_new)) {
++		ret = PTR_ERR(proxy_new);
++		goto out_put;
++	}
++
++	proxy_new = xchg(&space->vx_nsproxy, proxy_new);
++	space->vx_nsmask |= mask;
++
++	if (mask & CLONE_NEWUSER) {
++		struct cred *cred;
++
++		vxdprintk(VXD_CBIT(space, 10),
++			"vx_set_space(%p[#%u],%p) cred (%p,%p)",
++			vxi, vxi->vx_id, space->vx_cred,
++			current->real_cred, current->cred);
++
++		cred = prepare_creds();
++		cred = (struct cred *)xchg(&space->vx_cred, cred);
++		if (cred)
++			abort_creds(cred);
++	}
++
++	ret = 0;
++
++	if (proxy_new)
++		put_nsproxy(proxy_new);
++out_put:
++	if (proxy_cur)
++		put_nsproxy(proxy_cur);
++	return ret;
++}
++
++
++int vc_enter_space_v1(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return vx_enter_space(vxi, vc_data.mask, 0);
++}
++
++int vc_enter_space(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if (vc_data.index >= VX_SPACES)
++		return -EINVAL;
++
++	return vx_enter_space(vxi, vc_data.mask, vc_data.index);
++}
++
++int vc_set_space_v1(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return vx_set_space(vxi, vc_data.mask, 0);
++}
++
++int vc_set_space(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if (vc_data.index >= VX_SPACES)
++		return -EINVAL;
++
++	return vx_set_space(vxi, vc_data.mask, vc_data.index);
++}
++
++int vc_get_space_mask(void __user *data, int type)
++{
++	const struct vcmd_space_mask_v1 *mask;
++
++	if (type == 0)
++		mask = &space_mask_v0;
++	else if (type == 1)
++		mask = &space_mask;
++	else
++		mask = &default_space_mask;
++
++	vxdprintk(VXD_CBIT(space, 10),
++		"vc_get_space_mask(%d) = %08llx", type, mask->mask);
++
++	if (copy_to_user(data, mask, sizeof(*mask)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/switch.c linux-3.7.10-vs2.3.5.6/kernel/vserver/switch.c
+--- linux-3.7.10/kernel/vserver/switch.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/switch.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,556 @@
++/*
++ *  linux/kernel/vserver/switch.c
++ *
++ *  Virtual Server: Syscall Switch
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  V0.01  syscall switch
++ *  V0.02  added signal to context
++ *  V0.03  added rlimit functions
++ *  V0.04  added iattr, task/xid functions
++ *  V0.05  added debug/history stuff
++ *  V0.06  added compat32 layer
++ *  V0.07  vcmd args and perms
++ *  V0.08  added status commands
++ *  V0.09  added tag commands
++ *  V0.10  added oom bias
++ *  V0.11  added device commands
++ *  V0.12  added warn mask
++ *
++ */
++
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/switch.h>
++
++#include "vci_config.h"
++
++
++static inline
++int vc_get_version(uint32_t id)
++{
++	return VCI_VERSION;
++}
++
++static inline
++int vc_get_vci(uint32_t id)
++{
++	return vci_kernel_config();
++}
++
++#include <linux/vserver/context_cmd.h>
++#include <linux/vserver/cvirt_cmd.h>
++#include <linux/vserver/cacct_cmd.h>
++#include <linux/vserver/limit_cmd.h>
++#include <linux/vserver/network_cmd.h>
++#include <linux/vserver/sched_cmd.h>
++#include <linux/vserver/debug_cmd.h>
++#include <linux/vserver/inode_cmd.h>
++#include <linux/vserver/dlimit_cmd.h>
++#include <linux/vserver/signal_cmd.h>
++#include <linux/vserver/space_cmd.h>
++#include <linux/vserver/tag_cmd.h>
++#include <linux/vserver/device_cmd.h>
++
++#include <linux/vserver/inode.h>
++#include <linux/vserver/dlimit.h>
++
++
++#ifdef	CONFIG_COMPAT
++#define __COMPAT(name, id, data, compat)	\
++	(compat) ? name ## _x32(id, data) : name(id, data)
++#define __COMPAT_NO_ID(name, data, compat)	\
++	(compat) ? name ## _x32(data) : name(data)
++#else
++#define __COMPAT(name, id, data, compat)	\
++	name(id, data)
++#define __COMPAT_NO_ID(name, data, compat)	\
++	name(data)
++#endif
++
++
++static inline
++long do_vcmd(uint32_t cmd, uint32_t id,
++	struct vx_info *vxi, struct nx_info *nxi,
++	void __user *data, int compat)
++{
++	switch (cmd) {
++
++	case VCMD_get_version:
++		return vc_get_version(id);
++	case VCMD_get_vci:
++		return vc_get_vci(id);
++
++	case VCMD_task_xid:
++		return vc_task_xid(id);
++	case VCMD_vx_info:
++		return vc_vx_info(vxi, data);
++
++	case VCMD_task_nid:
++		return vc_task_nid(id);
++	case VCMD_nx_info:
++		return vc_nx_info(nxi, data);
++
++	case VCMD_task_tag:
++		return vc_task_tag(id);
++
++	case VCMD_set_space_v1:
++		return vc_set_space_v1(vxi, data);
++	/* this is version 2 */
++	case VCMD_set_space:
++		return vc_set_space(vxi, data);
++
++	case VCMD_get_space_mask_v0:
++		return vc_get_space_mask(data, 0);
++	/* this is version 1 */
++	case VCMD_get_space_mask:
++		return vc_get_space_mask(data, 1);
++
++	case VCMD_get_space_default:
++		return vc_get_space_mask(data, -1);
++
++	case VCMD_set_umask:
++		return vc_set_umask(vxi, data);
++
++	case VCMD_get_umask:
++		return vc_get_umask(vxi, data);
++
++	case VCMD_set_wmask:
++		return vc_set_wmask(vxi, data);
++
++	case VCMD_get_wmask:
++		return vc_get_wmask(vxi, data);
++#ifdef	CONFIG_IA32_EMULATION
++	case VCMD_get_rlimit:
++		return __COMPAT(vc_get_rlimit, vxi, data, compat);
++	case VCMD_set_rlimit:
++		return __COMPAT(vc_set_rlimit, vxi, data, compat);
++#else
++	case VCMD_get_rlimit:
++		return vc_get_rlimit(vxi, data);
++	case VCMD_set_rlimit:
++		return vc_set_rlimit(vxi, data);
++#endif
++	case VCMD_get_rlimit_mask:
++		return vc_get_rlimit_mask(id, data);
++	case VCMD_reset_hits:
++		return vc_reset_hits(vxi, data);
++	case VCMD_reset_minmax:
++		return vc_reset_minmax(vxi, data);
++
++	case VCMD_get_vhi_name:
++		return vc_get_vhi_name(vxi, data);
++	case VCMD_set_vhi_name:
++		return vc_set_vhi_name(vxi, data);
++
++	case VCMD_ctx_stat:
++		return vc_ctx_stat(vxi, data);
++	case VCMD_virt_stat:
++		return vc_virt_stat(vxi, data);
++	case VCMD_sock_stat:
++		return vc_sock_stat(vxi, data);
++	case VCMD_rlimit_stat:
++		return vc_rlimit_stat(vxi, data);
++
++	case VCMD_set_cflags:
++		return vc_set_cflags(vxi, data);
++	case VCMD_get_cflags:
++		return vc_get_cflags(vxi, data);
++
++	/* this is version 1 */
++	case VCMD_set_ccaps:
++		return vc_set_ccaps(vxi, data);
++	/* this is version 1 */
++	case VCMD_get_ccaps:
++		return vc_get_ccaps(vxi, data);
++	case VCMD_set_bcaps:
++		return vc_set_bcaps(vxi, data);
++	case VCMD_get_bcaps:
++		return vc_get_bcaps(vxi, data);
++
++	case VCMD_set_badness:
++		return vc_set_badness(vxi, data);
++	case VCMD_get_badness:
++		return vc_get_badness(vxi, data);
++
++	case VCMD_set_nflags:
++		return vc_set_nflags(nxi, data);
++	case VCMD_get_nflags:
++		return vc_get_nflags(nxi, data);
++
++	case VCMD_set_ncaps:
++		return vc_set_ncaps(nxi, data);
++	case VCMD_get_ncaps:
++		return vc_get_ncaps(nxi, data);
++
++	case VCMD_set_prio_bias:
++		return vc_set_prio_bias(vxi, data);
++	case VCMD_get_prio_bias:
++		return vc_get_prio_bias(vxi, data);
++	case VCMD_add_dlimit:
++		return __COMPAT(vc_add_dlimit, id, data, compat);
++	case VCMD_rem_dlimit:
++		return __COMPAT(vc_rem_dlimit, id, data, compat);
++	case VCMD_set_dlimit:
++		return __COMPAT(vc_set_dlimit, id, data, compat);
++	case VCMD_get_dlimit:
++		return __COMPAT(vc_get_dlimit, id, data, compat);
++
++	case VCMD_ctx_kill:
++		return vc_ctx_kill(vxi, data);
++
++	case VCMD_wait_exit:
++		return vc_wait_exit(vxi, data);
++
++	case VCMD_get_iattr:
++		return __COMPAT_NO_ID(vc_get_iattr, data, compat);
++	case VCMD_set_iattr:
++		return __COMPAT_NO_ID(vc_set_iattr, data, compat);
++
++	case VCMD_fget_iattr:
++		return vc_fget_iattr(id, data);
++	case VCMD_fset_iattr:
++		return vc_fset_iattr(id, data);
++
++	case VCMD_enter_space_v0:
++		return vc_enter_space_v1(vxi, NULL);
++	case VCMD_enter_space_v1:
++		return vc_enter_space_v1(vxi, data);
++	/* this is version 2 */
++	case VCMD_enter_space:
++		return vc_enter_space(vxi, data);
++
++	case VCMD_ctx_create_v0:
++		return vc_ctx_create(id, NULL);
++	case VCMD_ctx_create:
++		return vc_ctx_create(id, data);
++	case VCMD_ctx_migrate_v0:
++		return vc_ctx_migrate(vxi, NULL);
++	case VCMD_ctx_migrate:
++		return vc_ctx_migrate(vxi, data);
++
++	case VCMD_net_create_v0:
++		return vc_net_create(id, NULL);
++	case VCMD_net_create:
++		return vc_net_create(id, data);
++	case VCMD_net_migrate:
++		return vc_net_migrate(nxi, data);
++
++	case VCMD_tag_migrate:
++		return vc_tag_migrate(id);
++
++	case VCMD_net_add:
++		return vc_net_add(nxi, data);
++	case VCMD_net_remove:
++		return vc_net_remove(nxi, data);
++
++	case VCMD_net_add_ipv4_v1:
++		return vc_net_add_ipv4_v1(nxi, data);
++	/* this is version 2 */
++	case VCMD_net_add_ipv4:
++		return vc_net_add_ipv4(nxi, data);
++
++	case VCMD_net_rem_ipv4_v1:
++		return vc_net_rem_ipv4_v1(nxi, data);
++	/* this is version 2 */
++	case VCMD_net_rem_ipv4:
++		return vc_net_rem_ipv4(nxi, data);
++#ifdef	CONFIG_IPV6
++	case VCMD_net_add_ipv6:
++		return vc_net_add_ipv6(nxi, data);
++	case VCMD_net_remove_ipv6:
++		return vc_net_remove_ipv6(nxi, data);
++#endif
++/*	case VCMD_add_match_ipv4:
++		return vc_add_match_ipv4(nxi, data);
++	case VCMD_get_match_ipv4:
++		return vc_get_match_ipv4(nxi, data);
++#ifdef	CONFIG_IPV6
++	case VCMD_add_match_ipv6:
++		return vc_add_match_ipv6(nxi, data);
++	case VCMD_get_match_ipv6:
++		return vc_get_match_ipv6(nxi, data);
++#endif	*/
++
++#ifdef	CONFIG_VSERVER_DEVICE
++	case VCMD_set_mapping:
++		return __COMPAT(vc_set_mapping, vxi, data, compat);
++	case VCMD_unset_mapping:
++		return __COMPAT(vc_unset_mapping, vxi, data, compat);
++#endif
++#ifdef	CONFIG_VSERVER_HISTORY
++	case VCMD_dump_history:
++		return vc_dump_history(id);
++	case VCMD_read_history:
++		return __COMPAT(vc_read_history, id, data, compat);
++#endif
++	default:
++		vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
++			VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
++	}
++	return -ENOSYS;
++}
++
++
++#define	__VCMD(vcmd, _perm, _args, _flags)		\
++	case VCMD_ ## vcmd: perm = _perm;		\
++		args = _args; flags = _flags; break
++
++
++#define VCA_NONE	0x00
++#define VCA_VXI		0x01
++#define VCA_NXI		0x02
++
++#define VCF_NONE	0x00
++#define VCF_INFO	0x01
++#define VCF_ADMIN	0x02
++#define VCF_ARES	0x06	/* includes admin */
++#define VCF_SETUP	0x08
++
++#define VCF_ZIDOK	0x10	/* zero id okay */
++
++
++static inline
++long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
++{
++	long ret;
++	int permit = -1, state = 0;
++	int perm = -1, args = 0, flags = 0;
++	struct vx_info *vxi = NULL;
++	struct nx_info *nxi = NULL;
++
++	switch (cmd) {
++	/* unpriviledged commands */
++	__VCMD(get_version,	 0, VCA_NONE,	0);
++	__VCMD(get_vci,		 0, VCA_NONE,	0);
++	__VCMD(get_rlimit_mask,	 0, VCA_NONE,	0);
++	__VCMD(get_space_mask_v0,0, VCA_NONE,   0);
++	__VCMD(get_space_mask,	 0, VCA_NONE,   0);
++	__VCMD(get_space_default,0, VCA_NONE,   0);
++
++	/* info commands */
++	__VCMD(task_xid,	 2, VCA_NONE,	0);
++	__VCMD(reset_hits,	 2, VCA_VXI,	0);
++	__VCMD(reset_minmax,	 2, VCA_VXI,	0);
++	__VCMD(vx_info,		 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_bcaps,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_ccaps,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_cflags,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_umask,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_wmask,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_badness,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_vhi_name,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_rlimit,	 3, VCA_VXI,	VCF_INFO);
++
++	__VCMD(ctx_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(virt_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(sock_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(rlimit_stat,	 3, VCA_VXI,	VCF_INFO);
++
++	__VCMD(task_nid,	 2, VCA_NONE,	0);
++	__VCMD(nx_info,		 3, VCA_NXI,	VCF_INFO);
++	__VCMD(get_ncaps,	 3, VCA_NXI,	VCF_INFO);
++	__VCMD(get_nflags,	 3, VCA_NXI,	VCF_INFO);
++
++	__VCMD(task_tag,	 2, VCA_NONE,	0);
++
++	__VCMD(get_iattr,	 2, VCA_NONE,	0);
++	__VCMD(fget_iattr,	 2, VCA_NONE,	0);
++	__VCMD(get_dlimit,	 3, VCA_NONE,	VCF_INFO);
++	__VCMD(get_prio_bias,	 3, VCA_VXI,	VCF_INFO);
++
++	/* lower admin commands */
++	__VCMD(wait_exit,	 4, VCA_VXI,	VCF_INFO);
++	__VCMD(ctx_create_v0,	 5, VCA_NONE,	0);
++	__VCMD(ctx_create,	 5, VCA_NONE,	0);
++	__VCMD(ctx_migrate_v0,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(ctx_migrate,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space_v0,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space_v1,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space,	 5, VCA_VXI,	VCF_ADMIN);
++
++	__VCMD(net_create_v0,	 5, VCA_NONE,	0);
++	__VCMD(net_create,	 5, VCA_NONE,	0);
++	__VCMD(net_migrate,	 5, VCA_NXI,	VCF_ADMIN);
++
++	__VCMD(tag_migrate,	 5, VCA_NONE,	VCF_ADMIN);
++
++	/* higher admin commands */
++	__VCMD(ctx_kill,	 6, VCA_VXI,	VCF_ARES);
++	__VCMD(set_space_v1,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_space,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_ccaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_bcaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_cflags,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_umask,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_wmask,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_badness,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_vhi_name,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_rlimit,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_prio_bias,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_ncaps,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_nflags,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add,		 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_remove,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add_ipv4_v1,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_rem_ipv4_v1,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add_ipv4,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_rem_ipv4,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++#ifdef	CONFIG_IPV6
++	__VCMD(net_add_ipv6,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_remove_ipv6,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++#endif
++	__VCMD(set_iattr,	 7, VCA_NONE,	0);
++	__VCMD(fset_iattr,	 7, VCA_NONE,	0);
++	__VCMD(set_dlimit,	 7, VCA_NONE,	VCF_ARES);
++	__VCMD(add_dlimit,	 8, VCA_NONE,	VCF_ARES);
++	__VCMD(rem_dlimit,	 8, VCA_NONE,	VCF_ARES);
++
++#ifdef	CONFIG_VSERVER_DEVICE
++	__VCMD(set_mapping,	 8, VCA_VXI,    VCF_ARES|VCF_ZIDOK);
++	__VCMD(unset_mapping,	 8, VCA_VXI,	VCF_ARES|VCF_ZIDOK);
++#endif
++	/* debug level admin commands */
++#ifdef	CONFIG_VSERVER_HISTORY
++	__VCMD(dump_history,	 9, VCA_NONE,	0);
++	__VCMD(read_history,	 9, VCA_NONE,	0);
++#endif
++
++	default:
++		perm = -1;
++	}
++
++	vxdprintk(VXD_CBIT(switch, 0),
++		"vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]",
++		VC_CATEGORY(cmd), VC_COMMAND(cmd),
++		VC_VERSION(cmd), id, data, compat,
++		perm, args, flags);
++
++	ret = -ENOSYS;
++	if (perm < 0)
++		goto out;
++
++	state = 1;
++	if (!capable(CAP_CONTEXT))
++		goto out;
++
++	state = 2;
++	/* moved here from the individual commands */
++	ret = -EPERM;
++	if ((perm > 1) && !capable(CAP_SYS_ADMIN))
++		goto out;
++
++	state = 3;
++	/* vcmd involves resource management  */
++	ret = -EPERM;
++	if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE))
++		goto out;
++
++	state = 4;
++	/* various legacy exceptions */
++	switch (cmd) {
++	/* will go away when spectator is a cap */
++	case VCMD_ctx_migrate_v0:
++	case VCMD_ctx_migrate:
++		if (id == 1) {
++			current->xid = 1;
++			ret = 1;
++			goto out;
++		}
++		break;
++
++	/* will go away when spectator is a cap */
++	case VCMD_net_migrate:
++		if (id == 1) {
++			current->nid = 1;
++			ret = 1;
++			goto out;
++		}
++		break;
++	}
++
++	/* vcmds are fine by default */
++	permit = 1;
++
++	/* admin type vcmds require admin ... */
++	if (flags & VCF_ADMIN)
++		permit = vx_check(0, VS_ADMIN) ? 1 : 0;
++
++	/* ... but setup type vcmds override that */
++	if (!permit && (flags & VCF_SETUP))
++		permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0;
++
++	state = 5;
++	ret = -EPERM;
++	if (!permit)
++		goto out;
++
++	state = 6;
++	if (!id && (flags & VCF_ZIDOK))
++		goto skip_id;
++
++	ret = -ESRCH;
++	if (args & VCA_VXI) {
++		vxi = lookup_vx_info(id);
++		if (!vxi)
++			goto out;
++
++		if ((flags & VCF_ADMIN) &&
++			/* special case kill for shutdown */
++			(cmd != VCMD_ctx_kill) &&
++			/* can context be administrated? */
++			!vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
++			ret = -EACCES;
++			goto out_vxi;
++		}
++	}
++	state = 7;
++	if (args & VCA_NXI) {
++		nxi = lookup_nx_info(id);
++		if (!nxi)
++			goto out_vxi;
++
++		if ((flags & VCF_ADMIN) &&
++			/* can context be administrated? */
++			!nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
++			ret = -EACCES;
++			goto out_nxi;
++		}
++	}
++skip_id:
++	state = 8;
++	ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
++
++out_nxi:
++	if ((args & VCA_NXI) && nxi)
++		put_nx_info(nxi);
++out_vxi:
++	if ((args & VCA_VXI) && vxi)
++		put_vx_info(vxi);
++out:
++	vxdprintk(VXD_CBIT(switch, 1),
++		"vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]",
++		VC_CATEGORY(cmd), VC_COMMAND(cmd),
++		VC_VERSION(cmd), ret, ret, state, permit);
++	return ret;
++}
++
++asmlinkage long
++sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
++{
++	return do_vserver(cmd, id, data, 0);
++}
++
++#ifdef	CONFIG_COMPAT
++
++asmlinkage long
++sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
++{
++	return do_vserver(cmd, id, data, 1);
++}
++
++#endif	/* CONFIG_COMPAT */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sysctl.c linux-3.7.10-vs2.3.5.6/kernel/vserver/sysctl.c
+--- linux-3.7.10/kernel/vserver/sysctl.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sysctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,247 @@
++/*
++ *  kernel/vserver/sysctl.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/ctype.h>
++#include <linux/sysctl.h>
++#include <linux/parser.h>
++#include <asm/uaccess.h>
++
++enum {
++	CTL_DEBUG_ERROR		= 0,
++	CTL_DEBUG_SWITCH	= 1,
++	CTL_DEBUG_XID,
++	CTL_DEBUG_NID,
++	CTL_DEBUG_TAG,
++	CTL_DEBUG_NET,
++	CTL_DEBUG_LIMIT,
++	CTL_DEBUG_CRES,
++	CTL_DEBUG_DLIM,
++	CTL_DEBUG_QUOTA,
++	CTL_DEBUG_CVIRT,
++	CTL_DEBUG_SPACE,
++	CTL_DEBUG_PERM,
++	CTL_DEBUG_MISC,
++};
++
++
++unsigned int vs_debug_switch	= 0;
++unsigned int vs_debug_xid	= 0;
++unsigned int vs_debug_nid	= 0;
++unsigned int vs_debug_tag	= 0;
++unsigned int vs_debug_net	= 0;
++unsigned int vs_debug_limit	= 0;
++unsigned int vs_debug_cres	= 0;
++unsigned int vs_debug_dlim	= 0;
++unsigned int vs_debug_quota	= 0;
++unsigned int vs_debug_cvirt	= 0;
++unsigned int vs_debug_space	= 0;
++unsigned int vs_debug_perm	= 0;
++unsigned int vs_debug_misc	= 0;
++
++
++static struct ctl_table_header *vserver_table_header;
++static ctl_table vserver_root_table[];
++
++
++void vserver_register_sysctl(void)
++{
++	if (!vserver_table_header) {
++		vserver_table_header = register_sysctl_table(vserver_root_table);
++	}
++
++}
++
++void vserver_unregister_sysctl(void)
++{
++	if (vserver_table_header) {
++		unregister_sysctl_table(vserver_table_header);
++		vserver_table_header = NULL;
++	}
++}
++
++
++static int proc_dodebug(ctl_table *table, int write,
++	void __user *buffer, size_t *lenp, loff_t *ppos)
++{
++	char		tmpbuf[20], *p, c;
++	unsigned int	value;
++	size_t		left, len;
++
++	if ((*ppos && !write) || !*lenp) {
++		*lenp = 0;
++		return 0;
++	}
++
++	left = *lenp;
++
++	if (write) {
++		if (!access_ok(VERIFY_READ, buffer, left))
++			return -EFAULT;
++		p = (char *)buffer;
++		while (left && __get_user(c, p) >= 0 && isspace(c))
++			left--, p++;
++		if (!left)
++			goto done;
++
++		if (left > sizeof(tmpbuf) - 1)
++			return -EINVAL;
++		if (copy_from_user(tmpbuf, p, left))
++			return -EFAULT;
++		tmpbuf[left] = '\0';
++
++		for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--)
++			value = 10 * value + (*p - '0');
++		if (*p && !isspace(*p))
++			return -EINVAL;
++		while (left && isspace(*p))
++			left--, p++;
++		*(unsigned int *)table->data = value;
++	} else {
++		if (!access_ok(VERIFY_WRITE, buffer, left))
++			return -EFAULT;
++		len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
++		if (len > left)
++			len = left;
++		if (__copy_to_user(buffer, tmpbuf, len))
++			return -EFAULT;
++		if ((left -= len) > 0) {
++			if (put_user('\n', (char *)buffer + len))
++				return -EFAULT;
++			left--;
++		}
++	}
++
++done:
++	*lenp -= left;
++	*ppos += *lenp;
++	return 0;
++}
++
++static int zero;
++
++#define	CTL_ENTRY(ctl, name)				\
++	{						\
++		.procname	= #name,		\
++		.data		= &vs_ ## name,		\
++		.maxlen		= sizeof(int),		\
++		.mode		= 0644,			\
++		.proc_handler	= &proc_dodebug,	\
++		.extra1		= &zero,		\
++		.extra2		= &zero,		\
++	}
++
++static ctl_table vserver_debug_table[] = {
++	CTL_ENTRY(CTL_DEBUG_SWITCH,	debug_switch),
++	CTL_ENTRY(CTL_DEBUG_XID,	debug_xid),
++	CTL_ENTRY(CTL_DEBUG_NID,	debug_nid),
++	CTL_ENTRY(CTL_DEBUG_TAG,	debug_tag),
++	CTL_ENTRY(CTL_DEBUG_NET,	debug_net),
++	CTL_ENTRY(CTL_DEBUG_LIMIT,	debug_limit),
++	CTL_ENTRY(CTL_DEBUG_CRES,	debug_cres),
++	CTL_ENTRY(CTL_DEBUG_DLIM,	debug_dlim),
++	CTL_ENTRY(CTL_DEBUG_QUOTA,	debug_quota),
++	CTL_ENTRY(CTL_DEBUG_CVIRT,	debug_cvirt),
++	CTL_ENTRY(CTL_DEBUG_SPACE,	debug_space),
++	CTL_ENTRY(CTL_DEBUG_PERM,	debug_perm),
++	CTL_ENTRY(CTL_DEBUG_MISC,	debug_misc),
++	{ 0 }
++};
++
++static ctl_table vserver_root_table[] = {
++	{
++		.procname	= "vserver",
++		.mode		= 0555,
++		.child		= vserver_debug_table
++	},
++	{ 0 }
++};
++
++
++static match_table_t tokens = {
++	{ CTL_DEBUG_SWITCH,	"switch=%x"	},
++	{ CTL_DEBUG_XID,	"xid=%x"	},
++	{ CTL_DEBUG_NID,	"nid=%x"	},
++	{ CTL_DEBUG_TAG,	"tag=%x"	},
++	{ CTL_DEBUG_NET,	"net=%x"	},
++	{ CTL_DEBUG_LIMIT,	"limit=%x"	},
++	{ CTL_DEBUG_CRES,	"cres=%x"	},
++	{ CTL_DEBUG_DLIM,	"dlim=%x"	},
++	{ CTL_DEBUG_QUOTA,	"quota=%x"	},
++	{ CTL_DEBUG_CVIRT,	"cvirt=%x"	},
++	{ CTL_DEBUG_SPACE,	"space=%x"	},
++	{ CTL_DEBUG_PERM,	"perm=%x"	},
++	{ CTL_DEBUG_MISC,	"misc=%x"	},
++	{ CTL_DEBUG_ERROR,	NULL		}
++};
++
++#define	HANDLE_CASE(id, name, val)				\
++	case CTL_DEBUG_ ## id:					\
++		vs_debug_ ## name = val;			\
++		printk("vs_debug_" #name "=0x%x\n", val);	\
++		break
++
++
++static int __init vs_debug_setup(char *str)
++{
++	char *p;
++	int token;
++
++	printk("vs_debug_setup(%s)\n", str);
++	while ((p = strsep(&str, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		unsigned int value;
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, tokens, args);
++		value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
++
++		switch (token) {
++		HANDLE_CASE(SWITCH, switch, value);
++		HANDLE_CASE(XID,    xid,    value);
++		HANDLE_CASE(NID,    nid,    value);
++		HANDLE_CASE(TAG,    tag,    value);
++		HANDLE_CASE(NET,    net,    value);
++		HANDLE_CASE(LIMIT,  limit,  value);
++		HANDLE_CASE(CRES,   cres,   value);
++		HANDLE_CASE(DLIM,   dlim,   value);
++		HANDLE_CASE(QUOTA,  quota,  value);
++		HANDLE_CASE(CVIRT,  cvirt,  value);
++		HANDLE_CASE(SPACE,  space,  value);
++		HANDLE_CASE(PERM,   perm,   value);
++		HANDLE_CASE(MISC,   misc,   value);
++		default:
++			return -EINVAL;
++			break;
++		}
++	}
++	return 1;
++}
++
++__setup("vsdebug=", vs_debug_setup);
++
++
++
++EXPORT_SYMBOL_GPL(vs_debug_switch);
++EXPORT_SYMBOL_GPL(vs_debug_xid);
++EXPORT_SYMBOL_GPL(vs_debug_nid);
++EXPORT_SYMBOL_GPL(vs_debug_net);
++EXPORT_SYMBOL_GPL(vs_debug_limit);
++EXPORT_SYMBOL_GPL(vs_debug_cres);
++EXPORT_SYMBOL_GPL(vs_debug_dlim);
++EXPORT_SYMBOL_GPL(vs_debug_quota);
++EXPORT_SYMBOL_GPL(vs_debug_cvirt);
++EXPORT_SYMBOL_GPL(vs_debug_space);
++EXPORT_SYMBOL_GPL(vs_debug_perm);
++EXPORT_SYMBOL_GPL(vs_debug_misc);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/tag.c linux-3.7.10-vs2.3.5.6/kernel/vserver/tag.c
+--- linux-3.7.10/kernel/vserver/tag.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/tag.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,63 @@
++/*
++ *  linux/kernel/vserver/tag.c
++ *
++ *  Virtual Server: Shallow Tag Space
++ *
++ *  Copyright (C) 2007  Herbert Pötzl
++ *
++ *  V0.01  basic implementation
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/vserver/debug.h>
++#include <linux/vs_pid.h>
++#include <linux/vs_tag.h>
++
++#include <linux/vserver/tag_cmd.h>
++
++
++int dx_migrate_task(struct task_struct *p, tag_t tag)
++{
++	if (!p)
++		BUG();
++
++	vxdprintk(VXD_CBIT(tag, 5),
++		"dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag);
++
++	task_lock(p);
++	p->tag = tag;
++	task_unlock(p);
++
++	vxdprintk(VXD_CBIT(tag, 5),
++		"moved task %p into [#%d]", p, tag);
++	return 0;
++}
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++
++int vc_task_tag(uint32_t id)
++{
++	tag_t tag;
++
++	if (id) {
++		struct task_struct *tsk;
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		tag = (tsk) ? tsk->tag : -ESRCH;
++		rcu_read_unlock();
++	} else
++		tag = dx_current_tag();
++	return tag;
++}
++
++
++int vc_tag_migrate(uint32_t tag)
++{
++	return dx_migrate_task(current, tag & 0xFFFF);
++}
++
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/vci_config.h linux-3.7.10-vs2.3.5.6/kernel/vserver/vci_config.h
+--- linux-3.7.10/kernel/vserver/vci_config.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/vci_config.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,80 @@
++
++/*  interface version */
++
++#define VCI_VERSION		0x00020308
++
++
++enum {
++	VCI_KCBIT_NO_DYNAMIC = 0,
++
++	VCI_KCBIT_PROC_SECURE = 4,
++	/* VCI_KCBIT_HARDCPU = 5, */
++	/* VCI_KCBIT_IDLELIMIT = 6, */
++	/* VCI_KCBIT_IDLETIME = 7, */
++
++	VCI_KCBIT_COWBL = 8,
++	VCI_KCBIT_FULLCOWBL = 9,
++	VCI_KCBIT_SPACES = 10,
++	VCI_KCBIT_NETV2 = 11,
++	VCI_KCBIT_MEMCG = 12,
++	VCI_KCBIT_MEMCG_SWAP = 13,
++
++	VCI_KCBIT_DEBUG = 16,
++	VCI_KCBIT_HISTORY = 20,
++	VCI_KCBIT_TAGGED = 24,
++	VCI_KCBIT_PPTAG = 28,
++
++	VCI_KCBIT_MORE = 31,
++};
++
++
++static inline uint32_t vci_kernel_config(void)
++{
++	return
++	(1 << VCI_KCBIT_NO_DYNAMIC) |
++
++	/* configured features */
++#ifdef	CONFIG_VSERVER_PROC_SECURE
++	(1 << VCI_KCBIT_PROC_SECURE) |
++#endif
++#ifdef	CONFIG_VSERVER_COWBL
++	(1 << VCI_KCBIT_COWBL) |
++	(1 << VCI_KCBIT_FULLCOWBL) |
++#endif
++	(1 << VCI_KCBIT_SPACES) |
++	(1 << VCI_KCBIT_NETV2) |
++#ifdef	CONFIG_MEMCG
++	(1 << VCI_KCBIT_MEMCG) |
++#endif
++#ifdef	CONFIG_MEMCG_SWAP
++	(1 << VCI_KCBIT_MEMCG_SWAP) |
++#endif
++
++	/* debug options */
++#ifdef	CONFIG_VSERVER_DEBUG
++	(1 << VCI_KCBIT_DEBUG) |
++#endif
++#ifdef	CONFIG_VSERVER_HISTORY
++	(1 << VCI_KCBIT_HISTORY) |
++#endif
++
++	/* inode context tagging */
++#if	defined(CONFIG_TAGGING_NONE)
++	(0 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_UID16)
++	(1 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_GID16)
++	(2 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_ID24)
++	(3 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_INTERN)
++	(4 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_RUNTIME)
++	(5 << VCI_KCBIT_TAGGED) |
++#else
++	(7 << VCI_KCBIT_TAGGED) |
++#endif
++	(1 << VCI_KCBIT_PPTAG) |
++	0;
++}
++
+diff -NurpP --minimal linux-3.7.10/mm/memcontrol.c linux-3.7.10-vs2.3.5.6/mm/memcontrol.c
+--- linux-3.7.10/mm/memcontrol.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/memcontrol.c	2012-12-18 15:13:16.000000000 +0000
+@@ -884,6 +884,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ 	return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
+ }
+ 
++u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
++{
++	return res_counter_read_u64(&mem->res, member);
++}
++
++u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member)
++{
++	return res_counter_read_u64(&mem->memsw, member);
++}
++
++s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE);
++}
++
++s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS);
++}
++
++s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED);
++}
++
+ struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
+ {
+ 	struct mem_cgroup *memcg = NULL;
+diff -NurpP --minimal linux-3.7.10/mm/oom_kill.c linux-3.7.10-vs2.3.5.6/mm/oom_kill.c
+--- linux-3.7.10/mm/oom_kill.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/oom_kill.c	2012-12-18 15:13:16.000000000 +0000
+@@ -35,6 +35,8 @@
+ #include <linux/freezer.h>
+ #include <linux/ftrace.h>
+ #include <linux/ratelimit.h>
++#include <linux/reboot.h>
++#include <linux/vs_context.h>
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/oom.h>
+@@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(st
+ static bool oom_unkillable_task(struct task_struct *p,
+ 		const struct mem_cgroup *memcg, const nodemask_t *nodemask)
+ {
+-	if (is_global_init(p))
++	unsigned xid = vx_current_xid();
++
++	/* skip the init task, global and per guest */
++	if (task_is_init(p))
+ 		return true;
+ 	if (p->flags & PF_KTHREAD)
+ 		return true;
+ 
++	/* skip other guest and host processes if oom in guest */
++	if (xid && vx_task_xid(p) != xid)
++		return true;
++
+ 	/* When mem_cgroup_out_of_memory() and p is not member of the group */
+ 	if (memcg && !task_in_mem_cgroup(p, memcg))
+ 		return true;
+@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct
+ 		dump_header(p, gfp_mask, order, memcg, nodemask);
+ 
+ 	task_lock(p);
+-	pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n",
+-		message, task_pid_nr(p), p->comm, points);
++	pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
++		message, task_pid_nr(p), p->xid, p->comm, points);
+ 	task_unlock(p);
+ 
+ 	/*
+@@ -518,8 +527,8 @@ void oom_kill_process(struct task_struct
+ 
+ 	/* mm cannot safely be dereferenced after task_unlock(victim) */
+ 	mm = victim->mm;
+-	pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+-		task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
++	pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
++		task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
+ 		K(get_mm_counter(victim->mm, MM_ANONPAGES)),
+ 		K(get_mm_counter(victim->mm, MM_FILEPAGES)));
+ 	task_unlock(victim);
+@@ -589,6 +598,8 @@ int unregister_oom_notifier(struct notif
+ }
+ EXPORT_SYMBOL_GPL(unregister_oom_notifier);
+ 
++long vs_oom_action(unsigned int);
++
+ /*
+  * Try to acquire the OOM killer lock for the zones in zonelist.  Returns zero
+  * if a parallel OOM killing is already taking place that includes a zone in
+@@ -738,7 +749,12 @@ void out_of_memory(struct zonelist *zone
+ 	/* Found nothing?!?! Either we hang forever, or we panic. */
+ 	if (!p) {
+ 		dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
+-		panic("Out of memory and no killable processes...\n");
++
++		/* avoid panic for guest OOM */
++		if (vx_current_xid())
++			vs_oom_action(LINUX_REBOOT_CMD_OOM);
++		else
++			panic("Out of memory and no killable processes...\n");
+ 	}
+ 	if (PTR_ERR(p) != -1UL) {
+ 		oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
+diff -NurpP --minimal linux-3.7.10/mm/page_alloc.c linux-3.7.10-vs2.3.5.6/mm/page_alloc.c
+--- linux-3.7.10/mm/page_alloc.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/page_alloc.c	2013-03-02 15:26:03.000000000 +0000
+@@ -58,6 +58,8 @@
+ #include <linux/prefetch.h>
+ #include <linux/migrate.h>
+ #include <linux/page-debug-flags.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/tlbflush.h>
+ #include <asm/div64.h>
+@@ -2813,6 +2815,9 @@ void si_meminfo(struct sysinfo *val)
+ 	val->totalhigh = totalhigh_pages;
+ 	val->freehigh = nr_free_highpages();
+ 	val->mem_unit = PAGE_SIZE;
++
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_meminfo(val);
+ }
+ 
+ EXPORT_SYMBOL(si_meminfo);
+@@ -2833,6 +2838,9 @@ void si_meminfo_node(struct sysinfo *val
+ 	val->freehigh = 0;
+ #endif
+ 	val->mem_unit = PAGE_SIZE;
++
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_meminfo(val);
+ }
+ #endif
+ 
+diff -NurpP --minimal linux-3.7.10/mm/pgtable-generic.c linux-3.7.10-vs2.3.5.6/mm/pgtable-generic.c
+--- linux-3.7.10/mm/pgtable-generic.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/pgtable-generic.c	2012-12-18 15:13:16.000000000 +0000
+@@ -6,6 +6,8 @@
+  *  Copyright (C) 2010  Linus Torvalds
+  */
+ 
++#include <linux/mm.h>
++
+ #include <linux/pagemap.h>
+ #include <asm/tlb.h>
+ #include <asm-generic/pgtable.h>
+diff -NurpP --minimal linux-3.7.10/mm/shmem.c linux-3.7.10-vs2.3.5.6/mm/shmem.c
+--- linux-3.7.10/mm/shmem.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/shmem.c	2013-03-02 15:26:03.000000000 +0000
+@@ -1820,7 +1820,7 @@ static int shmem_statfs(struct dentry *d
+ {
+ 	struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
+ 
+-	buf->f_type = TMPFS_MAGIC;
++	buf->f_type = TMPFS_SUPER_MAGIC;
+ 	buf->f_bsize = PAGE_CACHE_SIZE;
+ 	buf->f_namelen = NAME_MAX;
+ 	if (sbinfo->max_blocks) {
+@@ -2510,7 +2510,7 @@ int shmem_fill_super(struct super_block
+ 	sb->s_maxbytes = MAX_LFS_FILESIZE;
+ 	sb->s_blocksize = PAGE_CACHE_SIZE;
+ 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+-	sb->s_magic = TMPFS_MAGIC;
++	sb->s_magic = TMPFS_SUPER_MAGIC;
+ 	sb->s_op = &shmem_ops;
+ 	sb->s_time_gran = 1;
+ #ifdef CONFIG_TMPFS_XATTR
+diff -NurpP --minimal linux-3.7.10/mm/slab.c linux-3.7.10-vs2.3.5.6/mm/slab.c
+--- linux-3.7.10/mm/slab.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/slab.c	2012-12-18 15:13:16.000000000 +0000
+@@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_
+ #define STATS_INC_FREEMISS(x)	do { } while (0)
+ #endif
+ 
++#include "slab_vs.h"
++
+ #if DEBUG
+ 
+ /*
+@@ -3479,6 +3481,7 @@ retry:
+ 
+ 	obj = slab_get_obj(cachep, slabp, nodeid);
+ 	check_slabp(cachep, slabp);
++	vx_slab_alloc(cachep, flags);
+ 	l3->free_objects--;
+ 	/* move slabp to correct slabp list: */
+ 	list_del(&slabp->list);
+@@ -3556,6 +3559,7 @@ slab_alloc_node(struct kmem_cache *cache
+ 	/* ___cache_alloc_node can fall back to other nodes */
+ 	ptr = ____cache_alloc_node(cachep, flags, nodeid);
+   out:
++	vx_slab_alloc(cachep, flags);
+ 	local_irq_restore(save_flags);
+ 	ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
+ 	kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
+@@ -3746,6 +3750,7 @@ static inline void __cache_free(struct k
+ 	check_irq_off();
+ 	kmemleak_free_recursive(objp, cachep->flags);
+ 	objp = cache_free_debugcheck(cachep, objp, caller);
++	vx_slab_free(cachep);
+ 
+ 	kmemcheck_slab_free(cachep, objp, cachep->object_size);
+ 
+diff -NurpP --minimal linux-3.7.10/mm/slab_vs.h linux-3.7.10-vs2.3.5.6/mm/slab_vs.h
+--- linux-3.7.10/mm/slab_vs.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/slab_vs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,29 @@
++
++#include <linux/vserver/context.h>
++
++#include <linux/vs_context.h>
++
++static inline
++void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
++{
++	int what = gfp_zone(cachep->allocflags);
++	struct vx_info *vxi = current_vx_info();
++
++	if (!vxi)
++		return;
++
++	atomic_add(cachep->size, &vxi->cacct.slab[what]);
++}
++
++static inline
++void vx_slab_free(struct kmem_cache *cachep)
++{
++	int what = gfp_zone(cachep->allocflags);
++	struct vx_info *vxi = current_vx_info();
++
++	if (!vxi)
++		return;
++
++	atomic_sub(cachep->size, &vxi->cacct.slab[what]);
++}
++
+diff -NurpP --minimal linux-3.7.10/mm/swapfile.c linux-3.7.10-vs2.3.5.6/mm/swapfile.c
+--- linux-3.7.10/mm/swapfile.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/swapfile.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <asm/tlbflush.h>
+ #include <linux/swapops.h>
+ #include <linux/page_cgroup.h>
++#include <linux/vs_base.h>
+ 
+ static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
+ 				 unsigned char);
+@@ -1685,6 +1686,16 @@ static int swap_show(struct seq_file *sw
+ 
+ 	if (si == SEQ_START_TOKEN) {
+ 		seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
++		if (vx_flags(VXF_VIRT_MEM, 0)) {
++			struct sysinfo si;
++
++			vx_vsi_swapinfo(&si);
++			if (si.totalswap < (1 << 10))
++				return 0;
++			seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
++				"hdv0", "partition", si.totalswap >> 10,
++				(si.totalswap - si.freeswap) >> 10, -1);
++		}
+ 		return 0;
+ 	}
+ 
+@@ -2112,6 +2123,8 @@ void si_swapinfo(struct sysinfo *val)
+ 	val->freeswap = nr_swap_pages + nr_to_be_unused;
+ 	val->totalswap = total_swap_pages + nr_to_be_unused;
+ 	spin_unlock(&swap_lock);
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_swapinfo(val);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/net/bridge/br_multicast.c linux-3.7.10-vs2.3.5.6/net/bridge/br_multicast.c
+--- linux-3.7.10/net/bridge/br_multicast.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/bridge/br_multicast.c	2012-12-18 15:13:16.000000000 +0000
+@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
+ 	ip6h->hop_limit = 1;
+ 	ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
+ 	if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
+-			       &ip6h->saddr)) {
++			       &ip6h->saddr, NULL)) {
+ 		kfree_skb(skb);
+ 		return NULL;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/core/dev.c linux-3.7.10-vs2.3.5.6/net/core/dev.c
+--- linux-3.7.10/net/core/dev.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/core/dev.c	2013-02-19 14:41:41.000000000 +0000
+@@ -126,6 +126,7 @@
+ #include <linux/in.h>
+ #include <linux/jhash.h>
+ #include <linux/random.h>
++#include <linux/vs_inet.h>
+ #include <trace/events/napi.h>
+ #include <trace/events/net.h>
+ #include <trace/events/skb.h>
+@@ -620,7 +621,8 @@ struct net_device *__dev_get_by_name(str
+ 	struct hlist_head *head = dev_name_hash(net, name);
+ 
+ 	hlist_for_each_entry(dev, p, head, name_hlist)
+-		if (!strncmp(dev->name, name, IFNAMSIZ))
++		if (!strncmp(dev->name, name, IFNAMSIZ) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -646,7 +648,8 @@ struct net_device *dev_get_by_name_rcu(s
+ 	struct hlist_head *head = dev_name_hash(net, name);
+ 
+ 	hlist_for_each_entry_rcu(dev, p, head, name_hlist)
+-		if (!strncmp(dev->name, name, IFNAMSIZ))
++		if (!strncmp(dev->name, name, IFNAMSIZ) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -697,7 +700,8 @@ struct net_device *__dev_get_by_index(st
+ 	struct hlist_head *head = dev_index_hash(net, ifindex);
+ 
+ 	hlist_for_each_entry(dev, p, head, index_hlist)
+-		if (dev->ifindex == ifindex)
++		if ((dev->ifindex == ifindex) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -715,7 +719,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+  *	about locking. The caller must hold RCU lock.
+  */
+ 
+-struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
+ {
+ 	struct hlist_node *p;
+ 	struct net_device *dev;
+@@ -727,6 +731,16 @@ struct net_device *dev_get_by_index_rcu(
+ 
+ 	return NULL;
+ }
++EXPORT_SYMBOL(dev_get_by_index_real_rcu);
++
++struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++{
++	struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
++
++	if (nx_dev_visible(current_nx_info(), dev))
++		return dev;
++	return NULL;
++}
+ EXPORT_SYMBOL(dev_get_by_index_rcu);
+ 
+ 
+@@ -775,7 +789,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+ 
+ 	for_each_netdev_rcu(net, dev)
+ 		if (dev->type == type &&
+-		    !memcmp(dev->dev_addr, ha, dev->addr_len))
++		    !memcmp(dev->dev_addr, ha, dev->addr_len) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -787,9 +802,11 @@ struct net_device *__dev_getfirstbyhwtyp
+ 	struct net_device *dev;
+ 
+ 	ASSERT_RTNL();
+-	for_each_netdev(net, dev)
+-		if (dev->type == type)
++	for_each_netdev(net, dev) {
++		if ((dev->type == type) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
++	}
+ 
+ 	return NULL;
+ }
+@@ -907,6 +924,8 @@ static int __dev_alloc_name(struct net *
+ 				continue;
+ 			if (i < 0 || i >= max_netdevices)
+ 				continue;
++			if (!nx_dev_visible(current_nx_info(), d))
++				continue;
+ 
+ 			/*  avoid cases where sscanf is not exact inverse of printf */
+ 			snprintf(buf, IFNAMSIZ, name, i);
+@@ -4129,6 +4148,8 @@ static int dev_ifconf(struct net *net, c
+ 
+ 	total = 0;
+ 	for_each_netdev(net, dev) {
++		if (!nx_dev_visible(current_nx_info(), dev))
++			continue;
+ 		for (i = 0; i < NPROTO; i++) {
+ 			if (gifconf_list[i]) {
+ 				int done;
+@@ -4231,6 +4252,10 @@ static void dev_seq_printf_stats(struct
+ 	struct rtnl_link_stats64 temp;
+ 	const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
+ 
++	/* device visible inside network context? */
++	if (!nx_dev_visible(current_nx_info(), dev))
++		return;
++
+ 	seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
+ 		   "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
+ 		   dev->name, stats->rx_bytes, stats->rx_packets,
+diff -NurpP --minimal linux-3.7.10/net/core/rtnetlink.c linux-3.7.10-vs2.3.5.6/net/core/rtnetlink.c
+--- linux-3.7.10/net/core/rtnetlink.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/core/rtnetlink.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+ 		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+ 			if (idx < s_idx)
+ 				goto cont;
++			if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
++				continue;
+ 			if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
+ 					     NETLINK_CB(cb->skb).portid,
+ 					     cb->nlh->nlmsg_seq, 0,
+@@ -1971,6 +1973,9 @@ void rtmsg_ifinfo(int type, struct net_d
+ 	int err = -ENOBUFS;
+ 	size_t if_info_size;
+ 
++	if (!nx_dev_visible(current_nx_info(), dev))
++		return;
++
+ 	skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
+ 	if (skb == NULL)
+ 		goto errout;
+diff -NurpP --minimal linux-3.7.10/net/core/sock.c linux-3.7.10-vs2.3.5.6/net/core/sock.c
+--- linux-3.7.10/net/core/sock.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/core/sock.c	2012-12-18 15:13:16.000000000 +0000
+@@ -132,6 +132,10 @@
+ #include <net/netprio_cgroup.h>
+ 
+ #include <linux/filter.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ 
+ #include <trace/events/sock.h>
+ 
+@@ -1183,6 +1187,8 @@ static struct sock *sk_prot_alloc(struct
+ 			goto out_free_sec;
+ 		sk_tx_queue_clear(sk);
+ 	}
++		sock_vx_init(sk);
++		sock_nx_init(sk);
+ 
+ 	return sk;
+ 
+@@ -1295,6 +1301,11 @@ static void __sk_free(struct sock *sk)
+ 		put_cred(sk->sk_peer_cred);
+ 	put_pid(sk->sk_peer_pid);
+ 	put_net(sock_net(sk));
++	vx_sock_dec(sk);
++	clr_vx_info(&sk->sk_vx_info);
++	sk->sk_xid = -1;
++	clr_nx_info(&sk->sk_nx_info);
++	sk->sk_nid = -1;
+ 	sk_prot_free(sk->sk_prot_creator, sk);
+ }
+ 
+@@ -1355,6 +1366,8 @@ struct sock *sk_clone_lock(const struct
+ 
+ 		/* SANITY */
+ 		get_net(sock_net(newsk));
++		sock_vx_init(newsk);
++		sock_nx_init(newsk);
+ 		sk_node_init(&newsk->sk_node);
+ 		sock_lock_init(newsk);
+ 		bh_lock_sock(newsk);
+@@ -1411,6 +1424,12 @@ struct sock *sk_clone_lock(const struct
+ 		smp_wmb();
+ 		atomic_set(&newsk->sk_refcnt, 2);
+ 
++		set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
++		newsk->sk_xid = sk->sk_xid;
++		vx_sock_inc(newsk);
++		set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info);
++		newsk->sk_nid = sk->sk_nid;
++
+ 		/*
+ 		 * Increment the counter in the same struct proto as the master
+ 		 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
+@@ -2206,6 +2225,12 @@ void sock_init_data(struct socket *sock,
+ 
+ 	sk->sk_stamp = ktime_set(-1L, 0);
+ 
++	set_vx_info(&sk->sk_vx_info, current_vx_info());
++	sk->sk_xid = vx_current_xid();
++	vx_sock_inc(sk);
++	set_nx_info(&sk->sk_nx_info, current_nx_info());
++	sk->sk_nid = nx_current_nid();
++
+ 	/*
+ 	 * Before updating sk_refcnt, we must commit prior changes to memory
+ 	 * (Documentation/RCU/rculist_nulls.txt for details)
+diff -NurpP --minimal linux-3.7.10/net/ipv4/af_inet.c linux-3.7.10-vs2.3.5.6/net/ipv4/af_inet.c
+--- linux-3.7.10/net/ipv4/af_inet.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/af_inet.c	2012-12-18 15:13:16.000000000 +0000
+@@ -118,6 +118,7 @@
+ #ifdef CONFIG_IP_MROUTE
+ #include <linux/mroute.h>
+ #endif
++#include <linux/vs_limit.h>
+ 
+ 
+ /* The inetsw table contains everything that inet_create needs to
+@@ -346,9 +347,13 @@ lookup_protocol:
+ 	}
+ 
+ 	err = -EPERM;
++	if ((protocol == IPPROTO_ICMP) &&
++		nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
++		goto override;
++
+ 	if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ 		goto out_rcu_unlock;
+-
++override:
+ 	err = -EAFNOSUPPORT;
+ 	if (!inet_netns_ok(net, protocol))
+ 		goto out_rcu_unlock;
+@@ -473,6 +478,7 @@ int inet_bind(struct socket *sock, struc
+ 	struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
+ 	struct sock *sk = sock->sk;
+ 	struct inet_sock *inet = inet_sk(sk);
++	struct nx_v4_sock_addr nsa;
+ 	unsigned short snum;
+ 	int chk_addr_ret;
+ 	int err;
+@@ -496,7 +502,11 @@ int inet_bind(struct socket *sock, struc
+ 			goto out;
+ 	}
+ 
+-	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
++	err = v4_map_sock_addr(inet, addr, &nsa);
++	if (err)
++		goto out;
++
++	chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
+ 
+ 	/* Not specified by any standard per-se, however it breaks too
+ 	 * many applications when removed.  It is unfortunate since
+@@ -508,7 +518,7 @@ int inet_bind(struct socket *sock, struc
+ 	err = -EADDRNOTAVAIL;
+ 	if (!sysctl_ip_nonlocal_bind &&
+ 	    !(inet->freebind || inet->transparent) &&
+-	    addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
++	    nsa.saddr != htonl(INADDR_ANY) &&
+ 	    chk_addr_ret != RTN_LOCAL &&
+ 	    chk_addr_ret != RTN_MULTICAST &&
+ 	    chk_addr_ret != RTN_BROADCAST)
+@@ -533,7 +543,7 @@ int inet_bind(struct socket *sock, struc
+ 	if (sk->sk_state != TCP_CLOSE || inet->inet_num)
+ 		goto out_release_sock;
+ 
+-	inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++	v4_set_sock_addr(inet, &nsa);
+ 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
+ 		inet->inet_saddr = 0;  /* Use device */
+ 
+@@ -752,11 +762,13 @@ int inet_getname(struct socket *sock, st
+ 		     peer == 1))
+ 			return -ENOTCONN;
+ 		sin->sin_port = inet->inet_dport;
+-		sin->sin_addr.s_addr = inet->inet_daddr;
++		sin->sin_addr.s_addr =
++			nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr);
+ 	} else {
+ 		__be32 addr = inet->inet_rcv_saddr;
+ 		if (!addr)
+ 			addr = inet->inet_saddr;
++		addr = nx_map_sock_lback(sk->sk_nx_info, addr);
+ 		sin->sin_port = inet->inet_sport;
+ 		sin->sin_addr.s_addr = addr;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/ipv4/arp.c linux-3.7.10-vs2.3.5.6/net/ipv4/arp.c
+--- linux-3.7.10/net/ipv4/arp.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/arp.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc
+ 	struct net_device *dev = n->dev;
+ 	int hatype = dev->type;
+ 
++	/* FIXME: check for network context */
+ 	read_lock(&n->lock);
+ 	/* Convert hardware address to XX:XX:XX:XX ... form. */
+ #if IS_ENABLED(CONFIG_AX25)
+@@ -1349,6 +1350,7 @@ static void arp_format_pneigh_entry(stru
+ 	int hatype = dev ? dev->type : 0;
+ 	char tbuf[16];
+ 
++	/* FIXME: check for network context */
+ 	sprintf(tbuf, "%pI4", n->key);
+ 	seq_printf(seq, "%-16s 0x%-10x0x%-10x%s     *        %s\n",
+ 		   tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
+diff -NurpP --minimal linux-3.7.10/net/ipv4/devinet.c linux-3.7.10-vs2.3.5.6/net/ipv4/devinet.c
+--- linux-3.7.10/net/ipv4/devinet.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/devinet.c	2012-12-18 15:13:16.000000000 +0000
+@@ -513,6 +513,7 @@ struct in_device *inetdev_by_index(struc
+ }
+ EXPORT_SYMBOL(inetdev_by_index);
+ 
++
+ /* Called only from RTNL semaphored context. No locks. */
+ 
+ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
+@@ -754,6 +755,8 @@ int devinet_ioctl(struct net *net, unsig
+ 
+ 	in_dev = __in_dev_get_rtnl(dev);
+ 	if (in_dev) {
++		struct nx_info *nxi = current_nx_info();
++
+ 		if (tryaddrmatch) {
+ 			/* Matthias Andree */
+ 			/* compare label and address (4.4BSD style) */
+@@ -762,6 +765,8 @@ int devinet_ioctl(struct net *net, unsig
+ 			   This is checked above. */
+ 			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
+ 			     ifap = &ifa->ifa_next) {
++				if (!nx_v4_ifa_visible(nxi, ifa))
++					continue;
+ 				if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
+ 				    sin_orig.sin_addr.s_addr ==
+ 							ifa->ifa_local) {
+@@ -774,9 +779,12 @@ int devinet_ioctl(struct net *net, unsig
+ 		   comparing just the label */
+ 		if (!ifa) {
+ 			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
+-			     ifap = &ifa->ifa_next)
++			     ifap = &ifa->ifa_next) {
++				if (!nx_v4_ifa_visible(nxi, ifa))
++					continue;
+ 				if (!strcmp(ifr.ifr_name, ifa->ifa_label))
+ 					break;
++			}
+ 		}
+ 	}
+ 
+@@ -929,6 +937,8 @@ static int inet_gifconf(struct net_devic
+ 		goto out;
+ 
+ 	for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
++		if (!nx_v4_ifa_visible(current_nx_info(), ifa))
++			continue;
+ 		if (!buf) {
+ 			done += sizeof(ifr);
+ 			continue;
+@@ -1288,6 +1298,7 @@ static int inet_dump_ifaddr(struct sk_bu
+ 	struct net_device *dev;
+ 	struct in_device *in_dev;
+ 	struct in_ifaddr *ifa;
++	struct sock *sk = skb->sk;
+ 	struct hlist_head *head;
+ 	struct hlist_node *node;
+ 
+@@ -1310,6 +1321,8 @@ static int inet_dump_ifaddr(struct sk_bu
+ 
+ 			for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
+ 			     ifa = ifa->ifa_next, ip_idx++) {
++			if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa))
++				continue;
+ 				if (ip_idx < s_ip_idx)
+ 					continue;
+ 				if (inet_fill_ifaddr(skb, ifa,
+diff -NurpP --minimal linux-3.7.10/net/ipv4/fib_trie.c linux-3.7.10-vs2.3.5.6/net/ipv4/fib_trie.c
+--- linux-3.7.10/net/ipv4/fib_trie.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/fib_trie.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2557,6 +2557,7 @@ static int fib_route_seq_show(struct seq
+ 			    || fa->fa_type == RTN_MULTICAST)
+ 				continue;
+ 
++			/* FIXME: check for network context? */
+ 			if (fi)
+ 				seq_printf(seq,
+ 					 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
+diff -NurpP --minimal linux-3.7.10/net/ipv4/inet_connection_sock.c linux-3.7.10-vs2.3.5.6/net/ipv4/inet_connection_sock.c
+--- linux-3.7.10/net/ipv4/inet_connection_sock.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/inet_connection_sock.c	2013-01-16 00:19:03.000000000 +0000
+@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
+ }
+ EXPORT_SYMBOL(inet_get_local_port_range);
+ 
++int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
++{
++	__be32	sk1_rcv_saddr = sk_rcv_saddr(sk1),
++		sk2_rcv_saddr = sk_rcv_saddr(sk2);
++
++	if (inet_v6_ipv6only(sk2))
++		return 0;
++
++	if (sk1_rcv_saddr &&
++	    sk2_rcv_saddr &&
++	    sk1_rcv_saddr == sk2_rcv_saddr)
++		return 1;
++
++	if (sk1_rcv_saddr &&
++	    !sk2_rcv_saddr &&
++	    v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, NXA_MASK_BIND))
++		return 1;
++
++	if (sk2_rcv_saddr &&
++	    !sk1_rcv_saddr &&
++	    v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, NXA_MASK_BIND))
++		return 1;
++
++	if (!sk1_rcv_saddr &&
++	    !sk2_rcv_saddr &&
++	    nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info))
++		return 1;
++
++	return 0;
++}
++
+ int inet_csk_bind_conflict(const struct sock *sk,
+ 			   const struct inet_bind_bucket *tb, bool relax)
+ {
+@@ -75,9 +106,7 @@ int inet_csk_bind_conflict(const struct
+ 		     sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
+ 			if (!reuse || !sk2->sk_reuse ||
+ 			    sk2->sk_state == TCP_LISTEN) {
+-				const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
+-				if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) ||
+-				    sk2_rcv_saddr == sk_rcv_saddr(sk))
++				if (ipv4_rcv_saddr_equal(sk, sk2))
+ 					break;
+ 			}
+ 			if (!relax && reuse && sk2->sk_reuse &&
+diff -NurpP --minimal linux-3.7.10/net/ipv4/inet_diag.c linux-3.7.10-vs2.3.5.6/net/ipv4/inet_diag.c
+--- linux-3.7.10/net/ipv4/inet_diag.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/inet_diag.c	2012-12-18 15:13:16.000000000 +0000
+@@ -31,6 +31,8 @@
+ 
+ #include <linux/inet.h>
+ #include <linux/stddef.h>
++#include <linux/vs_network.h>
++#include <linux/vs_inet.h>
+ 
+ #include <linux/inet_diag.h>
+ #include <linux/sock_diag.h>
+@@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+ 
+ 	r->id.idiag_sport = inet->inet_sport;
+ 	r->id.idiag_dport = inet->inet_dport;
+-	r->id.idiag_src[0] = inet->inet_rcv_saddr;
+-	r->id.idiag_dst[0] = inet->inet_daddr;
++	r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info,
++		inet->inet_rcv_saddr);
++	r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info,
++		inet->inet_daddr);
+ 
+ 	/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
+ 	 * hence this needs to be included regardless of socket family.
+@@ -239,8 +243,8 @@ static int inet_twsk_diag_fill(struct in
+ 	sock_diag_save_cookie(tw, r->id.idiag_cookie);
+ 	r->id.idiag_sport     = tw->tw_sport;
+ 	r->id.idiag_dport     = tw->tw_dport;
+-	r->id.idiag_src[0]    = tw->tw_rcv_saddr;
+-	r->id.idiag_dst[0]    = tw->tw_daddr;
++	r->id.idiag_src[0]    = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr);
++	r->id.idiag_dst[0]    = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr);
+ 	r->idiag_state	      = tw->tw_substate;
+ 	r->idiag_timer	      = 3;
+ 	r->idiag_expires      = DIV_ROUND_UP(tmo * 1000, HZ);
+@@ -284,12 +288,14 @@ int inet_diag_dump_one_icsk(struct inet_
+ 
+ 	err = -EINVAL;
+ 	if (req->sdiag_family == AF_INET) {
++		/* TODO: lback */
+ 		sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
+ 				 req->id.idiag_dport, req->id.idiag_src[0],
+ 				 req->id.idiag_sport, req->id.idiag_if);
+ 	}
+ #if IS_ENABLED(CONFIG_IPV6)
+ 	else if (req->sdiag_family == AF_INET6) {
++		/* TODO: lback */
+ 		sk = inet6_lookup(net, hashinfo,
+ 				  (struct in6_addr *)req->id.idiag_dst,
+ 				  req->id.idiag_dport,
+@@ -491,6 +497,7 @@ int inet_diag_bc_sk(const struct nlattr
+ 	} else
+ #endif
+ 	{
++			/* TODO: lback */
+ 		entry.saddr = &inet->inet_rcv_saddr;
+ 		entry.daddr = &inet->inet_daddr;
+ 	}
+@@ -649,6 +656,7 @@ static int inet_twsk_diag_dump(struct in
+ 		} else
+ #endif
+ 		{
++			/* TODO: lback */
+ 			entry.saddr = &tw->tw_rcv_saddr;
+ 			entry.daddr = &tw->tw_daddr;
+ 		}
+@@ -727,8 +735,8 @@ static int inet_diag_fill_req(struct sk_
+ 
+ 	r->id.idiag_sport = inet->inet_sport;
+ 	r->id.idiag_dport = ireq->rmt_port;
+-	r->id.idiag_src[0] = ireq->loc_addr;
+-	r->id.idiag_dst[0] = ireq->rmt_addr;
++	r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr);
++	r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr);
+ 	r->idiag_expires = jiffies_to_msecs(tmo);
+ 	r->idiag_rqueue = 0;
+ 	r->idiag_wqueue = 0;
+@@ -791,6 +799,7 @@ static int inet_diag_dump_reqs(struct sk
+ 			    r->id.idiag_dport)
+ 				continue;
+ 
++			/* TODO: lback */
+ 			if (bc) {
+ 				inet_diag_req_addrs(sk, req, &entry);
+ 				entry.dport = ntohs(ireq->rmt_port);
+@@ -847,6 +856,8 @@ void inet_diag_dump_icsk(struct inet_has
+ 				if (!net_eq(sock_net(sk), net))
+ 					continue;
+ 
++				if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (num < s_num) {
+ 					num++;
+ 					continue;
+@@ -919,6 +930,8 @@ skip_listen_ht:
+ 
+ 			if (!net_eq(sock_net(sk), net))
+ 				continue;
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (num < s_num)
+ 				goto next_normal;
+ 			if (!(r->idiag_states & (1 << sk->sk_state)))
+@@ -947,7 +960,8 @@ next_normal:
+ 				    &head->twchain) {
+ 				if (!net_eq(twsk_net(tw), net))
+ 					continue;
+-
++				if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (num < s_num)
+ 					goto next_dying;
+ 				if (r->sdiag_family != AF_UNSPEC &&
+diff -NurpP --minimal linux-3.7.10/net/ipv4/inet_hashtables.c linux-3.7.10-vs2.3.5.6/net/ipv4/inet_hashtables.c
+--- linux-3.7.10/net/ipv4/inet_hashtables.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/inet_hashtables.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
++#include <net/route.h>
+ #include <net/ip.h>
+ 
+ /*
+@@ -156,6 +157,11 @@ static inline int compute_score(struct s
+ 			if (rcv_saddr != daddr)
+ 				return -1;
+ 			score += 2;
++		} else {
++			/* block non nx_info ips */
++			if (!v4_addr_in_nx_info(sk->sk_nx_info,
++				daddr, NXA_MASK_BIND))
++				return -1;
+ 		}
+ 		if (sk->sk_bound_dev_if) {
+ 			if (sk->sk_bound_dev_if != dif)
+@@ -173,7 +179,6 @@ static inline int compute_score(struct s
+  * wildcarded during the search since they can never be otherwise.
+  */
+ 
+-
+ struct sock *__inet_lookup_listener(struct net *net,
+ 				    struct inet_hashinfo *hashinfo,
+ 				    const __be32 daddr, const unsigned short hnum,
+@@ -196,6 +201,7 @@ begin:
+ 			hiscore = score;
+ 		}
+ 	}
++
+ 	/*
+ 	 * if the nulls value we got at the end of this lookup is
+ 	 * not the expected one, we must restart lookup.
+diff -NurpP --minimal linux-3.7.10/net/ipv4/netfilter.c linux-3.7.10-vs2.3.5.6/net/ipv4/netfilter.c
+--- linux-3.7.10/net/ipv4/netfilter.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/netfilter.c	2012-12-18 15:13:16.000000000 +0000
+@@ -6,7 +6,7 @@
+ #include <linux/skbuff.h>
+ #include <linux/gfp.h>
+ #include <linux/export.h>
+-#include <net/route.h>
++// #include <net/route.h>
+ #include <net/xfrm.h>
+ #include <net/ip.h>
+ #include <net/netfilter/nf_queue.h>
+diff -NurpP --minimal linux-3.7.10/net/ipv4/raw.c linux-3.7.10-vs2.3.5.6/net/ipv4/raw.c
+--- linux-3.7.10/net/ipv4/raw.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/raw.c	2013-02-19 14:41:41.000000000 +0000
+@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
+ 
+ 		if (net_eq(sock_net(sk), net) && inet->inet_num == num	&&
+ 		    !(inet->inet_daddr && inet->inet_daddr != raddr) 	&&
+-		    !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
++		    v4_sock_addr_match(sk->sk_nx_info, inet, laddr)	&&
+ 		    !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
+ 			goto found; /* gotcha */
+ 	}
+@@ -397,6 +397,12 @@ static int raw_send_hdrinc(struct sock *
+ 		icmp_out_count(net, ((struct icmphdr *)
+ 			skb_transport_header(skb))->type);
+ 
++	err = -EPERM;
++	if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
++		sk->sk_nx_info &&
++		!v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
++		goto error_free;
++
+ 	err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
+ 		      rt->dst.dev, dst_output);
+ 	if (err > 0)
+@@ -582,6 +588,16 @@ static int raw_sendmsg(struct kiocb *ioc
+ 			goto done;
+ 	}
+ 
++	if (sk->sk_nx_info) {
++		rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4);
++		if (IS_ERR(rt)) {
++			err = PTR_ERR(rt);
++			rt = NULL;
++			goto done;
++		}
++		ip_rt_put(rt);
++	}
++
+ 	security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+ 	rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
+ 	if (IS_ERR(rt)) {
+@@ -658,17 +674,19 @@ static int raw_bind(struct sock *sk, str
+ {
+ 	struct inet_sock *inet = inet_sk(sk);
+ 	struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
++	struct nx_v4_sock_addr nsa = { 0 };
+ 	int ret = -EINVAL;
+ 	int chk_addr_ret;
+ 
+ 	if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
+ 		goto out;
+-	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
++	v4_map_sock_addr(inet, addr, &nsa);
++	chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
+ 	ret = -EADDRNOTAVAIL;
+-	if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
++	if (nsa.saddr && chk_addr_ret != RTN_LOCAL &&
+ 	    chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
+ 		goto out;
+-	inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++	v4_set_sock_addr(inet, &nsa);
+ 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
+ 		inet->inet_saddr = 0;  /* Use device */
+ 	sk_dst_reset(sk);
+@@ -720,7 +738,8 @@ static int raw_recvmsg(struct kiocb *ioc
+ 	/* Copy the address. */
+ 	if (sin) {
+ 		sin->sin_family = AF_INET;
+-		sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++		sin->sin_addr.s_addr =
++			nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr);
+ 		sin->sin_port = 0;
+ 		memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
+ 	}
+@@ -917,7 +936,8 @@ static struct sock *raw_get_first(struct
+ 		struct hlist_node *node;
+ 
+ 		sk_for_each(sk, node, &state->h->ht[state->bucket])
+-			if (sock_net(sk) == seq_file_net(seq))
++			if ((sock_net(sk) == seq_file_net(seq)) &&
++				nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ 				goto found;
+ 	}
+ 	sk = NULL;
+@@ -933,7 +953,8 @@ static struct sock *raw_get_next(struct
+ 		sk = sk_next(sk);
+ try_again:
+ 		;
+-	} while (sk && sock_net(sk) != seq_file_net(seq));
++	} while (sk && ((sock_net(sk) != seq_file_net(seq)) ||
++		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 
+ 	if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
+ 		sk = sk_head(&state->h->ht[state->bucket]);
+diff -NurpP --minimal linux-3.7.10/net/ipv4/route.c linux-3.7.10-vs2.3.5.6/net/ipv4/route.c
+--- linux-3.7.10/net/ipv4/route.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/route.c	2013-02-19 14:41:41.000000000 +0000
+@@ -2002,7 +2002,7 @@ struct rtable *__ip_route_output_key(str
+ 
+ 
+ 	if (fl4->flowi4_oif) {
+-		dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
++		dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
+ 		rth = ERR_PTR(-ENODEV);
+ 		if (dev_out == NULL)
+ 			goto out;
+diff -NurpP --minimal linux-3.7.10/net/ipv4/tcp.c linux-3.7.10-vs2.3.5.6/net/ipv4/tcp.c
+--- linux-3.7.10/net/ipv4/tcp.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/tcp.c	2013-02-19 14:41:41.000000000 +0000
+@@ -268,6 +268,7 @@
+ #include <linux/crypto.h>
+ #include <linux/time.h>
+ #include <linux/slab.h>
++#include <linux/in.h>
+ 
+ #include <net/icmp.h>
+ #include <net/inet_common.h>
+diff -NurpP --minimal linux-3.7.10/net/ipv4/tcp_ipv4.c linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_ipv4.c
+--- linux-3.7.10/net/ipv4/tcp_ipv4.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_ipv4.c	2013-02-19 14:41:41.000000000 +0000
+@@ -2261,6 +2261,12 @@ static void *listening_get_next(struct s
+ 		req = req->dl_next;
+ 		while (1) {
+ 			while (req) {
++				vxdprintk(VXD_CBIT(net, 6),
++					"sk,req: %p [#%d] (from %d)", req->sk,
++					(req->sk)?req->sk->sk_nid:0, nx_current_nid());
++				if (req->sk &&
++					!nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (req->rsk_ops->family == st->family) {
+ 					cur = req;
+ 					goto out;
+@@ -2285,6 +2291,10 @@ get_req:
+ 	}
+ get_sk:
+ 	sk_nulls_for_each_from(sk, node) {
++		vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
++			sk, sk->sk_nid, nx_current_nid());
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (!net_eq(sock_net(sk), net))
+ 			continue;
+ 		if (sk->sk_family == st->family) {
+@@ -2361,6 +2371,11 @@ static void *established_get_first(struc
+ 
+ 		spin_lock_bh(lock);
+ 		sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
++			vxdprintk(VXD_CBIT(net, 6),
++				"sk,egf: %p [#%d] (from %d)",
++				sk, sk->sk_nid, nx_current_nid());
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (sk->sk_family != st->family ||
+ 			    !net_eq(sock_net(sk), net)) {
+ 				continue;
+@@ -2371,6 +2386,11 @@ static void *established_get_first(struc
+ 		st->state = TCP_SEQ_STATE_TIME_WAIT;
+ 		inet_twsk_for_each(tw, node,
+ 				   &tcp_hashinfo.ehash[st->bucket].twchain) {
++			vxdprintk(VXD_CBIT(net, 6),
++				"tw: %p [#%d] (from %d)",
++				tw, tw->tw_nid, nx_current_nid());
++			if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (tw->tw_family != st->family ||
+ 			    !net_eq(twsk_net(tw), net)) {
+ 				continue;
+@@ -2400,7 +2420,9 @@ static void *established_get_next(struct
+ 		tw = cur;
+ 		tw = tw_next(tw);
+ get_tw:
+-		while (tw && (tw->tw_family != st->family || !net_eq(twsk_net(tw), net))) {
++		while (tw && (tw->tw_family != st->family ||
++			!net_eq(twsk_net(tw), net) ||
++			!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) {
+ 			tw = tw_next(tw);
+ 		}
+ 		if (tw) {
+@@ -2424,6 +2446,11 @@ get_tw:
+ 		sk = sk_nulls_next(sk);
+ 
+ 	sk_nulls_for_each_from(sk, node) {
++		vxdprintk(VXD_CBIT(net, 6),
++			"sk,egn: %p [#%d] (from %d)",
++			sk, sk->sk_nid, nx_current_nid());
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
+ 			goto found;
+ 	}
+@@ -2629,9 +2656,9 @@ static void get_openreq4(const struct so
+ 	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
+ 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
+ 		i,
+-		ireq->loc_addr,
++		nx_map_sock_lback(current_nx_info(), ireq->loc_addr),
+ 		ntohs(inet_sk(sk)->inet_sport),
+-		ireq->rmt_addr,
++		nx_map_sock_lback(current_nx_info(), ireq->rmt_addr),
+ 		ntohs(ireq->rmt_port),
+ 		TCP_SYN_RECV,
+ 		0, 0, /* could print option size, but that is af dependent. */
+@@ -2654,8 +2681,8 @@ static void get_tcp4_sock(struct sock *s
+ 	const struct inet_connection_sock *icsk = inet_csk(sk);
+ 	const struct inet_sock *inet = inet_sk(sk);
+ 	struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq;
+-	__be32 dest = inet->inet_daddr;
+-	__be32 src = inet->inet_rcv_saddr;
++	__be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++	__be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ 	__u16 destp = ntohs(inet->inet_dport);
+ 	__u16 srcp = ntohs(inet->inet_sport);
+ 	int rx_queue;
+@@ -2711,8 +2738,8 @@ static void get_timewait4_sock(const str
+ 	__u16 destp, srcp;
+ 	long delta = tw->tw_ttd - jiffies;
+ 
+-	dest  = tw->tw_daddr;
+-	src   = tw->tw_rcv_saddr;
++	dest  = nx_map_sock_lback(current_nx_info(), tw->tw_daddr);
++	src   = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr);
+ 	destp = ntohs(tw->tw_dport);
+ 	srcp  = ntohs(tw->tw_sport);
+ 
+diff -NurpP --minimal linux-3.7.10/net/ipv4/tcp_minisocks.c linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_minisocks.c
+--- linux-3.7.10/net/ipv4/tcp_minisocks.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_minisocks.c	2012-12-18 15:13:16.000000000 +0000
+@@ -23,6 +23,9 @@
+ #include <linux/slab.h>
+ #include <linux/sysctl.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_context.h>
+ #include <net/tcp.h>
+ #include <net/inet_common.h>
+ #include <net/xfrm.h>
+@@ -289,6 +292,11 @@ void tcp_time_wait(struct sock *sk, int
+ 		tcptw->tw_ts_recent	= tp->rx_opt.ts_recent;
+ 		tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
+ 
++		tw->tw_xid		= sk->sk_xid;
++		tw->tw_vx_info		= NULL;
++		tw->tw_nid		= sk->sk_nid;
++		tw->tw_nx_info		= NULL;
++
+ #if IS_ENABLED(CONFIG_IPV6)
+ 		if (tw->tw_family == PF_INET6) {
+ 			struct ipv6_pinfo *np = inet6_sk(sk);
+diff -NurpP --minimal linux-3.7.10/net/ipv4/udp.c linux-3.7.10-vs2.3.5.6/net/ipv4/udp.c
+--- linux-3.7.10/net/ipv4/udp.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/udp.c	2013-02-19 14:41:41.000000000 +0000
+@@ -300,14 +300,7 @@ fail:
+ }
+ EXPORT_SYMBOL(udp_lib_get_port);
+ 
+-static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+-{
+-	struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
+-
+-	return 	(!ipv6_only_sock(sk2)  &&
+-		 (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr ||
+-		   inet1->inet_rcv_saddr == inet2->inet_rcv_saddr));
+-}
++extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *);
+ 
+ static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
+ 				       unsigned int port)
+@@ -342,6 +335,11 @@ static inline int compute_score(struct s
+ 			if (inet->inet_rcv_saddr != daddr)
+ 				return -1;
+ 			score += 2;
++		} else {
++			/* block non nx_info ips */
++			if (!v4_addr_in_nx_info(sk->sk_nx_info,
++				daddr, NXA_MASK_BIND))
++				return -1;
+ 		}
+ 		if (inet->inet_daddr) {
+ 			if (inet->inet_daddr != saddr)
+@@ -445,6 +443,7 @@ exact_match:
+ 	return result;
+ }
+ 
++
+ /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
+  * harder than this. -DaveM
+  */
+@@ -490,6 +489,11 @@ begin:
+ 	sk_nulls_for_each_rcu(sk, node, &hslot->head) {
+ 		score = compute_score(sk, net, saddr, hnum, sport,
+ 				      daddr, dport, dif);
++		/* FIXME: disabled?
++		if (score == 9) {
++			result = sk;
++			break;
++		} else */
+ 		if (score > badness) {
+ 			result = sk;
+ 			badness = score;
+@@ -503,6 +507,7 @@ begin:
+ 	if (get_nulls_value(node) != slot)
+ 		goto begin;
+ 
++
+ 	if (result) {
+ 		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
+ 			result = NULL;
+@@ -512,6 +517,7 @@ begin:
+ 			goto begin;
+ 		}
+ 	}
++
+ 	rcu_read_unlock();
+ 	return result;
+ }
+@@ -555,8 +561,7 @@ static inline struct sock *udp_v4_mcast_
+ 		    udp_sk(s)->udp_port_hash != hnum ||
+ 		    (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
+ 		    (inet->inet_dport != rmt_port && inet->inet_dport) ||
+-		    (inet->inet_rcv_saddr &&
+-		     inet->inet_rcv_saddr != loc_addr) ||
++		    !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr)	||
+ 		    ipv6_only_sock(s) ||
+ 		    (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
+ 			continue;
+@@ -939,6 +944,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
+ 				   inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
+ 				   faddr, saddr, dport, inet->inet_sport);
+ 
++		if (sk->sk_nx_info) {
++			rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
++			if (IS_ERR(rt)) {
++				err = PTR_ERR(rt);
++				rt = NULL;
++				goto out;
++			}
++			ip_rt_put(rt);
++		}
++
+ 		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
+ 		rt = ip_route_output_flow(net, fl4, sk);
+ 		if (IS_ERR(rt)) {
+@@ -1244,7 +1259,8 @@ try_again:
+ 	if (sin) {
+ 		sin->sin_family = AF_INET;
+ 		sin->sin_port = udp_hdr(skb)->source;
+-		sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++		sin->sin_addr.s_addr = nx_map_sock_lback(
++			skb->sk->sk_nx_info, ip_hdr(skb)->saddr);
+ 		memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+ 	}
+ 	if (inet->cmsg_flags)
+@@ -1993,6 +2009,8 @@ static struct sock *udp_get_first(struct
+ 		sk_nulls_for_each(sk, node, &hslot->head) {
+ 			if (!net_eq(sock_net(sk), net))
+ 				continue;
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (sk->sk_family == state->family)
+ 				goto found;
+ 		}
+@@ -2010,7 +2028,9 @@ static struct sock *udp_get_next(struct
+ 
+ 	do {
+ 		sk = sk_nulls_next(sk);
+-	} while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
++	} while (sk && (!net_eq(sock_net(sk), net) ||
++		sk->sk_family != state->family ||
++		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 
+ 	if (!sk) {
+ 		if (state->bucket <= state->udp_table->mask)
+@@ -2106,8 +2126,8 @@ static void udp4_format_sock(struct sock
+ 		int bucket, int *len)
+ {
+ 	struct inet_sock *inet = inet_sk(sp);
+-	__be32 dest = inet->inet_daddr;
+-	__be32 src  = inet->inet_rcv_saddr;
++	__be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++	__be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ 	__u16 destp	  = ntohs(inet->inet_dport);
+ 	__u16 srcp	  = ntohs(inet->inet_sport);
+ 
+diff -NurpP --minimal linux-3.7.10/net/ipv6/Kconfig linux-3.7.10-vs2.3.5.6/net/ipv6/Kconfig
+--- linux-3.7.10/net/ipv6/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -4,8 +4,8 @@
+ 
+ #   IPv6 as module will cause a CRASH if you try to unload it
+ menuconfig IPV6
+-	tristate "The IPv6 protocol"
+-	default m
++	bool "The IPv6 protocol"
++	default n
+ 	---help---
+ 	  This is complemental support for the IP version 6.
+ 	  You will still be able to do traditional IPv4 networking as well.
+diff -NurpP --minimal linux-3.7.10/net/ipv6/addrconf.c linux-3.7.10-vs2.3.5.6/net/ipv6/addrconf.c
+--- linux-3.7.10/net/ipv6/addrconf.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/addrconf.c	2013-02-19 14:41:41.000000000 +0000
+@@ -92,6 +92,8 @@
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/export.h>
++#include <linux/vs_network.h>
++#include <linux/vs_inet6.h>
+ 
+ /* Set to 3 to get tracing... */
+ #define ACONF_DEBUG 2
+@@ -1094,7 +1096,7 @@ out:
+ 
+ int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+-		       struct in6_addr *saddr)
++		       struct in6_addr *saddr, struct nx_info *nxi)
+ {
+ 	struct ipv6_saddr_score scores[2],
+ 				*score = &scores[0], *hiscore = &scores[1];
+@@ -1166,6 +1168,8 @@ int ipv6_dev_get_saddr(struct net *net,
+ 					       dev->name);
+ 				continue;
+ 			}
++			if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
++				continue;
+ 
+ 			score->rule = -1;
+ 			bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
+@@ -3135,7 +3139,10 @@ static void if6_seq_stop(struct seq_file
+ static int if6_seq_show(struct seq_file *seq, void *v)
+ {
+ 	struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
+-	seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
++
++	if (nx_check(0, VS_ADMIN|VS_WATCH) ||
++	    v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1))
++		seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
+ 		   &ifp->addr,
+ 		   ifp->idev->dev->ifindex,
+ 		   ifp->prefix_len,
+@@ -3641,6 +3648,11 @@ static int in6_dump_addrs(struct inet6_d
+ 	struct ifacaddr6 *ifaca;
+ 	int err = 1;
+ 	int ip_idx = *p_ip_idx;
++	struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
++
++	/* disable ipv6 on non v6 guests */
++	if (nxi && !nx_info_has_v6(nxi))
++		return skb->len;
+ 
+ 	read_lock_bh(&idev->lock);
+ 	switch (type) {
+@@ -3651,6 +3663,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		list_for_each_entry(ifa, &idev->addr_list, if_list) {
+ 			if (++ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
++					continue;
+ 			err = inet6_fill_ifaddr(skb, ifa,
+ 						NETLINK_CB(cb->skb).portid,
+ 						cb->nlh->nlmsg_seq,
+@@ -3667,6 +3681,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		     ifmca = ifmca->next, ip_idx++) {
+ 			if (ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
++					continue;
+ 			err = inet6_fill_ifmcaddr(skb, ifmca,
+ 						  NETLINK_CB(cb->skb).portid,
+ 						  cb->nlh->nlmsg_seq,
+@@ -3682,6 +3698,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		     ifaca = ifaca->aca_next, ip_idx++) {
+ 			if (ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
++					continue;
+ 			err = inet6_fill_ifacaddr(skb, ifaca,
+ 						  NETLINK_CB(cb->skb).portid,
+ 						  cb->nlh->nlmsg_seq,
+@@ -4065,6 +4083,11 @@ static int inet6_dump_ifinfo(struct sk_b
+ 	struct inet6_dev *idev;
+ 	struct hlist_head *head;
+ 	struct hlist_node *node;
++	struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
++
++	/* FIXME: maybe disable ipv6 on non v6 guests?
++	if (skb->sk && skb->sk->sk_vx_info)
++		return skb->len; */
+ 
+ 	s_h = cb->args[0];
+ 	s_idx = cb->args[1];
+@@ -4076,6 +4099,8 @@ static int inet6_dump_ifinfo(struct sk_b
+ 		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+ 			if (idx < s_idx)
+ 				goto cont;
++			if (!v6_dev_in_nx_info(dev, nxi))
++				goto cont;
+ 			idev = __in6_dev_get(dev);
+ 			if (!idev)
+ 				goto cont;
+diff -NurpP --minimal linux-3.7.10/net/ipv6/af_inet6.c linux-3.7.10-vs2.3.5.6/net/ipv6/af_inet6.c
+--- linux-3.7.10/net/ipv6/af_inet6.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/af_inet6.c	2012-12-18 15:13:16.000000000 +0000
+@@ -43,6 +43,8 @@
+ #include <linux/netdevice.h>
+ #include <linux/icmpv6.h>
+ #include <linux/netfilter_ipv6.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <net/ip.h>
+ #include <net/ipv6.h>
+@@ -160,9 +162,12 @@ lookup_protocol:
+ 	}
+ 
+ 	err = -EPERM;
++	if ((protocol == IPPROTO_ICMPV6) &&
++		nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
++		goto override;
+ 	if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ 		goto out_rcu_unlock;
+-
++override:
+ 	sock->ops = answer->ops;
+ 	answer_prot = answer->prot;
+ 	answer_no_check = answer->no_check;
+@@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru
+ 	struct inet_sock *inet = inet_sk(sk);
+ 	struct ipv6_pinfo *np = inet6_sk(sk);
+ 	struct net *net = sock_net(sk);
++	struct nx_v6_sock_addr nsa;
+ 	__be32 v4addr = 0;
+ 	unsigned short snum;
+ 	int addr_type = 0;
+@@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru
+ 	if (addr->sin6_family != AF_INET6)
+ 		return -EAFNOSUPPORT;
+ 
++	err = v6_map_sock_addr(inet, addr, &nsa);
++	if (err)
++		return err;
++
+ 	addr_type = ipv6_addr_type(&addr->sin6_addr);
+ 	if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
+ 		return -EINVAL;
+@@ -308,6 +318,7 @@ int inet6_bind(struct socket *sock, stru
+ 		/* Reproduce AF_INET checks to make the bindings consistent */
+ 		v4addr = addr->sin6_addr.s6_addr32[3];
+ 		chk_addr_ret = inet_addr_type(net, v4addr);
++
+ 		if (!sysctl_ip_nonlocal_bind &&
+ 		    !(inet->freebind || inet->transparent) &&
+ 		    v4addr != htonl(INADDR_ANY) &&
+@@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru
+ 			err = -EADDRNOTAVAIL;
+ 			goto out;
+ 		}
++		if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
++			err = -EADDRNOTAVAIL;
++			goto out;
++		}
+ 	} else {
+ 		if (addr_type != IPV6_ADDR_ANY) {
+ 			struct net_device *dev = NULL;
+@@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru
+ 				}
+ 			}
+ 
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++				err = -EADDRNOTAVAIL;
++				goto out_unlock;
++			}
++
+ 			/* ipv4 addr of the socket is invalid.  Only the
+ 			 * unspecified and mapped address have a v4 equivalent.
+ 			 */
+@@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru
+ 		}
+ 	}
+ 
++	/* what's that for? */
++	v6_set_sock_addr(inet, &nsa);
++
+ 	inet->inet_rcv_saddr = v4addr;
+ 	inet->inet_saddr = v4addr;
+ 
+@@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s
+ 			return -ENOTCONN;
+ 		sin->sin6_port = inet->inet_dport;
+ 		sin->sin6_addr = np->daddr;
++		/* FIXME: remap lback? */
+ 		if (np->sndflow)
+ 			sin->sin6_flowinfo = np->flow_label;
+ 	} else {
++		/* FIXME: remap lback? */
+ 		if (ipv6_addr_any(&np->rcv_saddr))
+ 			sin->sin6_addr = np->saddr;
+ 		else
+diff -NurpP --minimal linux-3.7.10/net/ipv6/datagram.c linux-3.7.10-vs2.3.5.6/net/ipv6/datagram.c
+--- linux-3.7.10/net/ipv6/datagram.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/datagram.c	2012-12-18 15:13:16.000000000 +0000
+@@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s
+ 
+ 			rcu_read_lock();
+ 			if (fl6->flowi6_oif) {
+-				dev = dev_get_by_index_rcu(net, fl6->flowi6_oif);
++				dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif);
+ 				if (!dev) {
+ 					rcu_read_unlock();
+ 					return -ENODEV;
+diff -NurpP --minimal linux-3.7.10/net/ipv6/fib6_rules.c linux-3.7.10-vs2.3.5.6/net/ipv6/fib6_rules.c
+--- linux-3.7.10/net/ipv6/fib6_rules.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/fib6_rules.c	2012-12-18 15:13:16.000000000 +0000
+@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
+ 					       ip6_dst_idev(&rt->dst)->dev,
+ 					       &flp6->daddr,
+ 					       rt6_flags2srcprefs(flags),
+-					       &saddr))
++					       &saddr, NULL))
+ 				goto again;
+ 			if (!ipv6_prefix_equal(&saddr, &r->src.addr,
+ 					       r->src.plen))
+diff -NurpP --minimal linux-3.7.10/net/ipv6/inet6_hashtables.c linux-3.7.10-vs2.3.5.6/net/ipv6/inet6_hashtables.c
+--- linux-3.7.10/net/ipv6/inet6_hashtables.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/inet6_hashtables.c	2012-12-18 15:13:16.000000000 +0000
+@@ -16,6 +16,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/random.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established(
+ 	unsigned int slot = hash & hashinfo->ehash_mask;
+ 	struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
+ 
+-
+ 	rcu_read_lock();
+ begin:
+ 	sk_nulls_for_each_rcu(sk, node, &head->chain) {
+@@ -95,7 +95,7 @@ begin:
+ 				sock_put(sk);
+ 				goto begin;
+ 			}
+-		goto out;
++			goto out;
+ 		}
+ 	}
+ 	if (get_nulls_value(node) != slot)
+@@ -141,6 +141,9 @@ static inline int compute_score(struct s
+ 			if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
+ 				return -1;
+ 			score++;
++		} else {
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++				return -1;
+ 		}
+ 		if (sk->sk_bound_dev_if) {
+ 			if (sk->sk_bound_dev_if != dif)
+diff -NurpP --minimal linux-3.7.10/net/ipv6/ip6_output.c linux-3.7.10-vs2.3.5.6/net/ipv6/ip6_output.c
+--- linux-3.7.10/net/ipv6/ip6_output.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/ip6_output.c	2013-02-19 14:41:41.000000000 +0000
+@@ -964,7 +964,8 @@ static int ip6_dst_lookup_tail(struct so
+ 		struct rt6_info *rt = (struct rt6_info *) *dst;
+ 		err = ip6_route_get_saddr(net, rt, &fl6->daddr,
+ 					  sk ? inet6_sk(sk)->srcprefs : 0,
+-					  &fl6->saddr);
++					  &fl6->saddr,
++					  sk ? sk->sk_nx_info : NULL);
+ 		if (err)
+ 			goto out_err_release;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/ipv6/ndisc.c linux-3.7.10-vs2.3.5.6/net/ipv6/ndisc.c
+--- linux-3.7.10/net/ipv6/ndisc.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/ndisc.c	2013-01-16 00:19:03.000000000 +0000
+@@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev
+ 	} else {
+ 		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
+ 				       inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
+-				       &tmpaddr))
++				       &tmpaddr, NULL))
+ 			return;
+ 		src_addr = &tmpaddr;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.7.10-vs2.3.5.6/net/ipv6/netfilter/ip6t_MASQUERADE.c
+--- linux-3.7.10/net/ipv6/netfilter/ip6t_MASQUERADE.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/netfilter/ip6t_MASQUERADE.c	2012-12-18 15:13:16.000000000 +0000
+@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons
+ 			    ctinfo == IP_CT_RELATED_REPLY));
+ 
+ 	if (ipv6_dev_get_saddr(dev_net(par->out), par->out,
+-			       &ipv6_hdr(skb)->daddr, 0, &src) < 0)
++			       &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0)
+ 		return NF_DROP;
+ 
+ 	nfct_nat(ct)->masq_index = par->out->ifindex;
+diff -NurpP --minimal linux-3.7.10/net/ipv6/raw.c linux-3.7.10-vs2.3.5.6/net/ipv6/raw.c
+--- linux-3.7.10/net/ipv6/raw.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/raw.c	2012-12-18 15:13:16.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include <linux/icmpv6.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter_ipv6.h>
++#include <linux/vs_inet6.h>
+ #include <linux/skbuff.h>
+ #include <linux/compat.h>
+ #include <asm/uaccess.h>
+@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s
+ 				goto out_unlock;
+ 		}
+ 
++		if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++			err = -EADDRNOTAVAIL;
++			if (dev)
++				dev_put(dev);
++			goto out;
++		}
++
+ 		/* ipv4 addr of the socket is invalid.  Only the
+ 		 * unspecified and mapped address have a v4 equivalent.
+ 		 */
+diff -NurpP --minimal linux-3.7.10/net/ipv6/route.c linux-3.7.10-vs2.3.5.6/net/ipv6/route.c
+--- linux-3.7.10/net/ipv6/route.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/route.c	2013-02-19 14:41:41.000000000 +0000
+@@ -57,6 +57,7 @@
+ #include <net/xfrm.h>
+ #include <net/netevent.h>
+ #include <net/netlink.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -2116,15 +2117,17 @@ int ip6_route_get_saddr(struct net *net,
+ 			struct rt6_info *rt,
+ 			const struct in6_addr *daddr,
+ 			unsigned int prefs,
+-			struct in6_addr *saddr)
++			struct in6_addr *saddr,
++			struct nx_info *nxi)
+ {
+ 	struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt);
+ 	int err = 0;
+-	if (rt->rt6i_prefsrc.plen)
++	if (rt->rt6i_prefsrc.plen && (!nxi ||
++	    v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR)))
+ 		*saddr = rt->rt6i_prefsrc.addr;
+ 	else
+ 		err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
+-					 daddr, prefs, saddr);
++					 daddr, prefs, saddr, nxi);
+ 	return err;
+ }
+ 
+@@ -2478,7 +2481,8 @@ static int rt6_fill_node(struct net *net
+ 				goto nla_put_failure;
+ 	} else if (dst) {
+ 		struct in6_addr saddr_buf;
+-		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
++		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
++		    (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
+ 		    nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
+ 			goto nla_put_failure;
+ 	}
+@@ -2692,6 +2696,7 @@ static int rt6_info_route(struct rt6_inf
+ 	struct seq_file *m = p_arg;
+ 	struct neighbour *n;
+ 
++	/* FIXME: check for network context? */
+ 	seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
+ 
+ #ifdef CONFIG_IPV6_SUBTREES
+diff -NurpP --minimal linux-3.7.10/net/ipv6/tcp_ipv6.c linux-3.7.10-vs2.3.5.6/net/ipv6/tcp_ipv6.c
+--- linux-3.7.10/net/ipv6/tcp_ipv6.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/tcp_ipv6.c	2013-01-16 00:19:03.000000000 +0000
+@@ -71,6 +71,7 @@
+ 
+ #include <linux/crypto.h>
+ #include <linux/scatterlist.h>
++#include <linux/vs_inet6.h>
+ 
+ static void	tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
+ static void	tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
+@@ -175,8 +176,15 @@ static int tcp_v6_connect(struct sock *s
+ 	 *	connect() to INADDR_ANY means loopback (BSD'ism).
+ 	 */
+ 
+-	if(ipv6_addr_any(&usin->sin6_addr))
+-		usin->sin6_addr.s6_addr[15] = 0x1;
++	if(ipv6_addr_any(&usin->sin6_addr)) {
++		struct nx_info *nxi =  sk->sk_nx_info;
++
++		if (nxi && nx_info_has_v6(nxi))
++			/* FIXME: remap lback? */
++			usin->sin6_addr = nxi->v6.ip;
++		else
++			usin->sin6_addr.s6_addr[15] = 0x1;
++	}
+ 
+ 	addr_type = ipv6_addr_type(&usin->sin6_addr);
+ 
+diff -NurpP --minimal linux-3.7.10/net/ipv6/udp.c linux-3.7.10-vs2.3.5.6/net/ipv6/udp.c
+--- linux-3.7.10/net/ipv6/udp.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/udp.c	2012-12-18 15:13:16.000000000 +0000
+@@ -45,42 +45,68 @@
+ #include <net/tcp_states.h>
+ #include <net/ip6_checksum.h>
+ #include <net/xfrm.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <trace/events/skb.h>
+ #include "udp_impl.h"
+ 
+-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
++int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+ {
+-	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
++	const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr;
+ 	const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
+-	__be32 sk1_rcv_saddr = sk_rcv_saddr(sk);
++	__be32 sk1_rcv_saddr = sk_rcv_saddr(sk1);
+ 	__be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
+-	int sk_ipv6only = ipv6_only_sock(sk);
++	int sk1_ipv6only = ipv6_only_sock(sk1);
+ 	int sk2_ipv6only = inet_v6_ipv6only(sk2);
+-	int addr_type = ipv6_addr_type(sk_rcv_saddr6);
++	int addr_type = ipv6_addr_type(sk1_rcv_saddr6);
+ 	int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
+ 
+ 	/* if both are mapped, treat as IPv4 */
+-	if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED)
+-		return (!sk2_ipv6only &&
++	if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
++		if (!sk2_ipv6only &&
+ 			(!sk1_rcv_saddr || !sk2_rcv_saddr ||
+-			  sk1_rcv_saddr == sk2_rcv_saddr));
++			  sk1_rcv_saddr == sk2_rcv_saddr))
++			goto vs_v4;
++		else
++			return 0;
++	}
+ 
+ 	if (addr_type2 == IPV6_ADDR_ANY &&
+ 	    !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
+-		return 1;
++		goto vs;
+ 
+ 	if (addr_type == IPV6_ADDR_ANY &&
+-	    !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
+-		return 1;
++	    !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
++		goto vs;
+ 
+ 	if (sk2_rcv_saddr6 &&
+-	    ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))
+-		return 1;
++	    ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6))
++		goto vs;
+ 
+ 	return 0;
++
++vs_v4:
++	if (!sk1_rcv_saddr && !sk2_rcv_saddr)
++		return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++	if (!sk2_rcv_saddr)
++		return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
++	if (!sk1_rcv_saddr)
++		return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
++	return 1;
++vs:
++	if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY)
++		return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++	else if (addr_type2 == IPV6_ADDR_ANY)
++		return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
++	else if (addr_type == IPV6_ADDR_ANY) {
++		if (addr_type2 == IPV6_ADDR_MAPPED)
++			return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++		else
++			return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
++	}
++	return 1;
+ }
+ 
+ static unsigned int udp6_portaddr_hash(struct net *net,
+@@ -144,6 +170,10 @@ static inline int compute_score(struct s
+ 			if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
+ 				return -1;
+ 			score++;
++		} else {
++			/* block non nx_info ips */
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++				return -1;
+ 		}
+ 		if (!ipv6_addr_any(&np->daddr)) {
+ 			if (!ipv6_addr_equal(&np->daddr, saddr))
+diff -NurpP --minimal linux-3.7.10/net/ipv6/xfrm6_policy.c linux-3.7.10-vs2.3.5.6/net/ipv6/xfrm6_policy.c
+--- linux-3.7.10/net/ipv6/xfrm6_policy.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/xfrm6_policy.c	2012-12-18 15:13:16.000000000 +0000
+@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
+ 	dev = ip6_dst_idev(dst)->dev;
+ 	ipv6_dev_get_saddr(dev_net(dev), dev,
+ 			   (struct in6_addr *)&daddr->a6, 0,
+-			   (struct in6_addr *)&saddr->a6);
++			   (struct in6_addr *)&saddr->a6, NULL);
+ 	dst_release(dst);
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7.10-vs2.3.5.6/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.7.10/net/netfilter/ipvs/ip_vs_xmit.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/netfilter/ipvs/ip_vs_xmit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -273,7 +273,7 @@ __ip_vs_route_output_v6(struct net *net,
+ 		return dst;
+ 	if (ipv6_addr_any(&fl6.saddr) &&
+ 	    ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
+-			       &fl6.daddr, 0, &fl6.saddr) < 0)
++			       &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
+ 		goto out_err;
+ 	if (do_xfrm) {
+ 		dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
+diff -NurpP --minimal linux-3.7.10/net/netlink/af_netlink.c linux-3.7.10-vs2.3.5.6/net/netlink/af_netlink.c
+--- linux-3.7.10/net/netlink/af_netlink.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/netlink/af_netlink.c	2012-12-18 15:13:16.000000000 +0000
+@@ -55,6 +55,9 @@
+ #include <linux/types.h>
+ #include <linux/audit.h>
+ #include <linux/mutex.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
+ 
+ #include <net/net_namespace.h>
+ #include <net/sock.h>
+@@ -1981,6 +1984,8 @@ static struct sock *netlink_seq_socket_i
+ 			sk_for_each(s, node, &hash->table[j]) {
+ 				if (sock_net(s) != seq_file_net(seq))
+ 					continue;
++				if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (off == pos) {
+ 					iter->link = i;
+ 					iter->hash_idx = j;
+@@ -2015,7 +2020,8 @@ static void *netlink_seq_next(struct seq
+ 	s = v;
+ 	do {
+ 		s = sk_next(s);
+-	} while (s && sock_net(s) != seq_file_net(seq));
++	} while (s && (sock_net(s) != seq_file_net(seq) ||
++		!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 	if (s)
+ 		return s;
+ 
+@@ -2027,7 +2033,8 @@ static void *netlink_seq_next(struct seq
+ 
+ 		for (; j <= hash->mask; j++) {
+ 			s = sk_head(&hash->table[j]);
+-			while (s && sock_net(s) != seq_file_net(seq))
++			while (s && (sock_net(s) != seq_file_net(seq) ||
++				!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)))
+ 				s = sk_next(s);
+ 			if (s) {
+ 				iter->link = i;
+diff -NurpP --minimal linux-3.7.10/net/socket.c linux-3.7.10-vs2.3.5.6/net/socket.c
+--- linux-3.7.10/net/socket.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/socket.c	2012-12-18 15:13:16.000000000 +0000
+@@ -99,6 +99,10 @@
+ 
+ #include <net/sock.h>
+ #include <linux/netfilter.h>
++#include <linux/vs_base.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <linux/if_tun.h>
+ #include <linux/ipv6_route.h>
+@@ -619,6 +623,7 @@ static inline int __sock_sendmsg_nosec(s
+ 				       struct msghdr *msg, size_t size)
+ {
+ 	struct sock_iocb *si = kiocb_to_siocb(iocb);
++	size_t len;
+ 
+ 	sock_update_classid(sock->sk);
+ 
+@@ -627,7 +632,22 @@ static inline int __sock_sendmsg_nosec(s
+ 	si->msg = msg;
+ 	si->size = size;
+ 
+-	return sock->ops->sendmsg(iocb, sock, msg, size);
++	len = sock->ops->sendmsg(iocb, sock, msg, size);
++	if (sock->sk) {
++		if (len == size)
++			vx_sock_send(sock->sk, size);
++		else
++			vx_sock_fail(sock->sk, size);
++	}
++	vxdprintk(VXD_CBIT(net, 7),
++		"__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu",
++		sock, sock->sk,
++		(sock->sk)?sock->sk->sk_nx_info:0,
++		(sock->sk)?sock->sk->sk_vx_info:0,
++		(sock->sk)?sock->sk->sk_xid:0,
++		(sock->sk)?sock->sk->sk_nid:0,
++		(unsigned int)size, len);
++	return len;
+ }
+ 
+ static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
+@@ -783,6 +803,7 @@ static inline int __sock_recvmsg_nosec(s
+ 				       struct msghdr *msg, size_t size, int flags)
+ {
+ 	struct sock_iocb *si = kiocb_to_siocb(iocb);
++	int len;
+ 
+ 	sock_update_classid(sock->sk);
+ 
+@@ -792,7 +813,18 @@ static inline int __sock_recvmsg_nosec(s
+ 	si->size = size;
+ 	si->flags = flags;
+ 
+-	return sock->ops->recvmsg(iocb, sock, msg, size, flags);
++	len = sock->ops->recvmsg(iocb, sock, msg, size, flags);
++	if ((len >= 0) && sock->sk)
++		vx_sock_recv(sock->sk, len);
++	vxdprintk(VXD_CBIT(net, 7),
++		"__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
++		sock, sock->sk,
++		(sock->sk)?sock->sk->sk_nx_info:0,
++		(sock->sk)?sock->sk->sk_vx_info:0,
++		(sock->sk)?sock->sk->sk_xid:0,
++		(sock->sk)?sock->sk->sk_nid:0,
++		(unsigned int)size, len);
++	return len;
+ }
+ 
+ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
+@@ -1277,6 +1309,13 @@ int __sock_create(struct net *net, int f
+ 	if (type < 0 || type >= SOCK_MAX)
+ 		return -EINVAL;
+ 
++	if (!nx_check(0, VS_ADMIN)) {
++		if (family == PF_INET && !current_nx_info_has_v4())
++			return -EAFNOSUPPORT;
++		if (family == PF_INET6 && !current_nx_info_has_v6())
++			return -EAFNOSUPPORT;
++	}
++
+ 	/* Compatibility.
+ 
+ 	   This uglymoron is moved from INET layer to here to avoid
+@@ -1411,6 +1450,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+ 	if (retval < 0)
+ 		goto out;
+ 
++	set_bit(SOCK_USER_SOCKET, &sock->flags);
+ 	retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
+ 	if (retval < 0)
+ 		goto out_release;
+@@ -1452,10 +1492,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+ 	err = sock_create(family, type, protocol, &sock1);
+ 	if (err < 0)
+ 		goto out;
++	set_bit(SOCK_USER_SOCKET, &sock1->flags);
+ 
+ 	err = sock_create(family, type, protocol, &sock2);
+ 	if (err < 0)
+ 		goto out_release_1;
++	set_bit(SOCK_USER_SOCKET, &sock2->flags);
+ 
+ 	err = sock1->ops->socketpair(sock1, sock2);
+ 	if (err < 0)
+diff -NurpP --minimal linux-3.7.10/net/sunrpc/auth.c linux-3.7.10-vs2.3.5.6/net/sunrpc/auth.c
+--- linux-3.7.10/net/sunrpc/auth.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/sunrpc/auth.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,7 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/gss_api.h>
+ #include <linux/spinlock.h>
++#include <linux/vs_tag.h>
+ 
+ #ifdef RPC_DEBUG
+ # define RPCDBG_FACILITY	RPCDBG_AUTH
+@@ -481,6 +482,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+ 	memset(&acred, 0, sizeof(acred));
+ 	acred.uid = cred->fsuid;
+ 	acred.gid = cred->fsgid;
++	acred.tag = dx_current_tag();
+ 	acred.group_info = get_group_info(((struct cred *)cred)->group_info);
+ 
+ 	ret = auth->au_ops->lookup_cred(auth, &acred, flags);
+@@ -521,6 +523,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+ 	struct auth_cred acred = {
+ 		.uid = 0,
+ 		.gid = 0,
++		.tag = dx_current_tag(),
+ 	};
+ 
+ 	dprintk("RPC: %5u looking up %s cred\n",
+diff -NurpP --minimal linux-3.7.10/net/sunrpc/auth_unix.c linux-3.7.10-vs2.3.5.6/net/sunrpc/auth_unix.c
+--- linux-3.7.10/net/sunrpc/auth_unix.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/sunrpc/auth_unix.c	2012-12-18 15:13:16.000000000 +0000
+@@ -13,11 +13,13 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/auth.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_tag.h>
+ 
+ #define NFS_NGROUPS	16
+ 
+ struct unx_cred {
+ 	struct rpc_cred		uc_base;
++	tag_t			uc_tag;
+ 	gid_t			uc_gid;
+ 	gid_t			uc_gids[NFS_NGROUPS];
+ };
+@@ -79,6 +81,7 @@ unx_create_cred(struct rpc_auth *auth, s
+ 		groups = NFS_NGROUPS;
+ 
+ 	cred->uc_gid = acred->gid;
++	cred->uc_tag = acred->tag;
+ 	for (i = 0; i < groups; i++) {
+ 		gid_t gid;
+ 		gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
+@@ -123,7 +126,9 @@ unx_match(struct auth_cred *acred, struc
+ 	unsigned int i;
+ 
+ 
+-	if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)
++	if (cred->uc_uid != acred->uid ||
++		cred->uc_gid != acred->gid ||
++		cred->uc_tag != acred->tag)
+ 		return 0;
+ 
+ 	if (acred->group_info != NULL)
+@@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
+ 	struct rpc_clnt	*clnt = task->tk_client;
+ 	struct unx_cred	*cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
+ 	__be32		*base, *hold;
+-	int		i;
++	int		i, tag;
+ 
+ 	*p++ = htonl(RPC_AUTH_UNIX);
+ 	base = p++;
+@@ -162,9 +167,12 @@ unx_marshal(struct rpc_task *task, __be3
+ 	 * Copy the UTS nodename captured when the client was created.
+ 	 */
+ 	p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
++	tag = task->tk_client->cl_tag;
+ 
+-	*p++ = htonl((u32) cred->uc_uid);
+-	*p++ = htonl((u32) cred->uc_gid);
++	*p++ = htonl((u32) TAGINO_UID(tag,
++		cred->uc_uid, cred->uc_tag));
++	*p++ = htonl((u32) TAGINO_GID(tag,
++		cred->uc_gid, cred->uc_tag));
+ 	hold = p++;
+ 	for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
+ 		*p++ = htonl((u32) cred->uc_gids[i]);
+diff -NurpP --minimal linux-3.7.10/net/sunrpc/clnt.c linux-3.7.10-vs2.3.5.6/net/sunrpc/clnt.c
+--- linux-3.7.10/net/sunrpc/clnt.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/sunrpc/clnt.c	2013-02-05 01:14:43.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <linux/in6.h>
+ #include <linux/un.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/rpc_pipe_fs.h>
+@@ -481,6 +482,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+ 	if (!(args->flags & RPC_CLNT_CREATE_QUIET))
+ 		clnt->cl_chatty = 1;
+ 
++	/* TODO: handle RPC_CLNT_CREATE_TAGGED
++	if (args->flags & RPC_CLNT_CREATE_TAGGED)
++		clnt->cl_tag = 1; */
+ 	return clnt;
+ }
+ EXPORT_SYMBOL_GPL(rpc_create);
+diff -NurpP --minimal linux-3.7.10/net/unix/af_unix.c linux-3.7.10-vs2.3.5.6/net/unix/af_unix.c
+--- linux-3.7.10/net/unix/af_unix.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/unix/af_unix.c	2012-12-18 15:13:16.000000000 +0000
+@@ -114,6 +114,8 @@
+ #include <linux/mount.h>
+ #include <net/checksum.h>
+ #include <linux/security.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
+ EXPORT_SYMBOL_GPL(unix_socket_table);
+@@ -271,6 +273,8 @@ static struct sock *__unix_find_socket_b
+ 		if (!net_eq(sock_net(s), net))
+ 			continue;
+ 
++		if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (u->addr->len == len &&
+ 		    !memcmp(u->addr->name, sunname, len))
+ 			goto found;
+@@ -2259,6 +2263,8 @@ static struct sock *unix_from_bucket(str
+ 	for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
+ 		if (sock_net(sk) != seq_file_net(seq))
+ 			continue;
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (++count == offset)
+ 			break;
+ 	}
+@@ -2276,6 +2282,8 @@ static struct sock *unix_next_socket(str
+ 		sk = sk_next(sk);
+ 		if (!sk)
+ 			goto next_bucket;
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (sock_net(sk) == seq_file_net(seq))
+ 			return sk;
+ 	}
+diff -NurpP --minimal linux-3.7.10/scripts/checksyscalls.sh linux-3.7.10-vs2.3.5.6/scripts/checksyscalls.sh
+--- linux-3.7.10/scripts/checksyscalls.sh	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/scripts/checksyscalls.sh	2012-12-18 15:13:16.000000000 +0000
+@@ -193,7 +193,6 @@ cat << EOF
+ #define __IGNORE_afs_syscall
+ #define __IGNORE_getpmsg
+ #define __IGNORE_putpmsg
+-#define __IGNORE_vserver
+ EOF
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/security/commoncap.c linux-3.7.10-vs2.3.5.6/security/commoncap.c
+--- linux-3.7.10/security/commoncap.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/security/commoncap.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
+ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
+ 		int cap, int audit)
+ {
++	struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
++
+ 	for (;;) {
+ 		/* The owner of the user namespace has all caps. */
+ 		if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner, cred->euid))
+ 			return 0;
+ 
+ 		/* Do we have the necessary capabilities? */
+-		if (targ_ns == cred->user_ns)
+-			return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
++		if (targ_ns == cred->user_ns) {
++			if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
++			    cap_raised(cred->cap_effective, cap))
++				return 0;
++			return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM;
++		}
+ 
+ 		/* Have we tried all of the parent namespaces? */
+ 		if (targ_ns == &init_user_ns)
+@@ -619,7 +625,7 @@ int cap_inode_setxattr(struct dentry *de
+ 
+ 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ 		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+-	    !capable(CAP_SYS_ADMIN))
++		!vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ 		return -EPERM;
+ 	return 0;
+ }
+@@ -645,7 +651,7 @@ int cap_inode_removexattr(struct dentry
+ 
+ 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ 		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+-	    !capable(CAP_SYS_ADMIN))
++		!vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ 		return -EPERM;
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/security/selinux/hooks.c linux-3.7.10-vs2.3.5.6/security/selinux/hooks.c
+--- linux-3.7.10/security/selinux/hooks.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/security/selinux/hooks.c	2012-12-18 15:13:16.000000000 +0000
+@@ -66,7 +66,6 @@
+ #include <linux/dccp.h>
+ #include <linux/quota.h>
+ #include <linux/un.h>		/* for Unix socket types */
+-#include <net/af_unix.h>	/* for Unix socket types */
+ #include <linux/parser.h>
+ #include <linux/nfs_mount.h>
+ #include <net/ipv6.h>
diff --git a/main/linux-vserver/patch-3.9.2-vs2.3.5.6.diff b/main/linux-vserver/patch-3.9.2-vs2.3.5.6.diff
new file mode 100644
index 000000000..a35ca32a0
--- /dev/null
+++ b/main/linux-vserver/patch-3.9.2-vs2.3.5.6.diff
@@ -0,0 +1,26174 @@
+diff -NurpP --minimal linux-3.7.10/Documentation/vserver/debug.txt linux-3.7.10-vs2.3.5.6/Documentation/vserver/debug.txt
+--- linux-3.7.10/Documentation/vserver/debug.txt	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/Documentation/vserver/debug.txt	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,154 @@
++
++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 %ld,%ld [mult=%d]"
++ 3   8	"ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
++	"ext3_has_free_blocks(%p): free=%lu, root=%lu"
++	"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_misc:
++
++ 0   1	"destroy_dqhash: %p [#0x%08x] c=%d"
++	"new_dqhash: %p [#0x%08x]"
++	"vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
++	"vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
++	"vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
++	"vroot_get_real_bdev not set"
++ 1   2	"cow_break_link(»%s«)"
++	"temp copy »%s«"
++ 2   4	"dentry_open(new): %p"
++	"dentry_open(old): %p"
++	"lookup_create(new): %p"
++	"old path »%s«"
++	"path_lookup(old): %d"
++	"vfs_create(new): %d"
++	"vfs_rename: %d"
++	"vfs_sendfile: %d"
++ 3   8	"fput(new_file=%p[#%d])"
++	"fput(old_file=%p[#%d])"
++ 4  10	"vx_info_kill(%p[#%d],%d,%d) = %d"
++	"vx_info_kill(%p[#%d],%d,%d)*"
++ 5  20	"vs_reboot(%p[#%d],%d)"
++ 6  40	"dropping task %p[#%u,%u] for %p[#%u,%u]"
++
++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.%d.%d]"
++ 5  20	"moved task %p into nxi:%p[#%d]"
++	"nx_migrate_task(%p,%p[#%d.%d.%d])"
++	"task_get_nx_info(%p)"
++ 6  40	"nx_clear_persistent(%p[#%d])"
++
++debug_quota:
++
++ 0   1	"quota_sync_dqh(%p,%d) discard inode %p"
++ 1   2	"quota_sync_dqh(%p,%d)"
++	"sync_dquots(%p,%d)"
++	"sync_dquots_dqh(%p,%d)"
++ 3   8	"do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
++
++debug_switch:
++
++ 0   1	"vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
++ 1   2	"vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
++ 4  10	"%s: (%s %s) returned %s with %d"
++
++debug_tag:
++
++ 7  80	"dx_parse_tag(»%s«): %d:#%d"
++	"dx_propagate_tag(%p[#%lu.%d]): %d,%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)"
++	"loc_vx_info(%d) = %p (found)"
++	"loc_vx_info(%d) = %p (new)"
++	"loc_vx_info(%d) = %p (not available)"
++ 1   2	"create_vx_info(%d)*"
++	"loc_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.%d.%d]"
++	"__vx_dynamic_id: [#%d]"
++ 5  20	"enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
++	"leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
++	"moved task %p into vxi:%p[#%d]"
++	"task_get_vx_info(%p)"
++	"vx_migrate_task(%p,%p[#%d.%d])"
++ 6  40	"vx_clear_persistent(%p[#%d])"
++	"vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
++	"vx_set_init(%p[#%d],%p[#%d,%d,%d])"
++	"vx_set_persistent(%p[#%d])"
++	"vx_set_reaper(%p[#%d],%p[#%d,%d])"
++ 7  80	"vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
++
++
++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"
+diff -NurpP --minimal linux-3.7.10/Makefile linux-3.7.10-vs2.3.5.6/Makefile
+--- linux-3.7.10/Makefile	2013-03-02 09:54:53.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/Makefile	2013-03-02 17:55:53.000000000 +0000
+@@ -1,7 +1,7 @@
+ VERSION = 3
+ PATCHLEVEL = 7
+ SUBLEVEL = 10
+-EXTRAVERSION =
++EXTRAVERSION = -vs2.3.5.6
+ NAME = Terrified Chipmunk
+ 
+ # *DOCUMENTATION*
+diff -NurpP --minimal linux-3.7.10/arch/alpha/Kconfig linux-3.7.10-vs2.3.5.6/arch/alpha/Kconfig
+--- linux-3.7.10/arch/alpha/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/alpha/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
+ 	depends on VGA_HOSE
+ 	default y
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/alpha/kernel/systbls.S linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/systbls.S
+--- linux-3.7.10/arch/alpha/kernel/systbls.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/systbls.S	2012-12-18 15:13:16.000000000 +0000
+@@ -446,7 +446,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 */
+diff -NurpP --minimal linux-3.7.10/arch/alpha/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/traps.c
+--- linux-3.7.10/arch/alpha/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/alpha/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
+ #ifdef CONFIG_SMP
+ 	printk("CPU %d ", hard_smp_processor_id());
+ #endif
+-	printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
++	printk("%s(%d[#%u]): %s %ld\n", current->comm,
++		task_pid_nr(current), current->xid, str, err);
+ 	dik_show_regs(regs, r9_15);
+ 	add_taint(TAINT_DIE);
+ 	dik_show_trace((unsigned long *)(regs+1));
+diff -NurpP --minimal linux-3.7.10/arch/arm/Kconfig linux-3.7.10-vs2.3.5.6/arch/arm/Kconfig
+--- linux-3.7.10/arch/arm/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -2307,6 +2307,8 @@ source "fs/Kconfig"
+ 
+ source "arch/arm/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/arm/kernel/calls.S linux-3.7.10-vs2.3.5.6/arch/arm/kernel/calls.S
+--- linux-3.7.10/arch/arm/kernel/calls.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/kernel/calls.S	2012-12-18 15:13:16.000000000 +0000
+@@ -322,7 +322,7 @@
+ /* 310 */	CALL(sys_request_key)
+ 		CALL(sys_keyctl)
+ 		CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
+-/* vserver */	CALL(sys_ni_syscall)
++		CALL(sys_vserver)
+ 		CALL(sys_ioprio_set)
+ /* 315 */	CALL(sys_ioprio_get)
+ 		CALL(sys_inotify_init)
+diff -NurpP --minimal linux-3.7.10/arch/arm/kernel/process.c linux-3.7.10-vs2.3.5.6/arch/arm/kernel/process.c
+--- linux-3.7.10/arch/arm/kernel/process.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/kernel/process.c	2012-12-18 15:13:16.000000000 +0000
+@@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs)
+ void show_regs(struct pt_regs * regs)
+ {
+ 	printk("\n");
+-	printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
++	printk("Pid: %d[#%u], comm: %20s\n",
++		task_pid_nr(current), current->xid, current->comm);
+ 	__show_regs(regs);
+ 	dump_stack();
+ }
+diff -NurpP --minimal linux-3.7.10/arch/arm/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/arm/kernel/traps.c
+--- linux-3.7.10/arch/arm/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/arm/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -249,8 +249,8 @@ static int __die(const char *str, int er
+ 
+ 	print_modules();
+ 	__show_regs(regs);
+-	printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
+-		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));
++	printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
++		TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk));
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+ 		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
+diff -NurpP --minimal linux-3.7.10/arch/cris/Kconfig linux-3.7.10-vs2.3.5.6/arch/cris/Kconfig
+--- linux-3.7.10/arch/cris/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/cris/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -670,6 +670,8 @@ source "drivers/staging/Kconfig"
+ 
+ source "arch/cris/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/h8300/Kconfig linux-3.7.10-vs2.3.5.6/arch/h8300/Kconfig
+--- linux-3.7.10/arch/h8300/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/h8300/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -217,6 +217,8 @@ source "fs/Kconfig"
+ 
+ source "arch/h8300/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/ia64/Kconfig linux-3.7.10-vs2.3.5.6/arch/ia64/Kconfig
+--- linux-3.7.10/arch/ia64/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -644,6 +644,8 @@ source "fs/Kconfig"
+ 
+ source "arch/ia64/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/entry.S linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/entry.S
+--- linux-3.7.10/arch/ia64/kernel/entry.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/entry.S	2012-12-18 15:13:16.000000000 +0000
+@@ -1714,7 +1714,7 @@ sys_call_table:
+ 	data8 sys_mq_notify
+ 	data8 sys_mq_getsetattr
+ 	data8 sys_kexec_load
+-	data8 sys_ni_syscall			// reserved for vserver
++	data8 sys_vserver
+ 	data8 sys_waitid			// 1270
+ 	data8 sys_add_key
+ 	data8 sys_request_key
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/process.c linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/process.c
+--- linux-3.7.10/arch/ia64/kernel/process.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/process.c	2012-12-18 15:13:16.000000000 +0000
+@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs)
+ 	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
+ 
+ 	print_modules();
+-	printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
+-			smp_processor_id(), current->comm);
++	printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
++			current->xid, smp_processor_id(), current->comm);
+ 	printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
+ 	       regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
+ 	       init_utsname()->release);
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/ptrace.c
+--- linux-3.7.10/arch/ia64/kernel/ptrace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/ptrace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/regset.h>
+ #include <linux/elf.h>
+ #include <linux/tracehook.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+diff -NurpP --minimal linux-3.7.10/arch/ia64/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/traps.c
+--- linux-3.7.10/arch/ia64/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/ia64/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
+ 	put_cpu();
+ 
+ 	if (++die.lock_owner_depth < 3) {
+-		printk("%s[%d]: %s %ld [%d]\n",
+-		current->comm, task_pid_nr(current), str, err, ++die_counter);
++		printk("%s[%d[#%u]]: %s %ld [%d]\n",
++			current->comm, task_pid_nr(current), current->xid,
++			str, err, ++die_counter);
+ 		if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
+ 	            != NOTIFY_STOP)
+ 			show_regs(regs);
+@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
+ 			if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
+ 				last.time = current_jiffies + 5 * HZ;
+ 				printk(KERN_WARNING
+-		       			"%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+-		       			current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
++					"%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
++					current->comm, task_pid_nr(current), current->xid,
++					regs->cr_iip + ia64_psr(regs)->ri, isr);
+ 			}
+ 		}
+ 	}
+diff -NurpP --minimal linux-3.7.10/arch/m32r/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/m32r/kernel/traps.c
+--- linux-3.7.10/arch/m32r/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/m32r/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
+ 	} else {
+ 		printk("SPI: %08lx\n", sp);
+ 	}
+-	printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
+-		current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
++	printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
++		current->comm, task_pid_nr(current), current->xid,
++		0xffff & i, 4096+(unsigned long)current);
+ 
+ 	/*
+ 	 * When in-kernel, we also print out the stack and code at the
+diff -NurpP --minimal linux-3.7.10/arch/m68k/Kconfig linux-3.7.10-vs2.3.5.6/arch/m68k/Kconfig
+--- linux-3.7.10/arch/m68k/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/m68k/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -135,6 +135,8 @@ source "fs/Kconfig"
+ 
+ source "arch/m68k/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/mips/Kconfig linux-3.7.10-vs2.3.5.6/arch/mips/Kconfig
+--- linux-3.7.10/arch/mips/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -2574,6 +2574,8 @@ source "fs/Kconfig"
+ 
+ source "arch/mips/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/arch/mips/kernel/ptrace.c
+--- linux-3.7.10/arch/mips/kernel/ptrace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/ptrace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/security.h>
+ #include <linux/audit.h>
+ #include <linux/seccomp.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/byteorder.h>
+ #include <asm/cpu.h>
+@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi
+ 	void __user *datavp = (void __user *) data;
+ 	unsigned long __user *datalp = (void __user *) data;
+ 
++	if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
++		goto out;
++
+ 	switch (request) {
+ 	/* when I and D space are separate, these will need to be fixed. */
+ 	case PTRACE_PEEKTEXT: /* read word at location addr. */
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall32-o32.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall32-o32.S
+--- linux-3.7.10/arch/mips/kernel/scall32-o32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall32-o32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -512,7 +512,7 @@ einval:	li	v0, -ENOSYS
+ 	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		5
+ 	sys	sys_ni_syscall		0	/* available, was setaltroot */
+ 	sys	sys_add_key		5	/* 4280 */
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall64-64.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-64.S
+--- linux-3.7.10/arch/mips/kernel/scall64-64.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-64.S	2012-12-18 15:13:16.000000000 +0000
+@@ -351,7 +351,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
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall64-n32.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-n32.S
+--- linux-3.7.10/arch/mips/kernel/scall64-n32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-n32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -350,7 +350,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	compat_sys_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/scall64-o32.S linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-o32.S
+--- linux-3.7.10/arch/mips/kernel/scall64-o32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/scall64-o32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -469,7 +469,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_32_waitid
+ 	PTR	sys_ni_syscall			/* available, was setaltroot */
+ 	PTR	sys_add_key			/* 4280 */
+diff -NurpP --minimal linux-3.7.10/arch/mips/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/mips/kernel/traps.c
+--- linux-3.7.10/arch/mips/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/mips/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs
+ 
+ 	__show_regs(regs);
+ 	print_modules();
+-	printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
+-	       current->comm, current->pid, current_thread_info(), current,
+-	      field, current_thread_info()->tp_value);
++	printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
++		current->comm, task_pid_nr(current), current->xid,
++		current_thread_info(), current,
++		field, current_thread_info()->tp_value);
+ 	if (cpu_has_userlocal) {
+ 		unsigned long tls;
+ 
+diff -NurpP --minimal linux-3.7.10/arch/parisc/Kconfig linux-3.7.10-vs2.3.5.6/arch/parisc/Kconfig
+--- linux-3.7.10/arch/parisc/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -284,6 +284,8 @@ source "fs/Kconfig"
+ 
+ source "arch/parisc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/parisc/kernel/syscall_table.S linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/syscall_table.S
+--- linux-3.7.10/arch/parisc/kernel/syscall_table.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/syscall_table.S	2012-12-18 15:13:16.000000000 +0000
+@@ -361,7 +361,7 @@
+ 	ENTRY_COMP(mbind)		/* 260 */
+ 	ENTRY_COMP(get_mempolicy)
+ 	ENTRY_COMP(set_mempolicy)
+-	ENTRY_SAME(ni_syscall)	/* 263: reserved for vserver */
++	ENTRY_DIFF(vserver)
+ 	ENTRY_SAME(add_key)
+ 	ENTRY_SAME(request_key)		/* 265 */
+ 	ENTRY_SAME(keyctl)
+diff -NurpP --minimal linux-3.7.10/arch/parisc/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/traps.c
+--- linux-3.7.10/arch/parisc/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
+ 		if (err == 0)
+ 			return; /* STFU */
+ 
+-		printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
+-			current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
++		printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
++			current->comm, task_pid_nr(current), current->xid,
++			str, err, regs->iaoq[0]);
+ #ifdef PRINT_USER_FAULTS
+ 		/* XXX for debugging only */
+ 		show_regs(regs);
+@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_
+ 		pdc_console_restart();
+ 	
+ 	if (err)
+-		printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
+-			current->comm, task_pid_nr(current), str, err);
++		printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
++			current->comm, task_pid_nr(current), current->xid, str, err);
+ 
+ 	/* Wot's wrong wif bein' racy? */
+ 	if (current->thread.flags & PARISC_KERNEL_DEATH) {
+diff -NurpP --minimal linux-3.7.10/arch/parisc/mm/fault.c linux-3.7.10-vs2.3.5.6/arch/parisc/mm/fault.c
+--- linux-3.7.10/arch/parisc/mm/fault.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/parisc/mm/fault.c	2012-12-18 15:13:16.000000000 +0000
+@@ -237,8 +237,9 @@ bad_area:
+ 
+ #ifdef PRINT_USER_FAULTS
+ 		printk(KERN_DEBUG "\n");
+-		printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
+-		    task_pid_nr(tsk), tsk->comm, code, address);
++		printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
++		    "command='%s' type=%lu address=0x%08lx\n",
++		    task_pid_nr(tsk), tsk->xid, tsk->comm, code, address);
+ 		if (vma) {
+ 			printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
+ 					vma->vm_start, vma->vm_end);
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/Kconfig linux-3.7.10-vs2.3.5.6/arch/powerpc/Kconfig
+--- linux-3.7.10/arch/powerpc/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -1014,6 +1014,8 @@ source "lib/Kconfig"
+ 
+ source "arch/powerpc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ config KEYS_COMPAT
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/include/uapi/asm/unistd.h linux-3.7.10-vs2.3.5.6/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.7.10/arch/powerpc/include/uapi/asm/unistd.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/include/uapi/asm/unistd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -275,7 +275,7 @@
+ #endif
+ #define __NR_rtas		255
+ #define __NR_sys_debug_setcontext 256
+-/* Number 257 is reserved for vserver */
++#define __NR_vserver		257
+ #define __NR_migrate_pages	258
+ #define __NR_mbind		259
+ #define __NR_get_mempolicy	260
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/kernel/process.c linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/process.c
+--- linux-3.7.10/arch/powerpc/kernel/process.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/process.c	2012-12-18 15:13:16.000000000 +0000
+@@ -660,8 +660,9 @@ void show_regs(struct pt_regs * regs)
+ #else
+ 		printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
+ #endif
+-	printk("TASK = %p[%d] '%s' THREAD: %p",
+-	       current, task_pid_nr(current), current->comm, task_thread_info(current));
++	printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
++	       current, task_pid_nr(current), current->xid,
++	       current->comm, task_thread_info(current));
+ 
+ #ifdef CONFIG_SMP
+ 	printk(" CPU: %d", raw_smp_processor_id());
+diff -NurpP --minimal linux-3.7.10/arch/powerpc/kernel/traps.c linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/traps.c
+--- linux-3.7.10/arch/powerpc/kernel/traps.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/powerpc/kernel/traps.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1120,8 +1120,9 @@ void nonrecoverable_exception(struct pt_
+ 
+ void trace_syscall(struct pt_regs *regs)
+ {
+-	printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld    %s\n",
+-	       current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
++	printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld    %s\n",
++	       current, task_pid_nr(current), current->xid,
++	       regs->nip, regs->link, regs->gpr[0],
+ 	       regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/arch/s390/Kconfig linux-3.7.10-vs2.3.5.6/arch/s390/Kconfig
+--- linux-3.7.10/arch/s390/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -530,6 +530,8 @@ source "fs/Kconfig"
+ 
+ source "arch/s390/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/s390/include/asm/tlb.h linux-3.7.10-vs2.3.5.6/arch/s390/include/asm/tlb.h
+--- linux-3.7.10/arch/s390/include/asm/tlb.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/include/asm/tlb.h	2012-12-18 15:13:16.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <linux/mm.h>
+ #include <linux/pagemap.h>
+ #include <linux/swap.h>
++
+ #include <asm/processor.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+diff -NurpP --minimal linux-3.7.10/arch/s390/include/uapi/asm/unistd.h linux-3.7.10-vs2.3.5.6/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.7.10/arch/s390/include/uapi/asm/unistd.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/include/uapi/asm/unistd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -200,7 +200,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_statfs64		265
+ #define __NR_fstatfs64		266
+ #define __NR_remap_file_pages	267
+diff -NurpP --minimal linux-3.7.10/arch/s390/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/arch/s390/kernel/ptrace.c
+--- linux-3.7.10/arch/s390/kernel/ptrace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/kernel/ptrace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/tracehook.h>
+ #include <linux/seccomp.h>
+ #include <linux/compat.h>
++#include <linux/vs_base.h>
+ #include <trace/syscall.h>
+ #include <asm/segment.h>
+ #include <asm/page.h>
+diff -NurpP --minimal linux-3.7.10/arch/s390/kernel/syscalls.S linux-3.7.10-vs2.3.5.6/arch/s390/kernel/syscalls.S
+--- linux-3.7.10/arch/s390/kernel/syscalls.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/s390/kernel/syscalls.S	2012-12-18 15:13:16.000000000 +0000
+@@ -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(sys_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)
+diff -NurpP --minimal linux-3.7.10/arch/sh/Kconfig linux-3.7.10-vs2.3.5.6/arch/sh/Kconfig
+--- linux-3.7.10/arch/sh/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sh/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -945,6 +945,8 @@ source "fs/Kconfig"
+ 
+ source "arch/sh/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/sh/kernel/irq.c linux-3.7.10-vs2.3.5.6/arch/sh/kernel/irq.c
+--- linux-3.7.10/arch/sh/kernel/irq.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sh/kernel/irq.c	2012-12-18 15:13:16.000000000 +0000
+@@ -14,6 +14,7 @@
+ #include <linux/ftrace.h>
+ #include <linux/delay.h>
+ #include <linux/ratelimit.h>
++// #include <linux/vs_context.h>
+ #include <asm/processor.h>
+ #include <asm/machvec.h>
+ #include <asm/uaccess.h>
+diff -NurpP --minimal linux-3.7.10/arch/sparc/Kconfig linux-3.7.10-vs2.3.5.6/arch/sparc/Kconfig
+--- linux-3.7.10/arch/sparc/Kconfig	2013-03-02 09:54:54.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/Kconfig	2013-03-02 15:26:03.000000000 +0000
+@@ -565,6 +565,8 @@ source "fs/Kconfig"
+ 
+ source "arch/sparc/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/sparc/include/uapi/asm/unistd.h linux-3.7.10-vs2.3.5.6/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.7.10/arch/sparc/include/uapi/asm/unistd.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/include/uapi/asm/unistd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -332,7 +332,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
+diff -NurpP --minimal linux-3.7.10/arch/sparc/kernel/systbls_32.S linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_32.S
+--- linux-3.7.10/arch/sparc/kernel/systbls_32.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_32.S	2012-12-18 15:13:16.000000000 +0000
+@@ -70,7 +70,7 @@ sys_call_table:
+ /*250*/	.long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
+ /*255*/	.long sys_sync_file_range, 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_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
+diff -NurpP --minimal linux-3.7.10/arch/sparc/kernel/systbls_64.S linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_64.S
+--- linux-3.7.10/arch/sparc/kernel/systbls_64.S	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/sparc/kernel/systbls_64.S	2012-12-18 15:13:16.000000000 +0000
+@@ -71,7 +71,7 @@ sys_call_table32:
+ /*250*/	.word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
+ 	.word sys32_sync_file_range, compat_sys_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, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
++	.word sys_timer_delete, compat_sys_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 sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat
+@@ -149,7 +149,7 @@ sys_call_table:
+ /*250*/	.word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
+ 	.word sys_sync_file_range, 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_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
+diff -NurpP --minimal linux-3.7.10/arch/um/Kconfig.rest linux-3.7.10-vs2.3.5.6/arch/um/Kconfig.rest
+--- linux-3.7.10/arch/um/Kconfig.rest	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/um/Kconfig.rest	2012-12-18 15:13:16.000000000 +0000
+@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
+ 
+ source "fs/Kconfig"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/um/include/shared/kern_constants.h linux-3.7.10-vs2.3.5.6/arch/um/include/shared/kern_constants.h
+--- linux-3.7.10/arch/um/include/shared/kern_constants.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/um/include/shared/kern_constants.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../include/generated/asm-offsets.h"
+diff -NurpP --minimal linux-3.7.10/arch/um/include/shared/user_constants.h linux-3.7.10-vs2.3.5.6/arch/um/include/shared/user_constants.h
+--- linux-3.7.10/arch/um/include/shared/user_constants.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/um/include/shared/user_constants.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,40 @@
++/*
++ * DO NOT MODIFY.
++ *
++ * This file was generated by arch/um/Makefile
++ *
++ */
++
++#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2)	# */
++#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err)	# */
++#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno)	# */
++#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long)	# */
++#define HOST_RBX 5 /* RBX	# */
++#define HOST_RCX 11 /* RCX	# */
++#define HOST_RDI 14 /* RDI	# */
++#define HOST_RSI 13 /* RSI	# */
++#define HOST_RDX 12 /* RDX	# */
++#define HOST_RBP 4 /* RBP	# */
++#define HOST_RAX 10 /* RAX	# */
++#define HOST_R8 9 /* R8	# */
++#define HOST_R9 8 /* R9	# */
++#define HOST_R10 7 /* R10	# */
++#define HOST_R11 6 /* R11	# */
++#define HOST_R12 3 /* R12	# */
++#define HOST_R13 2 /* R13	# */
++#define HOST_R14 1 /* R14	# */
++#define HOST_R15 0 /* R15	# */
++#define HOST_ORIG_RAX 15 /* ORIG_RAX	# */
++#define HOST_CS 17 /* CS	# */
++#define HOST_SS 20 /* SS	# */
++#define HOST_EFLAGS 18 /* EFLAGS	# */
++#define HOST_IP 16 /* RIP	# */
++#define HOST_SP 19 /* RSP	# */
++#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct)	# */
++#define UM_POLLIN 1 /* POLLIN	# */
++#define UM_POLLPRI 2 /* POLLPRI	# */
++#define UM_POLLOUT 4 /* POLLOUT	# */
++#define UM_PROT_READ 1 /* PROT_READ	# */
++#define UM_PROT_WRITE 2 /* PROT_WRITE	# */
++#define UM_PROT_EXEC 4 /* PROT_EXEC	# */
++
+diff -NurpP --minimal linux-3.7.10/arch/x86/Kconfig linux-3.7.10-vs2.3.5.6/arch/x86/Kconfig
+--- linux-3.7.10/arch/x86/Kconfig	2013-03-02 09:54:54.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/x86/Kconfig	2013-03-02 15:26:03.000000000 +0000
+@@ -2244,6 +2244,8 @@ source "fs/Kconfig"
+ 
+ source "arch/x86/Kconfig.debug"
+ 
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+ 
+ source "crypto/Kconfig"
+diff -NurpP --minimal linux-3.7.10/arch/x86/syscalls/syscall_32.tbl linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.7.10/arch/x86/syscalls/syscall_32.tbl	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_32.tbl	2012-12-18 15:13:16.000000000 +0000
+@@ -279,7 +279,7 @@
+ 270	i386	tgkill			sys_tgkill
+ 271	i386	utimes			sys_utimes			compat_sys_utimes
+ 272	i386	fadvise64_64		sys_fadvise64_64		sys32_fadvise64_64
+-273	i386	vserver
++273	i386	vserver			sys_vserver			sys32_vserver
+ 274	i386	mbind			sys_mbind
+ 275	i386	get_mempolicy		sys_get_mempolicy		compat_sys_get_mempolicy
+ 276	i386	set_mempolicy		sys_set_mempolicy
+diff -NurpP --minimal linux-3.7.10/arch/x86/syscalls/syscall_64.tbl linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.7.10/arch/x86/syscalls/syscall_64.tbl	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/arch/x86/syscalls/syscall_64.tbl	2012-12-18 15:13:16.000000000 +0000
+@@ -242,7 +242,7 @@
+ 233	common	epoll_ctl		sys_epoll_ctl
+ 234	common	tgkill			sys_tgkill
+ 235	common	utimes			sys_utimes
+-236	64	vserver
++236	64	vserver			sys_vserver
+ 237	common	mbind			sys_mbind
+ 238	common	set_mempolicy		sys_set_mempolicy
+ 239	common	get_mempolicy		sys_get_mempolicy
+diff -NurpP --minimal linux-3.7.10/drivers/block/Kconfig linux-3.7.10-vs2.3.5.6/drivers/block/Kconfig
+--- linux-3.7.10/drivers/block/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -291,6 +291,13 @@ config BLK_DEV_CRYPTOLOOP
+ 
+ source "drivers/block/drbd/Kconfig"
+ 
++config BLK_DEV_VROOT
++	tristate "Virtual Root device support"
++	depends on QUOTACTL
++	---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
+diff -NurpP --minimal linux-3.7.10/drivers/block/Makefile linux-3.7.10-vs2.3.5.6/drivers/block/Makefile
+--- linux-3.7.10/drivers/block/Makefile	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/Makefile	2012-12-18 15:13:16.000000000 +0000
+@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK)	+= virtio_blk.o
+ obj-$(CONFIG_VIODASD)		+= viodasd.o
+ obj-$(CONFIG_BLK_DEV_SX8)	+= sx8.o
+ obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
++obj-$(CONFIG_BLK_DEV_VROOT)	+= vroot.o
+ 
+ obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
+ obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/
+diff -NurpP --minimal linux-3.7.10/drivers/block/loop.c linux-3.7.10-vs2.3.5.6/drivers/block/loop.c
+--- linux-3.7.10/drivers/block/loop.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/loop.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,6 +76,7 @@
+ #include <linux/sysfs.h>
+ #include <linux/miscdevice.h>
+ #include <linux/falloc.h>
++#include <linux/vs_context.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_devic
+ 	lo->lo_blocksize = lo_blocksize;
+ 	lo->lo_device = bdev;
+ 	lo->lo_flags = lo_flags;
++	lo->lo_xid = vx_current_xid();
+ 	lo->lo_backing_file = file;
+ 	lo->transfer = transfer_none;
+ 	lo->ioctl = NULL;
+@@ -1014,6 +1016,7 @@ static int loop_clr_fd(struct loop_devic
+ 	lo->lo_sizelimit = 0;
+ 	lo->lo_encrypt_key_size = 0;
+ 	lo->lo_thread = NULL;
++	lo->lo_xid = 0;
+ 	memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE);
+ 	memset(lo->lo_crypt_name, 0, LO_NAME_SIZE);
+ 	memset(lo->lo_file_name, 0, LO_NAME_SIZE);
+@@ -1055,7 +1058,7 @@ loop_set_status(struct loop_device *lo,
+ 
+ 	if (lo->lo_encrypt_key_size &&
+ 	    !uid_eq(lo->lo_key_owner, uid) &&
+-	    !capable(CAP_SYS_ADMIN))
++	    !vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP))
+ 		return -EPERM;
+ 	if (lo->lo_state != Lo_bound)
+ 		return -ENXIO;
+@@ -1145,7 +1148,8 @@ loop_get_status(struct loop_device *lo,
+ 	memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
+ 	info->lo_encrypt_type =
+ 		lo->lo_encryption ? lo->lo_encryption->number : 0;
+-	if (lo->lo_encrypt_key_size && capable(CAP_SYS_ADMIN)) {
++	if (lo->lo_encrypt_key_size &&
++		vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_CLOOP)) {
+ 		info->lo_encrypt_key_size = lo->lo_encrypt_key_size;
+ 		memcpy(info->lo_encrypt_key, lo->lo_encrypt_key,
+ 		       lo->lo_encrypt_key_size);
+@@ -1505,6 +1509,11 @@ static int lo_open(struct block_device *
+ 		goto out;
+ 	}
+ 
++	if (!vx_check(lo->lo_xid, VS_IDENT|VS_HOSTID|VS_ADMIN_P)) {
++		err = -EACCES;
++		goto out;
++	}
++
+ 	mutex_lock(&lo->lo_ctl_mutex);
+ 	lo->lo_refcnt++;
+ 	mutex_unlock(&lo->lo_ctl_mutex);
+diff -NurpP --minimal linux-3.7.10/drivers/block/vroot.c linux-3.7.10-vs2.3.5.6/drivers/block/vroot.c
+--- linux-3.7.10/drivers/block/vroot.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/block/vroot.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,291 @@
++/*
++ *  linux/drivers/block/vroot.c
++ *
++ *  written by Herbert Pötzl, 9/11/2002
++ *  ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ *
++ *  based on the loop.c code by Theodore Ts'o.
++ *
++ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Redistribution of this file is permitted under the
++ * GNU General Public License.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/file.h>
++#include <linux/major.h>
++#include <linux/blkdev.h>
++#include <linux/slab.h>
++
++#include <linux/vroot.h>
++#include <linux/vs_context.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 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(VXD_CBIT(misc, 0),
++		"vroot[%d]_set_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	vr->vr_state = Vr_bound;
++	error = 0;
++
++ out_fput:
++	fput(file);
++ out:
++	return error;
++}
++
++static int vroot_clr_dev(
++	struct vroot_device *vr,
++	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(VXD_CBIT(misc, 0),
++		"vroot[%d]_clr_dev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	bdput(real_bdev);
++	vr->vr_state = Vr_unbound;
++	vr->vr_device = NULL;
++	return 0;
++}
++
++
++static int vr_ioctl(struct block_device *bdev, fmode_t mode,
++	unsigned int cmd, unsigned long arg)
++{
++	struct vroot_device *vr = bdev->bd_disk->private_data;
++	int err;
++
++	down(&vr->vr_ctl_mutex);
++	switch (cmd) {
++	case VROOT_SET_DEV:
++		err = vroot_set_dev(vr, bdev, arg);
++		break;
++	case VROOT_CLR_DEV:
++		err = vroot_clr_dev(vr, bdev);
++		break;
++	default:
++		err = -EINVAL;
++		break;
++	}
++	up(&vr->vr_ctl_mutex);
++	return err;
++}
++
++static int vr_open(struct block_device *bdev, fmode_t mode)
++{
++	struct vroot_device *vr = 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 gendisk *disk, fmode_t mode)
++{
++	struct vroot_device *vr = 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,
++};
++
++static void vroot_make_request(struct request_queue *q, struct bio *bio)
++{
++	printk("vroot_make_request %p, %p\n", q, bio);
++	bio_io_error(bio);
++}
++
++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(VXD_CBIT(misc, 0),
++		"vroot[%d]_get_real_bdev: dev=" VXF_DEV,
++		vr->vr_number, VXD_DEV(real_bdev));
++
++	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 Pötzl");
++MODULE_DESCRIPTION ("Virtual Root Device Mapper");
++
++
++int __init vroot_init(void)
++{
++	int err, 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;
++
++	err = -ENOMEM;
++	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;
++		disks[i]->queue = blk_alloc_queue(GFP_KERNEL);
++		if (!disks[i]->queue)
++			goto out_mem3;
++		blk_queue_make_request(disks[i]->queue, vroot_make_request);
++	}
++
++	for (i = 0; i < max_vroot; i++) {
++		struct vroot_device *vr = &vroot_dev[i];
++		struct gendisk *disk = disks[i];
++
++		memset(vr, 0, sizeof(*vr));
++		sema_init(&vr->vr_ctl_mutex, 1);
++		vr->vr_number = i;
++		disk->major = VROOT_MAJOR;
++		disk->first_minor = i;
++		disk->fops = &vr_fops;
++		sprintf(disk->disk_name, "vroot%d", i);
++		disk->private_data = vr;
++	}
++
++	err = register_vroot_grb(&__vroot_get_real_bdev);
++	if (err)
++		goto out_mem3;
++
++	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 err;
++}
++
++void vroot_exit(void)
++{
++	int i;
++
++	if (unregister_vroot_grb(&__vroot_get_real_bdev))
++		printk(KERN_WARNING "vroot: cannot unregister grb\n");
++
++	for (i = 0; i < max_vroot; i++) {
++		del_gendisk(disks[i]);
++		put_disk(disks[i]);
++	}
++	unregister_blkdev(VROOT_MAJOR, "vroot");
++
++	kfree(disks);
++	kfree(vroot_dev);
++}
++
++module_init(vroot_init);
++module_exit(vroot_exit);
++
++#ifndef MODULE
++
++static int __init max_vroot_setup(char *str)
++{
++	max_vroot = simple_strtol(str, NULL, 0);
++	return 1;
++}
++
++__setup("max_vroot=", max_vroot_setup);
++
++#endif
++
+diff -NurpP --minimal linux-3.7.10/drivers/infiniband/Kconfig linux-3.7.10-vs2.3.5.6/drivers/infiniband/Kconfig
+--- linux-3.7.10/drivers/infiniband/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/infiniband/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
+ config INFINIBAND_ADDR_TRANS
+ 	bool
+ 	depends on INET
+-	depends on !(INFINIBAND = y && IPV6 = m)
++	depends on !(INFINIBAND = y && IPV6 = y)
+ 	default y
+ 
+ source "drivers/infiniband/hw/mthca/Kconfig"
+diff -NurpP --minimal linux-3.7.10/drivers/infiniband/core/addr.c linux-3.7.10-vs2.3.5.6/drivers/infiniband/core/addr.c
+--- linux-3.7.10/drivers/infiniband/core/addr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/infiniband/core/addr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr
+ 
+ 	if (ipv6_addr_any(&fl6.saddr)) {
+ 		ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
+-					 &fl6.daddr, 0, &fl6.saddr);
++					 &fl6.daddr, 0, &fl6.saddr, NULL);
+ 		if (ret)
+ 			goto put;
+ 
+diff -NurpP --minimal linux-3.7.10/drivers/md/dm-ioctl.c linux-3.7.10-vs2.3.5.6/drivers/md/dm-ioctl.c
+--- linux-3.7.10/drivers/md/dm-ioctl.c	2013-03-02 09:54:56.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/md/dm-ioctl.c	2013-02-05 01:14:43.000000000 +0000
+@@ -16,6 +16,7 @@
+ #include <linux/dm-ioctl.h>
+ #include <linux/hdreg.h>
+ #include <linux/compat.h>
++#include <linux/vs_context.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell
+ 	unsigned int h = hash_str(str);
+ 
+ 	list_for_each_entry (hc, _name_buckets + h, name_list)
+-		if (!strcmp(hc->name, str)) {
++		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++			!strcmp(hc->name, str)) {
+ 			dm_get(hc->md);
+ 			return hc;
+ 		}
+@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell
+ 	unsigned int h = hash_str(str);
+ 
+ 	list_for_each_entry (hc, _uuid_buckets + h, uuid_list)
+-		if (!strcmp(hc->uuid, str)) {
++		if (vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT) &&
++			!strcmp(hc->uuid, str)) {
+ 			dm_get(hc->md);
+ 			return hc;
+ 		}
+@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell
+ static struct hash_cell *__get_dev_cell(uint64_t dev)
+ {
+ 	struct mapped_device *md;
+-	struct hash_cell *hc;
++	struct hash_cell *hc = NULL;
+ 
+ 	md = dm_get_md(huge_decode_dev(dev));
+ 	if (!md)
+ 		return NULL;
+ 
+-	hc = dm_get_mdptr(md);
++	if (vx_check(dm_get_xid(md), VS_WATCH_P | VS_IDENT))
++		hc = dm_get_mdptr(md);
++
+ 	if (!hc) {
+ 		dm_put(md);
+ 		return NULL;
+@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl
+ 
+ static int remove_all(struct dm_ioctl *param, size_t param_size)
+ {
++	if (!vx_check(0, VS_ADMIN))
++		return -EPERM;
++
+ 	dm_hash_remove_all(1);
+ 	param->data_size = 0;
+ 	return 0;
+@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl
+ 	 */
+ 	for (i = 0; i < NUM_BUCKETS; i++) {
+ 		list_for_each_entry (hc, _name_buckets + i, name_list) {
++			if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++				continue;
+ 			needed += sizeof(struct dm_name_list);
+ 			needed += strlen(hc->name) + 1;
+ 			needed += ALIGN_MASK;
+@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl
+ 	 */
+ 	for (i = 0; i < NUM_BUCKETS; i++) {
+ 		list_for_each_entry (hc, _name_buckets + i, name_list) {
++			if (!vx_check(dm_get_xid(hc->md), VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (old_nl)
+ 				old_nl->next = (uint32_t) ((void *) nl -
+ 							   (void *) old_nl);
+@@ -1627,8 +1639,8 @@ static int ctl_ioctl(uint command, struc
+ 	ioctl_fn fn = NULL;
+ 	size_t input_param_size;
+ 
+-	/* only root can play with this */
+-	if (!capable(CAP_SYS_ADMIN))
++	/* only root and certain contexts can play with this */
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_ADMIN_MAPPER))
+ 		return -EACCES;
+ 
+ 	if (_IOC_TYPE(command) != DM_IOCTL)
+diff -NurpP --minimal linux-3.7.10/drivers/md/dm.c linux-3.7.10-vs2.3.5.6/drivers/md/dm.c
+--- linux-3.7.10/drivers/md/dm.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/md/dm.c	2012-12-18 15:13:16.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <linux/idr.h>
+ #include <linux/hdreg.h>
+ #include <linux/delay.h>
++#include <linux/vs_base.h>
+ 
+ #include <trace/events/block.h>
+ 
+@@ -137,6 +138,7 @@ struct mapped_device {
+ 	rwlock_t map_lock;
+ 	atomic_t holders;
+ 	atomic_t open_count;
++	xid_t xid;
+ 
+ 	unsigned long flags;
+ 
+@@ -345,6 +347,7 @@ int dm_deleting_md(struct mapped_device
+ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
+ {
+ 	struct mapped_device *md;
++	int ret = -ENXIO;
+ 
+ 	spin_lock(&_minor_lock);
+ 
+@@ -353,18 +356,19 @@ static int dm_blk_open(struct block_devi
+ 		goto out;
+ 
+ 	if (test_bit(DMF_FREEING, &md->flags) ||
+-	    dm_deleting_md(md)) {
+-		md = NULL;
++	    dm_deleting_md(md))
++		goto out;
++
++	ret = -EACCES;
++	if (!vx_check(md->xid, VS_IDENT|VS_HOSTID))
+ 		goto out;
+-	}
+ 
+ 	dm_get(md);
+ 	atomic_inc(&md->open_count);
+-
++	ret = 0;
+ out:
+ 	spin_unlock(&_minor_lock);
+-
+-	return md ? 0 : -ENXIO;
++	return ret;
+ }
+ 
+ static int dm_blk_close(struct gendisk *disk, fmode_t mode)
+@@ -575,6 +579,14 @@ int dm_set_geometry(struct mapped_device
+ 	return 0;
+ }
+ 
++/*
++ * Get the xid associated with a dm device
++ */
++xid_t dm_get_xid(struct mapped_device *md)
++{
++	return md->xid;
++}
++
+ /*-----------------------------------------------------------------
+  * CRUD START:
+  *   A more elegant soln is in the works that uses the queue
+@@ -1852,6 +1864,7 @@ static struct mapped_device *alloc_dev(i
+ 	INIT_LIST_HEAD(&md->uevent_list);
+ 	spin_lock_init(&md->uevent_lock);
+ 
++	md->xid = vx_current_xid();
+ 	md->queue = blk_alloc_queue(GFP_KERNEL);
+ 	if (!md->queue)
+ 		goto bad_queue;
+diff -NurpP --minimal linux-3.7.10/drivers/md/dm.h linux-3.7.10-vs2.3.5.6/drivers/md/dm.h
+--- linux-3.7.10/drivers/md/dm.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/md/dm.h	2012-12-18 15:13:16.000000000 +0000
+@@ -46,6 +46,8 @@ struct dm_dev_internal {
+ struct dm_table;
+ struct dm_md_mempools;
+ 
++xid_t dm_get_xid(struct mapped_device *md);
++
+ /*-----------------------------------------------------------------
+  * Internal table functions.
+  *---------------------------------------------------------------*/
+diff -NurpP --minimal linux-3.7.10/drivers/net/tun.c linux-3.7.10-vs2.3.5.6/drivers/net/tun.c
+--- linux-3.7.10/drivers/net/tun.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/net/tun.c	2012-12-18 15:13:16.000000000 +0000
+@@ -64,6 +64,7 @@
+ #include <linux/nsproxy.h>
+ #include <linux/virtio_net.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_network.h>
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
+ #include <net/rtnetlink.h>
+@@ -123,6 +124,7 @@ struct tun_struct {
+ 	unsigned int 		flags;
+ 	kuid_t			owner;
+ 	kgid_t			group;
++	nid_t			nid;
+ 
+ 	struct net_device	*dev;
+ 	netdev_features_t	set_features;
+@@ -1034,6 +1036,7 @@ static void tun_setup(struct net_device
+ 
+ 	tun->owner = INVALID_UID;
+ 	tun->group = INVALID_GID;
++	tun->nid = nx_current_nid();
+ 
+ 	dev->ethtool_ops = &tun_ethtool_ops;
+ 	dev->destructor = tun_free_netdev;
+@@ -1198,7 +1201,7 @@ static int tun_set_iff(struct net *net,
+ 
+ 		if (((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) ||
+ 		     (gid_valid(tun->group) && !in_egroup_p(tun->group))) &&
+-		    !capable(CAP_NET_ADMIN))
++		     !cap_raised(current_cap(), CAP_NET_ADMIN))
+ 			return -EPERM;
+ 		err = security_tun_dev_attach(tun->socket.sk);
+ 		if (err < 0)
+@@ -1212,7 +1215,7 @@ static int tun_set_iff(struct net *net,
+ 		char *name;
+ 		unsigned long flags = 0;
+ 
+-		if (!capable(CAP_NET_ADMIN))
++		if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE))
+ 			return -EPERM;
+ 		err = security_tun_dev_create();
+ 		if (err < 0)
+@@ -1283,6 +1286,9 @@ static int tun_set_iff(struct net *net,
+ 
+ 		sk->sk_destruct = tun_sock_destruct;
+ 
++		if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P))
++			return -EPERM;
++
+ 		err = tun_attach(tun, file);
+ 		if (err < 0)
+ 			goto failed;
+@@ -1478,6 +1484,16 @@ static long __tun_chr_ioctl(struct file
+ 			  from_kgid(&init_user_ns, tun->group));
+ 		break;
+ 
++	case TUNSETNID:
++		if (!capable(CAP_CONTEXT))
++			return -EPERM;
++
++		/* Set nid owner of the device */
++		tun->nid = (nid_t) arg;
++
++		tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid);
++		break;
++
+ 	case TUNSETLINK:
+ 		/* Only allow setting the type when the interface is down */
+ 		if (tun->dev->flags & IFF_UP) {
+diff -NurpP --minimal linux-3.7.10/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7.10-vs2.3.5.6/drivers/staging/csr/csr_wifi_hip_xbv.c
+--- linux-3.7.10/drivers/staging/csr/csr_wifi_hip_xbv.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/staging/csr/csr_wifi_hip_xbv.c	2012-12-18 15:13:16.000000000 +0000
+@@ -55,7 +55,7 @@ typedef struct
+ {
+     char t_name[4];
+     u32     t_len;
+-} tag_t;
++} ctag_t;
+ 
+ 
+ #define TAG_EQ(i, v)    (((i)[0] == (v)[0]) &&  \
+@@ -90,7 +90,7 @@ typedef struct
+     u32 ptr;
+ } xbv_stack_t;
+ 
+-static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag);
++static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag);
+ static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len);
+ static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len);
+ static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack,
+@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf,
+ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo)
+ {
+     ct_t ct;
+-    tag_t tag;
++    ctag_t tag;
+     xbv_stack_t stack;
+ 
+     ct.dlpriv = dlpriv;
+@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len)
+ }
+ 
+ 
+-static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag)
++static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag)
+ {
+     u8 buf[8];
+     s32 n;
+diff -NurpP --minimal linux-3.7.10/drivers/tty/sysrq.c linux-3.7.10-vs2.3.5.6/drivers/tty/sysrq.c
+--- linux-3.7.10/drivers/tty/sysrq.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/tty/sysrq.c	2012-12-18 15:13:16.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/slab.h>
+ #include <linux/input.h>
+ #include <linux/uaccess.h>
++#include <linux/vserver/debug.h>
+ 
+ #include <asm/ptrace.h>
+ #include <asm/irq_regs.h>
+@@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op
+ 	.enable_mask	= SYSRQ_ENABLE_RTNICE,
+ };
+ 
++
++#ifdef CONFIG_VSERVER_DEBUG
++static void sysrq_handle_vxinfo(int key)
++{
++	dump_vx_info_inactive((key == 'x') ? 0 : 1);
++}
++
++static struct sysrq_key_op sysrq_showvxinfo_op = {
++	.handler	= sysrq_handle_vxinfo,
++	.help_msg	= "conteXt",
++	.action_msg	= "Show Context Info",
++	.enable_mask	= SYSRQ_ENABLE_DUMP,
++};
++#endif
++
+ /* Key Operations table and lock */
+ static DEFINE_SPINLOCK(sysrq_key_table_lock);
+ 
+@@ -453,7 +469,11 @@ static struct sysrq_key_op *sysrq_key_ta
+ 	&sysrq_showstate_blocked_op,	/* w */
+ 	/* x: May be registered on ppc/powerpc for xmon */
+ 	/* x: May be registered on sparc64 for global PMU dump */
++#ifdef CONFIG_VSERVER_DEBUG
++	&sysrq_showvxinfo_op,		/* x */
++#else
+ 	NULL,				/* x */
++#endif
+ 	/* y: May be registered on sparc64 for global register dump */
+ 	NULL,				/* y */
+ 	&sysrq_ftrace_dump_op,		/* z */
+@@ -468,6 +488,8 @@ static int sysrq_key_table_key2index(int
+ 		retval = key - '0';
+ 	else if ((key >= 'a') && (key <= 'z'))
+ 		retval = key + 10 - 'a';
++	else if ((key >= 'A') && (key <= 'Z'))
++		retval = key + 10 - 'A';
+ 	else
+ 		retval = -1;
+ 	return retval;
+diff -NurpP --minimal linux-3.7.10/drivers/tty/tty_io.c linux-3.7.10-vs2.3.5.6/drivers/tty/tty_io.c
+--- linux-3.7.10/drivers/tty/tty_io.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/drivers/tty/tty_io.c	2012-12-18 15:13:16.000000000 +0000
+@@ -104,6 +104,7 @@
+ 
+ #include <linux/kmod.h>
+ #include <linux/nsproxy.h>
++#include <linux/vs_pid.h>
+ 
+ #undef TTY_DEBUG_HANGUP
+ 
+@@ -2139,7 +2140,8 @@ static int tiocsti(struct tty_struct *tt
+ 	char ch, mbz = 0;
+ 	struct tty_ldisc *ld;
+ 
+-	if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
++	if (((current->signal->tty != tty) &&
++		!vx_capable(CAP_SYS_ADMIN, VXC_TIOCSTI)))
+ 		return -EPERM;
+ 	if (get_user(ch, p))
+ 		return -EFAULT;
+@@ -2426,6 +2428,7 @@ static int tiocspgrp(struct tty_struct *
+ 		return -ENOTTY;
+ 	if (get_user(pgrp_nr, p))
+ 		return -EFAULT;
++	pgrp_nr = vx_rmap_pid(pgrp_nr);
+ 	if (pgrp_nr < 0)
+ 		return -EINVAL;
+ 	rcu_read_lock();
+diff -NurpP --minimal linux-3.7.10/fs/attr.c linux-3.7.10-vs2.3.5.6/fs/attr.c
+--- linux-3.7.10/fs/attr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/attr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,9 @@
+ #include <linux/security.h>
+ #include <linux/evm.h>
+ #include <linux/ima.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/vs_tag.h>
+ 
+ /**
+  * inode_change_ok - check if attribute changes to an inode are allowed
+@@ -75,6 +78,10 @@ int inode_change_ok(const struct inode *
+ 			return -EPERM;
+ 	}
+ 
++	/* check for inode tag permission */
++	if (dx_permission(inode, MAY_WRITE))
++		return -EACCES;
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(inode_change_ok);
+@@ -145,6 +152,8 @@ void setattr_copy(struct inode *inode, c
+ 		inode->i_uid = attr->ia_uid;
+ 	if (ia_valid & ATTR_GID)
+ 		inode->i_gid = attr->ia_gid;
++	if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++		inode->i_tag = attr->ia_tag;
+ 	if (ia_valid & ATTR_ATIME)
+ 		inode->i_atime = timespec_trunc(attr->ia_atime,
+ 						inode->i_sb->s_time_gran);
+@@ -174,7 +183,8 @@ int notify_change(struct dentry * dentry
+ 
+ 	WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex));
+ 
+-	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) {
++	if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID |
++		ATTR_TAG | ATTR_TIMES_SET)) {
+ 		if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 			return -EPERM;
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/block_dev.c linux-3.7.10-vs2.3.5.6/fs/block_dev.c
+--- linux-3.7.10/fs/block_dev.c	2013-03-02 09:54:59.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/block_dev.c	2013-03-02 15:26:03.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <linux/namei.h>
+ #include <linux/log2.h>
+ #include <linux/cleancache.h>
++#include <linux/vs_device.h>
+ #include <asm/uaccess.h>
+ #include "internal.h"
+ 
+@@ -528,6 +529,7 @@ struct block_device *bdget(dev_t dev)
+ 		bdev->bd_invalidated = 0;
+ 		inode->i_mode = S_IFBLK;
+ 		inode->i_rdev = dev;
++		inode->i_mdev = dev;
+ 		inode->i_bdev = bdev;
+ 		inode->i_data.a_ops = &def_blk_aops;
+ 		mapping_set_gfp_mask(&inode->i_data, GFP_USER);
+@@ -574,6 +576,11 @@ EXPORT_SYMBOL(bdput);
+ static struct block_device *bd_acquire(struct inode *inode)
+ {
+ 	struct block_device *bdev;
++	dev_t mdev;
++
++	if (!vs_map_blkdev(inode->i_rdev, &mdev, DATTR_OPEN))
++		return NULL;
++	inode->i_mdev = mdev;
+ 
+ 	spin_lock(&bdev_lock);
+ 	bdev = inode->i_bdev;
+@@ -584,7 +591,7 @@ static struct block_device *bd_acquire(s
+ 	}
+ 	spin_unlock(&bdev_lock);
+ 
+-	bdev = bdget(inode->i_rdev);
++	bdev = bdget(mdev);
+ 	if (bdev) {
+ 		spin_lock(&bdev_lock);
+ 		if (!inode->i_bdev) {
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/ctree.h linux-3.7.10-vs2.3.5.6/fs/btrfs/ctree.h
+--- linux-3.7.10/fs/btrfs/ctree.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/ctree.h	2012-12-18 15:13:16.000000000 +0000
+@@ -692,11 +692,14 @@ struct btrfs_inode_item {
+ 	/* modification sequence number for NFS */
+ 	__le64 sequence;
+ 
++	__le16 tag;
+ 	/*
+ 	 * a little future expansion, for more than this we can
+ 	 * just grow the inode item and version it
+ 	 */
+-	__le64 reserved[4];
++	__le16 reserved16;
++	__le32 reserved32;
++	__le64 reserved[3];
+ 	struct btrfs_timespec atime;
+ 	struct btrfs_timespec ctime;
+ 	struct btrfs_timespec mtime;
+@@ -1757,6 +1760,8 @@ struct btrfs_ioctl_defrag_range_args {
+ #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21)
+ #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	(1 << 22)
+ 
++#define BTRFS_MOUNT_TAGGED		(1 << 24)
++
+ #define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)
+ #define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)
+ #define btrfs_test_opt(root, opt)	((root)->fs_info->mount_opt & \
+@@ -2025,6 +2030,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st
+ BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32);
+ BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32);
+ BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32);
++BTRFS_SETGET_FUNCS(inode_tag, struct btrfs_inode_item, tag, 16);
+ BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32);
+ BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64);
+ BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64);
+@@ -2078,6 +2084,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct
+ 
+ BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32);
+ 
++#define BTRFS_INODE_IXUNLINK		(1 << 24)
++#define BTRFS_INODE_BARRIER		(1 << 25)
++#define BTRFS_INODE_COW			(1 << 26)
++
+ 
+ BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8);
+ 
+@@ -3363,6 +3373,7 @@ extern const struct dentry_operations bt
+ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+ void btrfs_update_iflags(struct inode *inode);
+ void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);
++int btrfs_sync_flags(struct inode *inode, int, int);
+ int btrfs_defrag_file(struct inode *inode, struct file *file,
+ 		      struct btrfs_ioctl_defrag_range_args *range,
+ 		      u64 newer_than, unsigned long max_pages);
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/disk-io.c linux-3.7.10-vs2.3.5.6/fs/btrfs/disk-io.c
+--- linux-3.7.10/fs/btrfs/disk-io.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/disk-io.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2197,6 +2197,9 @@ int open_ctree(struct super_block *sb,
+ 		goto fail_alloc;
+ 	}
+ 
++	if (btrfs_test_opt(tree_root, TAGGED))
++		sb->s_flags |= MS_TAGGED;
++
+ 	features = btrfs_super_incompat_flags(disk_super) &
+ 		~BTRFS_FEATURE_INCOMPAT_SUPP;
+ 	if (features) {
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/inode.c linux-3.7.10-vs2.3.5.6/fs/btrfs/inode.c
+--- linux-3.7.10/fs/btrfs/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <linux/slab.h>
+ #include <linux/ratelimit.h>
+ #include <linux/mount.h>
++#include <linux/vs_tag.h>
+ #include "compat.h"
+ #include "ctree.h"
+ #include "disk-io.h"
+@@ -2530,6 +2531,8 @@ static void btrfs_read_locked_inode(stru
+ 	struct btrfs_key location;
+ 	int maybe_acls;
+ 	u32 rdev;
++	uid_t uid;
++	gid_t gid;
+ 	int ret;
+ 	bool filled = false;
+ 
+@@ -2557,8 +2560,13 @@ static void btrfs_read_locked_inode(stru
+ 				    struct btrfs_inode_item);
+ 	inode->i_mode = btrfs_inode_mode(leaf, inode_item);
+ 	set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
+-	i_uid_write(inode, btrfs_inode_uid(leaf, inode_item));
+-	i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));
++
++	uid = btrfs_inode_uid(leaf, inode_item);
++	gid = btrfs_inode_gid(leaf, inode_item);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid,
++		btrfs_inode_tag(leaf, inode_item)));
+ 	btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
+ 
+ 	tspec = btrfs_inode_atime(inode_item);
+@@ -2648,8 +2656,16 @@ static void fill_inode_item(struct btrfs
+ 			    struct btrfs_inode_item *item,
+ 			    struct inode *inode)
+ {
+-	btrfs_set_inode_uid(leaf, item, i_uid_read(inode));
+-	btrfs_set_inode_gid(leaf, item, i_gid_read(inode));
++	uid_t uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	gid_t gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
++
++	btrfs_set_inode_uid(leaf, item, uid);
++	btrfs_set_inode_gid(leaf, item, gid);
++#ifdef CONFIG_TAGGING_INTERN
++	btrfs_set_inode_tag(leaf, item, i_tag_read(inode));
++#endif
+ 	btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
+ 	btrfs_set_inode_mode(leaf, item, inode->i_mode);
+ 	btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
+@@ -7786,11 +7802,13 @@ static const struct inode_operations btr
+ 	.listxattr	= btrfs_listxattr,
+ 	.removexattr	= btrfs_removexattr,
+ 	.permission	= btrfs_permission,
++	.sync_flags	= btrfs_sync_flags,
+ 	.get_acl	= btrfs_get_acl,
+ };
+ static const struct inode_operations btrfs_dir_ro_inode_operations = {
+ 	.lookup		= btrfs_lookup,
+ 	.permission	= btrfs_permission,
++	.sync_flags	= btrfs_sync_flags,
+ 	.get_acl	= btrfs_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/ioctl.c linux-3.7.10-vs2.3.5.6/fs/btrfs/ioctl.c
+--- linux-3.7.10/fs/btrfs/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl
+ {
+ 	unsigned int iflags = 0;
+ 
+-	if (flags & BTRFS_INODE_SYNC)
+-		iflags |= FS_SYNC_FL;
+ 	if (flags & BTRFS_INODE_IMMUTABLE)
+ 		iflags |= FS_IMMUTABLE_FL;
++	if (flags & BTRFS_INODE_IXUNLINK)
++		iflags |= FS_IXUNLINK_FL;
++
++	if (flags & BTRFS_INODE_SYNC)
++		iflags |= FS_SYNC_FL;
+ 	if (flags & BTRFS_INODE_APPEND)
+ 		iflags |= FS_APPEND_FL;
+ 	if (flags & BTRFS_INODE_NODUMP)
+@@ -94,28 +97,78 @@ static unsigned int btrfs_flags_to_ioctl
+ 	else if (flags & BTRFS_INODE_NOCOMPRESS)
+ 		iflags |= FS_NOCOMP_FL;
+ 
++	if (flags & BTRFS_INODE_BARRIER)
++		iflags |= FS_BARRIER_FL;
++	if (flags & BTRFS_INODE_COW)
++		iflags |= FS_COW_FL;
+ 	return iflags;
+ }
+ 
+ /*
+- * Update inode->i_flags based on the btrfs internal flags.
++ * Update inode->i_(v)flags based on the btrfs internal flags.
+  */
+ void btrfs_update_iflags(struct inode *inode)
+ {
+ 	struct btrfs_inode *ip = BTRFS_I(inode);
+ 
+-	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+-	if (ip->flags & BTRFS_INODE_SYNC)
+-		inode->i_flags |= S_SYNC;
+ 	if (ip->flags & BTRFS_INODE_IMMUTABLE)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (ip->flags & BTRFS_INODE_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++
++	if (ip->flags & BTRFS_INODE_SYNC)
++		inode->i_flags |= S_SYNC;
+ 	if (ip->flags & BTRFS_INODE_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	if (ip->flags & BTRFS_INODE_NOATIME)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (ip->flags & BTRFS_INODE_DIRSYNC)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (ip->flags & BTRFS_INODE_BARRIER)
++		inode->i_vflags |= V_BARRIER;
++	if (ip->flags & BTRFS_INODE_COW)
++		inode->i_vflags |= V_COW;
++}
++
++/*
++ * Update btrfs internal flags from inode->i_(v)flags.
++ */
++void btrfs_update_flags(struct inode *inode)
++{
++	struct btrfs_inode *ip = BTRFS_I(inode);
++
++	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	ip->flags &= ~(BTRFS_INODE_SYNC | BTRFS_INODE_APPEND |
++			BTRFS_INODE_IMMUTABLE | BTRFS_INODE_IXUNLINK |
++			BTRFS_INODE_NOATIME | BTRFS_INODE_DIRSYNC |
++			BTRFS_INODE_BARRIER | BTRFS_INODE_COW);
++
++	if (flags & S_IMMUTABLE)
++		ip->flags |= BTRFS_INODE_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->flags |= BTRFS_INODE_IXUNLINK;
++
++	if (flags & S_SYNC)
++		ip->flags |= BTRFS_INODE_SYNC;
++	if (flags & S_APPEND)
++		ip->flags |= BTRFS_INODE_APPEND;
++	if (flags & S_NOATIME)
++		ip->flags |= BTRFS_INODE_NOATIME;
++	if (flags & S_DIRSYNC)
++		ip->flags |= BTRFS_INODE_DIRSYNC;
++
++	if (vflags & V_BARRIER)
++		ip->flags |= BTRFS_INODE_BARRIER;
++	if (vflags & V_COW)
++		ip->flags |= BTRFS_INODE_COW;
+ }
+ 
+ /*
+@@ -131,6 +184,7 @@ void btrfs_inherit_iflags(struct inode *
+ 		return;
+ 
+ 	flags = BTRFS_I(dir)->flags;
++	flags &= ~BTRFS_INODE_BARRIER;
+ 
+ 	if (flags & BTRFS_INODE_NOCOMPRESS) {
+ 		BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS;
+@@ -146,6 +200,30 @@ void btrfs_inherit_iflags(struct inode *
+ 	btrfs_update_iflags(inode);
+ }
+ 
++int btrfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct btrfs_inode *ip = BTRFS_I(inode);
++	struct btrfs_root *root = ip->root;
++	struct btrfs_trans_handle *trans;
++	int ret;
++
++	trans = btrfs_join_transaction(root);
++	BUG_ON(!trans);
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	btrfs_update_flags(inode);
++
++	ret = btrfs_update_inode(trans, root, inode);
++	BUG_ON(ret);
++
++	btrfs_update_iflags(inode);
++	inode->i_ctime = CURRENT_TIME;
++	btrfs_end_transaction(trans, root);
++
++	return 0;
++}
++
+ static int btrfs_ioctl_getflags(struct file *file, void __user *arg)
+ {
+ 	struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode);
+@@ -208,21 +286,27 @@ static int btrfs_ioctl_setflags(struct f
+ 
+ 	flags = btrfs_mask_flags(inode->i_mode, flags);
+ 	oldflags = btrfs_flags_to_ioctl(ip->flags);
+-	if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
++	if ((flags ^ oldflags) & (FS_APPEND_FL |
++		FS_IMMUTABLE_FL | FS_IXUNLINK_FL)) {
+ 		if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 			ret = -EPERM;
+ 			goto out_unlock;
+ 		}
+ 	}
+ 
+-	if (flags & FS_SYNC_FL)
+-		ip->flags |= BTRFS_INODE_SYNC;
+-	else
+-		ip->flags &= ~BTRFS_INODE_SYNC;
+ 	if (flags & FS_IMMUTABLE_FL)
+ 		ip->flags |= BTRFS_INODE_IMMUTABLE;
+ 	else
+ 		ip->flags &= ~BTRFS_INODE_IMMUTABLE;
++	if (flags & FS_IXUNLINK_FL)
++		ip->flags |= BTRFS_INODE_IXUNLINK;
++	else
++		ip->flags &= ~BTRFS_INODE_IXUNLINK;
++
++	if (flags & FS_SYNC_FL)
++		ip->flags |= BTRFS_INODE_SYNC;
++	else
++		ip->flags &= ~BTRFS_INODE_SYNC;
+ 	if (flags & FS_APPEND_FL)
+ 		ip->flags |= BTRFS_INODE_APPEND;
+ 	else
+diff -NurpP --minimal linux-3.7.10/fs/btrfs/super.c linux-3.7.10-vs2.3.5.6/fs/btrfs/super.c
+--- linux-3.7.10/fs/btrfs/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/btrfs/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -312,7 +312,7 @@ enum {
+ 	Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
+ 	Opt_check_integrity, Opt_check_integrity_including_extent_data,
+ 	Opt_check_integrity_print_mask, Opt_fatal_errors,
+-	Opt_err,
++	Opt_tag, Opt_notag, Opt_tagid, Opt_err,
+ };
+ 
+ static match_table_t tokens = {
+@@ -352,6 +352,9 @@ static match_table_t tokens = {
+ 	{Opt_check_integrity_including_extent_data, "check_int_data"},
+ 	{Opt_check_integrity_print_mask, "check_int_print_mask=%d"},
+ 	{Opt_fatal_errors, "fatal_errors=%s"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -614,6 +617,22 @@ int btrfs_parse_options(struct btrfs_roo
+ 				goto out;
+ 			}
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			printk(KERN_INFO "btrfs: use tagging\n");
++			btrfs_set_opt(info->mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			printk(KERN_INFO "btrfs: disabled tagging\n");
++			btrfs_clear_opt(info->mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			btrfs_set_opt(info->mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_err:
+ 			printk(KERN_INFO "btrfs: unrecognized mount option "
+ 			       "'%s'\n", p);
+@@ -1211,6 +1230,12 @@ static int btrfs_remount(struct super_bl
+ 	btrfs_resize_thread_pool(fs_info,
+ 		fs_info->thread_pool_size, old_thread_pool_size);
+ 
++	if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++		printk("btrfs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		return -EINVAL;
++	}
++
+ 	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+ 		return 0;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/char_dev.c linux-3.7.10-vs2.3.5.6/fs/char_dev.c
+--- linux-3.7.10/fs/char_dev.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/char_dev.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,8 @@
+ #include <linux/mutex.h>
+ #include <linux/backing-dev.h>
+ #include <linux/tty.h>
++#include <linux/vs_context.h>
++#include <linux/vs_device.h>
+ 
+ #include "internal.h"
+ 
+@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino
+ 	struct cdev *p;
+ 	struct cdev *new = NULL;
+ 	int ret = 0;
++	dev_t mdev;
++
++	if (!vs_map_chrdev(inode->i_rdev, &mdev, DATTR_OPEN))
++		return -EPERM;
++	inode->i_mdev = mdev;
+ 
+ 	spin_lock(&cdev_lock);
+ 	p = inode->i_cdev;
+ 	if (!p) {
+ 		struct kobject *kobj;
+ 		int idx;
++
+ 		spin_unlock(&cdev_lock);
+-		kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
++
++		kobj = kobj_lookup(cdev_map, mdev, &idx);
+ 		if (!kobj)
+ 			return -ENXIO;
+ 		new = container_of(kobj, struct cdev, kobj);
+diff -NurpP --minimal linux-3.7.10/fs/dcache.c linux-3.7.10-vs2.3.5.6/fs/dcache.c
+--- linux-3.7.10/fs/dcache.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/dcache.c	2013-01-16 00:19:03.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/rculist_bl.h>
+ #include <linux/prefetch.h>
+ #include <linux/ratelimit.h>
++#include <linux/vs_limit.h>
+ #include "internal.h"
+ #include "mount.h"
+ 
+@@ -617,6 +618,8 @@ int d_invalidate(struct dentry * dentry)
+ 		spin_lock(&dentry->d_lock);
+ 	}
+ 
++	vx_dentry_dec(dentry);
++
+ 	/*
+ 	 * Somebody else still using it?
+ 	 *
+@@ -646,6 +649,7 @@ EXPORT_SYMBOL(d_invalidate);
+ static inline void __dget_dlock(struct dentry *dentry)
+ {
+ 	dentry->d_count++;
++	vx_dentry_inc(dentry);
+ }
+ 
+ static inline void __dget(struct dentry *dentry)
+@@ -1276,6 +1280,9 @@ struct dentry *__d_alloc(struct super_bl
+ 	struct dentry *dentry;
+ 	char *dname;
+ 
++	if (!vx_dentry_avail(1))
++		return NULL;
++
+ 	dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
+ 	if (!dentry)
+ 		return NULL;
+@@ -1308,6 +1315,7 @@ struct dentry *__d_alloc(struct super_bl
+ 
+ 	dentry->d_count = 1;
+ 	dentry->d_flags = 0;
++	vx_dentry_inc(dentry);
+ 	spin_lock_init(&dentry->d_lock);
+ 	seqcount_init(&dentry->d_seq);
+ 	dentry->d_inode = NULL;
+@@ -2012,6 +2020,7 @@ struct dentry *__d_lookup(struct dentry
+ 		}
+ 
+ 		dentry->d_count++;
++		vx_dentry_inc(dentry);
+ 		found = dentry;
+ 		spin_unlock(&dentry->d_lock);
+ 		break;
+diff -NurpP --minimal linux-3.7.10/fs/devpts/inode.c linux-3.7.10-vs2.3.5.6/fs/devpts/inode.c
+--- linux-3.7.10/fs/devpts/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/devpts/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/parser.h>
+ #include <linux/fsnotify.h>
+ #include <linux/seq_file.h>
++#include <linux/vs_base.h>
+ 
+ #define DEVPTS_DEFAULT_MODE 0600
+ /*
+@@ -36,6 +37,21 @@
+ #define DEVPTS_DEFAULT_PTMX_MODE 0000
+ #define PTMX_MINOR	2
+ 
++static int devpts_permission(struct inode *inode, int mask)
++{
++	int ret = -EACCES;
++
++	/* devpts is xid tagged */
++	if (vx_check((xid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT))
++		ret = generic_permission(inode, mask);
++	return ret;
++}
++
++static struct inode_operations devpts_file_inode_operations = {
++	.permission     = devpts_permission,
++};
++
++
+ /*
+  * sysctl support for setting limits on the number of Unix98 ptys allocated.
+  * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
+@@ -336,6 +352,34 @@ static int devpts_show_options(struct se
+ 	return 0;
+ }
+ 
++static int devpts_filter(struct dentry *de)
++{
++	xid_t xid = 0;
++
++	/* devpts is xid tagged */
++	if (de && de->d_inode)
++		xid = (xid_t)i_tag_read(de->d_inode);
++#ifdef CONFIG_VSERVER_WARN_DEVPTS
++	else
++		vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.",
++			de->d_name.len, de->d_name.name);
++#endif
++	return vx_check(xid, VS_WATCH_P | VS_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 const struct super_operations devpts_sops = {
+ 	.statfs		= simple_statfs,
+ 	.remount_fs	= devpts_remount,
+@@ -379,8 +423,10 @@ devpts_fill_super(struct super_block *s,
+ 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ 	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;
+ 	set_nlink(inode, 2);
++	/* devpts is xid tagged */
++	i_tag_write(inode, (tag_t)vx_current_xid());
+ 
+ 	s->s_root = d_make_root(inode);
+ 	if (s->s_root)
+@@ -572,6 +618,9 @@ int devpts_pty_new(struct inode *ptmx_in
+ 	inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
+ 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+ 	init_special_inode(inode, S_IFCHR|opts->mode, device);
++	/* devpts is xid tagged */
++	i_tag_write(inode, (tag_t)vx_current_xid());
++	inode->i_op = &devpts_file_inode_operations;
+ 	inode->i_private = tty;
+ 	tty->driver_data = inode;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/balloc.c linux-3.7.10-vs2.3.5.6/fs/ext2/balloc.c
+--- linux-3.7.10/fs/ext2/balloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/balloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block
+ 			start = 0;
+ 		end = EXT2_BLOCKS_PER_GROUP(sb);
+ 	}
+-
+ 	BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
+ 
+ repeat:
+diff -NurpP --minimal linux-3.7.10/fs/ext2/ext2.h linux-3.7.10-vs2.3.5.6/fs/ext2/ext2.h
+--- linux-3.7.10/fs/ext2/ext2.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/ext2.h	2012-12-18 15:13:16.000000000 +0000
+@@ -244,8 +244,12 @@ struct ext2_group_desc
+ #define EXT2_NOTAIL_FL			FS_NOTAIL_FL	/* file tail should not be merged */
+ #define EXT2_DIRSYNC_FL			FS_DIRSYNC_FL	/* dirsync behaviour (directories only) */
+ #define EXT2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
++#define EXT2_IXUNLINK_FL		FS_IXUNLINK_FL	/* Immutable invert on unlink */
+ #define EXT2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
+ 
++#define EXT2_BARRIER_FL			FS_BARRIER_FL	/* Barrier for chroot() */
++#define EXT2_COW_FL			FS_COW_FL	/* Copy on Write marker */
++
+ #define EXT2_FL_USER_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
+ #define EXT2_FL_USER_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
+ 
+@@ -329,7 +333,8 @@ struct ext2_inode {
+ 			__u16	i_pad1;
+ 			__le16	l_i_uid_high;	/* these 2 fields    */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+-			__u32	l_i_reserved2;
++			__le16	l_i_tag;	/* Context Tag */
++			__u16	l_i_reserved2;
+ 		} linux2;
+ 		struct {
+ 			__u8	h_i_frag;	/* Fragment number */
+@@ -357,6 +362,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_tag	osd2.linux2.l_i_tag
+ #define i_reserved2	osd2.linux2.l_i_reserved2
+ 
+ /*
+@@ -384,6 +390,7 @@ struct ext2_inode {
+ #define EXT2_MOUNT_USRQUOTA		0x020000  /* user quota */
+ #define EXT2_MOUNT_GRPQUOTA		0x040000  /* group quota */
+ #define EXT2_MOUNT_RESERVATION		0x080000  /* Preallocation */
++#define EXT2_MOUNT_TAGGED		(1<<24)	  /* Enable Context Tags */
+ 
+ 
+ #define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt
+@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct
+ extern void ext2_get_inode_flags(struct ext2_inode_info *);
+ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		       u64 start, u64 len);
++extern int ext2_sync_flags(struct inode *, int, int);
+ 
+ /* ioctl.c */
+ extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
+diff -NurpP --minimal linux-3.7.10/fs/ext2/file.c linux-3.7.10-vs2.3.5.6/fs/ext2/file.c
+--- linux-3.7.10/fs/ext2/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
+ 	.setattr	= ext2_setattr,
+ 	.get_acl	= ext2_get_acl,
+ 	.fiemap		= ext2_fiemap,
++	.sync_flags	= ext2_sync_flags,
+ };
+diff -NurpP --minimal linux-3.7.10/fs/ext2/ialloc.c linux-3.7.10-vs2.3.5.6/fs/ext2/ialloc.c
+--- linux-3.7.10/fs/ext2/ialloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/ialloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/buffer_head.h>
+ #include <linux/random.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -547,6 +548,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/inode.c linux-3.7.10-vs2.3.5.6/fs/ext2/inode.c
+--- linux-3.7.10/fs/ext2/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <linux/mpage.h>
+ #include <linux/fiemap.h>
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "acl.h"
+ #include "xip.h"
+@@ -1165,7 +1166,7 @@ static void ext2_truncate_blocks(struct
+ 		return;
+ 	if (ext2_inode_is_fast_symlink(inode))
+ 		return;
+-	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++	if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ 		return;
+ 	__ext2_truncate_blocks(inode, offset);
+ }
+@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct 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_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++
++	if (flags & EXT2_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT2_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	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_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT2_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT2_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT2_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */
+ void ext2_get_inode_flags(struct ext2_inode_info *ei)
+ {
+ 	unsigned int flags = ei->vfs_inode.i_flags;
++	unsigned int vflags = ei->vfs_inode.i_vflags;
++
++	ei->i_flags &= ~(EXT2_SYNC_FL | EXT2_APPEND_FL |
++			EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL |
++			EXT2_NOATIME_FL | EXT2_DIRSYNC_FL |
++			EXT2_BARRIER_FL | EXT2_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		ei->i_flags |= EXT2_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		ei->i_flags |= EXT2_IXUNLINK_FL;
+ 
+-	ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL|
+-			EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		ei->i_flags |= EXT2_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		ei->i_flags |= EXT2_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		ei->i_flags |= EXT2_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		ei->i_flags |= EXT2_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		ei->i_flags |= EXT2_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		ei->i_flags |= EXT2_BARRIER_FL;
++	if (vflags & V_COW)
++		ei->i_flags |= EXT2_COW_FL;
+ }
+ 
+ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
+@@ -1321,8 +1347,10 @@ struct inode *ext2_iget (struct super_bl
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ 	}
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++		le16_to_cpu(raw_inode->i_raw_tag)));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 	inode->i_size = le32_to_cpu(raw_inode->i_size);
+ 	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
+@@ -1420,8 +1448,10 @@ static int __ext2_write_inode(struct ino
+ 	struct ext2_inode_info *ei = EXT2_I(inode);
+ 	struct super_block *sb = inode->i_sb;
+ 	ino_t ino = inode->i_ino;
+-	uid_t uid = i_uid_read(inode);
+-	gid_t gid = i_gid_read(inode);
++	uid_t uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	gid_t gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
+ 	struct buffer_head * bh;
+ 	struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh);
+ 	int n;
+@@ -1457,6 +1487,9 @@ static int __ext2_write_inode(struct ino
+ 		raw_inode->i_uid_high = 0;
+ 		raw_inode->i_gid_high = 0;
+ 	}
++#ifdef CONFIG_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
++#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);
+@@ -1537,7 +1570,8 @@ int ext2_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, iattr))
+ 		dquot_initialize(inode);
+ 	if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
+-	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
++	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
++	    (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
+ 		error = dquot_transfer(inode, iattr);
+ 		if (error)
+ 			return error;
+diff -NurpP --minimal linux-3.7.10/fs/ext2/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ext2/ioctl.c
+--- linux-3.7.10/fs/ext2/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,16 @@
+ #include <asm/uaccess.h>
+ 
+ 
++int ext2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext2_get_inode_flags(EXT2_I(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++	mark_inode_dirty(inode);
++	return 0;
++}
++
+ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext2_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		mutex_lock(&inode->i_mutex);
+ 		/* Is it quota file? Do not allow user to mess with it */
+ 		if (IS_NOQUOTA(inode)) {
+@@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * 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_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				ret = -EPERM;
+@@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig
+ 			}
+ 		}
+ 
+-		flags = flags & EXT2_FL_USER_MODIFIABLE;
++		flags &= EXT2_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
+ 		ei->i_flags = flags;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/namei.c linux-3.7.10-vs2.3.5.6/fs/ext2/namei.c
+--- linux-3.7.10/fs/ext2/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -32,6 +32,7 @@
+ 
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "ext2.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct
+ 					(unsigned long) ino);
+ 			return ERR_PTR(-EIO);
+ 		}
++		dx_propagate_tag(nd, inode);
+ 	}
+ 	return d_splice_alias(inode, dentry);
+ }
+@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i
+ 	.removexattr	= generic_removexattr,
+ #endif
+ 	.setattr	= ext2_setattr,
++	.sync_flags	= ext2_sync_flags,
+ 	.get_acl	= ext2_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext2/super.c linux-3.7.10-vs2.3.5.6/fs/ext2/super.c
+--- linux-3.7.10/fs/ext2/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext2/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -395,7 +395,8 @@ enum {
+ 	Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
+ 	Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
+ 	Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
+-	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
++	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -423,6 +424,9 @@ static const match_table_t tokens = {
+ 	{Opt_acl, "acl"},
+ 	{Opt_noacl, "noacl"},
+ 	{Opt_xip, "xip"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_grpquota, "grpquota"},
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_quota, "quota"},
+@@ -506,6 +510,20 @@ static int parse_options(char *options,
+ 		case Opt_nouid32:
+ 			set_opt (sbi->s_mount_opt, NO_UID32);
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			clear_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_nocheck:
+ 			clear_opt (sbi->s_mount_opt, CHECK);
+ 			break;
+@@ -864,6 +882,8 @@ static int ext2_fill_super(struct super_
+ 	if (!parse_options((char *) data, sb))
+ 		goto failed_mount;
+ 
++	if (EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
+ 		 MS_POSIXACL : 0);
+@@ -1269,6 +1289,14 @@ static int ext2_remount (struct super_bl
+ 		err = -EINVAL;
+ 		goto restore_opts;
+ 	}
++
++	if ((sbi->s_mount_opt & EXT2_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT2-fs: %s: tagging not permitted on remount.\n",
++		       sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
+ 
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+diff -NurpP --minimal linux-3.7.10/fs/ext3/ext3.h linux-3.7.10-vs2.3.5.6/fs/ext3/ext3.h
+--- linux-3.7.10/fs/ext3/ext3.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/ext3.h	2012-12-18 15:13:16.000000000 +0000
+@@ -151,10 +151,14 @@ 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_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ #define EXT3_RESERVED_FL		0x80000000 /* reserved for ext3 lib */
+ 
+-#define EXT3_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+-#define EXT3_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
++#define EXT3_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define EXT3_COW_FL			0x20000000 /* Copy on Write marker */
++
++#define EXT3_FL_USER_VISIBLE		0x0103DFFF /* User visible flags */
++#define EXT3_FL_USER_MODIFIABLE		0x010380FF /* User modifiable flags */
+ 
+ /* Flags that should be inherited by new inodes from their parent. */
+ #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\
+@@ -290,7 +294,8 @@ struct ext3_inode {
+ 			__u16	i_pad1;
+ 			__le16	l_i_uid_high;	/* these 2 fields    */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+-			__u32	l_i_reserved2;
++			__le16	l_i_tag;	/* Context Tag */
++			__u16	l_i_reserved2;
+ 		} linux2;
+ 		struct {
+ 			__u8	h_i_frag;	/* Fragment number */
+@@ -320,6 +325,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_tag	osd2.linux2.l_i_tag
+ #define i_reserved2	osd2.linux2.l_i_reserved2
+ 
+ /*
+@@ -364,6 +370,7 @@ struct ext3_inode {
+ #define EXT3_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */
+ #define EXT3_MOUNT_DATA_ERR_ABORT	0x400000 /* Abort on file data write
+ 						  * error in ordered mode */
++#define EXT3_MOUNT_TAGGED		(1<<24) /* Enable Context Tags */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct
+ extern void ext3_set_aops(struct inode *inode);
+ extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		       u64 start, u64 len);
++extern int ext3_sync_flags(struct inode *, int, int);
+ 
+ /* ioctl.c */
+ extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
+diff -NurpP --minimal linux-3.7.10/fs/ext3/file.c linux-3.7.10-vs2.3.5.6/fs/ext3/file.c
+--- linux-3.7.10/fs/ext3/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
+ #endif
+ 	.get_acl	= ext3_get_acl,
+ 	.fiemap		= ext3_fiemap,
++	.sync_flags	= ext3_sync_flags,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/ialloc.c linux-3.7.10-vs2.3.5.6/fs/ext3/ialloc.c
+--- linux-3.7.10/fs/ext3/ialloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/ialloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -14,6 +14,7 @@
+ 
+ #include <linux/quotaops.h>
+ #include <linux/random.h>
++#include <linux/vs_tag.h>
+ 
+ #include "ext3.h"
+ #include "xattr.h"
+@@ -469,6 +470,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/inode.c linux-3.7.10-vs2.3.5.6/fs/ext3/inode.c
+--- linux-3.7.10/fs/ext3/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -27,6 +27,8 @@
+ #include <linux/writeback.h>
+ #include <linux/mpage.h>
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
++
+ #include "ext3.h"
+ #include "xattr.h"
+ #include "acl.h"
+@@ -2848,36 +2850,60 @@ void ext3_set_inode_flags(struct 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_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++	if (flags & EXT3_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT3_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	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_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT3_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT3_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT3_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT3_I(inode)->i_flags */
+ void ext3_get_inode_flags(struct ext3_inode_info *ei)
+ {
+ 	unsigned int flags = ei->vfs_inode.i_flags;
++	unsigned int vflags = ei->vfs_inode.i_vflags;
++
++	ei->i_flags &= ~(EXT3_SYNC_FL | EXT3_APPEND_FL |
++			EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL |
++			EXT3_NOATIME_FL | EXT3_DIRSYNC_FL |
++			EXT3_BARRIER_FL | EXT3_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		ei->i_flags |= EXT3_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		ei->i_flags |= EXT3_IXUNLINK_FL;
+ 
+-	ei->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL|
+-			EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		ei->i_flags |= EXT3_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		ei->i_flags |= EXT3_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		ei->i_flags |= EXT3_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		ei->i_flags |= EXT3_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		ei->i_flags |= EXT3_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		ei->i_flags |= EXT3_BARRIER_FL;
++	if (vflags & V_COW)
++		ei->i_flags |= EXT3_COW_FL;
+ }
+ 
+ struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
+@@ -2915,8 +2941,10 @@ struct inode *ext3_iget(struct super_blo
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ 	}
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++		le16_to_cpu(raw_inode->i_raw_tag)));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 	inode->i_size = le32_to_cpu(raw_inode->i_size);
+ 	inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
+@@ -3088,8 +3116,10 @@ again:
+ 
+ 	ext3_get_inode_flags(ei);
+ 	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+-	i_uid = i_uid_read(inode);
+-	i_gid = i_gid_read(inode);
++	i_uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	i_gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
+ 	if(!(test_opt(inode->i_sb, NO_UID32))) {
+ 		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
+ 		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
+@@ -3114,6 +3144,9 @@ again:
+ 		raw_inode->i_uid_high = 0;
+ 		raw_inode->i_gid_high = 0;
+ 	}
++#ifdef CONFIG_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
++#endif
+ 	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ 	disksize = cpu_to_le32(ei->i_disksize);
+ 	if (disksize != raw_inode->i_size) {
+@@ -3282,7 +3315,8 @@ int ext3_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, attr))
+ 		dquot_initialize(inode);
+ 	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+-	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++	    (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
+ 		handle_t *handle;
+ 
+ 		/* (user+group)*(old+new) structure, inode write (sb,
+@@ -3304,6 +3338,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_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		error = ext3_mark_inode_dirty(handle, inode);
+ 		ext3_journal_stop(handle);
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/ext3/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ext3/ioctl.c
+--- linux-3.7.10/fs/ext3/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -12,6 +12,34 @@
+ #include <asm/uaccess.h>
+ #include "ext3.h"
+ 
++
++int ext3_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	handle_t *handle = NULL;
++	struct ext3_iloc iloc;
++	int err;
++
++	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;
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext3_get_inode_flags(EXT3_I(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++
++	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++	ext3_journal_stop(handle);
++	return err;
++}
++
+ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext3_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		mutex_lock(&inode->i_mutex);
+ 
+ 		/* Is it quota file? Do not allow user to mess with it */
+@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * 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_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE))
+ 				goto flags_out;
+ 		}
+@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig
+ 		if (err)
+ 			goto flags_err;
+ 
+-		flags = flags & EXT3_FL_USER_MODIFIABLE;
++		flags &= EXT3_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
+ 		ei->i_flags = flags;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/namei.c linux-3.7.10-vs2.3.5.6/fs/ext3/namei.c
+--- linux-3.7.10/fs/ext3/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,8 @@
+  */
+ 
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
++
+ #include "ext3.h"
+ #include "namei.h"
+ #include "xattr.h"
+@@ -919,6 +921,7 @@ restart:
+ 					submit_bh(READ | REQ_META | REQ_PRIO,
+ 						  bh);
+ 				}
++		dx_propagate_tag(nd, inode);
+ 			}
+ 		}
+ 		if ((bh = bh_use[ra_ptr++]) == NULL)
+@@ -2528,6 +2531,7 @@ const struct inode_operations ext3_dir_i
+ 	.listxattr	= ext3_listxattr,
+ 	.removexattr	= generic_removexattr,
+ #endif
++	.sync_flags	= ext3_sync_flags,
+ 	.get_acl	= ext3_get_acl,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext3/super.c linux-3.7.10-vs2.3.5.6/fs/ext3/super.c
+--- linux-3.7.10/fs/ext3/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext3/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -816,7 +816,8 @@ enum {
+ 	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
+ 	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
+ 	Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
+-	Opt_resize, Opt_usrquota, Opt_grpquota
++	Opt_resize, Opt_usrquota, Opt_grpquota,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -873,6 +874,9 @@ static const match_table_t tokens = {
+ 	{Opt_barrier, "barrier"},
+ 	{Opt_nobarrier, "nobarrier"},
+ 	{Opt_resize, "resize"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1038,6 +1042,20 @@ static int parse_options (char *options,
+ 		case Opt_nouid32:
+ 			set_opt (sbi->s_mount_opt, NO_UID32);
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++		case Opt_notag:
++			clear_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			set_opt (sbi->s_mount_opt, TAGGED);
++			break;
++#endif
+ 		case Opt_nocheck:
+ 			clear_opt (sbi->s_mount_opt, CHECK);
+ 			break;
+@@ -1738,6 +1756,9 @@ static int ext3_fill_super (struct super
+ 			    NULL, 0))
+ 		goto failed_mount;
+ 
++	if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -2622,6 +2643,14 @@ static int ext3_remount (struct super_bl
+ 	if (test_opt(sb, ABORT))
+ 		ext3_abort(sb, __func__, "Abort forced by user");
+ 
++	if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT3-fs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext4/ext4.h linux-3.7.10-vs2.3.5.6/fs/ext4/ext4.h
+--- linux-3.7.10/fs/ext4/ext4.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/ext4.h	2012-12-18 15:13:16.000000000 +0000
+@@ -392,8 +392,12 @@ struct flex_groups {
+ #define EXT4_EXTENTS_FL			0x00080000 /* Inode uses extents */
+ #define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
+ #define EXT4_EOFBLOCKS_FL		0x00400000 /* Blocks allocated beyond EOF */
++#define EXT4_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ #define EXT4_RESERVED_FL		0x80000000 /* reserved for ext4 lib */
+ 
++#define EXT4_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define EXT4_COW_FL			0x20000000 /* Copy on Write marker */
++
+ #define EXT4_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
+ #define EXT4_FL_USER_MODIFIABLE		0x004B80FF /* User modifiable flags */
+ 
+@@ -665,7 +669,7 @@ struct ext4_inode {
+ 			__le16	l_i_uid_high;	/* these 2 fields */
+ 			__le16	l_i_gid_high;	/* were reserved2[0] */
+ 			__le16	l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
+-			__le16	l_i_reserved;
++			__le16	l_i_tag;	/* Context Tag */
+ 		} linux2;
+ 		struct {
+ 			__le16	h_i_reserved1;	/* Obsoleted fragment number/size which are removed in ext4 */
+@@ -783,6 +787,7 @@ do {									       \
+ #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_tag	osd2.linux2.l_i_tag
+ #define i_checksum_lo	osd2.linux2.l_i_checksum_lo
+ 
+ #elif defined(__GNU__)
+@@ -961,6 +966,7 @@ struct ext4_inode_info {
+ #define EXT4_MOUNT_POSIX_ACL		0x08000	/* POSIX Access Control Lists */
+ #define EXT4_MOUNT_NO_AUTO_DA_ALLOC	0x10000	/* No auto delalloc mapping */
+ #define EXT4_MOUNT_BARRIER		0x20000 /* Use block barriers */
++#define EXT4_MOUNT_TAGGED		0x40000 /* Enable Context Tags */
+ #define EXT4_MOUNT_QUOTA		0x80000 /* Some quota option set */
+ #define EXT4_MOUNT_USRQUOTA		0x100000 /* "old" user quota */
+ #define EXT4_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */
+@@ -2412,6 +2418,7 @@ extern int ext4_map_blocks(handle_t *han
+ 			   struct ext4_map_blocks *map, int flags);
+ extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 			__u64 start, __u64 len);
++extern int ext4_sync_flags(struct inode *, int, int);
+ /* move_extent.c */
+ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
+ 			     __u64 start_orig, __u64 start_donor,
+diff -NurpP --minimal linux-3.7.10/fs/ext4/file.c linux-3.7.10-vs2.3.5.6/fs/ext4/file.c
+--- linux-3.7.10/fs/ext4/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -334,5 +334,6 @@ const struct inode_operations ext4_file_
+ #endif
+ 	.get_acl	= ext4_get_acl,
+ 	.fiemap		= ext4_fiemap,
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext4/ialloc.c linux-3.7.10-vs2.3.5.6/fs/ext4/ialloc.c
+--- linux-3.7.10/fs/ext4/ialloc.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/ialloc.c	2013-02-05 01:14:43.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/random.h>
+ #include <linux/bitops.h>
+ #include <linux/blkdev.h>
++#include <linux/vs_tag.h>
+ #include <asm/byteorder.h>
+ 
+ #include "ext4.h"
+@@ -848,6 +849,7 @@ got:
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current_fsuid();
+ 		inode->i_gid = dir->i_gid;
++		inode->i_tag = dx_current_fstag(sb);
+ 	} else
+ 		inode_init_owner(inode, dir, mode);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ext4/inode.c linux-3.7.10-vs2.3.5.6/fs/ext4/inode.c
+--- linux-3.7.10/fs/ext4/inode.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/inode.c	2013-02-05 01:14:43.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/printk.h>
+ #include <linux/slab.h>
+ #include <linux/ratelimit.h>
++#include <linux/vs_tag.h>
+ 
+ #include "ext4_jbd2.h"
+ #include "xattr.h"
+@@ -3697,41 +3698,64 @@ void ext4_set_inode_flags(struct inode *
+ {
+ 	unsigned int flags = EXT4_I(inode)->i_flags;
+ 
+-	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
++
++	if (flags & EXT4_IMMUTABLE_FL)
++		inode->i_flags |= S_IMMUTABLE;
++	if (flags & EXT4_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
+ 	if (flags & EXT4_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+ 	if (flags & EXT4_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+-	if (flags & EXT4_IMMUTABLE_FL)
+-		inode->i_flags |= S_IMMUTABLE;
+ 	if (flags & EXT4_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & EXT4_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & EXT4_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & EXT4_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
+ void ext4_get_inode_flags(struct ext4_inode_info *ei)
+ {
+-	unsigned int vfs_fl;
++	unsigned int vfs_fl, vfs_vf;
+ 	unsigned long old_fl, new_fl;
+ 
+ 	do {
+ 		vfs_fl = ei->vfs_inode.i_flags;
++		vfs_vf = ei->vfs_inode.i_vflags;
+ 		old_fl = ei->i_flags;
+ 		new_fl = old_fl & ~(EXT4_SYNC_FL|EXT4_APPEND_FL|
+ 				EXT4_IMMUTABLE_FL|EXT4_NOATIME_FL|
+-				EXT4_DIRSYNC_FL);
++				EXT4_DIRSYNC_FL|EXT4_BARRIER_FL|
++				EXT4_COW_FL);
++
++		if (vfs_fl & S_IMMUTABLE)
++			new_fl |= EXT4_IMMUTABLE_FL;
++		if (vfs_fl & S_IXUNLINK)
++			new_fl |= EXT4_IXUNLINK_FL;
++
+ 		if (vfs_fl & S_SYNC)
+ 			new_fl |= EXT4_SYNC_FL;
+ 		if (vfs_fl & S_APPEND)
+ 			new_fl |= EXT4_APPEND_FL;
+-		if (vfs_fl & S_IMMUTABLE)
+-			new_fl |= EXT4_IMMUTABLE_FL;
+ 		if (vfs_fl & S_NOATIME)
+ 			new_fl |= EXT4_NOATIME_FL;
+ 		if (vfs_fl & S_DIRSYNC)
+ 			new_fl |= EXT4_DIRSYNC_FL;
++
++		if (vfs_vf & V_BARRIER)
++			new_fl |= EXT4_BARRIER_FL;
++		if (vfs_vf & V_COW)
++			new_fl |= EXT4_COW_FL;
+ 	} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
+ }
+ 
+@@ -3823,8 +3847,10 @@ struct inode *ext4_iget(struct super_blo
+ 		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
+ 		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
+ 	}
+-	i_uid_write(inode, i_uid);
+-	i_gid_write(inode, i_gid);
++	i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid));
++	i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid));
++	i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid,
++		le16_to_cpu(raw_inode->i_raw_tag)));
+ 	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
+ 
+ 	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */
+@@ -4048,8 +4074,10 @@ static int ext4_do_update_inode(handle_t
+ 
+ 	ext4_get_inode_flags(ei);
+ 	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
+-	i_uid = i_uid_read(inode);
+-	i_gid = i_gid_read(inode);
++	i_uid = TAGINO_UID(DX_TAG(inode),
++		i_uid_read(inode), i_tag_read(inode));
++	i_gid = TAGINO_GID(DX_TAG(inode),
++		i_gid_read(inode), i_tag_read(inode));
+ 	if (!(test_opt(inode->i_sb, NO_UID32))) {
+ 		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
+ 		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
+@@ -4072,6 +4100,9 @@ static int ext4_do_update_inode(handle_t
+ 		raw_inode->i_uid_high = 0;
+ 		raw_inode->i_gid_high = 0;
+ 	}
++#ifdef CONFIG_TAGGING_INTERN
++	raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode));
++#endif
+ 	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
+ 
+ 	EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
+@@ -4260,7 +4291,8 @@ int ext4_setattr(struct dentry *dentry,
+ 	if (is_quota_modification(inode, attr))
+ 		dquot_initialize(inode);
+ 	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
+-	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) {
++	    (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) ||
++	    (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) {
+ 		handle_t *handle;
+ 
+ 		/* (user+group)*(old+new) structure, inode write (sb,
+@@ -4282,6 +4314,8 @@ int ext4_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_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		error = ext4_mark_inode_dirty(handle, inode);
+ 		ext4_journal_stop(handle);
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/ext4/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ext4/ioctl.c
+--- linux-3.7.10/fs/ext4/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -14,12 +14,40 @@
+ #include <linux/compat.h>
+ #include <linux/mount.h>
+ #include <linux/file.h>
++#include <linux/vs_tag.h>
+ #include <asm/uaccess.h>
+ #include "ext4_jbd2.h"
+ #include "ext4.h"
+ 
+ #define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1)
+ 
++int ext4_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	handle_t *handle = NULL;
++	struct ext4_iloc iloc;
++	int err;
++
++	handle = ext4_journal_start(inode, 1);
++	if (IS_ERR(handle))
++		return PTR_ERR(handle);
++
++	if (IS_SYNC(inode))
++		ext4_handle_sync(handle);
++	err = ext4_reserve_inode_write(handle, inode, &iloc);
++	if (err)
++		goto flags_err;
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ext4_get_inode_flags(EXT4_I(inode));
++	inode->i_ctime = ext4_current_time(inode);
++
++	err = ext4_mark_iloc_dirty(handle, inode, &iloc);
++flags_err:
++	ext4_journal_stop(handle);
++	return err;
++}
++
+ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig
+ 
+ 		flags = ext4_mask_flags(inode->i_mode, flags);
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		err = -EPERM;
+ 		mutex_lock(&inode->i_mutex);
+ 		/* Is it quota file? Do not allow user to mess with it */
+@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig
+ 		 *
+ 		 * This test looks nicer. Thanks to Pauline Middelink
+ 		 */
+-		if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
++		if ((oldflags & EXT4_IMMUTABLE_FL) ||
++			((flags ^ oldflags) & (EXT4_APPEND_FL |
++			EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE))
+ 				goto flags_out;
+ 		}
+diff -NurpP --minimal linux-3.7.10/fs/ext4/namei.c linux-3.7.10-vs2.3.5.6/fs/ext4/namei.c
+--- linux-3.7.10/fs/ext4/namei.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/namei.c	2013-02-05 01:14:43.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/buffer_head.h>
+ #include <linux/bio.h>
++#include <linux/vs_tag.h>
+ #include "ext4.h"
+ #include "ext4_jbd2.h"
+ 
+@@ -1232,6 +1233,7 @@ restart:
+ 					ll_rw_block(READ | REQ_META | REQ_PRIO,
+ 						    1, &bh);
+ 			}
++		dx_propagate_tag(nd, inode);
+ 		}
+ 		if ((bh = bh_use[ra_ptr++]) == NULL)
+ 			goto next;
+@@ -3052,6 +3054,7 @@ const struct inode_operations ext4_dir_i
+ #endif
+ 	.get_acl	= ext4_get_acl,
+ 	.fiemap         = ext4_fiemap,
++	.sync_flags	= ext4_sync_flags,
+ };
+ 
+ const struct inode_operations ext4_special_inode_operations = {
+diff -NurpP --minimal linux-3.7.10/fs/ext4/super.c linux-3.7.10-vs2.3.5.6/fs/ext4/super.c
+--- linux-3.7.10/fs/ext4/super.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ext4/super.c	2013-02-05 01:15:45.000000000 +0000
+@@ -1222,7 +1222,7 @@ enum {
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
+-	Opt_max_dir_size_kb,
++	Opt_max_dir_size_kb, Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -1302,6 +1302,9 @@ static const match_table_t tokens = {
+ 	{Opt_removed, "reservation"},	/* mount option from ext2/3 */
+ 	{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
+ 	{Opt_removed, "journal=%u"},	/* mount option from ext2/3 */
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL},
+ };
+ 
+@@ -1549,6 +1552,20 @@ static int handle_mount_opt(struct super
+ 			return -1;
+ 		*journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg);
+ 		return 1;
++#ifndef CONFIG_TAGGING_NONE
++	case Opt_tag:
++		set_opt(sb, TAGGED);
++		return 1;
++	case Opt_notag:
++		clear_opt(sb, TAGGED);
++		return 1;
++#endif
++#ifdef CONFIG_PROPAGATE
++	case Opt_tagid:
++		/* use args[0] */
++		set_opt(sb, TAGGED);
++		return 1;
++#endif
+ 	}
+ 
+ 	for (m = ext4_mount_opts; m->token != Opt_err; m++) {
+@@ -3456,6 +3473,9 @@ static int ext4_fill_super(struct super_
+ 			clear_opt(sb, DELALLOC);
+ 	}
+ 
++	if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+@@ -4620,6 +4640,14 @@ static int ext4_remount(struct super_blo
+ 	if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
+ 		ext4_abort(sb, "Abort forced by user");
+ 
++	if ((sbi->s_mount_opt & EXT4_MOUNT_TAGGED) &&
++		!(sb->s_flags & MS_TAGGED)) {
++		printk("EXT4-fs: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		err = -EINVAL;
++		goto restore_opts;
++	}
++
+ 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
+ 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/fcntl.c linux-3.7.10-vs2.3.5.6/fs/fcntl.c
+--- linux-3.7.10/fs/fcntl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/fcntl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/rcupdate.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/poll.h>
+ #include <asm/siginfo.h>
+@@ -378,6 +379,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
+ 
+ 	if (!f.file)
+ 		goto out;
++	if (!vx_files_avail(1))
++		goto out;
+ 
+ 	if (unlikely(f.file->f_mode & FMODE_PATH)) {
+ 		if (!check_fcntl_cmd(cmd))
+diff -NurpP --minimal linux-3.7.10/fs/file.c linux-3.7.10-vs2.3.5.6/fs/file.c
+--- linux-3.7.10/fs/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/rcupdate.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
+ 
+ struct fdtable_defer {
+ 	spinlock_t lock;
+@@ -364,6 +365,8 @@ struct files_struct *dup_fd(struct files
+ 		struct file *f = *old_fds++;
+ 		if (f) {
+ 			get_file(f);
++			/* TODO: 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
+@@ -429,9 +432,11 @@ static void close_files(struct files_str
+ 					filp_close(file, files);
+ 					cond_resched();
+ 				}
++				vx_openfd_dec(i);
+ 			}
+ 			i++;
+ 			set >>= 1;
++			cond_resched();
+ 		}
+ 	}
+ }
+@@ -573,6 +578,7 @@ repeat:
+ 	else
+ 		__clear_close_on_exec(fd, fdt);
+ 	error = fd;
++	vx_openfd_inc(fd);
+ #if 1
+ 	/* Sanity check */
+ 	if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
+@@ -603,6 +609,7 @@ static void __put_unused_fd(struct files
+ 	__clear_open_fd(fd, fdt);
+ 	if (fd < files->next_fd)
+ 		files->next_fd = fd;
++	vx_openfd_dec(fd);
+ }
+ 
+ void put_unused_fd(unsigned int fd)
+@@ -882,6 +889,8 @@ static int do_dup2(struct files_struct *
+ 
+ 	if (tofree)
+ 		filp_close(tofree, files);
++	else
++		vx_openfd_inc(fd);	/* fd was unused */
+ 
+ 	return fd;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/file_table.c linux-3.7.10-vs2.3.5.6/fs/file_table.c
+--- linux-3.7.10/fs/file_table.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/file_table.c	2013-01-16 00:19:03.000000000 +0000
+@@ -26,6 +26,8 @@
+ #include <linux/hardirq.h>
+ #include <linux/task_work.h>
+ #include <linux/ima.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
+ 
+ #include <linux/atomic.h>
+ 
+@@ -136,6 +138,8 @@ struct file *get_empty_filp(void)
+ 	spin_lock_init(&f->f_lock);
+ 	eventpoll_init_file(f);
+ 	/* f->f_version: 0 */
++	f->f_xid = vx_current_xid();
++	vx_files_inc(f);
+ 	return f;
+ 
+ over:
+@@ -257,6 +261,8 @@ static void __fput(struct file *file)
+ 		i_readcount_dec(inode);
+ 	if (file->f_mode & FMODE_WRITE)
+ 		drop_file_write_access(file);
++	vx_files_dec(file);
++	file->f_xid = 0;
+ 	file->f_path.dentry = NULL;
+ 	file->f_path.mnt = NULL;
+ 	file_free(file);
+@@ -343,6 +349,8 @@ void put_filp(struct file *file)
+ {
+ 	if (atomic_long_dec_and_test(&file->f_count)) {
+ 		security_file_free(file);
++		vx_files_dec(file);
++		file->f_xid = 0;
+ 		file_sb_list_del(file);
+ 		file_free(file);
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/fs_struct.c linux-3.7.10-vs2.3.5.6/fs/fs_struct.c
+--- linux-3.7.10/fs/fs_struct.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/fs_struct.c	2012-12-18 15:13:16.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/vserver/global.h>
+ #include "internal.h"
+ 
+ /*
+@@ -87,6 +88,7 @@ void free_fs_struct(struct fs_struct *fs
+ {
+ 	path_put(&fs->root);
+ 	path_put(&fs->pwd);
++	atomic_dec(&vs_global_fs);
+ 	kmem_cache_free(fs_cachep, fs);
+ }
+ 
+@@ -124,6 +126,7 @@ struct fs_struct *copy_fs_struct(struct
+ 		fs->pwd = old->pwd;
+ 		path_get(&fs->pwd);
+ 		spin_unlock(&old->lock);
++		atomic_inc(&vs_global_fs);
+ 	}
+ 	return fs;
+ }
+diff -NurpP --minimal linux-3.7.10/fs/gfs2/file.c linux-3.7.10-vs2.3.5.6/fs/gfs2/file.c
+--- linux-3.7.10/fs/gfs2/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/gfs2/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = {
+ 	[12] = GFS2_DIF_EXHASH,
+ 	[14] = GFS2_DIF_INHERIT_JDATA,
+ 	[17] = GFS2_DIF_TOPDIR,
++	[27] = GFS2_DIF_IXUNLINK,
++	[26] = GFS2_DIF_BARRIER,
++	[29] = GFS2_DIF_COW,
+ };
+ 
+ static const u32 gfs2_to_fsflags[32] = {
+@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = {
+ 	[gfs2fl_ExHash] = FS_INDEX_FL,
+ 	[gfs2fl_TopLevel] = FS_TOPDIR_FL,
+ 	[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
++	[gfs2fl_IXUnlink] = FS_IXUNLINK_FL,
++	[gfs2fl_Barrier] = FS_BARRIER_FL,
++	[gfs2fl_Cow] = FS_COW_FL,
+ };
+ 
+ static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
+@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode *
+ {
+ 	struct gfs2_inode *ip = GFS2_I(inode);
+ 	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC | S_NOSEC);
+ 
+-	flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
+ 	if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
+ 		inode->i_flags |= S_NOSEC;
+ 	if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
+ 		flags |= S_IMMUTABLE;
++	if (ip->i_diskflags & GFS2_DIF_IXUNLINK)
++		flags |= S_IXUNLINK;
++
+ 	if (ip->i_diskflags & GFS2_DIF_APPENDONLY)
+ 		flags |= S_APPEND;
+ 	if (ip->i_diskflags & GFS2_DIF_NOATIME)
+@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode *
+ 	if (ip->i_diskflags & GFS2_DIF_SYNC)
+ 		flags |= S_SYNC;
+ 	inode->i_flags = flags;
++
++	vflags &= ~(V_BARRIER | V_COW);
++
++	if (ip->i_diskflags & GFS2_DIF_BARRIER)
++		vflags |= V_BARRIER;
++	if (ip->i_diskflags & GFS2_DIF_COW)
++		vflags |= V_COW;
++	inode->i_vflags = vflags;
++}
++
++void gfs2_get_inode_flags(struct inode *inode)
++{
++	struct gfs2_inode *ip = GFS2_I(inode);
++	unsigned int flags = inode->i_flags;
++	unsigned int vflags = inode->i_vflags;
++
++	ip->i_diskflags &= ~(GFS2_DIF_APPENDONLY |
++			GFS2_DIF_NOATIME | GFS2_DIF_SYNC |
++			GFS2_DIF_IMMUTABLE | GFS2_DIF_IXUNLINK |
++			GFS2_DIF_BARRIER | GFS2_DIF_COW);
++
++	if (flags & S_IMMUTABLE)
++		ip->i_diskflags |= GFS2_DIF_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->i_diskflags |= GFS2_DIF_IXUNLINK;
++
++	if (flags & S_APPEND)
++		ip->i_diskflags |= GFS2_DIF_APPENDONLY;
++	if (flags & S_NOATIME)
++		ip->i_diskflags |= GFS2_DIF_NOATIME;
++	if (flags & S_SYNC)
++		ip->i_diskflags |= GFS2_DIF_SYNC;
++
++	if (vflags & V_BARRIER)
++		ip->i_diskflags |= GFS2_DIF_BARRIER;
++	if (vflags & V_COW)
++		ip->i_diskflags |= GFS2_DIF_COW;
+ }
+ 
+ /* Flags that can be set by user space */
+@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f
+ 	return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
+ }
+ 
++int gfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct gfs2_inode *ip = GFS2_I(inode);
++	struct gfs2_sbd *sdp = GFS2_SB(inode);
++	struct buffer_head *bh;
++	struct gfs2_holder gh;
++	int error;
++
++	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
++	if (error)
++		return error;
++	error = gfs2_trans_begin(sdp, RES_DINODE, 0);
++	if (error)
++		goto out;
++	error = gfs2_meta_inode_buffer(ip, &bh);
++	if (error)
++		goto out_trans_end;
++	gfs2_trans_add_bh(ip->i_gl, bh, 1);
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	gfs2_get_inode_flags(inode);
++	gfs2_dinode_out(ip, bh->b_data);
++	brelse(bh);
++	gfs2_set_aops(inode);
++out_trans_end:
++	gfs2_trans_end(sdp);
++out:
++	gfs2_glock_dq_uninit(&gh);
++	return error;
++}
++
+ static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	switch(cmd) {
+diff -NurpP --minimal linux-3.7.10/fs/gfs2/inode.h linux-3.7.10-vs2.3.5.6/fs/gfs2/inode.h
+--- linux-3.7.10/fs/gfs2/inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/gfs2/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
+ extern const struct file_operations gfs2_dir_fops_nolock;
+ 
+ extern void gfs2_set_inode_flags(struct inode *inode);
++extern int gfs2_sync_flags(struct inode *inode, int flags, int vflags);
+  
+ #ifdef CONFIG_GFS2_FS_LOCKING_DLM
+ extern const struct file_operations gfs2_file_fops;
+diff -NurpP --minimal linux-3.7.10/fs/hostfs/hostfs.h linux-3.7.10-vs2.3.5.6/fs/hostfs/hostfs.h
+--- linux-3.7.10/fs/hostfs/hostfs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/hostfs/hostfs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -42,6 +42,7 @@ struct hostfs_iattr {
+ 	unsigned short	ia_mode;
+ 	uid_t		ia_uid;
+ 	gid_t		ia_gid;
++	tag_t		ia_tag;
+ 	loff_t		ia_size;
+ 	struct timespec	ia_atime;
+ 	struct timespec	ia_mtime;
+diff -NurpP --minimal linux-3.7.10/fs/inode.c linux-3.7.10-vs2.3.5.6/fs/inode.c
+--- linux-3.7.10/fs/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/prefetch.h>
+ #include <linux/buffer_head.h> /* for inode_has_buffers */
+ #include <linux/ratelimit.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
+ 
+ /*
+@@ -128,6 +129,8 @@ int inode_init_always(struct super_block
+ 	struct address_space *const mapping = &inode->i_data;
+ 
+ 	inode->i_sb = sb;
++
++	/* essential because of inode slab reuse */
+ 	inode->i_blkbits = sb->s_blocksize_bits;
+ 	inode->i_flags = 0;
+ 	atomic_set(&inode->i_count, 1);
+@@ -137,6 +140,7 @@ int inode_init_always(struct super_block
+ 	inode->i_opflags = 0;
+ 	i_uid_write(inode, 0);
+ 	i_gid_write(inode, 0);
++	i_tag_write(inode, 0);
+ 	atomic_set(&inode->i_writecount, 0);
+ 	inode->i_size = 0;
+ 	inode->i_blocks = 0;
+@@ -149,6 +153,7 @@ int inode_init_always(struct super_block
+ 	inode->i_bdev = NULL;
+ 	inode->i_cdev = NULL;
+ 	inode->i_rdev = 0;
++	inode->i_mdev = 0;
+ 	inode->dirtied_when = 0;
+ 
+ 	if (security_inode_alloc(inode))
+@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i
+ }
+ EXPORT_SYMBOL(__insert_inode_hash);
+ 
++EXPORT_SYMBOL_GPL(__iget);
++
+ /**
+  *	__remove_inode_hash - remove an inode from the hash
+  *	@inode: inode to unhash
+@@ -1804,9 +1811,11 @@ void init_special_inode(struct inode *in
+ 	if (S_ISCHR(mode)) {
+ 		inode->i_fop = &def_chr_fops;
+ 		inode->i_rdev = rdev;
++		inode->i_mdev = rdev;
+ 	} else if (S_ISBLK(mode)) {
+ 		inode->i_fop = &def_blk_fops;
+ 		inode->i_rdev = rdev;
++		inode->i_mdev = rdev;
+ 	} else if (S_ISFIFO(mode))
+ 		inode->i_fop = &def_fifo_fops;
+ 	else if (S_ISSOCK(mode))
+@@ -1835,6 +1844,7 @@ void inode_init_owner(struct inode *inod
+ 	} else
+ 		inode->i_gid = current_fsgid();
+ 	inode->i_mode = mode;
++	inode->i_tag = dx_current_fstag(inode->i_sb);
+ }
+ EXPORT_SYMBOL(inode_init_owner);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ioctl.c
+--- linux-3.7.10/fs/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,9 @@
+ #include <linux/writeback.h>
+ #include <linux/buffer_head.h>
+ #include <linux/falloc.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/ioctls.h>
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ioprio.c linux-3.7.10-vs2.3.5.6/fs/ioprio.c
+--- linux-3.7.10/fs/ioprio.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ioprio.c	2012-12-18 15:13:16.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/security.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_base.h>
+ 
+ int set_task_ioprio(struct task_struct *task, int ioprio)
+ {
+@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which,
+ 			else
+ 				pgrp = find_vpid(who);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				ret = set_task_ioprio(p, ioprio);
+ 				if (ret)
+ 					break;
+@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+ 			else
+ 				pgrp = find_vpid(who);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				tmpio = get_task_ioprio(p);
+ 				if (tmpio < 0)
+ 					continue;
+diff -NurpP --minimal linux-3.7.10/fs/jfs/file.c linux-3.7.10-vs2.3.5.6/fs/jfs/file.c
+--- linux-3.7.10/fs/jfs/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
+ 	if (is_quota_modification(inode, iattr))
+ 		dquot_initialize(inode);
+ 	if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) ||
+-	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) {
++	    (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) ||
++	    (iattr->ia_valid & ATTR_TAG && !tag_eq(iattr->ia_tag, inode->i_tag))) {
+ 		rc = dquot_transfer(inode, iattr);
+ 		if (rc)
+ 			return rc;
+@@ -142,6 +143,7 @@ const struct inode_operations jfs_file_i
+ #ifdef CONFIG_JFS_POSIX_ACL
+ 	.get_acl	= jfs_get_acl,
+ #endif
++	.sync_flags	= jfs_sync_flags,
+ };
+ 
+ const struct file_operations jfs_file_operations = {
+diff -NurpP --minimal linux-3.7.10/fs/jfs/ioctl.c linux-3.7.10-vs2.3.5.6/fs/jfs/ioctl.c
+--- linux-3.7.10/fs/jfs/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -12,6 +12,7 @@
+ #include <linux/time.h>
+ #include <linux/sched.h>
+ #include <linux/blkdev.h>
++#include <linux/mount.h>
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+ 
+@@ -56,6 +57,16 @@ static long jfs_map_ext2(unsigned long f
+ }
+ 
+ 
++int jfs_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	jfs_get_inode_flags(JFS_IP(inode));
++	inode->i_ctime = CURRENT_TIME_SEC;
++	mark_inode_dirty(inode);
++	return 0;
++}
++
+ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -89,6 +100,11 @@ long jfs_ioctl(struct file *filp, unsign
+ 		if (!S_ISDIR(inode->i_mode))
+ 			flags &= ~JFS_DIRSYNC_FL;
+ 
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -EACCES;
++		}
++
+ 		/* Is it quota file? Do not allow user to mess with it */
+ 		if (IS_NOQUOTA(inode)) {
+ 			err = -EPERM;
+@@ -106,8 +122,8 @@ long jfs_ioctl(struct file *filp, unsign
+ 		 * the relevant capability.
+ 		 */
+ 		if ((oldflags & JFS_IMMUTABLE_FL) ||
+-			((flags ^ oldflags) &
+-			(JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
++			((flags ^ oldflags) & (JFS_APPEND_FL |
++			JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL))) {
+ 			if (!capable(CAP_LINUX_IMMUTABLE)) {
+ 				mutex_unlock(&inode->i_mutex);
+ 				err = -EPERM;
+@@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign
+ 			}
+ 		}
+ 
+-		flags = flags & JFS_FL_USER_MODIFIABLE;
++		flags &= JFS_FL_USER_MODIFIABLE;
+ 		flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
+ 		jfs_inode->mode2 = flags;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_dinode.h linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_dinode.h
+--- linux-3.7.10/fs/jfs/jfs_dinode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_dinode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -161,9 +161,13 @@ struct dinode {
+ 
+ #define JFS_APPEND_FL		0x01000000 /* writes to file may only append */
+ #define JFS_IMMUTABLE_FL	0x02000000 /* Immutable file */
++#define JFS_IXUNLINK_FL		0x08000000 /* Immutable invert on unlink */
+ 
+-#define JFS_FL_USER_VISIBLE	0x03F80000
+-#define JFS_FL_USER_MODIFIABLE	0x03F80000
++#define JFS_BARRIER_FL		0x04000000 /* Barrier for chroot() */
++#define JFS_COW_FL		0x20000000 /* Copy on Write marker */
++
++#define JFS_FL_USER_VISIBLE	0x07F80000
++#define JFS_FL_USER_MODIFIABLE	0x07F80000
+ #define JFS_FL_INHERIT		0x03C80000
+ 
+ /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_filsys.h linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_filsys.h
+--- linux-3.7.10/fs/jfs/jfs_filsys.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_filsys.h	2012-12-18 15:13:16.000000000 +0000
+@@ -266,6 +266,7 @@
+ #define JFS_NAME_MAX	255
+ #define JFS_PATH_MAX	BPSIZE
+ 
++#define JFS_TAGGED		0x00800000	/* Context Tagging */
+ 
+ /*
+  *	file system state (superblock state)
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_imap.c linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_imap.c
+--- linux-3.7.10/fs/jfs/jfs_imap.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_imap.c	2012-12-18 15:13:16.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+ 
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod
+ {
+ 	struct jfs_inode_info *jfs_ip = JFS_IP(ip);
+ 	struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
++	kuid_t uid;
++	kgid_t gid;
+ 
+ 	jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
+ 	jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
+@@ -3078,14 +3081,19 @@ static int copy_from_dinode(struct dinod
+ 	}
+ 	set_nlink(ip, le32_to_cpu(dip->di_nlink));
+ 
+-	jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid));
++	uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid));
++	gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid));
++	ip->i_tag = make_ktag(&init_user_ns,
++		INOTAG_TAG(DX_TAG(ip), uid, gid, 0));
++
++	jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid);
+ 	if (!uid_valid(sbi->uid))
+ 		ip->i_uid = jfs_ip->saved_uid;
+ 	else {
+ 		ip->i_uid = sbi->uid;
+ 	}
+ 
+-	jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid));
++	jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid);
+ 	if (!gid_valid(sbi->gid))
+ 		ip->i_gid = jfs_ip->saved_gid;
+ 	else {
+@@ -3150,16 +3158,14 @@ 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);
+-	if (!uid_valid(sbi->uid))
+-		dip->di_uid = cpu_to_le32(i_uid_read(ip));
+-	else
+-		dip->di_uid =cpu_to_le32(from_kuid(&init_user_ns,
+-						   jfs_ip->saved_uid));
+-	if (!gid_valid(sbi->gid))
+-		dip->di_gid = cpu_to_le32(i_gid_read(ip));
+-	else
+-		dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns,
+-						    jfs_ip->saved_gid));
++	dip->di_uid = cpu_to_le32(from_kuid(&init_user_ns,
++		TAGINO_UID(DX_TAG(ip),
++		!uid_valid(sbi->uid) ? ip->i_uid : jfs_ip->saved_uid,
++		ip->i_tag)));
++	dip->di_gid = cpu_to_le32(from_kuid(&init_user_ns,
++		TAGINO_GID(DX_TAG(ip),
++		!gid_valid(sbi->gid) ? ip->i_gid : jfs_ip->saved_gid,
++		ip->i_tag)));
+ 	jfs_get_inode_flags(jfs_ip);
+ 	/*
+ 	 * mode2 is only needed for storing the higher order bits.
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_inode.c linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.c
+--- linux-3.7.10/fs/jfs/jfs_inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -18,6 +18,7 @@
+ 
+ #include <linux/fs.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_inode.h"
+ #include "jfs_filsys.h"
+@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i
+ {
+ 	unsigned int flags = JFS_IP(inode)->mode2;
+ 
+-	inode->i_flags &= ~(S_IMMUTABLE | S_APPEND |
+-		S_NOATIME | S_DIRSYNC | S_SYNC);
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
++		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+ 	if (flags & JFS_IMMUTABLE_FL)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (flags & JFS_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
++
++	if (flags & JFS_SYNC_FL)
++		inode->i_flags |= S_SYNC;
+ 	if (flags & JFS_APPEND_FL)
+ 		inode->i_flags |= S_APPEND;
+ 	if (flags & JFS_NOATIME_FL)
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & JFS_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
+-	if (flags & JFS_SYNC_FL)
+-		inode->i_flags |= S_SYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & JFS_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & JFS_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
+ {
+ 	unsigned int flags = jfs_ip->vfs_inode.i_flags;
++	unsigned int vflags = jfs_ip->vfs_inode.i_vflags;
++
++	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL |
++			   JFS_APPEND_FL | JFS_NOATIME_FL |
++			   JFS_DIRSYNC_FL | JFS_SYNC_FL |
++			   JFS_BARRIER_FL | JFS_COW_FL);
+ 
+-	jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |
+-			   JFS_DIRSYNC_FL | JFS_SYNC_FL);
+ 	if (flags & S_IMMUTABLE)
+ 		jfs_ip->mode2 |= JFS_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		jfs_ip->mode2 |= JFS_IXUNLINK_FL;
++
+ 	if (flags & S_APPEND)
+ 		jfs_ip->mode2 |= JFS_APPEND_FL;
+ 	if (flags & S_NOATIME)
+@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod
+ 		jfs_ip->mode2 |= JFS_DIRSYNC_FL;
+ 	if (flags & S_SYNC)
+ 		jfs_ip->mode2 |= JFS_SYNC_FL;
++
++	if (vflags & V_BARRIER)
++		jfs_ip->mode2 |= JFS_BARRIER_FL;
++	if (vflags & V_COW)
++		jfs_ip->mode2 |= JFS_COW_FL;
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/fs/jfs/jfs_inode.h linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.h
+--- linux-3.7.10/fs/jfs/jfs_inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/jfs_inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
+ extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
+ 	int fh_len, int fh_type);
+ extern void jfs_set_inode_flags(struct inode *);
++extern int jfs_sync_flags(struct inode *, int, int);
+ extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
+ extern int jfs_setattr(struct dentry *, struct iattr *);
+ 
+diff -NurpP --minimal linux-3.7.10/fs/jfs/namei.c linux-3.7.10-vs2.3.5.6/fs/jfs/namei.c
+--- linux-3.7.10/fs/jfs/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/ctype.h>
+ #include <linux/quotaops.h>
+ #include <linux/exportfs.h>
++#include <linux/vs_tag.h>
+ #include "jfs_incore.h"
+ #include "jfs_superblock.h"
+ #include "jfs_inode.h"
+@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct
+ 			jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
+ 	}
+ 
++	dx_propagate_tag(nd, ip);
+ 	return d_splice_alias(ip, dentry);
+ }
+ 
+@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in
+ #ifdef CONFIG_JFS_POSIX_ACL
+ 	.get_acl	= jfs_get_acl,
+ #endif
++	.sync_flags	= jfs_sync_flags,
+ };
+ 
+ const struct file_operations jfs_dir_operations = {
+diff -NurpP --minimal linux-3.7.10/fs/jfs/super.c linux-3.7.10-vs2.3.5.6/fs/jfs/super.c
+--- linux-3.7.10/fs/jfs/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/jfs/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -199,7 +199,8 @@ enum {
+ 	Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
+ 	Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
+ 	Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask,
+-	Opt_discard, Opt_nodiscard, Opt_discard_minblk
++	Opt_discard, Opt_nodiscard, Opt_discard_minblk,
++	Opt_tag, Opt_notag, Opt_tagid
+ };
+ 
+ static const match_table_t tokens = {
+@@ -209,6 +210,10 @@ static const match_table_t tokens = {
+ 	{Opt_resize, "resize=%u"},
+ 	{Opt_resize_nosize, "resize"},
+ 	{Opt_errors, "errors=%s"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
++	{Opt_tag, "tagxid"},
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_ignore, "quota"},
+ 	{Opt_usrquota, "usrquota"},
+@@ -385,7 +390,20 @@ static int parse_options(char *options,
+ 			}
+ 			break;
+ 		}
+-
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			*flag |= JFS_TAGGED;
++			break;
++		case Opt_notag:
++			*flag &= JFS_TAGGED;
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			*flag |= JFS_TAGGED;
++			break;
++#endif
+ 		default:
+ 			printk("jfs: Unrecognized mount option \"%s\" "
+ 					" or missing value\n", p);
+@@ -417,6 +435,12 @@ static int jfs_remount(struct super_bloc
+ 		return -EINVAL;
+ 	}
+ 
++	if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) {
++		printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n",
++			sb->s_id);
++		return -EINVAL;
++	}
++
+ 	if (newLVSize) {
+ 		if (sb->s_flags & MS_RDONLY) {
+ 			pr_err("JFS: resize requires volume" \
+@@ -502,6 +526,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_TAGGED)
++		sb->s_flags |= MS_TAGGED;
+ 
+ 	if (newLVSize) {
+ 		pr_err("resize option for remount only\n");
+diff -NurpP --minimal linux-3.7.10/fs/libfs.c linux-3.7.10-vs2.3.5.6/fs/libfs.c
+--- linux-3.7.10/fs/libfs.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/libfs.c	2012-12-18 15:13:16.000000000 +0000
+@@ -135,7 +135,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_path.dentry;
+ 	struct dentry *cursor = filp->private_data;
+@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v
+ 			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
+ 				struct dentry *next;
+ 				next = list_entry(p, struct dentry, d_u.d_child);
++				if (filter && !filter(next))
++					continue;
+ 				spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
+ 				if (!simple_positive(next)) {
+ 					spin_unlock(&next->d_lock);
+@@ -192,6 +195,17 @@ 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;
+@@ -983,6 +997,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(mount_pseudo);
+ EXPORT_SYMBOL(simple_write_begin);
+diff -NurpP --minimal linux-3.7.10/fs/locks.c linux-3.7.10-vs2.3.5.6/fs/locks.c
+--- linux-3.7.10/fs/locks.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/locks.c	2012-12-18 15:13:16.000000000 +0000
+@@ -126,6 +126,8 @@
+ #include <linux/time.h>
+ #include <linux/rcupdate.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct
+ /* Allocate an empty lock structure. */
+ struct file_lock *locks_alloc_lock(void)
+ {
+-	struct file_lock *fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++	struct file_lock *fl;
+ 
+-	if (fl)
+-		locks_init_lock_heads(fl);
++	if (!vx_locks_avail(1))
++		return NULL;
+ 
++	fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL);
++
++	if (fl) {
++		locks_init_lock_heads(fl);
++		fl->fl_xid = -1;
++	}
+ 	return fl;
+ }
+ EXPORT_SYMBOL_GPL(locks_alloc_lock);
+@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f
+ 	BUG_ON(!list_empty(&fl->fl_block));
+ 	BUG_ON(!list_empty(&fl->fl_link));
+ 
++	vx_locks_dec(fl);
+ 	locks_release_private(fl);
+ 	kmem_cache_free(filelock_cache, fl);
+ }
+@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f
+ {
+ 	memset(fl, 0, sizeof(struct file_lock));
+ 	locks_init_lock_heads(fl);
++	fl->fl_xid = -1;
+ }
+ 
+ EXPORT_SYMBOL(locks_init_lock);
+@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n
+ 	new->fl_file = fl->fl_file;
+ 	new->fl_ops = fl->fl_ops;
+ 	new->fl_lmops = fl->fl_lmops;
++	new->fl_xid = fl->fl_xid;
+ 
+ 	locks_copy_private(new, fl);
+ }
+@@ -299,6 +310,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;
+@@ -438,6 +454,7 @@ static int lease_init(struct file *filp,
+ 
+ 	fl->fl_owner = current->files;
+ 	fl->fl_pid = current->tgid;
++	fl->fl_xid = vx_current_xid();
+ 
+ 	fl->fl_file = filp;
+ 	fl->fl_flags = FL_LEASE;
+@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str
+ 	if (fl == NULL)
+ 		return ERR_PTR(error);
+ 
++	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) {
+ 		locks_free_lock(fl);
+@@ -753,6 +775,7 @@ static int flock_lock_file(struct file *
+ 		lock_flocks();
+ 	}
+ 
++	new_fl->fl_xid = -1;
+ find_conflict:
+ 	for_each_lock(inode, before) {
+ 		struct file_lock *fl = *before;
+@@ -773,6 +796,7 @@ find_conflict:
+ 		goto out;
+ 	locks_copy_lock(new_fl, request);
+ 	locks_insert_lock(before, new_fl);
++	vx_locks_inc(new_fl);
+ 	new_fl = NULL;
+ 	error = 0;
+ 
+@@ -783,7 +807,8 @@ out:
+ 	return error;
+ }
+ 
+-static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock)
++static int __posix_lock_file(struct inode *inode, struct file_lock *request,
++	struct file_lock *conflock, xid_t xid)
+ {
+ 	struct file_lock *fl;
+ 	struct file_lock *new_fl = NULL;
+@@ -793,6 +818,8 @@ 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.
+@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod
+ 	    (request->fl_type != F_UNLCK ||
+ 	     request->fl_start != 0 || request->fl_end != OFFSET_MAX)) {
+ 		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_flocks();
+@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod
+ int posix_lock_file(struct file *filp, struct file_lock *fl,
+ 			struct file_lock *conflock)
+ {
+-	return __posix_lock_file(filp->f_path.dentry->d_inode, fl, conflock);
++	return __posix_lock_file(filp->f_path.dentry->d_inode,
++		fl, conflock, filp->f_xid);
+ }
+ EXPORT_SYMBOL(posix_lock_file);
+ 
+@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write,
+ 	fl.fl_end = offset + count - 1;
+ 
+ 	for (;;) {
+-		error = __posix_lock_file(inode, &fl, NULL);
++		error = __posix_lock_file(inode, &fl, NULL, filp->f_xid);
+ 		if (error != FILE_LOCK_DEFERRED)
+ 			break;
+ 		error = wait_event_interruptible(fl.fl_wait, !fl.fl_next);
+@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp,
+ 		goto out;
+ 
+ 	locks_insert_lock(before, lease);
++	vx_locks_inc(lease);
+ 	return 0;
+ 
+ out:
+@@ -1836,6 +1869,11 @@ int fcntl_setlk(unsigned int fd, struct
+ 	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.
+ 	 */
+@@ -1954,6 +1992,11 @@ int fcntl_setlk64(unsigned int fd, struc
+ 	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.
+ 	 */
+@@ -2219,8 +2262,11 @@ static int locks_show(struct seq_file *f
+ 
+ 	lock_get_status(f, fl, *((loff_t *)f->private), "");
+ 
+-	list_for_each_entry(bfl, &fl->fl_block, fl_block)
++	list_for_each_entry(bfl, &fl->fl_block, fl_block) {
++		if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		lock_get_status(f, bfl, *((loff_t *)f->private), " ->");
++	}
+ 
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/fs/mount.h linux-3.7.10-vs2.3.5.6/fs/mount.h
+--- linux-3.7.10/fs/mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -46,6 +46,7 @@ struct mount {
+ 	int mnt_expiry_mark;		/* true if marked for expiry */
+ 	int mnt_pinned;
+ 	int mnt_ghosts;
++	tag_t mnt_tag;			/* tagging used for vfsmount */
+ };
+ 
+ #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
+diff -NurpP --minimal linux-3.7.10/fs/namei.c linux-3.7.10-vs2.3.5.6/fs/namei.c
+--- linux-3.7.10/fs/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -34,6 +34,14 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/fs_struct.h>
+ #include <linux/posix_acl.h>
++#include <linux/proc_fs.h>
++#include <linux/vserver/inode.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vs_device.h>
++#include <linux/vs_context.h>
++#include <linux/pid_namespace.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+@@ -266,6 +274,89 @@ static int check_acl(struct inode *inode
+ 	return -EAGAIN;
+ }
+ 
++static inline int dx_barrier(const struct inode *inode)
++{
++	if (IS_BARRIER(inode) && !vx_check(0, VS_ADMIN | VS_WATCH)) {
++		vxwprintk_task(1, "did hit the barrier.");
++		return 1;
++	}
++	return 0;
++}
++
++static int __dx_permission(const struct inode *inode, int mask)
++{
++	if (dx_barrier(inode))
++		return -EACCES;
++
++	if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) {
++		/* devpts is xid tagged */
++		if (S_ISDIR(inode->i_mode) ||
++		    vx_check((xid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P))
++			return 0;
++
++		/* just pretend we didn't find anything */
++		return -ENOENT;
++	}
++	else 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 out;
++
++		if ((mask & (MAY_WRITE | MAY_APPEND))) {
++			struct pid *pid;
++			struct task_struct *tsk;
++
++			if (vx_check(0, VS_ADMIN | VS_WATCH_P) ||
++			    vx_flags(VXF_STATE_SETUP, 0))
++				return 0;
++
++			pid = PROC_I(inode)->pid;
++			if (!pid)
++				goto out;
++
++			rcu_read_lock();
++			tsk = pid_task(pid, PIDTYPE_PID);
++			vxdprintk(VXD_CBIT(tag, 0), "accessing %p[#%u]",
++				  tsk, (tsk ? vx_task_xid(tsk) : 0));
++			if (tsk &&
++				vx_check(vx_task_xid(tsk), VS_IDENT | VS_WATCH_P)) {
++				rcu_read_unlock();
++				return 0;
++			}
++			rcu_read_unlock();
++		}
++		else {
++			/* FIXME: Should we block some entries here? */
++			return 0;
++		}
++	}
++	else {
++		if (dx_notagcheck(inode->i_sb) ||
++		    dx_check((xid_t)i_tag_read(inode),
++			DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT))
++			return 0;
++	}
++
++out:
++	return -EACCES;
++}
++
++int dx_permission(const struct inode *inode, int mask)
++{
++	int ret = __dx_permission(inode, mask);
++	if (unlikely(ret)) {
++#ifndef	CONFIG_VSERVER_WARN_DEVPTS
++		if (inode->i_sb->s_magic != DEVPTS_SUPER_MAGIC)
++#endif
++		    vxwprintk_task(1,
++			"denied [0x%x] access to inode %s:%p[#%d,%lu]",
++			mask, inode->i_sb->s_id, inode, inode->i_tag,
++			inode->i_ino);
++	}
++	return ret;
++}
++
+ /*
+  * This does the basic permission checking
+  */
+@@ -388,10 +479,14 @@ int __inode_permission(struct inode *ino
+ 		/*
+ 		 * Nobody gets write access to an immutable file.
+ 		 */
+-		if (IS_IMMUTABLE(inode))
++		if (IS_IMMUTABLE(inode) && !IS_COW(inode))
+ 			return -EACCES;
+ 	}
+ 
++	retval = dx_permission(inode, mask);
++	if (retval)
++		return retval;
++
+ 	retval = do_inode_permission(inode, mask);
+ 	if (retval)
+ 		return retval;
+@@ -1244,7 +1339,8 @@ static void follow_dotdot(struct nameida
+ 
+ 		if (nd->path.dentry == nd->root.dentry &&
+ 		    nd->path.mnt == nd->root.mnt) {
+-			break;
++			/* for sane '/' avoid follow_mount() */
++			return;
+ 		}
+ 		if (nd->path.dentry != nd->path.mnt->mnt_root) {
+ 			/* rare case of legitimate dget_parent()... */
+@@ -1393,6 +1489,9 @@ static int lookup_fast(struct nameidata
+ 				goto unlazy;
+ 			}
+ 		}
++
++		/* FIXME: check dx permission */
++
+ 		path->mnt = mnt;
+ 		path->dentry = dentry;
+ 		if (unlikely(!__follow_mount_rcu(nd, path, inode)))
+@@ -1428,6 +1527,8 @@ unlazy:
+ 		}
+ 	}
+ 
++	/* FIXME: check dx permission */
++
+ 	path->mnt = mnt;
+ 	path->dentry = dentry;
+ 	err = follow_managed(path, nd->flags);
+@@ -2258,7 +2359,7 @@ static int may_delete(struct inode *dir,
+ 	if (IS_APPEND(dir))
+ 		return -EPERM;
+ 	if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)||
+-	    IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
++		IS_IXORUNLINK(victim->d_inode) || IS_SWAPFILE(victim->d_inode))
+ 		return -EPERM;
+ 	if (isdir) {
+ 		if (!S_ISDIR(victim->d_inode->i_mode))
+@@ -2337,19 +2438,25 @@ int vfs_create(struct inode *dir, struct
+ 		bool want_excl)
+ {
+ 	int error = may_create(dir, dentry);
+-	if (error)
++	if (error) {
++		vxdprintk(VXD_CBIT(misc, 3), "may_create failed with %d", error);
+ 		return error;
++	}
+ 
+ 	if (!dir->i_op->create)
+ 		return -EACCES;	/* shouldn't it be ENOSYS? */
+ 	mode &= S_IALLUGO;
+ 	mode |= S_IFREG;
+ 	error = security_inode_create(dir, dentry, mode);
+-	if (error)
++	if (error) {
++		vxdprintk(VXD_CBIT(misc, 3), "security_inode_create failed with %d", error);
+ 		return error;
++	}
+ 	error = dir->i_op->create(dir, dentry, mode, want_excl);
+ 	if (!error)
+ 		fsnotify_create(dir, dentry);
++	else
++		vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error);
+ 	return error;
+ }
+ 
+@@ -2384,6 +2491,15 @@ static int may_open(struct path *path, i
+ 		break;
+ 	}
+ 
++#ifdef	CONFIG_VSERVER_COWBL
++	if (IS_COW(inode) &&
++		((flag & O_ACCMODE) != O_RDONLY)) {
++		if (IS_COW_LINK(inode))
++			return -EMLINK;
++		inode->i_flags &= ~(S_IXUNLINK|S_IMMUTABLE);
++		mark_inode_dirty(inode);
++	}
++#endif
+ 	error = inode_permission(inode, acc_mode);
+ 	if (error)
+ 		return error;
+@@ -2886,6 +3002,16 @@ finish_open:
+ 	}
+ finish_open_created:
+ 	error = may_open(&nd->path, acc_mode, open_flag);
++#ifdef	CONFIG_VSERVER_COWBL
++	if (error == -EMLINK) {
++		struct dentry *dentry;
++		dentry = cow_break_link(name->name);
++		if (IS_ERR(dentry))
++			error = PTR_ERR(dentry);
++		else
++			dput(dentry);
++	}
++#endif
+ 	if (error)
+ 		goto out;
+ 	file->f_path.mnt = nd->path.mnt;
+@@ -2950,6 +3076,7 @@ static struct file *path_openat(int dfd,
+ 	int opened = 0;
+ 	int error;
+ 
++restart:
+ 	file = get_empty_filp();
+ 	if (!file)
+ 		return ERR_PTR(-ENFILE);
+@@ -2986,6 +3113,16 @@ static struct file *path_openat(int dfd,
+ 		error = do_last(nd, &path, file, op, &opened, pathname);
+ 		put_link(nd, &link, cookie);
+ 	}
++
++#ifdef	CONFIG_VSERVER_COWBL
++	if (error == -EMLINK) {
++		if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
++			path_put(&nd->root);
++		if (base)
++			fput(base);
++		goto restart;
++	}
++#endif
+ out:
+ 	if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
+ 		path_put(&nd->root);
+@@ -3090,6 +3227,11 @@ struct dentry *kern_path_create(int dfd,
+ 		goto fail;
+ 	}
+ 	*path = nd.path;
++	vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p",
++		path->dentry, path->dentry->d_name.len,
++		path->dentry->d_name.name, dentry,
++		dentry->d_name.len, dentry->d_name.name,
++		path->dentry->d_inode);
+ 	return dentry;
+ fail:
+ 	dput(dentry);
+@@ -3556,7 +3698,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->link)
+ 		return -EPERM;
+@@ -3945,6 +4087,275 @@ int vfs_follow_link(struct nameidata *nd
+ 	return __vfs_follow_link(nd, link);
+ }
+ 
++
++#ifdef	CONFIG_VSERVER_COWBL
++
++static inline
++long do_cow_splice(struct file *in, struct file *out, size_t len)
++{
++	loff_t ppos = 0;
++
++	return do_splice_direct(in, &ppos, out, len, 0);
++}
++
++struct dentry *cow_break_link(const char *pathname)
++{
++	int ret, mode, pathlen, redo = 0;
++	struct nameidata old_nd, dir_nd;
++	struct path dir_path, *old_path, *new_path;
++	struct dentry *dir, *old_dentry, *new_dentry = NULL;
++	struct file *old_file;
++	struct file *new_file;
++	char *to, *path, pad='\251';
++	loff_t size;
++
++	vxdprintk(VXD_CBIT(misc, 1),
++		"cow_break_link(" VS_Q("%s") ")", pathname);
++
++	path = kmalloc(PATH_MAX, GFP_KERNEL);
++	ret = -ENOMEM;
++	if (!path)
++		goto out;
++
++	/* old_nd.path will have refs to dentry and mnt */
++	ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"do_path_lookup(old): %d", ret);
++	if (ret < 0)
++		goto out_free_path;
++
++	/* dentry/mnt refs handed over to old_path */
++	old_path = &old_nd.path;
++	/* no explicit reference for old_dentry here */
++	old_dentry = old_path->dentry;
++
++	mode = old_dentry->d_inode->i_mode;
++	to = d_path(old_path, path, PATH_MAX-2);
++	pathlen = strlen(to);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to,
++		old_dentry,
++		old_dentry->d_name.len, old_dentry->d_name.name,
++		old_dentry->d_name.len);
++
++	to[pathlen + 1] = 0;
++retry:
++	new_dentry = NULL;
++	to[pathlen] = pad--;
++	ret = -ELOOP;
++	if (pad <= '\240')
++		goto out_rel_old;
++
++	vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to);
++
++	/* dir_nd.path will have refs to dentry and mnt */
++	ret = do_path_lookup(AT_FDCWD, to,
++		LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd);
++	vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret);
++	if (ret < 0)
++		goto retry;
++
++	/* this puppy downs the dir inode mutex if successful.
++	   dir_path will hold refs to dentry and mnt and
++	   we'll have get write access to the mnt */
++	new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0);
++	if (!new_dentry || IS_ERR(new_dentry)) {
++		path_put(&dir_nd.path);
++		vxdprintk(VXD_CBIT(misc, 2),
++			"kern_path_create(new) failed with %ld",
++			PTR_ERR(new_dentry));
++		goto retry;
++	}
++	vxdprintk(VXD_CBIT(misc, 2),
++		"kern_path_create(new): %p [" VS_Q("%.*s") ":%d]",
++		new_dentry,
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len);
++
++	/* take a reference on new_dentry */
++	dget(new_dentry);
++
++	/* dentry/mnt refs handed over to new_path */
++	new_path = &dir_path;
++
++	/* dentry for old/new dir */
++	dir = dir_nd.path.dentry;
++
++	/* give up reference on dir */
++	dput(new_path->dentry);
++
++	/* new_dentry already has a reference */
++	new_path->dentry = new_dentry;
++
++	ret = vfs_create(dir->d_inode, new_dentry, mode, 1);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"vfs_create(new): %d", ret);
++	if (ret == -EEXIST) {
++		mutex_unlock(&dir->d_inode->i_mutex);
++		path_put(&dir_nd.path);
++		mnt_drop_write(new_path->mnt);
++		path_put(new_path);
++		new_dentry = NULL;
++		goto retry;
++	}
++	else if (ret < 0)
++		goto out_unlock_new;
++
++	/* drop out early, ret passes ENOENT */
++	ret = -ENOENT;
++	if ((redo = d_unhashed(old_dentry)))
++		goto out_unlock_new;
++
++	/* doesn't change refs for old_path */
++	old_file = dentry_open(old_path, O_RDONLY, current_cred());
++	vxdprintk(VXD_CBIT(misc, 2),
++		"dentry_open(old): %p", old_file);
++	if (IS_ERR(old_file)) {
++		ret = PTR_ERR(old_file);
++		goto out_unlock_new;
++	}
++
++	/* doesn't change refs for new_path */
++	new_file = dentry_open(new_path, O_WRONLY, current_cred());
++	vxdprintk(VXD_CBIT(misc, 2),
++		"dentry_open(new): %p", new_file);
++	if (IS_ERR(new_file)) {
++		ret = PTR_ERR(new_file);
++		goto out_fput_old;
++	}
++
++	size = i_size_read(old_file->f_dentry->d_inode);
++	ret = do_cow_splice(old_file, new_file, size);
++	vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret);
++	if (ret < 0) {
++		goto out_fput_both;
++	} else if (ret < size) {
++		ret = -ENOSPC;
++		goto out_fput_both;
++	} else {
++		struct inode *old_inode = old_dentry->d_inode;
++		struct inode *new_inode = new_dentry->d_inode;
++		struct iattr attr = {
++			.ia_uid = old_inode->i_uid,
++			.ia_gid = old_inode->i_gid,
++			.ia_valid = ATTR_UID | ATTR_GID
++			};
++
++		setattr_copy(new_inode, &attr);
++		mark_inode_dirty(new_inode);
++	}
++
++	/* lock rename mutex */
++	mutex_lock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++	/* drop out late */
++	ret = -ENOENT;
++	if ((redo = d_unhashed(old_dentry)))
++		goto out_unlock;
++
++	vxdprintk(VXD_CBIT(misc, 2),
++		"vfs_rename: [" VS_Q("%*s") ":%d] -> [" VS_Q("%*s") ":%d]",
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len,
++		old_dentry->d_name.len, old_dentry->d_name.name,
++		old_dentry->d_name.len);
++	ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry,
++		old_dentry->d_parent->d_inode, old_dentry);
++	vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
++
++out_unlock:
++	mutex_unlock(&old_dentry->d_inode->i_sb->s_vfs_rename_mutex);
++
++out_fput_both:
++	vxdprintk(VXD_CBIT(misc, 3),
++		"fput(new_file=%p[#%ld])", new_file,
++		atomic_long_read(&new_file->f_count));
++	fput(new_file);
++
++out_fput_old:
++	vxdprintk(VXD_CBIT(misc, 3),
++		"fput(old_file=%p[#%ld])", old_file,
++		atomic_long_read(&old_file->f_count));
++	fput(old_file);
++
++out_unlock_new:
++	/* drop references from dir_nd.path */
++	path_put(&dir_nd.path);
++
++	/* drop write access to mnt */
++	mnt_drop_write(new_path->mnt);
++
++	/* unlock the inode mutex from kern_path_create() */
++	mutex_unlock(&dir->d_inode->i_mutex);
++	if (!ret)
++		goto out_redo;
++
++	/* error path cleanup */
++	vfs_unlink(dir->d_inode, new_dentry);
++
++out_redo:
++	if (!redo)
++		goto out_rel_both;
++
++	/* lookup dentry once again
++	   old_nd.path will be freed as old_path in out_rel_old */
++	ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd);
++	if (ret)
++		goto out_rel_both;
++
++	/* drop reference on new_dentry */
++	dput(new_dentry);
++	new_dentry = old_path->dentry;
++	dget(new_dentry);
++	vxdprintk(VXD_CBIT(misc, 2),
++		"do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]",
++		new_dentry,
++		new_dentry->d_name.len, new_dentry->d_name.name,
++		new_dentry->d_name.len);
++
++out_rel_both:
++	if (new_path)
++		path_put(new_path);
++out_rel_old:
++	path_put(old_path);
++out_free_path:
++	kfree(path);
++out:
++	if (ret) {
++		dput(new_dentry);
++		new_dentry = ERR_PTR(ret);
++	}
++	vxdprintk(VXD_CBIT(misc, 3),
++		"cow_break_link returning with %p", new_dentry);
++	return new_dentry;
++}
++
++#endif
++
++int	vx_info_mnt_namespace(struct mnt_namespace *ns, char *buffer)
++{
++	struct path path;
++	struct vfsmount *vmnt;
++	char *pstr, *root;
++	int length = 0;
++
++	pstr = kmalloc(PATH_MAX, GFP_KERNEL);
++	if (!pstr)
++		return 0;
++
++	vmnt = &ns->root->mnt;
++	path.mnt = vmnt;
++	path.dentry = vmnt->mnt_root;
++	root = d_path(&path, pstr, PATH_MAX - 2);
++	length = sprintf(buffer + length,
++		"Namespace:\t%p [#%u]\n"
++		"RootPath:\t%s\n",
++		ns, atomic_read(&ns->count),
++		root);
++	kfree(pstr);
++	return length;
++}
++
+ /* get the link contents into pagecache */
+ static char *page_getlink(struct dentry * dentry, struct page **ppage)
+ {
+@@ -4068,3 +4479,4 @@ EXPORT_SYMBOL(vfs_symlink);
+ EXPORT_SYMBOL(vfs_unlink);
+ EXPORT_SYMBOL(dentry_unhash);
+ EXPORT_SYMBOL(generic_readlink);
++EXPORT_SYMBOL(vx_info_mnt_namespace);
+diff -NurpP --minimal linux-3.7.10/fs/namespace.c linux-3.7.10-vs2.3.5.6/fs/namespace.c
+--- linux-3.7.10/fs/namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,6 +20,11 @@
+ #include <linux/fs_struct.h>	/* get_fs_root et.al. */
+ #include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_context.h>
++#include <linux/vs_tag.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/global.h>
+ #include "pnode.h"
+ #include "internal.h"
+ 
+@@ -749,6 +754,10 @@ vfs_kern_mount(struct file_system_type *
+ 	if (!type)
+ 		return ERR_PTR(-ENODEV);
+ 
++	if ((type->fs_flags & FS_BINARY_MOUNTDATA) &&
++		!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT))
++		return ERR_PTR(-EPERM);
++
+ 	mnt = alloc_vfsmnt(name);
+ 	if (!mnt)
+ 		return ERR_PTR(-ENOMEM);
+@@ -801,6 +810,7 @@ static struct mount *clone_mnt(struct mo
+ 	mnt->mnt.mnt_root = dget(root);
+ 	mnt->mnt_mountpoint = mnt->mnt.mnt_root;
+ 	mnt->mnt_parent = mnt;
++		mnt->mnt_tag = old->mnt_tag;
+ 	br_write_lock(&vfsmount_lock);
+ 	list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
+ 	br_write_unlock(&vfsmount_lock);
+@@ -1266,7 +1276,7 @@ SYSCALL_DEFINE2(umount, char __user *, n
+ 		goto dput_and_out;
+ 
+ 	retval = -EPERM;
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		goto dput_and_out;
+ 
+ 	retval = do_umount(mnt, flags);
+@@ -1292,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user *
+ 
+ static int mount_is_safe(struct path *path)
+ {
+-	if (capable(CAP_SYS_ADMIN))
++	if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return 0;
+ 	return -EPERM;
+ #ifdef notyet
+@@ -1610,7 +1620,7 @@ static int do_change_type(struct path *p
+ 	int type;
+ 	int err = 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE))
+ 		return -EPERM;
+ 
+ 	if (path->dentry != path->mnt->mnt_root)
+@@ -1626,6 +1636,7 @@ static int do_change_type(struct path *p
+ 		if (err)
+ 			goto out_unlock;
+ 	}
++	// mnt->mnt_flags = mnt_flags;
+ 
+ 	br_write_lock(&vfsmount_lock);
+ 	for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
+@@ -1641,12 +1652,14 @@ static int do_change_type(struct path *p
+  * do loopback mount.
+  */
+ static int do_loopback(struct path *path, const char *old_name,
+-				int recurse)
++	tag_t tag, unsigned long flags, int mnt_flags)
+ {
+ 	LIST_HEAD(umount_list);
+ 	struct path old_path;
+ 	struct mount *mnt = NULL, *old;
+ 	int err = mount_is_safe(path);
++	int recurse = flags & MS_REC;
++
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+@@ -1715,13 +1728,13 @@ static int change_mount_flags(struct vfs
+  * on it - tough luck.
+  */
+ static int do_remount(struct path *path, int flags, int mnt_flags,
+-		      void *data)
++	void *data, xid_t xid)
+ {
+ 	int err;
+ 	struct super_block *sb = path->mnt->mnt_sb;
+ 	struct mount *mnt = real_mount(path->mnt);
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT))
+ 		return -EPERM;
+ 
+ 	if (!check_mnt(mnt))
+@@ -1770,7 +1783,7 @@ static int do_move_mount(struct path *pa
+ 	struct mount *p;
+ 	struct mount *old;
+ 	int err = 0;
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return -EPERM;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+@@ -1927,7 +1940,7 @@ static int do_new_mount(struct path *pat
+ 		return -EINVAL;
+ 
+ 	/* we need capabilities... */
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
+ 		return -EPERM;
+ 
+ 	mnt = do_kern_mount(type, flags, name, data);
+@@ -2197,6 +2210,7 @@ long do_mount(const char *dev_name, cons
+ 	struct path path;
+ 	int retval = 0;
+ 	int mnt_flags = 0;
++	tag_t tag = 0;
+ 
+ 	/* Discard magic */
+ 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+@@ -2224,6 +2238,12 @@ long do_mount(const char *dev_name, cons
+ 	if (!(flags & MS_NOATIME))
+ 		mnt_flags |= MNT_RELATIME;
+ 
++	if (dx_parse_tag(data_page, &tag, 1, &mnt_flags, &flags)) {
++		/* FIXME: bind and re-mounts get the tag flag? */
++		if (flags & (MS_BIND|MS_REMOUNT))
++			flags |= MS_TAGID;
++	}
++
+ 	/* Separate the per-mountpoint flags */
+ 	if (flags & MS_NOSUID)
+ 		mnt_flags |= MNT_NOSUID;
+@@ -2240,15 +2260,17 @@ long do_mount(const char *dev_name, cons
+ 	if (flags & MS_RDONLY)
+ 		mnt_flags |= MNT_READONLY;
+ 
++	if (!capable(CAP_SYS_ADMIN))
++		mnt_flags |= MNT_NODEV;
+ 	flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN |
+ 		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
+ 		   MS_STRICTATIME);
+ 
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
+-				    data_page);
++				    data_page, tag);
+ 	else if (flags & MS_BIND)
+-		retval = do_loopback(&path, dev_name, flags & MS_REC);
++		retval = do_loopback(&path, dev_name, tag, flags, mnt_flags);
+ 	else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
+ 		retval = do_change_type(&path, flags);
+ 	else if (flags & MS_MOVE)
+@@ -2329,6 +2351,7 @@ static struct mnt_namespace *dup_mnt_ns(
+ 		q = next_mnt(q, new);
+ 	}
+ 	up_write(&namespace_sem);
++	atomic_inc(&vs_global_mnt_ns);
+ 
+ 	if (rootmnt)
+ 		mntput(rootmnt);
+@@ -2524,9 +2547,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+ 	error = -EINVAL;
+ 	new_mnt = real_mount(new.mnt);
+ 	root_mnt = real_mount(root.mnt);
+-	if (IS_MNT_SHARED(real_mount(old.mnt)) ||
++	if ((IS_MNT_SHARED(real_mount(old.mnt)) ||
+ 		IS_MNT_SHARED(new_mnt->mnt_parent) ||
+-		IS_MNT_SHARED(root_mnt->mnt_parent))
++		IS_MNT_SHARED(root_mnt->mnt_parent)) &&
++		!vx_flags(VXF_STATE_SETUP, 0))
+ 		goto out4;
+ 	if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
+ 		goto out4;
+@@ -2647,6 +2671,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+ 	br_write_unlock(&vfsmount_lock);
+ 	up_write(&namespace_sem);
+ 	release_mounts(&umount_list);
++	atomic_dec(&vs_global_mnt_ns);
+ 	kfree(ns);
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/fs/nfs/client.c linux-3.7.10-vs2.3.5.6/fs/nfs/client.c
+--- linux-3.7.10/fs/nfs/client.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/client.c	2013-01-16 00:19:03.000000000 +0000
+@@ -683,6 +683,9 @@ int nfs_init_server_rpcclient(struct nfs
+ 	if (server->flags & NFS_MOUNT_SOFT)
+ 		server->client->cl_softrtry = 1;
+ 
++	server->client->cl_tag = 0;
++	if (server->flags & NFS_MOUNT_TAGGED)
++		server->client->cl_tag = 1;
+ 	return 0;
+ }
+ EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient);
+@@ -862,6 +865,10 @@ static void nfs_server_set_fsinfo(struct
+ 		server->acdirmin = server->acdirmax = 0;
+ 	}
+ 
++	/* FIXME: needs fsinfo
++	if (server->flags & NFS_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;	*/
++
+ 	server->maxfilesize = fsinfo->maxfilesize;
+ 
+ 	server->time_delta = fsinfo->time_delta;
+diff -NurpP --minimal linux-3.7.10/fs/nfs/dir.c linux-3.7.10-vs2.3.5.6/fs/nfs/dir.c
+--- linux-3.7.10/fs/nfs/dir.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/dir.c	2013-01-16 00:19:03.000000000 +0000
+@@ -36,6 +36,7 @@
+ #include <linux/sched.h>
+ #include <linux/kmemleak.h>
+ #include <linux/xattr.h>
++#include <linux/vs_tag.h>
+ 
+ #include "delegation.h"
+ #include "iostat.h"
+@@ -1255,6 +1256,7 @@ struct dentry *nfs_lookup(struct inode *
+ 	/* Success: notify readdir to use READDIRPLUS */
+ 	nfs_advise_use_readdirplus(dir);
+ 
++	dx_propagate_tag(nd, inode);
+ no_entry:
+ 	res = d_materialise_unique(dentry, inode);
+ 	if (res != NULL) {
+diff -NurpP --minimal linux-3.7.10/fs/nfs/inode.c linux-3.7.10-vs2.3.5.6/fs/nfs/inode.c
+--- linux-3.7.10/fs/nfs/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <linux/compat.h>
+ #include <linux/freezer.h>
+ #include <linux/crc32.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct
+ 	if (inode->i_state & I_NEW) {
+ 		struct nfs_inode *nfsi = NFS_I(inode);
+ 		unsigned long now = jiffies;
++		uid_t uid;
++		gid_t gid;
+ 
+ 		/* We set i_ino for the few things that still rely on it,
+ 		 * such as stat(2) */
+@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct
+ 		inode->i_version = 0;
+ 		inode->i_size = 0;
+ 		clear_nlink(inode);
+-		inode->i_uid = -2;
+-		inode->i_gid = -2;
++		uid = -2;
++		gid = -2;
+ 		inode->i_blocks = 0;
+ 		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
+ 		nfsi->write_io = 0;
+@@ -358,11 +361,11 @@ nfs_fhget(struct super_block *sb, struct
+ 		else if (nfs_server_capable(inode, NFS_CAP_NLINK))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_OWNER)
+-			inode->i_uid = fattr->uid;
++			uid = fattr->uid;
+ 		else if (nfs_server_capable(inode, NFS_CAP_OWNER))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_GROUP)
+-			inode->i_gid = fattr->gid;
++			gid = fattr->gid;
+ 		else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
+ 			nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
+ 		if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
+@@ -373,6 +376,11 @@ nfs_fhget(struct super_block *sb, struct
+ 			 */
+ 			inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
+ 		}
++		inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++		inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++		inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0);
++				/* maybe fattr->xid someday */
++
+ 		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
+ 		nfsi->attrtimeo_timestamp = now;
+ 		nfsi->access_cache = RB_ROOT;
+@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino
+ 			inode->i_uid = attr->ia_uid;
+ 		if ((attr->ia_valid & ATTR_GID) != 0)
+ 			inode->i_gid = attr->ia_gid;
++		if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode))
++			inode->i_tag = attr->ia_tag;
+ 		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+ 		spin_unlock(&inode->i_lock);
+ 	}
+@@ -968,6 +978,9 @@ static int nfs_check_inode_attributes(st
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	loff_t cur_size, new_isize;
+ 	unsigned long invalid = 0;
++	uid_t uid;
++	gid_t gid;
++	tag_t tag;
+ 
+ 
+ 	if (nfs_have_delegated_attributes(inode))
+@@ -993,13 +1006,18 @@ static int nfs_check_inode_attributes(st
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
+ 	}
+ 
++	uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid);
++	gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid);
++	tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0);
++
+ 	/* Have any file permissions changed? */
+ 	if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO))
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+-	if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid)
++	if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid)
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
+-	if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid)
++	if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid)
+ 		invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
++		/* maybe check for tag too? */
+ 
+ 	/* Has the link count changed? */
+ 	if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
+@@ -1303,6 +1321,9 @@ static int nfs_update_inode(struct inode
+ 	unsigned long invalid = 0;
+ 	unsigned long now = jiffies;
+ 	unsigned long save_cache_validity;
++	uid_t uid;
++	gid_t gid;
++	tag_t tag;
+ 
+ 	dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
+ 			__func__, inode->i_sb->s_id, inode->i_ino,
+@@ -1404,6 +1425,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_PAGECACHE
+ 				| NFS_INO_REVAL_FORCED);
+ 
++	uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
++	gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
++	tag = inode->i_tag;
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_ATIME)
+ 		memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
+@@ -1425,9 +1449,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_FORCED);
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
+-		if (inode->i_uid != fattr->uid) {
++		if (uid != fattr->uid) {
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+-			inode->i_uid = fattr->uid;
++			uid = fattr->uid;
+ 		}
+ 	} else if (server->caps & NFS_CAP_OWNER)
+ 		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1436,9 +1460,9 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_REVAL_FORCED);
+ 
+ 	if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
+-		if (inode->i_gid != fattr->gid) {
++		if (gid != fattr->gid) {
+ 			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+-			inode->i_gid = fattr->gid;
++			gid = fattr->gid;
+ 		}
+ 	} else if (server->caps & NFS_CAP_OWNER_GROUP)
+ 		invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
+@@ -1446,6 +1470,10 @@ static int nfs_update_inode(struct inode
+ 				| NFS_INO_INVALID_ACL
+ 				| NFS_INO_REVAL_FORCED);
+ 
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag);
++
+ 	if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
+ 		if (inode->i_nlink != fattr->nlink) {
+ 			invalid |= NFS_INO_INVALID_ATTR;
+diff -NurpP --minimal linux-3.7.10/fs/nfs/nfs3xdr.c linux-3.7.10-vs2.3.5.6/fs/nfs/nfs3xdr.c
+--- linux-3.7.10/fs/nfs/nfs3xdr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/nfs3xdr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/nfs3.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/nfsacl.h>
++#include <linux/vs_tag.h>
+ #include "internal.h"
+ 
+ #define NFSDBG_FACILITY		NFSDBG_XDR
+@@ -560,7 +561,8 @@ static __be32 *xdr_decode_nfstime3(__be3
+  *		set_mtime	mtime;
+  *	};
+  */
+-static void encode_sattr3(struct xdr_stream *xdr, const struct iattr *attr)
++static void encode_sattr3(struct xdr_stream *xdr,
++	const struct iattr *attr, int tag)
+ {
+ 	u32 nbytes;
+ 	__be32 *p;
+@@ -592,15 +594,19 @@ static void encode_sattr3(struct xdr_str
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+-	if (attr->ia_valid & ATTR_UID) {
++	if (attr->ia_valid & ATTR_UID ||
++		(tag && (attr->ia_valid & ATTR_TAG))) {
+ 		*p++ = xdr_one;
+-		*p++ = cpu_to_be32(attr->ia_uid);
++		*p++ = cpu_to_be32(TAGINO_UID(tag,
++			attr->ia_uid, attr->ia_tag));
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+-	if (attr->ia_valid & ATTR_GID) {
++	if (attr->ia_valid & ATTR_GID ||
++		(tag && (attr->ia_valid & ATTR_TAG))) {
+ 		*p++ = xdr_one;
+-		*p++ = cpu_to_be32(attr->ia_gid);
++		*p++ = cpu_to_be32(TAGINO_GID(tag,
++			attr->ia_gid, attr->ia_tag));
+ 	} else
+ 		*p++ = xdr_zero;
+ 
+@@ -879,7 +885,7 @@ static void nfs3_xdr_enc_setattr3args(st
+ 				      const struct nfs3_sattrargs *args)
+ {
+ 	encode_nfs_fh3(xdr, args->fh);
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
+ 	encode_sattrguard3(xdr, args);
+ }
+ 
+@@ -1029,13 +1035,13 @@ static void nfs3_xdr_enc_write3args(stru
+  *	};
+  */
+ static void encode_createhow3(struct xdr_stream *xdr,
+-			      const struct nfs3_createargs *args)
++	const struct nfs3_createargs *args, int tag)
+ {
+ 	encode_uint32(xdr, args->createmode);
+ 	switch (args->createmode) {
+ 	case NFS3_CREATE_UNCHECKED:
+ 	case NFS3_CREATE_GUARDED:
+-		encode_sattr3(xdr, args->sattr);
++		encode_sattr3(xdr, args->sattr, tag);
+ 		break;
+ 	case NFS3_CREATE_EXCLUSIVE:
+ 		encode_createverf3(xdr, args->verifier);
+@@ -1050,7 +1056,7 @@ static void nfs3_xdr_enc_create3args(str
+ 				     const struct nfs3_createargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_createhow3(xdr, args);
++	encode_createhow3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1066,7 +1072,7 @@ static void nfs3_xdr_enc_mkdir3args(stru
+ 				    const struct nfs3_mkdirargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1083,9 +1089,9 @@ static void nfs3_xdr_enc_mkdir3args(stru
+  *	};
+  */
+ static void encode_symlinkdata3(struct xdr_stream *xdr,
+-				const struct nfs3_symlinkargs *args)
++	const struct nfs3_symlinkargs *args, int tag)
+ {
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, tag);
+ 	encode_nfspath3(xdr, args->pages, args->pathlen);
+ }
+ 
+@@ -1094,7 +1100,7 @@ static void nfs3_xdr_enc_symlink3args(st
+ 				      const struct nfs3_symlinkargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);
+-	encode_symlinkdata3(xdr, args);
++	encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+@@ -1122,24 +1128,24 @@ static void nfs3_xdr_enc_symlink3args(st
+  *	};
+  */
+ static void encode_devicedata3(struct xdr_stream *xdr,
+-			       const struct nfs3_mknodargs *args)
++	const struct nfs3_mknodargs *args, int tag)
+ {
+-	encode_sattr3(xdr, args->sattr);
++	encode_sattr3(xdr, args->sattr, tag);
+ 	encode_specdata3(xdr, args->rdev);
+ }
+ 
+ static void encode_mknoddata3(struct xdr_stream *xdr,
+-			      const struct nfs3_mknodargs *args)
++	const struct nfs3_mknodargs *args, int tag)
+ {
+ 	encode_ftype3(xdr, args->type);
+ 	switch (args->type) {
+ 	case NF3CHR:
+ 	case NF3BLK:
+-		encode_devicedata3(xdr, args);
++		encode_devicedata3(xdr, args, tag);
+ 		break;
+ 	case NF3SOCK:
+ 	case NF3FIFO:
+-		encode_sattr3(xdr, args->sattr);
++		encode_sattr3(xdr, args->sattr, tag);
+ 		break;
+ 	case NF3REG:
+ 	case NF3DIR:
+@@ -1154,7 +1160,7 @@ static void nfs3_xdr_enc_mknod3args(stru
+ 				    const struct nfs3_mknodargs *args)
+ {
+ 	encode_diropargs3(xdr, args->fh, args->name, args->len);
+-	encode_mknoddata3(xdr, args);
++	encode_mknoddata3(xdr, args, req->rq_task->tk_client->cl_tag);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/fs/nfs/super.c linux-3.7.10-vs2.3.5.6/fs/nfs/super.c
+--- linux-3.7.10/fs/nfs/super.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfs/super.c	2013-02-05 01:14:43.000000000 +0000
+@@ -55,6 +55,7 @@
+ #include <linux/nsproxy.h>
+ #include <linux/rcupdate.h>
+ #include <linux/kthread.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -102,6 +103,7 @@ enum {
+ 	Opt_mountport,
+ 	Opt_mountvers,
+ 	Opt_minorversion,
++	Opt_tagid,
+ 
+ 	/* Mount options that take string arguments */
+ 	Opt_nfsvers,
+@@ -114,6 +116,9 @@ enum {
+ 	/* Special mount options */
+ 	Opt_userspace, Opt_deprecated, Opt_sloppy,
+ 
++	/* Linux-VServer tagging options */
++	Opt_tag, Opt_notag,
++
+ 	Opt_err
+ };
+ 
+@@ -183,6 +188,10 @@ static const match_table_t nfs_mount_opt
+ 	{ Opt_fscache_uniq, "fsc=%s" },
+ 	{ Opt_local_lock, "local_lock=%s" },
+ 
++	{ Opt_tag, "tag" },
++	{ Opt_notag, "notag" },
++	{ Opt_tagid, "tagid=%u" },
++
+ 	/* The following needs to be listed after all other options */
+ 	{ Opt_nfsvers, "v%s" },
+ 
+@@ -678,6 +687,7 @@ static void nfs_show_mount_options(struc
+ 		{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
+ 		{ NFS_MOUNT_UNSHARED, ",nosharecache", "" },
+ 		{ NFS_MOUNT_NORESVPORT, ",noresvport", "" },
++		{ NFS_MOUNT_TAGGED, ",tag", "" },
+ 		{ 0, NULL, NULL }
+ 	};
+ 	const struct proc_nfs_info *nfs_infop;
+@@ -1304,6 +1314,14 @@ static int nfs_parse_mount_options(char
+ 		case Opt_nomigration:
+ 			mnt->options &= NFS_OPTION_MIGRATION;
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			mnt->flags |= NFS_MOUNT_TAGGED;
++			break;
++		case Opt_notag:
++			mnt->flags &= ~NFS_MOUNT_TAGGED;
++			break;
++#endif
+ 
+ 		/*
+ 		 * options that take numeric values
+@@ -1390,6 +1408,12 @@ static int nfs_parse_mount_options(char
+ 				goto out_invalid_value;
+ 			mnt->minorversion = option;
+ 			break;
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			nfs_data.flags |= NFS_MOUNT_TAGGED;
++			break;
++#endif
+ 
+ 		/*
+ 		 * options that take text values
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/auth.c linux-3.7.10-vs2.3.5.6/fs/nfsd/auth.c
+--- linux-3.7.10/fs/nfsd/auth.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/auth.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2,6 +2,7 @@
+ 
+ #include <linux/sched.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_tag.h>
+ #include "nfsd.h"
+ #include "auth.h"
+ 
+@@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp,
+ 
+ 	new->fsuid = rqstp->rq_cred.cr_uid;
+ 	new->fsgid = rqstp->rq_cred.cr_gid;
++	/* FIXME: this desperately needs a tag :)
++	new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
++			*/
+ 
+ 	rqgi = rqstp->rq_cred.cr_group_info;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/nfs3xdr.c linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs3xdr.c
+--- linux-3.7.10/fs/nfsd/nfs3xdr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs3xdr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <linux/namei.h>
++#include <linux/vs_tag.h>
+ #include "xdr3.h"
+ #include "auth.h"
+ 
+@@ -95,6 +96,8 @@ static __be32 *
+ decode_sattr3(__be32 *p, struct iattr *iap)
+ {
+ 	u32	tmp;
++	uid_t	uid = 0;
++	gid_t	gid = 0;
+ 
+ 	iap->ia_valid = 0;
+ 
+@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i
+ 	}
+ 	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 = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++	iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++	iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ 	if (*p++) {
+ 		u64	newsize;
+ 
+@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __
+ 	*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,
++		TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
++		stat->uid, stat->tag)));
++	*p++ = htonl((u32) nfsd_rgid(rqstp,
++		TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */,
++		stat->gid, stat->tag)));
+ 	if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
+ 		p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
+ 	} else {
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/nfs4xdr.c linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs4xdr.c
+--- linux-3.7.10/fs/nfsd/nfs4xdr.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/nfs4xdr.c	2013-01-16 00:19:03.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include <linux/utsname.h>
+ #include <linux/pagemap.h>
+ #include <linux/sunrpc/svcauth_gss.h>
++#include <linux/vs_tag.h>
+ 
+ #include "idmap.h"
+ #include "acl.h"
+@@ -2351,14 +2352,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,
++			TAGINO_UID(DX_TAG(dentry->d_inode),
++			stat.uid, stat.tag), &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,
++			TAGINO_GID(DX_TAG(dentry->d_inode),
++			stat.gid, stat.tag), &p, &buflen);
+ 		if (status == nfserr_resource)
+ 			goto out_resource;
+ 		if (status)
+diff -NurpP --minimal linux-3.7.10/fs/nfsd/nfsxdr.c linux-3.7.10-vs2.3.5.6/fs/nfsd/nfsxdr.c
+--- linux-3.7.10/fs/nfsd/nfsxdr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/nfsd/nfsxdr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -6,6 +6,7 @@
+ 
+ #include "xdr.h"
+ #include "auth.h"
++#include <linux/vs_tag.h>
+ 
+ #define NFSDDBG_FACILITY		NFSDDBG_XDR
+ 
+@@ -88,6 +89,8 @@ static __be32 *
+ decode_sattr(__be32 *p, struct iattr *iap)
+ {
+ 	u32	tmp, tmp1;
++	uid_t	uid = 0;
++	gid_t	gid = 0;
+ 
+ 	iap->ia_valid = 0;
+ 
+@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia
+ 	}
+ 	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 = INOTAG_UID(DX_TAG_NFSD, uid, gid);
++	iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid);
++	iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0);
+ 	if ((tmp = ntohl(*p++)) != (u32)-1) {
+ 		iap->ia_valid |= ATTR_SIZE;
+ 		iap->ia_size = tmp;
+@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b
+ 	*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,
++		TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag)));
++	*p++ = htonl((u32) nfsd_rgid(rqstp,
++		TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag)));
+ 
+ 	if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
+ 		*p++ = htonl(NFS_MAXPATHLEN);
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/dlmglue.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.c
+--- linux-3.7.10/fs/ocfs2/dlmglue.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.c	2013-03-02 15:26:03.000000000 +0000
+@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+ 	lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
+ 	lvb->lvb_iuid      = cpu_to_be32(inode->i_uid);
+ 	lvb->lvb_igid      = cpu_to_be32(inode->i_gid);
++	lvb->lvb_itag      = cpu_to_be16(inode->i_tag);
+ 	lvb->lvb_imode     = cpu_to_be16(inode->i_mode);
+ 	lvb->lvb_inlink    = cpu_to_be16(inode->i_nlink);
+ 	lvb->lvb_iatime_packed  =
+@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb
+ 
+ 	inode->i_uid     = be32_to_cpu(lvb->lvb_iuid);
+ 	inode->i_gid     = be32_to_cpu(lvb->lvb_igid);
++	inode->i_tag     = be16_to_cpu(lvb->lvb_itag);
+ 	inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
+ 	set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
+ 	ocfs2_unpack_timespec(&inode->i_atime,
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/dlmglue.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.h
+--- linux-3.7.10/fs/ocfs2/dlmglue.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/dlmglue.h	2012-12-18 15:13:16.000000000 +0000
+@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
+ 	__be16       lvb_inlink;
+ 	__be32       lvb_iattr;
+ 	__be32       lvb_igeneration;
+-	__be32       lvb_reserved2;
++	__be16       lvb_itag;
++	__be16       lvb_reserved2;
+ };
+ 
+ #define OCFS2_QINFO_LVB_VERSION 1
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/file.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/file.c
+--- linux-3.7.10/fs/ocfs2/file.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/file.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
+ 		attr->ia_valid &= ~ATTR_SIZE;
+ 
+ #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \
+-			   | ATTR_GID | ATTR_UID | ATTR_MODE)
++			   | ATTR_GID | ATTR_UID | ATTR_TAG | ATTR_MODE)
+ 	if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
+ 		return 0;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/inode.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.c
+--- linux-3.7.10/fs/ocfs2/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <linux/highmem.h>
+ #include <linux/pagemap.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ 
+ #include <asm/byteorder.h>
+ 
+@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode
+ {
+ 	unsigned int flags = OCFS2_I(inode)->ip_attr;
+ 
+-	inode->i_flags &= ~(S_IMMUTABLE |
++	inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK |
+ 		S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC);
+ 
+ 	if (flags & OCFS2_IMMUTABLE_FL)
+ 		inode->i_flags |= S_IMMUTABLE;
++	if (flags & OCFS2_IXUNLINK_FL)
++		inode->i_flags |= S_IXUNLINK;
+ 
+ 	if (flags & OCFS2_SYNC_FL)
+ 		inode->i_flags |= S_SYNC;
+@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode
+ 		inode->i_flags |= S_NOATIME;
+ 	if (flags & OCFS2_DIRSYNC_FL)
+ 		inode->i_flags |= S_DIRSYNC;
++
++	inode->i_vflags &= ~(V_BARRIER | V_COW);
++
++	if (flags & OCFS2_BARRIER_FL)
++		inode->i_vflags |= V_BARRIER;
++	if (flags & OCFS2_COW_FL)
++		inode->i_vflags |= V_COW;
+ }
+ 
+ /* Propagate flags from i_flags to OCFS2_I(inode)->ip_attr */
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi)
+ {
+ 	unsigned int flags = oi->vfs_inode.i_flags;
++	unsigned int vflags = oi->vfs_inode.i_vflags;
++
++	oi->ip_attr &= ~(OCFS2_SYNC_FL | OCFS2_APPEND_FL |
++			OCFS2_IMMUTABLE_FL | OCFS2_IXUNLINK_FL |
++			OCFS2_NOATIME_FL | OCFS2_DIRSYNC_FL |
++			OCFS2_BARRIER_FL | OCFS2_COW_FL);
++
++	if (flags & S_IMMUTABLE)
++		oi->ip_attr |= OCFS2_IMMUTABLE_FL;
++	if (flags & S_IXUNLINK)
++		oi->ip_attr |= OCFS2_IXUNLINK_FL;
+ 
+-	oi->ip_attr &= ~(OCFS2_SYNC_FL|OCFS2_APPEND_FL|
+-			OCFS2_IMMUTABLE_FL|OCFS2_NOATIME_FL|OCFS2_DIRSYNC_FL);
+ 	if (flags & S_SYNC)
+ 		oi->ip_attr |= OCFS2_SYNC_FL;
+ 	if (flags & S_APPEND)
+ 		oi->ip_attr |= OCFS2_APPEND_FL;
+-	if (flags & S_IMMUTABLE)
+-		oi->ip_attr |= OCFS2_IMMUTABLE_FL;
+ 	if (flags & S_NOATIME)
+ 		oi->ip_attr |= OCFS2_NOATIME_FL;
+ 	if (flags & S_DIRSYNC)
+ 		oi->ip_attr |= OCFS2_DIRSYNC_FL;
++
++	if (vflags & V_BARRIER)
++		oi->ip_attr |= OCFS2_BARRIER_FL;
++	if (vflags & V_COW)
++		oi->ip_attr |= OCFS2_COW_FL;
+ }
+ 
+ struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno)
+@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode *
+ 	struct super_block *sb;
+ 	struct ocfs2_super *osb;
+ 	int use_plocks = 1;
++	uid_t uid;
++	gid_t gid;
+ 
+ 	sb = inode->i_sb;
+ 	osb = OCFS2_SB(sb);
+@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode *
+ 	inode->i_generation = le32_to_cpu(fe->i_generation);
+ 	inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
+ 	inode->i_mode = le16_to_cpu(fe->i_mode);
+-	inode->i_uid = le32_to_cpu(fe->i_uid);
+-	inode->i_gid = le32_to_cpu(fe->i_gid);
++	uid = le32_to_cpu(fe->i_uid);
++	gid = le32_to_cpu(fe->i_gid);
++	inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid);
++	inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid);
++	inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid,
++		/* le16_to_cpu(raw_inode->i_raw_tag)i */ 0);
+ 
+ 	/* Fast symlinks will have i_size but no allocated clusters. */
+ 	if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/inode.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.h
+--- linux-3.7.10/fs/ocfs2/inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
+ 
+ void ocfs2_set_inode_flags(struct inode *inode);
+ void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi);
++int ocfs2_sync_flags(struct inode *inode, int, int);
+ 
+ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
+ {
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/ioctl.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/ioctl.c
+--- linux-3.7.10/fs/ocfs2/ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
+ 	return status;
+ }
+ 
+-static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
++int ocfs2_sync_flags(struct inode *inode, int flags, int vflags)
++{
++	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
++	struct buffer_head *bh = NULL;
++	handle_t *handle = NULL;
++	int status;
++
++	status = ocfs2_inode_lock(inode, &bh, 1);
++	if (status < 0) {
++		mlog_errno(status);
++		return status;
++	}
++	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
++	if (IS_ERR(handle)) {
++		status = PTR_ERR(handle);
++		mlog_errno(status);
++		goto bail_unlock;
++	}
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	ocfs2_get_inode_flags(OCFS2_I(inode));
++
++	status = ocfs2_mark_inode_dirty(handle, inode, bh);
++	if (status < 0)
++		mlog_errno(status);
++
++	ocfs2_commit_trans(osb, handle);
++bail_unlock:
++	ocfs2_inode_unlock(inode, 1);
++	brelse(bh);
++	return status;
++}
++
++int ocfs2_set_inode_attr(struct inode *inode, unsigned flags,
+ 				unsigned mask)
+ {
+ 	struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode);
+@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i
+ 	if (!S_ISDIR(inode->i_mode))
+ 		flags &= ~OCFS2_DIRSYNC_FL;
+ 
++	if (IS_BARRIER(inode)) {
++		vxwprintk_task(1, "messing with the barrier.");
++		goto bail_unlock;
++	}
++
+ 	handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
+ 	if (IS_ERR(handle)) {
+ 		status = PTR_ERR(handle);
+@@ -879,6 +918,7 @@ bail:
+ 	return status;
+ }
+ 
++
+ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+ {
+ 	struct inode *inode = filp->f_path.dentry->d_inode;
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/namei.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/namei.c
+--- linux-3.7.10/fs/ocfs2/namei.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/namei.c	2012-12-18 15:13:16.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <linux/slab.h>
+ #include <linux/highmem.h>
+ #include <linux/quotaops.h>
++#include <linux/vs_tag.h>
+ 
+ #include <cluster/masklog.h>
+ 
+@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i
+ 	struct ocfs2_dinode *fe = NULL;
+ 	struct ocfs2_extent_list *fel;
+ 	u16 feat;
++	tag_t tag;
+ 
+ 	*new_fe_bh = NULL;
+ 
+@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i
+ 	fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
+ 	fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
+ 	fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
+-	fe->i_uid = cpu_to_le32(inode->i_uid);
+-	fe->i_gid = cpu_to_le32(inode->i_gid);
++
++	tag = dx_current_fstag(osb->sb);
++	fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), inode->i_uid, tag));
++	fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), inode->i_gid, tag));
++	inode->i_tag = tag;
+ 	fe->i_mode = cpu_to_le16(inode->i_mode);
+ 	if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
+ 		fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/ocfs2.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2.h
+--- linux-3.7.10/fs/ocfs2/ocfs2.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2.h	2012-12-18 15:13:16.000000000 +0000
+@@ -272,6 +272,7 @@ enum ocfs2_mount_options
+ 						     writes */
+ 	OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
+ 	OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
++	OCFS2_MOUNT_TAGGED = 1 << 15, /* use tagging */
+ };
+ 
+ #define OCFS2_OSB_SOFT_RO			0x0001
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/ocfs2_fs.h linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2_fs.h
+--- linux-3.7.10/fs/ocfs2/ocfs2_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/ocfs2_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -266,6 +266,11 @@
+ #define OCFS2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
+ #define OCFS2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
+ 
++#define OCFS2_IXUNLINK_FL		FS_IXUNLINK_FL	/* Immutable invert on unlink */
++
++#define OCFS2_BARRIER_FL		FS_BARRIER_FL	/* Barrier for chroot() */
++#define OCFS2_COW_FL			FS_COW_FL	/* Copy on Write marker */
++
+ #define OCFS2_FL_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
+ #define OCFS2_FL_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
+ 
+diff -NurpP --minimal linux-3.7.10/fs/ocfs2/super.c linux-3.7.10-vs2.3.5.6/fs/ocfs2/super.c
+--- linux-3.7.10/fs/ocfs2/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/ocfs2/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -185,6 +185,7 @@ enum {
+ 	Opt_coherency_full,
+ 	Opt_resv_level,
+ 	Opt_dir_resv_level,
++	Opt_tag, Opt_notag, Opt_tagid,
+ 	Opt_err,
+ };
+ 
+@@ -216,6 +217,9 @@ static const match_table_t tokens = {
+ 	{Opt_coherency_full, "coherency=full"},
+ 	{Opt_resv_level, "resv_level=%u"},
+ 	{Opt_dir_resv_level, "dir_resv_level=%u"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
++	{Opt_tagid, "tagid=%u"},
+ 	{Opt_err, NULL}
+ };
+ 
+@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl
+ 		goto out;
+ 	}
+ 
++	if ((osb->s_mount_opt & OCFS2_MOUNT_TAGGED) !=
++	    (parsed_options.mount_opt & OCFS2_MOUNT_TAGGED)) {
++		ret = -EINVAL;
++		mlog(ML_ERROR, "Cannot change tagging on remount\n");
++		goto out;
++	}
++
+ 	/* We're going to/from readonly mode. */
+ 	if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+ 		/* Disable quota accounting before remounting RO */
+@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super
+ 
+ 	ocfs2_complete_mount_recovery(osb);
+ 
++	if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	if (ocfs2_mount_local(osb))
+ 		snprintf(nodestr, sizeof(nodestr), "local");
+ 	else
+@@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct su
+ 			    option < OCFS2_MAX_RESV_LEVEL)
+ 				mopt->dir_resv_level = option;
+ 			break;
++#ifndef CONFIG_TAGGING_NONE
++		case Opt_tag:
++			mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++			break;
++		case Opt_notag:
++			mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
++			break;
++#endif
++#ifdef CONFIG_PROPAGATE
++		case Opt_tagid:
++			/* use args[0] */
++			mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
++			break;
++#endif
+ 		default:
+ 			mlog(ML_ERROR,
+ 			     "Unrecognized mount option \"%s\" "
+diff -NurpP --minimal linux-3.7.10/fs/open.c linux-3.7.10-vs2.3.5.6/fs/open.c
+--- linux-3.7.10/fs/open.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/open.c	2012-12-18 15:13:16.000000000 +0000
+@@ -30,6 +30,11 @@
+ #include <linux/fs_struct.h>
+ #include <linux/ima.h>
+ #include <linux/dnotify.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_cowbl.h>
++#include <linux/vserver/dlimit.h>
+ 
+ #include "internal.h"
+ 
+@@ -74,6 +79,12 @@ static long do_sys_truncate(const char _
+ 	error = user_path(pathname, &path);
+ 	if (error)
+ 		goto out;
++
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (error)
++		goto dput_and_out;
++#endif
+ 	inode = path.dentry->d_inode;
+ 
+ 	/* For directories it's -EISDIR, for other non-regulars - -EINVAL */
+@@ -492,6 +503,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
+ 
+ 	error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
+ 	if (!error) {
++#ifdef CONFIG_VSERVER_COWBL
++		error = cow_check_and_break(&path);
++		if (!error)
++#endif
+ 		error = chmod_common(&path, mode);
+ 		path_put(&path);
+ 	}
+@@ -519,13 +534,13 @@ static int chown_common(struct path *pat
+ 		if (!uid_valid(uid))
+ 			return -EINVAL;
+ 		newattrs.ia_valid |= ATTR_UID;
+-		newattrs.ia_uid = uid;
++		newattrs.ia_uid = dx_map_uid(user);
+ 	}
+ 	if (group != (gid_t) -1) {
+ 		if (!gid_valid(gid))
+ 			return -EINVAL;
+ 		newattrs.ia_valid |= ATTR_GID;
+-		newattrs.ia_gid = gid;
++		newattrs.ia_gid = dx_map_gid(group);
+ 	}
+ 	if (!S_ISDIR(inode->i_mode))
+ 		newattrs.ia_valid |=
+@@ -558,6 +573,18 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons
+ 	error = mnt_want_write(path.mnt);
+ 	if (error)
+ 		goto out_release;
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
++#ifdef CONFIG_VSERVER_COWBL
++	error = cow_check_and_break(&path);
++	if (!error)
++#endif
+ 	error = chown_common(&path, user, group);
+ 	mnt_drop_write(path.mnt);
+ out_release:
+diff -NurpP --minimal linux-3.7.10/fs/proc/array.c linux-3.7.10-vs2.3.5.6/fs/proc/array.c
+--- linux-3.7.10/fs/proc/array.c	2013-03-02 09:55:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/array.c	2013-01-16 00:19:03.000000000 +0000
+@@ -82,6 +82,8 @@
+ #include <linux/ptrace.h>
+ #include <linux/tracehook.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/processor.h>
+@@ -172,6 +174,9 @@ static inline void task_state(struct seq
+ 	rcu_read_lock();
+ 	ppid = pid_alive(p) ?
+ 		task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
++	if (unlikely(vx_current_initpid(p->pid)))
++		ppid = 0;
++
+ 	tpid = 0;
+ 	if (pid_alive(p)) {
+ 		struct task_struct *tracer = ptrace_parent(p);
+@@ -296,7 +301,7 @@ static inline void task_sig(struct seq_f
+ }
+ 
+ static void render_cap_t(struct seq_file *m, const char *header,
+-			kernel_cap_t *a)
++			struct vx_info *vxi, kernel_cap_t *a)
+ {
+ 	unsigned __capi;
+ 
+@@ -321,10 +326,11 @@ static inline void task_cap(struct seq_f
+ 	cap_bset	= cred->cap_bset;
+ 	rcu_read_unlock();
+ 
+-	render_cap_t(m, "CapInh:\t", &cap_inheritable);
+-	render_cap_t(m, "CapPrm:\t", &cap_permitted);
+-	render_cap_t(m, "CapEff:\t", &cap_effective);
+-	render_cap_t(m, "CapBnd:\t", &cap_bset);
++	/* FIXME: maybe move the p->vx_info masking to __task_cred() ? */
++	render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable);
++	render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted);
++	render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective);
++	render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset);
+ }
+ 
+ static inline void task_context_switch_counts(struct seq_file *m,
+@@ -346,6 +352,42 @@ static void task_cpus_allowed(struct seq
+ 	seq_putc(m, '\n');
+ }
+ 
++int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++			struct pid *pid, struct task_struct *task)
++{
++	seq_printf(m,	"Proxy:\t%p(%c)\n"
++			"Count:\t%u\n"
++			"uts:\t%p(%c)\n"
++			"ipc:\t%p(%c)\n"
++			"mnt:\t%p(%c)\n"
++			"pid:\t%p(%c)\n"
++			"net:\t%p(%c)\n",
++			task->nsproxy,
++			(task->nsproxy == init_task.nsproxy ? 'I' : '-'),
++			atomic_read(&task->nsproxy->count),
++			task->nsproxy->uts_ns,
++			(task->nsproxy->uts_ns == init_task.nsproxy->uts_ns ? 'I' : '-'),
++			task->nsproxy->ipc_ns,
++			(task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'),
++			task->nsproxy->mnt_ns,
++			(task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'),
++			task->nsproxy->pid_ns,
++			(task->nsproxy->pid_ns == init_task.nsproxy->pid_ns ? 'I' : '-'),
++			task->nsproxy->net_ns,
++			(task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-'));
++	return 0;
++}
++
++void task_vs_id(struct seq_file *m, struct task_struct *task)
++{
++	if (task_vx_flags(task, VXF_HIDE_VINFO, 0))
++		return;
++
++	seq_printf(m, "VxID: %d\n", vx_task_xid(task));
++	seq_printf(m, "NxID: %d\n", nx_task_nid(task));
++}
++
++
+ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+ 			struct pid *pid, struct task_struct *task)
+ {
+@@ -362,6 +404,7 @@ int proc_pid_status(struct seq_file *m,
+ 	task_cap(m, task);
+ 	task_cpus_allowed(m, task);
+ 	cpuset_task_status_allowed(m, task);
++	task_vs_id(m, task);
+ 	task_context_switch_counts(m, task);
+ 	return 0;
+ }
+@@ -471,6 +514,17 @@ static int do_task_stat(struct seq_file
+ 	/* 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;
++	}
++
+ 	seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
+ 	seq_put_decimal_ll(m, ' ', ppid);
+ 	seq_put_decimal_ll(m, ' ', pgid);
+diff -NurpP --minimal linux-3.7.10/fs/proc/base.c linux-3.7.10-vs2.3.5.6/fs/proc/base.c
+--- linux-3.7.10/fs/proc/base.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/base.c	2012-12-18 15:13:16.000000000 +0000
+@@ -85,6 +85,8 @@
+ #include <linux/fs_struct.h>
+ #include <linux/slab.h>
+ #include <linux/flex_array.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ #ifdef CONFIG_HARDWALL
+ #include <asm/hardwall.h>
+ #endif
+@@ -950,11 +952,15 @@ static ssize_t oom_adj_write(struct file
+ 		oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
+ 
+ 	if (oom_adj < task->signal->oom_score_adj &&
+-	    !capable(CAP_SYS_RESOURCE)) {
++	    !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) {
+ 		err = -EACCES;
+ 		goto err_sighand;
+ 	}
+ 
++	/* prevent guest processes from circumventing the oom killer */
++	if (vx_current_xid() && (oom_adj == OOM_DISABLE))
++		oom_adj = OOM_ADJUST_MIN;
++
+ 	/*
+ 	 * /proc/pid/oom_adj is provided for legacy purposes, ask users to use
+ 	 * /proc/pid/oom_score_adj instead.
+@@ -1534,6 +1540,8 @@ struct inode *proc_pid_make_inode(struct
+ 		inode->i_gid = cred->egid;
+ 		rcu_read_unlock();
+ 	}
++	/* procfs is xid tagged */
++	i_tag_write(inode, (tag_t)vx_task_xid(task));
+ 	security_task_to_inode(task, inode);
+ 
+ out:
+@@ -1579,6 +1587,8 @@ int pid_getattr(struct vfsmount *mnt, st
+ 
+ /* dentry stuff */
+ 
++static unsigned name_to_int(struct dentry *dentry);
++
+ /*
+  *	Exceptional case: normally we are not allowed to unhash a busy
+  * directory. In this case, however, we can do it - no aliasing problems
+@@ -1607,6 +1617,12 @@ int pid_revalidate(struct dentry *dentry
+ 	task = get_proc_task(inode);
+ 
+ 	if (task) {
++		unsigned pid = name_to_int(dentry);
++
++		if (pid != ~0U && pid != vx_map_pid(task->pid)) {
++			put_task_struct(task);
++			goto drop;
++		}
+ 		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
+ 		    task_dumpable(task)) {
+ 			rcu_read_lock();
+@@ -1623,6 +1639,7 @@ int pid_revalidate(struct dentry *dentry
+ 		put_task_struct(task);
+ 		return 1;
+ 	}
++drop:
+ 	d_drop(dentry);
+ 	return 0;
+ }
+@@ -2065,6 +2082,13 @@ static struct dentry *proc_pident_lookup
+ 	if (!task)
+ 		goto out_no_task;
+ 
++	/* TODO: maybe we can come up with a generic approach? */
++	if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
++		(dentry->d_name.len == 5) &&
++		(!memcmp(dentry->d_name.name, "vinfo", 5) ||
++		!memcmp(dentry->d_name.name, "ninfo", 5)))
++		goto out;
++
+ 	/*
+ 	 * Yes, it does not scale. And it should not. Don't add
+ 	 * new entries into /proc/<tgid>/ without very good reasons.
+@@ -2451,7 +2475,7 @@ out_iput:
+ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
+ {
+ 	struct dentry *error;
+-	struct task_struct *task = get_proc_task(dir);
++	struct task_struct *task = get_proc_task_real(dir);
+ 	const struct pid_entry *p, *last;
+ 
+ 	error = ERR_PTR(-ENOENT);
+@@ -2639,6 +2663,9 @@ static int proc_pid_personality(struct s
+ static const struct file_operations proc_task_operations;
+ static const struct inode_operations proc_task_inode_operations;
+ 
++extern int proc_pid_vx_info(struct task_struct *, char *);
++extern int proc_pid_nx_info(struct task_struct *, char *);
++
+ static const struct pid_entry tgid_base_stuff[] = {
+ 	DIR("task",       S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
+ 	DIR("fd",         S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
+@@ -2705,6 +2732,8 @@ static const struct pid_entry tgid_base_
+ #ifdef CONFIG_CGROUPS
+ 	REG("cgroup",  S_IRUGO, proc_cgroup_operations),
+ #endif
++	INF("vinfo",      S_IRUGO, proc_pid_vx_info),
++	INF("ninfo",	  S_IRUGO, proc_pid_nx_info),
+ 	INF("oom_score",  S_IRUGO, proc_oom_score),
+ 	REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adj_operations),
+ 	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
+@@ -2729,6 +2758,7 @@ static const struct pid_entry tgid_base_
+ 	REG("gid_map",    S_IRUGO|S_IWUSR, proc_gid_map_operations),
+ 	REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
+ #endif
++	ONE("nsproxy",	S_IRUGO, proc_pid_nsproxy),
+ };
+ 
+ static int proc_tgid_base_readdir(struct file * filp,
+@@ -2923,7 +2953,7 @@ retry:
+ 	iter.task = NULL;
+ 	pid = find_ge_pid(iter.tgid, ns);
+ 	if (pid) {
+-		iter.tgid = pid_nr_ns(pid, ns);
++		iter.tgid = pid_unmapped_nr_ns(pid, ns);
+ 		iter.task = pid_task(pid, PIDTYPE_PID);
+ 		/* What we to know is if the pid we have find is the
+ 		 * pid of a thread_group_leader.  Testing for task
+@@ -2953,7 +2983,7 @@ static int proc_pid_fill_cache(struct fi
+ 	struct tgid_iter iter)
+ {
+ 	char name[PROC_NUMBUF];
+-	int len = snprintf(name, sizeof(name), "%d", iter.tgid);
++	int len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid));
+ 	return proc_fill_cache(filp, dirent, filldir, name, len,
+ 				proc_pid_instantiate, iter.task, NULL);
+ }
+@@ -2977,7 +3007,7 @@ int proc_pid_readdir(struct file * filp,
+ 		goto out_no_task;
+ 	nr = filp->f_pos - FIRST_PROCESS_ENTRY;
+ 
+-	reaper = get_proc_task(filp->f_path.dentry->d_inode);
++	reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
+ 	if (!reaper)
+ 		goto out_no_task;
+ 
+@@ -2999,6 +3029,8 @@ int proc_pid_readdir(struct file * filp,
+ 			__filldir = fake_filldir;
+ 
+ 		filp->f_pos = iter.tgid + TGID_OFFSET;
++		if (!vx_proc_task_visible(iter.task))
++			continue;
+ 		if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
+ 			put_task_struct(iter.task);
+ 			goto out;
+@@ -3161,6 +3193,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;
+ 
+ 	ns = dentry->d_sb->s_fs_info;
+ 	rcu_read_lock();
+diff -NurpP --minimal linux-3.7.10/fs/proc/generic.c linux-3.7.10-vs2.3.5.6/fs/proc/generic.c
+--- linux-3.7.10/fs/proc/generic.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/generic.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/bitops.h>
+ #include <linux/spinlock.h>
+ #include <linux/completion.h>
++#include <linux/vserver/inode.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro
+ 	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)) {
+ 			pde_get(de);
+ 			spin_unlock(&proc_subdir_lock);
+ 			error = -ENOMEM;
+ 			inode = proc_get_inode(dir->i_sb, de);
++			/* generic proc entries belong to the host */
++			i_tag_write(inode, 0);
+ 			goto out_unlock;
+ 		}
+ 	}
+@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr
+ 
+ 				/* filldir passes info to user space */
+ 				pde_get(de);
++				if (!vx_hide_check(0, de->vx_flags))
++					goto skip;
+ 				spin_unlock(&proc_subdir_lock);
+ 				if (filldir(dirent, de->name, de->namelen, filp->f_pos,
+ 					    de->low_ino, de->mode >> 12) < 0) {
+@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr
+ 					goto out;
+ 				}
+ 				spin_lock(&proc_subdir_lock);
++			skip:
+ 				filp->f_pos++;
+ 				next = de->next;
+ 				pde_put(de);
+@@ -625,6 +633,7 @@ static struct proc_dir_entry *__proc_cre
+ 	ent->namelen = len;
+ 	ent->mode = mode;
+ 	ent->nlink = nlink;
++	ent->vx_flags = IATTR_PROC_DEFAULT;
+ 	atomic_set(&ent->count, 1);
+ 	spin_lock_init(&ent->pde_unload_lock);
+ 	INIT_LIST_HEAD(&ent->pde_openers);
+@@ -648,7 +657,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;
+diff -NurpP --minimal linux-3.7.10/fs/proc/inode.c linux-3.7.10-vs2.3.5.6/fs/proc/inode.c
+--- linux-3.7.10/fs/proc/inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -457,6 +457,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)
+diff -NurpP --minimal linux-3.7.10/fs/proc/internal.h linux-3.7.10-vs2.3.5.6/fs/proc/internal.h
+--- linux-3.7.10/fs/proc/internal.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/internal.h	2012-12-18 15:13:16.000000000 +0000
+@@ -11,6 +11,8 @@
+ 
+ #include <linux/sched.h>
+ #include <linux/proc_fs.h>
++#include <linux/vs_pid.h>
++
+ struct  ctl_table_header;
+ struct  mempolicy;
+ 
+@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi
+ 				struct pid *pid, struct task_struct *task);
+ extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+ 				struct pid *pid, struct task_struct *task);
++extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++				struct pid *pid, struct task_struct *task);
++
+ extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
+ 
+ extern const struct file_operations proc_tid_children_operations;
+@@ -87,11 +92,16 @@ static inline struct pid *proc_pid(struc
+ 	return PROC_I(inode)->pid;
+ }
+ 
+-static inline struct task_struct *get_proc_task(struct inode *inode)
++static inline struct task_struct *get_proc_task_real(struct inode *inode)
+ {
+ 	return get_pid_task(proc_pid(inode), PIDTYPE_PID);
+ }
+ 
++static inline struct task_struct *get_proc_task(struct inode *inode)
++{
++	return vx_get_proc_task(inode, proc_pid(inode));
++}
++
+ static inline int proc_fd(struct inode *inode)
+ {
+ 	return PROC_I(inode)->fd;
+diff -NurpP --minimal linux-3.7.10/fs/proc/loadavg.c linux-3.7.10-vs2.3.5.6/fs/proc/loadavg.c
+--- linux-3.7.10/fs/proc/loadavg.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/loadavg.c	2012-12-18 15:13:16.000000000 +0000
+@@ -12,15 +12,27 @@
+ 
+ static int loadavg_proc_show(struct seq_file *m, void *v)
+ {
++	unsigned long running;
++	unsigned int threads;
+ 	unsigned long avnrun[3];
+ 
+ 	get_avenrun(avnrun, FIXED_1/200, 0);
+ 
++	if (vx_flags(VXF_VIRT_LOAD, 0)) {
++		struct vx_info *vxi = current_vx_info();
++
++		running = atomic_read(&vxi->cvirt.nr_running);
++		threads = atomic_read(&vxi->cvirt.nr_threads);
++	} else {
++		running = nr_running();
++		threads = nr_threads;
++	}
++
+ 	seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n",
+ 		LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]),
+ 		LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]),
+ 		LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]),
+-		nr_running(), nr_threads,
++		running, threads,
+ 		task_active_pid_ns(current)->last_pid);
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/fs/proc/meminfo.c linux-3.7.10-vs2.3.5.6/fs/proc/meminfo.c
+--- linux-3.7.10/fs/proc/meminfo.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/meminfo.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
+ 	allowed = ((totalram_pages - hugetlb_total_pages())
+ 		* sysctl_overcommit_ratio / 100) + total_swap_pages;
+ 
+-	cached = global_page_state(NR_FILE_PAGES) -
++	cached = vx_flags(VXF_VIRT_MEM, 0) ?
++		vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) -
+ 			total_swapcache_pages - i.bufferram;
+ 	if (cached < 0)
+ 		cached = 0;
+diff -NurpP --minimal linux-3.7.10/fs/proc/root.c linux-3.7.10-vs2.3.5.6/fs/proc/root.c
+--- linux-3.7.10/fs/proc/root.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/root.c	2012-12-18 15:13:16.000000000 +0000
+@@ -19,9 +19,14 @@
+ #include <linux/mount.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/parser.h>
++#include <linux/vserver/inode.h>
+ 
+ #include "internal.h"
+ 
++struct proc_dir_entry *proc_virtual;
++
++extern void proc_vx_init(void);
++
+ static int proc_test_super(struct super_block *sb, void *data)
+ {
+ 	return sb->s_fs_info == data;
+@@ -189,6 +194,7 @@ void __init proc_root_init(void)
+ #endif
+ 	proc_mkdir("bus", NULL);
+ 	proc_sys_init();
++	proc_vx_init();
+ }
+ 
+ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
+@@ -255,6 +261,7 @@ struct proc_dir_entry proc_root = {
+ 	.proc_iops	= &proc_root_inode_operations, 
+ 	.proc_fops	= &proc_root_operations,
+ 	.parent		= &proc_root,
++	.vx_flags	= IATTR_ADMIN | IATTR_WATCH,
+ 	.name		= "/proc",
+ };
+ 
+diff -NurpP --minimal linux-3.7.10/fs/proc/stat.c linux-3.7.10-vs2.3.5.6/fs/proc/stat.c
+--- linux-3.7.10/fs/proc/stat.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/stat.c	2012-12-18 15:13:16.000000000 +0000
+@@ -9,8 +9,10 @@
+ #include <linux/slab.h>
+ #include <linux/time.h>
+ #include <linux/irqnr.h>
++#include <linux/vserver/cvirt.h>
+ #include <asm/cputime.h>
+ #include <linux/tick.h>
++#include <linux/cpuset.h>
+ 
+ #ifndef arch_irq_stat_cpu
+ #define arch_irq_stat_cpu(cpu) 0
+@@ -87,14 +89,26 @@ static int show_stat(struct seq_file *p,
+ 	u64 sum_softirq = 0;
+ 	unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
+ 	struct timespec boottime;
++	cpumask_var_t cpus_allowed;
++	bool virt_cpu = vx_flags(VXF_VIRT_CPU, 0);
+ 
+ 	user = nice = system = idle = iowait =
+ 		irq = softirq = steal = 0;
+ 	guest = guest_nice = 0;
+ 	getboottime(&boottime);
++
++	if (vx_flags(VXF_VIRT_UPTIME, 0))
++		vx_vsi_boottime(&boottime);
++
++	if (virt_cpu)
++		cpuset_cpus_allowed(current, cpus_allowed);
++
+ 	jif = boottime.tv_sec;
+ 
+ 	for_each_possible_cpu(i) {
++		if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
++			continue;
++
+ 		user += kcpustat_cpu(i).cpustat[CPUTIME_USER];
+ 		nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
+ 		system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
+@@ -131,6 +145,9 @@ static int show_stat(struct seq_file *p,
+ 	seq_putc(p, '\n');
+ 
+ 	for_each_online_cpu(i) {
++		if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed))
++			continue;
++
+ 		/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
+ 		user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
+ 		nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
+diff -NurpP --minimal linux-3.7.10/fs/proc/uptime.c linux-3.7.10-vs2.3.5.6/fs/proc/uptime.c
+--- linux-3.7.10/fs/proc/uptime.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc/uptime.c	2012-12-18 15:13:16.000000000 +0000
+@@ -5,6 +5,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/time.h>
+ #include <linux/kernel_stat.h>
++#include <linux/vserver/cvirt.h>
+ #include <asm/cputime.h>
+ 
+ static int uptime_proc_show(struct seq_file *m, void *v)
+@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f
+ 	nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC;
+ 	idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
+ 	idle.tv_nsec = rem;
++
++	if (vx_flags(VXF_VIRT_UPTIME, 0))
++		vx_vsi_uptime(&uptime, &idle);
++
+ 	seq_printf(m, "%lu.%02lu %lu.%02lu\n",
+ 			(unsigned long) uptime.tv_sec,
+ 			(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
+diff -NurpP --minimal linux-3.7.10/fs/proc_namespace.c linux-3.7.10-vs2.3.5.6/fs/proc_namespace.c
+--- linux-3.7.10/fs/proc_namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/proc_namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
+ 		{ MS_SYNCHRONOUS, ",sync" },
+ 		{ MS_DIRSYNC, ",dirsync" },
+ 		{ MS_MANDLOCK, ",mand" },
++		{ MS_TAGGED, ",tag" },
++		{ MS_NOTAGCHECK, ",notagcheck" },
+ 		{ 0, NULL }
+ 	};
+ 	const struct proc_fs_info *fs_infop;
+@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil
+ 	seq_escape(m, s, " \t\n\\");
+ }
+ 
++#ifdef	CONFIG_VSERVER_EXTRA_MNT_CHECK
++
++static int mnt_is_reachable(struct vfsmount *vfsmnt)
++{
++	struct path root;
++	struct dentry *point;
++	struct mount *mnt = real_mount(vfsmnt);
++	struct mount *root_mnt;
++	int ret;
++
++	if (mnt == mnt->mnt_ns->root)
++		return 1;
++
++	br_read_lock(&vfsmount_lock);
++	root = current->fs->root;
++	root_mnt = real_mount(root.mnt);
++	point = root.dentry;
++
++	while ((mnt != mnt->mnt_parent) && (mnt != root_mnt)) {
++		point = mnt->mnt_mountpoint;
++		mnt = mnt->mnt_parent;
++	}
++
++	ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
++
++	br_read_unlock(&vfsmount_lock);
++
++	return ret;
++}
++
++#else
++#define	mnt_is_reachable(v)	(1)
++#endif
++
+ static void show_type(struct seq_file *m, struct super_block *sb)
+ {
+ 	mangle(m, sb->s_type->name);
+@@ -96,6 +132,17 @@ static int show_vfsmnt(struct seq_file *
+ 	struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
+ 	struct super_block *sb = mnt_path.dentry->d_sb;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
++	if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++		mnt == current->fs->root.mnt) {
++		seq_puts(m, "/dev/root / ");
++		goto type;
++	}
++
+ 	if (sb->s_op->show_devname) {
+ 		err = sb->s_op->show_devname(m, mnt_path.dentry);
+ 		if (err)
+@@ -106,6 +153,7 @@ static int show_vfsmnt(struct seq_file *
+ 	seq_putc(m, ' ');
+ 	seq_path(m, &mnt_path, " \t\n\\");
+ 	seq_putc(m, ' ');
++type:
+ 	show_type(m, sb);
+ 	seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
+ 	err = show_sb_opts(m, sb);
+@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil
+ 	struct path root = p->root;
+ 	int err = 0;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
+ 	seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
+ 		   MAJOR(sb->s_dev), MINOR(sb->s_dev));
+ 	if (sb->s_op->show_path)
+@@ -187,6 +240,17 @@ static int show_vfsstat(struct seq_file
+ 	struct super_block *sb = mnt_path.dentry->d_sb;
+ 	int err = 0;
+ 
++	if (vx_flags(VXF_HIDE_MOUNT, 0))
++		return SEQ_SKIP;
++	if (!mnt_is_reachable(mnt) && !vx_check(0, VS_WATCH_P))
++		return SEQ_SKIP;
++
++	if (!vx_check(0, VS_ADMIN|VS_WATCH) &&
++		mnt == current->fs->root.mnt) {
++		seq_puts(m, "device /dev/root mounted on / ");
++		goto type;
++	}
++
+ 	/* device */
+ 	if (sb->s_op->show_devname) {
+ 		seq_puts(m, "device ");
+@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file
+ 	seq_puts(m, " mounted on ");
+ 	seq_path(m, &mnt_path, " \t\n\\");
+ 	seq_putc(m, ' ');
+-
++type:
+ 	/* file system type */
+ 	seq_puts(m, "with fstype ");
+ 	show_type(m, sb);
+diff -NurpP --minimal linux-3.7.10/fs/quota/dquot.c linux-3.7.10-vs2.3.5.6/fs/quota/dquot.c
+--- linux-3.7.10/fs/quota/dquot.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/quota/dquot.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1582,6 +1582,9 @@ int __dquot_alloc_space(struct inode *in
+ 	struct dquot **dquots = inode->i_dquot;
+ 	int reserve = flags & DQUOT_SPACE_RESERVE;
+ 
++	if ((ret = dl_alloc_space(inode, number)))
++		return ret;
++
+ 	/*
+ 	 * First test before acquiring mutex - solves deadlocks when we
+ 	 * re-enter the quota code and are already holding the mutex
+@@ -1637,6 +1640,9 @@ int dquot_alloc_inode(const struct inode
+ 	struct dquot_warn warn[MAXQUOTAS];
+ 	struct dquot * const *dquots = inode->i_dquot;
+ 
++	if ((ret = dl_alloc_inode(inode)))
++		return ret;
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode))
+@@ -1708,6 +1714,8 @@ void __dquot_free_space(struct inode *in
+ 	struct dquot **dquots = inode->i_dquot;
+ 	int reserve = flags & DQUOT_SPACE_RESERVE;
+ 
++	dl_free_space(inode, number);
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode)) {
+@@ -1752,6 +1760,8 @@ void dquot_free_inode(const struct inode
+ 	struct dquot_warn warn[MAXQUOTAS];
+ 	struct dquot * const *dquots = inode->i_dquot;
+ 
++	dl_free_inode(inode);
++
+ 	/* First test before acquiring mutex - solves deadlocks when we
+          * re-enter the quota code and are already holding the mutex */
+ 	if (!dquot_active(inode))
+diff -NurpP --minimal linux-3.7.10/fs/quota/quota.c linux-3.7.10-vs2.3.5.6/fs/quota/quota.c
+--- linux-3.7.10/fs/quota/quota.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/quota/quota.c	2012-12-18 15:13:16.000000000 +0000
+@@ -8,6 +8,7 @@
+ #include <linux/fs.h>
+ #include <linux/namei.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
+ #include <asm/current.h>
+ #include <linux/uaccess.h>
+ #include <linux/kernel.h>
+@@ -37,7 +38,7 @@ static int check_quotactl_permission(str
+ 			break;
+ 		/*FALLTHROUGH*/
+ 	default:
+-		if (!capable(CAP_SYS_ADMIN))
++		if (!vx_capable(CAP_SYS_ADMIN, VXC_QUOTA_CTL))
+ 			return -EPERM;
+ 	}
+ 
+@@ -307,6 +308,46 @@ static int do_quotactl(struct super_bloc
+ 	}
+ }
+ 
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++
++#include <linux/vroot.h>
++#include <linux/major.h>
++#include <linux/module.h>
++#include <linux/kallsyms.h>
++#include <linux/vserver/debug.h>
++
++static vroot_grb_func *vroot_get_real_bdev = NULL;
++
++static DEFINE_SPINLOCK(vroot_grb_lock);
++
++int register_vroot_grb(vroot_grb_func *func) {
++	int ret = -EBUSY;
++
++	spin_lock(&vroot_grb_lock);
++	if (!vroot_get_real_bdev) {
++		vroot_get_real_bdev = func;
++		ret = 0;
++	}
++	spin_unlock(&vroot_grb_lock);
++	return ret;
++}
++EXPORT_SYMBOL(register_vroot_grb);
++
++int unregister_vroot_grb(vroot_grb_func *func) {
++	int ret = -EINVAL;
++
++	spin_lock(&vroot_grb_lock);
++	if (vroot_get_real_bdev) {
++		vroot_get_real_bdev = NULL;
++		ret = 0;
++	}
++	spin_unlock(&vroot_grb_lock);
++	return ret;
++}
++EXPORT_SYMBOL(unregister_vroot_grb);
++
++#endif
++
+ /* Return 1 if 'cmd' will block on frozen filesystem */
+ static int quotactl_cmd_write(int cmd)
+ {
+@@ -339,6 +380,22 @@ static struct super_block *quotactl_bloc
+ 	putname(tmp);
+ 	if (IS_ERR(bdev))
+ 		return ERR_CAST(bdev);
++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE)
++	if (bdev && bdev->bd_inode &&
++		imajor(bdev->bd_inode) == VROOT_MAJOR) {
++		struct block_device *bdnew = (void *)-EINVAL;
++
++		if (vroot_get_real_bdev)
++			bdnew = vroot_get_real_bdev(bdev);
++		else
++			vxdprintk(VXD_CBIT(misc, 0),
++					"vroot_get_real_bdev not set");
++		bdput(bdev);
++		if (IS_ERR(bdnew))
++			return ERR_PTR(PTR_ERR(bdnew));
++		bdev = bdnew;
++	}
++#endif
+ 	if (quotactl_cmd_write(cmd))
+ 		sb = get_super_thawed(bdev);
+ 	else
+diff -NurpP --minimal linux-3.7.10/fs/stat.c linux-3.7.10-vs2.3.5.6/fs/stat.c
+--- linux-3.7.10/fs/stat.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/stat.c	2012-12-18 15:13:16.000000000 +0000
+@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
+ 	stat->nlink = inode->i_nlink;
+ 	stat->uid = inode->i_uid;
+ 	stat->gid = inode->i_gid;
++	stat->tag = inode->i_tag;
+ 	stat->rdev = inode->i_rdev;
+ 	stat->size = i_size_read(inode);
+ 	stat->atime = inode->i_atime;
+diff -NurpP --minimal linux-3.7.10/fs/statfs.c linux-3.7.10-vs2.3.5.6/fs/statfs.c
+--- linux-3.7.10/fs/statfs.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/statfs.c	2012-12-18 15:13:16.000000000 +0000
+@@ -7,6 +7,8 @@
+ #include <linux/statfs.h>
+ #include <linux/security.h>
+ #include <linux/uaccess.h>
++#include <linux/vs_base.h>
++#include <linux/vs_dlimit.h>
+ #include "internal.h"
+ 
+ static int flags_by_mnt(int mnt_flags)
+@@ -60,6 +62,8 @@ static int statfs_by_dentry(struct dentr
+ 	retval = dentry->d_sb->s_op->statfs(dentry, buf);
+ 	if (retval == 0 && buf->f_frsize == 0)
+ 		buf->f_frsize = buf->f_bsize;
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		vx_vsi_statfs(dentry->d_sb, buf);
+ 	return retval;
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/fs/super.c linux-3.7.10-vs2.3.5.6/fs/super.c
+--- linux-3.7.10/fs/super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -34,6 +34,8 @@
+ #include <linux/cleancache.h>
+ #include <linux/fsnotify.h>
+ #include <linux/lockdep.h>
++#include <linux/magic.h>
++#include <linux/vs_context.h>
+ #include "internal.h"
+ 
+ 
+@@ -1119,6 +1121,13 @@ mount_fs(struct file_system_type *type,
+ 	WARN_ON(sb->s_bdi == &default_backing_dev_info);
+ 	sb->s_flags |= MS_BORN;
+ 
++	error = -EPERM;
++	if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) &&
++		!sb->s_bdev &&
++		(sb->s_magic != PROC_SUPER_MAGIC) &&
++		(sb->s_magic != DEVPTS_SUPER_MAGIC))
++		goto out_sb;
++
+ 	error = security_sb_kern_mount(sb, flags, secdata);
+ 	if (error)
+ 		goto out_sb;
+diff -NurpP --minimal linux-3.7.10/fs/sysfs/mount.c linux-3.7.10-vs2.3.5.6/fs/sysfs/mount.c
+--- linux-3.7.10/fs/sysfs/mount.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/sysfs/mount.c	2012-12-18 15:13:16.000000000 +0000
+@@ -47,7 +47,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;
+ 
+diff -NurpP --minimal linux-3.7.10/fs/utimes.c linux-3.7.10-vs2.3.5.6/fs/utimes.c
+--- linux-3.7.10/fs/utimes.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/utimes.c	2012-12-18 15:13:16.000000000 +0000
+@@ -8,6 +8,8 @@
+ #include <linux/stat.h>
+ #include <linux/utime.h>
+ #include <linux/syscalls.h>
++#include <linux/mount.h>
++#include <linux/vs_cowbl.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+ 
+@@ -52,12 +54,18 @@ static int utimes_common(struct path *pa
+ {
+ 	int error;
+ 	struct iattr newattrs;
+-	struct inode *inode = path->dentry->d_inode;
++	struct inode *inode;
+ 
+ 	error = mnt_want_write(path->mnt);
+ 	if (error)
+ 		goto out;
+ 
++	error = cow_check_and_break(path);
++	if (error)
++		goto mnt_drop_write_and_out;
++
++	inode = path->dentry->d_inode;
++
+ 	if (times && times[0].tv_nsec == UTIME_NOW &&
+ 		     times[1].tv_nsec == UTIME_NOW)
+ 		times = NULL;
+diff -NurpP --minimal linux-3.7.10/fs/xattr.c linux-3.7.10-vs2.3.5.6/fs/xattr.c
+--- linux-3.7.10/fs/xattr.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xattr.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/audit.h>
+ #include <linux/vmalloc.h>
+ #include <linux/posix_acl_xattr.h>
++#include <linux/mount.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -52,7 +53,7 @@ xattr_permission(struct inode *inode, co
+ 	 * The trusted.* namespace can only be accessed by privileged users.
+ 	 */
+ 	if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) {
+-		if (!capable(CAP_SYS_ADMIN))
++		if (!vx_capable(CAP_SYS_ADMIN, VXC_FS_TRUSTED))
+ 			return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
+ 		return 0;
+ 	}
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_dinode.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_dinode.h
+--- linux-3.7.10/fs/xfs/xfs_dinode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_dinode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
+ 	__be32		di_nlink;	/* number of links to file */
+ 	__be16		di_projid_lo;	/* lower part of owner's project id */
+ 	__be16		di_projid_hi;	/* higher part owner's project id */
+-	__u8		di_pad[6];	/* unused, zeroed space */
++	__u8		di_pad[2];	/* unused, zeroed space */
++	__be16		di_tag;		/* context tagging */
++	__be16		di_vflags;	/* vserver specific flags */
+ 	__be16		di_flushiter;	/* incremented on flush */
+ 	xfs_timestamp_t	di_atime;	/* time last accessed */
+ 	xfs_timestamp_t	di_mtime;	/* time last modified */
+@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s
+ #define XFS_DIFLAG_EXTSZINHERIT_BIT 12	/* inherit inode extent size */
+ #define XFS_DIFLAG_NODEFRAG_BIT     13	/* do not reorganize/defragment */
+ #define XFS_DIFLAG_FILESTREAM_BIT   14  /* use filestream allocator */
++#define XFS_DIFLAG_IXUNLINK_BIT     15	/* Immutable inver on 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)
+@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s
+ #define XFS_DIFLAG_EXTSZINHERIT  (1 << XFS_DIFLAG_EXTSZINHERIT_BIT)
+ #define XFS_DIFLAG_NODEFRAG      (1 << XFS_DIFLAG_NODEFRAG_BIT)
+ #define XFS_DIFLAG_FILESTREAM    (1 << XFS_DIFLAG_FILESTREAM_BIT)
++#define XFS_DIFLAG_IXUNLINK      (1 << XFS_DIFLAG_IXUNLINK_BIT)
+ 
+ #ifdef CONFIG_XFS_RT
+ #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME)
+@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s
+ 	 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_EXTSIZE | \
+-	 XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM)
++	 XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \
++	 XFS_DIFLAG_IXUNLINK)
++
++#define XFS_DIVFLAG_BARRIER	0x01
++#define XFS_DIVFLAG_COW		0x02
+ 
+ #endif	/* __XFS_DINODE_H__ */
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_fs.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_fs.h
+--- linux-3.7.10/fs/xfs/xfs_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -67,6 +67,9 @@ struct fsxattr {
+ #define XFS_XFLAG_EXTSZINHERIT	0x00001000	/* inherit inode extent size */
+ #define XFS_XFLAG_NODEFRAG	0x00002000  	/* do not defragment */
+ #define XFS_XFLAG_FILESTREAM	0x00004000	/* use filestream allocator */
++#define XFS_XFLAG_IXUNLINK	0x00008000	/* immutable invert on unlink */
++#define XFS_XFLAG_BARRIER	0x10000000	/* chroot() barrier */
++#define XFS_XFLAG_COW		0x20000000	/* copy on write mark */
+ #define XFS_XFLAG_HASATTR	0x80000000	/* no DIFLAG for this	*/
+ 
+ /*
+@@ -302,7 +305,8 @@ typedef struct xfs_bstat {
+ #define	bs_projid	bs_projid_lo	/* (previously just bs_projid)	*/
+ 	__u16		bs_forkoff;	/* inode fork offset in bytes	*/
+ 	__u16		bs_projid_hi;	/* higher part of project id	*/
+-	unsigned char	bs_pad[10];	/* pad space, unused		*/
++	unsigned char	bs_pad[8];	/* pad space, unused		*/
++	__u16		bs_tag;		/* context tagging		*/
+ 	__u32		bs_dmevmask;	/* DMIG event mask		*/
+ 	__u16		bs_dmstate;	/* DMIG state info		*/
+ 	__u16		bs_aextents;	/* attribute number of extents	*/
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_ialloc.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ialloc.c
+--- linux-3.7.10/fs/xfs/xfs_ialloc.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ialloc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -37,7 +37,6 @@
+ #include "xfs_error.h"
+ #include "xfs_bmap.h"
+ 
+-
+ /*
+  * Allocation group level functions.
+  */
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_inode.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.c
+--- linux-3.7.10/fs/xfs/xfs_inode.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ #include <linux/log2.h>
++#include <linux/vs_tag.h>
+ 
+ #include "xfs.h"
+ #include "xfs_fs.h"
+@@ -563,15 +564,25 @@ xfs_iformat_btree(
+ STATIC void
+ xfs_dinode_from_disk(
+ 	xfs_icdinode_t		*to,
+-	xfs_dinode_t		*from)
++	xfs_dinode_t		*from,
++	int			tagged)
+ {
++	uint32_t uid, gid, tag;
++
+ 	to->di_magic = be16_to_cpu(from->di_magic);
+ 	to->di_mode = be16_to_cpu(from->di_mode);
+ 	to->di_version = from ->di_version;
+ 	to->di_format = from->di_format;
+ 	to->di_onlink = be16_to_cpu(from->di_onlink);
+-	to->di_uid = be32_to_cpu(from->di_uid);
+-	to->di_gid = be32_to_cpu(from->di_gid);
++
++	uid = be32_to_cpu(from->di_uid);
++	gid = be32_to_cpu(from->di_gid);
++	tag = be16_to_cpu(from->di_tag);
++
++	to->di_uid = INOTAG_UID(tagged, uid, gid);
++	to->di_gid = INOTAG_GID(tagged, uid, gid);
++	to->di_tag = INOTAG_TAG(tagged, uid, gid, tag);
++
+ 	to->di_nlink = be32_to_cpu(from->di_nlink);
+ 	to->di_projid_lo = be16_to_cpu(from->di_projid_lo);
+ 	to->di_projid_hi = be16_to_cpu(from->di_projid_hi);
+@@ -593,21 +604,26 @@ xfs_dinode_from_disk(
+ 	to->di_dmevmask	= be32_to_cpu(from->di_dmevmask);
+ 	to->di_dmstate	= be16_to_cpu(from->di_dmstate);
+ 	to->di_flags	= be16_to_cpu(from->di_flags);
++	to->di_vflags	= be16_to_cpu(from->di_vflags);
+ 	to->di_gen	= be32_to_cpu(from->di_gen);
+ }
+ 
+ void
+ xfs_dinode_to_disk(
+ 	xfs_dinode_t		*to,
+-	xfs_icdinode_t		*from)
++	xfs_icdinode_t		*from,
++	int			tagged)
+ {
+ 	to->di_magic = cpu_to_be16(from->di_magic);
+ 	to->di_mode = cpu_to_be16(from->di_mode);
+ 	to->di_version = from ->di_version;
+ 	to->di_format = from->di_format;
+ 	to->di_onlink = cpu_to_be16(from->di_onlink);
+-	to->di_uid = cpu_to_be32(from->di_uid);
+-	to->di_gid = cpu_to_be32(from->di_gid);
++
++	to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag));
++	to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag));
++	to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag));
++
+ 	to->di_nlink = cpu_to_be32(from->di_nlink);
+ 	to->di_projid_lo = cpu_to_be16(from->di_projid_lo);
+ 	to->di_projid_hi = cpu_to_be16(from->di_projid_hi);
+@@ -629,12 +645,14 @@ xfs_dinode_to_disk(
+ 	to->di_dmevmask = cpu_to_be32(from->di_dmevmask);
+ 	to->di_dmstate = cpu_to_be16(from->di_dmstate);
+ 	to->di_flags = cpu_to_be16(from->di_flags);
++	to->di_vflags = cpu_to_be16(from->di_vflags);
+ 	to->di_gen = cpu_to_be32(from->di_gen);
+ }
+ 
+ STATIC uint
+ _xfs_dic2xflags(
+-	__uint16_t		di_flags)
++	__uint16_t		di_flags,
++	__uint16_t		di_vflags)
+ {
+ 	uint			flags = 0;
+ 
+@@ -645,6 +663,8 @@ _xfs_dic2xflags(
+ 			flags |= XFS_XFLAG_PREALLOC;
+ 		if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ 			flags |= XFS_XFLAG_IMMUTABLE;
++		if (di_flags & XFS_DIFLAG_IXUNLINK)
++			flags |= XFS_XFLAG_IXUNLINK;
+ 		if (di_flags & XFS_DIFLAG_APPEND)
+ 			flags |= XFS_XFLAG_APPEND;
+ 		if (di_flags & XFS_DIFLAG_SYNC)
+@@ -669,6 +689,10 @@ _xfs_dic2xflags(
+ 			flags |= XFS_XFLAG_FILESTREAM;
+ 	}
+ 
++	if (di_vflags & XFS_DIVFLAG_BARRIER)
++		flags |= FS_BARRIER_FL;
++	if (di_vflags & XFS_DIVFLAG_COW)
++		flags |= FS_COW_FL;
+ 	return flags;
+ }
+ 
+@@ -678,7 +702,7 @@ xfs_ip2xflags(
+ {
+ 	xfs_icdinode_t		*dic = &ip->i_d;
+ 
+-	return _xfs_dic2xflags(dic->di_flags) |
++	return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) |
+ 				(XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0);
+ }
+ 
+@@ -686,7 +710,8 @@ uint
+ xfs_dic2xflags(
+ 	xfs_dinode_t		*dip)
+ {
+-	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) |
++	return _xfs_dic2xflags(be16_to_cpu(dip->di_flags),
++				be16_to_cpu(dip->di_vflags)) |
+ 				(XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0);
+ }
+ 
+@@ -740,7 +765,8 @@ xfs_iread(
+ 	 * Otherwise, just get the truly permanent information.
+ 	 */
+ 	if (dip->di_mode) {
+-		xfs_dinode_from_disk(&ip->i_d, dip);
++		xfs_dinode_from_disk(&ip->i_d, dip,
++			mp->m_flags & XFS_MOUNT_TAGGED);
+ 		error = xfs_iformat(ip, dip);
+ 		if (error)  {
+ #ifdef DEBUG
+@@ -927,6 +953,7 @@ xfs_ialloc(
+ 	ASSERT(ip->i_d.di_nlink == nlink);
+ 	ip->i_d.di_uid = current_fsuid();
+ 	ip->i_d.di_gid = current_fsgid();
++	ip->i_d.di_tag = current_fstag(&ip->i_vnode);
+ 	xfs_set_projid(ip, prid);
+ 	memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
+ 
+@@ -986,6 +1013,7 @@ xfs_ialloc(
+ 	ip->i_d.di_dmevmask = 0;
+ 	ip->i_d.di_dmstate = 0;
+ 	ip->i_d.di_flags = 0;
++	ip->i_d.di_vflags = 0;
+ 	flags = XFS_ILOG_CORE;
+ 	switch (mode & S_IFMT) {
+ 	case S_IFIFO:
+@@ -1668,6 +1696,7 @@ xfs_ifree(
+ 	}
+ 	ip->i_d.di_mode = 0;		/* mark incore inode as free */
+ 	ip->i_d.di_flags = 0;
++	ip->i_d.di_vflags = 0;
+ 	ip->i_d.di_dmevmask = 0;
+ 	ip->i_d.di_forkoff = 0;		/* mark the attr fork not in use */
+ 	ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS;
+@@ -1834,7 +1863,6 @@ xfs_iroot_realloc(
+ 	return;
+ }
+ 
+-
+ /*
+  * This is called when the amount of space needed for if_data
+  * is increased or decreased.  The change in size is indicated by
+@@ -2522,7 +2550,8 @@ xfs_iflush_int(
+ 	 * because if the inode is dirty at all the core must
+ 	 * be.
+ 	 */
+-	xfs_dinode_to_disk(dip, &ip->i_d);
++	xfs_dinode_to_disk(dip, &ip->i_d,
++		mp->m_flags & XFS_MOUNT_TAGGED);
+ 
+ 	/* Wrap, we never let the log put out DI_MAX_FLUSH */
+ 	if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_inode.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.h
+--- linux-3.7.10/fs/xfs/xfs_inode.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
+ 	__uint32_t	di_nlink;	/* number of links to file */
+ 	__uint16_t	di_projid_lo;	/* lower part of owner's project id */
+ 	__uint16_t	di_projid_hi;	/* higher part of owner's project id */
+-	__uint8_t	di_pad[6];	/* unused, zeroed space */
++	__uint8_t	di_pad[2];	/* unused, zeroed space */
++	__uint16_t	di_tag;		/* context tagging */
++	__uint16_t	di_vflags;	/* vserver specific flags */
+ 	__uint16_t	di_flushiter;	/* incremented on flush */
+ 	xfs_ictimestamp_t di_atime;	/* time last accessed */
+ 	xfs_ictimestamp_t di_mtime;	/* time last modified */
+@@ -561,7 +563,7 @@ int		xfs_imap_to_bp(struct xfs_mount *,
+ int		xfs_iread(struct xfs_mount *, struct xfs_trans *,
+ 			  struct xfs_inode *, uint);
+ void		xfs_dinode_to_disk(struct xfs_dinode *,
+-				   struct xfs_icdinode *);
++				   struct xfs_icdinode *, int);
+ void		xfs_idestroy_fork(struct xfs_inode *, int);
+ void		xfs_idata_realloc(struct xfs_inode *, int, int);
+ void		xfs_iroot_realloc(struct xfs_inode *, int, int);
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_ioctl.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.c
+--- linux-3.7.10/fs/xfs/xfs_ioctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -26,7 +26,7 @@
+ #include "xfs_bmap_btree.h"
+ #include "xfs_dinode.h"
+ #include "xfs_inode.h"
+-#include "xfs_ioctl.h"
++// #include "xfs_ioctl.h"
+ #include "xfs_rtalloc.h"
+ #include "xfs_itable.h"
+ #include "xfs_error.h"
+@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags(
+ 		xflags |= XFS_XFLAG_IMMUTABLE;
+ 	else
+ 		xflags &= ~XFS_XFLAG_IMMUTABLE;
++	if (flags & FS_IXUNLINK_FL)
++		xflags |= XFS_XFLAG_IXUNLINK;
++	else
++		xflags &= ~XFS_XFLAG_IXUNLINK;
+ 	if (flags & FS_APPEND_FL)
+ 		xflags |= XFS_XFLAG_APPEND;
+ 	else
+@@ -790,6 +794,8 @@ xfs_di2lxflags(
+ 
+ 	if (di_flags & XFS_DIFLAG_IMMUTABLE)
+ 		flags |= FS_IMMUTABLE_FL;
++	if (di_flags & XFS_DIFLAG_IXUNLINK)
++		flags |= FS_IXUNLINK_FL;
+ 	if (di_flags & XFS_DIFLAG_APPEND)
+ 		flags |= FS_APPEND_FL;
+ 	if (di_flags & XFS_DIFLAG_SYNC)
+@@ -850,6 +856,8 @@ xfs_set_diflags(
+ 	di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
+ 	if (xflags & XFS_XFLAG_IMMUTABLE)
+ 		di_flags |= XFS_DIFLAG_IMMUTABLE;
++	if (xflags & XFS_XFLAG_IXUNLINK)
++		di_flags |= XFS_DIFLAG_IXUNLINK;
+ 	if (xflags & XFS_XFLAG_APPEND)
+ 		di_flags |= XFS_DIFLAG_APPEND;
+ 	if (xflags & XFS_XFLAG_SYNC)
+@@ -892,6 +900,10 @@ xfs_diflags_to_linux(
+ 		inode->i_flags |= S_IMMUTABLE;
+ 	else
+ 		inode->i_flags &= ~S_IMMUTABLE;
++	if (xflags & XFS_XFLAG_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++	else
++		inode->i_flags &= ~S_IXUNLINK;
+ 	if (xflags & XFS_XFLAG_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	else
+@@ -1396,10 +1408,18 @@ xfs_file_ioctl(
+ 	case XFS_IOC_FSGETXATTRA:
+ 		return xfs_ioc_fsgetxattr(ip, 1, arg);
+ 	case XFS_IOC_FSSETXATTR:
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -XFS_ERROR(EACCES);
++		}
+ 		return xfs_ioc_fssetxattr(ip, filp, arg);
+ 	case XFS_IOC_GETXFLAGS:
+ 		return xfs_ioc_getxflags(ip, arg);
+ 	case XFS_IOC_SETXFLAGS:
++		if (IS_BARRIER(inode)) {
++			vxwprintk_task(1, "messing with the barrier.");
++			return -XFS_ERROR(EACCES);
++		}
+ 		return xfs_ioc_setxflags(ip, filp, arg);
+ 
+ 	case XFS_IOC_FSSETDM: {
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_ioctl.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.h
+--- linux-3.7.10/fs/xfs/xfs_ioctl.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_ioctl.h	2012-12-18 15:13:16.000000000 +0000
+@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
+ 	void __user		*uhandle,
+ 	u32			hlen);
+ 
++extern int
++xfs_sync_flags(
++	struct inode		*inode,
++	int			flags,
++	int			vflags);
++
+ extern long
+ xfs_file_ioctl(
+ 	struct file		*filp,
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_iops.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_iops.c
+--- linux-3.7.10/fs/xfs/xfs_iops.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_iops.c	2012-12-18 15:13:16.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include "xfs_bmap_btree.h"
+ #include "xfs_dinode.h"
+ #include "xfs_inode.h"
++#include "xfs_ioctl.h"
+ #include "xfs_bmap.h"
+ #include "xfs_rtalloc.h"
+ #include "xfs_error.h"
+@@ -46,6 +47,7 @@
+ #include <linux/security.h>
+ #include <linux/fiemap.h>
+ #include <linux/slab.h>
++#include <linux/vs_tag.h>
+ 
+ static int
+ xfs_initxattrs(
+@@ -421,6 +423,7 @@ xfs_vn_getattr(
+ 	stat->nlink = ip->i_d.di_nlink;
+ 	stat->uid = ip->i_d.di_uid;
+ 	stat->gid = ip->i_d.di_gid;
++	stat->tag = ip->i_d.di_tag;
+ 	stat->ino = ip->i_ino;
+ 	stat->atime = inode->i_atime;
+ 	stat->mtime = inode->i_mtime;
+@@ -1033,6 +1036,7 @@ static const struct inode_operations xfs
+ 	.listxattr		= xfs_vn_listxattr,
+ 	.fiemap			= xfs_vn_fiemap,
+ 	.update_time		= xfs_vn_update_time,
++	.sync_flags		= xfs_sync_flags,
+ };
+ 
+ static const struct inode_operations xfs_dir_inode_operations = {
+@@ -1059,6 +1063,7 @@ static const struct inode_operations xfs
+ 	.removexattr		= generic_removexattr,
+ 	.listxattr		= xfs_vn_listxattr,
+ 	.update_time		= xfs_vn_update_time,
++	.sync_flags		= xfs_sync_flags,
+ };
+ 
+ static const struct inode_operations xfs_dir_ci_inode_operations = {
+@@ -1110,6 +1115,10 @@ xfs_diflags_to_iflags(
+ 		inode->i_flags |= S_IMMUTABLE;
+ 	else
+ 		inode->i_flags &= ~S_IMMUTABLE;
++	if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK)
++		inode->i_flags |= S_IXUNLINK;
++	else
++		inode->i_flags &= ~S_IXUNLINK;
+ 	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
+ 		inode->i_flags |= S_APPEND;
+ 	else
+@@ -1122,6 +1131,15 @@ xfs_diflags_to_iflags(
+ 		inode->i_flags |= S_NOATIME;
+ 	else
+ 		inode->i_flags &= ~S_NOATIME;
++
++	if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER)
++		inode->i_vflags |= V_BARRIER;
++	else
++		inode->i_vflags &= ~V_BARRIER;
++	if (ip->i_d.di_vflags & XFS_DIVFLAG_COW)
++		inode->i_vflags |= V_COW;
++	else
++		inode->i_vflags &= ~V_COW;
+ }
+ 
+ /*
+@@ -1153,6 +1171,7 @@ xfs_setup_inode(
+ 	set_nlink(inode, ip->i_d.di_nlink);
+ 	inode->i_uid	= ip->i_d.di_uid;
+ 	inode->i_gid	= ip->i_d.di_gid;
++	inode->i_tag    = ip->i_d.di_tag;
+ 
+ 	switch (inode->i_mode & S_IFMT) {
+ 	case S_IFBLK:
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_itable.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_itable.c
+--- linux-3.7.10/fs/xfs/xfs_itable.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_itable.c	2012-12-18 15:13:16.000000000 +0000
+@@ -96,6 +96,7 @@ xfs_bulkstat_one_int(
+ 	buf->bs_mode = dic->di_mode;
+ 	buf->bs_uid = dic->di_uid;
+ 	buf->bs_gid = dic->di_gid;
++	buf->bs_tag = dic->di_tag;
+ 	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;
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_linux.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_linux.h
+--- linux-3.7.10/fs/xfs/xfs_linux.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_linux.h	2012-12-18 15:13:16.000000000 +0000
+@@ -121,6 +121,7 @@
+ 
+ #define current_cpu()		(raw_smp_processor_id())
+ #define current_pid()		(current->pid)
++#define current_fstag(vp)	(dx_current_fstag((vp)->i_sb))
+ #define current_test_flags(f)	(current->flags & (f))
+ #define current_set_flags_nested(sp, f)		\
+ 		(*(sp) = current->flags, current->flags |= (f))
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_log_recover.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_log_recover.c
+--- linux-3.7.10/fs/xfs/xfs_log_recover.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_log_recover.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2(
+ 	}
+ 
+ 	/* The core is in in-core format */
+-	xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr);
++	xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr,
++		mp->m_flags & XFS_MOUNT_TAGGED);
+ 
+ 	/* the rest is in on-disk format */
+ 	if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_mount.h linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_mount.h
+--- linux-3.7.10/fs/xfs/xfs_mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -246,6 +246,7 @@ typedef struct xfs_mount {
+ 						   allocator */
+ #define XFS_MOUNT_NOATTR2	(1ULL << 25)	/* disable use of attr2 format */
+ 
++#define XFS_MOUNT_TAGGED	(1ULL << 31)	/* context tagging */
+ 
+ /*
+  * Default minimum read and write sizes.
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_super.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_super.c
+--- linux-3.7.10/fs/xfs/xfs_super.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_super.c	2012-12-18 15:13:16.000000000 +0000
+@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
+ #define MNTOPT_NODELAYLOG  "nodelaylog"	/* Delayed logging disabled */
+ #define MNTOPT_DISCARD	   "discard"	/* Discard unused blocks */
+ #define MNTOPT_NODISCARD   "nodiscard"	/* Do not discard unused blocks */
++#define MNTOPT_TAGXID	"tagxid"	/* context tagging for inodes */
++#define MNTOPT_TAGGED	"tag"		/* context tagging for inodes */
++#define MNTOPT_NOTAGTAG	"notag"		/* do not use context tagging */
+ 
+ /*
+  * Table driven mount option parser.
+@@ -126,6 +129,8 @@ enum {
+ 	Opt_nobarrier,
+ 	Opt_inode64,
+ 	Opt_inode32,
++	Opt_tag,
++	Opt_notag,
+ 	Opt_err
+ };
+ 
+@@ -134,6 +139,9 @@ static const match_table_t tokens = {
+ 	{Opt_nobarrier, "nobarrier"},
+ 	{Opt_inode64, "inode64"},
+ 	{Opt_inode32, "inode32"},
++	{Opt_tag, "tagxid"},
++	{Opt_tag, "tag"},
++	{Opt_notag, "notag"},
+ 	{Opt_err, NULL}
+ };
+ 
+@@ -383,6 +391,19 @@ xfs_parseargs(
+ 		} else if (!strcmp(this_char, "irixsgid")) {
+ 			xfs_warn(mp,
+ 	"irixsgid is now a sysctl(2) variable, option is deprecated.");
++#ifndef CONFIG_TAGGING_NONE
++		} else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++		} else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) {
++			mp->m_flags &= ~XFS_MOUNT_TAGGED;
++		} else if (!strcmp(this_char, MNTOPT_TAGXID)) {
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++#endif
++#ifdef CONFIG_PROPAGATE
++		} else if (!strcmp(this_char, MNTOPT_TAGGED)) {
++			/* use value */
++			mp->m_flags |= XFS_MOUNT_TAGGED;
++#endif
+ 		} else {
+ 			xfs_warn(mp, "unknown mount option [%s].", this_char);
+ 			return EINVAL;
+@@ -1149,6 +1170,16 @@ xfs_fs_remount(
+ 		case Opt_inode32:
+ 			mp->m_maxagi = xfs_set_inode32(mp);
+ 			break;
++		case Opt_tag:
++			if (!(sb->s_flags & MS_TAGGED)) {
++				printk(KERN_INFO
++					"XFS: %s: tagging not permitted on remount.\n",
++					sb->s_id);
++				return -EINVAL;
++			}
++			break;
++		case Opt_notag:
++			break;
+ 		default:
+ 			/*
+ 			 * Logically we would return an error here to prevent
+@@ -1368,6 +1399,9 @@ xfs_fs_fill_super(
+ 	if (error)
+ 		goto out_free_sb;
+ 
++	if (mp->m_flags & XFS_MOUNT_TAGGED)
++		sb->s_flags |= MS_TAGGED;
++
+ 	/*
+ 	 * we must configure the block size in the superblock before we run the
+ 	 * full mount process as the mount process can lookup and cache inodes.
+diff -NurpP --minimal linux-3.7.10/fs/xfs/xfs_vnodeops.c linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_vnodeops.c
+--- linux-3.7.10/fs/xfs/xfs_vnodeops.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/fs/xfs/xfs_vnodeops.c	2012-12-18 15:13:16.000000000 +0000
+@@ -103,6 +103,77 @@ xfs_readlink_bmap(
+ 	return error;
+ }
+ 
++
++STATIC void
++xfs_get_inode_flags(
++	xfs_inode_t	*ip)
++{
++	struct inode 	*inode = VFS_I(ip);
++	unsigned int 	flags = inode->i_flags;
++	unsigned int 	vflags = inode->i_vflags;
++
++	if (flags & S_IMMUTABLE)
++		ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE;
++	else
++		ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE;
++	if (flags & S_IXUNLINK)
++		ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK;
++	else
++		ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK;
++
++	if (vflags & V_BARRIER)
++		ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER;
++	else
++		ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER;
++	if (vflags & V_COW)
++		ip->i_d.di_vflags |= XFS_DIVFLAG_COW;
++	else
++		ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW;
++}
++
++int
++xfs_sync_flags(
++	struct inode		*inode,
++	int			flags,
++	int			vflags)
++{
++	struct xfs_inode	*ip = XFS_I(inode);
++	struct xfs_mount	*mp = ip->i_mount;
++	struct xfs_trans        *tp;
++	unsigned int		lock_flags = 0;
++	int			code;
++
++	tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE);
++	code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0);
++	if (code)
++		goto error_out;
++
++	xfs_ilock(ip, XFS_ILOCK_EXCL);
++	xfs_trans_ijoin(tp, ip, 0);
++
++	inode->i_flags = flags;
++	inode->i_vflags = vflags;
++	xfs_get_inode_flags(ip);
++
++	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
++	xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
++
++	XFS_STATS_INC(xs_ig_attrchg);
++
++	if (mp->m_flags & XFS_MOUNT_WSYNC)
++		xfs_trans_set_sync(tp);
++	code = xfs_trans_commit(tp, 0);
++	xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	return code;
++
++error_out:
++	xfs_trans_cancel(tp, 0);
++	if (lock_flags)
++		xfs_iunlock(ip, XFS_ILOCK_EXCL);
++	return code;
++}
++
++
+ int
+ xfs_readlink(
+ 	xfs_inode_t     *ip,
+diff -NurpP --minimal linux-3.7.10/include/linux/cred.h linux-3.7.10-vs2.3.5.6/include/linux/cred.h
+--- linux-3.7.10/include/linux/cred.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/cred.h	2012-12-18 15:13:16.000000000 +0000
+@@ -157,6 +157,7 @@ extern void exit_creds(struct task_struc
+ extern int copy_creds(struct task_struct *, unsigned long);
+ extern const struct cred *get_task_cred(struct task_struct *);
+ extern struct cred *cred_alloc_blank(void);
++extern struct cred *__prepare_creds(const struct cred *);
+ extern struct cred *prepare_creds(void);
+ extern struct cred *prepare_exec_creds(void);
+ extern int commit_creds(struct cred *);
+@@ -210,6 +211,31 @@ static inline void validate_process_cred
+ }
+ #endif
+ 
++static inline void set_cred_subscribers(struct cred *cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	atomic_set(&cred->subscribers, n);
++#endif
++}
++
++static inline int read_cred_subscribers(const struct cred *cred)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	return atomic_read(&cred->subscribers);
++#else
++	return 0;
++#endif
++}
++
++static inline void alter_cred_subscribers(const struct cred *_cred, int n)
++{
++#ifdef CONFIG_DEBUG_CREDENTIALS
++	struct cred *cred = (struct cred *) _cred;
++
++	atomic_add(n, &cred->subscribers);
++#endif
++}
++
+ /**
+  * get_new_cred - Get a reference on a new set of credentials
+  * @cred: The new credentials to reference
+diff -NurpP --minimal linux-3.7.10/include/linux/devpts_fs.h linux-3.7.10-vs2.3.5.6/include/linux/devpts_fs.h
+--- linux-3.7.10/include/linux/devpts_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/devpts_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
+ 
+ #endif
+ 
+-
+ #endif /* _LINUX_DEVPTS_FS_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/fs.h linux-3.7.10-vs2.3.5.6/include/linux/fs.h
+--- linux-3.7.10/include/linux/fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -210,6 +210,7 @@ typedef void (dio_iodone_t)(struct kiocb
+ #define ATTR_KILL_PRIV	(1 << 14)
+ #define ATTR_OPEN	(1 << 15) /* Truncating from open(O_TRUNC) */
+ #define ATTR_TIMES_SET	(1 << 16)
++#define ATTR_TAG	(1 << 17)
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -225,6 +226,7 @@ struct iattr {
+ 	umode_t		ia_mode;
+ 	kuid_t		ia_uid;
+ 	kgid_t		ia_gid;
++	ktag_t		ia_tag;
+ 	loff_t		ia_size;
+ 	struct timespec	ia_atime;
+ 	struct timespec	ia_mtime;
+@@ -522,7 +524,9 @@ struct inode {
+ 	unsigned short		i_opflags;
+ 	kuid_t			i_uid;
+ 	kgid_t			i_gid;
+-	unsigned int		i_flags;
++	ktag_t			i_tag;
++	unsigned short		i_flags;
++	unsigned short		i_vflags;
+ 
+ #ifdef CONFIG_FS_POSIX_ACL
+ 	struct posix_acl	*i_acl;
+@@ -551,6 +555,7 @@ struct inode {
+ 		unsigned int __i_nlink;
+ 	};
+ 	dev_t			i_rdev;
++	dev_t			i_mdev;
+ 	loff_t			i_size;
+ 	struct timespec		i_atime;
+ 	struct timespec		i_mtime;
+@@ -701,6 +706,11 @@ static inline gid_t i_gid_read(const str
+ 	return from_kgid(&init_user_ns, inode->i_gid);
+ }
+ 
++static inline tag_t i_tag_read(const struct inode *inode)
++{
++	return from_ktag(&init_user_ns, inode->i_tag);
++}
++
+ static inline void i_uid_write(struct inode *inode, uid_t uid)
+ {
+ 	inode->i_uid = make_kuid(&init_user_ns, uid);
+@@ -711,14 +721,19 @@ static inline void i_gid_write(struct in
+ 	inode->i_gid = make_kgid(&init_user_ns, gid);
+ }
+ 
++static inline void i_tag_write(struct inode *inode, tag_t tag)
++{
++	inode->i_tag = make_ktag(&init_user_ns, tag);
++}
++
+ static inline unsigned iminor(const struct inode *inode)
+ {
+-	return MINOR(inode->i_rdev);
++	return MINOR(inode->i_mdev);
+ }
+ 
+ static inline unsigned imajor(const struct inode *inode)
+ {
+-	return MAJOR(inode->i_rdev);
++	return MAJOR(inode->i_mdev);
+ }
+ 
+ extern struct block_device *I_BDEV(struct inode *inode);
+@@ -785,6 +800,7 @@ struct file {
+ 	loff_t			f_pos;
+ 	struct fown_struct	f_owner;
+ 	const struct cred	*f_cred;
++	xid_t			f_xid;
+ 	struct file_ra_state	f_ra;
+ 
+ 	u64			f_version;
+@@ -936,6 +952,7 @@ struct file_lock {
+ 	struct file *fl_file;
+ 	loff_t fl_start;
+ 	loff_t fl_end;
++	xid_t fl_xid;
+ 
+ 	struct fasync_struct *	fl_fasync; /* for lease break notifications */
+ 	/* for lease breaks: */
+@@ -1570,6 +1587,7 @@ struct inode_operations {
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ 	int (*removexattr) (struct dentry *, const char *);
++	int (*sync_flags) (struct inode *, int, int);
+ 	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
+ 		      u64 len);
+ 	int (*update_time)(struct inode *, struct timespec *, int);
+@@ -1584,6 +1602,7 @@ ssize_t rw_copy_check_uvector(int type,
+ 			      unsigned long nr_segs, unsigned long fast_segs,
+ 			      struct iovec *fast_pointer,
+ 			      struct iovec **ret_pointer);
++ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t);
+ 
+ extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
+ extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
+@@ -1637,6 +1656,14 @@ struct super_operations {
+ #define S_IMA		1024	/* Inode has an associated IMA struct */
+ #define S_AUTOMOUNT	2048	/* Automount/referral quasi-directory */
+ #define S_NOSEC		4096	/* no suid or xattr security attributes */
++#define S_IXUNLINK	8192	/* Immutable Invert on unlink */
++
++/* Linux-VServer related Inode flags */
++
++#define V_VALID		1
++#define V_XATTR		2
++#define V_BARRIER	4	/* Barrier for chroot() */
++#define V_COW		8	/* Copy on Write */
+ 
+ /*
+  * Note that nosuid etc flags are inode-specific: setting some file-system
+@@ -1661,10 +1688,13 @@ struct super_operations {
+ #define IS_MANDLOCK(inode)	__IS_FLG(inode, MS_MANDLOCK)
+ #define IS_NOATIME(inode)	__IS_FLG(inode, MS_RDONLY|MS_NOATIME)
+ #define IS_I_VERSION(inode)	__IS_FLG(inode, MS_I_VERSION)
++#define IS_TAGGED(inode)	__IS_FLG(inode, MS_TAGGED)
+ 
+ #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_IXUNLINK(inode)	((inode)->i_flags & S_IXUNLINK)
++#define IS_IXORUNLINK(inode)	((IS_IXUNLINK(inode) ? S_IMMUTABLE : 0) ^ IS_IMMUTABLE(inode))
+ #define IS_POSIXACL(inode)	__IS_FLG(inode, MS_POSIXACL)
+ 
+ #define IS_DEADDIR(inode)	((inode)->i_flags & S_DEAD)
+@@ -1675,6 +1705,16 @@ struct super_operations {
+ #define IS_AUTOMOUNT(inode)	((inode)->i_flags & S_AUTOMOUNT)
+ #define IS_NOSEC(inode)		((inode)->i_flags & S_NOSEC)
+ 
++#define IS_BARRIER(inode)	(S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER))
++
++#ifdef CONFIG_VSERVER_COWBL
++#  define IS_COW(inode)		(IS_IXUNLINK(inode) && IS_IMMUTABLE(inode))
++#  define IS_COW_LINK(inode)	(S_ISREG((inode)->i_mode) && ((inode)->i_nlink > 1))
++#else
++#  define IS_COW(inode)		(0)
++#  define IS_COW_LINK(inode)	(0)
++#endif
++
+ /*
+  * Inode state bits.  Protected by inode->i_lock
+  *
+@@ -1900,6 +1940,9 @@ extern int rw_verify_area(int, struct fi
+ extern int locks_mandatory_locked(struct inode *);
+ extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t);
+ 
++#define ATTR_FLAG_BARRIER	512	/* Barrier for chroot() */
++#define ATTR_FLAG_IXUNLINK	1024	/* Immutable invert on unlink */
++
+ /*
+  * Candidates for mandatory locking have the setgid bit set
+  * but no group execute bit -  an otherwise meaningless combination.
+@@ -2504,6 +2547,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_setattr(struct dentry *, struct iattr *);
+ extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+ extern int simple_statfs(struct dentry *, struct kstatfs *);
+diff -NurpP --minimal linux-3.7.10/include/linux/init_task.h linux-3.7.10-vs2.3.5.6/include/linux/init_task.h
+--- linux-3.7.10/include/linux/init_task.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/init_task.h	2012-12-18 15:13:16.000000000 +0000
+@@ -210,6 +210,10 @@ extern struct task_group root_task_group
+ 	INIT_TRACE_RECURSION						\
+ 	INIT_TASK_RCU_PREEMPT(tsk)					\
+ 	INIT_CPUSET_SEQ							\
++	.xid		= 0,						\
++	.vx_info	= NULL,						\
++	.nid		= 0,						\
++	.nx_info	= NULL,						\
+ }
+ 
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/ipc.h linux-3.7.10-vs2.3.5.6/include/linux/ipc.h
+--- linux-3.7.10/include/linux/ipc.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/ipc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -16,6 +16,7 @@ struct kern_ipc_perm
+ 	key_t		key;
+ 	kuid_t		uid;
+ 	kgid_t		gid;
++	xid_t		xid;
+ 	kuid_t		cuid;
+ 	kgid_t		cgid;
+ 	umode_t		mode; 
+diff -NurpP --minimal linux-3.7.10/include/linux/ipc_namespace.h linux-3.7.10-vs2.3.5.6/include/linux/ipc_namespace.h
+--- linux-3.7.10/include/linux/ipc_namespace.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/ipc_namespace.h	2012-12-18 15:13:16.000000000 +0000
+@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_
+ 
+ #if defined(CONFIG_IPC_NS)
+ extern struct ipc_namespace *copy_ipcs(unsigned long flags,
+-				       struct task_struct *tsk);
++				       struct ipc_namespace *old_ns,
++				       struct user_namespace *user_ns);
+ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
+ {
+ 	if (ns)
+@@ -144,12 +145,13 @@ static inline struct ipc_namespace *get_
+ extern void put_ipc_ns(struct ipc_namespace *ns);
+ #else
+ static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
+-					      struct task_struct *tsk)
++					      struct ipc_namespace *old_ns,
++					      struct user_namespace *user_ns)
+ {
+ 	if (flags & CLONE_NEWIPC)
+ 		return ERR_PTR(-EINVAL);
+ 
+-	return tsk->nsproxy->ipc_ns;
++	return old_ns;
+ }
+ 
+ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
+diff -NurpP --minimal linux-3.7.10/include/linux/loop.h linux-3.7.10-vs2.3.5.6/include/linux/loop.h
+--- linux-3.7.10/include/linux/loop.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/loop.h	2012-12-18 15:13:16.000000000 +0000
+@@ -41,6 +41,7 @@ struct loop_device {
+ 	struct loop_func_table *lo_encryption;
+ 	__u32           lo_init[2];
+ 	kuid_t		lo_key_owner;	/* Who set the key */
++	xid_t		lo_xid;
+ 	int		(*ioctl)(struct loop_device *, int cmd, 
+ 				 unsigned long arg); 
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/memcontrol.h linux-3.7.10-vs2.3.5.6/include/linux/memcontrol.h
+--- linux-3.7.10/include/linux/memcontrol.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/memcontrol.h	2012-12-18 15:13:16.000000000 +0000
+@@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg
+ extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
+ extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
+ 
++extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member);
++extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member);
++
++extern s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem);
++extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem);
++
+ static inline
+ bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
+ {
+diff -NurpP --minimal linux-3.7.10/include/linux/mm_types.h linux-3.7.10-vs2.3.5.6/include/linux/mm_types.h
+--- linux-3.7.10/include/linux/mm_types.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/mm_types.h	2012-12-18 15:13:16.000000000 +0000
+@@ -365,6 +365,7 @@ struct mm_struct {
+ 
+ 	/* Architecture-specific MM context */
+ 	mm_context_t context;
++	struct vx_info *mm_vx_info;
+ 
+ 	unsigned long flags; /* Must use atomic bitops to access the bits */
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/mmzone.h linux-3.7.10-vs2.3.5.6/include/linux/mmzone.h
+--- linux-3.7.10/include/linux/mmzone.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/mmzone.h	2012-12-18 15:13:16.000000000 +0000
+@@ -735,6 +735,13 @@ typedef struct pglist_data {
+ 	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
+ })
+ 
++#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)
++
++#define node_end_pfn(nid) ({\
++	pg_data_t *__pgdat = NODE_DATA(nid);\
++	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
++})
++
+ #include <linux/memory_hotplug.h>
+ 
+ extern struct mutex zonelists_mutex;
+diff -NurpP --minimal linux-3.7.10/include/linux/mount.h linux-3.7.10-vs2.3.5.6/include/linux/mount.h
+--- linux-3.7.10/include/linux/mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -47,6 +47,9 @@ struct mnt_namespace;
+ 
+ #define MNT_INTERNAL	0x4000
+ 
++#define MNT_TAGID	0x10000
++#define MNT_NOTAG	0x20000
++
+ struct vfsmount {
+ 	struct dentry *mnt_root;	/* root of the mounted tree */
+ 	struct super_block *mnt_sb;	/* pointer to superblock */
+diff -NurpP --minimal linux-3.7.10/include/linux/net.h linux-3.7.10-vs2.3.5.6/include/linux/net.h
+--- linux-3.7.10/include/linux/net.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/net.h	2012-12-18 15:13:16.000000000 +0000
+@@ -38,6 +38,7 @@ struct net;
+ #define SOCK_PASSCRED		3
+ #define SOCK_PASSSEC		4
+ #define SOCK_EXTERNALLY_ALLOCATED 5
++#define SOCK_USER_SOCKET	6
+ 
+ #ifndef ARCH_HAS_SOCKET_TYPES
+ /**
+diff -NurpP --minimal linux-3.7.10/include/linux/netdevice.h linux-3.7.10-vs2.3.5.6/include/linux/netdevice.h
+--- linux-3.7.10/include/linux/netdevice.h	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/netdevice.h	2013-02-19 14:41:41.000000000 +0000
+@@ -1640,6 +1640,7 @@ extern void		netdev_resync_ops(struct ne
+ 
+ extern struct net_device	*dev_get_by_index(struct net *net, int ifindex);
+ extern struct net_device	*__dev_get_by_index(struct net *net, int ifindex);
++extern struct net_device	*dev_get_by_index_real_rcu(struct net *net, int ifindex);
+ extern struct net_device	*dev_get_by_index_rcu(struct net *net, int ifindex);
+ extern int		dev_restart(struct net_device *dev);
+ #ifdef CONFIG_NETPOLL_TRAP
+diff -NurpP --minimal linux-3.7.10/include/linux/nsproxy.h linux-3.7.10-vs2.3.5.6/include/linux/nsproxy.h
+--- linux-3.7.10/include/linux/nsproxy.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/nsproxy.h	2012-12-18 15:13:16.000000000 +0000
+@@ -3,6 +3,7 @@
+ 
+ #include <linux/spinlock.h>
+ #include <linux/sched.h>
++#include <linux/vserver/debug.h>
+ 
+ struct mnt_namespace;
+ struct uts_namespace;
+@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro
+ }
+ 
+ int copy_namespaces(unsigned long flags, struct task_struct *tsk);
++struct nsproxy *copy_nsproxy(struct nsproxy *orig);
+ void exit_task_namespaces(struct task_struct *tsk);
+ void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
+ void free_nsproxy(struct nsproxy *ns);
+@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned
+ 	struct fs_struct *);
+ int __init nsproxy_cache_init(void);
+ 
+-static inline void put_nsproxy(struct nsproxy *ns)
++#define	get_nsproxy(n)	__get_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __get_nsproxy(struct nsproxy *ns,
++	const char *_file, int _line)
+ {
+-	if (atomic_dec_and_test(&ns->count)) {
+-		free_nsproxy(ns);
+-	}
++	vxlprintk(VXD_CBIT(space, 0), "get_nsproxy(%p[%u])",
++		ns, atomic_read(&ns->count), _file, _line);
++	atomic_inc(&ns->count);
+ }
+ 
+-static inline void get_nsproxy(struct nsproxy *ns)
++#define	put_nsproxy(n)	__put_nsproxy(n, __FILE__, __LINE__)
++
++static inline void __put_nsproxy(struct nsproxy *ns,
++	const char *_file, int _line)
+ {
+-	atomic_inc(&ns->count);
++	vxlprintk(VXD_CBIT(space, 0), "put_nsproxy(%p[%u])",
++		ns, atomic_read(&ns->count), _file, _line);
++	if (atomic_dec_and_test(&ns->count)) {
++		free_nsproxy(ns);
++	}
+ }
+ 
+ #endif
+diff -NurpP --minimal linux-3.7.10/include/linux/pid.h linux-3.7.10-vs2.3.5.6/include/linux/pid.h
+--- linux-3.7.10/include/linux/pid.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/pid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -8,7 +8,8 @@ enum pid_type
+ 	PIDTYPE_PID,
+ 	PIDTYPE_PGID,
+ 	PIDTYPE_SID,
+-	PIDTYPE_MAX
++	PIDTYPE_MAX,
++	PIDTYPE_REALPID
+ };
+ 
+ /*
+@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p
+ }
+ 
+ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns);
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns);
+ pid_t pid_vnr(struct pid *pid);
+ 
+ #define do_each_pid_task(pid, type, task)				\
+diff -NurpP --minimal linux-3.7.10/include/linux/proc_fs.h linux-3.7.10-vs2.3.5.6/include/linux/proc_fs.h
+--- linux-3.7.10/include/linux/proc_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/proc_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -54,6 +54,7 @@ struct proc_dir_entry {
+ 	nlink_t nlink;
+ 	kuid_t uid;
+ 	kgid_t gid;
++	int vx_flags;
+ 	loff_t size;
+ 	const struct inode_operations *proc_iops;
+ 	/*
+@@ -252,12 +253,18 @@ extern const struct proc_ns_operations n
+ extern const struct proc_ns_operations utsns_operations;
+ extern const struct proc_ns_operations ipcns_operations;
+ 
++struct vx_info;
++struct nx_info;
++
+ union proc_op {
+ 	int (*proc_get_link)(struct dentry *, struct path *);
+ 	int (*proc_read)(struct task_struct *task, char *page);
+ 	int (*proc_show)(struct seq_file *m,
+ 		struct pid_namespace *ns, struct pid *pid,
+ 		struct task_struct *task);
++	int (*proc_vs_read)(char *page);
++	int (*proc_vxi_read)(struct vx_info *vxi, char *page);
++	int (*proc_nxi_read)(struct nx_info *nxi, char *page);
+ };
+ 
+ struct ctl_table_header;
+@@ -265,6 +272,7 @@ struct ctl_table;
+ 
+ struct proc_inode {
+ 	struct pid *pid;
++	int vx_flags;
+ 	int fd;
+ 	union proc_op op;
+ 	struct proc_dir_entry *pde;
+diff -NurpP --minimal linux-3.7.10/include/linux/quotaops.h linux-3.7.10-vs2.3.5.6/include/linux/quotaops.h
+--- linux-3.7.10/include/linux/quotaops.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/quotaops.h	2012-12-18 15:13:16.000000000 +0000
+@@ -8,6 +8,7 @@
+ #define _LINUX_QUOTAOPS_
+ 
+ #include <linux/fs.h>
++#include <linux/vs_dlimit.h>
+ 
+ #define DQUOT_SPACE_WARN	0x1
+ #define DQUOT_SPACE_RESERVE	0x2
+@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino
+ 
+ static inline int dquot_alloc_inode(const struct inode *inode)
+ {
+-	return 0;
++	return dl_alloc_inode(inode);
+ }
+ 
+ static inline void dquot_free_inode(const struct inode *inode)
+ {
++	dl_free_inode(inode);
+ }
+ 
+ static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
+@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct
+ static inline int __dquot_alloc_space(struct inode *inode, qsize_t number,
+ 		int flags)
+ {
++	int ret = 0;
++
++	if ((ret = dl_alloc_space(inode, number)))
++		return ret;
+ 	if (!(flags & DQUOT_SPACE_RESERVE))
+ 		inode_add_bytes(inode, number);
+ 	return 0;
+@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st
+ {
+ 	if (!(flags & DQUOT_SPACE_RESERVE))
+ 		inode_sub_bytes(inode, number);
++	dl_free_space(inode, number);
+ }
+ 
+ static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
+diff -NurpP --minimal linux-3.7.10/include/linux/sched.h linux-3.7.10-vs2.3.5.6/include/linux/sched.h
+--- linux-3.7.10/include/linux/sched.h	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sched.h	2013-02-05 01:14:43.000000000 +0000
+@@ -1378,6 +1378,14 @@ struct task_struct {
+ #endif
+ 	struct seccomp seccomp;
+ 
++/* vserver context data */
++	struct vx_info *vx_info;
++	struct nx_info *nx_info;
++
++	xid_t xid;
++	nid_t nid;
++	tag_t tag;
++
+ /* Thread group tracking */
+    	u32 parent_exec_id;
+    	u32 self_exec_id;
+@@ -1627,6 +1635,11 @@ struct pid_namespace;
+ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
+ 			struct pid_namespace *ns);
+ 
++#include <linux/vserver/base.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/pid.h>
++
+ static inline pid_t task_pid_nr(struct task_struct *tsk)
+ {
+ 	return tsk->pid;
+@@ -1640,7 +1653,8 @@ static inline pid_t task_pid_nr_ns(struc
+ 
+ static inline pid_t task_pid_vnr(struct task_struct *tsk)
+ {
+-	return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++	// return __task_pid_nr_ns(tsk, PIDTYPE_PID, NULL);
++	return vx_map_pid(__task_pid_nr_ns(tsk, PIDTYPE_PID, NULL));
+ }
+ 
+ 
+@@ -1653,7 +1667,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+ 
+ static inline pid_t task_tgid_vnr(struct task_struct *tsk)
+ {
+-	return pid_vnr(task_tgid(tsk));
++	return vx_map_tgid(pid_vnr(task_tgid(tsk)));
+ }
+ 
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/shmem_fs.h linux-3.7.10-vs2.3.5.6/include/linux/shmem_fs.h
+--- linux-3.7.10/include/linux/shmem_fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/shmem_fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -9,6 +9,9 @@
+ 
+ /* inode in-kernel data */
+ 
++#define TMPFS_SUPER_MAGIC	0x01021994
++
++
+ struct shmem_inode_info {
+ 	spinlock_t		lock;
+ 	unsigned long		flags;
+diff -NurpP --minimal linux-3.7.10/include/linux/stat.h linux-3.7.10-vs2.3.5.6/include/linux/stat.h
+--- linux-3.7.10/include/linux/stat.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/stat.h	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@ struct kstat {
+ 	unsigned int	nlink;
+ 	kuid_t		uid;
+ 	kgid_t		gid;
++	tag_t		tag;
+ 	dev_t		rdev;
+ 	loff_t		size;
+ 	struct timespec  atime;
+diff -NurpP --minimal linux-3.7.10/include/linux/sunrpc/auth.h linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/auth.h
+--- linux-3.7.10/include/linux/sunrpc/auth.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/auth.h	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ struct auth_cred {
+ 	uid_t	uid;
+ 	gid_t	gid;
++	tag_t	tag;
+ 	struct group_info *group_info;
+ 	const char *principal;
+ 	unsigned char machine_cred : 1;
+diff -NurpP --minimal linux-3.7.10/include/linux/sunrpc/clnt.h linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/clnt.h
+--- linux-3.7.10/include/linux/sunrpc/clnt.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sunrpc/clnt.h	2012-12-18 15:13:16.000000000 +0000
+@@ -49,7 +49,8 @@ struct rpc_clnt {
+ 	unsigned int		cl_softrtry : 1,/* soft timeouts */
+ 				cl_discrtry : 1,/* disconnect before retry */
+ 				cl_autobind : 1,/* use getport() */
+-				cl_chatty   : 1;/* be verbose */
++				cl_chatty   : 1,/* be verbose */
++				cl_tag      : 1;/* context tagging */
+ 
+ 	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */
+ 	const struct rpc_timeout *cl_timeout;	/* Timeout strategy */
+diff -NurpP --minimal linux-3.7.10/include/linux/sysfs.h linux-3.7.10-vs2.3.5.6/include/linux/sysfs.h
+--- linux-3.7.10/include/linux/sysfs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/sysfs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -19,6 +19,8 @@
+ #include <linux/kobject_ns.h>
+ #include <linux/atomic.h>
+ 
++#define SYSFS_SUPER_MAGIC	0x62656572
++
+ struct kobject;
+ struct module;
+ enum kobj_ns_type;
+diff -NurpP --minimal linux-3.7.10/include/linux/types.h linux-3.7.10-vs2.3.5.6/include/linux/types.h
+--- linux-3.7.10/include/linux/types.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/types.h	2012-12-18 15:13:16.000000000 +0000
+@@ -32,6 +32,9 @@ 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;
++typedef unsigned int		tag_t;
+ 
+ typedef unsigned long		uintptr_t;
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/uidgid.h linux-3.7.10-vs2.3.5.6/include/linux/uidgid.h
+--- linux-3.7.10/include/linux/uidgid.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/uidgid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -23,13 +23,17 @@ typedef struct {
+ 	uid_t val;
+ } kuid_t;
+ 
+-
+ typedef struct {
+ 	gid_t val;
+ } kgid_t;
+ 
++typedef struct {
++	tag_t val;
++} ktag_t;
++
+ #define KUIDT_INIT(value) (kuid_t){ value }
+ #define KGIDT_INIT(value) (kgid_t){ value }
++#define KTAGT_INIT(value) (ktag_t){ value }
+ 
+ static inline uid_t __kuid_val(kuid_t uid)
+ {
+@@ -41,10 +45,16 @@ static inline gid_t __kgid_val(kgid_t gi
+ 	return gid.val;
+ }
+ 
++static inline tag_t __ktag_val(ktag_t tag)
++{
++	return tag.val;
++}
++
+ #else
+ 
+ typedef uid_t kuid_t;
+ typedef gid_t kgid_t;
++typedef tag_t ktag_t;
+ 
+ static inline uid_t __kuid_val(kuid_t uid)
+ {
+@@ -56,16 +66,24 @@ static inline gid_t __kgid_val(kgid_t gi
+ 	return gid;
+ }
+ 
++static inline tag_t __ktag_val(ktag_t tag)
++{
++	return tag;
++}
++
+ #define KUIDT_INIT(value) ((kuid_t) value )
+ #define KGIDT_INIT(value) ((kgid_t) value )
++#define KTAGT_INIT(value) ((ktag_t) value )
+ 
+ #endif
+ 
+ #define GLOBAL_ROOT_UID KUIDT_INIT(0)
+ #define GLOBAL_ROOT_GID KGIDT_INIT(0)
++#define GLOBAL_ROOT_TAG KTAGT_INIT(0)
+ 
+ #define INVALID_UID KUIDT_INIT(-1)
+ #define INVALID_GID KGIDT_INIT(-1)
++#define INVALID_TAG KTAGT_INIT(-1)
+ 
+ static inline bool uid_eq(kuid_t left, kuid_t right)
+ {
+@@ -77,6 +95,11 @@ static inline bool gid_eq(kgid_t left, k
+ 	return __kgid_val(left) == __kgid_val(right);
+ }
+ 
++static inline bool tag_eq(ktag_t left, ktag_t right)
++{
++	return __ktag_val(left) == __ktag_val(right);
++}
++
+ static inline bool uid_gt(kuid_t left, kuid_t right)
+ {
+ 	return __kuid_val(left) > __kuid_val(right);
+@@ -127,13 +150,21 @@ static inline bool gid_valid(kgid_t gid)
+ 	return !gid_eq(gid, INVALID_GID);
+ }
+ 
++static inline bool tag_valid(ktag_t tag)
++{
++	return !tag_eq(tag, INVALID_TAG);
++}
++
+ #ifdef CONFIG_USER_NS
+ 
+ extern kuid_t make_kuid(struct user_namespace *from, uid_t uid);
+ extern kgid_t make_kgid(struct user_namespace *from, gid_t gid);
++extern krag_t make_ktag(struct user_namespace *from, gid_t gid);
+ 
+ extern uid_t from_kuid(struct user_namespace *to, kuid_t uid);
+ extern gid_t from_kgid(struct user_namespace *to, kgid_t gid);
++extern tag_t from_ktag(struct user_namespace *to, ktag_t tag);
++
+ extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid);
+ extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid);
+ 
+@@ -159,6 +190,11 @@ static inline kgid_t make_kgid(struct us
+ 	return KGIDT_INIT(gid);
+ }
+ 
++static inline ktag_t make_ktag(struct user_namespace *from, tag_t tag)
++{
++	return KTAGT_INIT(tag);
++}
++
+ static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid)
+ {
+ 	return __kuid_val(kuid);
+@@ -169,6 +205,11 @@ static inline gid_t from_kgid(struct use
+ 	return __kgid_val(kgid);
+ }
+ 
++static inline tag_t from_ktag(struct user_namespace *to, ktag_t ktag)
++{
++	return __ktag_val(ktag);
++}
++
+ static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
+ {
+ 	uid_t uid = from_kuid(to, kuid);
+diff -NurpP --minimal linux-3.7.10/include/linux/utsname.h linux-3.7.10-vs2.3.5.6/include/linux/utsname.h
+--- linux-3.7.10/include/linux/utsname.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/utsname.h	2012-12-18 15:13:16.000000000 +0000
+@@ -33,7 +33,8 @@ static inline void get_uts_ns(struct uts
+ }
+ 
+ extern struct uts_namespace *copy_utsname(unsigned long flags,
+-					  struct task_struct *tsk);
++					  struct uts_namespace *old_ns,
++					  struct user_namespace *user_ns);
+ extern void free_uts_ns(struct kref *kref);
+ 
+ static inline void put_uts_ns(struct uts_namespace *ns)
+@@ -50,12 +51,13 @@ static inline void put_uts_ns(struct uts
+ }
+ 
+ static inline struct uts_namespace *copy_utsname(unsigned long flags,
+-						 struct task_struct *tsk)
++						 struct uts_namespace *old_ns,
++						 struct user_namespace *user_ns)
+ {
+ 	if (flags & CLONE_NEWUTS)
+ 		return ERR_PTR(-EINVAL);
+ 
+-	return tsk->nsproxy->uts_ns;
++	return old_ns;
+ }
+ #endif
+ 
+diff -NurpP --minimal linux-3.7.10/include/linux/vroot.h linux-3.7.10-vs2.3.5.6/include/linux/vroot.h
+--- linux-3.7.10/include/linux/vroot.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vroot.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,51 @@
++
++/*
++ * include/linux/vroot.h
++ *
++ * written by Herbert Pötzl, 9/11/2002
++ * ported to 2.6 by Herbert Pötzl, 30/12/2004
++ *
++ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * 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;
++};
++
++
++typedef struct block_device *(vroot_grb_func)(struct block_device *);
++
++extern int register_vroot_grb(vroot_grb_func *);
++extern int unregister_vroot_grb(vroot_grb_func *);
++
++#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 */
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_base.h linux-3.7.10-vs2.3.5.6/include/linux/vs_base.h
+--- linux-3.7.10/include/linux/vs_base.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_base.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VS_BASE_H
++#define _VS_BASE_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_context.h linux-3.7.10-vs2.3.5.6/include/linux/vs_context.h
+--- linux-3.7.10/include/linux/vs_context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_context.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,242 @@
++#ifndef _VS_CONTEXT_H
++#define _VS_CONTEXT_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/history.h"
++#include "vserver/debug.h"
++
++#include <linux/sched.h>
++
++
++#define get_vx_info(i) __get_vx_info(i, __FILE__, __LINE__, __HERE__)
++
++static inline struct vx_info *__get_vx_info(struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __put_vx_info(struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __init_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++		atomic_inc(&vxi->vx_usecnt);
++	}
++	*vxp = vxi;
++}
++
++
++#define set_vx_info(p, i) \
++	__set_vx_info(p, i, __FILE__, __LINE__, __HERE__)
++
++static inline void __set_vx_info(struct vx_info **vxp, struct vx_info *vxi,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	atomic_inc(&vxi->vx_usecnt);
++	vxo = xchg(vxp, vxi);
++	BUG_ON(vxo);
++}
++
++
++#define clr_vx_info(p) __clr_vx_info(p, __FILE__, __LINE__, __HERE__)
++
++static inline void __clr_vx_info(struct vx_info **vxp,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __claim_vx_info(struct vx_info *vxi,
++	struct task_struct *task,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline void __release_vx_info(struct vx_info *vxi,
++	struct task_struct *task,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++
++	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__, __HERE__)
++
++static inline struct vx_info *__task_get_vx_info(struct task_struct *p,
++	const char *_file, int _line, void *_here)
++{
++	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, _here);
++	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);
++}
++
++
++#define enter_vx_info(v, s) __enter_vx_info(v, s, __FILE__, __LINE__)
++
++static inline void __enter_vx_info(struct vx_info *vxi,
++	struct vx_info_save *vxis, const char *_file, int _line)
++{
++	vxlprintk(VXD_CBIT(xid, 5), "enter_vx_info(%p[#%d],%p) %p[#%d,%p]",
++		vxi, vxi ? vxi->vx_id : 0, vxis, current,
++		current->xid, current->vx_info, _file, _line);
++	vxis->vxi = xchg(&current->vx_info, vxi);
++	vxis->xid = current->xid;
++	current->xid = vxi ? vxi->vx_id : 0;
++}
++
++#define leave_vx_info(s) __leave_vx_info(s, __FILE__, __LINE__)
++
++static inline void __leave_vx_info(struct vx_info_save *vxis,
++	const char *_file, int _line)
++{
++	vxlprintk(VXD_CBIT(xid, 5), "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]",
++		vxis, vxis->xid, vxis->vxi, current,
++		current->xid, current->vx_info, _file, _line);
++	(void)xchg(&current->vx_info, vxis->vxi);
++	current->xid = vxis->xid;
++}
++
++
++static inline void __enter_vx_admin(struct vx_info_save *vxis)
++{
++	vxis->vxi = xchg(&current->vx_info, NULL);
++	vxis->xid = xchg(&current->xid, (xid_t)0);
++}
++
++static inline void __leave_vx_admin(struct vx_info_save *vxis)
++{
++	(void)xchg(&current->xid, vxis->xid);
++	(void)xchg(&current->vx_info, vxis->vxi);
++}
++
++#define task_is_init(p) \
++	__task_is_init(p, __FILE__, __LINE__, __HERE__)
++
++static inline int __task_is_init(struct task_struct *p,
++	const char *_file, int _line, void *_here)
++{
++	int is_init = is_global_init(p);
++
++	task_lock(p);
++	if (p->vx_info)
++		is_init = p->vx_info->vx_initpid == p->pid;
++	task_unlock(p);
++	return is_init;
++}
++
++extern void exit_vx_info(struct task_struct *, int);
++extern void exit_vx_info_early(struct task_struct *, int);
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_cowbl.h linux-3.7.10-vs2.3.5.6/include/linux/vs_cowbl.h
+--- linux-3.7.10/include/linux/vs_cowbl.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_cowbl.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,48 @@
++#ifndef _VS_COWBL_H
++#define _VS_COWBL_H
++
++#include <linux/fs.h>
++#include <linux/dcache.h>
++#include <linux/namei.h>
++#include <linux/slab.h>
++
++extern struct dentry *cow_break_link(const char *pathname);
++
++static inline int cow_check_and_break(struct path *path)
++{
++	struct inode *inode = path->dentry->d_inode;
++	int error = 0;
++
++	/* do we need this check? */
++	if (IS_RDONLY(inode))
++		return -EROFS;
++
++	if (IS_COW(inode)) {
++		if (IS_COW_LINK(inode)) {
++			struct dentry *new_dentry, *old_dentry = path->dentry;
++			char *pp, *buf;
++
++			buf = kmalloc(PATH_MAX, GFP_KERNEL);
++			if (!buf) {
++				return -ENOMEM;
++			}
++			pp = d_path(path, buf, PATH_MAX);
++			new_dentry = cow_break_link(pp);
++			kfree(buf);
++			if (!IS_ERR(new_dentry)) {
++				path->dentry = new_dentry;
++				dput(old_dentry);
++			} else
++				error = PTR_ERR(new_dentry);
++		} else {
++			inode->i_flags &= ~(S_IXUNLINK | S_IMMUTABLE);
++			inode->i_ctime = CURRENT_TIME;
++			mark_inode_dirty(inode);
++		}
++	}
++	return error;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_cvirt.h linux-3.7.10-vs2.3.5.6/include/linux/vs_cvirt.h
+--- linux-3.7.10/include/linux/vs_cvirt.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_cvirt.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,50 @@
++#ifndef _VS_CVIRT_H
++#define _VS_CVIRT_H
++
++#include "vserver/cvirt.h"
++#include "vserver/context.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++
++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
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_device.h linux-3.7.10-vs2.3.5.6/include/linux/vs_device.h
+--- linux-3.7.10/include/linux/vs_device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_device.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,45 @@
++#ifndef _VS_DEVICE_H
++#define _VS_DEVICE_H
++
++#include "vserver/base.h"
++#include "vserver/device.h"
++#include "vserver/debug.h"
++
++
++#ifdef CONFIG_VSERVER_DEVICE
++
++int vs_map_device(struct vx_info *, dev_t, dev_t *, umode_t);
++
++#define vs_device_perm(v, d, m, p) \
++	((vs_map_device(current_vx_info(), d, NULL, m) & (p)) == (p))
++
++#else
++
++static inline
++int vs_map_device(struct vx_info *vxi,
++	dev_t device, dev_t *target, umode_t mode)
++{
++	if (target)
++		*target = device;
++	return ~0;
++}
++
++#define vs_device_perm(v, d, m, p) ((p) == (p))
++
++#endif
++
++
++#define vs_map_chrdev(d, t, p) \
++	((vs_map_device(current_vx_info(), d, t, S_IFCHR) & (p)) == (p))
++#define vs_map_blkdev(d, t, p) \
++	((vs_map_device(current_vx_info(), d, t, S_IFBLK) & (p)) == (p))
++
++#define vs_chrdev_perm(d, p) \
++	vs_device_perm(current_vx_info(), d, S_IFCHR, p)
++#define vs_blkdev_perm(d, p) \
++	vs_device_perm(current_vx_info(), d, S_IFBLK, p)
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_dlimit.h linux-3.7.10-vs2.3.5.6/include/linux/vs_dlimit.h
+--- linux-3.7.10/include/linux/vs_dlimit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_dlimit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,215 @@
++#ifndef _VS_DLIMIT_H
++#define _VS_DLIMIT_H
++
++#include <linux/fs.h>
++
++#include "vserver/dlimit.h"
++#include "vserver/base.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_tag : 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_tag : 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,
++	tag_t tag, 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, tag);
++	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, tag, __dlimit_char(dli), (long long)nr,
++		ret, file, line);
++	return ret ? -ENOSPC : 0;
++}
++
++static inline void __dl_free_space(struct super_block *sb,
++	tag_t tag, dlsize_t nr, const char *_file, int _line)
++{
++	struct dl_info *dli = NULL;
++
++	if (nr == 0)
++		goto out;
++	dli = locate_dl_info(sb, tag);
++	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, tag, __dlimit_char(dli), (long long)nr,
++		_file, _line);
++}
++
++static inline int __dl_alloc_inode(struct super_block *sb,
++	tag_t tag, const char *_file, int _line)
++{
++	struct dl_info *dli;
++	int ret = 0;
++
++	dli = locate_dl_info(sb, tag);
++	if (!dli)
++		goto out;
++
++	spin_lock(&dli->dl_lock);
++	dli->dl_inodes_used++;
++	ret = (dli->dl_inodes_used > dli->dl_inodes_total);
++	spin_unlock(&dli->dl_lock);
++	put_dl_info(dli);
++out:
++	vxlprintk(VXD_CBIT(dlim, 0),
++		"ALLOC (%p,#%d)%c inode (%d)",
++		sb, tag, __dlimit_char(dli), ret, _file, _line);
++	return ret ? -ENOSPC : 0;
++}
++
++static inline void __dl_free_inode(struct super_block *sb,
++	tag_t tag, const char *_file, int _line)
++{
++	struct dl_info *dli;
++
++	dli = locate_dl_info(sb, tag);
++	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, tag, __dlimit_char(dli), _file, _line);
++}
++
++static inline void __dl_adjust_block(struct super_block *sb, tag_t tag,
++	unsigned long long *free_blocks, unsigned long long *root_blocks,
++	const char *_file, int _line)
++{
++	struct dl_info *dli;
++	uint64_t broot, bfree;
++
++	dli = locate_dl_info(sb, tag);
++	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 %lld,%lld [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 dl_prealloc_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_alloc_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_reserve_space(in, bytes) \
++	__dl_alloc_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_claim_space(in, bytes) (0)
++
++#define dl_release_space(in, bytes) \
++	__dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++#define dl_free_space(in, bytes) \
++	__dl_free_space((in)->i_sb, i_tag_read(in), (dlsize_t)(bytes), \
++		__FILE__, __LINE__ )
++
++
++
++#define dl_alloc_inode(in) \
++	__dl_alloc_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
++
++#define dl_free_inode(in) \
++	__dl_free_inode((in)->i_sb, i_tag_read(in), __FILE__, __LINE__ )
++
++
++#define dl_adjust_block(sb, tag, fb, rb) \
++	__dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ )
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_inet.h linux-3.7.10-vs2.3.5.6/include/linux/vs_inet.h
+--- linux-3.7.10/include/linux/vs_inet.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_inet.h	2013-01-04 23:27:50.000000000 +0000
+@@ -0,0 +1,364 @@
++#ifndef _VS_INET_H
++#define _VS_INET_H
++
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
++
++#define IPI_LOOPBACK	htonl(INADDR_LOOPBACK)
++
++#define NXAV4(a)	NIPQUAD((a)->ip[0]), NIPQUAD((a)->ip[1]), \
++			NIPQUAD((a)->mask), (a)->type
++#define NXAV4_FMT	"[" NIPQUAD_FMT "-" NIPQUAD_FMT "/" NIPQUAD_FMT ":%04x]"
++
++#define NIPQUAD(addr) \
++	((unsigned char *)&addr)[0], \
++	((unsigned char *)&addr)[1], \
++	((unsigned char *)&addr)[2], \
++	((unsigned char *)&addr)[3]
++
++#define NIPQUAD_FMT "%u.%u.%u.%u"
++
++
++static inline
++int v4_addr_match(struct nx_addr_v4 *nxa, __be32 addr, uint16_t tmask)
++{
++	__be32 ip = nxa->ip[0].s_addr;
++	__be32 mask = nxa->mask.s_addr;
++	__be32 bcast = ip | ~mask;
++	int ret = 0;
++
++	switch (nxa->type & tmask) {
++	case NXA_TYPE_MASK:
++		ret = (ip == (addr & mask));
++		break;
++	case NXA_TYPE_ADDR:
++		ret = 3;
++		if (addr == ip)
++			break;
++		/* fall through to broadcast */
++	case NXA_MOD_BCAST:
++		ret = ((tmask & NXA_MOD_BCAST) && (addr == bcast));
++		break;
++	case NXA_TYPE_RANGE:
++		ret = ((nxa->ip[0].s_addr <= addr) &&
++			(nxa->ip[1].s_addr > addr));
++		break;
++	case NXA_TYPE_ANY:
++		ret = 2;
++		break;
++	}
++
++	vxdprintk(VXD_CBIT(net, 0),
++		"v4_addr_match(%p" NXAV4_FMT "," NIPQUAD_FMT ",%04x) = %d",
++		nxa, NXAV4(nxa), NIPQUAD(addr), tmask, ret);
++	return ret;
++}
++
++static inline
++int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
++{
++	struct nx_addr_v4 *nxa;
++	unsigned long irqflags;
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++
++	ret = 2;
++	/* allow 127.0.0.1 when remapping lback */
++	if ((tmask & NXA_LOOPBACK) &&
++		(addr == IPI_LOOPBACK) &&
++		nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++		goto out;
++	ret = 3;
++	/* check for lback address */
++	if ((tmask & NXA_MOD_LBACK) &&
++		(nxi->v4_lback.s_addr == addr))
++		goto out;
++	ret = 4;
++	/* check for broadcast address */
++	if ((tmask & NXA_MOD_BCAST) &&
++		(nxi->v4_bcast.s_addr == addr))
++		goto out;
++	ret = 5;
++
++	/* check for v4 addresses */
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (nxa = &nxi->v4; nxa; nxa = nxa->next)
++		if (v4_addr_match(nxa, addr, tmask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++out:
++	vxdprintk(VXD_CBIT(net, 0),
++		"v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
++		nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret);
++	return ret;
++}
++
++static inline
++int v4_nx_addr_match(struct nx_addr_v4 *nxa, struct nx_addr_v4 *addr, uint16_t mask)
++{
++	/* FIXME: needs full range checks */
++	return v4_addr_match(nxa, addr->ip[0].s_addr, mask);
++}
++
++static inline
++int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
++{
++	struct nx_addr_v4 *ptr;
++	unsigned long irqflags;
++	int ret = 1;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (ptr = &nxi->v4; ptr; ptr = ptr->next)
++		if (v4_nx_addr_match(ptr, nxa, mask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	return ret;
++}
++
++#include <net/inet_sock.h>
++
++/*
++ *	Check if a given address matches for a socket
++ *
++ *	nxi:		the socket's nx_info if any
++ *	addr:		to be verified address
++ */
++static inline
++int v4_sock_addr_match (
++	struct nx_info *nxi,
++	struct inet_sock *inet,
++	__be32 addr)
++{
++	__be32 saddr = inet->inet_rcv_saddr;
++	__be32 bcast = nxi ? nxi->v4_bcast.s_addr : INADDR_BROADCAST;
++
++	if (addr && (saddr == addr || bcast == addr))
++		return 1;
++	if (!saddr)
++		return v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND);
++	return 0;
++}
++
++
++/* inet related checks and helpers */
++
++
++struct in_ifaddr;
++struct net_device;
++struct sock;
++
++#ifdef CONFIG_INET
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_sock.h>
++#include <net/inet_timewait_sock.h>
++
++
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v4_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v4_addr_conflict(struct nx_info *, struct nx_info *);
++
++
++/*
++ *	check if address is covered by socket
++ *
++ *	sk:	the socket to check against
++ *	addr:	the address in question (must be != 0)
++ */
++
++static inline
++int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa)
++{
++	struct nx_info *nxi = sk->sk_nx_info;
++	__be32 saddr = sk_rcv_saddr(sk);
++
++	vxdprintk(VXD_CBIT(net, 5),
++		"__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx",
++		sk, NXAV4(nxa), nxi, NIPQUAD(saddr), sk->sk_socket,
++		(sk->sk_socket?sk->sk_socket->flags:0));
++
++	if (saddr) {		/* direct address match */
++		return v4_addr_match(nxa, saddr, -1);
++	} else if (nxi) {	/* match against nx_info */
++		return v4_nx_addr_in_nx_info(nxi, nxa, -1);
++	} else {		/* unrestricted any socket */
++		return 1;
++	}
++}
++
++
++
++static inline
++int nx_dev_visible(struct nx_info *nxi, struct net_device *dev)
++{
++	vxdprintk(VXD_CBIT(net, 1),
++		"nx_dev_visible(%p[#%u],%p " VS_Q("%s") ") %d",
++		nxi, nxi ? nxi->nx_id : 0, dev, dev->name,
++		nxi ? dev_in_nx_info(dev, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (dev_in_nx_info(dev, nxi))
++		return 1;
++	return 0;
++}
++
++
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (!ifa)
++		return 0;
++	return v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW);
++}
++
++static inline
++int nx_v4_ifa_visible(struct nx_info *nxi, struct in_ifaddr *ifa)
++{
++	vxdprintk(VXD_CBIT(net, 1), "nx_v4_ifa_visible(%p[#%u],%p) %d",
++		nxi, nxi ? nxi->nx_id : 0, ifa,
++		nxi ? v4_ifa_in_nx_info(ifa, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (v4_ifa_in_nx_info(ifa, nxi))
++		return 1;
++	return 0;
++}
++
++
++struct nx_v4_sock_addr {
++	__be32 saddr;	/* Address used for validation */
++	__be32 baddr;	/* Address used for socket bind */
++};
++
++static inline
++int v4_map_sock_addr(struct inet_sock *inet, struct sockaddr_in *addr,
++	struct nx_v4_sock_addr *nsa)
++{
++	struct sock *sk = &inet->sk;
++	struct nx_info *nxi = sk->sk_nx_info;
++	__be32 saddr = addr->sin_addr.s_addr;
++	__be32 baddr = saddr;
++
++	vxdprintk(VXD_CBIT(net, 3),
++		"inet_bind(%p)* %p,%p;%lx " NIPQUAD_FMT,
++		sk, sk->sk_nx_info, sk->sk_socket,
++		(sk->sk_socket ? sk->sk_socket->flags : 0),
++		NIPQUAD(saddr));
++
++	if (nxi) {
++		if (saddr == INADDR_ANY) {
++			if (nx_info_flags(nxi, NXF_SINGLE_IP, 0))
++				baddr = nxi->v4.ip[0].s_addr;
++		} else if (saddr == IPI_LOOPBACK) {
++			if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++				baddr = nxi->v4_lback.s_addr;
++		} else if (!ipv4_is_multicast(saddr) ||
++			!nx_info_ncaps(nxi, NXC_MULTICAST)) {
++			/* normal address bind */
++			if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
++				return -EADDRNOTAVAIL;
++		}
++	}
++
++	vxdprintk(VXD_CBIT(net, 3),
++		"inet_bind(%p) " NIPQUAD_FMT ", " NIPQUAD_FMT,
++		sk, NIPQUAD(saddr), NIPQUAD(baddr));
++
++	nsa->saddr = saddr;
++	nsa->baddr = baddr;
++	return 0;
++}
++
++static inline
++void v4_set_sock_addr(struct inet_sock *inet, struct nx_v4_sock_addr *nsa)
++{
++	inet->inet_saddr = nsa->baddr;
++	inet->inet_rcv_saddr = nsa->baddr;
++}
++
++
++/*
++ *      helper to simplify inet_lookup_listener
++ *
++ *      nxi:	the socket's nx_info if any
++ *      addr:	to be verified address
++ *      saddr:	socket address
++ */
++static inline int v4_inet_addr_match (
++	struct nx_info *nxi,
++	__be32 addr,
++	__be32 saddr)
++{
++	if (addr && (saddr == addr))
++		return 1;
++	if (!saddr)
++		return nxi ? v4_addr_in_nx_info(nxi, addr, NXA_MASK_BIND) : 1;
++	return 0;
++}
++
++static inline __be32 nx_map_sock_lback(struct nx_info *nxi, __be32 addr)
++{
++	if (nx_info_flags(nxi, NXF_HIDE_LBACK, 0) &&
++		(addr == nxi->v4_lback.s_addr))
++		return IPI_LOOPBACK;
++	return addr;
++}
++
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (NX_IPV4(nxi))
++		return 1;
++	if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
++		return 1;
++	return 0;
++}
++
++#else /* CONFIG_INET */
++
++static inline
++int nx_dev_visible(struct nx_info *n, struct net_device *d)
++{
++	return 1;
++}
++
++static inline
++int nx_v4_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++	return 1;
++}
++
++static inline
++int v4_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++	return 1;
++}
++
++static inline
++int nx_info_has_v4(struct nx_info *nxi)
++{
++	return 0;
++}
++
++#endif /* CONFIG_INET */
++
++#define current_nx_info_has_v4() \
++	nx_info_has_v4(current_nx_info())
++
++#else
++// #warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_inet6.h linux-3.7.10-vs2.3.5.6/include/linux/vs_inet6.h
+--- linux-3.7.10/include/linux/vs_inet6.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_inet6.h	2013-01-04 23:27:50.000000000 +0000
+@@ -0,0 +1,257 @@
++#ifndef _VS_INET6_H
++#define _VS_INET6_H
++
++#include "vserver/base.h"
++#include "vserver/network.h"
++#include "vserver/debug.h"
++
++#include <net/ipv6.h>
++
++#define NXAV6(a)	&(a)->ip, &(a)->mask, (a)->prefix, (a)->type
++#define NXAV6_FMT	"[%pI6/%pI6/%d:%04x]"
++
++
++#ifdef	CONFIG_IPV6
++
++static inline
++int v6_addr_match(struct nx_addr_v6 *nxa,
++	const struct in6_addr *addr, uint16_t mask)
++{
++	int ret = 0;
++
++	switch (nxa->type & mask) {
++	case NXA_TYPE_MASK:
++		ret = ipv6_masked_addr_cmp(&nxa->ip, &nxa->mask, addr);
++		break;
++	case NXA_TYPE_ADDR:
++		ret = ipv6_addr_equal(&nxa->ip, addr);
++		break;
++	case NXA_TYPE_ANY:
++		ret = 1;
++		break;
++	}
++	vxdprintk(VXD_CBIT(net, 0),
++		"v6_addr_match(%p" NXAV6_FMT ",%pI6,%04x) = %d",
++		nxa, NXAV6(nxa), addr, mask, ret);
++	return ret;
++}
++
++static inline
++int v6_addr_in_nx_info(struct nx_info *nxi,
++	const struct in6_addr *addr, uint16_t mask)
++{
++	struct nx_addr_v6 *nxa;
++	unsigned long irqflags;
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (nxa = &nxi->v6; nxa; nxa = nxa->next)
++		if (v6_addr_match(nxa, addr, mask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++out:
++	vxdprintk(VXD_CBIT(net, 0),
++		"v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
++		nxi, nxi ? nxi->nx_id : 0, addr, mask, ret);
++	return ret;
++}
++
++static inline
++int v6_nx_addr_match(struct nx_addr_v6 *nxa, struct nx_addr_v6 *addr, uint16_t mask)
++{
++	/* FIXME: needs full range checks */
++	return v6_addr_match(nxa, &addr->ip, mask);
++}
++
++static inline
++int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
++{
++	struct nx_addr_v6 *ptr;
++	unsigned long irqflags;
++	int ret = 1;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	for (ptr = &nxi->v6; ptr; ptr = ptr->next)
++		if (v6_nx_addr_match(ptr, nxa, mask))
++			goto out_unlock;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	return ret;
++}
++
++
++/*
++ *	Check if a given address matches for a socket
++ *
++ *	nxi:		the socket's nx_info if any
++ *	addr:		to be verified address
++ */
++static inline
++int v6_sock_addr_match (
++	struct nx_info *nxi,
++	struct inet_sock *inet,
++	struct in6_addr *addr)
++{
++	struct sock *sk = &inet->sk;
++	struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	if (!ipv6_addr_any(addr) &&
++		ipv6_addr_equal(saddr, addr))
++		return 1;
++	if (ipv6_addr_any(saddr))
++		return v6_addr_in_nx_info(nxi, addr, -1);
++	return 0;
++}
++
++/*
++ *	check if address is covered by socket
++ *
++ *	sk:	the socket to check against
++ *	addr:	the address in question (must be != 0)
++ */
++
++static inline
++int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa)
++{
++	struct nx_info *nxi = sk->sk_nx_info;
++	struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	vxdprintk(VXD_CBIT(net, 5),
++		"__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx",
++		sk, NXAV6(nxa), nxi, saddr, sk->sk_socket,
++		(sk->sk_socket?sk->sk_socket->flags:0));
++
++	if (!ipv6_addr_any(saddr)) {	/* direct address match */
++		return v6_addr_match(nxa, saddr, -1);
++	} else if (nxi) {		/* match against nx_info */
++		return v6_nx_addr_in_nx_info(nxi, nxa, -1);
++	} else {			/* unrestricted any socket */
++		return 1;
++	}
++}
++
++
++/* inet related checks and helpers */
++
++
++struct in_ifaddr;
++struct net_device;
++struct sock;
++
++
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <net/inet_timewait_sock.h>
++
++
++int dev_in_nx_info(struct net_device *, struct nx_info *);
++int v6_dev_in_nx_info(struct net_device *, struct nx_info *);
++int nx_v6_addr_conflict(struct nx_info *, struct nx_info *);
++
++
++
++static inline
++int v6_ifa_in_nx_info(struct inet6_ifaddr *ifa, struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (!ifa)
++		return 0;
++	return v6_addr_in_nx_info(nxi, &ifa->addr, -1);
++}
++
++static inline
++int nx_v6_ifa_visible(struct nx_info *nxi, struct inet6_ifaddr *ifa)
++{
++	vxdprintk(VXD_CBIT(net, 1), "nx_v6_ifa_visible(%p[#%u],%p) %d",
++		nxi, nxi ? nxi->nx_id : 0, ifa,
++		nxi ? v6_ifa_in_nx_info(ifa, nxi) : 0);
++
++	if (!nx_info_flags(nxi, NXF_HIDE_NETIF, 0))
++		return 1;
++	if (v6_ifa_in_nx_info(ifa, nxi))
++		return 1;
++	return 0;
++}
++
++
++struct nx_v6_sock_addr {
++	struct in6_addr saddr;	/* Address used for validation */
++	struct in6_addr baddr;	/* Address used for socket bind */
++};
++
++static inline
++int v6_map_sock_addr(struct inet_sock *inet, struct sockaddr_in6 *addr,
++	struct nx_v6_sock_addr *nsa)
++{
++	// struct sock *sk = &inet->sk;
++	// struct nx_info *nxi = sk->sk_nx_info;
++	struct in6_addr saddr = addr->sin6_addr;
++	struct in6_addr baddr = saddr;
++
++	nsa->saddr = saddr;
++	nsa->baddr = baddr;
++	return 0;
++}
++
++static inline
++void v6_set_sock_addr(struct inet_sock *inet, struct nx_v6_sock_addr *nsa)
++{
++	// struct sock *sk = &inet->sk;
++	// struct in6_addr *saddr = inet6_rcv_saddr(sk);
++
++	// *saddr = nsa->baddr;
++	// inet->inet_saddr = nsa->baddr;
++}
++
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++	if (!nxi)
++		return 1;
++	if (NX_IPV6(nxi))
++		return 1;
++	return 0;
++}
++
++#else /* CONFIG_IPV6 */
++
++static inline
++int nx_v6_dev_visible(struct nx_info *n, struct net_device *d)
++{
++	return 1;
++}
++
++
++static inline
++int nx_v6_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
++{
++	return 1;
++}
++
++static inline
++int v6_ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
++{
++	return 1;
++}
++
++static inline
++int nx_info_has_v6(struct nx_info *nxi)
++{
++	return 0;
++}
++
++#endif /* CONFIG_IPV6 */
++
++#define current_nx_info_has_v6() \
++	nx_info_has_v6(current_nx_info())
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_limit.h linux-3.7.10-vs2.3.5.6/include/linux/vs_limit.h
+--- linux-3.7.10/include/linux/vs_limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_limit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,140 @@
++#ifndef _VS_LIMIT_H
++#define _VS_LIMIT_H
++
++#include "vserver/limit.h"
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/context.h"
++#include "vserver/limit_int.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__)
++
++
++#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)
++
++
++/* 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__)
++
++
++#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)
++
++
++/* dentry limits */
++
++#define vx_dentry_inc(d) do {						\
++	if ((d)->d_count == 1)						\
++		vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY);	\
++	} while (0)
++
++#define vx_dentry_dec(d) do {						\
++	if ((d)->d_count == 0)						\
++		vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY);	\
++	} while (0)
++
++#define vx_dentry_avail(n) \
++	vx_cres_avail(current_vx_info(), n, VLIMIT_DENTRY)
++
++
++/* 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)
++
++
++#define vx_semary_inc(a) \
++	vx_acc_cres(current_vx_info(), 1, a, VLIMIT_SEMARY)
++
++#define vx_semary_dec(a) \
++	vx_acc_cres(current_vx_info(), -1, a, VLIMIT_SEMARY)
++
++
++#define vx_nsems_add(a,n) \
++	vx_add_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++
++#define vx_nsems_sub(a,n) \
++	vx_sub_cres(current_vx_info(), n, a, VLIMIT_NSEMS)
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_network.h linux-3.7.10-vs2.3.5.6/include/linux/vs_network.h
+--- linux-3.7.10/include/linux/vs_network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_network.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,169 @@
++#ifndef _NX_VS_NETWORK_H
++#define _NX_VS_NETWORK_H
++
++#include "vserver/context.h"
++#include "vserver/network.h"
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/debug.h"
++
++#include <linux/sched.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;
++}
++
++
++static inline void exit_nx_info(struct task_struct *p)
++{
++	if (p->nx_info)
++		release_nx_info(p->nx_info, p);
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_pid.h linux-3.7.10-vs2.3.5.6/include/linux/vs_pid.h
+--- linux-3.7.10/include/linux/vs_pid.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_pid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,50 @@
++#ifndef _VS_PID_H
++#define _VS_PID_H
++
++#include "vserver/base.h"
++#include "vserver/check.h"
++#include "vserver/context.h"
++#include "vserver/debug.h"
++#include "vserver/pid.h"
++#include <linux/pid_namespace.h>
++
++
++#define VXF_FAKE_INIT	(VXF_INFO_INIT | VXF_STATE_INIT)
++
++static inline
++int vx_proc_task_visible(struct task_struct *task)
++{
++	if ((task->pid == 1) &&
++		!vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT))
++		/* show a blend through init */
++		goto visible;
++	if (vx_check(vx_task_xid(task), VS_WATCH | VS_IDENT))
++		goto visible;
++	return 0;
++visible:
++	return 1;
++}
++
++#define find_task_by_real_pid(pid) find_task_by_pid_ns(pid, &init_pid_ns)
++
++
++static inline
++struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid)
++{
++	struct task_struct *task = get_pid_task(pid, PIDTYPE_PID);
++
++	if (task && !vx_proc_task_visible(task)) {
++		vxdprintk(VXD_CBIT(misc, 6),
++			"dropping task (get) %p[#%u,%u] for %p[#%u,%u]",
++			task, task->xid, task->pid,
++			current, current->xid, current->pid);
++		put_task_struct(task);
++		task = NULL;
++	}
++	return task;
++}
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_sched.h linux-3.7.10-vs2.3.5.6/include/linux/vs_sched.h
+--- linux-3.7.10/include/linux/vs_sched.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_sched.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,40 @@
++#ifndef _VS_SCHED_H
++#define _VS_SCHED_H
++
++#include "vserver/base.h"
++#include "vserver/context.h"
++#include "vserver/sched.h"
++
++
++#define MAX_PRIO_BIAS		 20
++#define MIN_PRIO_BIAS		-20
++
++static inline
++int vx_adjust_prio(struct task_struct *p, int prio, int max_user)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi)
++		prio += vx_cpu(vxi, sched_pc).prio_bias;
++	return prio;
++}
++
++static inline void vx_account_user(struct vx_info *vxi,
++	cputime_t cputime, int nice)
++{
++	if (!vxi)
++		return;
++	vx_cpu(vxi, sched_pc).user_ticks += cputime;
++}
++
++static inline void vx_account_system(struct vx_info *vxi,
++	cputime_t cputime, int idle)
++{
++	if (!vxi)
++		return;
++	vx_cpu(vxi, sched_pc).sys_ticks += cputime;
++}
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_socket.h linux-3.7.10-vs2.3.5.6/include/linux/vs_socket.h
+--- linux-3.7.10/include/linux/vs_socket.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_socket.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,67 @@
++#ifndef _VS_SOCKET_H
++#define _VS_SOCKET_H
++
++#include "vserver/debug.h"
++#include "vserver/base.h"
++#include "vserver/cacct.h"
++#include "vserver/context.h"
++#include "vserver/tag.h"
++
++
++/* socket accounting */
++
++#include <linux/socket.h>
++
++static inline int vx_sock_type(int family)
++{
++	switch (family) {
++	case PF_UNSPEC:
++		return VXA_SOCK_UNSPEC;
++	case PF_UNIX:
++		return VXA_SOCK_UNIX;
++	case PF_INET:
++		return VXA_SOCK_INET;
++	case PF_INET6:
++		return VXA_SOCK_INET6;
++	case PF_PACKET:
++		return VXA_SOCK_PACKET;
++	default:
++		return VXA_SOCK_OTHER;
++	}
++}
++
++#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_long_inc(&vxi->cacct.sock[type][pos].count);
++		atomic_long_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
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_tag.h linux-3.7.10-vs2.3.5.6/include/linux/vs_tag.h
+--- linux-3.7.10/include/linux/vs_tag.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_tag.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,47 @@
++#ifndef _VS_TAG_H
++#define _VS_TAG_H
++
++#include <linux/vserver/tag.h>
++
++/* check conditions */
++
++#define DX_ADMIN	0x0001
++#define DX_WATCH	0x0002
++#define DX_HOSTID	0x0008
++
++#define DX_IDENT	0x0010
++
++#define DX_ARG_MASK	0x0010
++
++
++#define dx_task_tag(t)	((t)->tag)
++
++#define dx_current_tag() dx_task_tag(current)
++
++#define dx_check(c, m)	__dx_check(dx_current_tag(), c, m)
++
++#define dx_weak_check(c, m)	((m) ? dx_check(c, m) : 1)
++
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode)
++{
++	if (mode & DX_ARG_MASK) {
++		if ((mode & DX_IDENT) && (id == cid))
++			return 1;
++	}
++	return (((mode & DX_ADMIN) && (cid == 0)) ||
++		((mode & DX_WATCH) && (cid == 1)) ||
++		((mode & DX_HOSTID) && (id == 0)));
++}
++
++struct inode;
++int dx_permission(const struct inode *inode, int mask);
++
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vs_time.h linux-3.7.10-vs2.3.5.6/include/linux/vs_time.h
+--- linux-3.7.10/include/linux/vs_time.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vs_time.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VS_TIME_H
++#define _VS_TIME_H
++
++
++/* time faking stuff */
++
++#ifdef CONFIG_VSERVER_VTIME
++
++extern void vx_adjust_timespec(struct timespec *ts);
++extern int vx_settimeofday(const struct timespec *ts);
++
++#else
++#define	vx_adjust_timespec(t)	do { } while (0)
++#define	vx_settimeofday(t)	do_settimeofday(t)
++#endif
++
++#else
++#warning duplicate inclusion
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/base.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/base.h
+--- linux-3.7.10/include/linux/vserver/base.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/base.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,178 @@
++#ifndef _VSERVER_BASE_H
++#define _VSERVER_BASE_H
++
++
++/* context state changes */
++
++enum {
++	VSC_STARTUP = 1,
++	VSC_SHUTDOWN,
++
++	VSC_NETUP,
++	VSC_NETDOWN,
++};
++
++
++
++#define vx_task_xid(t)	((t)->xid)
++
++#define vx_current_xid() vx_task_xid(current)
++
++#define current_vx_info() (current->vx_info)
++
++
++#define nx_task_nid(t)	((t)->nid)
++
++#define nx_current_nid() nx_task_nid(current)
++
++#define current_nx_info() (current->nx_info)
++
++
++/* generic flag merging */
++
++#define vs_check_flags(v, m, f)	(((v) & (m)) ^ (f))
++
++#define vs_mask_flags(v, f, m)	(((v) & ~(m)) | ((f) & (m)))
++
++#define vs_mask_mask(v, f, m)	(((v) & ~(m)) | ((v) & (f) & (m)))
++
++#define vs_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) \
++	vs_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))
++
++
++
++/* network flags */
++
++#define __nx_flags(n)	((n) ? (n)->nx_flags : 0)
++
++#define nx_current_flags()	__nx_flags(current_nx_info())
++
++#define nx_info_flags(n, m, f) \
++	vs_check_flags(__nx_flags(n), 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)
++
++
++/* network caps */
++
++#define __nx_ncaps(n)	((n) ? (n)->nx_ncaps : 0)
++
++#define nx_current_ncaps()	__nx_ncaps(current_nx_info())
++
++#define nx_info_ncaps(n, c)	(__nx_ncaps(n) & (c))
++
++#define nx_ncaps(c)	nx_info_ncaps(current_nx_info(), c)
++
++
++/* context mask capabilities */
++
++#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)
++
++
++/* context bcap mask */
++
++#define __vx_bcaps(v)		((v)->vx_bcaps)
++
++#define vx_current_bcaps()	__vx_bcaps(current_vx_info())
++
++
++/* mask given bcaps */
++
++#define vx_info_mbcaps(v, c)	((v) ? cap_intersect(__vx_bcaps(v), c) : c)
++
++#define vx_mbcaps(c)		vx_info_mbcaps(current_vx_info(), c)
++
++
++/* masked cap_bset */
++
++#define vx_info_cap_bset(v)	vx_info_mbcaps(v, current->cap_bset)
++
++#define vx_current_cap_bset()	vx_info_cap_bset(current_vx_info())
++
++#if 0
++#define vx_info_mbcap(v, b) \
++	(!vx_info_flags(v, VXF_STATE_SETUP, 0) ? \
++	vx_info_bcaps(v, b) : (b))
++
++#define task_vx_mbcap(t, b) \
++	vx_info_mbcap((t)->vx_info, (t)->b)
++
++#define vx_mbcap(b)	task_vx_mbcap(current, b)
++#endif
++
++#define vx_cap_raised(v, c, f)	cap_raised(vx_info_mbcaps(v, c), f)
++
++#define vx_capable(b, c) (capable(b) || \
++	(cap_raised(current_cap(), b) && vx_ccaps(c)))
++
++#define vx_ns_capable(n, b, c) (ns_capable(n, b) || \
++	(cap_raised(current_cap(), b) && vx_ccaps(c)))
++
++#define nx_capable(b, c) (capable(b) || \
++	(cap_raised(current_cap(), b) && nx_ncaps(c)))
++
++#define vx_task_initpid(t, n) \
++	((t)->vx_info && \
++	((t)->vx_info->vx_initpid == (n)))
++
++#define vx_current_initpid(n)	vx_task_initpid(current, n)
++
++
++/* context unshare mask */
++
++#define __vx_umask(v)		((v)->vx_umask)
++
++#define vx_current_umask()	__vx_umask(current_vx_info())
++
++#define vx_can_unshare(b, f) (capable(b) || \
++	(cap_raised(current_cap(), b) && \
++	!((f) & ~vx_current_umask())))
++
++
++#define __vx_wmask(v)		((v)->vx_wmask)
++
++#define vx_current_wmask()	__vx_wmask(current_vx_info())
++
++
++#define __vx_state(v)	((v) ? ((v)->vx_state) : 0)
++
++#define vx_info_state(v, m)	(__vx_state(v) & (m))
++
++
++#define __nx_state(n)	((n) ? ((n)->nx_state) : 0)
++
++#define nx_info_state(n, m)	(__nx_state(n) & (m))
++
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct.h
+--- linux-3.7.10/include/linux/vserver/cacct.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,15 @@
++#ifndef _VSERVER_CACCT_H
++#define _VSERVER_CACCT_H
++
++
++enum sock_acc_field {
++	VXA_SOCK_UNSPEC = 0,
++	VXA_SOCK_UNIX,
++	VXA_SOCK_INET,
++	VXA_SOCK_INET6,
++	VXA_SOCK_PACKET,
++	VXA_SOCK_OTHER,
++	VXA_SOCK_SIZE	/* array size */
++};
++
++#endif	/* _VSERVER_CACCT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_cmd.h
+--- linux-3.7.10/include/linux/vserver/cacct_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_CACCT_CMD_H
++#define _VSERVER_CACCT_CMD_H
++
++
++#include <linux/compiler.h>
++#include <uapi/vserver/cacct_cmd.h>
++
++extern int vc_sock_stat(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_def.h
+--- linux-3.7.10/include/linux/vserver/cacct_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,43 @@
++#ifndef _VSERVER_CACCT_DEF_H
++#define _VSERVER_CACCT_DEF_H
++
++#include <asm/atomic.h>
++#include <linux/vserver/cacct.h>
++
++
++struct _vx_sock_acc {
++	atomic_long_t count;
++	atomic_long_t total;
++};
++
++/* context sub struct */
++
++struct _vx_cacct {
++	struct _vx_sock_acc sock[VXA_SOCK_SIZE][3];
++	atomic_t slab[8];
++	atomic_t page[6][8];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
++{
++	int i, j;
++
++	printk("\t_vx_cacct:");
++	for (i = 0; i < 6; i++) {
++		struct _vx_sock_acc *ptr = cacct->sock[i];
++
++		printk("\t [%d] =", i);
++		for (j = 0; j < 3; j++) {
++			printk(" [%d] = %8lu, %8lu", j,
++				atomic_long_read(&ptr[j].count),
++				atomic_long_read(&ptr[j].total));
++		}
++		printk("\n");
++	}
++}
++
++#endif
++
++#endif	/* _VSERVER_CACCT_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cacct_int.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_int.h
+--- linux-3.7.10/include/linux/vserver/cacct_int.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cacct_int.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _VSERVER_CACCT_INT_H
++#define _VSERVER_CACCT_INT_H
++
++static inline
++unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos)
++{
++	return atomic_long_read(&cacct->sock[type][pos].count);
++}
++
++
++static inline
++unsigned long vx_sock_total(struct _vx_cacct *cacct, int type, int pos)
++{
++	return atomic_long_read(&cacct->sock[type][pos].total);
++}
++
++#endif	/* _VSERVER_CACCT_INT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/check.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/check.h
+--- linux-3.7.10/include/linux/vserver/check.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/check.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,89 @@
++#ifndef _VSERVER_CHECK_H
++#define _VSERVER_CHECK_H
++
++
++#define MAX_S_CONTEXT	65535	/* Arbitrary limit */
++
++#ifdef	CONFIG_VSERVER_DYNAMIC_IDS
++#define MIN_D_CONTEXT	49152	/* dynamic contexts start here */
++#else
++#define MIN_D_CONTEXT	65536
++#endif
++
++/* check conditions */
++
++#define VS_ADMIN	0x0001
++#define VS_WATCH	0x0002
++#define VS_HIDE		0x0004
++#define VS_HOSTID	0x0008
++
++#define VS_IDENT	0x0010
++#define VS_EQUIV	0x0020
++#define VS_PARENT	0x0040
++#define VS_CHILD	0x0080
++
++#define VS_ARG_MASK	0x00F0
++
++#define VS_DYNAMIC	0x0100
++#define VS_STATIC	0x0200
++
++#define VS_ATR_MASK	0x0F00
++
++#ifdef	CONFIG_VSERVER_PRIVACY
++#define VS_ADMIN_P	(0)
++#define VS_WATCH_P	(0)
++#else
++#define VS_ADMIN_P	VS_ADMIN
++#define VS_WATCH_P	VS_WATCH
++#endif
++
++#define VS_HARDIRQ	0x1000
++#define VS_SOFTIRQ	0x2000
++#define VS_IRQ		0x4000
++
++#define VS_IRQ_MASK	0xF000
++
++#include <linux/hardirq.h>
++
++/*
++ * check current context for ADMIN/WATCH and
++ * optionally against supplied argument
++ */
++static inline int __vs_check(int cid, int id, unsigned int mode)
++{
++	if (mode & VS_ARG_MASK) {
++		if ((mode & VS_IDENT) && (id == cid))
++			return 1;
++	}
++	if (mode & VS_ATR_MASK) {
++		if ((mode & VS_DYNAMIC) &&
++			(id >= MIN_D_CONTEXT) &&
++			(id <= MAX_S_CONTEXT))
++			return 1;
++		if ((mode & VS_STATIC) &&
++			(id > 1) && (id < MIN_D_CONTEXT))
++			return 1;
++	}
++	if (mode & VS_IRQ_MASK) {
++		if ((mode & VS_IRQ) && unlikely(in_interrupt()))
++			return 1;
++		if ((mode & VS_HARDIRQ) && unlikely(in_irq()))
++			return 1;
++		if ((mode & VS_SOFTIRQ) && unlikely(in_softirq()))
++			return 1;
++	}
++	return (((mode & VS_ADMIN) && (cid == 0)) ||
++		((mode & VS_WATCH) && (cid == 1)) ||
++		((mode & VS_HOSTID) && (id == 0)));
++}
++
++#define vx_check(c, m)	__vs_check(vx_current_xid(), c, (m) | VS_IRQ)
++
++#define vx_weak_check(c, m)	((m) ? vx_check(c, m) : 1)
++
++
++#define nx_check(c, m)	__vs_check(nx_current_nid(), c, m)
++
++#define nx_weak_check(c, m)	((m) ? nx_check(c, m) : 1)
++
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/context.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/context.h
+--- linux-3.7.10/include/linux/vserver/context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/context.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,110 @@
++#ifndef _VSERVER_CONTEXT_H
++#define _VSERVER_CONTEXT_H
++
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <uapi/vserver/context.h>
++
++#include "limit_def.h"
++#include "sched_def.h"
++#include "cvirt_def.h"
++#include "cacct_def.h"
++#include "device_def.h"
++
++#define VX_SPACES	2
++
++struct _vx_info_pc {
++	struct _vx_sched_pc sched_pc;
++	struct _vx_cvirt_pc cvirt_pc;
++};
++
++struct _vx_space {
++	unsigned long vx_nsmask;		/* assignment mask */
++	struct nsproxy *vx_nsproxy;             /* private namespaces */
++	struct fs_struct *vx_fs;                /* private namespace fs */
++	const struct cred *vx_cred;             /* task credentials */
++};
++
++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 _vx_space space[VX_SPACES];	/* namespace store */
++
++	uint64_t vx_flags;			/* context flags */
++	uint64_t vx_ccaps;			/* context caps (vserver) */
++	uint64_t vx_umask;			/* unshare mask (guest) */
++	uint64_t vx_wmask;			/* warn mask (guest) */
++	kernel_cap_t vx_bcaps;			/* bounding caps (system) */
++
++	struct task_struct *vx_reaper;		/* guest reaper process */
++	pid_t vx_initpid;			/* PID of guest init */
++	int64_t vx_badness_bias;		/* OOM points bias */
++
++	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 */
++
++	struct _vx_device dmap;			/* default device map targets */
++
++#ifndef CONFIG_SMP
++	struct _vx_info_pc info_pc;		/* per cpu data */
++#else
++	struct _vx_info_pc *ptr_pc;		/* per cpu array */
++#endif
++
++	wait_queue_head_t vx_wait;		/* context exit waitqueue */
++	int reboot_cmd;				/* last sys_reboot() cmd */
++	int exit_code;				/* last process exit code */
++
++	char vx_name[65];			/* vserver name */
++};
++
++#ifndef CONFIG_SMP
++#define	vx_ptr_pc(vxi)		(&(vxi)->info_pc)
++#define	vx_per_cpu(vxi, v, id)	vx_ptr_pc(vxi)->v
++#else
++#define	vx_ptr_pc(vxi)		((vxi)->ptr_pc)
++#define	vx_per_cpu(vxi, v, id)	per_cpu_ptr(vx_ptr_pc(vxi), id)->v
++#endif
++
++#define	vx_cpu(vxi, v)		vx_per_cpu(vxi, v, smp_processor_id())
++
++
++struct vx_info_save {
++	struct vx_info *vxi;
++	xid_t xid;
++};
++
++
++/* status flags */
++
++#define VXS_HASHED	0x0001
++#define VXS_PAUSED	0x0010
++#define VXS_SHUTDOWN	0x0100
++#define VXS_HELPER	0x1000
++#define VXS_RELEASED	0x8000
++
++
++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 *lookup_vx_info(int);
++extern struct vx_info *lookup_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 *, int);
++
++extern long vs_state_change(struct vx_info *, unsigned int);
++
++
++#endif	/* _VSERVER_CONTEXT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/context_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/context_cmd.h
+--- linux-3.7.10/include/linux/vserver/context_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/context_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,33 @@
++#ifndef _VSERVER_CONTEXT_CMD_H
++#define _VSERVER_CONTEXT_CMD_H
++
++#include <uapi/vserver/context_cmd.h>
++
++extern int vc_task_xid(uint32_t);
++
++extern int vc_vx_info(struct vx_info *, void __user *);
++
++extern int vc_ctx_stat(struct vx_info *, void __user *);
++
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
++
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
++
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
++
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
++
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
++
++extern int vc_get_wmask(struct vx_info *, void __user *);
++extern int vc_set_wmask(struct vx_info *, void __user *);
++
++extern int vc_get_badness(struct vx_info *, void __user *);
++extern int vc_set_badness(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cvirt.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt.h
+--- linux-3.7.10/include/linux/vserver/cvirt.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,18 @@
++#ifndef _VSERVER_CVIRT_H
++#define _VSERVER_CVIRT_H
++
++struct timespec;
++
++void vx_vsi_boottime(struct timespec *);
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++int vx_do_syslog(int, char __user *, int);
++
++#endif	/* _VSERVER_CVIRT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cvirt_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_cmd.h
+--- linux-3.7.10/include/linux/vserver/cvirt_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_CVIRT_CMD_H
++#define _VSERVER_CVIRT_CMD_H
++
++
++#include <linux/compiler.h>
++#include <uapi/vserver/cvirt_cmd.h>
++
++extern int vc_set_vhi_name(struct vx_info *, void __user *);
++extern int vc_get_vhi_name(struct vx_info *, void __user *);
++
++extern int vc_virt_stat(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/cvirt_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_def.h
+--- linux-3.7.10/include/linux/vserver/cvirt_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/cvirt_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,80 @@
++#ifndef _VSERVER_CVIRT_DEF_H
++#define _VSERVER_CVIRT_DEF_H
++
++#include <linux/jiffies.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 {
++	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_ts;	/* time offset to the host */
++	struct timespec bias_idle;
++	struct timespec bias_uptime;	/* context creation point */
++	uint64_t bias_clock;		/* offset in clock_t */
++
++	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 calculated */
++	uint32_t load[3];		/* load averages 1,5,15 */
++
++	atomic_t total_forks;		/* number of forks so far */
++
++	struct _vx_syslog syslog;
++};
++
++struct _vx_cvirt_pc {
++	struct _vx_usage_stat cpustat;
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
++{
++	printk("\t_vx_cvirt:\n");
++	printk("\t threads: %4d, %4d, %4d, %4d\n",
++		atomic_read(&cvirt->nr_threads),
++		atomic_read(&cvirt->nr_running),
++		atomic_read(&cvirt->nr_uninterruptible),
++		atomic_read(&cvirt->nr_onhold));
++	/* add rest here */
++	printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
++}
++
++#endif
++
++#endif	/* _VSERVER_CVIRT_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/debug.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug.h
+--- linux-3.7.10/include/linux/vserver/debug.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,145 @@
++#ifndef _VSERVER_DEBUG_H
++#define _VSERVER_DEBUG_H
++
++
++#define VXD_CBIT(n, m)	(vs_debug_ ## n & (1 << (m)))
++#define VXD_CMIN(n, m)	(vs_debug_ ## n > (m))
++#define VXD_MASK(n, m)	(vs_debug_ ## n & (m))
++
++#define VXD_DEV(d)	(d), (d)->bd_inode->i_ino,		\
++			imajor((d)->bd_inode), iminor((d)->bd_inode)
++#define VXF_DEV		"%p[%lu,%d:%d]"
++
++#if	defined(CONFIG_QUOTES_UTF8)
++#define	VS_Q_LQM	"\xc2\xbb"
++#define	VS_Q_RQM	"\xc2\xab"
++#elif	defined(CONFIG_QUOTES_ASCII)
++#define	VS_Q_LQM	"\x27"
++#define	VS_Q_RQM	"\x27"
++#else
++#define	VS_Q_LQM	"\xbb"
++#define	VS_Q_RQM	"\xab"
++#endif
++
++#define	VS_Q(f)		VS_Q_LQM f VS_Q_RQM
++
++
++#define vxd_path(p)						\
++	({ static char _buffer[PATH_MAX];			\
++	   d_path(p, _buffer, sizeof(_buffer)); })
++
++#define vxd_cond_path(n)					\
++	((n) ? vxd_path(&(n)->path) : "<null>" )
++
++
++#ifdef	CONFIG_VSERVER_DEBUG
++
++extern unsigned int vs_debug_switch;
++extern unsigned int vs_debug_xid;
++extern unsigned int vs_debug_nid;
++extern unsigned int vs_debug_tag;
++extern unsigned int vs_debug_net;
++extern unsigned int vs_debug_limit;
++extern unsigned int vs_debug_cres;
++extern unsigned int vs_debug_dlim;
++extern unsigned int vs_debug_quota;
++extern unsigned int vs_debug_cvirt;
++extern unsigned int vs_debug_space;
++extern unsigned int vs_debug_perm;
++extern unsigned int vs_debug_misc;
++
++
++#define VX_LOGLEVEL	"vxD: "
++#define VX_PROC_FMT	"%p: "
++#define VX_PROCESS	current
++
++#define vxdprintk(c, f, x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_LOGLEVEL VX_PROC_FMT f "\n",	\
++				VX_PROCESS , ##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)
++
++
++struct vx_info;
++
++void dump_vx_info(struct vx_info *, int);
++void dump_vx_info_inactive(int);
++
++#else	/* CONFIG_VSERVER_DEBUG */
++
++#define vs_debug_switch	0
++#define vs_debug_xid	0
++#define vs_debug_nid	0
++#define vs_debug_tag	0
++#define vs_debug_net	0
++#define vs_debug_limit	0
++#define vs_debug_cres	0
++#define vs_debug_dlim	0
++#define vs_debug_quota	0
++#define vs_debug_cvirt	0
++#define vs_debug_space	0
++#define vs_debug_perm	0
++#define vs_debug_misc	0
++
++#define vxdprintk(x...) do { } while (0)
++#define vxlprintk(x...) do { } while (0)
++#define vxfprintk(x...) do { } while (0)
++
++#endif	/* CONFIG_VSERVER_DEBUG */
++
++
++#ifdef	CONFIG_VSERVER_WARN
++
++#define VX_WARNLEVEL	KERN_WARNING "vxW: "
++#define VX_WARN_TASK	"[" VS_Q("%s") ",%u:#%u|%u|%u] "
++#define VX_WARN_XID	"[xid #%u] "
++#define VX_WARN_NID	"[nid #%u] "
++#define VX_WARN_TAG	"[tag #%u] "
++
++#define vxwprintk(c, f, x...)					\
++	do {							\
++		if (c)						\
++			printk(VX_WARNLEVEL f "\n", ##x);	\
++	} while (0)
++
++#else	/* CONFIG_VSERVER_WARN */
++
++#define vxwprintk(x...) do { } while (0)
++
++#endif	/* CONFIG_VSERVER_WARN */
++
++#define vxwprintk_task(c, f, x...)				\
++	vxwprintk(c, VX_WARN_TASK f,				\
++		current->comm, current->pid,			\
++		current->xid, current->nid, current->tag, ##x)
++#define vxwprintk_xid(c, f, x...)				\
++	vxwprintk(c, VX_WARN_XID f, current->xid, x)
++#define vxwprintk_nid(c, f, x...)				\
++	vxwprintk(c, VX_WARN_NID f, current->nid, x)
++#define vxwprintk_tag(c, f, x...)				\
++	vxwprintk(c, VX_WARN_TAG f, current->tag, x)
++
++#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 /* _VSERVER_DEBUG_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/debug_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug_cmd.h
+--- linux-3.7.10/include/linux/vserver/debug_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/debug_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_DEBUG_CMD_H
++#define _VSERVER_DEBUG_CMD_H
++
++#include <uapi/vserver/debug_cmd.h>
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_read_history_v0_x32 {
++	uint32_t index;
++	uint32_t count;
++	compat_uptr_t data_ptr;
++};
++
++struct	vcmd_read_monitor_v0_x32 {
++	uint32_t index;
++	uint32_t count;
++	compat_uptr_t data_ptr;
++};
++
++#endif  /* CONFIG_COMPAT */
++
++extern int vc_dump_history(uint32_t);
++
++extern int vc_read_history(uint32_t, void __user *);
++extern int vc_read_monitor(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_read_history_x32(uint32_t, void __user *);
++extern int vc_read_monitor_x32(uint32_t, void __user *);
++
++#endif  /* CONFIG_COMPAT */
++
++#endif	/* _VSERVER_DEBUG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/device.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/device.h
+--- linux-3.7.10/include/linux/vserver/device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/device.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,9 @@
++#ifndef _VSERVER_DEVICE_H
++#define _VSERVER_DEVICE_H
++
++
++#include <uapi/vserver/device.h>
++
++#else	/* _VSERVER_DEVICE_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_DEVICE_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/device_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_cmd.h
+--- linux-3.7.10/include/linux/vserver/device_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,31 @@
++#ifndef _VSERVER_DEVICE_CMD_H
++#define _VSERVER_DEVICE_CMD_H
++
++#include <uapi/vserver/device_cmd.h>
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_set_mapping_v0_x32 {
++	compat_uptr_t device_ptr;
++	compat_uptr_t target_ptr;
++	uint32_t flags;
++};
++
++#endif	/* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_set_mapping(struct vx_info *, void __user *);
++extern int vc_unset_mapping(struct vx_info *, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_set_mapping_x32(struct vx_info *, void __user *);
++extern int vc_unset_mapping_x32(struct vx_info *, void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* _VSERVER_DEVICE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/device_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_def.h
+--- linux-3.7.10/include/linux/vserver/device_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/device_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,17 @@
++#ifndef _VSERVER_DEVICE_DEF_H
++#define _VSERVER_DEVICE_DEF_H
++
++#include <linux/types.h>
++
++struct vx_dmap_target {
++	dev_t target;
++	uint32_t flags;
++};
++
++struct _vx_device {
++#ifdef CONFIG_VSERVER_DEVICE
++	struct vx_dmap_target targets[2];
++#endif
++};
++
++#endif	/* _VSERVER_DEVICE_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/dlimit.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit.h
+--- linux-3.7.10/include/linux/vserver/dlimit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,54 @@
++#ifndef _VSERVER_DLIMIT_H
++#define _VSERVER_DLIMIT_H
++
++#include "switch.h"
++
++
++#ifdef	__KERNEL__
++
++/*      keep in sync with CDLIM_INFINITY	*/
++
++#define DLIM_INFINITY		(~0ULL)
++
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++
++struct super_block;
++
++struct dl_info {
++	struct hlist_node dl_hlist;		/* linked list of contexts */
++	struct rcu_head dl_rcu;			/* the rcu head */
++	tag_t dl_tag;				/* context tag */
++	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 */
++
++	unsigned long long dl_space_used;	/* used space in bytes */
++	unsigned long long dl_space_total;	/* maximum space in bytes */
++	unsigned long dl_inodes_used;		/* used inodes */
++	unsigned long 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 *, tag_t);
++
++
++struct kstatfs;
++
++extern void vx_vsi_statfs(struct super_block *, struct kstatfs *);
++
++typedef uint64_t dlsize_t;
++
++#endif	/* __KERNEL__ */
++#else	/* _VSERVER_DLIMIT_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_DLIMIT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/dlimit_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit_cmd.h
+--- linux-3.7.10/include/linux/vserver/dlimit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/dlimit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,46 @@
++#ifndef _VSERVER_DLIMIT_CMD_H
++#define _VSERVER_DLIMIT_CMD_H
++
++#include <uapi/vserver/dlimit_cmd.h>
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++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	/* _VSERVER_DLIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/global.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/global.h
+--- linux-3.7.10/include/linux/vserver/global.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/global.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VSERVER_GLOBAL_H
++#define _VSERVER_GLOBAL_H
++
++
++extern atomic_t vx_global_ctotal;
++extern atomic_t vx_global_cactive;
++
++extern atomic_t nx_global_ctotal;
++extern atomic_t nx_global_cactive;
++
++extern atomic_t vs_global_nsproxy;
++extern atomic_t vs_global_fs;
++extern atomic_t vs_global_mnt_ns;
++extern atomic_t vs_global_uts_ns;
++extern atomic_t vs_global_user_ns;
++extern atomic_t vs_global_pid_ns;
++
++
++#endif /* _VSERVER_GLOBAL_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/history.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/history.h
+--- linux-3.7.10/include/linux/vserver/history.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/history.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,197 @@
++#ifndef _VSERVER_HISTORY_H
++#define _VSERVER_HISTORY_H
++
++
++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 _vxhe_vxi {
++	struct vx_info *ptr;
++	unsigned xid;
++	unsigned usecnt;
++	unsigned tasks;
++};
++
++struct _vxhe_set_clr {
++	void *data;
++};
++
++struct _vxhe_loc_lookup {
++	unsigned arg;
++};
++
++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;
++	};
++};
++
++#ifdef	CONFIG_VSERVER_HISTORY
++
++extern unsigned volatile int vxh_active;
++
++struct _vx_hist_entry *vxh_advance(void *loc);
++
++
++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	__HERE__ current_text_addr()
++
++#define __VXH_BODY(__type, __data, __here)	\
++	struct _vx_hist_entry *entry;		\
++						\
++	preempt_disable();			\
++	entry = vxh_advance(__here);		\
++	__data;					\
++	entry->type = __type;			\
++	preempt_enable();
++
++
++	/* pass vxi only */
++
++#define __VXH_SMPL				\
++	__vxh_copy_vxi(entry, vxi)
++
++static inline
++void	__vxh_smpl(struct vx_info *vxi, int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_SMPL, __here)
++}
++
++	/* pass vxi and data (void *) */
++
++#define __VXH_DATA				\
++	__vxh_copy_vxi(entry, vxi);		\
++	entry->sc.data = data
++
++static inline
++void	__vxh_data(struct vx_info *vxi, void *data,
++			int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_DATA, __here)
++}
++
++	/* pass vxi and arg (long) */
++
++#define __VXH_LONG				\
++	__vxh_copy_vxi(entry, vxi);		\
++	entry->ll.arg = arg
++
++static inline
++void	__vxh_long(struct vx_info *vxi, long arg,
++			int __type, void *__here)
++{
++	__VXH_BODY(__type, __VXH_LONG, __here)
++}
++
++
++static inline
++void	__vxh_throw_oops(void *__here)
++{
++	__VXH_BODY(VXH_THROW_OOPS, {}, __here);
++	/* prevent further acquisition */
++	vxh_active = 0;
++}
++
++
++#define vxh_throw_oops()	__vxh_throw_oops(__HERE__);
++
++#define __vxh_get_vx_info(v, h)	__vxh_smpl(v, VXH_GET_VX_INFO, h);
++#define __vxh_put_vx_info(v, h)	__vxh_smpl(v, VXH_PUT_VX_INFO, h);
++
++#define __vxh_init_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_INIT_VX_INFO, h);
++#define __vxh_set_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_SET_VX_INFO, h);
++#define __vxh_clr_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_CLR_VX_INFO, h);
++
++#define __vxh_claim_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_CLAIM_VX_INFO, h);
++#define __vxh_release_vx_info(v, d, h) \
++	__vxh_data(v, d, VXH_RELEASE_VX_INFO, h);
++
++#define vxh_alloc_vx_info(v) \
++	__vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
++#define vxh_dealloc_vx_info(v) \
++	__vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
++
++#define vxh_hash_vx_info(v) \
++	__vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
++#define vxh_unhash_vx_info(v) \
++	__vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
++
++#define vxh_loc_vx_info(v, l) \
++	__vxh_long(v, l, VXH_LOC_VX_INFO, __HERE__);
++#define vxh_lookup_vx_info(v, l) \
++	__vxh_long(v, l, VXH_LOOKUP_VX_INFO, __HERE__);
++#define vxh_create_vx_info(v, l) \
++	__vxh_long(v, l, VXH_CREATE_VX_INFO, __HERE__);
++
++extern void vxh_dump_history(void);
++
++
++#else  /* CONFIG_VSERVER_HISTORY */
++
++#define	__HERE__	0
++
++#define vxh_throw_oops()		do { } while (0)
++
++#define __vxh_get_vx_info(v, h)		do { } while (0)
++#define __vxh_put_vx_info(v, h)		do { } while (0)
++
++#define __vxh_init_vx_info(v, d, h)	do { } while (0)
++#define __vxh_set_vx_info(v, d, h)	do { } while (0)
++#define __vxh_clr_vx_info(v, d, h)	do { } while (0)
++
++#define __vxh_claim_vx_info(v, d, h)	do { } while (0)
++#define __vxh_release_vx_info(v, d, h)	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(v, l)		do { } while (0)
++#define vxh_lookup_vx_info(v, l)	do { } while (0)
++#define vxh_create_vx_info(v, l)	do { } while (0)
++
++#define vxh_dump_history()		do { } while (0)
++
++
++#endif /* CONFIG_VSERVER_HISTORY */
++
++#endif /* _VSERVER_HISTORY_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/inode.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode.h
+--- linux-3.7.10/include/linux/vserver/inode.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,19 @@
++#ifndef _VSERVER_INODE_H
++#define _VSERVER_INODE_H
++
++#include <uapi/vserver/inode.h>
++
++
++#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)
++
++#else	/* _VSERVER_INODE_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_INODE_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/inode_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode_cmd.h
+--- linux-3.7.10/include/linux/vserver/inode_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/inode_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,36 @@
++#ifndef _VSERVER_INODE_CMD_H
++#define _VSERVER_INODE_CMD_H
++
++#include <uapi/vserver/inode_cmd.h>
++
++
++
++#ifdef	CONFIG_COMPAT
++
++#include <asm/compat.h>
++
++struct	vcmd_ctx_iattr_v1_x32 {
++	compat_uptr_t name_ptr;
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++#endif	/* CONFIG_COMPAT */
++
++#include <linux/compiler.h>
++
++extern int vc_get_iattr(void __user *);
++extern int vc_set_iattr(void __user *);
++
++extern int vc_fget_iattr(uint32_t, void __user *);
++extern int vc_fset_iattr(uint32_t, void __user *);
++
++#ifdef	CONFIG_COMPAT
++
++extern int vc_get_iattr_x32(void __user *);
++extern int vc_set_iattr_x32(void __user *);
++
++#endif	/* CONFIG_COMPAT */
++
++#endif	/* _VSERVER_INODE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit.h
+--- linux-3.7.10/include/linux/vserver/limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,61 @@
++#ifndef _VSERVER_LIMIT_H
++#define _VSERVER_LIMIT_H
++
++#include <uapi/vserver/limit.h>
++
++
++#define	VLIM_NOCHECK	((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS))
++
++/*	keep in sync with CRLIM_INFINITY */
++
++#define	VLIM_INFINITY	(~0ULL)
++
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
++#ifndef RLIM_INFINITY
++#warning RLIM_INFINITY is undefined
++#endif
++
++#define __rlim_val(l, r, v)	((l)->res[r].v)
++
++#define __rlim_soft(l, r)	__rlim_val(l, r, soft)
++#define __rlim_hard(l, r)	__rlim_val(l, r, hard)
++
++#define __rlim_rcur(l, r)	__rlim_val(l, r, rcur)
++#define __rlim_rmin(l, r)	__rlim_val(l, r, rmin)
++#define __rlim_rmax(l, r)	__rlim_val(l, r, rmax)
++
++#define __rlim_lhit(l, r)	__rlim_val(l, r, lhit)
++#define __rlim_hit(l, r)	atomic_inc(&__rlim_lhit(l, r))
++
++typedef atomic_long_t rlim_atomic_t;
++typedef unsigned long rlim_t;
++
++#define __rlim_get(l, r)	atomic_long_read(&__rlim_rcur(l, r))
++#define __rlim_set(l, r, v)	atomic_long_set(&__rlim_rcur(l, r), v)
++#define __rlim_inc(l, r)	atomic_long_inc(&__rlim_rcur(l, r))
++#define __rlim_dec(l, r)	atomic_long_dec(&__rlim_rcur(l, r))
++#define __rlim_add(l, r, v)	atomic_long_add(v, &__rlim_rcur(l, r))
++#define __rlim_sub(l, r, v)	atomic_long_sub(v, &__rlim_rcur(l, r))
++
++
++#if	(RLIM_INFINITY == VLIM_INFINITY)
++#define	VX_VLIM(r) ((long long)(long)(r))
++#define	VX_RLIM(v) ((rlim_t)(v))
++#else
++#define	VX_VLIM(r) (((r) == RLIM_INFINITY) \
++		? VLIM_INFINITY : (long long)(r))
++#define	VX_RLIM(v) (((v) == VLIM_INFINITY) \
++		? RLIM_INFINITY : (rlim_t)(v))
++#endif
++
++struct sysinfo;
++
++void vx_vsi_meminfo(struct sysinfo *);
++void vx_vsi_swapinfo(struct sysinfo *);
++long vx_vsi_cached(struct sysinfo *);
++
++#define NUM_LIMITS	24
++
++#endif	/* _VSERVER_LIMIT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_cmd.h
+--- linux-3.7.10/include/linux/vserver/limit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,35 @@
++#ifndef _VSERVER_LIMIT_CMD_H
++#define _VSERVER_LIMIT_CMD_H
++
++#include <uapi/vserver/limit_cmd.h>
++
++
++#ifdef	CONFIG_IA32_EMULATION
++
++struct	vcmd_ctx_rlimit_v0_x32 {
++	uint32_t id;
++	uint64_t minimum;
++	uint64_t softlimit;
++	uint64_t maximum;
++} __attribute__ ((packed));
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++#include <linux/compiler.h>
++
++extern int vc_get_rlimit_mask(uint32_t, void __user *);
++extern int vc_get_rlimit(struct vx_info *, void __user *);
++extern int vc_set_rlimit(struct vx_info *, void __user *);
++extern int vc_reset_hits(struct vx_info *, void __user *);
++extern int vc_reset_minmax(struct vx_info *, void __user *);
++
++extern int vc_rlimit_stat(struct vx_info *, void __user *);
++
++#ifdef	CONFIG_IA32_EMULATION
++
++extern int vc_get_rlimit_x32(struct vx_info *, void __user *);
++extern int vc_set_rlimit_x32(struct vx_info *, void __user *);
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++#endif	/* _VSERVER_LIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_def.h
+--- linux-3.7.10/include/linux/vserver/limit_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,47 @@
++#ifndef _VSERVER_LIMIT_DEF_H
++#define _VSERVER_LIMIT_DEF_H
++
++#include <asm/atomic.h>
++#include <asm/resource.h>
++
++#include "limit.h"
++
++
++struct _vx_res_limit {
++	rlim_t soft;		/* Context soft limit */
++	rlim_t hard;		/* Context hard limit */
++
++	rlim_atomic_t rcur;	/* Current value */
++	rlim_t rmin;		/* Context minimum */
++	rlim_t rmax;		/* Context maximum */
++
++	atomic_t lhit;		/* Limit hits */
++};
++
++/* context sub struct */
++
++struct _vx_limit {
++	struct _vx_res_limit res[NUM_LIMITS];
++};
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_limit(struct _vx_limit *limit)
++{
++	int i;
++
++	printk("\t_vx_limit:");
++	for (i = 0; i < NUM_LIMITS; i++) {
++		printk("\t [%2d] = %8lu %8lu/%8lu, %8ld/%8ld, %8d\n",
++			i, (unsigned long)__rlim_get(limit, i),
++			(unsigned long)__rlim_rmin(limit, i),
++			(unsigned long)__rlim_rmax(limit, i),
++			(long)__rlim_soft(limit, i),
++			(long)__rlim_hard(limit, i),
++			atomic_read(&__rlim_lhit(limit, i)));
++	}
++}
++
++#endif
++
++#endif	/* _VSERVER_LIMIT_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/limit_int.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_int.h
+--- linux-3.7.10/include/linux/vserver/limit_int.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/limit_int.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,193 @@
++#ifndef _VSERVER_LIMIT_INT_H
++#define _VSERVER_LIMIT_INT_H
++
++#define VXD_RCRES_COND(r)	VXD_CBIT(cres, r)
++#define VXD_RLIMIT_COND(r)	VXD_CBIT(limit, r)
++
++extern const char *vlimit_name[NUM_LIMITS];
++
++static inline void __vx_acc_cres(struct vx_info *vxi,
++	int res, int dir, void *_data, char *_file, int _line)
++{
++	if (VXD_RCRES_COND(res))
++		vxlprintk(1, "vx_acc_cres[%5d,%s,%2d]: %5ld%s (%p)",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			(dir > 0) ? "++" : "--", _data, _file, _line);
++	if (!vxi)
++		return;
++
++	if (dir > 0)
++		__rlim_inc(&vxi->limit, res);
++	else
++		__rlim_dec(&vxi->limit, res);
++}
++
++static inline void __vx_add_cres(struct vx_info *vxi,
++	int res, int amount, void *_data, char *_file, int _line)
++{
++	if (VXD_RCRES_COND(res))
++		vxlprintk(1, "vx_add_cres[%5d,%s,%2d]: %5ld += %5d (%p)",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			amount, _data, _file, _line);
++	if (amount == 0)
++		return;
++	if (!vxi)
++		return;
++	__rlim_add(&vxi->limit, res, amount);
++}
++
++static inline
++int __vx_cres_adjust_max(struct _vx_limit *limit, int res, rlim_t value)
++{
++	int cond = (value > __rlim_rmax(limit, res));
++
++	if (cond)
++		__rlim_rmax(limit, res) = value;
++	return cond;
++}
++
++static inline
++int __vx_cres_adjust_min(struct _vx_limit *limit, int res, rlim_t value)
++{
++	int cond = (value < __rlim_rmin(limit, res));
++
++	if (cond)
++		__rlim_rmin(limit, res) = value;
++	return cond;
++}
++
++static inline
++void __vx_cres_fixup(struct _vx_limit *limit, int res, rlim_t value)
++{
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++}
++
++
++/*	return values:
++	 +1 ... no limit hit
++	 -1 ... over soft limit
++	  0 ... over hard limit		*/
++
++static inline int __vx_cres_avail(struct vx_info *vxi,
++	int res, int num, char *_file, int _line)
++{
++	struct _vx_limit *limit;
++	rlim_t value;
++
++	if (VXD_RLIMIT_COND(res))
++		vxlprintk(1, "vx_cres_avail[%5d,%s,%2d]: %5ld/%5ld > %5ld + %5d",
++			(vxi ? vxi->vx_id : -1), vlimit_name[res], res,
++			(vxi ? (long)__rlim_soft(&vxi->limit, res) : -1),
++			(vxi ? (long)__rlim_hard(&vxi->limit, res) : -1),
++			(vxi ? (long)__rlim_get(&vxi->limit, res) : 0),
++			num, _file, _line);
++	if (!vxi)
++		return 1;
++
++	limit = &vxi->limit;
++	value = __rlim_get(limit, res);
++
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++
++	if (num == 0)
++		return 1;
++
++	if (__rlim_soft(limit, res) == RLIM_INFINITY)
++		return -1;
++	if (value + num <= __rlim_soft(limit, res))
++		return -1;
++
++	if (__rlim_hard(limit, res) == RLIM_INFINITY)
++		return 1;
++	if (value + num <= __rlim_hard(limit, res))
++		return 1;
++
++	__rlim_hit(limit, res);
++	return 0;
++}
++
++
++static const int VLA_RSS[] = { RLIMIT_RSS, VLIMIT_ANON, VLIMIT_MAPPED, 0 };
++
++static inline
++rlim_t __vx_cres_array_sum(struct _vx_limit *limit, const int *array)
++{
++	rlim_t value, sum = 0;
++	int res;
++
++	while ((res = *array++)) {
++		value = __rlim_get(limit, res);
++		__vx_cres_fixup(limit, res, value);
++		sum += value;
++	}
++	return sum;
++}
++
++static inline
++rlim_t __vx_cres_array_fixup(struct _vx_limit *limit, const int *array)
++{
++	rlim_t value = __vx_cres_array_sum(limit, array + 1);
++	int res = *array;
++
++	if (value == __rlim_get(limit, res))
++		return value;
++
++	__rlim_set(limit, res, value);
++	/* now adjust min/max */
++	if (!__vx_cres_adjust_max(limit, res, value))
++		__vx_cres_adjust_min(limit, res, value);
++
++	return value;
++}
++
++static inline int __vx_cres_array_avail(struct vx_info *vxi,
++	const int *array, int num, char *_file, int _line)
++{
++	struct _vx_limit *limit;
++	rlim_t value = 0;
++	int res;
++
++	if (num == 0)
++		return 1;
++	if (!vxi)
++		return 1;
++
++	limit = &vxi->limit;
++	res = *array;
++	value = __vx_cres_array_sum(limit, array + 1);
++
++	__rlim_set(limit, res, value);
++	__vx_cres_fixup(limit, res, value);
++
++	return __vx_cres_avail(vxi, res, num, _file, _line);
++}
++
++
++static inline void vx_limit_fixup(struct _vx_limit *limit, int id)
++{
++	rlim_t value;
++	int res;
++
++	/* complex resources first */
++	if ((id < 0) || (id == RLIMIT_RSS))
++		__vx_cres_array_fixup(limit, VLA_RSS);
++
++	for (res = 0; res < NUM_LIMITS; res++) {
++		if ((id > 0) && (res != id))
++			continue;
++
++		value = __rlim_get(limit, res);
++		__vx_cres_fixup(limit, res, value);
++
++		/* not supposed to happen, maybe warn? */
++		if (__rlim_rmax(limit, res) > __rlim_hard(limit, res))
++			__rlim_rmax(limit, res) = __rlim_hard(limit, res);
++	}
++}
++
++
++#endif	/* _VSERVER_LIMIT_INT_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/monitor.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/monitor.h
+--- linux-3.7.10/include/linux/vserver/monitor.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/monitor.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,6 @@
++#ifndef _VSERVER_MONITOR_H
++#define _VSERVER_MONITOR_H
++
++#include <uapi/vserver/monitor.h>
++
++#endif /* _VSERVER_MONITOR_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/network.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/network.h
+--- linux-3.7.10/include/linux/vserver/network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/network.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,76 @@
++#ifndef _VSERVER_NETWORK_H
++#define _VSERVER_NETWORK_H
++
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
++#include <uapi/vserver/network.h>
++
++struct nx_addr_v4 {
++	struct nx_addr_v4 *next;
++	struct in_addr ip[2];
++	struct in_addr mask;
++	uint16_t type;
++	uint16_t flags;
++};
++
++struct nx_addr_v6 {
++	struct nx_addr_v6 *next;
++	struct in6_addr ip;
++	struct in6_addr mask;
++	uint32_t prefix;
++	uint16_t type;
++	uint16_t flags;
++};
++
++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 */
++
++	spinlock_t addr_lock;		/* protect address changes */
++	struct in_addr v4_lback;	/* Loopback address */
++	struct in_addr v4_bcast;	/* Broadcast address */
++	struct nx_addr_v4 v4;		/* First/Single ipv4 address */
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 v6;		/* First/Single ipv6 address */
++#endif
++	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 *lookup_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 sock;
++
++
++#define NX_IPV4(n)	((n)->v4.type != NXA_TYPE_NONE)
++#ifdef  CONFIG_IPV6
++#define NX_IPV6(n)	((n)->v6.type != NXA_TYPE_NONE)
++#else
++#define NX_IPV6(n)	(0)
++#endif
++
++#endif	/* _VSERVER_NETWORK_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/network_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/network_cmd.h
+--- linux-3.7.10/include/linux/vserver/network_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/network_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,37 @@
++#ifndef _VSERVER_NETWORK_CMD_H
++#define _VSERVER_NETWORK_CMD_H
++
++#include <uapi/vserver/network_cmd.h>
++
++extern int vc_task_nid(uint32_t);
++
++extern int vc_nx_info(struct nx_info *, void __user *);
++
++extern int vc_net_create(uint32_t, void __user *);
++extern int vc_net_migrate(struct nx_info *, void __user *);
++
++extern int vc_net_add(struct nx_info *, void __user *);
++extern int vc_net_remove(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_add_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *);
++extern int vc_net_rem_ipv4(struct nx_info *, void __user *);
++
++extern int vc_net_add_ipv6(struct nx_info *, void __user *);
++extern int vc_net_remove_ipv6(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv4(struct nx_info *, void __user *);
++extern int vc_get_match_ipv4(struct nx_info *, void __user *);
++
++extern int vc_add_match_ipv6(struct nx_info *, void __user *);
++extern int vc_get_match_ipv6(struct nx_info *, void __user *);
++
++extern int vc_get_nflags(struct nx_info *, void __user *);
++extern int vc_set_nflags(struct nx_info *, void __user *);
++
++extern int vc_get_ncaps(struct nx_info *, void __user *);
++extern int vc_set_ncaps(struct nx_info *, void __user *);
++
++#endif	/* _VSERVER_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/percpu.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/percpu.h
+--- linux-3.7.10/include/linux/vserver/percpu.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/percpu.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_PERCPU_H
++#define _VSERVER_PERCPU_H
++
++#include "cvirt_def.h"
++#include "sched_def.h"
++
++struct	_vx_percpu {
++	struct _vx_cvirt_pc cvirt;
++	struct _vx_sched_pc sched;
++};
++
++#define	PERCPU_PERCTX	(sizeof(struct _vx_percpu))
++
++#endif	/* _VSERVER_PERCPU_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/pid.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/pid.h
+--- linux-3.7.10/include/linux/vserver/pid.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/pid.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,51 @@
++#ifndef _VSERVER_PID_H
++#define _VSERVER_PID_H
++
++/* 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;
++}
++
++#endif
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/sched.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched.h
+--- linux-3.7.10/include/linux/vserver/sched.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _VSERVER_SCHED_H
++#define _VSERVER_SCHED_H
++
++
++#ifdef	__KERNEL__
++
++struct timespec;
++
++void vx_vsi_uptime(struct timespec *, struct timespec *);
++
++
++struct vx_info;
++
++void vx_update_load(struct vx_info *);
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++	struct _vx_sched_pc *sched_pc);
++
++#endif	/* __KERNEL__ */
++#else	/* _VSERVER_SCHED_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_SCHED_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/sched_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_cmd.h
+--- linux-3.7.10/include/linux/vserver/sched_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,11 @@
++#ifndef _VSERVER_SCHED_CMD_H
++#define _VSERVER_SCHED_CMD_H
++
++
++#include <linux/compiler.h>
++#include <uapi/vserver/sched_cmd.h>
++
++extern int vc_set_prio_bias(struct vx_info *, void __user *);
++extern int vc_get_prio_bias(struct vx_info *, void __user *);
++
++#endif	/* _VSERVER_SCHED_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/sched_def.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_def.h
+--- linux-3.7.10/include/linux/vserver/sched_def.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/sched_def.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,38 @@
++#ifndef _VSERVER_SCHED_DEF_H
++#define _VSERVER_SCHED_DEF_H
++
++#include <linux/spinlock.h>
++#include <linux/jiffies.h>
++#include <linux/cpumask.h>
++#include <asm/atomic.h>
++#include <asm/param.h>
++
++
++/* context sub struct */
++
++struct _vx_sched {
++	int prio_bias;			/* bias offset for priority */
++
++	cpumask_t update;		/* CPUs which should update */
++};
++
++struct _vx_sched_pc {
++	int prio_bias;			/* bias offset for priority */
++
++	uint64_t user_ticks;		/* token tick events */
++	uint64_t sys_ticks;		/* token tick events */
++	uint64_t hold_ticks;		/* token ticks paused */
++};
++
++
++#ifdef CONFIG_VSERVER_DEBUG
++
++static inline void __dump_vx_sched(struct _vx_sched *sched)
++{
++	printk("\t_vx_sched:\n");
++	printk("\t priority = %4d\n", sched->prio_bias);
++}
++
++#endif
++
++#endif	/* _VSERVER_SCHED_DEF_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/signal.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal.h
+--- linux-3.7.10/include/linux/vserver/signal.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_H
++#define _VSERVER_SIGNAL_H
++
++
++#ifdef	__KERNEL__
++
++struct vx_info;
++
++int vx_info_kill(struct vx_info *, int, int);
++
++#endif	/* __KERNEL__ */
++#else	/* _VSERVER_SIGNAL_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_SIGNAL_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/signal_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal_cmd.h
+--- linux-3.7.10/include/linux/vserver/signal_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/signal_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _VSERVER_SIGNAL_CMD_H
++#define _VSERVER_SIGNAL_CMD_H
++
++#include <uapi/vserver/signal_cmd.h>
++
++
++extern int vc_ctx_kill(struct vx_info *, void __user *);
++extern int vc_wait_exit(struct vx_info *, void __user *);
++
++
++extern int vc_get_pflags(uint32_t pid, void __user *);
++extern int vc_set_pflags(uint32_t pid, void __user *);
++
++#endif	/* _VSERVER_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/space.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/space.h
+--- linux-3.7.10/include/linux/vserver/space.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/space.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,12 @@
++#ifndef _VSERVER_SPACE_H
++#define _VSERVER_SPACE_H
++
++#include <linux/types.h>
++
++struct vx_info;
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index);
++
++#else	/* _VSERVER_SPACE_H */
++#warning duplicate inclusion
++#endif	/* _VSERVER_SPACE_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/space_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/space_cmd.h
+--- linux-3.7.10/include/linux/vserver/space_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/space_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _VSERVER_SPACE_CMD_H
++#define _VSERVER_SPACE_CMD_H
++
++#include <uapi/vserver/space_cmd.h>
++
++
++extern int vc_enter_space_v1(struct vx_info *, void __user *);
++extern int vc_set_space_v1(struct vx_info *, void __user *);
++extern int vc_enter_space(struct vx_info *, void __user *);
++extern int vc_set_space(struct vx_info *, void __user *);
++extern int vc_get_space_mask(void __user *, int);
++
++#endif	/* _VSERVER_SPACE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/switch.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/switch.h
+--- linux-3.7.10/include/linux/vserver/switch.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/switch.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,8 @@
++#ifndef _VSERVER_SWITCH_H
++#define _VSERVER_SWITCH_H
++
++
++#include <linux/errno.h>
++#include <uapi/vserver/switch.h>
++
++#endif	/* _VSERVER_SWITCH_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/tag.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag.h
+--- linux-3.7.10/include/linux/vserver/tag.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,143 @@
++#ifndef _DX_TAG_H
++#define _DX_TAG_H
++
++#include <linux/types.h>
++
++
++#define DX_TAG(in)	(IS_TAGGED(in))
++
++
++#ifdef CONFIG_TAG_NFSD
++#define DX_TAG_NFSD	1
++#else
++#define DX_TAG_NFSD	0
++#endif
++
++
++#ifdef CONFIG_TAGGING_NONE
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	(0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_GID16
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0x0000FFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (((gid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	\
++	((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_ID24
++
++#define MAX_UID		0x00FFFFFF
++#define MAX_GID		0x00FFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	\
++	((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag)	\
++	((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid))
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_UID16
++
++#define MAX_UID		0x0000FFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (((uid) >> 16) & 0xFFFF) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	\
++	((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid))
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifdef CONFIG_TAGGING_INTERN
++
++#define MAX_UID		0xFFFFFFFF
++#define MAX_GID		0xFFFFFFFF
++
++#define INOTAG_TAG(cond, uid, gid, tag)	\
++	((cond) ? (tag) : 0)
++
++#define TAGINO_UID(cond, uid, tag)	(uid)
++#define TAGINO_GID(cond, gid, tag)	(gid)
++
++#endif
++
++
++#ifndef CONFIG_TAGGING_NONE
++#define dx_current_fstag(sb)	\
++	((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0)
++#else
++#define dx_current_fstag(sb)	(0)
++#endif
++
++#ifndef CONFIG_TAGGING_INTERN
++#define TAGINO_TAG(cond, tag)	(0)
++#else
++#define TAGINO_TAG(cond, tag)	((cond) ? (tag) : 0)
++#endif
++
++#define INOTAG_UID(cond, uid, gid)	\
++	((cond) ? ((uid) & MAX_UID) : (uid))
++#define INOTAG_GID(cond, uid, gid)	\
++	((cond) ? ((gid) & MAX_GID) : (gid))
++
++
++static inline uid_t dx_map_uid(uid_t uid)
++{
++	if ((uid > MAX_UID) && (uid != -1))
++		uid = -2;
++	return (uid & MAX_UID);
++}
++
++static inline gid_t dx_map_gid(gid_t gid)
++{
++	if ((gid > MAX_GID) && (gid != -1))
++		gid = -2;
++	return (gid & MAX_GID);
++}
++
++struct peer_tag {
++	int32_t xid;
++	int32_t nid;
++};
++
++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK))
++
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++		 unsigned long *flags);
++
++#ifdef	CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode);
++
++#define dx_propagate_tag(n, i)	__dx_propagate_tag(n, i)
++
++#else
++#define dx_propagate_tag(n, i)	do { } while (0)
++#endif
++
++#endif /* _DX_TAG_H */
+diff -NurpP --minimal linux-3.7.10/include/linux/vserver/tag_cmd.h linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag_cmd.h
+--- linux-3.7.10/include/linux/vserver/tag_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/linux/vserver/tag_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,10 @@
++#ifndef _VSERVER_TAG_CMD_H
++#define _VSERVER_TAG_CMD_H
++
++#include <uapi/vserver/tag_cmd.h>
++
++extern int vc_task_tag(uint32_t);
++
++extern int vc_tag_migrate(uint32_t);
++
++#endif	/* _VSERVER_TAG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/net/addrconf.h linux-3.7.10-vs2.3.5.6/include/net/addrconf.h
+--- linux-3.7.10/include/net/addrconf.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/addrconf.h	2012-12-18 15:13:16.000000000 +0000
+@@ -81,7 +81,8 @@ extern int			ipv6_dev_get_saddr(struct n
+ 					       const struct net_device *dev,
+ 					       const struct in6_addr *daddr,
+ 					       unsigned int srcprefs,
+-					       struct in6_addr *saddr);
++					       struct in6_addr *saddr,
++					       struct nx_info *nxi);
+ extern int			ipv6_get_lladdr(struct net_device *dev,
+ 						struct in6_addr *addr,
+ 						unsigned char banned_flags);
+diff -NurpP --minimal linux-3.7.10/include/net/af_unix.h linux-3.7.10-vs2.3.5.6/include/net/af_unix.h
+--- linux-3.7.10/include/net/af_unix.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/af_unix.h	2012-12-18 15:13:16.000000000 +0000
+@@ -4,6 +4,7 @@
+ #include <linux/socket.h>
+ #include <linux/un.h>
+ #include <linux/mutex.h>
++#include <linux/vs_base.h>
+ #include <net/sock.h>
+ 
+ extern void unix_inflight(struct file *fp);
+diff -NurpP --minimal linux-3.7.10/include/net/inet_timewait_sock.h linux-3.7.10-vs2.3.5.6/include/net/inet_timewait_sock.h
+--- linux-3.7.10/include/net/inet_timewait_sock.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/inet_timewait_sock.h	2012-12-18 15:13:16.000000000 +0000
+@@ -112,6 +112,10 @@ struct inet_timewait_sock {
+ #define tw_net			__tw_common.skc_net
+ #define tw_daddr        	__tw_common.skc_daddr
+ #define tw_rcv_saddr    	__tw_common.skc_rcv_saddr
++#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
+ 	int			tw_timeout;
+ 	volatile unsigned char	tw_substate;
+ 	unsigned char		tw_rcv_wscale;
+diff -NurpP --minimal linux-3.7.10/include/net/ip6_route.h linux-3.7.10-vs2.3.5.6/include/net/ip6_route.h
+--- linux-3.7.10/include/net/ip6_route.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/ip6_route.h	2012-12-18 15:13:16.000000000 +0000
+@@ -97,7 +97,8 @@ extern int			ip6_route_get_saddr(struct
+ 						    struct rt6_info *rt,
+ 						    const struct in6_addr *daddr,
+ 						    unsigned int prefs,
+-						    struct in6_addr *saddr);
++						    struct in6_addr *saddr,
++						    struct nx_info *nxi);
+ 
+ extern struct rt6_info		*rt6_lookup(struct net *net,
+ 					    const struct in6_addr *daddr,
+diff -NurpP --minimal linux-3.7.10/include/net/route.h linux-3.7.10-vs2.3.5.6/include/net/route.h
+--- linux-3.7.10/include/net/route.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/route.h	2012-12-18 15:13:16.000000000 +0000
+@@ -204,6 +204,9 @@ static inline void ip_rt_put(struct rtab
+ 		dst_release(&rt->dst);
+ }
+ 
++#include <linux/vs_base.h>
++#include <linux/vs_inet.h>
++
+ #define IPTOS_RT_MASK	(IPTOS_TOS_MASK & ~3)
+ 
+ extern const __u8 ip_tos2prio[16];
+@@ -253,6 +256,9 @@ static inline void ip_route_connect_init
+ 			   protocol, flow_flags, dst, src, dport, sport);
+ }
+ 
++extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *,
++	struct flowi4 *);
++
+ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
+ 					      __be32 dst, __be32 src, u32 tos,
+ 					      int oif, u8 protocol,
+@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co
+ {
+ 	struct net *net = sock_net(sk);
+ 	struct rtable *rt;
++	struct nx_info *nx_info = current_nx_info();
+ 
+ 	ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
+ 			      sport, dport, sk, can_sleep);
+ 
+-	if (!dst || !src) {
++	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));
++
++	rt = ip_v4_find_src(net, nx_info, fl4);
++	if (IS_ERR(rt))
++		return rt;
++	ip_rt_put(rt);
++
++	if (!fl4->daddr || !fl4->saddr) {
+ 		rt = __ip_route_output_key(net, fl4);
+ 		if (IS_ERR(rt))
+ 			return rt;
+diff -NurpP --minimal linux-3.7.10/include/net/sock.h linux-3.7.10-vs2.3.5.6/include/net/sock.h
+--- linux-3.7.10/include/net/sock.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/net/sock.h	2012-12-18 15:13:16.000000000 +0000
+@@ -171,6 +171,10 @@ struct sock_common {
+ #ifdef CONFIG_NET_NS
+ 	struct net	 	*skc_net;
+ #endif
++	xid_t			skc_xid;
++	struct vx_info		*skc_vx_info;
++	nid_t			skc_nid;
++	struct nx_info		*skc_nx_info;
+ 	/*
+ 	 * fields between dontcopy_begin/dontcopy_end
+ 	 * are not copied in sock_copy()
+@@ -283,6 +287,10 @@ struct sock {
+ #define sk_bind_node		__sk_common.skc_bind_node
+ #define sk_prot			__sk_common.skc_prot
+ #define sk_net			__sk_common.skc_net
++#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
+ 	socket_lock_t		sk_lock;
+ 	struct sk_buff_head	sk_receive_queue;
+ 	/*
+diff -NurpP --minimal linux-3.7.10/include/uapi/Kbuild linux-3.7.10-vs2.3.5.6/include/uapi/Kbuild
+--- linux-3.7.10/include/uapi/Kbuild	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/Kbuild	2012-12-18 15:13:16.000000000 +0000
+@@ -12,3 +12,4 @@ header-y += video/
+ header-y += drm/
+ header-y += xen/
+ header-y += scsi/
++header-y += vserver/
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/capability.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/capability.h
+--- linux-3.7.10/include/uapi/linux/capability.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/capability.h	2012-12-18 15:13:16.000000000 +0000
+@@ -259,6 +259,7 @@ struct vfs_cap_data {
+    arbitrary SCSI commands */
+ /* Allow setting encryption key on loopback filesystem */
+ /* Allow setting zone reclaim policy */
++/* Allow the selection of a security context */
+ 
+ #define CAP_SYS_ADMIN        21
+ 
+@@ -345,7 +346,12 @@ struct vfs_cap_data {
+ 
+ #define CAP_LAST_CAP         CAP_BLOCK_SUSPEND
+ 
+-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
++/* Allow context manipulations */
++/* Allow changing context info on files */
++
++#define CAP_CONTEXT	     63
++
++#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT))
+ 
+ /*
+  * Bit location of each capability (used by user-space library and kernel)
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/fs.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/fs.h
+--- linux-3.7.10/include/uapi/linux/fs.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/fs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -86,6 +86,9 @@ struct inodes_stat_t {
+ #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
+ #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
+ #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
++#define MS_TAGGED	(1<<25) /* use generic inode tagging */
++#define MS_TAGID	(1<<26) /* use specific tag for this mount */
++#define MS_NOTAGCHECK	(1<<27) /* don't check tags */
+ #define MS_NOSEC	(1<<28)
+ #define MS_BORN		(1<<29)
+ #define MS_ACTIVE	(1<<30)
+@@ -189,11 +192,14 @@ struct inodes_stat_t {
+ #define FS_EXTENT_FL			0x00080000 /* Extents */
+ #define FS_DIRECTIO_FL			0x00100000 /* Use direct i/o */
+ #define FS_NOCOW_FL			0x00800000 /* Do not cow file */
++#define FS_IXUNLINK_FL			0x08000000 /* Immutable invert on unlink */
+ #define FS_RESERVED_FL			0x80000000 /* reserved for ext2 lib */
+ 
+-#define FS_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
+-#define FS_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
++#define FS_BARRIER_FL			0x04000000 /* Barrier for chroot() */
++#define FS_COW_FL			0x20000000 /* Copy on Write marker */
+ 
++#define FS_FL_USER_VISIBLE		0x0103DFFF /* User visible flags */
++#define FS_FL_USER_MODIFIABLE		0x010380FF /* User modifiable flags */
+ 
+ #define SYNC_FILE_RANGE_WAIT_BEFORE	1
+ #define SYNC_FILE_RANGE_WRITE		2
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/gfs2_ondisk.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.7.10/include/uapi/linux/gfs2_ondisk.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/gfs2_ondisk.h	2012-12-18 15:13:16.000000000 +0000
+@@ -225,6 +225,9 @@ enum {
+ 	gfs2fl_Sync		= 8,
+ 	gfs2fl_System		= 9,
+ 	gfs2fl_TopLevel		= 10,
++	gfs2fl_IXUnlink         = 16,
++	gfs2fl_Barrier          = 17,
++	gfs2fl_Cow              = 18,
+ 	gfs2fl_TruncInProg	= 29,
+ 	gfs2fl_InheritDirectio	= 30,
+ 	gfs2fl_InheritJdata	= 31,
+@@ -242,6 +245,9 @@ enum {
+ #define GFS2_DIF_SYNC			0x00000100
+ #define GFS2_DIF_SYSTEM			0x00000200 /* New in gfs2 */
+ #define GFS2_DIF_TOPDIR			0x00000400 /* New in gfs2 */
++#define GFS2_DIF_IXUNLINK               0x00010000
++#define GFS2_DIF_BARRIER                0x00020000
++#define GFS2_DIF_COW                    0x00040000
+ #define GFS2_DIF_TRUNC_IN_PROG		0x20000000 /* New in gfs2 */
+ #define GFS2_DIF_INHERIT_DIRECTIO	0x40000000 /* only in gfs1 */
+ #define GFS2_DIF_INHERIT_JDATA		0x80000000
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/if_tun.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/if_tun.h
+--- linux-3.7.10/include/uapi/linux/if_tun.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/if_tun.h	2012-12-18 15:13:16.000000000 +0000
+@@ -53,6 +53,7 @@
+ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
+ #define TUNGETVNETHDRSZ _IOR('T', 215, int)
+ #define TUNSETVNETHDRSZ _IOW('T', 216, int)
++#define TUNSETNID     _IOW('T', 217, int)
+ 
+ /* TUNSETIFF ifr flags */
+ #define IFF_TUN		0x0001
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/major.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/major.h
+--- linux-3.7.10/include/uapi/linux/major.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/major.h	2012-12-18 15:13:16.000000000 +0000
+@@ -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
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/nfs_mount.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/nfs_mount.h
+--- linux-3.7.10/include/uapi/linux/nfs_mount.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/nfs_mount.h	2012-12-18 15:13:16.000000000 +0000
+@@ -63,7 +63,8 @@ struct nfs_mount_data {
+ #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+ #define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
+ #define NFS_MOUNT_UNSHARED	0x8000	/* 5 */
+-#define NFS_MOUNT_FLAGMASK	0xFFFF
++#define NFS_MOUNT_TAGGED	0x10000	/* context tagging */
++#define NFS_MOUNT_FLAGMASK	0x1FFFF
+ 
+ /* The following are for internal use only */
+ #define NFS_MOUNT_LOOKUP_CACHE_NONEG	0x10000
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/reboot.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/reboot.h
+--- linux-3.7.10/include/uapi/linux/reboot.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/reboot.h	2012-12-18 15:13:16.000000000 +0000
+@@ -33,7 +33,7 @@
+ #define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
+ #define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
+ #define	LINUX_REBOOT_CMD_KEXEC		0x45584543
+-
++#define	LINUX_REBOOT_CMD_OOM		0xDEADBEEF
+ 
+ 
+ #endif /* _UAPI_LINUX_REBOOT_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/linux/sysctl.h linux-3.7.10-vs2.3.5.6/include/uapi/linux/sysctl.h
+--- linux-3.7.10/include/uapi/linux/sysctl.h	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/linux/sysctl.h	2012-12-18 15:13:16.000000000 +0000
+@@ -60,6 +60,7 @@ enum
+ 	CTL_ABI=9,		/* Binary emulation */
+ 	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
+ 	CTL_ARLAN=254,		/* arlan wireless driver */
++	CTL_VSERVER=4242,	/* Linux-VServer debug */
+ 	CTL_S390DBF=5677,	/* s390 debug */
+ 	CTL_SUNRPC=7249,	/* sunrpc debug */
+ 	CTL_PM=9899,		/* frv power management */
+@@ -94,6 +95,7 @@ enum
+ 
+ 	KERN_PANIC=15,		/* int: panic timeout */
+ 	KERN_REALROOTDEV=16,	/* real root device to mount after initrd */
++	KERN_VSHELPER=17,	/* string: path to vshelper policy agent */
+ 
+ 	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
+ 	KERN_CTLALTDEL=22,	/* int: allow ctl-alt-del to reboot */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/Kbuild linux-3.7.10-vs2.3.5.6/include/uapi/vserver/Kbuild
+--- linux-3.7.10/include/uapi/vserver/Kbuild	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/Kbuild	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,9 @@
++
++header-y += context_cmd.h network_cmd.h space_cmd.h \
++	cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \
++	inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \
++	debug_cmd.h device_cmd.h
++
++header-y += switch.h context.h network.h monitor.h \
++	limit.h inode.h device.h
++
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/cacct_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cacct_cmd.h
+--- linux-3.7.10/include/uapi/vserver/cacct_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cacct_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,15 @@
++#ifndef _UAPI_VS_CACCT_CMD_H
++#define _UAPI_VS_CACCT_CMD_H
++
++
++/* virtual host info name commands */
++
++#define VCMD_sock_stat		VC_CMD(VSTAT, 5, 0)
++
++struct	vcmd_sock_stat_v0 {
++	uint32_t field;
++	uint32_t count[3];
++	uint64_t total[3];
++};
++
++#endif /* _UAPI_VS_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/context.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context.h
+--- linux-3.7.10/include/uapi/vserver/context.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,80 @@
++#ifndef _UAPI_VS_CONTEXT_H
++#define _UAPI_VS_CONTEXT_H
++
++#include <linux/types.h>
++#include <linux/capability.h>
++
++
++/* context flags */
++
++#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_VIRT_TIME		0x00100000
++
++#define VXF_HIDE_MOUNT		0x01000000
++/* was	VXF_HIDE_NETIF		0x02000000 */
++#define VXF_HIDE_VINFO		0x04000000
++
++#define VXF_STATE_SETUP		(1ULL << 32)
++#define VXF_STATE_INIT		(1ULL << 33)
++#define VXF_STATE_ADMIN		(1ULL << 34)
++
++#define VXF_SC_HELPER		(1ULL << 36)
++#define VXF_REBOOT_KILL		(1ULL << 37)
++#define VXF_PERSISTENT		(1ULL << 38)
++
++#define VXF_FORK_RSS		(1ULL << 48)
++#define VXF_PROLIFIC		(1ULL << 49)
++
++#define VXF_IGNEG_NICE		(1ULL << 52)
++
++#define VXF_ONE_TIME		(0x0007ULL << 32)
++
++#define VXF_INIT_SET		(VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN)
++
++
++/* context migration */
++
++#define VXM_SET_INIT		0x00000001
++#define VXM_SET_REAPER		0x00000002
++
++/* context caps */
++
++#define VXC_SET_UTSNAME		0x00000001
++#define VXC_SET_RLIMIT		0x00000002
++#define VXC_FS_SECURITY		0x00000004
++#define VXC_FS_TRUSTED		0x00000008
++#define VXC_TIOCSTI		0x00000010
++
++/* was	VXC_RAW_ICMP		0x00000100 */
++#define VXC_SYSLOG		0x00001000
++#define VXC_OOM_ADJUST		0x00002000
++#define VXC_AUDIT_CONTROL	0x00004000
++
++#define VXC_SECURE_MOUNT	0x00010000
++#define VXC_SECURE_REMOUNT	0x00020000
++#define VXC_BINARY_MOUNT	0x00040000
++
++#define VXC_QUOTA_CTL		0x00100000
++#define VXC_ADMIN_MAPPER	0x00200000
++#define VXC_ADMIN_CLOOP		0x00400000
++
++#define VXC_KTHREAD		0x01000000
++#define VXC_NAMESPACE		0x02000000
++
++#endif /* _UAPI_VS_CONTEXT_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/context_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context_cmd.h
+--- linux-3.7.10/include/uapi/vserver/context_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/context_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,115 @@
++#ifndef _UAPI_VS_CONTEXT_CMD_H
++#define _UAPI_VS_CONTEXT_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_xid		VC_CMD(VINFO, 1, 0)
++
++
++#define VCMD_vx_info		VC_CMD(VINFO, 5, 0)
++
++struct	vcmd_vx_info_v0 {
++	uint32_t xid;
++	uint32_t initpid;
++	/* more to come */
++};
++
++
++#define VCMD_ctx_stat		VC_CMD(VSTAT, 0, 0)
++
++struct	vcmd_ctx_stat_v0 {
++	uint32_t usecnt;
++	uint32_t tasks;
++	/* more to come */
++};
++
++
++/* 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_v0	VC_CMD(PROCMIG, 1, 0)
++#define VCMD_ctx_migrate	VC_CMD(PROCMIG, 1, 1)
++
++struct	vcmd_ctx_migrate {
++	uint64_t flagword;
++};
++
++
++
++/* 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;
++};
++
++
++
++/* context caps commands */
++
++#define VCMD_get_ccaps		VC_CMD(FLAGS, 3, 1)
++#define VCMD_set_ccaps		VC_CMD(FLAGS, 4, 1)
++
++struct	vcmd_ctx_caps_v1 {
++	uint64_t ccaps;
++	uint64_t cmask;
++};
++
++
++
++/* bcaps commands */
++
++#define VCMD_get_bcaps		VC_CMD(FLAGS, 9, 0)
++#define VCMD_set_bcaps		VC_CMD(FLAGS, 10, 0)
++
++struct	vcmd_bcaps {
++	uint64_t bcaps;
++	uint64_t bmask;
++};
++
++
++
++/* umask commands */
++
++#define VCMD_get_umask		VC_CMD(FLAGS, 13, 0)
++#define VCMD_set_umask		VC_CMD(FLAGS, 14, 0)
++
++struct	vcmd_umask {
++	uint64_t umask;
++	uint64_t mask;
++};
++
++
++
++/* wmask commands */
++
++#define VCMD_get_wmask		VC_CMD(FLAGS, 15, 0)
++#define VCMD_set_wmask		VC_CMD(FLAGS, 16, 0)
++
++struct	vcmd_wmask {
++	uint64_t wmask;
++	uint64_t mask;
++};
++
++
++
++/* OOM badness */
++
++#define VCMD_get_badness	VC_CMD(MEMCTRL, 5, 0)
++#define VCMD_set_badness	VC_CMD(MEMCTRL, 6, 0)
++
++struct	vcmd_badness_v0 {
++	int64_t bias;
++};
++
++#endif /* _UAPI_VS_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/cvirt_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.7.10/include/uapi/vserver/cvirt_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/cvirt_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,41 @@
++#ifndef _UAPI_VS_CVIRT_CMD_H
++#define _UAPI_VS_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,
++};
++
++
++
++#define VCMD_virt_stat		VC_CMD(VSTAT, 3, 0)
++
++struct	vcmd_virt_stat_v0 {
++	uint64_t offset;
++	uint64_t uptime;
++	uint32_t nr_threads;
++	uint32_t nr_running;
++	uint32_t nr_uninterruptible;
++	uint32_t nr_onhold;
++	uint32_t nr_forks;
++	uint32_t load[3];
++};
++
++#endif /* _UAPI_VS_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/debug_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/debug_cmd.h
+--- linux-3.7.10/include/uapi/vserver/debug_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/debug_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,24 @@
++#ifndef _UAPI_VS_DEBUG_CMD_H
++#define _UAPI_VS_DEBUG_CMD_H
++
++
++/* debug commands */
++
++#define VCMD_dump_history	VC_CMD(DEBUG, 1, 0)
++
++#define VCMD_read_history	VC_CMD(DEBUG, 5, 0)
++#define VCMD_read_monitor	VC_CMD(DEBUG, 6, 0)
++
++struct  vcmd_read_history_v0 {
++	uint32_t index;
++	uint32_t count;
++	char __user *data;
++};
++
++struct  vcmd_read_monitor_v0 {
++	uint32_t index;
++	uint32_t count;
++	char __user *data;
++};
++
++#endif /* _UAPI_VS_DEBUG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/device.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device.h
+--- linux-3.7.10/include/uapi/vserver/device.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,12 @@
++#ifndef _UAPI_VS_DEVICE_H
++#define _UAPI_VS_DEVICE_H
++
++
++#define DATTR_CREATE	0x00000001
++#define DATTR_OPEN	0x00000002
++
++#define DATTR_REMAP	0x00000010
++
++#define DATTR_MASK	0x00000013
++
++#endif	/* _UAPI_VS_DEVICE_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/device_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device_cmd.h
+--- linux-3.7.10/include/uapi/vserver/device_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/device_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,16 @@
++#ifndef _UAPI_VS_DEVICE_CMD_H
++#define _UAPI_VS_DEVICE_CMD_H
++
++
++/*  device vserver commands */
++
++#define VCMD_set_mapping	VC_CMD(DEVICE, 1, 0)
++#define VCMD_unset_mapping	VC_CMD(DEVICE, 2, 0)
++
++struct	vcmd_set_mapping_v0 {
++	const char __user *device;
++	const char __user *target;
++	uint32_t flags;
++};
++
++#endif /* _UAPI_VS_DEVICE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/dlimit_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.7.10/include/uapi/vserver/dlimit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/dlimit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,67 @@
++#ifndef _UAPI_VS_DLIMIT_CMD_H
++#define _UAPI_VS_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;
++};
++
++#define CDLIM_UNSET		((uint32_t)0UL)
++#define CDLIM_INFINITY		((uint32_t)~0UL)
++#define CDLIM_KEEP		((uint32_t)~1UL)
++
++#define DLIME_UNIT	0
++#define DLIME_KILO	1
++#define DLIME_MEGA	2
++#define DLIME_GIGA	3
++
++#define DLIMF_SHIFT	0x10
++
++#define DLIMS_USED	0
++#define DLIMS_TOTAL	2
++
++static inline
++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift)
++{
++	int exp = (flags & DLIMF_SHIFT) ?
++		(flags >> shift) & DLIME_GIGA : DLIME_KILO;
++	return ((uint64_t)val) << (10 * exp);
++}
++
++static inline
++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift)
++{
++	int exp = 0;
++
++	if (*flags & DLIMF_SHIFT) {
++		while (val > (1LL << 32) && (exp < 3)) {
++			val >>= 10;
++			exp++;
++		}
++		*flags &= ~(DLIME_GIGA << shift);
++		*flags |= exp << shift;
++	} else
++		val >>= 10;
++	return val;
++}
++
++#endif /* _UAPI_VS_DLIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/inode.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode.h
+--- linux-3.7.10/include/uapi/vserver/inode.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _UAPI_VS_INODE_H
++#define _UAPI_VS_INODE_H
++
++
++#define IATTR_TAG	0x01000000
++
++#define IATTR_ADMIN	0x00000001
++#define IATTR_WATCH	0x00000002
++#define IATTR_HIDE	0x00000004
++#define IATTR_FLAGS	0x00000007
++
++#define IATTR_BARRIER	0x00010000
++#define IATTR_IXUNLINK	0x00020000
++#define IATTR_IMMUTABLE 0x00040000
++#define IATTR_COW	0x00080000
++
++
++/* inode ioctls */
++
++#define FIOC_GETXFLG	_IOR('x', 5, long)
++#define FIOC_SETXFLG	_IOW('x', 6, long)
++
++#endif	/* _UAPI_VS_INODE_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/inode_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode_cmd.h
+--- linux-3.7.10/include/uapi/vserver/inode_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/inode_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,26 @@
++#ifndef _UAPI_VS_INODE_CMD_H
++#define _UAPI_VS_INODE_CMD_H
++
++
++/*  inode vserver commands */
++
++#define VCMD_get_iattr		VC_CMD(INODE, 1, 1)
++#define VCMD_set_iattr		VC_CMD(INODE, 2, 1)
++
++#define VCMD_fget_iattr		VC_CMD(INODE, 3, 0)
++#define VCMD_fset_iattr		VC_CMD(INODE, 4, 0)
++
++struct	vcmd_ctx_iattr_v1 {
++	const char __user *name;
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++struct	vcmd_ctx_fiattr_v0 {
++	uint32_t tag;
++	uint32_t flags;
++	uint32_t mask;
++};
++
++#endif /* _UAPI_VS_INODE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/limit.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit.h
+--- linux-3.7.10/include/uapi/vserver/limit.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_LIMIT_H
++#define _UAPI_VS_LIMIT_H
++
++
++#define VLIMIT_NSOCK	16
++#define VLIMIT_OPENFD	17
++#define VLIMIT_ANON	18
++#define VLIMIT_SHMEM	19
++#define VLIMIT_SEMARY	20
++#define VLIMIT_NSEMS	21
++#define VLIMIT_DENTRY	22
++#define VLIMIT_MAPPED	23
++
++#endif /* _UAPI_VS_LIMIT_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/limit_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit_cmd.h
+--- linux-3.7.10/include/uapi/vserver/limit_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/limit_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,40 @@
++#ifndef _UAPI_VS_LIMIT_CMD_H
++#define _UAPI_VS_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)
++#define VCMD_reset_hits		VC_CMD(RLIMIT, 7, 0)
++#define VCMD_reset_minmax	VC_CMD(RLIMIT, 9, 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 VCMD_rlimit_stat	VC_CMD(VSTAT, 1, 0)
++
++struct	vcmd_rlimit_stat_v0 {
++	uint32_t id;
++	uint32_t hits;
++	uint64_t value;
++	uint64_t minimum;
++	uint64_t maximum;
++};
++
++#define CRLIM_UNSET		(0ULL)
++#define CRLIM_INFINITY		(~0ULL)
++#define CRLIM_KEEP		(~1ULL)
++
++#endif /* _UAPI_VS_LIMIT_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/monitor.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/monitor.h
+--- linux-3.7.10/include/uapi/vserver/monitor.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/monitor.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,96 @@
++#ifndef _UAPI_VS_MONITOR_H
++#define _UAPI_VS_MONITOR_H
++
++#include <linux/types.h>
++
++
++enum {
++	VXM_UNUSED = 0,
++
++	VXM_SYNC = 0x10,
++
++	VXM_UPDATE = 0x20,
++	VXM_UPDATE_1,
++	VXM_UPDATE_2,
++
++	VXM_RQINFO_1 = 0x24,
++	VXM_RQINFO_2,
++
++	VXM_ACTIVATE = 0x40,
++	VXM_DEACTIVATE,
++	VXM_IDLE,
++
++	VXM_HOLD = 0x44,
++	VXM_UNHOLD,
++
++	VXM_MIGRATE = 0x48,
++	VXM_RESCHED,
++
++	/* all other bits are flags */
++	VXM_SCHED = 0x80,
++};
++
++struct _vxm_update_1 {
++	uint32_t tokens_max;
++	uint32_t fill_rate;
++	uint32_t interval;
++};
++
++struct _vxm_update_2 {
++	uint32_t tokens_min;
++	uint32_t fill_rate;
++	uint32_t interval;
++};
++
++struct _vxm_rqinfo_1 {
++	uint16_t running;
++	uint16_t onhold;
++	uint16_t iowait;
++	uint16_t uintr;
++	uint32_t idle_tokens;
++};
++
++struct _vxm_rqinfo_2 {
++	uint32_t norm_time;
++	uint32_t idle_time;
++	uint32_t idle_skip;
++};
++
++struct _vxm_sched {
++	uint32_t tokens;
++	uint32_t norm_time;
++	uint32_t idle_time;
++};
++
++struct _vxm_task {
++	uint16_t pid;
++	uint16_t state;
++};
++
++struct _vxm_event {
++	uint32_t jif;
++	union {
++		uint32_t seq;
++		uint32_t sec;
++	};
++	union {
++		uint32_t tokens;
++		uint32_t nsec;
++		struct _vxm_task tsk;
++	};
++};
++
++struct _vx_mon_entry {
++	uint16_t type;
++	uint16_t xid;
++	union {
++		struct _vxm_event ev;
++		struct _vxm_sched sd;
++		struct _vxm_update_1 u1;
++		struct _vxm_update_2 u2;
++		struct _vxm_rqinfo_1 q1;
++		struct _vxm_rqinfo_2 q2;
++	};
++};
++
++#endif /* _UAPI_VS_MONITOR_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/network.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network.h
+--- linux-3.7.10/include/uapi/vserver/network.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,76 @@
++#ifndef _UAPI_VS_NETWORK_H
++#define _UAPI_VS_NETWORK_H
++
++#include <linux/types.h>
++
++
++#define MAX_N_CONTEXT	65535	/* Arbitrary limit */
++
++
++/* network flags */
++
++#define NXF_INFO_PRIVATE	0x00000008
++
++#define NXF_SINGLE_IP		0x00000100
++#define NXF_LBACK_REMAP		0x00000200
++#define NXF_LBACK_ALLOW		0x00000400
++
++#define NXF_HIDE_NETIF		0x02000000
++#define NXF_HIDE_LBACK		0x04000000
++
++#define NXF_STATE_SETUP		(1ULL << 32)
++#define NXF_STATE_ADMIN		(1ULL << 34)
++
++#define NXF_SC_HELPER		(1ULL << 36)
++#define NXF_PERSISTENT		(1ULL << 38)
++
++#define NXF_ONE_TIME		(0x0005ULL << 32)
++
++
++#define	NXF_INIT_SET		(__nxf_init_set())
++
++static inline uint64_t __nxf_init_set(void) {
++	return	  NXF_STATE_ADMIN
++#ifdef	CONFIG_VSERVER_AUTO_LBACK
++		| NXF_LBACK_REMAP
++		| NXF_HIDE_LBACK
++#endif
++#ifdef	CONFIG_VSERVER_AUTO_SINGLE
++		| NXF_SINGLE_IP
++#endif
++		| NXF_HIDE_NETIF;
++}
++
++
++/* network caps */
++
++#define NXC_TUN_CREATE		0x00000001
++
++#define NXC_RAW_ICMP		0x00000100
++
++#define NXC_MULTICAST		0x00001000
++
++
++/* address types */
++
++#define NXA_TYPE_IPV4		0x0001
++#define NXA_TYPE_IPV6		0x0002
++
++#define NXA_TYPE_NONE		0x0000
++#define NXA_TYPE_ANY		0x00FF
++
++#define NXA_TYPE_ADDR		0x0010
++#define NXA_TYPE_MASK		0x0020
++#define NXA_TYPE_RANGE		0x0040
++
++#define NXA_MASK_ALL		(NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
++
++#define NXA_MOD_BCAST		0x0100
++#define NXA_MOD_LBACK		0x0200
++
++#define NXA_LOOPBACK		0x1000
++
++#define NXA_MASK_BIND		(NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
++#define NXA_MASK_SHOW		(NXA_MASK_ALL | NXA_LOOPBACK)
++
++#endif /* _UAPI_VS_NETWORK_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/network_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network_cmd.h
+--- linux-3.7.10/include/uapi/vserver/network_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/network_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,123 @@
++#ifndef _UAPI_VS_NETWORK_CMD_H
++#define _UAPI_VS_NETWORK_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_nid		VC_CMD(VINFO, 2, 0)
++
++
++#define VCMD_nx_info		VC_CMD(VINFO, 6, 0)
++
++struct	vcmd_nx_info_v0 {
++	uint32_t nid;
++	/* more to come */
++};
++
++
++#include <linux/in.h>
++#include <linux/in6.h>
++
++#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;
++	struct in_addr ip[4];
++	struct in_addr mask[4];
++};
++
++#define VCMD_net_add_ipv4_v1	VC_CMD(NETALT, 1, 1)
++#define VCMD_net_rem_ipv4_v1	VC_CMD(NETALT, 2, 1)
++
++struct	vcmd_net_addr_ipv4_v1 {
++	uint16_t type;
++	uint16_t flags;
++	struct in_addr ip;
++	struct in_addr mask;
++};
++
++#define VCMD_net_add_ipv4	VC_CMD(NETALT, 1, 2)
++#define VCMD_net_rem_ipv4	VC_CMD(NETALT, 2, 2)
++
++struct	vcmd_net_addr_ipv4_v2 {
++	uint16_t type;
++	uint16_t flags;
++	struct in_addr ip;
++	struct in_addr ip2;
++	struct in_addr mask;
++};
++
++#define VCMD_net_add_ipv6	VC_CMD(NETALT, 3, 1)
++#define VCMD_net_remove_ipv6	VC_CMD(NETALT, 4, 1)
++
++struct	vcmd_net_addr_ipv6_v1 {
++	uint16_t type;
++	uint16_t flags;
++	uint32_t prefix;
++	struct in6_addr ip;
++	struct in6_addr mask;
++};
++
++#define VCMD_add_match_ipv4	VC_CMD(NETALT, 5, 0)
++#define VCMD_get_match_ipv4	VC_CMD(NETALT, 6, 0)
++
++struct	vcmd_match_ipv4_v0 {
++	uint16_t type;
++	uint16_t flags;
++	uint16_t parent;
++	uint16_t prefix;
++	struct in_addr ip;
++	struct in_addr ip2;
++	struct in_addr mask;
++};
++
++#define VCMD_add_match_ipv6	VC_CMD(NETALT, 7, 0)
++#define VCMD_get_match_ipv6	VC_CMD(NETALT, 8, 0)
++
++struct	vcmd_match_ipv6_v0 {
++	uint16_t type;
++	uint16_t flags;
++	uint16_t parent;
++	uint16_t prefix;
++	struct in6_addr ip;
++	struct in6_addr ip2;
++	struct in6_addr mask;
++};
++
++
++
++
++/* 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;
++};
++
++
++
++/* 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;
++};
++
++#endif /* _UAPI_VS_NETWORK_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/sched_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/sched_cmd.h
+--- linux-3.7.10/include/uapi/vserver/sched_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/sched_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _UAPI_VS_SCHED_CMD_H
++#define _UAPI_VS_SCHED_CMD_H
++
++
++struct	vcmd_prio_bias {
++	int32_t cpu_id;
++	int32_t prio_bias;
++};
++
++#define VCMD_set_prio_bias	VC_CMD(SCHED, 4, 0)
++#define VCMD_get_prio_bias	VC_CMD(SCHED, 5, 0)
++
++#endif /* _UAPI_VS_SCHED_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/signal_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/signal_cmd.h
+--- linux-3.7.10/include/uapi/vserver/signal_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/signal_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,31 @@
++#ifndef _UAPI_VS_SIGNAL_CMD_H
++#define _UAPI_VS_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 reboot_cmd;
++	int32_t exit_code;
++};
++
++
++/*  process alteration commands */
++
++#define VCMD_get_pflags		VC_CMD(PROCALT, 5, 0)
++#define VCMD_set_pflags		VC_CMD(PROCALT, 6, 0)
++
++struct	vcmd_pflags_v0 {
++	uint32_t flagword;
++	uint32_t mask;
++};
++
++#endif /* _UAPI_VS_SIGNAL_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/space_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/space_cmd.h
+--- linux-3.7.10/include/uapi/vserver/space_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/space_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,28 @@
++#ifndef _UAPI_VS_SPACE_CMD_H
++#define _UAPI_VS_SPACE_CMD_H
++
++
++#define VCMD_enter_space_v0	VC_CMD(PROCALT, 1, 0)
++#define VCMD_enter_space_v1	VC_CMD(PROCALT, 1, 1)
++#define VCMD_enter_space	VC_CMD(PROCALT, 1, 2)
++
++#define VCMD_set_space_v0	VC_CMD(PROCALT, 3, 0)
++#define VCMD_set_space_v1	VC_CMD(PROCALT, 3, 1)
++#define VCMD_set_space		VC_CMD(PROCALT, 3, 2)
++
++#define VCMD_get_space_mask_v0	VC_CMD(PROCALT, 4, 0)
++
++#define VCMD_get_space_mask	VC_CMD(VSPACE, 0, 1)
++#define VCMD_get_space_default	VC_CMD(VSPACE, 1, 0)
++
++
++struct	vcmd_space_mask_v1 {
++	uint64_t mask;
++};
++
++struct	vcmd_space_mask_v2 {
++	uint64_t mask;
++	uint32_t index;
++};
++
++#endif /* _UAPI_VS_SPACE_CMD_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/switch.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/switch.h
+--- linux-3.7.10/include/uapi/vserver/switch.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/switch.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,90 @@
++#ifndef _UAPI_VS_SWITCH_H
++#define _UAPI_VS_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  |       |       |       | |DEVICE |       |
++  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 |       |       |       |       |MEMCTRL|       | |SWAP   |       |
++	 |     16|     17|     18|     19|     20|     21| |     22|     23|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  NETWORK|       |VNET   |NETALT |NETMIG |NETCTL |       | |SERIAL |       |
++	 |     24|     25|     26|     27|     28|     29| |     30|     31|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  DISK   |       |       |       |TAGMIG |DLIMIT |       | |INODE  |       |
++  VFS    |     32|     33|     34|     35|     36|     37| |     38|     39|
++  -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
++  OTHER  |VSTAT  |       |       |       |       |       | |VINFO  |       |
++	 |     40|     41|     42|     43|     44|     45| |     46|     47|
++  =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
++  SPECIAL|EVENT  |       |       |       |FLAGS  |       | |VSPACE |       |
++	 |     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_DEVICE		6
++
++#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_MEMCTRL		20
++
++#define VC_CAT_VNET		25
++#define VC_CAT_NETALT		26
++#define VC_CAT_NETMIG		27
++#define VC_CAT_NETCTRL		28
++
++#define VC_CAT_TAGMIG		35
++#define VC_CAT_DLIMIT		36
++#define VC_CAT_INODE		38
++
++#define VC_CAT_VSTAT		40
++#define VC_CAT_VINFO		46
++#define VC_CAT_EVENT		48
++
++#define VC_CAT_FLAGS		52
++#define VC_CAT_VSPACE		54
++#define VC_CAT_DEBUG		56
++#define VC_CAT_RLIMIT		60
++
++#define VC_CAT_SYSTEST		61
++#define VC_CAT_COMPAT		63
++
++/*  query version */
++
++#define VCMD_get_version	VC_CMD(VERSION, 0, 0)
++#define VCMD_get_vci		VC_CMD(VERSION, 1, 0)
++
++#endif /* _UAPI_VS_SWITCH_H */
+diff -NurpP --minimal linux-3.7.10/include/uapi/vserver/tag_cmd.h linux-3.7.10-vs2.3.5.6/include/uapi/vserver/tag_cmd.h
+--- linux-3.7.10/include/uapi/vserver/tag_cmd.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/include/uapi/vserver/tag_cmd.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,14 @@
++#ifndef _UAPI_VS_TAG_CMD_H
++#define _UAPI_VS_TAG_CMD_H
++
++
++/* vinfo commands */
++
++#define VCMD_task_tag		VC_CMD(VINFO, 3, 0)
++
++
++/* context commands */
++
++#define VCMD_tag_migrate	VC_CMD(TAGMIG, 1, 0)
++
++#endif /* _UAPI_VS_TAG_CMD_H */
+diff -NurpP --minimal linux-3.7.10/init/Kconfig linux-3.7.10-vs2.3.5.6/init/Kconfig
+--- linux-3.7.10/init/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/init/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -699,6 +699,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
+ menuconfig CGROUPS
+ 	boolean "Control Group support"
+ 	depends on EVENTFD
++	default y
+ 	help
+ 	  This option adds support for grouping sets of processes together, for
+ 	  use with process control subsystems such as Cpusets, CFS, memory
+@@ -964,6 +965,7 @@ config USER_NS
+ 	bool "User namespace (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL
+ 	depends on UIDGID_CONVERTED
++	depends on VSERVER_DISABLED
+ 	select UIDGID_STRICT_TYPE_CHECKS
+ 
+ 	default n
+diff -NurpP --minimal linux-3.7.10/init/main.c linux-3.7.10-vs2.3.5.6/init/main.c
+--- linux-3.7.10/init/main.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/init/main.c	2013-02-05 01:14:43.000000000 +0000
+@@ -70,6 +70,7 @@
+ #include <linux/perf_event.h>
+ #include <linux/file.h>
+ #include <linux/ptrace.h>
++#include <linux/vserver/percpu.h>
+ 
+ #include <asm/io.h>
+ #include <asm/bugs.h>
+diff -NurpP --minimal linux-3.7.10/ipc/mqueue.c linux-3.7.10-vs2.3.5.6/ipc/mqueue.c
+--- linux-3.7.10/ipc/mqueue.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/mqueue.c	2012-12-18 15:13:16.000000000 +0000
+@@ -35,6 +35,8 @@
+ #include <linux/ipc_namespace.h>
+ #include <linux/user_namespace.h>
+ #include <linux/slab.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ #include <net/sock.h>
+ #include "util.h"
+@@ -76,6 +78,7 @@ struct mqueue_inode_info {
+ 	struct pid* notify_owner;
+ 	struct user_namespace *notify_user_ns;
+ 	struct user_struct *user;	/* user who created, for accounting */
++	struct vx_info *vxi;
+ 	struct sock *notify_sock;
+ 	struct sk_buff *notify_cookie;
+ 
+@@ -234,6 +237,7 @@ static struct inode *mqueue_get_inode(st
+ 	if (S_ISREG(mode)) {
+ 		struct mqueue_inode_info *info;
+ 		unsigned long mq_bytes, mq_treesize;
++		struct vx_info *vxi = current_vx_info();
+ 
+ 		inode->i_fop = &mqueue_file_operations;
+ 		inode->i_size = FILENT_SIZE;
+@@ -247,6 +251,7 @@ static struct inode *mqueue_get_inode(st
+ 		info->notify_user_ns = NULL;
+ 		info->qsize = 0;
+ 		info->user = NULL;	/* set when all is ok */
++		info->vxi = NULL;
+ 		info->msg_tree = RB_ROOT;
+ 		info->node_cache = NULL;
+ 		memset(&info->attr, 0, sizeof(info->attr));
+@@ -280,17 +285,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 > rlimit(RLIMIT_MSGQUEUE)) {
++		    u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE) ||
++		    !vx_ipcmsg_avail(vxi, mq_bytes)) {
+ 			spin_unlock(&mq_lock);
+ 			/* mqueue_evict_inode() releases info->messages */
+ 			ret = -EMFILE;
+ 			goto out_inode;
+ 		}
+ 		u->mq_bytes += mq_bytes;
++		vx_ipcmsg_add(vxi, u, mq_bytes);
+ 		spin_unlock(&mq_lock);
+ 
+ 		/* all is ok */
+ 		info->user = get_uid(u);
++		info->vxi = get_vx_info(vxi);
+ 	} else if (S_ISDIR(mode)) {
+ 		inc_nlink(inode);
+ 		/* Some things misbehave if size == 0 on a directory */
+@@ -394,8 +402,11 @@ static void mqueue_evict_inode(struct in
+ 
+ 	user = info->user;
+ 	if (user) {
++		struct vx_info *vxi = info->vxi;
++
+ 		spin_lock(&mq_lock);
+ 		user->mq_bytes -= mq_bytes;
++		vx_ipcmsg_sub(vxi, user, mq_bytes);
+ 		/*
+ 		 * get_ns_from_inode() ensures that the
+ 		 * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns
+@@ -405,6 +416,7 @@ static void mqueue_evict_inode(struct in
+ 		if (ipc_ns)
+ 			ipc_ns->mq_queues_count--;
+ 		spin_unlock(&mq_lock);
++		put_vx_info(vxi);
+ 		free_uid(user);
+ 	}
+ 	if (ipc_ns)
+diff -NurpP --minimal linux-3.7.10/ipc/msg.c linux-3.7.10-vs2.3.5.6/ipc/msg.c
+--- linux-3.7.10/ipc/msg.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/msg.c	2012-12-18 15:13:16.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
+ 
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace *
+ 
+ 	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);
+diff -NurpP --minimal linux-3.7.10/ipc/namespace.c linux-3.7.10-vs2.3.5.6/ipc/namespace.c
+--- linux-3.7.10/ipc/namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -13,11 +13,12 @@
+ #include <linux/mount.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_fs.h>
++#include <linux/vs_base.h>
++#include <linux/vserver/global.h>
+ 
+ #include "util.h"
+ 
+-static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
+-					   struct ipc_namespace *old_ns)
++static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns)
+ {
+ 	struct ipc_namespace *ns;
+ 	int err;
+@@ -46,19 +47,19 @@ static struct ipc_namespace *create_ipc_
+ 	ipcns_notify(IPCNS_CREATED);
+ 	register_ipcns_notifier(ns);
+ 
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
++	// ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
++	ns->user_ns = get_user_ns(user_ns);
+ 
+ 	return ns;
+ }
+ 
+ struct ipc_namespace *copy_ipcs(unsigned long flags,
+-				struct task_struct *tsk)
++				struct ipc_namespace *old_ns,
++				struct user_namespace *user_ns)
+ {
+-	struct ipc_namespace *ns = tsk->nsproxy->ipc_ns;
+-
+ 	if (!(flags & CLONE_NEWIPC))
+-		return get_ipc_ns(ns);
+-	return create_ipc_ns(tsk, ns);
++		return get_ipc_ns(old_ns);
++	return create_ipc_ns(user_ns);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/ipc/sem.c linux-3.7.10-vs2.3.5.6/ipc/sem.c
+--- linux-3.7.10/ipc/sem.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/sem.c	2012-12-18 15:13:16.000000000 +0000
+@@ -86,6 +86,8 @@
+ #include <linux/rwsem.h>
+ #include <linux/nsproxy.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ #include "util.h"
+@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace *
+ 
+ 	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);
+@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace *
+ 		return id;
+ 	}
+ 	ns->used_sems += nsems;
++	/* FIXME: obsoleted? */
++	vx_semary_inc(sma);
++	vx_nsems_add(sma, nsems);
+ 
+ 	sma->sem_base = (struct sem *) &sma[1];
+ 
+@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace
+ 
+ 	wake_up_sem_queue_do(&tasks);
+ 	ns->used_sems -= sma->sem_nsems;
++	/* FIXME: obsoleted? */
++	vx_nsems_sub(sma, sma->sem_nsems);
++	vx_semary_dec(sma);
+ 	security_sem_free(sma);
+ 	ipc_rcu_putref(sma);
+ }
+diff -NurpP --minimal linux-3.7.10/ipc/shm.c linux-3.7.10-vs2.3.5.6/ipc/shm.c
+--- linux-3.7.10/ipc/shm.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/ipc/shm.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,8 @@
+ #include <linux/nsproxy.h>
+ #include <linux/mount.h>
+ #include <linux/ipc_namespace.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru
+  */
+ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
+ {
+-	ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++	struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
++	int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
++
++	vx_ipcshm_sub(vxi, shp, numpages);
++	ns->shm_tot -= numpages;
++
+ 	shm_rmid(ns, shp);
+ 	shm_unlock(shp);
+ 	if (!is_file_hugepages(shp->shm_file))
+@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names
+ 						shp->mlock_user);
+ 	fput (shp->shm_file);
+ 	security_shm_free(shp);
++	put_vx_info(vxi);
+ 	ipc_rcu_putref(shp);
+ }
+ 
+@@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace *
+ 	if (ns->shm_tot + numpages > ns->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_perm.mode = (shmflg & S_IRWXUGO);
+ 	shp->mlock_user = NULL;
+ 
+@@ -533,6 +545,7 @@ static int newseg(struct ipc_namespace *
+ 	ns->shm_tot += numpages;
+ 	error = shp->shm_perm.id;
+ 	shm_unlock(shp);
++	vx_ipcshm_add(current_vx_info(), key, numpages);
+ 	return error;
+ 
+ no_id:
+diff -NurpP --minimal linux-3.7.10/kernel/Makefile linux-3.7.10-vs2.3.5.6/kernel/Makefile
+--- linux-3.7.10/kernel/Makefile	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/Makefile	2012-12-18 15:13:16.000000000 +0000
+@@ -24,6 +24,7 @@ endif
+ 
+ obj-y += sched/
+ obj-y += power/
++obj-y += vserver/
+ 
+ ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
+ obj-$(CONFIG_X86) += kcmp.o
+diff -NurpP --minimal linux-3.7.10/kernel/auditsc.c linux-3.7.10-vs2.3.5.6/kernel/auditsc.c
+--- linux-3.7.10/kernel/auditsc.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/auditsc.c	2013-02-05 01:14:43.000000000 +0000
+@@ -2372,7 +2372,7 @@ int audit_set_loginuid(kuid_t loginuid)
+ 	if (uid_valid(task->loginuid))
+ 		return -EPERM;
+ #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+-	if (!capable(CAP_AUDIT_CONTROL))
++	if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL))
+ 		return -EPERM;
+ #endif  /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/capability.c linux-3.7.10-vs2.3.5.6/kernel/capability.c
+--- linux-3.7.10/kernel/capability.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/capability.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/pid_namespace.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_context.h>
+ #include <asm/uaccess.h>
+ 
+ /*
+@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h
+ 	return 0;
+ }
+ 
++
+ /*
+  * The only thing that can change the capabilities of the current
+  * process is the current process. As such, we can't be in this code
+@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta
+ 	return (ret == 0);
+ }
+ 
++#include <linux/vserver/base.h>
++
+ /**
+  * has_capability_noaudit - Does a task have a capability (unaudited) in the
+  * initial user ns
+diff -NurpP --minimal linux-3.7.10/kernel/compat.c linux-3.7.10-vs2.3.5.6/kernel/compat.c
+--- linux-3.7.10/kernel/compat.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/compat.c	2012-12-18 15:13:16.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <linux/times.h>
+ #include <linux/ptrace.h>
+ #include <linux/gfp.h>
++#include <linux/vs_time.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -1054,7 +1055,7 @@ asmlinkage long compat_sys_stime(compat_
+ 	if (err)
+ 		return err;
+ 
+-	do_settimeofday(&tv);
++	vx_settimeofday(&tv);
+ 	return 0;
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/cred.c linux-3.7.10-vs2.3.5.6/kernel/cred.c
+--- linux-3.7.10/kernel/cred.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/cred.c	2012-12-18 15:13:16.000000000 +0000
+@@ -70,31 +70,6 @@ struct cred init_cred = {
+ #endif
+ };
+ 
+-static inline void set_cred_subscribers(struct cred *cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	atomic_set(&cred->subscribers, n);
+-#endif
+-}
+-
+-static inline int read_cred_subscribers(const struct cred *cred)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	return atomic_read(&cred->subscribers);
+-#else
+-	return 0;
+-#endif
+-}
+-
+-static inline void alter_cred_subscribers(const struct cred *_cred, int n)
+-{
+-#ifdef CONFIG_DEBUG_CREDENTIALS
+-	struct cred *cred = (struct cred *) _cred;
+-
+-	atomic_add(n, &cred->subscribers);
+-#endif
+-}
+-
+ /*
+  * Dispose of the shared task group credentials
+  */
+@@ -284,21 +259,16 @@ error:
+  *
+  * Call commit_creds() or abort_creds() to clean up.
+  */
+-struct cred *prepare_creds(void)
++struct cred *__prepare_creds(const struct cred *old)
+ {
+-	struct task_struct *task = current;
+-	const struct cred *old;
+ 	struct cred *new;
+ 
+-	validate_process_creds();
+-
+ 	new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
+ 	if (!new)
+ 		return NULL;
+ 
+ 	kdebug("prepare_creds() alloc %p", new);
+ 
+-	old = task->cred;
+ 	memcpy(new, old, sizeof(struct cred));
+ 
+ 	atomic_set(&new->usage, 1);
+@@ -326,6 +296,13 @@ error:
+ 	abort_creds(new);
+ 	return NULL;
+ }
++
++struct cred *prepare_creds(void)
++{
++	validate_process_creds();
++
++	return __prepare_creds(current->cred);
++}
+ EXPORT_SYMBOL(prepare_creds);
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/kernel/exit.c linux-3.7.10-vs2.3.5.6/kernel/exit.c
+--- linux-3.7.10/kernel/exit.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/exit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -48,6 +48,10 @@
+ #include <linux/fs_struct.h>
+ #include <linux/init_task.h>
+ #include <linux/perf_event.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/oom.h>
+@@ -616,15 +620,25 @@ static struct task_struct *find_new_reap
+ 	__acquires(&tasklist_lock)
+ {
+ 	struct pid_namespace *pid_ns = task_active_pid_ns(father);
+-	struct task_struct *thread;
++	struct vx_info *vxi = task_get_vx_info(father);
++	struct task_struct *thread = father;
++	struct task_struct *reaper;
+ 
+-	thread = father;
+ 	while_each_thread(father, thread) {
+ 		if (thread->flags & PF_EXITING)
+ 			continue;
+ 		if (unlikely(pid_ns->child_reaper == father))
+ 			pid_ns->child_reaper = thread;
+-		return thread;
++		reaper = thread;
++		goto out_put;
++	}
++
++	reaper = pid_ns->child_reaper;
++	if (vxi) {
++		BUG_ON(!vxi->vx_reaper);
++		if (vxi->vx_reaper != init_pid_ns.child_reaper &&
++		    vxi->vx_reaper != father)
++			reaper = vxi->vx_reaper;
+ 	}
+ 
+ 	if (unlikely(pid_ns->child_reaper == father)) {
+@@ -662,7 +676,9 @@ static struct task_struct *find_new_reap
+ 		}
+ 	}
+ 
+-	return pid_ns->child_reaper;
++out_put:
++	put_vx_info(vxi);
++	return reaper;
+ }
+ 
+ /*
+@@ -713,10 +729,15 @@ static void forget_original_parent(struc
+ 	list_for_each_entry_safe(p, n, &father->children, sibling) {
+ 		struct task_struct *t = p;
+ 		do {
+-			t->real_parent = reaper;
++			struct task_struct *new_parent = reaper;
++
++			if (unlikely(p == reaper))
++				new_parent = task_active_pid_ns(p)->child_reaper;
++
++			t->real_parent = new_parent;
+ 			if (t->parent == father) {
+ 				BUG_ON(t->ptrace);
+-				t->parent = t->real_parent;
++				t->parent = new_parent;
+ 			}
+ 			if (t->pdeath_signal)
+ 				group_send_sig_info(t->pdeath_signal,
+@@ -923,6 +944,9 @@ void do_exit(long code)
+ 	 */
+ 	ptrace_put_breakpoints(tsk);
+ 
++	/* needs to stay before exit_notify() */
++	exit_vx_info_early(tsk, code);
++
+ 	exit_notify(tsk, group_dead);
+ #ifdef CONFIG_NUMA
+ 	task_lock(tsk);
+@@ -976,10 +1000,15 @@ void do_exit(long code)
+ 	smp_mb();
+ 	raw_spin_unlock_wait(&tsk->pi_lock);
+ 
++	/* needs to stay after exit_notify() */
++	exit_vx_info(tsk, code);
++	exit_nx_info(tsk);
++
+ 	/* causes final put_task_struct in finish_task_switch(). */
+ 	tsk->state = TASK_DEAD;
+ 	tsk->flags |= PF_NOFREEZE;	/* tell freezer to ignore us */
+ 	schedule();
++	printk("bad task: %p [%lx]\n", current, current->state);
+ 	BUG();
+ 	/* Avoid "noreturn function does return".  */
+ 	for (;;)
+diff -NurpP --minimal linux-3.7.10/kernel/fork.c linux-3.7.10-vs2.3.5.6/kernel/fork.c
+--- linux-3.7.10/kernel/fork.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/fork.c	2013-01-16 00:19:28.000000000 +0000
+@@ -70,6 +70,9 @@
+ #include <linux/khugepaged.h>
+ #include <linux/signalfd.h>
+ #include <linux/uprobes.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/pgalloc.h>
+@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk)
+ 	arch_release_thread_info(tsk->stack);
+ 	free_thread_info(tsk->stack);
+ 	rt_mutex_debug_task_free(tsk);
++	clr_vx_info(&tsk->vx_info);
++	clr_nx_info(&tsk->nx_info);
+ 	ftrace_graph_exit_task(tsk);
+ 	put_seccomp_filter(tsk);
+ 	arch_release_task_struct(tsk);
+@@ -545,6 +550,7 @@ static struct mm_struct *mm_init(struct
+ 	if (likely(!mm_alloc_pgd(mm))) {
+ 		mm->def_flags = 0;
+ 		mmu_notifier_mm_init(mm);
++		set_vx_info(&mm->mm_vx_info, p->vx_info);
+ 		return mm;
+ 	}
+ 
+@@ -597,6 +603,7 @@ void __mmdrop(struct mm_struct *mm)
+ 	destroy_context(mm);
+ 	mmu_notifier_mm_destroy(mm);
+ 	check_mm(mm);
++	clr_vx_info(&mm->mm_vx_info);
+ 	free_mm(mm);
+ }
+ EXPORT_SYMBOL_GPL(__mmdrop);
+@@ -816,6 +823,7 @@ struct mm_struct *dup_mm(struct task_str
+ 		goto fail_nomem;
+ 
+ 	memcpy(mm, oldmm, sizeof(*mm));
++	mm->mm_vx_info = NULL;
+ 	mm_init_cpumask(mm);
+ 
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+@@ -854,6 +862,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 NULL;
+@@ -1135,6 +1144,8 @@ static struct task_struct *copy_process(
+ {
+ 	int retval;
+ 	struct task_struct *p;
++	struct vx_info *vxi;
++	struct nx_info *nxi;
+ 
+ 	if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS))
+ 		return ERR_PTR(-EINVAL);
+@@ -1182,7 +1193,12 @@ static struct task_struct *copy_process(
+ 	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
+ 	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
+ #endif
++	init_vx_info(&p->vx_info, current_vx_info());
++	init_nx_info(&p->nx_info, current_nx_info());
++
+ 	retval = -EAGAIN;
++	if (!vx_nproc_avail(1))
++		goto bad_fork_free;
+ 	if (atomic_read(&p->real_cred->user->processes) >=
+ 			task_rlimit(p, RLIMIT_NPROC)) {
+ 		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+@@ -1451,6 +1467,18 @@ static struct task_struct *copy_process(
+ 
+ 	total_forks++;
+ 	spin_unlock(&current->sighand->siglock);
++
++	/* 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);
+ 	proc_fork_connector(p);
+ 	cgroup_post_fork(p);
+diff -NurpP --minimal linux-3.7.10/kernel/kthread.c linux-3.7.10-vs2.3.5.6/kernel/kthread.c
+--- linux-3.7.10/kernel/kthread.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/kthread.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/slab.h>
+ #include <linux/freezer.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_pid.h>
+ #include <trace/events/sched.h>
+ 
+ static DEFINE_SPINLOCK(kthread_create_lock);
+diff -NurpP --minimal linux-3.7.10/kernel/nsproxy.c linux-3.7.10-vs2.3.5.6/kernel/nsproxy.c
+--- linux-3.7.10/kernel/nsproxy.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/nsproxy.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,11 +20,14 @@
+ #include <linux/mnt_namespace.h>
+ #include <linux/utsname.h>
+ #include <linux/pid_namespace.h>
++#include <linux/vserver/global.h>
++#include <linux/vserver/debug.h>
+ #include <net/net_namespace.h>
+ #include <linux/ipc_namespace.h>
+ #include <linux/proc_fs.h>
+ #include <linux/file.h>
+ #include <linux/syscalls.h>
++#include "../fs/mount.h"
+ 
+ static struct kmem_cache *nsproxy_cachep;
+ 
+@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp
+ 	struct nsproxy *nsproxy;
+ 
+ 	nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+-	if (nsproxy)
++	if (nsproxy) {
+ 		atomic_set(&nsproxy->count, 1);
++		atomic_inc(&vs_global_nsproxy);
++	}
++	vxdprintk(VXD_CBIT(space, 2), "create_nsproxy = %p[1]", nsproxy);
+ 	return nsproxy;
+ }
+ 
+@@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsp
+  * Return the newly created nsproxy.  Do not attach this to the task,
+  * leave it to the caller to do proper locking and attach it to task.
+  */
+-static struct nsproxy *create_new_namespaces(unsigned long flags,
+-			struct task_struct *tsk, struct fs_struct *new_fs)
++static struct nsproxy *unshare_namespaces(unsigned long flags,
++			struct nsproxy *orig,
++			struct fs_struct *new_fs,
++			struct user_namespace *new_user,
++			struct pid_namespace *new_pid)
+ {
+ 	struct nsproxy *new_nsp;
+ 	int err;
+@@ -66,31 +75,31 @@ static struct nsproxy *create_new_namesp
+ 	if (!new_nsp)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, new_fs);
++	new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs);
+ 	if (IS_ERR(new_nsp->mnt_ns)) {
+ 		err = PTR_ERR(new_nsp->mnt_ns);
+ 		goto out_ns;
+ 	}
+ 
+-	new_nsp->uts_ns = copy_utsname(flags, tsk);
++	new_nsp->uts_ns = copy_utsname(flags, orig->uts_ns, new_user);
+ 	if (IS_ERR(new_nsp->uts_ns)) {
+ 		err = PTR_ERR(new_nsp->uts_ns);
+ 		goto out_uts;
+ 	}
+ 
+-	new_nsp->ipc_ns = copy_ipcs(flags, tsk);
++	new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns, new_user);
+ 	if (IS_ERR(new_nsp->ipc_ns)) {
+ 		err = PTR_ERR(new_nsp->ipc_ns);
+ 		goto out_ipc;
+ 	}
+ 
+-	new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
++	new_nsp->pid_ns = copy_pid_ns(flags, new_pid);
+ 	if (IS_ERR(new_nsp->pid_ns)) {
+ 		err = PTR_ERR(new_nsp->pid_ns);
+ 		goto out_pid;
+ 	}
+ 
+-	new_nsp->net_ns = copy_net_ns(flags, tsk->nsproxy->net_ns);
++	new_nsp->net_ns = copy_net_ns(flags, orig->net_ns);
+ 	if (IS_ERR(new_nsp->net_ns)) {
+ 		err = PTR_ERR(new_nsp->net_ns);
+ 		goto out_net;
+@@ -115,6 +124,40 @@ out_ns:
+ 	return ERR_PTR(err);
+ }
+ 
++static struct nsproxy *create_new_namespaces(unsigned long flags,
++			struct task_struct *tsk, struct fs_struct *new_fs)
++{
++	return unshare_namespaces(flags, tsk->nsproxy,
++		new_fs, task_cred_xxx(tsk, user_ns),
++		task_active_pid_ns(tsk));
++}
++
++/*
++ * copies the nsproxy, setting refcount to 1, and grabbing a
++ * reference to all contained namespaces.
++ */
++struct nsproxy *copy_nsproxy(struct nsproxy *orig)
++{
++	struct nsproxy *ns = create_nsproxy();
++
++	if (ns) {
++		memcpy(ns, orig, sizeof(struct nsproxy));
++		atomic_set(&ns->count, 1);
++
++		if (ns->mnt_ns)
++			get_mnt_ns(ns->mnt_ns);
++		if (ns->uts_ns)
++			get_uts_ns(ns->uts_ns);
++		if (ns->ipc_ns)
++			get_ipc_ns(ns->ipc_ns);
++		if (ns->pid_ns)
++			get_pid_ns(ns->pid_ns);
++		if (ns->net_ns)
++			get_net(ns->net_ns);
++	}
++	return ns;
++}
++
+ /*
+  * called from clone.  This now handles copy for nsproxy and all
+  * namespaces therein.
+@@ -122,9 +165,12 @@ out_ns:
+ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
+ {
+ 	struct nsproxy *old_ns = tsk->nsproxy;
+-	struct nsproxy *new_ns;
++	struct nsproxy *new_ns = NULL;
+ 	int err = 0;
+ 
++	vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])",
++		flags, tsk, old_ns);
++
+ 	if (!old_ns)
+ 		return 0;
+ 
+@@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags,
+ 				CLONE_NEWPID | CLONE_NEWNET)))
+ 		return 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN)) {
++	if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) {
+ 		err = -EPERM;
+ 		goto out;
+ 	}
+@@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags,
+ 
+ out:
+ 	put_nsproxy(old_ns);
++	vxdprintk(VXD_CBIT(space, 3),
++		"copy_namespaces(0x%08lx,%p[%p]) = %d [%p]",
++		flags, tsk, old_ns, err, new_ns);
+ 	return err;
+ }
+ 
+@@ -174,7 +223,9 @@ void free_nsproxy(struct nsproxy *ns)
+ 		put_ipc_ns(ns->ipc_ns);
+ 	if (ns->pid_ns)
+ 		put_pid_ns(ns->pid_ns);
+-	put_net(ns->net_ns);
++	if (ns->net_ns)
++		put_net(ns->net_ns);
++	atomic_dec(&vs_global_nsproxy);
+ 	kmem_cache_free(nsproxy_cachep, ns);
+ }
+ 
+@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned
+ {
+ 	int err = 0;
+ 
++	vxdprintk(VXD_CBIT(space, 4),
++		"unshare_nsproxy_namespaces(0x%08lx,[%p])",
++		unshare_flags, current->nsproxy);
++
+ 	if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC |
+ 			       CLONE_NEWNET)))
+ 		return 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags))
+ 		return -EPERM;
+ 
+ 	*new_nsp = create_new_namespaces(unshare_flags, current,
+diff -NurpP --minimal linux-3.7.10/kernel/pid.c linux-3.7.10-vs2.3.5.6/kernel/pid.c
+--- linux-3.7.10/kernel/pid.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/pid.c	2012-12-18 15:13:16.000000000 +0000
+@@ -36,6 +36,7 @@
+ #include <linux/pid_namespace.h>
+ #include <linux/init_task.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_pid.h>
+ 
+ #define pid_hashfn(nr, ns)	\
+ 	hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift)
+@@ -344,7 +345,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns);
+ 
+ struct pid *find_vpid(int nr)
+ {
+-	return find_pid_ns(nr, current->nsproxy->pid_ns);
++	return find_pid_ns(vx_rmap_pid(nr), current->nsproxy->pid_ns);
+ }
+ EXPORT_SYMBOL_GPL(find_vpid);
+ 
+@@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *ol
+ struct task_struct *pid_task(struct pid *pid, enum pid_type type)
+ {
+ 	struct task_struct *result = NULL;
++
++	if (type == PIDTYPE_REALPID)
++		type = PIDTYPE_PID;
+ 	if (pid) {
+ 		struct hlist_node *first;
+ 		first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]),
+@@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns(
+ 	rcu_lockdep_assert(rcu_read_lock_held(),
+ 			   "find_task_by_pid_ns() needs rcu_read_lock()"
+ 			   " protection");
+-	return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
++	return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
+ }
+ 
+ struct task_struct *find_task_by_vpid(pid_t vnr)
+@@ -467,7 +471,7 @@ struct pid *find_get_pid(pid_t nr)
+ }
+ EXPORT_SYMBOL_GPL(find_get_pid);
+ 
+-pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
++pid_t pid_unmapped_nr_ns(struct pid *pid, struct pid_namespace *ns)
+ {
+ 	struct upid *upid;
+ 	pid_t nr = 0;
+@@ -481,6 +485,11 @@ pid_t pid_nr_ns(struct pid *pid, struct
+ }
+ EXPORT_SYMBOL_GPL(pid_nr_ns);
+ 
++pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
++{
++	return vx_map_pid(pid_unmapped_nr_ns(pid, ns));
++}
++
+ pid_t pid_vnr(struct pid *pid)
+ {
+ 	return pid_nr_ns(pid, current->nsproxy->pid_ns);
+diff -NurpP --minimal linux-3.7.10/kernel/pid_namespace.c linux-3.7.10-vs2.3.5.6/kernel/pid_namespace.c
+--- linux-3.7.10/kernel/pid_namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/pid_namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -17,6 +17,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/reboot.h>
+ #include <linux/export.h>
++#include <linux/vserver/global.h>
+ 
+ #define BITS_PER_PAGE		(PAGE_SIZE*8)
+ 
+@@ -100,6 +101,7 @@ static struct pid_namespace *create_pid_
+ 		goto out_free_map;
+ 
+ 	kref_init(&ns->kref);
++	atomic_inc(&vs_global_pid_ns);
+ 	ns->level = level;
+ 	ns->parent = get_pid_ns(parent_pid_ns);
+ 
+@@ -131,6 +133,7 @@ static void destroy_pid_namespace(struct
+ 
+ 	for (i = 0; i < PIDMAP_ENTRIES; i++)
+ 		kfree(ns->pidmap[i].page);
++	atomic_dec(&vs_global_pid_ns);
+ 	kmem_cache_free(pid_ns_cachep, ns);
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/posix-timers.c linux-3.7.10-vs2.3.5.6/kernel/posix-timers.c
+--- linux-3.7.10/kernel/posix-timers.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/posix-timers.c	2012-12-18 15:13:16.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <linux/wait.h>
+ #include <linux/workqueue.h>
+ #include <linux/export.h>
++#include <linux/vs_context.h>
+ 
+ /*
+  * Management arrays for POSIX timers.	 Timers are kept in slab memory
+@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t
+ {
+ 	struct task_struct *task;
+ 	int shared, ret = -1;
++
+ 	/*
+ 	 * FIXME: if ->sigq is queued we can race with
+ 	 * dequeue_signal()->do_schedule_next_timer().
+@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t
+ 	rcu_read_lock();
+ 	task = pid_task(timr->it_pid, PIDTYPE_PID);
+ 	if (task) {
++		struct vx_info_save vxis;
++		struct vx_info *vxi;
++
++		vxi = get_vx_info(task->vx_info);
++		enter_vx_info(vxi, &vxis);
+ 		shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
+ 		ret = send_sigqueue(timr->sigq, task, shared);
++		leave_vx_info(&vxis);
++		put_vx_info(vxi);
+ 	}
+ 	rcu_read_unlock();
++
+ 	/* If we failed to send the signal the timer stops. */
+ 	return ret > 0;
+ }
+diff -NurpP --minimal linux-3.7.10/kernel/printk.c linux-3.7.10-vs2.3.5.6/kernel/printk.c
+--- linux-3.7.10/kernel/printk.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/printk.c	2013-01-16 00:19:03.000000000 +0000
+@@ -42,6 +42,7 @@
+ #include <linux/notifier.h>
+ #include <linux/rculist.h>
+ #include <linux/poll.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -818,7 +819,7 @@ static int check_syslog_permissions(int
+ 		return 0;
+ 
+ 	if (syslog_action_restricted(type)) {
+-		if (capable(CAP_SYSLOG))
++		if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
+ 			return 0;
+ 		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
+ 		if (capable(CAP_SYS_ADMIN)) {
+@@ -1112,12 +1113,9 @@ int do_syslog(int type, char __user *buf
+ 	if (error)
+ 		return error;
+ 
+-	switch (type) {
+-	case SYSLOG_ACTION_CLOSE:	/* Close log */
+-		break;
+-	case SYSLOG_ACTION_OPEN:	/* Open log */
+-		break;
+-	case SYSLOG_ACTION_READ:	/* Read from log */
++	if ((type == SYSLOG_ACTION_READ) ||
++	    (type == SYSLOG_ACTION_READ_ALL) ||
++	    (type == SYSLOG_ACTION_READ_CLEAR)) {
+ 		error = -EINVAL;
+ 		if (!buf || len < 0)
+ 			goto out;
+@@ -1128,6 +1126,16 @@ int do_syslog(int type, char __user *buf
+ 			error = -EFAULT;
+ 			goto out;
+ 		}
++	}
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		return vx_do_syslog(type, buf, len);
++
++	switch (type) {
++	case SYSLOG_ACTION_CLOSE:	/* Close log */
++		break;
++	case SYSLOG_ACTION_OPEN:	/* Open log */
++		break;
++	case SYSLOG_ACTION_READ:	/* Read from log */
+ 		error = wait_event_interruptible(log_wait,
+ 						 syslog_seq != log_next_seq);
+ 		if (error)
+@@ -1140,16 +1148,6 @@ int do_syslog(int type, char __user *buf
+ 		/* FALL THRU */
+ 	/* Read last kernel messages */
+ 	case SYSLOG_ACTION_READ_ALL:
+-		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;
+-		}
+ 		error = syslog_print_all(buf, len, clear);
+ 		break;
+ 	/* Clear ring buffer */
+diff -NurpP --minimal linux-3.7.10/kernel/ptrace.c linux-3.7.10-vs2.3.5.6/kernel/ptrace.c
+--- linux-3.7.10/kernel/ptrace.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/ptrace.c	2013-02-05 01:14:43.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/uaccess.h>
+ #include <linux/regset.h>
++#include <linux/vs_context.h>
+ #include <linux/hw_breakpoint.h>
+ #include <linux/cn_proc.h>
+ 
+@@ -256,6 +257,11 @@ ok:
+ 		dumpable = get_dumpable(task->mm);
+ 	if (!dumpable  && !ptrace_has_cap(task_user_ns(task), mode))
+ 		return -EPERM;
++	if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT))
++		return -EPERM;
++	if (!vx_check(task->xid, VS_IDENT) &&
++		!task_vx_flags(task, VXF_STATE_ADMIN, 0))
++		return -EACCES;
+ 
+ 	return security_ptrace_access_check(task, mode);
+ }
+diff -NurpP --minimal linux-3.7.10/kernel/sched/core.c linux-3.7.10-vs2.3.5.6/kernel/sched/core.c
+--- linux-3.7.10/kernel/sched/core.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sched/core.c	2013-02-05 01:14:43.000000000 +0000
+@@ -72,6 +72,8 @@
+ #include <linux/slab.h>
+ #include <linux/init_task.h>
+ #include <linux/binfmts.h>
++#include <linux/vs_sched.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <asm/switch_to.h>
+ #include <asm/tlb.h>
+@@ -2031,9 +2033,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+  */
+ void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
+ {
+-	loads[0] = (avenrun[0] + offset) << shift;
+-	loads[1] = (avenrun[1] + offset) << shift;
+-	loads[2] = (avenrun[2] + offset) << shift;
++	if (vx_flags(VXF_VIRT_LOAD, 0)) {
++		struct vx_info *vxi = current_vx_info();
++
++		loads[0] = (vxi->cvirt.load[0] + offset) << shift;
++		loads[1] = (vxi->cvirt.load[1] + offset) << shift;
++		loads[2] = (vxi->cvirt.load[2] + offset) << shift;
++	} else {
++		loads[0] = (avenrun[0] + offset) << shift;
++		loads[1] = (avenrun[1] + offset) << shift;
++		loads[2] = (avenrun[2] + offset) << shift;
++	}
+ }
+ 
+ static long calc_load_fold_active(struct rq *this_rq)
+@@ -3597,7 +3607,7 @@ SYSCALL_DEFINE1(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)
+diff -NurpP --minimal linux-3.7.10/kernel/sched/cputime.c linux-3.7.10-vs2.3.5.6/kernel/sched/cputime.c
+--- linux-3.7.10/kernel/sched/cputime.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sched/cputime.c	2012-12-18 15:13:16.000000000 +0000
+@@ -3,6 +3,7 @@
+ #include <linux/tsacct_kern.h>
+ #include <linux/kernel_stat.h>
+ #include <linux/static_key.h>
++#include <linux/vs_sched.h>
+ #include "sched.h"
+ 
+ 
+@@ -150,14 +151,17 @@ static inline void task_group_account_fi
+ void account_user_time(struct task_struct *p, cputime_t cputime,
+ 		       cputime_t cputime_scaled)
+ {
++	struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
++	int nice = (TASK_NICE(p) > 0);
+ 	int index;
+ 
+ 	/* Add user time to process. */
+ 	p->utime += cputime;
+ 	p->utimescaled += cputime_scaled;
++	vx_account_user(vxi, cputime, nice);
+ 	account_group_user_time(p, cputime);
+ 
+-	index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER;
++	index = (nice) ? CPUTIME_NICE : CPUTIME_USER;
+ 
+ 	/* Add user time to cpustat. */
+ 	task_group_account_field(p, index, (__force u64) cputime);
+@@ -204,9 +208,12 @@ static inline
+ void __account_system_time(struct task_struct *p, cputime_t cputime,
+ 			cputime_t cputime_scaled, int index)
+ {
++	struct vx_info *vxi = p->vx_info;  /* p is _always_ current */
++
+ 	/* Add system time to process. */
+ 	p->stime += cputime;
+ 	p->stimescaled += cputime_scaled;
++	vx_account_system(vxi, cputime, 0 /* do we have idle time? */);
+ 	account_group_system_time(p, cputime);
+ 
+ 	/* Add system time to cpustat. */
+diff -NurpP --minimal linux-3.7.10/kernel/sched/fair.c linux-3.7.10-vs2.3.5.6/kernel/sched/fair.c
+--- linux-3.7.10/kernel/sched/fair.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sched/fair.c	2012-12-18 15:13:16.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/slab.h>
+ #include <linux/profile.h>
+ #include <linux/interrupt.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <trace/events/sched.h>
+ 
+@@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
+ 		__enqueue_entity(cfs_rq, se);
+ 	se->on_rq = 1;
+ 
++	if (entity_is_task(se))
++		vx_activate_task(task_of(se));
+ 	if (cfs_rq->nr_running == 1) {
+ 		list_add_leaf_cfs_rq(cfs_rq);
+ 		check_enqueue_throttle(cfs_rq);
+@@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st
+ 	if (se != cfs_rq->curr)
+ 		__dequeue_entity(cfs_rq, se);
+ 	se->on_rq = 0;
++	if (entity_is_task(se))
++		vx_deactivate_task(task_of(se));
+ 	update_cfs_load(cfs_rq, 0);
+ 	account_entity_dequeue(cfs_rq, se);
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/signal.c linux-3.7.10-vs2.3.5.6/kernel/signal.c
+--- linux-3.7.10/kernel/signal.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/signal.c	2013-02-05 01:14:43.000000000 +0000
+@@ -31,6 +31,8 @@
+ #include <linux/nsproxy.h>
+ #include <linux/user_namespace.h>
+ #include <linux/uprobes.h>
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/signal.h>
+ 
+@@ -785,9 +787,18 @@ static int check_kill_permission(int sig
+ 	struct pid *sid;
+ 	int error;
+ 
++	vxdprintk(VXD_CBIT(misc, 7),
++		"check_kill_permission(%d,%p,%p[#%u,%u])",
++		sig, info, t, vx_task_xid(t), t->pid);
++
+ 	if (!valid_signal(sig))
+ 		return -EINVAL;
+ 
++/*	FIXME: needed? if so, why?
++	if ((info != SEND_SIG_NOINFO) &&
++		(is_si_special(info) || !si_fromuser(info)))
++		goto skip;	*/
++
+ 	if (!si_fromuser(info))
+ 		return 0;
+ 
+@@ -811,6 +822,20 @@ static int check_kill_permission(int sig
+ 		}
+ 	}
+ 
++	error = -EPERM;
++	if (t->pid == 1 && current->xid)
++		return error;
++
++	error = -ESRCH;
++	/* FIXME: we shouldn't return ESRCH ever, to avoid
++		  loops, maybe ENOENT or EACCES? */
++	if (!vx_check(vx_task_xid(t), VS_WATCH_P | VS_IDENT)) {
++		vxdprintk(current->xid || VXD_CBIT(misc, 7),
++			"signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
++			sig, info, t, vx_task_xid(t), t->pid, current->xid);
++		return error;
++	}
++/* skip: */
+ 	return security_task_kill(t, info, sig, 0);
+ }
+ 
+@@ -1346,7 +1371,7 @@ int kill_pid_info(int sig, struct siginf
+ 	rcu_read_lock();
+ retry:
+ 	p = pid_task(pid, PIDTYPE_PID);
+-	if (p) {
++	if (p && vx_check(vx_task_xid(p), VS_IDENT)) {
+ 		error = group_send_sig_info(sig, info, p);
+ 		if (unlikely(error == -ESRCH))
+ 			/*
+@@ -1394,7 +1419,7 @@ int kill_pid_info_as_cred(int sig, struc
+ 
+ 	rcu_read_lock();
+ 	p = pid_task(pid, PIDTYPE_PID);
+-	if (!p) {
++	if (!p || !vx_check(vx_task_xid(p), VS_IDENT)) {
+ 		ret = -ESRCH;
+ 		goto out_unlock;
+ 	}
+@@ -1446,8 +1471,10 @@ static int kill_something_info(int sig,
+ 		struct task_struct * p;
+ 
+ 		for_each_process(p) {
+-			if (task_pid_vnr(p) > 1 &&
+-					!same_thread_group(p, current)) {
++			if (vx_check(vx_task_xid(p), VS_ADMIN|VS_IDENT) &&
++				task_pid_vnr(p) > 1 &&
++				!same_thread_group(p, current) &&
++				!vx_current_initpid(p->pid)) {
+ 				int err = group_send_sig_info(sig, info, p);
+ 				++count;
+ 				if (err != -EPERM)
+@@ -2307,6 +2334,11 @@ relock:
+ 				!sig_kernel_only(signr))
+ 			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
+diff -NurpP --minimal linux-3.7.10/kernel/softirq.c linux-3.7.10-vs2.3.5.6/kernel/softirq.c
+--- linux-3.7.10/kernel/softirq.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/softirq.c	2012-12-18 15:13:16.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <linux/smp.h>
+ #include <linux/smpboot.h>
+ #include <linux/tick.h>
++#include <linux/vs_context.h>
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/irq.h>
+diff -NurpP --minimal linux-3.7.10/kernel/sys.c linux-3.7.10-vs2.3.5.6/kernel/sys.c
+--- linux-3.7.10/kernel/sys.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sys.c	2012-12-18 15:13:16.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/kprobes.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_pid.h>
+ 
+ #include <linux/kmsg_dump.h>
+ /* Move somewhere else to avoid recompiling? */
+@@ -154,7 +155,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);
+@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which,
+ 			else
+ 				pgrp = task_pgrp(current);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				error = set_one_prio(p, niceval, error);
+ 			} while_each_pid_thread(pgrp, PIDTYPE_PGID, p);
+ 			break;
+@@ -270,6 +276,8 @@ SYSCALL_DEFINE2(getpriority, int, which,
+ 			else
+ 				pgrp = task_pgrp(current);
+ 			do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
++				if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT))
++					continue;
+ 				niceval = 20 - task_nice(p);
+ 				if (niceval > retval)
+ 					retval = niceval;
+@@ -422,6 +430,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off);
+ 
+ static DEFINE_MUTEX(reboot_mutex);
+ 
++long vs_reboot(unsigned int, void __user *);
++
+ /*
+  * Reboot system call: for obvious reasons only root may call it,
+  * and even root needs to set up some magic numbers in the registers
+@@ -463,6 +473,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+ 	if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off)
+ 		cmd = LINUX_REBOOT_CMD_HALT;
+ 
++	if (!vx_check(0, VS_ADMIN|VS_WATCH))
++		return vs_reboot(cmd, arg);
++
+ 	mutex_lock(&reboot_mutex);
+ 	switch (cmd) {
+ 	case LINUX_REBOOT_CMD_RESTART:
+@@ -1370,7 +1383,8 @@ SYSCALL_DEFINE2(sethostname, char __user
+ 	int errno;
+ 	char tmp[__NEW_UTS_LEN];
+ 
+-	if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++	if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++		CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ 		return -EPERM;
+ 
+ 	if (len < 0 || len > __NEW_UTS_LEN)
+@@ -1421,7 +1435,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
+ 	int errno;
+ 	char tmp[__NEW_UTS_LEN];
+ 
+-	if (!ns_capable(current->nsproxy->uts_ns->user_ns, CAP_SYS_ADMIN))
++	if (!vx_ns_capable(current->nsproxy->uts_ns->user_ns,
++		CAP_SYS_ADMIN, VXC_SET_UTSNAME))
+ 		return -EPERM;
+ 	if (len < 0 || len > __NEW_UTS_LEN)
+ 		return -EINVAL;
+@@ -1540,7 +1555,7 @@ int do_prlimit(struct task_struct *tsk,
+ 		/* Keep the capable check against init_user_ns until
+ 		   cgroups can contain all limits */
+ 		if (new_rlim->rlim_max > rlim->rlim_max &&
+-				!capable(CAP_SYS_RESOURCE))
++			!vx_capable(CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ 			retval = -EPERM;
+ 		if (!retval)
+ 			retval = security_task_setrlimit(tsk->group_leader,
+@@ -1593,7 +1608,8 @@ static int check_prlimit_permission(stru
+ 	    gid_eq(cred->gid, tcred->sgid) &&
+ 	    gid_eq(cred->gid, tcred->gid))
+ 		return 0;
+-	if (ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
++	if (vx_ns_capable(tcred->user_ns,
++		CAP_SYS_RESOURCE, VXC_SET_RLIMIT))
+ 		return 0;
+ 
+ 	return -EPERM;
+diff -NurpP --minimal linux-3.7.10/kernel/sysctl.c linux-3.7.10-vs2.3.5.6/kernel/sysctl.c
+--- linux-3.7.10/kernel/sysctl.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sysctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -82,6 +82,7 @@
+ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+ #include <linux/lockdep.h>
+ #endif
++extern char vshelper_path[];
+ #ifdef CONFIG_CHR_DEV_SG
+ #include <scsi/sg.h>
+ #endif
+@@ -574,6 +575,13 @@ static struct ctl_table kern_table[] = {
+ 		.proc_handler	= proc_dostring,
+ 	},
+ #endif
++	{
++		.procname	= "vshelper",
++		.data		= &vshelper_path,
++		.maxlen		= 256,
++		.mode		= 0644,
++		.proc_handler	= &proc_dostring,
++	},
+ #ifdef CONFIG_CHR_DEV_SG
+ 	{
+ 		.procname	= "sg-big-buff",
+diff -NurpP --minimal linux-3.7.10/kernel/sysctl_binary.c linux-3.7.10-vs2.3.5.6/kernel/sysctl_binary.c
+--- linux-3.7.10/kernel/sysctl_binary.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/sysctl_binary.c	2012-12-18 15:13:16.000000000 +0000
+@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
+ 
+ 	{ CTL_INT,	KERN_PANIC,			"panic" },
+ 	{ CTL_INT,	KERN_REALROOTDEV,		"real-root-dev" },
++	{ CTL_STR,	KERN_VSHELPER,			"vshelper" },
+ 
+ 	{ CTL_STR,	KERN_SPARC_REBOOT,		"reboot-cmd" },
+ 	{ CTL_INT,	KERN_CTLALTDEL,			"ctrl-alt-del" },
+diff -NurpP --minimal linux-3.7.10/kernel/time/timekeeping.c linux-3.7.10-vs2.3.5.6/kernel/time/timekeeping.c
+--- linux-3.7.10/kernel/time/timekeeping.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/time/timekeeping.c	2012-12-18 15:13:16.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <linux/time.h>
+ #include <linux/tick.h>
+ #include <linux/stop_machine.h>
++#include <linux/vs_time.h>
+ 
+ 
+ static struct timekeeper timekeeper;
+@@ -243,6 +244,7 @@ void getnstimeofday(struct timespec *ts)
+ 
+ 	ts->tv_nsec = 0;
+ 	timespec_add_ns(ts, nsecs);
++	vx_adjust_timespec(ts);
+ }
+ EXPORT_SYMBOL(getnstimeofday);
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/time.c linux-3.7.10-vs2.3.5.6/kernel/time.c
+--- linux-3.7.10/kernel/time.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/time.c	2012-12-18 15:13:16.000000000 +0000
+@@ -37,6 +37,7 @@
+ #include <linux/fs.h>
+ #include <linux/math64.h>
+ #include <linux/ptrace.h>
++#include <linux/vs_time.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+@@ -92,7 +93,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
+ 	if (err)
+ 		return err;
+ 
+-	do_settimeofday(&tv);
++	vx_settimeofday(&tv);
+ 	return 0;
+ }
+ 
+@@ -172,7 +173,7 @@ int do_sys_settimeofday(const struct tim
+ 		}
+ 	}
+ 	if (tv)
+-		return do_settimeofday(tv);
++		return vx_settimeofday(tv);
+ 	return 0;
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/timer.c linux-3.7.10-vs2.3.5.6/kernel/timer.c
+--- linux-3.7.10/kernel/timer.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/timer.c	2012-12-18 15:13:16.000000000 +0000
+@@ -40,6 +40,10 @@
+ #include <linux/irq_work.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
++#include <linux/vs_base.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/sched.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+diff -NurpP --minimal linux-3.7.10/kernel/user_namespace.c linux-3.7.10-vs2.3.5.6/kernel/user_namespace.c
+--- linux-3.7.10/kernel/user_namespace.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/user_namespace.c	2012-12-18 15:13:16.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include <linux/uaccess.h>
+ #include <linux/ctype.h>
+ #include <linux/projid.h>
++#include <linux/vserver/global.h>
+ 
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ 
+@@ -53,6 +54,7 @@ int create_user_ns(struct cred *new)
+ 		return -ENOMEM;
+ 
+ 	kref_init(&ns->kref);
++	atomic_inc(&vs_global_user_ns);
+ 	ns->parent = parent_ns;
+ 	ns->owner = owner;
+ 	ns->group = group;
+@@ -85,6 +87,9 @@ void free_user_ns(struct kref *kref)
+ 
+ 	parent = ns->parent;
+ 	kmem_cache_free(user_ns_cachep, ns);
++
++	/* FIXME: maybe move into destroyer? */
++	atomic_dec(&vs_global_user_ns);
+ 	put_user_ns(parent);
+ }
+ EXPORT_SYMBOL(free_user_ns);
+diff -NurpP --minimal linux-3.7.10/kernel/utsname.c linux-3.7.10-vs2.3.5.6/kernel/utsname.c
+--- linux-3.7.10/kernel/utsname.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/utsname.c	2012-12-18 15:13:16.000000000 +0000
+@@ -16,14 +16,17 @@
+ #include <linux/slab.h>
+ #include <linux/user_namespace.h>
+ #include <linux/proc_fs.h>
++#include <linux/vserver/global.h>
+ 
+ static struct uts_namespace *create_uts_ns(void)
+ {
+ 	struct uts_namespace *uts_ns;
+ 
+ 	uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
+-	if (uts_ns)
++	if (uts_ns) {
+ 		kref_init(&uts_ns->kref);
++		atomic_inc(&vs_global_uts_ns);
++	}
+ 	return uts_ns;
+ }
+ 
+@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_
+  * @old_ns: namespace to clone
+  * Return NULL on error (failure to kmalloc), new ns otherwise
+  */
+-static struct uts_namespace *clone_uts_ns(struct task_struct *tsk,
+-					  struct uts_namespace *old_ns)
++static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns,
++					  struct user_namespace *old_user)
+ {
+ 	struct uts_namespace *ns;
+ 
+@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n
+ 
+ 	down_read(&uts_sem);
+ 	memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
+-	ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns));
++	ns->user_ns = get_user_ns(old_user);
+ 	up_read(&uts_sem);
+ 	return ns;
+ }
+@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n
+  * versa.
+  */
+ struct uts_namespace *copy_utsname(unsigned long flags,
+-				   struct task_struct *tsk)
++				   struct uts_namespace *old_ns,
++				   struct user_namespace *user_ns)
+ {
+-	struct uts_namespace *old_ns = tsk->nsproxy->uts_ns;
+ 	struct uts_namespace *new_ns;
+ 
+ 	BUG_ON(!old_ns);
+@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig
+ 	if (!(flags & CLONE_NEWUTS))
+ 		return old_ns;
+ 
+-	new_ns = clone_uts_ns(tsk, old_ns);
++	new_ns = clone_uts_ns(old_ns, user_ns);
+ 
+ 	put_uts_ns(old_ns);
+ 	return new_ns;
+@@ -78,6 +81,7 @@ void free_uts_ns(struct kref *kref)
+ 
+ 	ns = container_of(kref, struct uts_namespace, kref);
+ 	put_user_ns(ns->user_ns);
++	atomic_dec(&vs_global_uts_ns);
+ 	kfree(ns);
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/Kconfig linux-3.7.10-vs2.3.5.6/kernel/vserver/Kconfig
+--- linux-3.7.10/kernel/vserver/Kconfig	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,233 @@
++#
++# Linux VServer configuration
++#
++
++menu "Linux VServer"
++
++config	VSERVER_AUTO_LBACK
++	bool    "Automatically Assign Loopback IP"
++	default y
++	help
++	  Automatically assign a guest specific loopback
++	  IP and add it to the kernel network stack on
++	  startup.
++
++config	VSERVER_AUTO_SINGLE
++	bool	"Automatic Single IP Special Casing"
++	depends on EXPERIMENTAL
++	default y
++	help
++	  This allows network contexts with a single IP to
++	  automatically remap 0.0.0.0 bindings to that IP,
++	  avoiding further network checks and improving
++	  performance.
++
++	  (note: such guests do not allow to change the ip
++	   on the fly and do not show loopback addresses)
++
++config	VSERVER_COWBL
++	bool	"Enable COW Immutable Link Breaking"
++	default y
++	help
++	  This enables the COW (Copy-On-Write) link break code.
++	  It allows you to treat unified files like normal files
++	  when writing to them (which will implicitely break the
++	  link and create a copy of the unified file)
++
++config	VSERVER_VTIME
++	bool	"Enable Virtualized Guest Time"
++	depends on EXPERIMENTAL
++	default n
++	help
++	  This enables per guest time offsets to allow for
++	  adjusting the system clock individually per guest.
++	  this adds some overhead to the time functions and
++	  therefore should not be enabled without good reason.
++
++config	VSERVER_DEVICE
++	bool	"Enable Guest Device Mapping"
++	depends on EXPERIMENTAL
++	default n
++	help
++	  This enables generic device remapping.
++
++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)
++
++choice
++	prompt	"Persistent Inode Tagging"
++	default	TAGGING_ID24
++	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	TAGGING_NONE
++	bool	"Disabled"
++	help
++	  do not store per-context information in inodes.
++
++config	TAGGING_UID16
++	bool	"UID16/GID32"
++	help
++	  reduces UID to 16 bit, but leaves GID at 32 bit.
++
++config	TAGGING_GID16
++	bool	"UID32/GID16"
++	help
++	  reduces GID to 16 bit, but leaves UID at 32 bit.
++
++config	TAGGING_ID24
++	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	TAGGING_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)
++
++endchoice
++
++config	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 tagging specified above.
++	  (will require patched clients too)
++
++config	VSERVER_PRIVACY
++	bool	"Honor Privacy Aspects of Guests"
++	default n
++	help
++	  When enabled, most context checks will disallow
++	  access to structures assigned to a specific context,
++	  like ptys or loop devices.
++
++config	VSERVER_CONTEXTS
++	int	"Maximum number of Contexts (1-65533)"	if EMBEDDED
++	range 1 65533
++	default "768"	if 64BIT
++	default "256"
++	help
++	  This setting will optimize certain data structures
++	  and memory allocations according to the expected
++	  maximum.
++
++	  note: this is not a strict upper limit.
++
++config	VSERVER_WARN
++	bool	"VServer Warnings"
++	default y
++	help
++	  This enables various runtime warnings, which will
++	  notify about potential manipulation attempts or
++	  resource shortage. It is generally considered to
++	  be a good idea to have that enabled.
++
++config	VSERVER_WARN_DEVPTS
++	bool	"VServer DevPTS Warnings"
++	depends on VSERVER_WARN
++	default y
++	help
++	  This enables DevPTS related warnings, issued when a
++	  process inside a context tries to lookup or access
++	  a dynamic pts from the host or a different context.
++
++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 very 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.
++
++config	VSERVER_EXTRA_MNT_CHECK
++	bool	"Extra Checks for Reachability"
++	default n
++	help
++	  Set this to yes if you want to do extra checks for
++	  vfsmount reachability in the proc filesystem code.
++	  This shouldn't be required on any setup utilizing
++	  mnt namespaces.
++
++choice
++	prompt	"Quotes used in debug and warn messages"
++	default	QUOTES_ISO8859
++
++config	QUOTES_ISO8859
++	bool	"Extended ASCII (ISO 8859) angle quotes"
++	help
++	  This uses the extended ASCII characters \xbb
++	  and \xab for quoting file and process names.
++
++config	QUOTES_UTF8
++	bool	"UTF-8 angle quotes"
++	help
++	  This uses the the UTF-8 sequences for angle
++	  quotes to quote file and process names.
++
++config	QUOTES_ASCII
++	bool	"ASCII single quotes"
++	help
++	  This uses the ASCII single quote character
++	  (\x27) to quote file and process names.
++
++endchoice
++
++endmenu
++
++
++config	VSERVER
++	bool
++	default y
++	select NAMESPACES
++	select UTS_NS
++	select IPC_NS
++#	select USER_NS
++	select SYSVIPC
++
++config	VSERVER_SECURITY
++	bool
++	depends on SECURITY
++	default y
++	select SECURITY_CAPABILITIES
++
++config	VSERVER_DISABLED
++	bool
++	default n
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/Makefile linux-3.7.10-vs2.3.5.6/kernel/vserver/Makefile
+--- linux-3.7.10/kernel/vserver/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/Makefile	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,18 @@
++#
++# Makefile for the Linux vserver routines.
++#
++
++
++obj-y		+= vserver.o
++
++vserver-y	:= switch.o context.o space.o sched.o network.o inode.o \
++		   limit.o cvirt.o cacct.o signal.o helper.o init.o \
++		   dlimit.o tag.o
++
++vserver-$(CONFIG_INET) += inet.o
++vserver-$(CONFIG_PROC_FS) += proc.o
++vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o debug.o
++vserver-$(CONFIG_VSERVER_HISTORY) += history.o
++vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
++vserver-$(CONFIG_VSERVER_DEVICE) += device.o
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cacct.c linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct.c
+--- linux-3.7.10/kernel/vserver/cacct.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,42 @@
++/*
++ *  linux/kernel/vserver/cacct.c
++ *
++ *  Virtual Server: Context Accounting
++ *
++ *  Copyright (C) 2006-2007 Herbert Pötzl
++ *
++ *  V0.01  added accounting stats
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/vs_context.h>
++#include <linux/vserver/cacct_cmd.h>
++#include <linux/vserver/cacct_int.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++
++
++int vc_sock_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_sock_stat_v0 vc_data;
++	int j, field;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	field = vc_data.field;
++	if ((field < 0) || (field >= VXA_SOCK_SIZE))
++		return -EINVAL;
++
++	for (j = 0; j < 3; j++) {
++		vc_data.count[j] = vx_sock_count(&vxi->cacct, field, j);
++		vc_data.total[j] = vx_sock_total(&vxi->cacct, field, j);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cacct_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_init.h
+--- linux-3.7.10/kernel/vserver/cacct_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,25 @@
++
++
++static inline void vx_info_init_cacct(struct _vx_cacct *cacct)
++{
++	int i, j;
++
++
++	for (i = 0; i < VXA_SOCK_SIZE; i++) {
++		for (j = 0; j < 3; j++) {
++			atomic_long_set(&cacct->sock[i][j].count, 0);
++			atomic_long_set(&cacct->sock[i][j].total, 0);
++		}
++	}
++	for (i = 0; i < 8; i++)
++		atomic_set(&cacct->slab[i], 0);
++	for (i = 0; i < 5; i++)
++		for (j = 0; j < 4; j++)
++			atomic_set(&cacct->page[i][j], 0);
++}
++
++static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
++{
++	return;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cacct_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_proc.h
+--- linux-3.7.10/kernel/vserver/cacct_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cacct_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,53 @@
++#ifndef _VX_CACCT_PROC_H
++#define _VX_CACCT_PROC_H
++
++#include <linux/vserver/cacct_int.h>
++
++
++#define VX_SOCKA_TOP	\
++	"Type\t    recv #/bytes\t\t   send #/bytes\t\t    fail #/bytes\n"
++
++static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer)
++{
++	int i, j, length = 0;
++	static char *type[VXA_SOCK_SIZE] = {
++		"UNSPEC", "UNIX", "INET", "INET6", "PACKET", "OTHER"
++	};
++
++	length += sprintf(buffer + length, VX_SOCKA_TOP);
++	for (i = 0; i < VXA_SOCK_SIZE; i++) {
++		length += sprintf(buffer + length, "%s:", type[i]);
++		for (j = 0; j < 3; j++) {
++			length += sprintf(buffer + length,
++				"\t%10lu/%-10lu",
++				vx_sock_count(cacct, i, j),
++				vx_sock_total(cacct, i, j));
++		}
++		buffer[length++] = '\n';
++	}
++
++	length += sprintf(buffer + length, "\n");
++	length += sprintf(buffer + length,
++		"slab:\t %8u %8u %8u %8u\n",
++		atomic_read(&cacct->slab[1]),
++		atomic_read(&cacct->slab[4]),
++		atomic_read(&cacct->slab[0]),
++		atomic_read(&cacct->slab[2]));
++
++	length += sprintf(buffer + length, "\n");
++	for (i = 0; i < 5; i++) {
++		length += sprintf(buffer + length,
++			"page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i,
++			atomic_read(&cacct->page[i][0]),
++			atomic_read(&cacct->page[i][1]),
++			atomic_read(&cacct->page[i][2]),
++			atomic_read(&cacct->page[i][3]),
++			atomic_read(&cacct->page[i][4]),
++			atomic_read(&cacct->page[i][5]),
++			atomic_read(&cacct->page[i][6]),
++			atomic_read(&cacct->page[i][7]));
++	}
++	return length;
++}
++
++#endif	/* _VX_CACCT_PROC_H */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/context.c linux-3.7.10-vs2.3.5.6/kernel/vserver/context.c
+--- linux-3.7.10/kernel/vserver/context.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/context.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,1119 @@
++/*
++ *  linux/kernel/vserver/context.c
++ *
++ *  Virtual Server: Context Support
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  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
++ *  V0.12  referenced context store
++ *  V0.13  separate per cpu data
++ *  V0.14  changed vcmds to vxi arg
++ *  V0.15  added context stat
++ *  V0.16  have __create claim() the vxi
++ *  V0.17  removed older and legacy stuff
++ *  V0.18  added user credentials
++ *  V0.19  added warn mask
++ *
++ */
++
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <linux/security.h>
++#include <linux/pid_namespace.h>
++#include <linux/capability.h>
++
++#include <linux/vserver/context.h>
++#include <linux/vserver/network.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/limit_int.h>
++#include <linux/vserver/space.h>
++#include <linux/init_task.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/context_cmd.h>
++
++#include "cvirt_init.h"
++#include "cacct_init.h"
++#include "limit_init.h"
++#include "sched_init.h"
++
++
++atomic_t vx_global_ctotal	= ATOMIC_INIT(0);
++atomic_t vx_global_cactive	= ATOMIC_INIT(0);
++
++
++/*	now inactive context structures */
++
++static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
++
++static DEFINE_SPINLOCK(vx_info_inactive_lock);
++
++
++/*	__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;
++	int cpu, index;
++
++	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));
++#ifdef CONFIG_SMP
++	new->ptr_pc = alloc_percpu(struct _vx_info_pc);
++	if (!new->ptr_pc)
++		goto error;
++#endif
++	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);
++
++	/* prepare reaper */
++	get_task_struct(init_pid_ns.child_reaper);
++	new->vx_reaper = init_pid_ns.child_reaper;
++	new->vx_badness_bias = 0;
++
++	/* 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);
++
++	/* per cpu data structures */
++	for_each_possible_cpu(cpu) {
++		vx_info_init_sched_pc(
++			&vx_per_cpu(new, sched_pc, cpu), cpu);
++		vx_info_init_cvirt_pc(
++			&vx_per_cpu(new, cvirt_pc, cpu), cpu);
++	}
++
++	new->vx_flags = VXF_INIT_SET;
++	new->vx_bcaps = CAP_FULL_SET;	// maybe ~CAP_SETPCAP
++	new->vx_ccaps = 0;
++	new->vx_umask = 0;
++	new->vx_wmask = 0;
++
++	new->reboot_cmd = 0;
++	new->exit_code = 0;
++
++	// preconfig spaces
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &new->space[index];
++
++		// filesystem
++		spin_lock(&init_fs.lock);
++		init_fs.users++;
++		spin_unlock(&init_fs.lock);
++		space->vx_fs = &init_fs;
++
++		/* FIXME: do we want defaults? */
++		// space->vx_real_cred = 0;
++		// space->vx_cred = 0;
++	}
++
++
++	vxdprintk(VXD_CBIT(xid, 0),
++		"alloc_vx_info(%d) = %p", xid, new);
++	vxh_alloc_vx_info(new);
++	atomic_inc(&vx_global_ctotal);
++	return new;
++#ifdef CONFIG_SMP
++error:
++	kfree(new);
++	return 0;
++#endif
++}
++
++/*	__dealloc_vx_info()
++
++	* final disposal of vx_info				*/
++
++static void __dealloc_vx_info(struct vx_info *vxi)
++{
++#ifdef	CONFIG_VSERVER_WARN
++	struct vx_info_save vxis;
++	int cpu;
++#endif
++	vxdprintk(VXD_CBIT(xid, 0),
++		"dealloc_vx_info(%p)", vxi);
++	vxh_dealloc_vx_info(vxi);
++
++#ifdef	CONFIG_VSERVER_WARN
++	enter_vx_info(vxi, &vxis);
++	vx_info_exit_limit(&vxi->limit);
++	vx_info_exit_sched(&vxi->sched);
++	vx_info_exit_cvirt(&vxi->cvirt);
++	vx_info_exit_cacct(&vxi->cacct);
++
++	for_each_possible_cpu(cpu) {
++		vx_info_exit_sched_pc(
++			&vx_per_cpu(vxi, sched_pc, cpu), cpu);
++		vx_info_exit_cvirt_pc(
++			&vx_per_cpu(vxi, cvirt_pc, cpu), cpu);
++	}
++	leave_vx_info(&vxis);
++#endif
++
++	vxi->vx_id = -1;
++	vxi->vx_state |= VXS_RELEASED;
++
++#ifdef CONFIG_SMP
++	free_percpu(vxi->ptr_pc);
++#endif
++	kfree(vxi);
++	atomic_dec(&vx_global_ctotal);
++}
++
++static void __shutdown_vx_info(struct vx_info *vxi)
++{
++	struct nsproxy *nsproxy;
++	struct fs_struct *fs;
++	struct cred *cred;
++	int index, kill;
++
++	might_sleep();
++
++	vxi->vx_state |= VXS_SHUTDOWN;
++	vs_state_change(vxi, VSC_SHUTDOWN);
++
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &vxi->space[index];
++
++		nsproxy = xchg(&space->vx_nsproxy, NULL);
++		if (nsproxy)
++			put_nsproxy(nsproxy);
++
++		fs = xchg(&space->vx_fs, NULL);
++		spin_lock(&fs->lock);
++		kill = !--fs->users;
++		spin_unlock(&fs->lock);
++		if (kill)
++			free_fs_struct(fs);
++
++		cred = (struct cred *)xchg(&space->vx_cred, NULL);
++		if (cred)
++			abort_creds(cred);
++	}
++}
++
++/* exported stuff */
++
++void free_vx_info(struct vx_info *vxi)
++{
++	unsigned long flags;
++	unsigned index;
++
++	/* check for reference counts first */
++	BUG_ON(atomic_read(&vxi->vx_usecnt));
++	BUG_ON(atomic_read(&vxi->vx_tasks));
++
++	/* context must not be hashed */
++	BUG_ON(vx_info_state(vxi, VXS_HASHED));
++
++	/* context shutdown is mandatory */
++	BUG_ON(!vx_info_state(vxi, VXS_SHUTDOWN));
++
++	/* spaces check */
++	for (index = 0; index < VX_SPACES; index++) {
++		struct _vx_space *space = &vxi->space[index];
++
++		BUG_ON(space->vx_nsproxy);
++		BUG_ON(space->vx_fs);
++		// BUG_ON(space->vx_real_cred);
++		// BUG_ON(space->vx_cred);
++	}
++
++	spin_lock_irqsave(&vx_info_inactive_lock, flags);
++	hlist_del(&vxi->vx_hlist);
++	spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++
++	__dealloc_vx_info(vxi);
++}
++
++
++/*	hash table for vx_info hash */
++
++#define VX_HASH_SIZE	13
++
++static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
++	{ [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
++
++static DEFINE_SPINLOCK(vx_info_hash_lock);
++
++
++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);
++	atomic_inc(&vx_global_cactive);
++}
++
++/*	__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)
++{
++	unsigned long flags;
++
++	vxd_assert_lock(&vx_info_hash_lock);
++	vxdprintk(VXD_CBIT(xid, 4),
++		"__unhash_vx_info: %p[#%d.%d.%d]", vxi, vxi->vx_id,
++		atomic_read(&vxi->vx_usecnt), atomic_read(&vxi->vx_tasks));
++	vxh_unhash_vx_info(vxi);
++
++	/* context must be hashed */
++	BUG_ON(!vx_info_state(vxi, VXS_HASHED));
++	/* but without tasks */
++	BUG_ON(atomic_read(&vxi->vx_tasks));
++
++	vxi->vx_state &= ~VXS_HASHED;
++	hlist_del_init(&vxi->vx_hlist);
++	spin_lock_irqsave(&vx_info_inactive_lock, flags);
++	hlist_add_head(&vxi->vx_hlist, &vx_info_inactive);
++	spin_unlock_irqrestore(&vx_info_inactive_lock, flags);
++	atomic_dec(&vx_global_cactive);
++}
++
++
++/*	__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;
++}
++
++
++/*	__create_vx_info()
++
++	* create the requested context
++	* get(), claim() 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);
++
++	/* static context requested */
++	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;
++	}
++	/* new context */
++	vxdprintk(VXD_CBIT(xid, 0),
++		"create_vx_info(%d) = %p (new)", id, new);
++	claim_vx_info(new, NULL);
++	__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)
++{
++	spin_lock(&vx_info_hash_lock);
++	__unhash_vx_info(vxi);
++	spin_unlock(&vx_info_hash_lock);
++	__shutdown_vx_info(vxi);
++	__wakeup_vx_info(vxi);
++}
++
++
++/*	lookup_vx_info()
++
++	* search for a vx_info and get() it
++	* negative id means current				*/
++
++struct vx_info *lookup_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_PROC_FS
++
++/*	get_xid_list()
++
++	* get a subset of hashed xids for proc
++	* assumes size is at least one				*/
++
++int get_xid_list(int index, unsigned int *xids, int size)
++{
++	int hindex, nr_xids = 0;
++
++	/* only show current and children */
++	if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
++		if (index > 0)
++			return 0;
++		xids[nr_xids] = vx_current_xid();
++		return 1;
++	}
++
++	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
++
++#ifdef	CONFIG_VSERVER_DEBUG
++
++void	dump_vx_info_inactive(int level)
++{
++	struct hlist_node *entry, *next;
++
++	hlist_for_each_safe(entry, next, &vx_info_inactive) {
++		struct vx_info *vxi =
++			list_entry(entry, struct vx_info, vx_hlist);
++
++		dump_vx_info(vxi, level);
++	}
++}
++
++#endif
++
++#if 0
++int vx_migrate_user(struct task_struct *p, struct vx_info *vxi)
++{
++	struct user_struct *new_user, *old_user;
++
++	if (!p || !vxi)
++		BUG();
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++		return -EACCES;
++
++	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;
++}
++#endif
++
++#if 0
++void vx_mask_cap_bset(struct vx_info *vxi, struct task_struct *p)
++{
++	// p->cap_effective &= vxi->vx_cap_bset;
++	p->cap_effective =
++		cap_intersect(p->cap_effective, vxi->cap_bset);
++	// p->cap_inheritable &= vxi->vx_cap_bset;
++	p->cap_inheritable =
++		cap_intersect(p->cap_inheritable, vxi->cap_bset);
++	// p->cap_permitted &= vxi->vx_cap_bset;
++	p->cap_permitted =
++		cap_intersect(p->cap_permitted, vxi->cap_bset);
++}
++#endif
++
++
++#include <linux/file.h>
++#include <linux/fdtable.h>
++
++static int vx_openfd_task(struct task_struct *tsk)
++{
++	struct files_struct *files = tsk->files;
++	struct fdtable *fdt;
++	const unsigned long *bptr;
++	int count, total;
++
++	/* no rcu_read_lock() because of spin_lock() */
++	spin_lock(&files->file_lock);
++	fdt = files_fdtable(files);
++	bptr = fdt->open_fds;
++	count = fdt->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;
++}
++
++
++/*	for *space compatibility */
++
++asmlinkage long sys_unshare(unsigned long);
++
++/*
++ *	migrate task to new context
++ *	gets vxi, puts old_vxi on change
++ *	optionally unshares namespaces (hack)
++ */
++
++int vx_migrate_task(struct task_struct *p, struct vx_info *vxi, int unshare)
++{
++	struct vx_info *old_vxi;
++	int ret = 0;
++
++	if (!p || !vxi)
++		BUG();
++
++	vxdprintk(VXD_CBIT(xid, 5),
++		"vx_migrate_task(%p,%p[#%d.%d])", p, vxi,
++		vxi->vx_id, atomic_read(&vxi->vx_usecnt));
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0) &&
++		!vx_info_flags(vxi, VXF_STATE_SETUP, 0))
++		return -EACCES;
++
++	if (vx_info_state(vxi, VXS_SHUTDOWN))
++		return -EFAULT;
++
++	old_vxi = task_get_vx_info(p);
++	if (old_vxi == vxi)
++		goto out;
++
++//	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);
++			__rlim_dec(&old_vxi->limit, RLIMIT_NPROC);
++			/* FIXME: what about the struct files here? */
++			__rlim_sub(&old_vxi->limit, VLIMIT_OPENFD, openfd);
++			/* account for the executable */
++			__rlim_dec(&old_vxi->limit, VLIMIT_DENTRY);
++		}
++		atomic_inc(&vxi->cvirt.nr_threads);
++		atomic_inc(&vxi->cvirt.nr_running);
++		__rlim_inc(&vxi->limit, RLIMIT_NPROC);
++		/* FIXME: what about the struct files here? */
++		__rlim_add(&vxi->limit, VLIMIT_OPENFD, openfd);
++		/* account for the executable */
++		__rlim_inc(&vxi->limit, VLIMIT_DENTRY);
++
++		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_cap_bset(vxi, p);
++		task_unlock(p);
++
++		/* hack for *spaces to provide compatibility */
++		if (unshare) {
++			struct nsproxy *old_nsp, *new_nsp;
++
++			ret = unshare_nsproxy_namespaces(
++				CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER,
++				&new_nsp, NULL);
++			if (ret)
++				goto out;
++
++			old_nsp = xchg(&p->nsproxy, new_nsp);
++			vx_set_space(vxi,
++				CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, 0);
++			put_nsproxy(old_nsp);
++		}
++	}
++out:
++	put_vx_info(old_vxi);
++	return ret;
++}
++
++int vx_set_reaper(struct vx_info *vxi, struct task_struct *p)
++{
++	struct task_struct *old_reaper;
++	struct vx_info *reaper_vxi;
++
++	if (!vxi)
++		return -EINVAL;
++
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_set_reaper(%p[#%d],%p[#%d,%d])",
++		vxi, vxi->vx_id, p, p->xid, p->pid);
++
++	old_reaper = vxi->vx_reaper;
++	if (old_reaper == p)
++		return 0;
++
++	reaper_vxi = task_get_vx_info(p);
++	if (reaper_vxi && reaper_vxi != vxi) {
++		vxwprintk(1,
++			"Unsuitable reaper [" VS_Q("%s") ",%u:#%u] "
++			"for [xid #%u]",
++			p->comm, p->pid, p->xid, vx_current_xid());
++		goto out;
++	}
++
++	/* set new child reaper */
++	get_task_struct(p);
++	vxi->vx_reaper = p;
++	put_task_struct(old_reaper);
++out:
++	put_vx_info(reaper_vxi);
++	return 0;
++}
++
++int vx_set_init(struct vx_info *vxi, struct task_struct *p)
++{
++	if (!vxi)
++		return -EINVAL;
++
++	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_flags &= ~VXF_STATE_INIT;
++	// vxi->vx_initpid = p->tgid;
++	vxi->vx_initpid = p->pid;
++	return 0;
++}
++
++void vx_exit_init(struct vx_info *vxi, struct task_struct *p, int code)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_exit_init(%p[#%d],%p[#%d,%d,%d])",
++		vxi, vxi->vx_id, p, p->xid, p->pid, p->tgid);
++
++	vxi->exit_code = code;
++	vxi->vx_initpid = 0;
++}
++
++
++void vx_set_persistent(struct vx_info *vxi)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_set_persistent(%p[#%d])", vxi, vxi->vx_id);
++
++	get_vx_info(vxi);
++	claim_vx_info(vxi, NULL);
++}
++
++void vx_clear_persistent(struct vx_info *vxi)
++{
++	vxdprintk(VXD_CBIT(xid, 6),
++		"vx_clear_persistent(%p[#%d])", vxi, vxi->vx_id);
++
++	release_vx_info(vxi, NULL);
++	put_vx_info(vxi);
++}
++
++void vx_update_persistent(struct vx_info *vxi)
++{
++	if (vx_info_flags(vxi, VXF_PERSISTENT, 0))
++		vx_set_persistent(vxi);
++	else
++		vx_clear_persistent(vxi);
++}
++
++
++/*	task must be current or locked		*/
++
++void	exit_vx_info(struct task_struct *p, int code)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi) {
++		atomic_dec(&vxi->cvirt.nr_threads);
++		vx_nproc_dec(p);
++
++		vxi->exit_code = code;
++		release_vx_info(vxi, p);
++	}
++}
++
++void	exit_vx_info_early(struct task_struct *p, int code)
++{
++	struct vx_info *vxi = p->vx_info;
++
++	if (vxi) {
++		if (vxi->vx_initpid == p->pid)
++			vx_exit_init(vxi, p, code);
++		if (vxi->vx_reaper == p)
++			vx_set_reaper(vxi, init_pid_ns.child_reaper);
++	}
++}
++
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++#include <asm/uaccess.h>
++
++
++int vc_task_xid(uint32_t id)
++{
++	xid_t xid;
++
++	if (id) {
++		struct task_struct *tsk;
++
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		xid = (tsk) ? tsk->xid : -ESRCH;
++		rcu_read_unlock();
++	} else
++		xid = vx_current_xid();
++	return xid;
++}
++
++
++int vc_vx_info(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vx_info_v0 vc_data;
++
++	vc_data.xid = vxi->vx_id;
++	vc_data.initpid = vxi->vx_initpid;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++int vc_ctx_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_stat_v0 vc_data;
++
++	vc_data.usecnt = atomic_read(&vxi->vx_usecnt);
++	vc_data.tasks = atomic_read(&vxi->vx_tasks);
++
++	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 (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if ((xid > MAX_S_CONTEXT) || (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;
++
++	ret = -ENOEXEC;
++	if (vs_state_change(new_vxi, VSC_STARTUP))
++		goto out;
++
++	ret = vx_migrate_task(current, new_vxi, (!data));
++	if (ret)
++		goto out;
++
++	/* return context id on success */
++	ret = new_vxi->vx_id;
++
++	/* get a reference for persistent contexts */
++	if ((vc_data.flagword & VXF_PERSISTENT))
++		vx_set_persistent(new_vxi);
++out:
++	release_vx_info(new_vxi, NULL);
++	put_vx_info(new_vxi);
++	return ret;
++}
++
++
++int vc_ctx_migrate(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_migrate vc_data = { .flagword = 0 };
++	int ret;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = vx_migrate_task(current, vxi, 0);
++	if (ret)
++		return ret;
++	if (vc_data.flagword & VXM_SET_INIT)
++		ret = vx_set_init(vxi, current);
++	if (ret)
++		return ret;
++	if (vc_data.flagword & VXM_SET_REAPER)
++		ret = vx_set_reaper(vxi, current);
++	return ret;
++}
++
++
++int vc_get_cflags(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_flags_v0 vc_data;
++
++	vc_data.flagword = vxi->vx_flags;
++
++	/* special STATE flag handling */
++	vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_cflags(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_flags_v0 vc_data;
++	uint64_t mask, trigger;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special STATE flag handling */
++	mask = vs_mask_mask(vc_data.mask, vxi->vx_flags, VXF_ONE_TIME);
++	trigger = (mask & vxi->vx_flags) ^ (mask & vc_data.flagword);
++
++	if (vxi == current_vx_info()) {
++		/* if (trigger & VXF_STATE_SETUP)
++			vx_mask_cap_bset(vxi, current); */
++		if (trigger & VXF_STATE_INIT) {
++			int ret;
++
++			ret = vx_set_init(vxi, current);
++			if (ret)
++				return ret;
++			ret = vx_set_reaper(vxi, current);
++			if (ret)
++				return ret;
++		}
++	}
++
++	vxi->vx_flags = vs_mask_flags(vxi->vx_flags,
++		vc_data.flagword, mask);
++	if (trigger & VXF_PERSISTENT)
++		vx_update_persistent(vxi);
++
++	return 0;
++}
++
++
++static inline uint64_t caps_from_cap_t(kernel_cap_t c)
++{
++	uint64_t v = c.cap[0] | ((uint64_t)c.cap[1] << 32);
++
++	// printk("caps_from_cap_t(%08x:%08x) = %016llx\n", c.cap[1], c.cap[0], v);
++	return v;
++}
++
++static inline kernel_cap_t cap_t_from_caps(uint64_t v)
++{
++	kernel_cap_t c = __cap_empty_set;
++
++	c.cap[0] = v & 0xFFFFFFFF;
++	c.cap[1] = (v >> 32) & 0xFFFFFFFF;
++
++	// printk("cap_t_from_caps(%016llx) = %08x:%08x\n", v, c.cap[1], c.cap[0]);
++	return c;
++}
++
++
++static int do_get_caps(struct vx_info *vxi, uint64_t *bcaps, uint64_t *ccaps)
++{
++	if (bcaps)
++		*bcaps = caps_from_cap_t(vxi->vx_bcaps);
++	if (ccaps)
++		*ccaps = vxi->vx_ccaps;
++
++	return 0;
++}
++
++int vc_get_ccaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_caps_v1 vc_data;
++	int ret;
++
++	ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
++	if (ret)
++		return ret;
++	vc_data.cmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++static int do_set_caps(struct vx_info *vxi,
++	uint64_t bcaps, uint64_t bmask, uint64_t ccaps, uint64_t cmask)
++{
++	uint64_t bcold = caps_from_cap_t(vxi->vx_bcaps);
++
++#if 0
++	printk("do_set_caps(%16llx, %16llx, %16llx, %16llx)\n",
++		bcaps, bmask, ccaps, cmask);
++#endif
++	vxi->vx_bcaps = cap_t_from_caps(
++		vs_mask_flags(bcold, bcaps, bmask));
++	vxi->vx_ccaps = vs_mask_flags(vxi->vx_ccaps, ccaps, cmask);
++
++	return 0;
++}
++
++int vc_set_ccaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_caps_v1 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_caps(vxi, 0, 0, vc_data.ccaps, vc_data.cmask);
++}
++
++int vc_get_bcaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_bcaps vc_data;
++	int ret;
++
++	ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
++	if (ret)
++		return ret;
++	vc_data.bmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_bcaps(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_bcaps vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_caps(vxi, vc_data.bcaps, vc_data.bmask, 0, 0);
++}
++
++
++int vc_get_umask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_umask vc_data;
++
++	vc_data.umask = vxi->vx_umask;
++	vc_data.mask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_umask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_umask vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_umask = vs_mask_flags(vxi->vx_umask,
++		vc_data.umask, vc_data.mask);
++	return 0;
++}
++
++
++int vc_get_wmask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wmask vc_data;
++
++	vc_data.wmask = vxi->vx_wmask;
++	vc_data.mask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_wmask(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wmask vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_wmask = vs_mask_flags(vxi->vx_wmask,
++		vc_data.wmask, vc_data.mask);
++	return 0;
++}
++
++
++int vc_get_badness(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_badness_v0 vc_data;
++
++	vc_data.bias = vxi->vx_badness_bias;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_badness(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_badness_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	vxi->vx_badness_bias = vc_data.bias;
++	return 0;
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(free_vx_info);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cvirt.c linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt.c
+--- linux-3.7.10/kernel/vserver/cvirt.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,313 @@
++/*
++ *  linux/kernel/vserver/cvirt.c
++ *
++ *  Virtual Server: Context Virtualization
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  broken out from limit.c
++ *  V0.02  added utsname stuff
++ *  V0.03  changed vcmds to vxi arg
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/utsname.h>
++#include <linux/vs_cvirt.h>
++#include <linux/vserver/switch.h>
++#include <linux/vserver/cvirt_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++void vx_vsi_boottime(struct timespec *boottime)
++{
++	struct vx_info *vxi = current_vx_info();
++
++	set_normalized_timespec(boottime,
++		boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
++		boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
++	return;
++}
++
++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;
++	unsigned long flags;
++
++	spin_lock_irqsave(&vxi->cvirt.load_lock, flags);
++
++	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_irqrestore(&vxi->cvirt.load_lock, flags);
++}
++
++
++/*
++ * 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)
++{
++	struct nsproxy *nsproxy;
++	struct uts_namespace *uts;
++
++	if (id == VHIN_CONTEXT)
++		return vxi->vx_name;
++
++	nsproxy = vxi->space[0].vx_nsproxy;
++	if (!nsproxy)
++		return NULL;
++
++	uts = nsproxy->uts_ns;
++	if (!uts)
++		return NULL;
++
++	switch (id) {
++	case VHIN_SYSNAME:
++		return uts->name.sysname;
++	case VHIN_NODENAME:
++		return uts->name.nodename;
++	case VHIN_RELEASE:
++		return uts->name.release;
++	case VHIN_VERSION:
++		return uts->name.version;
++	case VHIN_MACHINE:
++		return uts->name.machine;
++	case VHIN_DOMAINNAME:
++		return uts->name.domainname;
++	default:
++		return NULL;
++	}
++	return NULL;
++}
++
++int vc_set_vhi_name(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vhi_name_v0 vc_data;
++	char *name;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	name = vx_vhi_name(vxi, vc_data.field);
++	if (!name)
++		return -EINVAL;
++
++	memcpy(name, vc_data.name, 65);
++	return 0;
++}
++
++int vc_get_vhi_name(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_vhi_name_v0 vc_data;
++	char *name;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	name = vx_vhi_name(vxi, vc_data.field);
++	if (!name)
++		return -EINVAL;
++
++	memcpy(vc_data.name, name, 65);
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++int vc_virt_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_virt_stat_v0 vc_data;
++	struct _vx_cvirt *cvirt = &vxi->cvirt;
++	struct timespec uptime;
++
++	do_posix_clock_monotonic_gettime(&uptime);
++	set_normalized_timespec(&uptime,
++		uptime.tv_sec - cvirt->bias_uptime.tv_sec,
++		uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
++
++	vc_data.offset = timespec_to_ns(&cvirt->bias_ts);
++	vc_data.uptime = timespec_to_ns(&uptime);
++	vc_data.nr_threads = atomic_read(&cvirt->nr_threads);
++	vc_data.nr_running = atomic_read(&cvirt->nr_running);
++	vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible);
++	vc_data.nr_onhold = atomic_read(&cvirt->nr_onhold);
++	vc_data.nr_forks = atomic_read(&cvirt->total_forks);
++	vc_data.load[0] = cvirt->load[0];
++	vc_data.load[1] = cvirt->load[1];
++	vc_data.load[2] = cvirt->load[2];
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++#ifdef CONFIG_VSERVER_VTIME
++
++/* virtualized time base */
++
++void vx_adjust_timespec(struct timespec *ts)
++{
++	struct vx_info *vxi;
++
++	if (!vx_flags(VXF_VIRT_TIME, 0))
++		return;
++
++	vxi = current_vx_info();
++	ts->tv_sec += vxi->cvirt.bias_ts.tv_sec;
++	ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec;
++
++	if (ts->tv_nsec >= NSEC_PER_SEC) {
++		ts->tv_sec++;
++		ts->tv_nsec -= NSEC_PER_SEC;
++	} else if (ts->tv_nsec < 0) {
++		ts->tv_sec--;
++		ts->tv_nsec += NSEC_PER_SEC;
++	}
++}
++
++int vx_settimeofday(const struct timespec *ts)
++{
++	struct timespec ats, delta;
++	struct vx_info *vxi;
++
++	if (!vx_flags(VXF_VIRT_TIME, 0))
++		return do_settimeofday(ts);
++
++	getnstimeofday(&ats);
++	delta = timespec_sub(*ts, ats);
++
++	vxi = current_vx_info();
++	vxi->cvirt.bias_ts = timespec_add(vxi->cvirt.bias_ts, delta);
++	return 0;
++}
++
++#endif
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cvirt_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_init.h
+--- linux-3.7.10/kernel/vserver/cvirt_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,70 @@
++
++
++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);
++	cvirt->bias_ts.tv_sec = 0;
++	cvirt->bias_ts.tv_nsec = 0;
++
++	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);
++
++	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_init_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
++{
++	// cvirt_pc->cpustat = { 0 };
++}
++
++static inline void vx_info_exit_cvirt(struct _vx_cvirt *cvirt)
++{
++#ifdef	CONFIG_VSERVER_WARN
++	int value;
++#endif
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_threads)),
++		"!!! cvirt: %p[nr_threads] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_running)),
++		"!!! cvirt: %p[nr_running] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_uninterruptible)),
++		"!!! cvirt: %p[nr_uninterruptible] = %d on exit.",
++		cvirt, value);
++	vxwprintk_xid((value = atomic_read(&cvirt->nr_onhold)),
++		"!!! cvirt: %p[nr_onhold] = %d on exit.",
++		cvirt, value);
++	return;
++}
++
++static inline
++void vx_info_exit_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc, int cpu)
++{
++	return;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/cvirt_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_proc.h
+--- linux-3.7.10/kernel/vserver/cvirt_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/cvirt_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,123 @@
++#ifndef _VX_CVIRT_PROC_H
++#define _VX_CVIRT_PROC_H
++
++#include <linux/nsproxy.h>
++#include <linux/mnt_namespace.h>
++#include <linux/ipc_namespace.h>
++#include <linux/utsname.h>
++#include <linux/ipc.h>
++
++extern int vx_info_mnt_namespace(struct mnt_namespace *, char *);
++
++static inline
++int vx_info_proc_nsproxy(struct nsproxy *nsproxy, char *buffer)
++{
++	struct mnt_namespace *ns;
++	struct uts_namespace *uts;
++	struct ipc_namespace *ipc;
++	int length = 0;
++
++	if (!nsproxy)
++		goto out;
++
++	length += sprintf(buffer + length,
++		"NSProxy:\t%p [%p,%p,%p]\n",
++		nsproxy, nsproxy->mnt_ns,
++		nsproxy->uts_ns, nsproxy->ipc_ns);
++
++	ns = nsproxy->mnt_ns;
++	if (!ns)
++		goto skip_ns;
++
++	length += vx_info_mnt_namespace(ns, buffer + length);
++
++skip_ns:
++
++	uts = nsproxy->uts_ns;
++	if (!uts)
++		goto skip_uts;
++
++	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, uts->name.sysname,
++		__NEW_UTS_LEN, uts->name.nodename,
++		__NEW_UTS_LEN, uts->name.release,
++		__NEW_UTS_LEN, uts->name.version,
++		__NEW_UTS_LEN, uts->name.machine,
++		__NEW_UTS_LEN, uts->name.domainname);
++skip_uts:
++
++	ipc = nsproxy->ipc_ns;
++	if (!ipc)
++		goto skip_ipc;
++
++	length += sprintf(buffer + length,
++		"SEMS:\t\t%d %d %d %d  %d\n"
++		"MSG:\t\t%d %d %d\n"
++		"SHM:\t\t%lu %lu  %d %d\n",
++		ipc->sem_ctls[0], ipc->sem_ctls[1],
++		ipc->sem_ctls[2], ipc->sem_ctls[3],
++		ipc->used_sems,
++		ipc->msg_ctlmax, ipc->msg_ctlmnb, ipc->msg_ctlmni,
++		(unsigned long)ipc->shm_ctlmax,
++		(unsigned long)ipc->shm_ctlall,
++		ipc->shm_ctlmni, ipc->shm_tot);
++skip_ipc:
++out:
++	return length;
++}
++
++
++#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)));
++
++	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
++int vx_info_proc_cvirt_pc(struct _vx_cvirt_pc *cvirt_pc,
++	char *buffer, int cpu)
++{
++	int length = 0;
++	return length;
++}
++
++#endif	/* _VX_CVIRT_PROC_H */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/debug.c linux-3.7.10-vs2.3.5.6/kernel/vserver/debug.c
+--- linux-3.7.10/kernel/vserver/debug.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/debug.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,32 @@
++/*
++ *  kernel/vserver/debug.c
++ *
++ *  Copyright (C) 2005-2007 Herbert Pötzl
++ *
++ *  V0.01  vx_info dump support
++ *
++ */
++
++#include <linux/module.h>
++
++#include <linux/vserver/context.h>
++
++
++void	dump_vx_info(struct vx_info *vxi, int level)
++{
++	printk("vx_info %p[#%d, %d.%d, %4x]\n", vxi, vxi->vx_id,
++		atomic_read(&vxi->vx_usecnt),
++		atomic_read(&vxi->vx_tasks),
++		vxi->vx_state);
++	if (level > 0) {
++		__dump_vx_limit(&vxi->limit);
++		__dump_vx_sched(&vxi->sched);
++		__dump_vx_cvirt(&vxi->cvirt);
++		__dump_vx_cacct(&vxi->cacct);
++	}
++	printk("---\n");
++}
++
++
++EXPORT_SYMBOL_GPL(dump_vx_info);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/device.c linux-3.7.10-vs2.3.5.6/kernel/vserver/device.c
+--- linux-3.7.10/kernel/vserver/device.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/device.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,443 @@
++/*
++ *  linux/kernel/vserver/device.c
++ *
++ *  Linux-VServer: Device Support
++ *
++ *  Copyright (C) 2006  Herbert Pötzl
++ *  Copyright (C) 2007  Daniel Hokka Zakrisson
++ *
++ *  V0.01  device mapping basics
++ *  V0.02  added defaults
++ *
++ */
++
++#include <linux/slab.h>
++#include <linux/rcupdate.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/hash.h>
++
++#include <asm/errno.h>
++#include <asm/uaccess.h>
++#include <linux/vserver/base.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/context.h>
++#include <linux/vserver/device.h>
++#include <linux/vserver/device_cmd.h>
++
++
++#define DMAP_HASH_BITS	4
++
++
++struct vs_mapping {
++	union {
++		struct hlist_node hlist;
++		struct list_head list;
++	} u;
++#define dm_hlist	u.hlist
++#define dm_list		u.list
++	xid_t xid;
++	dev_t device;
++	struct vx_dmap_target target;
++};
++
++
++static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
++
++static DEFINE_SPINLOCK(dmap_main_hash_lock);
++
++static struct vx_dmap_target dmap_defaults[2] = {
++	{ .flags = DATTR_OPEN },
++	{ .flags = DATTR_OPEN },
++};
++
++
++struct kmem_cache *dmap_cachep __read_mostly;
++
++int __init dmap_cache_init(void)
++{
++	dmap_cachep = kmem_cache_create("dmap_cache",
++		sizeof(struct vs_mapping), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	return 0;
++}
++
++__initcall(dmap_cache_init);
++
++
++static inline unsigned int __hashval(dev_t dev, int bits)
++{
++	return hash_long((unsigned long)dev, bits);
++}
++
++
++/*	__hash_mapping()
++ *	add the mapping to the hash table
++ */
++static inline void __hash_mapping(struct vx_info *vxi, struct vs_mapping *vdm)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct hlist_head *head, *hash = dmap_main_hash;
++	int device = vdm->device;
++
++	spin_lock(hash_lock);
++	vxdprintk(VXD_CBIT(misc, 8), "__hash_mapping: %p[#%d] %08x:%08x",
++		vxi, vxi ? vxi->vx_id : 0, device, vdm->target.target);
++
++	head = &hash[__hashval(device, DMAP_HASH_BITS)];
++	hlist_add_head(&vdm->dm_hlist, head);
++	spin_unlock(hash_lock);
++}
++
++
++static inline int __mode_to_default(umode_t mode)
++{
++	switch (mode) {
++	case S_IFBLK:
++		return 0;
++	case S_IFCHR:
++		return 1;
++	default:
++		BUG();
++	}
++}
++
++
++/*	__set_default()
++ *	set a default
++ */
++static inline void __set_default(struct vx_info *vxi, umode_t mode,
++	struct vx_dmap_target *vdmt)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	spin_lock(hash_lock);
++
++	if (vxi)
++		vxi->dmap.targets[__mode_to_default(mode)] = *vdmt;
++	else
++		dmap_defaults[__mode_to_default(mode)] = *vdmt;
++
++
++	spin_unlock(hash_lock);
++
++	vxdprintk(VXD_CBIT(misc, 8), "__set_default: %p[#%u] %08x %04x",
++		  vxi, vxi ? vxi->vx_id : 0, vdmt->target, vdmt->flags);
++}
++
++
++/*	__remove_default()
++ *	remove a default
++ */
++static inline int __remove_default(struct vx_info *vxi, umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	spin_lock(hash_lock);
++
++	if (vxi)
++		vxi->dmap.targets[__mode_to_default(mode)].flags = 0;
++	else	/* remove == reset */
++		dmap_defaults[__mode_to_default(mode)].flags = DATTR_OPEN | mode;
++
++	spin_unlock(hash_lock);
++	return 0;
++}
++
++
++/*	__find_mapping()
++ *	find a mapping in the hash table
++ *
++ *	caller must hold hash_lock
++ */
++static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode,
++	struct vs_mapping **local, struct vs_mapping **global)
++{
++	struct hlist_head *hash = dmap_main_hash;
++	struct hlist_head *head = &hash[__hashval(device, DMAP_HASH_BITS)];
++	struct hlist_node *pos;
++	struct vs_mapping *vdm;
++
++	*local = NULL;
++	if (global)
++		*global = NULL;
++
++	hlist_for_each(pos, head) {
++		vdm = hlist_entry(pos, struct vs_mapping, dm_hlist);
++
++		if ((vdm->device == device) &&
++			!((vdm->target.flags ^ mode) & S_IFMT)) {
++			if (vdm->xid == xid) {
++				*local = vdm;
++				return 1;
++			} else if (global && vdm->xid == 0)
++				*global = vdm;
++		}
++	}
++
++	if (global && *global)
++		return 0;
++	else
++		return -ENOENT;
++}
++
++
++/*	__lookup_mapping()
++ *	find a mapping and store the result in target and flags
++ */
++static inline int __lookup_mapping(struct vx_info *vxi,
++	dev_t device, dev_t *target, int *flags, umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct vs_mapping *vdm, *global;
++	struct vx_dmap_target *vdmt;
++	int ret = 0;
++	xid_t xid = vxi->vx_id;
++	int index;
++
++	spin_lock(hash_lock);
++	if (__find_mapping(xid, device, mode, &vdm, &global) > 0) {
++		ret = 1;
++		vdmt = &vdm->target;
++		goto found;
++	}
++
++	index = __mode_to_default(mode);
++	if (vxi && vxi->dmap.targets[index].flags) {
++		ret = 2;
++		vdmt = &vxi->dmap.targets[index];
++	} else if (global) {
++		ret = 3;
++		vdmt = &global->target;
++		goto found;
++	} else {
++		ret = 4;
++		vdmt = &dmap_defaults[index];
++	}
++
++found:
++	if (target && (vdmt->flags & DATTR_REMAP))
++		*target = vdmt->target;
++	else if (target)
++		*target = device;
++	if (flags)
++		*flags = vdmt->flags;
++
++	spin_unlock(hash_lock);
++
++	return ret;
++}
++
++
++/*	__remove_mapping()
++ *	remove a mapping from the hash table
++ */
++static inline int __remove_mapping(struct vx_info *vxi, dev_t device,
++	umode_t mode)
++{
++	spinlock_t *hash_lock = &dmap_main_hash_lock;
++	struct vs_mapping *vdm = NULL;
++	int ret = 0;
++
++	spin_lock(hash_lock);
++
++	ret = __find_mapping((vxi ? vxi->vx_id : 0), device, mode, &vdm,
++		NULL);
++	vxdprintk(VXD_CBIT(misc, 8), "__remove_mapping: %p[#%d] %08x %04x",
++		vxi, vxi ? vxi->vx_id : 0, device, mode);
++	if (ret < 0)
++		goto out;
++	hlist_del(&vdm->dm_hlist);
++
++out:
++	spin_unlock(hash_lock);
++	if (vdm)
++		kmem_cache_free(dmap_cachep, vdm);
++	return ret;
++}
++
++
++
++int vs_map_device(struct vx_info *vxi,
++	dev_t device, dev_t *target, umode_t mode)
++{
++	int ret, flags = DATTR_MASK;
++
++	if (!vxi) {
++		if (target)
++			*target = device;
++		goto out;
++	}
++	ret = __lookup_mapping(vxi, device, target, &flags, mode);
++	vxdprintk(VXD_CBIT(misc, 8), "vs_map_device: %08x target: %08x flags: %04x mode: %04x mapped=%d",
++		device, target ? *target : 0, flags, mode, ret);
++out:
++	return (flags & DATTR_MASK);
++}
++
++
++
++static int do_set_mapping(struct vx_info *vxi,
++	dev_t device, dev_t target, int flags, umode_t mode)
++{
++	if (device) {
++		struct vs_mapping *new;
++
++		new = kmem_cache_alloc(dmap_cachep, GFP_KERNEL);
++		if (!new)
++			return -ENOMEM;
++
++		INIT_HLIST_NODE(&new->dm_hlist);
++		new->device = device;
++		new->target.target = target;
++		new->target.flags = flags | mode;
++		new->xid = (vxi ? vxi->vx_id : 0);
++
++		vxdprintk(VXD_CBIT(misc, 8), "do_set_mapping: %08x target: %08x flags: %04x", device, target, flags);
++		__hash_mapping(vxi, new);
++	} else {
++		struct vx_dmap_target new = {
++			.target = target,
++			.flags = flags | mode,
++		};
++		__set_default(vxi, mode, &new);
++	}
++	return 0;
++}
++
++
++static int do_unset_mapping(struct vx_info *vxi,
++	dev_t device, dev_t target, int flags, umode_t mode)
++{
++	int ret = -EINVAL;
++
++	if (device) {
++		ret = __remove_mapping(vxi, device, mode);
++		if (ret < 0)
++			goto out;
++	} else {
++		ret = __remove_default(vxi, mode);
++		if (ret < 0)
++			goto out;
++	}
++
++out:
++	return ret;
++}
++
++
++static inline int __user_device(const char __user *name, dev_t *dev,
++	umode_t *mode)
++{
++	struct nameidata nd;
++	int ret;
++
++	if (!name) {
++		*dev = 0;
++		return 0;
++	}
++	ret = user_lpath(name, &nd.path);
++	if (ret)
++		return ret;
++	if (nd.path.dentry->d_inode) {
++		*dev = nd.path.dentry->d_inode->i_rdev;
++		*mode = nd.path.dentry->d_inode->i_mode;
++	}
++	path_put(&nd.path);
++	return 0;
++}
++
++static inline int __mapping_mode(dev_t device, dev_t target,
++	umode_t device_mode, umode_t target_mode, umode_t *mode)
++{
++	if (device)
++		*mode = device_mode & S_IFMT;
++	else if (target)
++		*mode = target_mode & S_IFMT;
++	else
++		return -EINVAL;
++
++	/* if both given, device and target mode have to match */
++	if (device && target &&
++		((device_mode ^ target_mode) & S_IFMT))
++		return -EINVAL;
++	return 0;
++}
++
++
++static inline int do_mapping(struct vx_info *vxi, const char __user *device_path,
++	const char __user *target_path, int flags, int set)
++{
++	dev_t device = ~0, target = ~0;
++	umode_t device_mode = 0, target_mode = 0, mode;
++	int ret;
++
++	ret = __user_device(device_path, &device, &device_mode);
++	if (ret)
++		return ret;
++	ret = __user_device(target_path, &target, &target_mode);
++	if (ret)
++		return ret;
++
++	ret = __mapping_mode(device, target,
++		device_mode, target_mode, &mode);
++	if (ret)
++		return ret;
++
++	if (set)
++		return do_set_mapping(vxi, device, target,
++			flags, mode);
++	else
++		return do_unset_mapping(vxi, device, target,
++			flags, mode);
++}
++
++
++int vc_set_mapping(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, vc_data.device, vc_data.target,
++		vc_data.flags, 1);
++}
++
++int vc_unset_mapping(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, vc_data.device, vc_data.target,
++		vc_data.flags, 0);
++}
++
++
++#ifdef	CONFIG_COMPAT
++
++int vc_set_mapping_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++		compat_ptr(vc_data.target_ptr), vc_data.flags, 1);
++}
++
++int vc_unset_mapping_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_set_mapping_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_mapping(vxi, compat_ptr(vc_data.device_ptr),
++		compat_ptr(vc_data.target_ptr), vc_data.flags, 0);
++}
++
++#endif	/* CONFIG_COMPAT */
++
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/dlimit.c linux-3.7.10-vs2.3.5.6/kernel/vserver/dlimit.c
+--- linux-3.7.10/kernel/vserver/dlimit.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/dlimit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,531 @@
++/*
++ *  linux/kernel/vserver/dlimit.c
++ *
++ *  Virtual Server: Context Disk Limits
++ *
++ *  Copyright (C) 2004-2009  Herbert Pötzl
++ *
++ *  V0.01  initial version
++ *  V0.02  compat32 splitup
++ *  V0.03  extended interface
++ *
++ */
++
++#include <linux/statfs.h>
++#include <linux/sched.h>
++#include <linux/namei.h>
++#include <linux/vs_tag.h>
++#include <linux/vs_dlimit.h>
++#include <linux/vserver/dlimit_cmd.h>
++#include <linux/slab.h>
++// #include <linux/gfp.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, tag_t tag)
++{
++	struct dl_info *new = NULL;
++
++	vxdprintk(VXD_CBIT(dlim, 5),
++		"alloc_dl_info(%p,%d)*", sb, tag);
++
++	/* 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_tag = tag;
++	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, tag, 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_tag = -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 DEFINE_SPINLOCK(dl_info_hash_lock);
++
++
++static inline unsigned int __hashval(struct super_block *sb, tag_t tag)
++{
++	return ((tag ^ (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_tag);
++	get_dl_info(dli);
++	head = &dl_info_hash[__hashval(dli->dl_sb, dli->dl_tag)];
++	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_tag);
++	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, tag_t tag)
++{
++	struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)];
++	struct hlist_node *pos;
++	struct dl_info *dli;
++
++	hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) {
++
++		if (dli->dl_tag == tag && dli->dl_sb == sb) {
++			return dli;
++		}
++	}
++	return NULL;
++}
++
++
++struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag)
++{
++	struct dl_info *dli;
++
++	rcu_read_lock();
++	dli = get_dl_info(__lookup_dl_info(sb, tag));
++	vxdprintk(VXD_CBIT(dlim, 7),
++		"locate_dl_info(%p,#%d) = %p", sb, tag, 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");
++}
++
++
++
++
++static int do_addrem_dlimit(uint32_t id, const char __user *name,
++	uint32_t flags, int add)
++{
++	struct path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.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_put(&path);
++	}
++	return ret;
++}
++
++int vc_add_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_base_v0 vc_data;
++
++	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 (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 (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 (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 path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.dentry->d_inode->i_sb))
++			goto out_release;
++
++		/* sanity checks */
++		if ((reserved != CDLIM_KEEP &&
++			reserved > 100) ||
++			(inodes_used != CDLIM_KEEP &&
++			inodes_used > inodes_total) ||
++			(space_used != 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 != CDLIM_KEEP)
++			dli->dl_inodes_used = inodes_used;
++		if (inodes_total != CDLIM_KEEP)
++			dli->dl_inodes_total = inodes_total;
++		if (space_used != CDLIM_KEEP)
++			dli->dl_space_used = dlimit_space_32to64(
++				space_used, flags, DLIMS_USED);
++
++		if (space_total == CDLIM_INFINITY)
++			dli->dl_space_total = DLIM_INFINITY;
++		else if (space_total != CDLIM_KEEP)
++			dli->dl_space_total = dlimit_space_32to64(
++				space_total, flags, DLIMS_TOTAL);
++
++		if (reserved != CDLIM_KEEP)
++			dli->dl_nrlmult = (1 << 10) * (100 - reserved) / 100;
++
++		spin_unlock(&dli->dl_lock);
++
++		put_dl_info(dli);
++		ret = 0;
++
++	out_release:
++		path_put(&path);
++	}
++	return ret;
++}
++
++int vc_set_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_v0 vc_data;
++
++	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 (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 path path;
++	int ret;
++
++	ret = user_lpath(name, &path);
++	if (!ret) {
++		struct super_block *sb;
++		struct dl_info *dli;
++
++		ret = -EINVAL;
++		if (!path.dentry->d_inode)
++			goto out_release;
++		if (!(sb = path.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 = dlimit_space_64to32(
++			dli->dl_space_used, flags, DLIMS_USED);
++
++		if (dli->dl_space_total == DLIM_INFINITY)
++			*space_total = CDLIM_INFINITY;
++		else
++			*space_total = dlimit_space_64to32(
++				dli->dl_space_total, flags, DLIMS_TOTAL);
++
++		*reserved = 100 - ((dli->dl_nrlmult * 100 + 512) >> 10);
++		spin_unlock(&dli->dl_lock);
++
++		put_dl_info(dli);
++		ret = -EFAULT;
++
++		ret = 0;
++	out_release:
++		path_put(&path);
++	}
++	return ret;
++}
++
++
++int vc_get_dlimit(uint32_t id, void __user *data)
++{
++	struct vcmd_ctx_dlimit_v0 vc_data;
++	int ret;
++
++	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 (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, dx_current_tag());
++	if (!dli)
++		return;
++
++	spin_lock(&dli->dl_lock);
++	if (dli->dl_inodes_total == (unsigned long)DLIM_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 == DLIM_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);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/helper.c linux-3.7.10-vs2.3.5.6/kernel/vserver/helper.c
+--- linux-3.7.10/kernel/vserver/helper.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/helper.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,229 @@
++/*
++ *  linux/kernel/vserver/helper.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic helper
++ *
++ */
++
++#include <linux/kmod.h>
++#include <linux/reboot.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/signal.h>
++
++
++char vshelper_path[255] = "/sbin/vshelper";
++
++static int vshelper_init(struct subprocess_info *info, struct cred *new_cred)
++{
++	current->flags &= ~PF_THREAD_BOUND;
++	return 0;
++}
++
++static int do_vshelper(char *name, char *argv[], char *envp[], int sync)
++{
++	int ret;
++
++	if ((ret = call_usermodehelper_fns(name, argv, envp,
++		sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC,
++		vshelper_init, NULL, NULL))) {
++		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_helper(struct vx_info *vxi, int cmd, void __user *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};
++
++	if (vx_info_state(vxi, VXS_HELPER))
++		return -EAGAIN;
++	vxi->vx_state |= VXS_HELPER;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
++
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++	snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", current_uid());
++	snprintf(pid_buf, sizeof(pid_buf), "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;
++
++	case LINUX_REBOOT_CMD_OOM:
++		argv[1] = "oom";
++		break;
++
++	default:
++		vxi->vx_state &= ~VXS_HELPER;
++		return 0;
++	}
++
++	ret = do_vshelper(vshelper_path, argv, envp, 0);
++	vxi->vx_state &= ~VXS_HELPER;
++	__wakeup_vx_info(vxi);
++	return (ret) ? -EPERM : 0;
++}
++
++
++long vs_reboot(unsigned int cmd, void __user *arg)
++{
++	struct vx_info *vxi = current_vx_info();
++	long ret = 0;
++
++	vxdprintk(VXD_CBIT(misc, 5),
++		"vs_reboot(%p[#%d],%u)",
++		vxi, vxi ? vxi->vx_id : 0, cmd);
++
++	ret = vs_reboot_helper(vxi, cmd, arg);
++	if (ret)
++		return ret;
++
++	vxi->reboot_cmd = cmd;
++	if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++		switch (cmd) {
++		case LINUX_REBOOT_CMD_RESTART:
++		case LINUX_REBOOT_CMD_HALT:
++		case LINUX_REBOOT_CMD_POWER_OFF:
++			vx_info_kill(vxi, 0, SIGKILL);
++			vx_info_kill(vxi, 1, SIGKILL);
++		default:
++			break;
++		}
++	}
++	return 0;
++}
++
++long vs_oom_action(unsigned int cmd)
++{
++	struct vx_info *vxi = current_vx_info();
++	long ret = 0;
++
++	vxdprintk(VXD_CBIT(misc, 5),
++		"vs_oom_action(%p[#%d],%u)",
++		vxi, vxi ? vxi->vx_id : 0, cmd);
++
++	ret = vs_reboot_helper(vxi, cmd, NULL);
++	if (ret)
++		return ret;
++
++	vxi->reboot_cmd = cmd;
++	if (vx_info_flags(vxi, VXF_REBOOT_KILL, 0)) {
++		vx_info_kill(vxi, 0, SIGKILL);
++		vx_info_kill(vxi, 1, SIGKILL);
++	}
++	return 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_SC_HELPER, 0))
++		return 0;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id);
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++
++	switch (cmd) {
++	case VSC_STARTUP:
++		argv[1] = "startup";
++		break;
++	case VSC_SHUTDOWN:
++		argv[1] = "shutdown";
++		break;
++	default:
++		return 0;
++	}
++
++	return do_vshelper(vshelper_path, argv, envp, 1);
++}
++
++
++/*
++ *      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_SC_HELPER, 0))
++		return 0;
++
++	snprintf(id_buf, sizeof(id_buf), "%d", nxi->nx_id);
++	snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd);
++
++	switch (cmd) {
++	case VSC_NETUP:
++		argv[1] = "netup";
++		break;
++	case VSC_NETDOWN:
++		argv[1] = "netdown";
++		break;
++	default:
++		return 0;
++	}
++
++	return do_vshelper(vshelper_path, argv, envp, 1);
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/history.c linux-3.7.10-vs2.3.5.6/kernel/vserver/history.c
+--- linux-3.7.10/kernel/vserver/history.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/history.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,258 @@
++/*
++ *  kernel/vserver/history.c
++ *
++ *  Virtual Context History Backtrace
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *  V0.02  hash/unhash and trace
++ *  V0.03  preemption fixes
++ *
++ */
++
++#include <linux/module.h>
++#include <asm/uaccess.h>
++
++#include <linux/vserver/context.h>
++#include <linux/vserver/debug.h>
++#include <linux/vserver/debug_cmd.h>
++#include <linux/vserver/history.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;
++}
++
++EXPORT_SYMBOL_GPL(vxh_advance);
++
++
++#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, cpu;
++
++	printk("History:\tSEQ: %8x\tNR_CPUS: %d\n",
++		atomic_read(&sequence), NR_CPUS);
++
++	for (i = 0; i < VXH_SIZE; i++) {
++		for_each_online_cpu(cpu) {
++			struct _vx_history *hist =
++				&per_cpu(vx_history_buffer, cpu);
++			unsigned int index = (hist->counter - i) % VXH_SIZE;
++			struct _vx_hist_entry *entry = &hist->entry[index];
++
++			vxh_dump_entry(entry, cpu);
++		}
++	}
++}
++
++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;
++}
++
++
++int do_read_history(struct __user _vx_hist_entry *data,
++	int cpu, uint32_t *index, uint32_t *count)
++{
++	int pos, ret = 0;
++	struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
++	int end = hist->counter;
++	int start = end - VXH_SIZE + 2;
++	int idx = *index;
++
++	/* special case: get current pos */
++	if (!*count) {
++		*index = end;
++		return 0;
++	}
++
++	/* have we lost some data? */
++	if (idx < start)
++		idx = start;
++
++	for (pos = 0; (pos < *count) && (idx < end); pos++, idx++) {
++		struct _vx_hist_entry *entry =
++			&hist->entry[idx % VXH_SIZE];
++
++		/* send entry to userspace */
++		ret = copy_to_user(&data[pos], entry, sizeof(*entry));
++		if (ret)
++			break;
++	}
++	/* save new index and count */
++	*index = idx;
++	*count = pos;
++	return ret ? ret : (*index < end);
++}
++
++int vc_read_history(uint32_t id, void __user *data)
++{
++	struct vcmd_read_history_v0 vc_data;
++	int ret;
++
++	if (id >= NR_CPUS)
++		return -EINVAL;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_read_history((struct __user _vx_hist_entry *)vc_data.data,
++		id, &vc_data.index, &vc_data.count);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++#ifdef	CONFIG_COMPAT
++
++int vc_read_history_x32(uint32_t id, void __user *data)
++{
++	struct vcmd_read_history_v0_x32 vc_data;
++	int ret;
++
++	if (id >= NR_CPUS)
++		return -EINVAL;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_read_history((struct __user _vx_hist_entry *)
++		compat_ptr(vc_data.data_ptr),
++		id, &vc_data.index, &vc_data.count);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/inet.c linux-3.7.10-vs2.3.5.6/kernel/vserver/inet.c
+--- linux-3.7.10/kernel/vserver/inet.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/inet.c	2013-02-05 01:41:48.000000000 +0000
+@@ -0,0 +1,236 @@
++
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/export.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
++#include <linux/vserver/debug.h>
++#include <net/route.h>
++#include <net/addrconf.h>
++
++
++int nx_v4_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
++{
++	int ret = 0;
++
++	if (!nxi1 || !nxi2 || nxi1 == nxi2)
++		ret = 1;
++	else {
++		struct nx_addr_v4 *ptr;
++		unsigned long irqflags;
++
++		spin_lock_irqsave(&nxi1->addr_lock, irqflags);
++		for (ptr = &nxi1->v4; ptr; ptr = ptr->next) {
++			if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) {
++				ret = 1;
++				break;
++			}
++		}
++		spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
++	}
++
++	vxdprintk(VXD_CBIT(net, 2),
++		"nx_v4_addr_conflict(%p,%p): %d",
++		nxi1, nxi2, ret);
++
++	return ret;
++}
++
++
++#ifdef	CONFIG_IPV6
++
++int nx_v6_addr_conflict(struct nx_info *nxi1, struct nx_info *nxi2)
++{
++	int ret = 0;
++
++	if (!nxi1 || !nxi2 || nxi1 == nxi2)
++		ret = 1;
++	else {
++		struct nx_addr_v6 *ptr;
++		unsigned long irqflags;
++
++		spin_lock_irqsave(&nxi1->addr_lock, irqflags);
++		for (ptr = &nxi1->v6; ptr; ptr = ptr->next) {
++			if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) {
++				ret = 1;
++				break;
++			}
++		}
++		spin_unlock_irqrestore(&nxi1->addr_lock, irqflags);
++	}
++
++	vxdprintk(VXD_CBIT(net, 2),
++		"nx_v6_addr_conflict(%p,%p): %d",
++		nxi1, nxi2, ret);
++
++	return ret;
++}
++
++#endif
++
++int v4_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	struct in_device *in_dev;
++	struct in_ifaddr **ifap;
++	struct in_ifaddr *ifa;
++	int ret = 0;
++
++	if (!dev)
++		goto out;
++	in_dev = in_dev_get(dev);
++	if (!in_dev)
++		goto out;
++
++	for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
++		ifap = &ifa->ifa_next) {
++		if (v4_addr_in_nx_info(nxi, ifa->ifa_local, NXA_MASK_SHOW)) {
++			ret = 1;
++			break;
++		}
++	}
++	in_dev_put(in_dev);
++out:
++	return ret;
++}
++
++
++#ifdef	CONFIG_IPV6
++
++int v6_dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	struct inet6_dev *in_dev;
++	struct inet6_ifaddr *ifa;
++	int ret = 0;
++
++	if (!dev)
++		goto out;
++	in_dev = in6_dev_get(dev);
++	if (!in_dev)
++		goto out;
++
++	// for (ifap = &in_dev->addr_list; (ifa = *ifap) != NULL;
++	list_for_each_entry(ifa, &in_dev->addr_list, if_list) {
++		if (v6_addr_in_nx_info(nxi, &ifa->addr, -1)) {
++			ret = 1;
++			break;
++		}
++	}
++	in6_dev_put(in_dev);
++out:
++	return ret;
++}
++
++#endif
++
++int dev_in_nx_info(struct net_device *dev, struct nx_info *nxi)
++{
++	int ret = 1;
++
++	if (!nxi)
++		goto out;
++	if (nxi->v4.type && v4_dev_in_nx_info(dev, nxi))
++		goto out;
++#ifdef	CONFIG_IPV6
++	ret = 2;
++	if (nxi->v6.type && v6_dev_in_nx_info(dev, nxi))
++		goto out;
++#endif
++	ret = 0;
++out:
++	vxdprintk(VXD_CBIT(net, 3),
++		"dev_in_nx_info(%p,%p[#%d]) = %d",
++		dev, nxi, nxi ? nxi->nx_id : 0, ret);
++	return ret;
++}
++
++struct rtable *ip_v4_find_src(struct net *net, struct nx_info *nxi,
++	struct flowi4 *fl4)
++{
++	struct rtable *rt;
++
++	if (!nxi)
++		return NULL;
++
++	/* FIXME: handle lback only case */
++	if (!NX_IPV4(nxi))
++		return ERR_PTR(-EPERM);
++
++	vxdprintk(VXD_CBIT(net, 4),
++		"ip_v4_find_src(%p[#%u]) " NIPQUAD_FMT " -> " NIPQUAD_FMT,
++		nxi, nxi ? nxi->nx_id : 0,
++		NIPQUAD(fl4->saddr), NIPQUAD(fl4->daddr));
++
++	/* single IP is unconditional */
++	if (nx_info_flags(nxi, NXF_SINGLE_IP, 0) &&
++		(fl4->saddr == INADDR_ANY))
++		fl4->saddr = nxi->v4.ip[0].s_addr;
++
++	if (fl4->saddr == INADDR_ANY) {
++		struct nx_addr_v4 *ptr;
++		__be32 found = 0;
++
++		rt = __ip_route_output_key(net, fl4);
++		if (!IS_ERR(rt)) {
++			found = fl4->saddr;
++			ip_rt_put(rt);
++			vxdprintk(VXD_CBIT(net, 4),
++				"ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(found));
++			if (v4_addr_in_nx_info(nxi, found, NXA_MASK_BIND))
++				goto found;
++		}
++
++		WARN_ON_ONCE(in_irq());
++		spin_lock(&nxi->addr_lock);
++		for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
++			__be32 primary = ptr->ip[0].s_addr;
++			__be32 mask = ptr->mask.s_addr;
++			__be32 neta = primary & mask;
++
++			vxdprintk(VXD_CBIT(net, 4), "ip_v4_find_src(%p[#%u]) chk: "
++				NIPQUAD_FMT "/" NIPQUAD_FMT "/" NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, NIPQUAD(primary),
++				NIPQUAD(mask), NIPQUAD(neta));
++			if ((found & mask) != neta)
++				continue;
++
++			fl4->saddr = primary;
++			rt = __ip_route_output_key(net, fl4);
++			vxdprintk(VXD_CBIT(net, 4),
++				"ip_v4_find_src(%p[#%u]) rok[%u]: " NIPQUAD_FMT,
++				nxi, nxi ? nxi->nx_id : 0, fl4->flowi4_oif, NIPQUAD(primary));
++			if (!IS_ERR(rt)) {
++				found = fl4->saddr;
++				ip_rt_put(rt);
++				if (found == primary)
++					goto found_unlock;
++			}
++		}
++		/* still no source ip? */
++		found = ipv4_is_loopback(fl4->daddr)
++			? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
++	found_unlock:
++		spin_unlock(&nxi->addr_lock);
++	found:
++		/* assign src ip to flow */
++		fl4->saddr = found;
++
++	} else {
++		if (!v4_addr_in_nx_info(nxi, fl4->saddr, NXA_MASK_BIND))
++			return ERR_PTR(-EPERM);
++	}
++
++	if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0)) {
++		if (ipv4_is_loopback(fl4->daddr))
++			fl4->daddr = nxi->v4_lback.s_addr;
++		if (ipv4_is_loopback(fl4->saddr))
++			fl4->saddr = nxi->v4_lback.s_addr;
++	} else if (ipv4_is_loopback(fl4->daddr) &&
++		!nx_info_flags(nxi, NXF_LBACK_ALLOW, 0))
++		return ERR_PTR(-EPERM);
++
++	return NULL;
++}
++
++EXPORT_SYMBOL_GPL(ip_v4_find_src);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/init.c linux-3.7.10-vs2.3.5.6/kernel/vserver/init.c
+--- linux-3.7.10/kernel/vserver/init.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/init.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,45 @@
++/*
++ *  linux/kernel/init.c
++ *
++ *  Virtual Server Init
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *
++ */
++
++#include <linux/init.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;
++}
++
++/* FIXME: GFP_ZONETYPES gone
++long vx_slab[GFP_ZONETYPES]; */
++long vx_area;
++
++
++module_init(init_vserver);
++module_exit(exit_vserver);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/inode.c linux-3.7.10-vs2.3.5.6/kernel/vserver/inode.c
+--- linux-3.7.10/kernel/vserver/inode.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/inode.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,437 @@
++/*
++ *  linux/kernel/vserver/inode.c
++ *
++ *  Virtual Server: File System Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  separated from vcontext V0.05
++ *  V0.02  moved to tag (instead of xid)
++ *
++ */
++
++#include <linux/tty.h>
++#include <linux/proc_fs.h>
++#include <linux/devpts_fs.h>
++#include <linux/fs.h>
++#include <linux/file.h>
++#include <linux/mount.h>
++#include <linux/parser.h>
++#include <linux/namei.h>
++#include <linux/vserver/inode.h>
++#include <linux/vserver/inode_cmd.h>
++#include <linux/vs_base.h>
++#include <linux/vs_tag.h>
++
++#include <asm/uaccess.h>
++
++
++static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask)
++{
++	struct proc_dir_entry *entry;
++
++	if (!in || !in->i_sb)
++		return -ESRCH;
++
++	*flags = IATTR_TAG
++		| (IS_IMMUTABLE(in) ? IATTR_IMMUTABLE : 0)
++		| (IS_IXUNLINK(in) ? IATTR_IXUNLINK : 0)
++		| (IS_BARRIER(in) ? IATTR_BARRIER : 0)
++		| (IS_COW(in) ? IATTR_COW : 0);
++	*mask = IATTR_IXUNLINK | IATTR_IMMUTABLE | IATTR_COW;
++
++	if (S_ISDIR(in->i_mode))
++		*mask |= IATTR_BARRIER;
++
++	if (IS_TAGGED(in)) {
++		*tag = i_tag_read(in);
++		*mask |= IATTR_TAG;
++	}
++
++	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:
++		*tag = i_tag_read(in);
++		*mask |= IATTR_TAG;
++		break;
++
++	default:
++		break;
++	}
++	return 0;
++}
++
++int vc_get_iattr(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(vc_data.name, &path);
++	if (!ret) {
++		ret = __vc_get_iattr(path.dentry->d_inode,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++	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(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1_x32 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
++	if (!ret) {
++		ret = __vc_get_iattr(path.dentry->d_inode,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
++
++int vc_fget_iattr(uint32_t fd, void __user *data)
++{
++	struct file *filp;
++	struct vcmd_ctx_fiattr_v0 vc_data = { .tag = -1 };
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	filp = fget(fd);
++	if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++		return -EBADF;
++
++	ret = __vc_get_iattr(filp->f_dentry->d_inode,
++		&vc_data.tag, &vc_data.flags, &vc_data.mask);
++
++	fput(filp);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++
++static int __vc_set_iattr(struct dentry *de, uint32_t *tag, uint32_t *flags, uint32_t *mask)
++{
++	struct inode *in = de->d_inode;
++	int error = 0, is_proc = 0, has_tag = 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_tag = IS_TAGGED(in) ||
++		(in->i_sb->s_magic == DEVPTS_SUPER_MAGIC);
++	if ((*mask & IATTR_TAG) && !has_tag)
++		return -EINVAL;
++
++	mutex_lock(&in->i_mutex);
++	if (*mask & IATTR_TAG) {
++		attr.ia_tag = *tag;
++		attr.ia_valid |= ATTR_TAG;
++	}
++
++	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_IMMUTABLE | IATTR_IXUNLINK |
++		IATTR_BARRIER | IATTR_COW)) {
++		int iflags = in->i_flags;
++		int vflags = in->i_vflags;
++
++		if (*mask & IATTR_IMMUTABLE) {
++			if (*flags & IATTR_IMMUTABLE)
++				iflags |= S_IMMUTABLE;
++			else
++				iflags &= ~S_IMMUTABLE;
++		}
++		if (*mask & IATTR_IXUNLINK) {
++			if (*flags & IATTR_IXUNLINK)
++				iflags |= S_IXUNLINK;
++			else
++				iflags &= ~S_IXUNLINK;
++		}
++		if (S_ISDIR(in->i_mode) && (*mask & IATTR_BARRIER)) {
++			if (*flags & IATTR_BARRIER)
++				vflags |= V_BARRIER;
++			else
++				vflags &= ~V_BARRIER;
++		}
++		if (S_ISREG(in->i_mode) && (*mask & IATTR_COW)) {
++			if (*flags & IATTR_COW)
++				vflags |= V_COW;
++			else
++				vflags &= ~V_COW;
++		}
++		if (in->i_op && in->i_op->sync_flags) {
++			error = in->i_op->sync_flags(in, iflags, vflags);
++			if (error)
++				goto out;
++		}
++	}
++
++	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) {
++				setattr_copy(in, &attr);
++				mark_inode_dirty(in);
++			}
++		}
++	}
++
++out:
++	mutex_unlock(&in->i_mutex);
++	return error;
++}
++
++int vc_set_iattr(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(vc_data.name, &path);
++	if (!ret) {
++		ret = __vc_set_iattr(path.dentry,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#ifdef	CONFIG_COMPAT
++
++int vc_set_iattr_x32(void __user *data)
++{
++	struct path path;
++	struct vcmd_ctx_iattr_v1_x32 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = user_lpath(compat_ptr(vc_data.name_ptr), &path);
++	if (!ret) {
++		ret = __vc_set_iattr(path.dentry,
++			&vc_data.tag, &vc_data.flags, &vc_data.mask);
++		path_put(&path);
++	}
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
++#endif	/* CONFIG_COMPAT */
++
++int vc_fset_iattr(uint32_t fd, void __user *data)
++{
++	struct file *filp;
++	struct vcmd_ctx_fiattr_v0 vc_data;
++	int ret;
++
++	if (!capable(CAP_LINUX_IMMUTABLE))
++		return -EPERM;
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	filp = fget(fd);
++	if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode)
++		return -EBADF;
++
++	ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag,
++		&vc_data.flags, &vc_data.mask);
++
++	fput(filp);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return ret;
++}
++
++
++enum { Opt_notagcheck, Opt_tag, Opt_notag, Opt_tagid, Opt_err };
++
++static match_table_t tokens = {
++	{Opt_notagcheck, "notagcheck"},
++#ifdef	CONFIG_PROPAGATE
++	{Opt_notag, "notag"},
++	{Opt_tag, "tag"},
++	{Opt_tagid, "tagid=%u"},
++#endif
++	{Opt_err, NULL}
++};
++
++
++static void __dx_parse_remove(char *string, char *opt)
++{
++	char *p = strstr(string, opt);
++	char *q = p;
++
++	if (p) {
++		while (*q != '\0' && *q != ',')
++			q++;
++		while (*q)
++			*p++ = *q++;
++		while (*p)
++			*p++ = '\0';
++	}
++}
++
++int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags,
++		 unsigned long *flags)
++{
++	int set = 0;
++	substring_t args[MAX_OPT_ARGS];
++	int token;
++	char *s, *p, *opts;
++#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
++	int option = 0;
++#endif
++
++	if (!string)
++		return 0;
++	s = kstrdup(string, GFP_KERNEL | GFP_ATOMIC);
++	if (!s)
++		return 0;
++
++	opts = s;
++	while ((p = strsep(&opts, ",")) != NULL) {
++		token = match_token(p, tokens, args);
++
++		switch (token) {
++#ifdef CONFIG_PROPAGATE
++		case Opt_tag:
++			if (tag)
++				*tag = 0;
++			if (remove)
++				__dx_parse_remove(s, "tag");
++			*mnt_flags |= MNT_TAGID;
++			set |= MNT_TAGID;
++			break;
++		case Opt_notag:
++			if (remove)
++				__dx_parse_remove(s, "notag");
++			*mnt_flags |= MNT_NOTAG;
++			set |= MNT_NOTAG;
++			break;
++		case Opt_tagid:
++			if (tag && !match_int(args, &option))
++				*tag = option;
++			if (remove)
++				__dx_parse_remove(s, "tagid");
++			*mnt_flags |= MNT_TAGID;
++			set |= MNT_TAGID;
++			break;
++#endif	/* CONFIG_PROPAGATE */
++		case Opt_notagcheck:
++			if (remove)
++				__dx_parse_remove(s, "notagcheck");
++			*flags |= MS_NOTAGCHECK;
++			set |= MS_NOTAGCHECK;
++			break;
++		}
++		vxdprintk(VXD_CBIT(tag, 7),
++			"dx_parse_tag(" VS_Q("%s") "): %d:#%d",
++			p, token, option);
++	}
++	if (set)
++		strcpy(string, s);
++	kfree(s);
++	return set;
++}
++
++#ifdef	CONFIG_PROPAGATE
++
++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode)
++{
++	tag_t new_tag = 0;
++	struct vfsmount *mnt;
++	int propagate;
++
++	if (!nd)
++		return;
++	mnt = nd->path.mnt;
++	if (!mnt)
++		return;
++
++	propagate = (mnt->mnt_flags & MNT_TAGID);
++	if (propagate)
++		new_tag = mnt->mnt_tag;
++
++	vxdprintk(VXD_CBIT(tag, 7),
++		"dx_propagate_tag(%p[#%lu.%d]): %d,%d",
++		inode, inode->i_ino, inode->i_tag,
++		new_tag, (propagate) ? 1 : 0);
++
++	if (propagate)
++		i_tag_write(inode, new_tag);
++}
++
++#include <linux/module.h>
++
++EXPORT_SYMBOL_GPL(__dx_propagate_tag);
++
++#endif	/* CONFIG_PROPAGATE */
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/limit.c linux-3.7.10-vs2.3.5.6/kernel/vserver/limit.c
+--- linux-3.7.10/kernel/vserver/limit.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/limit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,345 @@
++/*
++ *  linux/kernel/vserver/limit.c
++ *
++ *  Virtual Server: Context Limits
++ *
++ *  Copyright (C) 2004-2010  Herbert Pötzl
++ *
++ *  V0.01  broken out from vcontext V0.05
++ *  V0.02  changed vcmds to vxi arg
++ *  V0.03  added memory cgroup support
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/module.h>
++#include <linux/memcontrol.h>
++#include <linux/res_counter.h>
++#include <linux/vs_limit.h>
++#include <linux/vserver/limit.h>
++#include <linux/vserver/limit_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++const char *vlimit_name[NUM_LIMITS] = {
++	[RLIMIT_CPU]		= "CPU",
++	[RLIMIT_NPROC]		= "NPROC",
++	[RLIMIT_NOFILE]		= "NOFILE",
++	[RLIMIT_LOCKS]		= "LOCKS",
++	[RLIMIT_SIGPENDING]	= "SIGP",
++	[RLIMIT_MSGQUEUE]	= "MSGQ",
++
++	[VLIMIT_NSOCK]		= "NSOCK",
++	[VLIMIT_OPENFD]		= "OPENFD",
++	[VLIMIT_SHMEM]		= "SHMEM",
++	[VLIMIT_DENTRY]		= "DENTRY",
++};
++
++EXPORT_SYMBOL_GPL(vlimit_name);
++
++#define MASK_ENTRY(x)	(1 << (x))
++
++const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
++		/* minimum */
++	0
++	,	/* softlimit */
++	0
++	,       /* maximum */
++	MASK_ENTRY( RLIMIT_NPROC	) |
++	MASK_ENTRY( RLIMIT_NOFILE	) |
++	MASK_ENTRY( RLIMIT_LOCKS	) |
++	MASK_ENTRY( RLIMIT_MSGQUEUE	) |
++
++	MASK_ENTRY( VLIMIT_NSOCK	) |
++	MASK_ENTRY( VLIMIT_OPENFD	) |
++	MASK_ENTRY( VLIMIT_SHMEM	) |
++	MASK_ENTRY( VLIMIT_DENTRY	) |
++	0
++};
++		/* accounting only */
++uint32_t account_mask =
++	MASK_ENTRY( VLIMIT_SEMARY	) |
++	MASK_ENTRY( VLIMIT_NSEMS	) |
++	MASK_ENTRY( VLIMIT_MAPPED	) |
++	0;
++
++
++static int is_valid_vlimit(int id)
++{
++	uint32_t mask = vlimit_mask.minimum |
++		vlimit_mask.softlimit | vlimit_mask.maximum;
++	return mask & (1 << id);
++}
++
++static int is_accounted_vlimit(int id)
++{
++	if (is_valid_vlimit(id))
++		return 1;
++	return account_mask & (1 << id);
++}
++
++
++static inline uint64_t vc_get_soft(struct vx_info *vxi, int id)
++{
++	rlim_t limit = __rlim_soft(&vxi->limit, id);
++	return VX_VLIM(limit);
++}
++
++static inline uint64_t vc_get_hard(struct vx_info *vxi, int id)
++{
++	rlim_t limit = __rlim_hard(&vxi->limit, id);
++	return VX_VLIM(limit);
++}
++
++static int do_get_rlimit(struct vx_info *vxi, uint32_t id,
++	uint64_t *minimum, uint64_t *softlimit, uint64_t *maximum)
++{
++	if (!is_valid_vlimit(id))
++		return -EINVAL;
++
++	if (minimum)
++		*minimum = CRLIM_UNSET;
++	if (softlimit)
++		*softlimit = vc_get_soft(vxi, id);
++	if (maximum)
++		*maximum = vc_get_hard(vxi, id);
++	return 0;
++}
++
++int vc_get_rlimit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0 vc_data;
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_get_rlimit(vxi, vc_data.id,
++		&vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++static int do_set_rlimit(struct vx_info *vxi, uint32_t id,
++	uint64_t minimum, uint64_t softlimit, uint64_t maximum)
++{
++	if (!is_valid_vlimit(id))
++		return -EINVAL;
++
++	if (maximum != CRLIM_KEEP)
++		__rlim_hard(&vxi->limit, id) = VX_RLIM(maximum);
++	if (softlimit != CRLIM_KEEP)
++		__rlim_soft(&vxi->limit, id) = VX_RLIM(softlimit);
++
++	/* clamp soft limit */
++	if (__rlim_soft(&vxi->limit, id) > __rlim_hard(&vxi->limit, id))
++		__rlim_soft(&vxi->limit, id) = __rlim_hard(&vxi->limit, id);
++
++	return 0;
++}
++
++int vc_set_rlimit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_rlimit(vxi, vc_data.id,
++		vc_data.minimum, vc_data.softlimit, vc_data.maximum);
++}
++
++#ifdef	CONFIG_IA32_EMULATION
++
++int vc_set_rlimit_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0_x32 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_rlimit(vxi, vc_data.id,
++		vc_data.minimum, vc_data.softlimit, vc_data.maximum);
++}
++
++int vc_get_rlimit_x32(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_rlimit_v0_x32 vc_data;
++	int ret;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	ret = do_get_rlimit(vxi, vc_data.id,
++		&vc_data.minimum, &vc_data.softlimit, &vc_data.maximum);
++	if (ret)
++		return ret;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++#endif	/* CONFIG_IA32_EMULATION */
++
++
++int vc_get_rlimit_mask(uint32_t id, void __user *data)
++{
++	if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
++		return -EFAULT;
++	return 0;
++}
++
++
++static inline void vx_reset_hits(struct _vx_limit *limit)
++{
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		atomic_set(&__rlim_lhit(limit, lim), 0);
++	}
++}
++
++int vc_reset_hits(struct vx_info *vxi, void __user *data)
++{
++	vx_reset_hits(&vxi->limit);
++	return 0;
++}
++
++static inline void vx_reset_minmax(struct _vx_limit *limit)
++{
++	rlim_t value;
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		value = __rlim_get(limit, lim);
++		__rlim_rmax(limit, lim) = value;
++		__rlim_rmin(limit, lim) = value;
++	}
++}
++
++int vc_reset_minmax(struct vx_info *vxi, void __user *data)
++{
++	vx_reset_minmax(&vxi->limit);
++	return 0;
++}
++
++
++int vc_rlimit_stat(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_rlimit_stat_v0 vc_data;
++	struct _vx_limit *limit = &vxi->limit;
++	int id;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	id = vc_data.id;
++	if (!is_accounted_vlimit(id))
++		return -EINVAL;
++
++	vx_limit_fixup(limit, id);
++	vc_data.hits = atomic_read(&__rlim_lhit(limit, id));
++	vc_data.value = __rlim_get(limit, id);
++	vc_data.minimum = __rlim_rmin(limit, id);
++	vc_data.maximum = __rlim_rmax(limit, id);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++void vx_vsi_meminfo(struct sysinfo *val)
++{
++#ifdef	CONFIG_MEMCG
++	struct mem_cgroup *mcg;
++	u64 res_limit, res_usage;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
++	if (!mcg)
++		goto out;
++
++	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++
++	if (res_limit != RESOURCE_MAX)
++		val->totalram = (res_limit >> PAGE_SHIFT);
++	val->freeram = val->totalram - (res_usage >> PAGE_SHIFT);
++	val->bufferram = 0;
++	val->totalhigh = 0;
++	val->freehigh = 0;
++out:
++#endif	/* CONFIG_MEMCG */
++	return;
++}
++
++void vx_vsi_swapinfo(struct sysinfo *val)
++{
++#ifdef	CONFIG_MEMCG
++#ifdef	CONFIG_MEMCG_SWAP
++	struct mem_cgroup *mcg;
++	u64 res_limit, res_usage, memsw_limit, memsw_usage;
++	s64 swap_limit, swap_usage;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
++	if (!mcg)
++		goto out;
++
++	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
++	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
++	memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT);
++	memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE);
++
++	/* memory unlimited */
++	if (res_limit == RESOURCE_MAX)
++		goto out;
++
++	swap_limit = memsw_limit - res_limit;
++	/* we have a swap limit? */
++	if (memsw_limit != RESOURCE_MAX)
++		val->totalswap = swap_limit >> PAGE_SHIFT;
++
++	/* calculate swap part */
++	swap_usage = (memsw_usage > res_usage) ?
++		memsw_usage - res_usage : 0;
++
++	/* total shown minus usage gives free swap */
++	val->freeswap = (swap_usage < swap_limit) ?
++		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
++out:
++#else	/* !CONFIG_MEMCG_SWAP */
++	val->totalswap = 0;
++	val->freeswap = 0;
++#endif	/* !CONFIG_MEMCG_SWAP */
++#endif	/* CONFIG_MEMCG */
++	return;
++}
++
++long vx_vsi_cached(struct sysinfo *val)
++{
++	long cache = 0;
++#ifdef	CONFIG_MEMCG
++	struct mem_cgroup *mcg;
++
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	rcu_read_unlock();
++	if (!mcg)
++		goto out;
++
++	cache = mem_cgroup_stat_read_cache(mcg);
++out:
++#endif
++	return cache;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/limit_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_init.h
+--- linux-3.7.10/kernel/vserver/limit_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,31 @@
++
++
++static inline void vx_info_init_limit(struct _vx_limit *limit)
++{
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		__rlim_soft(limit, lim) = RLIM_INFINITY;
++		__rlim_hard(limit, lim) = RLIM_INFINITY;
++		__rlim_set(limit, lim, 0);
++		atomic_set(&__rlim_lhit(limit, lim), 0);
++		__rlim_rmin(limit, lim) = 0;
++		__rlim_rmax(limit, lim) = 0;
++	}
++}
++
++static inline void vx_info_exit_limit(struct _vx_limit *limit)
++{
++	rlim_t value;
++	int lim;
++
++	for (lim = 0; lim < NUM_LIMITS; lim++) {
++		if ((1 << lim) & VLIM_NOCHECK)
++			continue;
++		value = __rlim_get(limit, lim);
++		vxwprintk_xid(value,
++			"!!! limit: %p[%s,%d] = %ld on exit.",
++			limit, vlimit_name[lim], lim, (long)value);
++	}
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/limit_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_proc.h
+--- linux-3.7.10/kernel/vserver/limit_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/limit_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,57 @@
++#ifndef _VX_LIMIT_PROC_H
++#define _VX_LIMIT_PROC_H
++
++#include <linux/vserver/limit_int.h>
++
++
++#define VX_LIMIT_FMT	":\t%8ld\t%8ld/%8ld\t%8lld/%8lld\t%6d\n"
++#define VX_LIMIT_TOP	\
++	"Limit\t current\t     min/max\t\t    soft/hard\t\thits\n"
++
++#define VX_LIMIT_ARG(r)				\
++	(unsigned long)__rlim_get(limit, r),	\
++	(unsigned long)__rlim_rmin(limit, r),	\
++	(unsigned long)__rlim_rmax(limit, r),	\
++	VX_VLIM(__rlim_soft(limit, r)),		\
++	VX_VLIM(__rlim_hard(limit, r)),		\
++	atomic_read(&__rlim_lhit(limit, r))
++
++static inline int vx_info_proc_limit(struct _vx_limit *limit, char *buffer)
++{
++	vx_limit_fixup(limit, -1);
++	return sprintf(buffer, VX_LIMIT_TOP
++		"PROC"	VX_LIMIT_FMT
++		"VM"	VX_LIMIT_FMT
++		"VML"	VX_LIMIT_FMT
++		"RSS"	VX_LIMIT_FMT
++		"ANON"	VX_LIMIT_FMT
++		"RMAP"	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
++		"SEMA"	VX_LIMIT_FMT
++		"SEMS"	VX_LIMIT_FMT
++		"DENT"	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(VLIMIT_MAPPED),
++		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),
++		VX_LIMIT_ARG(VLIMIT_SEMARY),
++		VX_LIMIT_ARG(VLIMIT_NSEMS),
++		VX_LIMIT_ARG(VLIMIT_DENTRY));
++}
++
++#endif	/* _VX_LIMIT_PROC_H */
++
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/network.c linux-3.7.10-vs2.3.5.6/kernel/vserver/network.c
+--- linux-3.7.10/kernel/vserver/network.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/network.c	2013-01-04 23:27:50.000000000 +0000
+@@ -0,0 +1,1053 @@
++/*
++ *  linux/kernel/vserver/network.c
++ *
++ *  Virtual Server: Network Support
++ *
++ *  Copyright (C) 2003-2007  Herbert Pötzl
++ *
++ *  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
++ *  V0.06  changed vcmds to nxi arg
++ *  V0.07  have __create claim() the nxi
++ *
++ */
++
++#include <linux/err.h>
++#include <linux/slab.h>
++#include <linux/rcupdate.h>
++#include <net/ipv6.h>
++
++#include <linux/vs_network.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/network_cmd.h>
++
++
++atomic_t nx_global_ctotal	= ATOMIC_INIT(0);
++atomic_t nx_global_cactive	= ATOMIC_INIT(0);
++
++static struct kmem_cache *nx_addr_v4_cachep = NULL;
++static struct kmem_cache *nx_addr_v6_cachep = NULL;
++
++
++static int __init init_network(void)
++{
++	nx_addr_v4_cachep = kmem_cache_create("nx_v4_addr_cache",
++		sizeof(struct nx_addr_v4), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	nx_addr_v6_cachep = kmem_cache_create("nx_v6_addr_cache",
++		sizeof(struct nx_addr_v6), 0,
++		SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
++	return 0;
++}
++
++
++/*	__alloc_nx_addr_v4()					*/
++
++static inline struct nx_addr_v4 *__alloc_nx_addr_v4(void)
++{
++	struct nx_addr_v4 *nxa = kmem_cache_alloc(
++		nx_addr_v4_cachep, GFP_KERNEL);
++
++	if (!IS_ERR(nxa))
++		memset(nxa, 0, sizeof(*nxa));
++	return nxa;
++}
++
++/*	__dealloc_nx_addr_v4()					*/
++
++static inline void __dealloc_nx_addr_v4(struct nx_addr_v4 *nxa)
++{
++	kmem_cache_free(nx_addr_v4_cachep, nxa);
++}
++
++/*	__dealloc_nx_addr_v4_all()				*/
++
++static inline void __dealloc_nx_addr_v4_all(struct nx_addr_v4 *nxa)
++{
++	while (nxa) {
++		struct nx_addr_v4 *next = nxa->next;
++
++		__dealloc_nx_addr_v4(nxa);
++		nxa = next;
++	}
++}
++
++
++#ifdef CONFIG_IPV6
++
++/*	__alloc_nx_addr_v6()					*/
++
++static inline struct nx_addr_v6 *__alloc_nx_addr_v6(void)
++{
++	struct nx_addr_v6 *nxa = kmem_cache_alloc(
++		nx_addr_v6_cachep, GFP_KERNEL);
++
++	if (!IS_ERR(nxa))
++		memset(nxa, 0, sizeof(*nxa));
++	return nxa;
++}
++
++/*	__dealloc_nx_addr_v6()					*/
++
++static inline void __dealloc_nx_addr_v6(struct nx_addr_v6 *nxa)
++{
++	kmem_cache_free(nx_addr_v6_cachep, nxa);
++}
++
++/*	__dealloc_nx_addr_v6_all()				*/
++
++static inline void __dealloc_nx_addr_v6_all(struct nx_addr_v6 *nxa)
++{
++	while (nxa) {
++		struct nx_addr_v6 *next = nxa->next;
++
++		__dealloc_nx_addr_v6(nxa);
++		nxa = next;
++	}
++}
++
++#endif	/* CONFIG_IPV6 */
++
++/*	__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);
++	spin_lock_init(&new->addr_lock);
++	new->nx_state = 0;
++
++	new->nx_flags = NXF_INIT_SET;
++
++	/* rest of init goes here */
++
++	new->v4_lback.s_addr = htonl(INADDR_LOOPBACK);
++	new->v4_bcast.s_addr = htonl(INADDR_BROADCAST);
++
++	vxdprintk(VXD_CBIT(nid, 0),
++		"alloc_nx_info(%d) = %p", nid, new);
++	atomic_inc(&nx_global_ctotal);
++	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));
++
++	__dealloc_nx_addr_v4_all(nxi->v4.next);
++#ifdef CONFIG_IPV6
++	__dealloc_nx_addr_v6_all(nxi->v6.next);
++#endif
++
++	nxi->nx_state |= NXS_RELEASED;
++	kfree(nxi);
++	atomic_dec(&nx_global_ctotal);
++}
++
++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_read(&nxi->nx_tasks));
++
++	__dealloc_nx_info(nxi);
++}
++
++
++void __nx_set_lback(struct nx_info *nxi)
++{
++	int nid = nxi->nx_id;
++	__be32 lback = htonl(INADDR_LOOPBACK ^ ((nid & 0xFFFF) << 8));
++
++	nxi->v4_lback.s_addr = lback;
++}
++
++extern int __nx_inet_add_lback(__be32 addr);
++extern int __nx_inet_del_lback(__be32 addr);
++
++
++/*	hash table for nx_info hash */
++
++#define NX_HASH_SIZE	13
++
++struct hlist_head nx_info_hash[NX_HASH_SIZE];
++
++static DEFINE_SPINLOCK(nx_info_hash_lock);
++
++
++static inline unsigned int __hashval(nid_t nid)
++{
++	return (nid % NX_HASH_SIZE);
++}
++
++
++
++/*	__hash_nx_info()
++
++	* add the nxi to the global hash table
++	* requires the hash_lock to be held			*/
++
++static inline void __hash_nx_info(struct nx_info *nxi)
++{
++	struct hlist_head *head;
++
++	vxd_assert_lock(&nx_info_hash_lock);
++	vxdprintk(VXD_CBIT(nid, 4),
++		"__hash_nx_info: %p[#%d]", nxi, nxi->nx_id);
++
++	/* context must not be hashed */
++	BUG_ON(nx_info_state(nxi, NXS_HASHED));
++
++	nxi->nx_state |= NXS_HASHED;
++	head = &nx_info_hash[__hashval(nxi->nx_id)];
++	hlist_add_head(&nxi->nx_hlist, head);
++	atomic_inc(&nx_global_cactive);
++}
++
++/*	__unhash_nx_info()
++
++	* remove the nxi from the global hash table
++	* requires the hash_lock to be held			*/
++
++static inline void __unhash_nx_info(struct nx_info *nxi)
++{
++	vxd_assert_lock(&nx_info_hash_lock);
++	vxdprintk(VXD_CBIT(nid, 4),
++		"__unhash_nx_info: %p[#%d.%d.%d]", nxi, nxi->nx_id,
++		atomic_read(&nxi->nx_usecnt), atomic_read(&nxi->nx_tasks));
++
++	/* context must be hashed */
++	BUG_ON(!nx_info_state(nxi, NXS_HASHED));
++	/* but without tasks */
++	BUG_ON(atomic_read(&nxi->nx_tasks));
++
++	nxi->nx_state &= ~NXS_HASHED;
++	hlist_del(&nxi->nx_hlist);
++	atomic_dec(&nx_global_cactive);
++}
++
++
++/*	__lookup_nx_info()
++
++	* requires the hash_lock to be held
++	* doesn't increment the nx_refcnt			*/
++
++static inline struct nx_info *__lookup_nx_info(nid_t nid)
++{
++	struct hlist_head *head = &nx_info_hash[__hashval(nid)];
++	struct hlist_node *pos;
++	struct nx_info *nxi;
++
++	vxd_assert_lock(&nx_info_hash_lock);
++	hlist_for_each(pos, head) {
++		nxi = hlist_entry(pos, struct nx_info, nx_hlist);
++
++		if (nxi->nx_id == nid)
++			goto found;
++	}
++	nxi = NULL;
++found:
++	vxdprintk(VXD_CBIT(nid, 0),
++		"__lookup_nx_info(#%u): %p[#%u]",
++		nid, nxi, nxi ? nxi->nx_id : 0);
++	return nxi;
++}
++
++
++/*	__create_nx_info()
++
++	* create the requested context
++	* get(), claim() and hash it				*/
++
++static struct nx_info *__create_nx_info(int id)
++{
++	struct nx_info *new, *nxi = NULL;
++
++	vxdprintk(VXD_CBIT(nid, 1), "create_nx_info(%d)*", id);
++
++	if (!(new = __alloc_nx_info(id)))
++		return ERR_PTR(-ENOMEM);
++
++	/* required to make dynamic xids unique */
++	spin_lock(&nx_info_hash_lock);
++
++	/* static context requested */
++	if ((nxi = __lookup_nx_info(id))) {
++		vxdprintk(VXD_CBIT(nid, 0),
++			"create_nx_info(%d) = %p (already there)", id, nxi);
++		if (nx_info_flags(nxi, NXF_STATE_SETUP, 0))
++			nxi = ERR_PTR(-EBUSY);
++		else
++			nxi = ERR_PTR(-EEXIST);
++		goto out_unlock;
++	}
++	/* new context */
++	vxdprintk(VXD_CBIT(nid, 0),
++		"create_nx_info(%d) = %p (new)", id, new);
++	claim_nx_info(new, NULL);
++	__nx_set_lback(new);
++	__hash_nx_info(get_nx_info(new));
++	nxi = new, new = NULL;
++
++out_unlock:
++	spin_unlock(&nx_info_hash_lock);
++	if (new)
++		__dealloc_nx_info(new);
++	return nxi;
++}
++
++
++
++/*	exported stuff						*/
++
++
++void unhash_nx_info(struct nx_info *nxi)
++{
++	__shutdown_nx_info(nxi);
++	spin_lock(&nx_info_hash_lock);
++	__unhash_nx_info(nxi);
++	spin_unlock(&nx_info_hash_lock);
++}
++
++/*	lookup_nx_info()
++
++	* search for a nx_info and get() it
++	* negative id means current				*/
++
++struct nx_info *lookup_nx_info(int id)
++{
++	struct nx_info *nxi = NULL;
++
++	if (id < 0) {
++		nxi = get_nx_info(current_nx_info());
++	} else if (id > 1) {
++		spin_lock(&nx_info_hash_lock);
++		nxi = get_nx_info(__lookup_nx_info(id));
++		spin_unlock(&nx_info_hash_lock);
++	}
++	return nxi;
++}
++
++/*	nid_is_hashed()
++
++	* verify that nid is still hashed			*/
++
++int nid_is_hashed(nid_t nid)
++{
++	int hashed;
++
++	spin_lock(&nx_info_hash_lock);
++	hashed = (__lookup_nx_info(nid) != NULL);
++	spin_unlock(&nx_info_hash_lock);
++	return hashed;
++}
++
++
++#ifdef	CONFIG_PROC_FS
++
++/*	get_nid_list()
++
++	* get a subset of hashed nids for proc
++	* assumes size is at least one				*/
++
++int get_nid_list(int index, unsigned int *nids, int size)
++{
++	int hindex, nr_nids = 0;
++
++	/* only show current and children */
++	if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
++		if (index > 0)
++			return 0;
++		nids[nr_nids] = nx_current_nid();
++		return 1;
++	}
++
++	for (hindex = 0; hindex < NX_HASH_SIZE; hindex++) {
++		struct hlist_head *head = &nx_info_hash[hindex];
++		struct hlist_node *pos;
++
++		spin_lock(&nx_info_hash_lock);
++		hlist_for_each(pos, head) {
++			struct nx_info *nxi;
++
++			if (--index > 0)
++				continue;
++
++			nxi = hlist_entry(pos, struct nx_info, nx_hlist);
++			nids[nr_nids] = nxi->nx_id;
++			if (++nr_nids >= size) {
++				spin_unlock(&nx_info_hash_lock);
++				goto out;
++			}
++		}
++		/* keep the lock time short */
++		spin_unlock(&nx_info_hash_lock);
++	}
++out:
++	return nr_nids;
++}
++#endif
++
++
++/*
++ *	migrate task to new network
++ *	gets nxi, puts old_nxi on change
++ */
++
++int nx_migrate_task(struct task_struct *p, struct nx_info *nxi)
++{
++	struct nx_info *old_nxi;
++	int ret = 0;
++
++	if (!p || !nxi)
++		BUG();
++
++	vxdprintk(VXD_CBIT(nid, 5),
++		"nx_migrate_task(%p,%p[#%d.%d.%d])",
++		p, nxi, nxi->nx_id,
++		atomic_read(&nxi->nx_usecnt),
++		atomic_read(&nxi->nx_tasks));
++
++	if (nx_info_flags(nxi, NXF_INFO_PRIVATE, 0) &&
++		!nx_info_flags(nxi, NXF_STATE_SETUP, 0))
++		return -EACCES;
++
++	if (nx_info_state(nxi, NXS_SHUTDOWN))
++		return -EFAULT;
++
++	/* maybe disallow this completely? */
++	old_nxi = task_get_nx_info(p);
++	if (old_nxi == nxi)
++		goto out;
++
++	task_lock(p);
++	if (old_nxi)
++		clr_nx_info(&p->nx_info);
++	claim_nx_info(nxi, p);
++	set_nx_info(&p->nx_info, nxi);
++	p->nid = nxi->nx_id;
++	task_unlock(p);
++
++	vxdprintk(VXD_CBIT(nid, 5),
++		"moved task %p into nxi:%p[#%d]",
++		p, nxi, nxi->nx_id);
++
++	if (old_nxi)
++		release_nx_info(old_nxi, p);
++	ret = 0;
++out:
++	put_nx_info(old_nxi);
++	return ret;
++}
++
++
++void nx_set_persistent(struct nx_info *nxi)
++{
++	vxdprintk(VXD_CBIT(nid, 6),
++		"nx_set_persistent(%p[#%d])", nxi, nxi->nx_id);
++
++	get_nx_info(nxi);
++	claim_nx_info(nxi, NULL);
++}
++
++void nx_clear_persistent(struct nx_info *nxi)
++{
++	vxdprintk(VXD_CBIT(nid, 6),
++		"nx_clear_persistent(%p[#%d])", nxi, nxi->nx_id);
++
++	release_nx_info(nxi, NULL);
++	put_nx_info(nxi);
++}
++
++void nx_update_persistent(struct nx_info *nxi)
++{
++	if (nx_info_flags(nxi, NXF_PERSISTENT, 0))
++		nx_set_persistent(nxi);
++	else
++		nx_clear_persistent(nxi);
++}
++
++/* vserver syscall commands below here */
++
++/* taks nid and nx_info functions */
++
++#include <asm/uaccess.h>
++
++
++int vc_task_nid(uint32_t id)
++{
++	nid_t nid;
++
++	if (id) {
++		struct task_struct *tsk;
++
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		nid = (tsk) ? tsk->nid : -ESRCH;
++		rcu_read_unlock();
++	} else
++		nid = nx_current_nid();
++	return nid;
++}
++
++
++int vc_nx_info(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_nx_info_v0 vc_data;
++
++	vc_data.nid = nxi->nx_id;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++
++/* network functions */
++
++int vc_net_create(uint32_t nid, void __user *data)
++{
++	struct vcmd_net_create vc_data = { .flagword = NXF_INIT_SET };
++	struct nx_info *new_nxi;
++	int ret;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if ((nid > MAX_S_CONTEXT) || (nid < 2))
++		return -EINVAL;
++
++	new_nxi = __create_nx_info(nid);
++	if (IS_ERR(new_nxi))
++		return PTR_ERR(new_nxi);
++
++	/* initial flags */
++	new_nxi->nx_flags = vc_data.flagword;
++
++	ret = -ENOEXEC;
++	if (vs_net_change(new_nxi, VSC_NETUP))
++		goto out;
++
++	ret = nx_migrate_task(current, new_nxi);
++	if (ret)
++		goto out;
++
++	/* return context id on success */
++	ret = new_nxi->nx_id;
++
++	/* get a reference for persistent contexts */
++	if ((vc_data.flagword & NXF_PERSISTENT))
++		nx_set_persistent(new_nxi);
++out:
++	release_nx_info(new_nxi, NULL);
++	put_nx_info(new_nxi);
++	return ret;
++}
++
++
++int vc_net_migrate(struct nx_info *nxi, void __user *data)
++{
++	return nx_migrate_task(current, nxi);
++}
++
++
++static inline
++struct nx_addr_v4 *__find_v4_addr(struct nx_info *nxi,
++	__be32 ip, __be32 ip2, __be32 mask, uint16_t type, uint16_t flags,
++	struct nx_addr_v4 **prev)
++{
++	struct nx_addr_v4 *nxa = &nxi->v4;
++
++	for (; nxa; nxa = nxa->next) {
++		if ((nxa->ip[0].s_addr == ip) &&
++		    (nxa->ip[1].s_addr == ip2) &&
++		    (nxa->mask.s_addr == mask) &&
++		    (nxa->type == type) &&
++		    (nxa->flags == flags))
++		    return nxa;
++
++		/* save previous entry */
++		if (prev)
++			*prev = nxa;
++	}
++	return NULL;
++}
++
++int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
++	uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v4 *nxa = NULL;
++	struct nx_addr_v4 *new = __alloc_nx_addr_v4();
++	unsigned long irqflags;
++	int ret = -EEXIST;
++
++	if (IS_ERR(new))
++		return PTR_ERR(new);
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa))
++		goto out_unlock;
++
++	if (NX_IPV4(nxi)) {
++		nxa->next = new;
++		nxa = new;
++		new = NULL;
++
++		/* remove single ip for ip list */
++		nxi->nx_flags &= ~NXF_SINGLE_IP;
++	}
++
++	nxa->ip[0].s_addr = ip;
++	nxa->ip[1].s_addr = ip2;
++	nxa->mask.s_addr = mask;
++	nxa->type = type;
++	nxa->flags = flags;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	if (new)
++		__dealloc_nx_addr_v4(new);
++	return ret;
++}
++
++int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask,
++	uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v4 *nxa = NULL;
++	struct nx_addr_v4 *old = NULL;
++	unsigned long irqflags;
++	int ret = 0;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	switch (type) {
++	case NXA_TYPE_ADDR:
++		old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa);
++		if (old) {
++			if (nxa) {
++				nxa->next = old->next;
++				old->next = NULL;
++			} else {
++				if (old->next) {
++					nxa = old;
++					old = old->next;
++					*nxa = *old;
++					old->next = NULL;
++				} else {
++					memset(old, 0, sizeof(*old));
++					old = NULL;
++				}
++			}
++		} else
++			ret = -ESRCH;
++		break;
++
++	case NXA_TYPE_ANY:
++		nxa = &nxi->v4;
++		old = nxa->next;
++		memset(nxa, 0, sizeof(*nxa));
++		break;
++
++	default:
++		ret = -EINVAL;
++	}
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	__dealloc_nx_addr_v4_all(old);
++	return ret;
++}
++
++
++int vc_net_add(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_v0 vc_data;
++	int index, ret = 0;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_IPV4:
++		if ((vc_data.count < 1) || (vc_data.count > 4))
++			return -EINVAL;
++
++		index = 0;
++		while (index < vc_data.count) {
++			ret = do_add_v4_addr(nxi, vc_data.ip[index].s_addr, 0,
++				vc_data.mask[index].s_addr, NXA_TYPE_ADDR, 0);
++			if (ret)
++				return ret;
++			index++;
++		}
++		ret = index;
++		break;
++
++	case NXA_TYPE_IPV4|NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip[0];
++		ret = 1;
++		break;
++
++	case NXA_TYPE_IPV4|NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip[0];
++		ret = 1;
++		break;
++
++	default:
++		ret = -EINVAL;
++		break;
++	}
++	return ret;
++}
++
++int vc_net_remove(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_v0 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ANY:
++		return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0);
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++
++int vc_net_add_ipv4_v1(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++	case NXA_TYPE_MASK:
++		return do_add_v4_addr(nxi, vc_data.ip.s_addr, 0,
++			vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++	case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip;
++		break;
++
++	case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip;
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_add_ipv4(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v2 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++	case NXA_TYPE_MASK:
++	case NXA_TYPE_RANGE:
++		return do_add_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
++			vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++
++	case NXA_TYPE_ADDR | NXA_MOD_BCAST:
++		nxi->v4_bcast = vc_data.ip;
++		break;
++
++	case NXA_TYPE_ADDR | NXA_MOD_LBACK:
++		nxi->v4_lback = vc_data.ip;
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_rem_ipv4_v1(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_remove_v4_addr(nxi, vc_data.ip.s_addr, 0,
++		vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++}
++
++int vc_net_rem_ipv4(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv4_v2 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr,
++		vc_data.mask.s_addr, vc_data.type, vc_data.flags);
++}
++
++#ifdef CONFIG_IPV6
++
++static inline
++struct nx_addr_v6 *__find_v6_addr(struct nx_info *nxi,
++	struct in6_addr *ip, struct in6_addr *mask,
++	uint32_t prefix, uint16_t type, uint16_t flags,
++	struct nx_addr_v6 **prev)
++{
++	struct nx_addr_v6 *nxa = &nxi->v6;
++
++	for (; nxa; nxa = nxa->next) {
++		if (ipv6_addr_equal(&nxa->ip, ip) &&
++		    ipv6_addr_equal(&nxa->mask, mask) &&
++		    (nxa->prefix == prefix) &&
++		    (nxa->type == type) &&
++		    (nxa->flags == flags))
++		    return nxa;
++
++		/* save previous entry */
++		if (prev)
++			*prev = nxa;
++	}
++	return NULL;
++}
++
++
++int do_add_v6_addr(struct nx_info *nxi,
++	struct in6_addr *ip, struct in6_addr *mask,
++	uint32_t prefix, uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v6 *nxa = NULL;
++	struct nx_addr_v6 *new = __alloc_nx_addr_v6();
++	unsigned long irqflags;
++	int ret = -EEXIST;
++
++	if (IS_ERR(new))
++		return PTR_ERR(new);
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa))
++		goto out_unlock;
++
++	if (NX_IPV6(nxi)) {
++		nxa->next = new;
++		nxa = new;
++		new = NULL;
++	}
++
++	nxa->ip = *ip;
++	nxa->mask = *mask;
++	nxa->prefix = prefix;
++	nxa->type = type;
++	nxa->flags = flags;
++	ret = 0;
++out_unlock:
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	if (new)
++		__dealloc_nx_addr_v6(new);
++	return ret;
++}
++
++int do_remove_v6_addr(struct nx_info *nxi,
++	struct in6_addr *ip, struct in6_addr *mask,
++	uint32_t prefix, uint16_t type, uint16_t flags)
++{
++	struct nx_addr_v6 *nxa = NULL;
++	struct nx_addr_v6 *old = NULL;
++	unsigned long irqflags;
++	int ret = 0;
++
++	spin_lock_irqsave(&nxi->addr_lock, irqflags);
++	switch (type) {
++	case NXA_TYPE_ADDR:
++		old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa);
++		if (old) {
++			if (nxa) {
++				nxa->next = old->next;
++				old->next = NULL;
++			} else {
++				if (old->next) {
++					nxa = old;
++					old = old->next;
++					*nxa = *old;
++					old->next = NULL;
++				} else {
++					memset(old, 0, sizeof(*old));
++					old = NULL;
++				}
++			}
++		} else
++			ret = -ESRCH;
++		break;
++
++	case NXA_TYPE_ANY:
++		nxa = &nxi->v6;
++		old = nxa->next;
++		memset(nxa, 0, sizeof(*nxa));
++		break;
++
++	default:
++		ret = -EINVAL;
++	}
++	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
++	__dealloc_nx_addr_v6_all(old);
++	return ret;
++}
++
++int vc_net_add_ipv6(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv6_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++		memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++		/* fallthrough */
++	case NXA_TYPE_MASK:
++		return do_add_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++			vc_data.prefix, vc_data.type, vc_data.flags);
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++int vc_net_remove_ipv6(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_addr_ipv6_v1 vc_data;
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	switch (vc_data.type) {
++	case NXA_TYPE_ADDR:
++		memset(&vc_data.mask, ~0, sizeof(vc_data.mask));
++		/* fallthrough */
++	case NXA_TYPE_MASK:
++		return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask,
++			vc_data.prefix, vc_data.type, vc_data.flags);
++	case NXA_TYPE_ANY:
++		return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0);
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++#endif	/* CONFIG_IPV6 */
++
++
++int vc_get_nflags(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_flags_v0 vc_data;
++
++	vc_data.flagword = nxi->nx_flags;
++
++	/* special STATE flag handling */
++	vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_nflags(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_flags_v0 vc_data;
++	uint64_t mask, trigger;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special STATE flag handling */
++	mask = vs_mask_mask(vc_data.mask, nxi->nx_flags, NXF_ONE_TIME);
++	trigger = (mask & nxi->nx_flags) ^ (mask & vc_data.flagword);
++
++	nxi->nx_flags = vs_mask_flags(nxi->nx_flags,
++		vc_data.flagword, mask);
++	if (trigger & NXF_PERSISTENT)
++		nx_update_persistent(nxi);
++
++	return 0;
++}
++
++int vc_get_ncaps(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_caps_v0 vc_data;
++
++	vc_data.ncaps = nxi->nx_ncaps;
++	vc_data.cmask = ~0ULL;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
++int vc_set_ncaps(struct nx_info *nxi, void __user *data)
++{
++	struct vcmd_net_caps_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	nxi->nx_ncaps = vs_mask_flags(nxi->nx_ncaps,
++		vc_data.ncaps, vc_data.cmask);
++	return 0;
++}
++
++
++#include <linux/module.h>
++
++module_init(init_network);
++
++EXPORT_SYMBOL_GPL(free_nx_info);
++EXPORT_SYMBOL_GPL(unhash_nx_info);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/proc.c linux-3.7.10-vs2.3.5.6/kernel/vserver/proc.c
+--- linux-3.7.10/kernel/vserver/proc.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/proc.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,1110 @@
++/*
++ *  linux/kernel/vserver/proc.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *  V0.02  adaptation vs1.3.0
++ *  V0.03  proc permissions
++ *  V0.04  locking/generic
++ *  V0.05  next generation procfs
++ *  V0.06  inode validation
++ *  V0.07  generic rewrite vid
++ *  V0.08  remove inode type
++ *  V0.09  added u/wmask info
++ *
++ */
++
++#include <linux/proc_fs.h>
++#include <linux/fs_struct.h>
++#include <linux/mount.h>
++#include <linux/namei.h>
++#include <asm/unistd.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_cvirt.h>
++
++#include <linux/in.h>
++#include <linux/inetdevice.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
++
++#include <linux/vserver/global.h>
++
++#include "cvirt_proc.h"
++#include "cacct_proc.h"
++#include "limit_proc.h"
++#include "sched_proc.h"
++#include "vci_config.h"
++
++
++static inline char *print_cap_t(char *buffer, kernel_cap_t *c)
++{
++	unsigned __capi;
++
++	CAP_FOR_EACH_U32(__capi) {
++		buffer += sprintf(buffer, "%08x",
++			c->cap[(_KERNEL_CAPABILITY_U32S-1) - __capi]);
++	}
++	return buffer;
++}
++
++
++static struct proc_dir_entry *proc_virtual;
++
++static struct proc_dir_entry *proc_virtnet;
++
++
++/* first the actual feeds */
++
++
++static int proc_vci(char *buffer)
++{
++	return sprintf(buffer,
++		"VCIVersion:\t%04x:%04x\n"
++		"VCISyscall:\t%d\n"
++		"VCIKernel:\t%08x\n",
++		VCI_VERSION >> 16,
++		VCI_VERSION & 0xFFFF,
++		__NR_vserver,
++		vci_kernel_config());
++}
++
++static int proc_virtual_info(char *buffer)
++{
++	return proc_vci(buffer);
++}
++
++static int proc_virtual_status(char *buffer)
++{
++	return sprintf(buffer,
++		"#CTotal:\t%d\n"
++		"#CActive:\t%d\n"
++		"#NSProxy:\t%d\t%d %d %d %d %d %d\n"
++		"#InitTask:\t%d\t%d %d\n",
++		atomic_read(&vx_global_ctotal),
++		atomic_read(&vx_global_cactive),
++		atomic_read(&vs_global_nsproxy),
++		atomic_read(&vs_global_fs),
++		atomic_read(&vs_global_mnt_ns),
++		atomic_read(&vs_global_uts_ns),
++		atomic_read(&nr_ipc_ns),
++		atomic_read(&vs_global_user_ns),
++		atomic_read(&vs_global_pid_ns),
++		atomic_read(&init_task.usage),
++		atomic_read(&init_task.nsproxy->count),
++		init_task.fs->users);
++}
++
++
++int proc_vxi_info(struct vx_info *vxi, char *buffer)
++{
++	int length;
++
++	length = sprintf(buffer,
++		"ID:\t%d\n"
++		"Info:\t%p\n"
++		"Init:\t%d\n"
++		"OOM:\t%lld\n",
++		vxi->vx_id,
++		vxi,
++		vxi->vx_initpid,
++		vxi->vx_badness_bias);
++	return length;
++}
++
++int proc_vxi_status(struct vx_info *vxi, char *buffer)
++{
++	char *orig = buffer;
++
++	buffer += sprintf(buffer,
++		"UseCnt:\t%d\n"
++		"Tasks:\t%d\n"
++		"Flags:\t%016llx\n",
++		atomic_read(&vxi->vx_usecnt),
++		atomic_read(&vxi->vx_tasks),
++		(unsigned long long)vxi->vx_flags);
++
++	buffer += sprintf(buffer, "BCaps:\t");
++	buffer = print_cap_t(buffer, &vxi->vx_bcaps);
++	buffer += sprintf(buffer, "\n");
++
++	buffer += sprintf(buffer,
++		"CCaps:\t%016llx\n"
++		"Umask:\t%16llx\n"
++		"Wmask:\t%16llx\n"
++		"Spaces:\t%08lx %08lx\n",
++		(unsigned long long)vxi->vx_ccaps,
++		(unsigned long long)vxi->vx_umask,
++		(unsigned long long)vxi->vx_wmask,
++		vxi->space[0].vx_nsmask, vxi->space[1].vx_nsmask);
++	return buffer - orig;
++}
++
++int proc_vxi_limit(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_limit(&vxi->limit, buffer);
++}
++
++int proc_vxi_sched(struct vx_info *vxi, char *buffer)
++{
++	int cpu, length;
++
++	length = vx_info_proc_sched(&vxi->sched, buffer);
++	for_each_online_cpu(cpu) {
++		length += vx_info_proc_sched_pc(
++			&vx_per_cpu(vxi, sched_pc, cpu),
++			buffer + length, cpu);
++	}
++	return length;
++}
++
++int proc_vxi_nsproxy0(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_nsproxy(vxi->space[0].vx_nsproxy, buffer);
++}
++
++int proc_vxi_nsproxy1(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_nsproxy(vxi->space[1].vx_nsproxy, buffer);
++}
++
++int proc_vxi_cvirt(struct vx_info *vxi, char *buffer)
++{
++	int cpu, length;
++
++	vx_update_load(vxi);
++	length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
++	for_each_online_cpu(cpu) {
++		length += vx_info_proc_cvirt_pc(
++			&vx_per_cpu(vxi, cvirt_pc, cpu),
++			buffer + length, cpu);
++	}
++	return length;
++}
++
++int proc_vxi_cacct(struct vx_info *vxi, char *buffer)
++{
++	return vx_info_proc_cacct(&vxi->cacct, buffer);
++}
++
++
++static int proc_virtnet_info(char *buffer)
++{
++	return proc_vci(buffer);
++}
++
++static int proc_virtnet_status(char *buffer)
++{
++	return sprintf(buffer,
++		"#CTotal:\t%d\n"
++		"#CActive:\t%d\n",
++		atomic_read(&nx_global_ctotal),
++		atomic_read(&nx_global_cactive));
++}
++
++int proc_nxi_info(struct nx_info *nxi, char *buffer)
++{
++	struct nx_addr_v4 *v4a;
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 *v6a;
++#endif
++	int length, i;
++
++	length = sprintf(buffer,
++		"ID:\t%d\n"
++		"Info:\t%p\n"
++		"Bcast:\t" NIPQUAD_FMT "\n"
++		"Lback:\t" NIPQUAD_FMT "\n",
++		nxi->nx_id,
++		nxi,
++		NIPQUAD(nxi->v4_bcast.s_addr),
++		NIPQUAD(nxi->v4_lback.s_addr));
++
++	if (!NX_IPV4(nxi))
++		goto skip_v4;
++	for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++		length += sprintf(buffer + length, "%d:\t" NXAV4_FMT "\n",
++			i, NXAV4(v4a));
++skip_v4:
++#ifdef	CONFIG_IPV6
++	if (!NX_IPV6(nxi))
++		goto skip_v6;
++	for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++		length += sprintf(buffer + length, "%d:\t" NXAV6_FMT "\n",
++			i, NXAV6(v6a));
++skip_v6:
++#endif
++	return length;
++}
++
++int proc_nxi_status(struct nx_info *nxi, char *buffer)
++{
++	int length;
++
++	length = sprintf(buffer,
++		"UseCnt:\t%d\n"
++		"Tasks:\t%d\n"
++		"Flags:\t%016llx\n"
++		"NCaps:\t%016llx\n",
++		atomic_read(&nxi->nx_usecnt),
++		atomic_read(&nxi->nx_tasks),
++		(unsigned long long)nxi->nx_flags,
++		(unsigned long long)nxi->nx_ncaps);
++	return length;
++}
++
++
++
++/* here the inode helpers */
++
++struct vs_entry {
++	int len;
++	char *name;
++	mode_t mode;
++	struct inode_operations *iop;
++	struct file_operations *fop;
++	union proc_op op;
++};
++
++static struct inode *vs_proc_make_inode(struct super_block *sb, struct vs_entry *p)
++{
++	struct inode *inode = new_inode(sb);
++
++	if (!inode)
++		goto out;
++
++	inode->i_mode = p->mode;
++	if (p->iop)
++		inode->i_op = p->iop;
++	if (p->fop)
++		inode->i_fop = p->fop;
++
++	set_nlink(inode, (p->mode & S_IFDIR) ? 2 : 1);
++	inode->i_flags |= S_IMMUTABLE;
++
++	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
++
++	inode->i_uid = 0;
++	inode->i_gid = 0;
++	inode->i_tag = 0;
++out:
++	return inode;
++}
++
++static struct dentry *vs_proc_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	struct vs_entry *p = ptr;
++	struct inode *inode = vs_proc_make_inode(dir->i_sb, p);
++	struct dentry *error = ERR_PTR(-EINVAL);
++
++	if (!inode)
++		goto out;
++
++	PROC_I(inode)->op = p->op;
++	PROC_I(inode)->fd = id;
++	d_add(dentry, inode);
++	error = NULL;
++out:
++	return error;
++}
++
++/* Lookups */
++
++typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *);
++
++/*
++ * Fill a directory entry.
++ *
++ * If possible create the dcache entry and derive our inode number and
++ * file type from dcache entry.
++ *
++ * Since all of the proc inode numbers are dynamically generated, the inode
++ * numbers do not exist until the inode is cache.  This means creating the
++ * the dcache entry in readdir is necessary to keep the inode numbers
++ * reported by readdir in sync with the inode numbers reported
++ * by stat.
++ */
++static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
++	char *name, int len, instantiate_t instantiate, int id, void *ptr)
++{
++	struct dentry *child, *dir = filp->f_dentry;
++	struct inode *inode;
++	struct qstr qname;
++	ino_t ino = 0;
++	unsigned type = DT_UNKNOWN;
++
++	qname.name = name;
++	qname.len  = len;
++	qname.hash = full_name_hash(name, len);
++
++	child = d_lookup(dir, &qname);
++	if (!child) {
++		struct dentry *new;
++		new = d_alloc(dir, &qname);
++		if (new) {
++			child = instantiate(dir->d_inode, new, id, ptr);
++			if (child)
++				dput(new);
++			else
++				child = new;
++		}
++	}
++	if (!child || IS_ERR(child) || !child->d_inode)
++		goto end_instantiate;
++	inode = child->d_inode;
++	if (inode) {
++		ino = inode->i_ino;
++		type = inode->i_mode >> 12;
++	}
++	dput(child);
++end_instantiate:
++	if (!ino)
++		ino = find_inode_number(dir, &qname);
++	if (!ino)
++		ino = 1;
++	return filldir(dirent, name, len, filp->f_pos, ino, type);
++}
++
++
++
++/* get and revalidate vx_info/xid */
++
++static inline
++struct vx_info *get_proc_vx_info(struct inode *inode)
++{
++	return lookup_vx_info(PROC_I(inode)->fd);
++}
++
++static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags)
++{
++	struct inode *inode = dentry->d_inode;
++	xid_t xid = PROC_I(inode)->fd;
++
++	if (flags & LOOKUP_RCU)	/* FIXME: can be dropped? */
++		return -ECHILD;
++
++	if (!xid || xid_is_hashed(xid))
++		return 1;
++	d_drop(dentry);
++	return 0;
++}
++
++
++/* get and revalidate nx_info/nid */
++
++static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags)
++{
++	struct inode *inode = dentry->d_inode;
++	nid_t nid = PROC_I(inode)->fd;
++
++	if (flags & LOOKUP_RCU)	/* FIXME: can be dropped? */
++		return -ECHILD;
++
++	if (!nid || nid_is_hashed(nid))
++		return 1;
++	d_drop(dentry);
++	return 0;
++}
++
++
++
++#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
++
++static ssize_t proc_vs_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(PROC_I(inode)->fd);
++
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		return -ENOMEM;
++
++	BUG_ON(!PROC_I(inode)->op.proc_vs_read);
++	length = PROC_I(inode)->op.proc_vs_read((char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++	return length;
++}
++
++static ssize_t proc_vx_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	struct vx_info *vxi = NULL;
++	xid_t xid = PROC_I(inode)->fd;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(!xid);
++	vxi = lookup_vx_info(xid);
++	if (!vxi)
++		goto out;
++
++	length = -ENOMEM;
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		goto out_put;
++
++	BUG_ON(!PROC_I(inode)->op.proc_vxi_read);
++	length = PROC_I(inode)->op.proc_vxi_read(vxi, (char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++out_put:
++	put_vx_info(vxi);
++out:
++	return length;
++}
++
++static ssize_t proc_nx_info_read(struct file *file, char __user *buf,
++			  size_t count, loff_t *ppos)
++{
++	struct inode *inode = file->f_dentry->d_inode;
++	struct nx_info *nxi = NULL;
++	nid_t nid = PROC_I(inode)->fd;
++	unsigned long page;
++	ssize_t length = 0;
++
++	if (count > PROC_BLOCK_SIZE)
++		count = PROC_BLOCK_SIZE;
++
++	/* fade that out as soon as stable */
++	WARN_ON(!nid);
++	nxi = lookup_nx_info(nid);
++	if (!nxi)
++		goto out;
++
++	length = -ENOMEM;
++	if (!(page = __get_free_page(GFP_KERNEL)))
++		goto out_put;
++
++	BUG_ON(!PROC_I(inode)->op.proc_nxi_read);
++	length = PROC_I(inode)->op.proc_nxi_read(nxi, (char *)page);
++
++	if (length >= 0)
++		length = simple_read_from_buffer(buf, count, ppos,
++			(char *)page, length);
++
++	free_page(page);
++out_put:
++	put_nx_info(nxi);
++out:
++	return length;
++}
++
++
++
++/* here comes the lower level */
++
++
++#define NOD(NAME, MODE, IOP, FOP, OP) {	\
++	.len  = sizeof(NAME) - 1,	\
++	.name = (NAME),			\
++	.mode = MODE,			\
++	.iop  = IOP,			\
++	.fop  = FOP,			\
++	.op   = OP,			\
++}
++
++
++#define DIR(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFDIR | (MODE)),			\
++		&proc_ ## OTYPE ## _inode_operations,	\
++		&proc_ ## OTYPE ## _file_operations, { } )
++
++#define INF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_vs_info_file_operations,		\
++		{ .proc_vs_read = &proc_##OTYPE } )
++
++#define VINF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_vx_info_file_operations,		\
++		{ .proc_vxi_read = &proc_##OTYPE } )
++
++#define NINF(NAME, MODE, OTYPE)				\
++	NOD(NAME, (S_IFREG | (MODE)), NULL,		\
++		&proc_nx_info_file_operations,		\
++		{ .proc_nxi_read = &proc_##OTYPE } )
++
++
++static struct file_operations proc_vs_info_file_operations = {
++	.read =		proc_vs_info_read,
++};
++
++static struct file_operations proc_vx_info_file_operations = {
++	.read =		proc_vx_info_read,
++};
++
++static struct dentry_operations proc_xid_dentry_operations = {
++	.d_revalidate =	proc_xid_revalidate,
++};
++
++static struct vs_entry vx_base_stuff[] = {
++	VINF("info",	S_IRUGO, vxi_info),
++	VINF("status",	S_IRUGO, vxi_status),
++	VINF("limit",	S_IRUGO, vxi_limit),
++	VINF("sched",	S_IRUGO, vxi_sched),
++	VINF("nsproxy",	S_IRUGO, vxi_nsproxy0),
++	VINF("nsproxy1",S_IRUGO, vxi_nsproxy1),
++	VINF("cvirt",	S_IRUGO, vxi_cvirt),
++	VINF("cacct",	S_IRUGO, vxi_cacct),
++	{}
++};
++
++
++
++
++static struct dentry *proc_xid_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	dentry->d_op = &proc_xid_dentry_operations;
++	return vs_proc_instantiate(dir, dentry, id, ptr);
++}
++
++static struct dentry *proc_xid_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = vx_base_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (!p->name)
++		goto out;
++
++	error = proc_xid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
++out:
++	return error;
++}
++
++static int proc_xid_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = vx_base_stuff;
++	int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto out;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, PROC_I(inode)->fd, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 1;
++}
++
++
++
++static struct file_operations proc_nx_info_file_operations = {
++	.read =		proc_nx_info_read,
++};
++
++static struct dentry_operations proc_nid_dentry_operations = {
++	.d_revalidate =	proc_nid_revalidate,
++};
++
++static struct vs_entry nx_base_stuff[] = {
++	NINF("info",	S_IRUGO, nxi_info),
++	NINF("status",	S_IRUGO, nxi_status),
++	{}
++};
++
++
++static struct dentry *proc_nid_instantiate(struct inode *dir,
++	struct dentry *dentry, int id, void *ptr)
++{
++	dentry->d_op = &proc_nid_dentry_operations;
++	return vs_proc_instantiate(dir, dentry, id, ptr);
++}
++
++static struct dentry *proc_nid_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = nx_base_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (!p->name)
++		goto out;
++
++	error = proc_nid_instantiate(dir, dentry, PROC_I(dir)->fd, p);
++out:
++	return error;
++}
++
++static int proc_nid_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = nx_base_stuff;
++	int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto out;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, PROC_I(inode)->fd, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 1;
++}
++
++
++#define MAX_MULBY10	((~0U - 9) / 10)
++
++static inline int atovid(const char *str, int len)
++{
++	int vid, c;
++
++	vid = 0;
++	while (len-- > 0) {
++		c = *str - '0';
++		str++;
++		if (c > 9)
++			return -1;
++		if (vid >= MAX_MULBY10)
++			return -1;
++		vid *= 10;
++		vid += c;
++		if (!vid)
++			return -1;
++	}
++	return vid;
++}
++
++/* now the upper level (virtual) */
++
++
++static struct file_operations proc_xid_file_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_xid_readdir,
++};
++
++static struct inode_operations proc_xid_inode_operations = {
++	.lookup =	proc_xid_lookup,
++};
++
++static struct vs_entry vx_virtual_stuff[] = {
++	INF("info",	S_IRUGO, virtual_info),
++	INF("status",	S_IRUGO, virtual_status),
++	DIR(NULL,	S_IRUGO | S_IXUGO, xid),
++};
++
++
++static struct dentry *proc_virtual_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = vx_virtual_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++	int id = 0;
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (p->name)
++		goto instantiate;
++
++	id = atovid(dentry->d_name.name, dentry->d_name.len);
++	if ((id < 0) || !xid_is_hashed(id))
++		goto out;
++
++instantiate:
++	error = proc_xid_instantiate(dir, dentry, id, p);
++out:
++	return error;
++}
++
++static struct file_operations proc_nid_file_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_nid_readdir,
++};
++
++static struct inode_operations proc_nid_inode_operations = {
++	.lookup =	proc_nid_lookup,
++};
++
++static struct vs_entry nx_virtnet_stuff[] = {
++	INF("info",	S_IRUGO, virtnet_info),
++	INF("status",	S_IRUGO, virtnet_status),
++	DIR(NULL,	S_IRUGO | S_IXUGO, nid),
++};
++
++
++static struct dentry *proc_virtnet_lookup(struct inode *dir,
++	struct dentry *dentry, unsigned int flags)
++{
++	struct vs_entry *p = nx_virtnet_stuff;
++	struct dentry *error = ERR_PTR(-ENOENT);
++	int id = 0;
++
++	for (; p->name; p++) {
++		if (p->len != dentry->d_name.len)
++			continue;
++		if (!memcmp(dentry->d_name.name, p->name, p->len))
++			break;
++	}
++	if (p->name)
++		goto instantiate;
++
++	id = atovid(dentry->d_name.name, dentry->d_name.len);
++	if ((id < 0) || !nid_is_hashed(id))
++		goto out;
++
++instantiate:
++	error = proc_nid_instantiate(dir, dentry, id, p);
++out:
++	return error;
++}
++
++
++#define PROC_MAXVIDS 32
++
++int proc_virtual_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = vx_virtual_stuff;
++	int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	unsigned int xid_array[PROC_MAXVIDS];
++	char buf[PROC_NUMBUF];
++	unsigned int nr_xids, i;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto entries;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, 0, p))
++				goto out;
++			pos++;
++		}
++	entries:
++		index = pos - size;
++		p = &vx_virtual_stuff[size - 1];
++		nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS);
++		for (i = 0; i < nr_xids; i++) {
++			int n, xid = xid_array[i];
++			unsigned int j = PROC_NUMBUF;
++
++			n = xid;
++			do
++				buf[--j] = '0' + (n % 10);
++			while (n /= 10);
++
++			if (proc_fill_cache(filp, dirent, filldir,
++				buf + j, PROC_NUMBUF - j,
++				vs_proc_instantiate, xid, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 0;
++}
++
++static int proc_virtual_getattr(struct vfsmount *mnt,
++	struct dentry *dentry, struct kstat *stat)
++{
++	struct inode *inode = dentry->d_inode;
++
++	generic_fillattr(inode, stat);
++	stat->nlink = 2 + atomic_read(&vx_global_cactive);
++	return 0;
++}
++
++static struct file_operations proc_virtual_dir_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_virtual_readdir,
++};
++
++static struct inode_operations proc_virtual_dir_inode_operations = {
++	.getattr =	proc_virtual_getattr,
++	.lookup =	proc_virtual_lookup,
++};
++
++
++
++
++
++int proc_virtnet_readdir(struct file *filp,
++	void *dirent, filldir_t filldir)
++{
++	struct dentry *dentry = filp->f_dentry;
++	struct inode *inode = dentry->d_inode;
++	struct vs_entry *p = nx_virtnet_stuff;
++	int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry);
++	int pos, index;
++	unsigned int nid_array[PROC_MAXVIDS];
++	char buf[PROC_NUMBUF];
++	unsigned int nr_nids, i;
++	u64 ino;
++
++	pos = filp->f_pos;
++	switch (pos) {
++	case 0:
++		ino = inode->i_ino;
++		if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	case 1:
++		ino = parent_ino(dentry);
++		if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
++			goto out;
++		pos++;
++		/* fall through */
++	default:
++		index = pos - 2;
++		if (index >= size)
++			goto entries;
++		for (p += index; p->name; p++) {
++			if (proc_fill_cache(filp, dirent, filldir, p->name, p->len,
++				vs_proc_instantiate, 0, p))
++				goto out;
++			pos++;
++		}
++	entries:
++		index = pos - size;
++		p = &nx_virtnet_stuff[size - 1];
++		nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS);
++		for (i = 0; i < nr_nids; i++) {
++			int n, nid = nid_array[i];
++			unsigned int j = PROC_NUMBUF;
++
++			n = nid;
++			do
++				buf[--j] = '0' + (n % 10);
++			while (n /= 10);
++
++			if (proc_fill_cache(filp, dirent, filldir,
++				buf + j, PROC_NUMBUF - j,
++				vs_proc_instantiate, nid, p))
++				goto out;
++			pos++;
++		}
++	}
++out:
++	filp->f_pos = pos;
++	return 0;
++}
++
++static int proc_virtnet_getattr(struct vfsmount *mnt,
++	struct dentry *dentry, struct kstat *stat)
++{
++	struct inode *inode = dentry->d_inode;
++
++	generic_fillattr(inode, stat);
++	stat->nlink = 2 + atomic_read(&nx_global_cactive);
++	return 0;
++}
++
++static struct file_operations proc_virtnet_dir_operations = {
++	.read =		generic_read_dir,
++	.readdir =	proc_virtnet_readdir,
++};
++
++static struct inode_operations proc_virtnet_dir_inode_operations = {
++	.getattr =	proc_virtnet_getattr,
++	.lookup =	proc_virtnet_lookup,
++};
++
++
++
++void proc_vx_init(void)
++{
++	struct proc_dir_entry *ent;
++
++	ent = proc_mkdir("virtual", 0);
++	if (ent) {
++		ent->proc_fops = &proc_virtual_dir_operations;
++		ent->proc_iops = &proc_virtual_dir_inode_operations;
++	}
++	proc_virtual = ent;
++
++	ent = proc_mkdir("virtnet", 0);
++	if (ent) {
++		ent->proc_fops = &proc_virtnet_dir_operations;
++		ent->proc_iops = &proc_virtnet_dir_inode_operations;
++	}
++	proc_virtnet = ent;
++}
++
++
++
++
++/* per pid info */
++
++
++int proc_pid_vx_info(struct task_struct *p, char *buffer)
++{
++	struct vx_info *vxi;
++	char *orig = buffer;
++
++	buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p));
++
++	vxi = task_get_vx_info(p);
++	if (!vxi)
++		goto out;
++
++	buffer += sprintf(buffer, "BCaps:\t");
++	buffer = print_cap_t(buffer, &vxi->vx_bcaps);
++	buffer += sprintf(buffer, "\n");
++	buffer += sprintf(buffer, "CCaps:\t%016llx\n",
++		(unsigned long long)vxi->vx_ccaps);
++	buffer += sprintf(buffer, "CFlags:\t%016llx\n",
++		(unsigned long long)vxi->vx_flags);
++	buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid);
++
++	put_vx_info(vxi);
++out:
++	return buffer - orig;
++}
++
++
++int proc_pid_nx_info(struct task_struct *p, char *buffer)
++{
++	struct nx_info *nxi;
++	struct nx_addr_v4 *v4a;
++#ifdef	CONFIG_IPV6
++	struct nx_addr_v6 *v6a;
++#endif
++	char *orig = buffer;
++	int i;
++
++	buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p));
++
++	nxi = task_get_nx_info(p);
++	if (!nxi)
++		goto out;
++
++	buffer += sprintf(buffer, "NCaps:\t%016llx\n",
++		(unsigned long long)nxi->nx_ncaps);
++	buffer += sprintf(buffer, "NFlags:\t%016llx\n",
++		(unsigned long long)nxi->nx_flags);
++
++	buffer += sprintf(buffer,
++		"V4Root[bcast]:\t" NIPQUAD_FMT "\n",
++		NIPQUAD(nxi->v4_bcast.s_addr));
++	buffer += sprintf (buffer,
++		"V4Root[lback]:\t" NIPQUAD_FMT "\n",
++		NIPQUAD(nxi->v4_lback.s_addr));
++	if (!NX_IPV4(nxi))
++		goto skip_v4;
++	for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next)
++		buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n",
++			i, NXAV4(v4a));
++skip_v4:
++#ifdef	CONFIG_IPV6
++	if (!NX_IPV6(nxi))
++		goto skip_v6;
++	for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next)
++		buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n",
++			i, NXAV6(v6a));
++skip_v6:
++#endif
++	put_nx_info(nxi);
++out:
++	return buffer - orig;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sched.c linux-3.7.10-vs2.3.5.6/kernel/vserver/sched.c
+--- linux-3.7.10/kernel/vserver/sched.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sched.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,83 @@
++/*
++ *  linux/kernel/vserver/sched.c
++ *
++ *  Virtual Server: Scheduler Support
++ *
++ *  Copyright (C) 2004-2010  Herbert Pötzl
++ *
++ *  V0.01  adapted Sam Vilains version to 2.6.3
++ *  V0.02  removed legacy interface
++ *  V0.03  changed vcmds to vxi arg
++ *  V0.04  removed older and legacy interfaces
++ *  V0.05  removed scheduler code/commands
++ *
++ */
++
++#include <linux/vs_context.h>
++#include <linux/vs_sched.h>
++#include <linux/cpumask.h>
++#include <linux/vserver/sched_cmd.h>
++
++#include <asm/uaccess.h>
++
++
++void vx_update_sched_param(struct _vx_sched *sched,
++	struct _vx_sched_pc *sched_pc)
++{
++	sched_pc->prio_bias = sched->prio_bias;
++}
++
++static int do_set_prio_bias(struct vx_info *vxi, struct vcmd_prio_bias *data)
++{
++	int cpu;
++
++	if (data->prio_bias > MAX_PRIO_BIAS)
++		data->prio_bias = MAX_PRIO_BIAS;
++	if (data->prio_bias < MIN_PRIO_BIAS)
++		data->prio_bias = MIN_PRIO_BIAS;
++
++	if (data->cpu_id != ~0) {
++		vxi->sched.update = cpumask_of_cpu(data->cpu_id);
++		cpumask_and(&vxi->sched.update, &vxi->sched.update,
++			cpu_online_mask);
++	} else
++		cpumask_copy(&vxi->sched.update, cpu_online_mask);
++
++	for_each_cpu_mask(cpu, vxi->sched.update)
++		vx_update_sched_param(&vxi->sched,
++			&vx_per_cpu(vxi, sched_pc, cpu));
++	return 0;
++}
++
++int vc_set_prio_bias(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_prio_bias vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return do_set_prio_bias(vxi, &vc_data);
++}
++
++int vc_get_prio_bias(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_prio_bias vc_data;
++	struct _vx_sched_pc *pcd;
++	int cpu;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	cpu = vc_data.cpu_id;
++
++	if (!cpu_possible(cpu))
++		return -EINVAL;
++
++	pcd = &vx_per_cpu(vxi, sched_pc, cpu);
++	vc_data.prio_bias = pcd->prio_bias;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sched_init.h linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_init.h
+--- linux-3.7.10/kernel/vserver/sched_init.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_init.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,27 @@
++
++static inline void vx_info_init_sched(struct _vx_sched *sched)
++{
++	/* scheduling; hard code starting values as constants */
++	sched->prio_bias = 0;
++}
++
++static inline
++void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++	sched_pc->prio_bias = 0;
++
++	sched_pc->user_ticks = 0;
++	sched_pc->sys_ticks = 0;
++	sched_pc->hold_ticks = 0;
++}
++
++static inline void vx_info_exit_sched(struct _vx_sched *sched)
++{
++	return;
++}
++
++static inline
++void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
++{
++	return;
++}
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sched_proc.h linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_proc.h
+--- linux-3.7.10/kernel/vserver/sched_proc.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sched_proc.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,32 @@
++#ifndef _VX_SCHED_PROC_H
++#define _VX_SCHED_PROC_H
++
++
++static inline
++int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
++{
++	int length = 0;
++
++	length += sprintf(buffer,
++		"PrioBias:\t%8d\n",
++		sched->prio_bias);
++	return length;
++}
++
++static inline
++int vx_info_proc_sched_pc(struct _vx_sched_pc *sched_pc,
++	char *buffer, int cpu)
++{
++	int length = 0;
++
++	length += sprintf(buffer + length,
++		"cpu %d: %lld %lld %lld", cpu,
++		(unsigned long long)sched_pc->user_ticks,
++		(unsigned long long)sched_pc->sys_ticks,
++		(unsigned long long)sched_pc->hold_ticks);
++	length += sprintf(buffer + length,
++		" %d\n", sched_pc->prio_bias);
++	return length;
++}
++
++#endif	/* _VX_SCHED_PROC_H */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/signal.c linux-3.7.10-vs2.3.5.6/kernel/vserver/signal.c
+--- linux-3.7.10/kernel/vserver/signal.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/signal.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,134 @@
++/*
++ *  linux/kernel/vserver/signal.c
++ *
++ *  Virtual Server: Signal Support
++ *
++ *  Copyright (C) 2003-2007  Herbert Pötzl
++ *
++ *  V0.01  broken out from vcontext V0.05
++ *  V0.02  changed vcmds to vxi arg
++ *  V0.03  adjusted siginfo for kill
++ *
++ */
++
++#include <asm/uaccess.h>
++
++#include <linux/vs_context.h>
++#include <linux/vs_pid.h>
++#include <linux/vserver/signal_cmd.h>
++
++
++int vx_info_kill(struct vx_info *vxi, int pid, int sig)
++{
++	int retval, count = 0;
++	struct task_struct *p;
++	struct siginfo *sip = SEND_SIG_PRIV;
++
++	retval = -ESRCH;
++	vxdprintk(VXD_CBIT(misc, 4),
++		"vx_info_kill(%p[#%d],%d,%d)*",
++		vxi, vxi->vx_id, pid, sig);
++	read_lock(&tasklist_lock);
++	switch (pid) {
++	case  0:
++	case -1:
++		for_each_process(p) {
++			int err = 0;
++
++			if (vx_task_xid(p) != vxi->vx_id || p->pid <= 1 ||
++				(pid && vxi->vx_initpid == p->pid))
++				continue;
++
++			err = group_send_sig_info(sig, sip, p);
++			++count;
++			if (err != -EPERM)
++				retval = err;
++		}
++		break;
++
++	case 1:
++		if (vxi->vx_initpid) {
++			pid = vxi->vx_initpid;
++			/* for now, only SIGINT to private init ... */
++			if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++				/* ... as long as there are tasks left */
++				(atomic_read(&vxi->vx_tasks) > 1))
++				sig = SIGINT;
++		}
++		/* fallthrough */
++	default:
++		rcu_read_lock();
++		p = find_task_by_real_pid(pid);
++		rcu_read_unlock();
++		if (p) {
++			if (vx_task_xid(p) == vxi->vx_id)
++				retval = group_send_sig_info(sig, sip, p);
++		}
++		break;
++	}
++	read_unlock(&tasklist_lock);
++	vxdprintk(VXD_CBIT(misc, 4),
++		"vx_info_kill(%p[#%d],%d,%d,%ld) = %d",
++		vxi, vxi->vx_id, pid, sig, (long)sip, retval);
++	return retval;
++}
++
++int vc_ctx_kill(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_ctx_kill_v0 vc_data;
++
++	if (copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	/* special check to allow guest shutdown */
++	if (!vx_info_flags(vxi, VXF_STATE_ADMIN, 0) &&
++		/* forbid killall pid=0 when init is present */
++		(((vc_data.pid < 1) && vxi->vx_initpid) ||
++		(vc_data.pid > 1)))
++		return -EACCES;
++
++	return vx_info_kill(vxi, vc_data.pid, vc_data.sig);
++}
++
++
++static int __wait_exit(struct vx_info *vxi)
++{
++	DECLARE_WAITQUEUE(wait, current);
++	int ret = 0;
++
++	add_wait_queue(&vxi->vx_wait, &wait);
++	set_current_state(TASK_INTERRUPTIBLE);
++
++wait:
++	if (vx_info_state(vxi,
++		VXS_SHUTDOWN | VXS_HASHED | VXS_HELPER) == VXS_SHUTDOWN)
++		goto out;
++	if (signal_pending(current)) {
++		ret = -ERESTARTSYS;
++		goto out;
++	}
++	schedule();
++	goto wait;
++
++out:
++	set_current_state(TASK_RUNNING);
++	remove_wait_queue(&vxi->vx_wait, &wait);
++	return ret;
++}
++
++
++
++int vc_wait_exit(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_wait_exit_v0 vc_data;
++	int ret;
++
++	ret = __wait_exit(vxi);
++	vc_data.reboot_cmd = vxi->reboot_cmd;
++	vc_data.exit_code = vxi->exit_code;
++
++	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
++		ret = -EFAULT;
++	return ret;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/space.c linux-3.7.10-vs2.3.5.6/kernel/vserver/space.c
+--- linux-3.7.10/kernel/vserver/space.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/space.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,436 @@
++/*
++ *  linux/kernel/vserver/space.c
++ *
++ *  Virtual Server: Context Space Support
++ *
++ *  Copyright (C) 2003-2010  Herbert Pötzl
++ *
++ *  V0.01  broken out from context.c 0.07
++ *  V0.02  added task locking for namespace
++ *  V0.03  broken out vx_enter_namespace
++ *  V0.04  added *space support and commands
++ *  V0.05  added credential support
++ *
++ */
++
++#include <linux/utsname.h>
++#include <linux/nsproxy.h>
++#include <linux/err.h>
++#include <linux/fs_struct.h>
++#include <linux/cred.h>
++#include <asm/uaccess.h>
++
++#include <linux/vs_context.h>
++#include <linux/vserver/space.h>
++#include <linux/vserver/space_cmd.h>
++
++atomic_t vs_global_nsproxy	= ATOMIC_INIT(0);
++atomic_t vs_global_fs		= ATOMIC_INIT(0);
++atomic_t vs_global_mnt_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_uts_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_user_ns	= ATOMIC_INIT(0);
++atomic_t vs_global_pid_ns	= ATOMIC_INIT(0);
++
++
++/* namespace functions */
++
++#include <linux/mnt_namespace.h>
++#include <linux/user_namespace.h>
++#include <linux/pid_namespace.h>
++#include <linux/ipc_namespace.h>
++#include <net/net_namespace.h>
++#include "../fs/mount.h"
++
++
++static const struct vcmd_space_mask_v1 space_mask_v0 = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++		0
++};
++
++static const struct vcmd_space_mask_v1 space_mask = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++#ifdef	CONFIG_PID_NS
++		CLONE_NEWPID |
++#endif
++#ifdef	CONFIG_NET_NS
++		CLONE_NEWNET |
++#endif
++		0
++};
++
++static const struct vcmd_space_mask_v1 default_space_mask = {
++	.mask = CLONE_FS |
++		CLONE_NEWNS |
++#ifdef	CONFIG_UTS_NS
++		CLONE_NEWUTS |
++#endif
++#ifdef	CONFIG_IPC_NS
++		CLONE_NEWIPC |
++#endif
++#ifdef	CONFIG_USER_NS
++		CLONE_NEWUSER |
++#endif
++#ifdef	CONFIG_PID_NS
++//		CLONE_NEWPID |
++#endif
++		0
++};
++
++/*
++ *	build a new nsproxy mix
++ *      assumes that both proxies are 'const'
++ *	does not touch nsproxy refcounts
++ *	will hold a reference on the result.
++ */
++
++struct nsproxy *vs_mix_nsproxy(struct nsproxy *old_nsproxy,
++	struct nsproxy *new_nsproxy, unsigned long mask)
++{
++	struct mnt_namespace *old_ns;
++	struct uts_namespace *old_uts;
++	struct ipc_namespace *old_ipc;
++#ifdef	CONFIG_PID_NS
++	struct pid_namespace *old_pid;
++#endif
++#ifdef	CONFIG_NET_NS
++	struct net *old_net;
++#endif
++	struct nsproxy *nsproxy;
++
++	nsproxy = copy_nsproxy(old_nsproxy);
++	if (!nsproxy)
++		goto out;
++
++	if (mask & CLONE_NEWNS) {
++		old_ns = nsproxy->mnt_ns;
++		nsproxy->mnt_ns = new_nsproxy->mnt_ns;
++		if (nsproxy->mnt_ns)
++			get_mnt_ns(nsproxy->mnt_ns);
++	} else
++		old_ns = NULL;
++
++	if (mask & CLONE_NEWUTS) {
++		old_uts = nsproxy->uts_ns;
++		nsproxy->uts_ns = new_nsproxy->uts_ns;
++		if (nsproxy->uts_ns)
++			get_uts_ns(nsproxy->uts_ns);
++	} else
++		old_uts = NULL;
++
++	if (mask & CLONE_NEWIPC) {
++		old_ipc = nsproxy->ipc_ns;
++		nsproxy->ipc_ns = new_nsproxy->ipc_ns;
++		if (nsproxy->ipc_ns)
++			get_ipc_ns(nsproxy->ipc_ns);
++	} else
++		old_ipc = NULL;
++
++#ifdef	CONFIG_PID_NS
++	if (mask & CLONE_NEWPID) {
++		old_pid = nsproxy->pid_ns;
++		nsproxy->pid_ns = new_nsproxy->pid_ns;
++		if (nsproxy->pid_ns)
++			get_pid_ns(nsproxy->pid_ns);
++	} else
++		old_pid = NULL;
++#endif
++#ifdef	CONFIG_NET_NS
++	if (mask & CLONE_NEWNET) {
++		old_net = nsproxy->net_ns;
++		nsproxy->net_ns = new_nsproxy->net_ns;
++		if (nsproxy->net_ns)
++			get_net(nsproxy->net_ns);
++	} else
++		old_net = NULL;
++#endif
++	if (old_ns)
++		put_mnt_ns(old_ns);
++	if (old_uts)
++		put_uts_ns(old_uts);
++	if (old_ipc)
++		put_ipc_ns(old_ipc);
++#ifdef	CONFIG_PID_NS
++	if (old_pid)
++		put_pid_ns(old_pid);
++#endif
++#ifdef	CONFIG_NET_NS
++	if (old_net)
++		put_net(old_net);
++#endif
++out:
++	return nsproxy;
++}
++
++
++/*
++ *	merge two nsproxy structs into a new one.
++ *	will hold a reference on the result.
++ */
++
++static inline
++struct nsproxy *__vs_merge_nsproxy(struct nsproxy *old,
++	struct nsproxy *proxy, unsigned long mask)
++{
++	struct nsproxy null_proxy = { .mnt_ns = NULL };
++
++	if (!proxy)
++		return NULL;
++
++	if (mask) {
++		/* vs_mix_nsproxy returns with reference */
++		return vs_mix_nsproxy(old ? old : &null_proxy,
++			proxy, mask);
++	}
++	get_nsproxy(proxy);
++	return proxy;
++}
++
++
++int vx_enter_space(struct vx_info *vxi, unsigned long mask, unsigned index)
++{
++	struct nsproxy *proxy, *proxy_cur, *proxy_new;
++	struct fs_struct *fs_cur, *fs = NULL;
++	struct _vx_space *space;
++	int ret, kill = 0;
++
++	vxdprintk(VXD_CBIT(space, 8), "vx_enter_space(%p[#%u],0x%08lx,%d)",
++		vxi, vxi->vx_id, mask, index);
++
++	if (vx_info_flags(vxi, VXF_INFO_PRIVATE, 0))
++		return -EACCES;
++
++	if (index >= VX_SPACES)
++		return -EINVAL;
++
++	space = &vxi->space[index];
++
++	if (!mask)
++		mask = space->vx_nsmask;
++
++	if ((mask & space->vx_nsmask) != mask)
++		return -EINVAL;
++
++	if (mask & CLONE_FS) {
++		fs = copy_fs_struct(space->vx_fs);
++		if (!fs)
++			return -ENOMEM;
++	}
++	proxy = space->vx_nsproxy;
++
++	vxdprintk(VXD_CBIT(space, 9),
++		"vx_enter_space(%p[#%u],0x%08lx,%d) -> (%p,%p)",
++		vxi, vxi->vx_id, mask, index, proxy, fs);
++
++	task_lock(current);
++	fs_cur = current->fs;
++
++	if (mask & CLONE_FS) {
++		spin_lock(&fs_cur->lock);
++		current->fs = fs;
++		kill = !--fs_cur->users;
++		spin_unlock(&fs_cur->lock);
++	}
++
++	proxy_cur = current->nsproxy;
++	get_nsproxy(proxy_cur);
++	task_unlock(current);
++
++	if (kill)
++		free_fs_struct(fs_cur);
++
++	proxy_new = __vs_merge_nsproxy(proxy_cur, proxy, mask);
++	if (IS_ERR(proxy_new)) {
++		ret = PTR_ERR(proxy_new);
++		goto out_put;
++	}
++
++	proxy_new = xchg(&current->nsproxy, proxy_new);
++
++	if (mask & CLONE_NEWUSER) {
++		struct cred *cred;
++
++		vxdprintk(VXD_CBIT(space, 10),
++			"vx_enter_space(%p[#%u],%p) cred (%p,%p)",
++			vxi, vxi->vx_id, space->vx_cred,
++			current->real_cred, current->cred);
++
++		if (space->vx_cred) {
++			cred = __prepare_creds(space->vx_cred);
++			if (cred)
++				commit_creds(cred);
++		}
++	}
++
++	ret = 0;
++
++	if (proxy_new)
++		put_nsproxy(proxy_new);
++out_put:
++	if (proxy_cur)
++		put_nsproxy(proxy_cur);
++	return ret;
++}
++
++
++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index)
++{
++	struct nsproxy *proxy_vxi, *proxy_cur, *proxy_new;
++	struct fs_struct *fs_vxi, *fs = NULL;
++	struct _vx_space *space;
++	int ret, kill = 0;
++
++	vxdprintk(VXD_CBIT(space, 8), "vx_set_space(%p[#%u],0x%08lx,%d)",
++		vxi, vxi->vx_id, mask, index);
++
++	if ((mask & space_mask.mask) != mask)
++		return -EINVAL;
++
++	if (index >= VX_SPACES)
++		return -EINVAL;
++
++	space = &vxi->space[index];
++
++	proxy_vxi = space->vx_nsproxy;
++	fs_vxi = space->vx_fs;
++
++	if (mask & CLONE_FS) {
++		fs = copy_fs_struct(current->fs);
++		if (!fs)
++			return -ENOMEM;
++	}
++
++	task_lock(current);
++
++	if (mask & CLONE_FS) {
++		spin_lock(&fs_vxi->lock);
++		space->vx_fs = fs;
++		kill = !--fs_vxi->users;
++		spin_unlock(&fs_vxi->lock);
++	}
++
++	proxy_cur = current->nsproxy;
++	get_nsproxy(proxy_cur);
++	task_unlock(current);
++
++	if (kill)
++		free_fs_struct(fs_vxi);
++
++	proxy_new = __vs_merge_nsproxy(proxy_vxi, proxy_cur, mask);
++	if (IS_ERR(proxy_new)) {
++		ret = PTR_ERR(proxy_new);
++		goto out_put;
++	}
++
++	proxy_new = xchg(&space->vx_nsproxy, proxy_new);
++	space->vx_nsmask |= mask;
++
++	if (mask & CLONE_NEWUSER) {
++		struct cred *cred;
++
++		vxdprintk(VXD_CBIT(space, 10),
++			"vx_set_space(%p[#%u],%p) cred (%p,%p)",
++			vxi, vxi->vx_id, space->vx_cred,
++			current->real_cred, current->cred);
++
++		cred = prepare_creds();
++		cred = (struct cred *)xchg(&space->vx_cred, cred);
++		if (cred)
++			abort_creds(cred);
++	}
++
++	ret = 0;
++
++	if (proxy_new)
++		put_nsproxy(proxy_new);
++out_put:
++	if (proxy_cur)
++		put_nsproxy(proxy_cur);
++	return ret;
++}
++
++
++int vc_enter_space_v1(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return vx_enter_space(vxi, vc_data.mask, 0);
++}
++
++int vc_enter_space(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if (vc_data.index >= VX_SPACES)
++		return -EINVAL;
++
++	return vx_enter_space(vxi, vc_data.mask, vc_data.index);
++}
++
++int vc_set_space_v1(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v1 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	return vx_set_space(vxi, vc_data.mask, 0);
++}
++
++int vc_set_space(struct vx_info *vxi, void __user *data)
++{
++	struct vcmd_space_mask_v2 vc_data = { .mask = 0 };
++
++	if (data && copy_from_user(&vc_data, data, sizeof(vc_data)))
++		return -EFAULT;
++
++	if (vc_data.index >= VX_SPACES)
++		return -EINVAL;
++
++	return vx_set_space(vxi, vc_data.mask, vc_data.index);
++}
++
++int vc_get_space_mask(void __user *data, int type)
++{
++	const struct vcmd_space_mask_v1 *mask;
++
++	if (type == 0)
++		mask = &space_mask_v0;
++	else if (type == 1)
++		mask = &space_mask;
++	else
++		mask = &default_space_mask;
++
++	vxdprintk(VXD_CBIT(space, 10),
++		"vc_get_space_mask(%d) = %08llx", type, mask->mask);
++
++	if (copy_to_user(data, mask, sizeof(*mask)))
++		return -EFAULT;
++	return 0;
++}
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/switch.c linux-3.7.10-vs2.3.5.6/kernel/vserver/switch.c
+--- linux-3.7.10/kernel/vserver/switch.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/switch.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,556 @@
++/*
++ *  linux/kernel/vserver/switch.c
++ *
++ *  Virtual Server: Syscall Switch
++ *
++ *  Copyright (C) 2003-2011  Herbert Pötzl
++ *
++ *  V0.01  syscall switch
++ *  V0.02  added signal to context
++ *  V0.03  added rlimit functions
++ *  V0.04  added iattr, task/xid functions
++ *  V0.05  added debug/history stuff
++ *  V0.06  added compat32 layer
++ *  V0.07  vcmd args and perms
++ *  V0.08  added status commands
++ *  V0.09  added tag commands
++ *  V0.10  added oom bias
++ *  V0.11  added device commands
++ *  V0.12  added warn mask
++ *
++ */
++
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vserver/switch.h>
++
++#include "vci_config.h"
++
++
++static inline
++int vc_get_version(uint32_t id)
++{
++	return VCI_VERSION;
++}
++
++static inline
++int vc_get_vci(uint32_t id)
++{
++	return vci_kernel_config();
++}
++
++#include <linux/vserver/context_cmd.h>
++#include <linux/vserver/cvirt_cmd.h>
++#include <linux/vserver/cacct_cmd.h>
++#include <linux/vserver/limit_cmd.h>
++#include <linux/vserver/network_cmd.h>
++#include <linux/vserver/sched_cmd.h>
++#include <linux/vserver/debug_cmd.h>
++#include <linux/vserver/inode_cmd.h>
++#include <linux/vserver/dlimit_cmd.h>
++#include <linux/vserver/signal_cmd.h>
++#include <linux/vserver/space_cmd.h>
++#include <linux/vserver/tag_cmd.h>
++#include <linux/vserver/device_cmd.h>
++
++#include <linux/vserver/inode.h>
++#include <linux/vserver/dlimit.h>
++
++
++#ifdef	CONFIG_COMPAT
++#define __COMPAT(name, id, data, compat)	\
++	(compat) ? name ## _x32(id, data) : name(id, data)
++#define __COMPAT_NO_ID(name, data, compat)	\
++	(compat) ? name ## _x32(data) : name(data)
++#else
++#define __COMPAT(name, id, data, compat)	\
++	name(id, data)
++#define __COMPAT_NO_ID(name, data, compat)	\
++	name(data)
++#endif
++
++
++static inline
++long do_vcmd(uint32_t cmd, uint32_t id,
++	struct vx_info *vxi, struct nx_info *nxi,
++	void __user *data, int compat)
++{
++	switch (cmd) {
++
++	case VCMD_get_version:
++		return vc_get_version(id);
++	case VCMD_get_vci:
++		return vc_get_vci(id);
++
++	case VCMD_task_xid:
++		return vc_task_xid(id);
++	case VCMD_vx_info:
++		return vc_vx_info(vxi, data);
++
++	case VCMD_task_nid:
++		return vc_task_nid(id);
++	case VCMD_nx_info:
++		return vc_nx_info(nxi, data);
++
++	case VCMD_task_tag:
++		return vc_task_tag(id);
++
++	case VCMD_set_space_v1:
++		return vc_set_space_v1(vxi, data);
++	/* this is version 2 */
++	case VCMD_set_space:
++		return vc_set_space(vxi, data);
++
++	case VCMD_get_space_mask_v0:
++		return vc_get_space_mask(data, 0);
++	/* this is version 1 */
++	case VCMD_get_space_mask:
++		return vc_get_space_mask(data, 1);
++
++	case VCMD_get_space_default:
++		return vc_get_space_mask(data, -1);
++
++	case VCMD_set_umask:
++		return vc_set_umask(vxi, data);
++
++	case VCMD_get_umask:
++		return vc_get_umask(vxi, data);
++
++	case VCMD_set_wmask:
++		return vc_set_wmask(vxi, data);
++
++	case VCMD_get_wmask:
++		return vc_get_wmask(vxi, data);
++#ifdef	CONFIG_IA32_EMULATION
++	case VCMD_get_rlimit:
++		return __COMPAT(vc_get_rlimit, vxi, data, compat);
++	case VCMD_set_rlimit:
++		return __COMPAT(vc_set_rlimit, vxi, data, compat);
++#else
++	case VCMD_get_rlimit:
++		return vc_get_rlimit(vxi, data);
++	case VCMD_set_rlimit:
++		return vc_set_rlimit(vxi, data);
++#endif
++	case VCMD_get_rlimit_mask:
++		return vc_get_rlimit_mask(id, data);
++	case VCMD_reset_hits:
++		return vc_reset_hits(vxi, data);
++	case VCMD_reset_minmax:
++		return vc_reset_minmax(vxi, data);
++
++	case VCMD_get_vhi_name:
++		return vc_get_vhi_name(vxi, data);
++	case VCMD_set_vhi_name:
++		return vc_set_vhi_name(vxi, data);
++
++	case VCMD_ctx_stat:
++		return vc_ctx_stat(vxi, data);
++	case VCMD_virt_stat:
++		return vc_virt_stat(vxi, data);
++	case VCMD_sock_stat:
++		return vc_sock_stat(vxi, data);
++	case VCMD_rlimit_stat:
++		return vc_rlimit_stat(vxi, data);
++
++	case VCMD_set_cflags:
++		return vc_set_cflags(vxi, data);
++	case VCMD_get_cflags:
++		return vc_get_cflags(vxi, data);
++
++	/* this is version 1 */
++	case VCMD_set_ccaps:
++		return vc_set_ccaps(vxi, data);
++	/* this is version 1 */
++	case VCMD_get_ccaps:
++		return vc_get_ccaps(vxi, data);
++	case VCMD_set_bcaps:
++		return vc_set_bcaps(vxi, data);
++	case VCMD_get_bcaps:
++		return vc_get_bcaps(vxi, data);
++
++	case VCMD_set_badness:
++		return vc_set_badness(vxi, data);
++	case VCMD_get_badness:
++		return vc_get_badness(vxi, data);
++
++	case VCMD_set_nflags:
++		return vc_set_nflags(nxi, data);
++	case VCMD_get_nflags:
++		return vc_get_nflags(nxi, data);
++
++	case VCMD_set_ncaps:
++		return vc_set_ncaps(nxi, data);
++	case VCMD_get_ncaps:
++		return vc_get_ncaps(nxi, data);
++
++	case VCMD_set_prio_bias:
++		return vc_set_prio_bias(vxi, data);
++	case VCMD_get_prio_bias:
++		return vc_get_prio_bias(vxi, data);
++	case VCMD_add_dlimit:
++		return __COMPAT(vc_add_dlimit, id, data, compat);
++	case VCMD_rem_dlimit:
++		return __COMPAT(vc_rem_dlimit, id, data, compat);
++	case VCMD_set_dlimit:
++		return __COMPAT(vc_set_dlimit, id, data, compat);
++	case VCMD_get_dlimit:
++		return __COMPAT(vc_get_dlimit, id, data, compat);
++
++	case VCMD_ctx_kill:
++		return vc_ctx_kill(vxi, data);
++
++	case VCMD_wait_exit:
++		return vc_wait_exit(vxi, data);
++
++	case VCMD_get_iattr:
++		return __COMPAT_NO_ID(vc_get_iattr, data, compat);
++	case VCMD_set_iattr:
++		return __COMPAT_NO_ID(vc_set_iattr, data, compat);
++
++	case VCMD_fget_iattr:
++		return vc_fget_iattr(id, data);
++	case VCMD_fset_iattr:
++		return vc_fset_iattr(id, data);
++
++	case VCMD_enter_space_v0:
++		return vc_enter_space_v1(vxi, NULL);
++	case VCMD_enter_space_v1:
++		return vc_enter_space_v1(vxi, data);
++	/* this is version 2 */
++	case VCMD_enter_space:
++		return vc_enter_space(vxi, data);
++
++	case VCMD_ctx_create_v0:
++		return vc_ctx_create(id, NULL);
++	case VCMD_ctx_create:
++		return vc_ctx_create(id, data);
++	case VCMD_ctx_migrate_v0:
++		return vc_ctx_migrate(vxi, NULL);
++	case VCMD_ctx_migrate:
++		return vc_ctx_migrate(vxi, data);
++
++	case VCMD_net_create_v0:
++		return vc_net_create(id, NULL);
++	case VCMD_net_create:
++		return vc_net_create(id, data);
++	case VCMD_net_migrate:
++		return vc_net_migrate(nxi, data);
++
++	case VCMD_tag_migrate:
++		return vc_tag_migrate(id);
++
++	case VCMD_net_add:
++		return vc_net_add(nxi, data);
++	case VCMD_net_remove:
++		return vc_net_remove(nxi, data);
++
++	case VCMD_net_add_ipv4_v1:
++		return vc_net_add_ipv4_v1(nxi, data);
++	/* this is version 2 */
++	case VCMD_net_add_ipv4:
++		return vc_net_add_ipv4(nxi, data);
++
++	case VCMD_net_rem_ipv4_v1:
++		return vc_net_rem_ipv4_v1(nxi, data);
++	/* this is version 2 */
++	case VCMD_net_rem_ipv4:
++		return vc_net_rem_ipv4(nxi, data);
++#ifdef	CONFIG_IPV6
++	case VCMD_net_add_ipv6:
++		return vc_net_add_ipv6(nxi, data);
++	case VCMD_net_remove_ipv6:
++		return vc_net_remove_ipv6(nxi, data);
++#endif
++/*	case VCMD_add_match_ipv4:
++		return vc_add_match_ipv4(nxi, data);
++	case VCMD_get_match_ipv4:
++		return vc_get_match_ipv4(nxi, data);
++#ifdef	CONFIG_IPV6
++	case VCMD_add_match_ipv6:
++		return vc_add_match_ipv6(nxi, data);
++	case VCMD_get_match_ipv6:
++		return vc_get_match_ipv6(nxi, data);
++#endif	*/
++
++#ifdef	CONFIG_VSERVER_DEVICE
++	case VCMD_set_mapping:
++		return __COMPAT(vc_set_mapping, vxi, data, compat);
++	case VCMD_unset_mapping:
++		return __COMPAT(vc_unset_mapping, vxi, data, compat);
++#endif
++#ifdef	CONFIG_VSERVER_HISTORY
++	case VCMD_dump_history:
++		return vc_dump_history(id);
++	case VCMD_read_history:
++		return __COMPAT(vc_read_history, id, data, compat);
++#endif
++	default:
++		vxwprintk_task(1, "unimplemented VCMD_%02d_%d[%d]",
++			VC_CATEGORY(cmd), VC_COMMAND(cmd), VC_VERSION(cmd));
++	}
++	return -ENOSYS;
++}
++
++
++#define	__VCMD(vcmd, _perm, _args, _flags)		\
++	case VCMD_ ## vcmd: perm = _perm;		\
++		args = _args; flags = _flags; break
++
++
++#define VCA_NONE	0x00
++#define VCA_VXI		0x01
++#define VCA_NXI		0x02
++
++#define VCF_NONE	0x00
++#define VCF_INFO	0x01
++#define VCF_ADMIN	0x02
++#define VCF_ARES	0x06	/* includes admin */
++#define VCF_SETUP	0x08
++
++#define VCF_ZIDOK	0x10	/* zero id okay */
++
++
++static inline
++long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
++{
++	long ret;
++	int permit = -1, state = 0;
++	int perm = -1, args = 0, flags = 0;
++	struct vx_info *vxi = NULL;
++	struct nx_info *nxi = NULL;
++
++	switch (cmd) {
++	/* unpriviledged commands */
++	__VCMD(get_version,	 0, VCA_NONE,	0);
++	__VCMD(get_vci,		 0, VCA_NONE,	0);
++	__VCMD(get_rlimit_mask,	 0, VCA_NONE,	0);
++	__VCMD(get_space_mask_v0,0, VCA_NONE,   0);
++	__VCMD(get_space_mask,	 0, VCA_NONE,   0);
++	__VCMD(get_space_default,0, VCA_NONE,   0);
++
++	/* info commands */
++	__VCMD(task_xid,	 2, VCA_NONE,	0);
++	__VCMD(reset_hits,	 2, VCA_VXI,	0);
++	__VCMD(reset_minmax,	 2, VCA_VXI,	0);
++	__VCMD(vx_info,		 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_bcaps,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_ccaps,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_cflags,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_umask,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_wmask,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_badness,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_vhi_name,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(get_rlimit,	 3, VCA_VXI,	VCF_INFO);
++
++	__VCMD(ctx_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(virt_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(sock_stat,	 3, VCA_VXI,	VCF_INFO);
++	__VCMD(rlimit_stat,	 3, VCA_VXI,	VCF_INFO);
++
++	__VCMD(task_nid,	 2, VCA_NONE,	0);
++	__VCMD(nx_info,		 3, VCA_NXI,	VCF_INFO);
++	__VCMD(get_ncaps,	 3, VCA_NXI,	VCF_INFO);
++	__VCMD(get_nflags,	 3, VCA_NXI,	VCF_INFO);
++
++	__VCMD(task_tag,	 2, VCA_NONE,	0);
++
++	__VCMD(get_iattr,	 2, VCA_NONE,	0);
++	__VCMD(fget_iattr,	 2, VCA_NONE,	0);
++	__VCMD(get_dlimit,	 3, VCA_NONE,	VCF_INFO);
++	__VCMD(get_prio_bias,	 3, VCA_VXI,	VCF_INFO);
++
++	/* lower admin commands */
++	__VCMD(wait_exit,	 4, VCA_VXI,	VCF_INFO);
++	__VCMD(ctx_create_v0,	 5, VCA_NONE,	0);
++	__VCMD(ctx_create,	 5, VCA_NONE,	0);
++	__VCMD(ctx_migrate_v0,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(ctx_migrate,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space_v0,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space_v1,	 5, VCA_VXI,	VCF_ADMIN);
++	__VCMD(enter_space,	 5, VCA_VXI,	VCF_ADMIN);
++
++	__VCMD(net_create_v0,	 5, VCA_NONE,	0);
++	__VCMD(net_create,	 5, VCA_NONE,	0);
++	__VCMD(net_migrate,	 5, VCA_NXI,	VCF_ADMIN);
++
++	__VCMD(tag_migrate,	 5, VCA_NONE,	VCF_ADMIN);
++
++	/* higher admin commands */
++	__VCMD(ctx_kill,	 6, VCA_VXI,	VCF_ARES);
++	__VCMD(set_space_v1,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_space,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_ccaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_bcaps,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_cflags,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_umask,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_wmask,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_badness,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_vhi_name,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_rlimit,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_prio_bias,	 7, VCA_VXI,	VCF_ARES | VCF_SETUP);
++
++	__VCMD(set_ncaps,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(set_nflags,	 7, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add,		 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_remove,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add_ipv4_v1,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_rem_ipv4_v1,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_add_ipv4,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_rem_ipv4,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++#ifdef	CONFIG_IPV6
++	__VCMD(net_add_ipv6,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++	__VCMD(net_remove_ipv6,	 8, VCA_NXI,	VCF_ARES | VCF_SETUP);
++#endif
++	__VCMD(set_iattr,	 7, VCA_NONE,	0);
++	__VCMD(fset_iattr,	 7, VCA_NONE,	0);
++	__VCMD(set_dlimit,	 7, VCA_NONE,	VCF_ARES);
++	__VCMD(add_dlimit,	 8, VCA_NONE,	VCF_ARES);
++	__VCMD(rem_dlimit,	 8, VCA_NONE,	VCF_ARES);
++
++#ifdef	CONFIG_VSERVER_DEVICE
++	__VCMD(set_mapping,	 8, VCA_VXI,    VCF_ARES|VCF_ZIDOK);
++	__VCMD(unset_mapping,	 8, VCA_VXI,	VCF_ARES|VCF_ZIDOK);
++#endif
++	/* debug level admin commands */
++#ifdef	CONFIG_VSERVER_HISTORY
++	__VCMD(dump_history,	 9, VCA_NONE,	0);
++	__VCMD(read_history,	 9, VCA_NONE,	0);
++#endif
++
++	default:
++		perm = -1;
++	}
++
++	vxdprintk(VXD_CBIT(switch, 0),
++		"vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]",
++		VC_CATEGORY(cmd), VC_COMMAND(cmd),
++		VC_VERSION(cmd), id, data, compat,
++		perm, args, flags);
++
++	ret = -ENOSYS;
++	if (perm < 0)
++		goto out;
++
++	state = 1;
++	if (!capable(CAP_CONTEXT))
++		goto out;
++
++	state = 2;
++	/* moved here from the individual commands */
++	ret = -EPERM;
++	if ((perm > 1) && !capable(CAP_SYS_ADMIN))
++		goto out;
++
++	state = 3;
++	/* vcmd involves resource management  */
++	ret = -EPERM;
++	if ((flags & VCF_ARES) && !capable(CAP_SYS_RESOURCE))
++		goto out;
++
++	state = 4;
++	/* various legacy exceptions */
++	switch (cmd) {
++	/* will go away when spectator is a cap */
++	case VCMD_ctx_migrate_v0:
++	case VCMD_ctx_migrate:
++		if (id == 1) {
++			current->xid = 1;
++			ret = 1;
++			goto out;
++		}
++		break;
++
++	/* will go away when spectator is a cap */
++	case VCMD_net_migrate:
++		if (id == 1) {
++			current->nid = 1;
++			ret = 1;
++			goto out;
++		}
++		break;
++	}
++
++	/* vcmds are fine by default */
++	permit = 1;
++
++	/* admin type vcmds require admin ... */
++	if (flags & VCF_ADMIN)
++		permit = vx_check(0, VS_ADMIN) ? 1 : 0;
++
++	/* ... but setup type vcmds override that */
++	if (!permit && (flags & VCF_SETUP))
++		permit = vx_flags(VXF_STATE_SETUP, 0) ? 2 : 0;
++
++	state = 5;
++	ret = -EPERM;
++	if (!permit)
++		goto out;
++
++	state = 6;
++	if (!id && (flags & VCF_ZIDOK))
++		goto skip_id;
++
++	ret = -ESRCH;
++	if (args & VCA_VXI) {
++		vxi = lookup_vx_info(id);
++		if (!vxi)
++			goto out;
++
++		if ((flags & VCF_ADMIN) &&
++			/* special case kill for shutdown */
++			(cmd != VCMD_ctx_kill) &&
++			/* can context be administrated? */
++			!vx_info_flags(vxi, VXF_STATE_ADMIN, 0)) {
++			ret = -EACCES;
++			goto out_vxi;
++		}
++	}
++	state = 7;
++	if (args & VCA_NXI) {
++		nxi = lookup_nx_info(id);
++		if (!nxi)
++			goto out_vxi;
++
++		if ((flags & VCF_ADMIN) &&
++			/* can context be administrated? */
++			!nx_info_flags(nxi, NXF_STATE_ADMIN, 0)) {
++			ret = -EACCES;
++			goto out_nxi;
++		}
++	}
++skip_id:
++	state = 8;
++	ret = do_vcmd(cmd, id, vxi, nxi, data, compat);
++
++out_nxi:
++	if ((args & VCA_NXI) && nxi)
++		put_nx_info(nxi);
++out_vxi:
++	if ((args & VCA_VXI) && vxi)
++		put_vx_info(vxi);
++out:
++	vxdprintk(VXD_CBIT(switch, 1),
++		"vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]",
++		VC_CATEGORY(cmd), VC_COMMAND(cmd),
++		VC_VERSION(cmd), ret, ret, state, permit);
++	return ret;
++}
++
++asmlinkage long
++sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
++{
++	return do_vserver(cmd, id, data, 0);
++}
++
++#ifdef	CONFIG_COMPAT
++
++asmlinkage long
++sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
++{
++	return do_vserver(cmd, id, data, 1);
++}
++
++#endif	/* CONFIG_COMPAT */
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/sysctl.c linux-3.7.10-vs2.3.5.6/kernel/vserver/sysctl.c
+--- linux-3.7.10/kernel/vserver/sysctl.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/sysctl.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,247 @@
++/*
++ *  kernel/vserver/sysctl.c
++ *
++ *  Virtual Context Support
++ *
++ *  Copyright (C) 2004-2007  Herbert Pötzl
++ *
++ *  V0.01  basic structure
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/ctype.h>
++#include <linux/sysctl.h>
++#include <linux/parser.h>
++#include <asm/uaccess.h>
++
++enum {
++	CTL_DEBUG_ERROR		= 0,
++	CTL_DEBUG_SWITCH	= 1,
++	CTL_DEBUG_XID,
++	CTL_DEBUG_NID,
++	CTL_DEBUG_TAG,
++	CTL_DEBUG_NET,
++	CTL_DEBUG_LIMIT,
++	CTL_DEBUG_CRES,
++	CTL_DEBUG_DLIM,
++	CTL_DEBUG_QUOTA,
++	CTL_DEBUG_CVIRT,
++	CTL_DEBUG_SPACE,
++	CTL_DEBUG_PERM,
++	CTL_DEBUG_MISC,
++};
++
++
++unsigned int vs_debug_switch	= 0;
++unsigned int vs_debug_xid	= 0;
++unsigned int vs_debug_nid	= 0;
++unsigned int vs_debug_tag	= 0;
++unsigned int vs_debug_net	= 0;
++unsigned int vs_debug_limit	= 0;
++unsigned int vs_debug_cres	= 0;
++unsigned int vs_debug_dlim	= 0;
++unsigned int vs_debug_quota	= 0;
++unsigned int vs_debug_cvirt	= 0;
++unsigned int vs_debug_space	= 0;
++unsigned int vs_debug_perm	= 0;
++unsigned int vs_debug_misc	= 0;
++
++
++static struct ctl_table_header *vserver_table_header;
++static ctl_table vserver_root_table[];
++
++
++void vserver_register_sysctl(void)
++{
++	if (!vserver_table_header) {
++		vserver_table_header = register_sysctl_table(vserver_root_table);
++	}
++
++}
++
++void vserver_unregister_sysctl(void)
++{
++	if (vserver_table_header) {
++		unregister_sysctl_table(vserver_table_header);
++		vserver_table_header = NULL;
++	}
++}
++
++
++static int proc_dodebug(ctl_table *table, int write,
++	void __user *buffer, size_t *lenp, loff_t *ppos)
++{
++	char		tmpbuf[20], *p, c;
++	unsigned int	value;
++	size_t		left, len;
++
++	if ((*ppos && !write) || !*lenp) {
++		*lenp = 0;
++		return 0;
++	}
++
++	left = *lenp;
++
++	if (write) {
++		if (!access_ok(VERIFY_READ, buffer, left))
++			return -EFAULT;
++		p = (char *)buffer;
++		while (left && __get_user(c, p) >= 0 && isspace(c))
++			left--, p++;
++		if (!left)
++			goto done;
++
++		if (left > sizeof(tmpbuf) - 1)
++			return -EINVAL;
++		if (copy_from_user(tmpbuf, p, left))
++			return -EFAULT;
++		tmpbuf[left] = '\0';
++
++		for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--)
++			value = 10 * value + (*p - '0');
++		if (*p && !isspace(*p))
++			return -EINVAL;
++		while (left && isspace(*p))
++			left--, p++;
++		*(unsigned int *)table->data = value;
++	} else {
++		if (!access_ok(VERIFY_WRITE, buffer, left))
++			return -EFAULT;
++		len = sprintf(tmpbuf, "%d", *(unsigned int *)table->data);
++		if (len > left)
++			len = left;
++		if (__copy_to_user(buffer, tmpbuf, len))
++			return -EFAULT;
++		if ((left -= len) > 0) {
++			if (put_user('\n', (char *)buffer + len))
++				return -EFAULT;
++			left--;
++		}
++	}
++
++done:
++	*lenp -= left;
++	*ppos += *lenp;
++	return 0;
++}
++
++static int zero;
++
++#define	CTL_ENTRY(ctl, name)				\
++	{						\
++		.procname	= #name,		\
++		.data		= &vs_ ## name,		\
++		.maxlen		= sizeof(int),		\
++		.mode		= 0644,			\
++		.proc_handler	= &proc_dodebug,	\
++		.extra1		= &zero,		\
++		.extra2		= &zero,		\
++	}
++
++static ctl_table vserver_debug_table[] = {
++	CTL_ENTRY(CTL_DEBUG_SWITCH,	debug_switch),
++	CTL_ENTRY(CTL_DEBUG_XID,	debug_xid),
++	CTL_ENTRY(CTL_DEBUG_NID,	debug_nid),
++	CTL_ENTRY(CTL_DEBUG_TAG,	debug_tag),
++	CTL_ENTRY(CTL_DEBUG_NET,	debug_net),
++	CTL_ENTRY(CTL_DEBUG_LIMIT,	debug_limit),
++	CTL_ENTRY(CTL_DEBUG_CRES,	debug_cres),
++	CTL_ENTRY(CTL_DEBUG_DLIM,	debug_dlim),
++	CTL_ENTRY(CTL_DEBUG_QUOTA,	debug_quota),
++	CTL_ENTRY(CTL_DEBUG_CVIRT,	debug_cvirt),
++	CTL_ENTRY(CTL_DEBUG_SPACE,	debug_space),
++	CTL_ENTRY(CTL_DEBUG_PERM,	debug_perm),
++	CTL_ENTRY(CTL_DEBUG_MISC,	debug_misc),
++	{ 0 }
++};
++
++static ctl_table vserver_root_table[] = {
++	{
++		.procname	= "vserver",
++		.mode		= 0555,
++		.child		= vserver_debug_table
++	},
++	{ 0 }
++};
++
++
++static match_table_t tokens = {
++	{ CTL_DEBUG_SWITCH,	"switch=%x"	},
++	{ CTL_DEBUG_XID,	"xid=%x"	},
++	{ CTL_DEBUG_NID,	"nid=%x"	},
++	{ CTL_DEBUG_TAG,	"tag=%x"	},
++	{ CTL_DEBUG_NET,	"net=%x"	},
++	{ CTL_DEBUG_LIMIT,	"limit=%x"	},
++	{ CTL_DEBUG_CRES,	"cres=%x"	},
++	{ CTL_DEBUG_DLIM,	"dlim=%x"	},
++	{ CTL_DEBUG_QUOTA,	"quota=%x"	},
++	{ CTL_DEBUG_CVIRT,	"cvirt=%x"	},
++	{ CTL_DEBUG_SPACE,	"space=%x"	},
++	{ CTL_DEBUG_PERM,	"perm=%x"	},
++	{ CTL_DEBUG_MISC,	"misc=%x"	},
++	{ CTL_DEBUG_ERROR,	NULL		}
++};
++
++#define	HANDLE_CASE(id, name, val)				\
++	case CTL_DEBUG_ ## id:					\
++		vs_debug_ ## name = val;			\
++		printk("vs_debug_" #name "=0x%x\n", val);	\
++		break
++
++
++static int __init vs_debug_setup(char *str)
++{
++	char *p;
++	int token;
++
++	printk("vs_debug_setup(%s)\n", str);
++	while ((p = strsep(&str, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		unsigned int value;
++
++		if (!*p)
++			continue;
++
++		token = match_token(p, tokens, args);
++		value = (token > 0) ? simple_strtoul(args[0].from, NULL, 0) : 0;
++
++		switch (token) {
++		HANDLE_CASE(SWITCH, switch, value);
++		HANDLE_CASE(XID,    xid,    value);
++		HANDLE_CASE(NID,    nid,    value);
++		HANDLE_CASE(TAG,    tag,    value);
++		HANDLE_CASE(NET,    net,    value);
++		HANDLE_CASE(LIMIT,  limit,  value);
++		HANDLE_CASE(CRES,   cres,   value);
++		HANDLE_CASE(DLIM,   dlim,   value);
++		HANDLE_CASE(QUOTA,  quota,  value);
++		HANDLE_CASE(CVIRT,  cvirt,  value);
++		HANDLE_CASE(SPACE,  space,  value);
++		HANDLE_CASE(PERM,   perm,   value);
++		HANDLE_CASE(MISC,   misc,   value);
++		default:
++			return -EINVAL;
++			break;
++		}
++	}
++	return 1;
++}
++
++__setup("vsdebug=", vs_debug_setup);
++
++
++
++EXPORT_SYMBOL_GPL(vs_debug_switch);
++EXPORT_SYMBOL_GPL(vs_debug_xid);
++EXPORT_SYMBOL_GPL(vs_debug_nid);
++EXPORT_SYMBOL_GPL(vs_debug_net);
++EXPORT_SYMBOL_GPL(vs_debug_limit);
++EXPORT_SYMBOL_GPL(vs_debug_cres);
++EXPORT_SYMBOL_GPL(vs_debug_dlim);
++EXPORT_SYMBOL_GPL(vs_debug_quota);
++EXPORT_SYMBOL_GPL(vs_debug_cvirt);
++EXPORT_SYMBOL_GPL(vs_debug_space);
++EXPORT_SYMBOL_GPL(vs_debug_perm);
++EXPORT_SYMBOL_GPL(vs_debug_misc);
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/tag.c linux-3.7.10-vs2.3.5.6/kernel/vserver/tag.c
+--- linux-3.7.10/kernel/vserver/tag.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/tag.c	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,63 @@
++/*
++ *  linux/kernel/vserver/tag.c
++ *
++ *  Virtual Server: Shallow Tag Space
++ *
++ *  Copyright (C) 2007  Herbert Pötzl
++ *
++ *  V0.01  basic implementation
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/vserver/debug.h>
++#include <linux/vs_pid.h>
++#include <linux/vs_tag.h>
++
++#include <linux/vserver/tag_cmd.h>
++
++
++int dx_migrate_task(struct task_struct *p, tag_t tag)
++{
++	if (!p)
++		BUG();
++
++	vxdprintk(VXD_CBIT(tag, 5),
++		"dx_migrate_task(%p[#%d],#%d)", p, p->tag, tag);
++
++	task_lock(p);
++	p->tag = tag;
++	task_unlock(p);
++
++	vxdprintk(VXD_CBIT(tag, 5),
++		"moved task %p into [#%d]", p, tag);
++	return 0;
++}
++
++/* vserver syscall commands below here */
++
++/* taks xid and vx_info functions */
++
++
++int vc_task_tag(uint32_t id)
++{
++	tag_t tag;
++
++	if (id) {
++		struct task_struct *tsk;
++		rcu_read_lock();
++		tsk = find_task_by_real_pid(id);
++		tag = (tsk) ? tsk->tag : -ESRCH;
++		rcu_read_unlock();
++	} else
++		tag = dx_current_tag();
++	return tag;
++}
++
++
++int vc_tag_migrate(uint32_t tag)
++{
++	return dx_migrate_task(current, tag & 0xFFFF);
++}
++
++
+diff -NurpP --minimal linux-3.7.10/kernel/vserver/vci_config.h linux-3.7.10-vs2.3.5.6/kernel/vserver/vci_config.h
+--- linux-3.7.10/kernel/vserver/vci_config.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/kernel/vserver/vci_config.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,80 @@
++
++/*  interface version */
++
++#define VCI_VERSION		0x00020308
++
++
++enum {
++	VCI_KCBIT_NO_DYNAMIC = 0,
++
++	VCI_KCBIT_PROC_SECURE = 4,
++	/* VCI_KCBIT_HARDCPU = 5, */
++	/* VCI_KCBIT_IDLELIMIT = 6, */
++	/* VCI_KCBIT_IDLETIME = 7, */
++
++	VCI_KCBIT_COWBL = 8,
++	VCI_KCBIT_FULLCOWBL = 9,
++	VCI_KCBIT_SPACES = 10,
++	VCI_KCBIT_NETV2 = 11,
++	VCI_KCBIT_MEMCG = 12,
++	VCI_KCBIT_MEMCG_SWAP = 13,
++
++	VCI_KCBIT_DEBUG = 16,
++	VCI_KCBIT_HISTORY = 20,
++	VCI_KCBIT_TAGGED = 24,
++	VCI_KCBIT_PPTAG = 28,
++
++	VCI_KCBIT_MORE = 31,
++};
++
++
++static inline uint32_t vci_kernel_config(void)
++{
++	return
++	(1 << VCI_KCBIT_NO_DYNAMIC) |
++
++	/* configured features */
++#ifdef	CONFIG_VSERVER_PROC_SECURE
++	(1 << VCI_KCBIT_PROC_SECURE) |
++#endif
++#ifdef	CONFIG_VSERVER_COWBL
++	(1 << VCI_KCBIT_COWBL) |
++	(1 << VCI_KCBIT_FULLCOWBL) |
++#endif
++	(1 << VCI_KCBIT_SPACES) |
++	(1 << VCI_KCBIT_NETV2) |
++#ifdef	CONFIG_MEMCG
++	(1 << VCI_KCBIT_MEMCG) |
++#endif
++#ifdef	CONFIG_MEMCG_SWAP
++	(1 << VCI_KCBIT_MEMCG_SWAP) |
++#endif
++
++	/* debug options */
++#ifdef	CONFIG_VSERVER_DEBUG
++	(1 << VCI_KCBIT_DEBUG) |
++#endif
++#ifdef	CONFIG_VSERVER_HISTORY
++	(1 << VCI_KCBIT_HISTORY) |
++#endif
++
++	/* inode context tagging */
++#if	defined(CONFIG_TAGGING_NONE)
++	(0 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_UID16)
++	(1 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_GID16)
++	(2 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_ID24)
++	(3 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_INTERN)
++	(4 << VCI_KCBIT_TAGGED) |
++#elif	defined(CONFIG_TAGGING_RUNTIME)
++	(5 << VCI_KCBIT_TAGGED) |
++#else
++	(7 << VCI_KCBIT_TAGGED) |
++#endif
++	(1 << VCI_KCBIT_PPTAG) |
++	0;
++}
++
+diff -NurpP --minimal linux-3.7.10/mm/memcontrol.c linux-3.7.10-vs2.3.5.6/mm/memcontrol.c
+--- linux-3.7.10/mm/memcontrol.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/memcontrol.c	2012-12-18 15:13:16.000000000 +0000
+@@ -884,6 +884,31 @@ struct mem_cgroup *mem_cgroup_from_task(
+ 	return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
+ }
+ 
++u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member)
++{
++	return res_counter_read_u64(&mem->res, member);
++}
++
++u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member)
++{
++	return res_counter_read_u64(&mem->memsw, member);
++}
++
++s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE);
++}
++
++s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS);
++}
++
++s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem)
++{
++	return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED);
++}
++
+ struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
+ {
+ 	struct mem_cgroup *memcg = NULL;
+diff -NurpP --minimal linux-3.7.10/mm/oom_kill.c linux-3.7.10-vs2.3.5.6/mm/oom_kill.c
+--- linux-3.7.10/mm/oom_kill.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/oom_kill.c	2012-12-18 15:13:16.000000000 +0000
+@@ -35,6 +35,8 @@
+ #include <linux/freezer.h>
+ #include <linux/ftrace.h>
+ #include <linux/ratelimit.h>
++#include <linux/reboot.h>
++#include <linux/vs_context.h>
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/oom.h>
+@@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(st
+ static bool oom_unkillable_task(struct task_struct *p,
+ 		const struct mem_cgroup *memcg, const nodemask_t *nodemask)
+ {
+-	if (is_global_init(p))
++	unsigned xid = vx_current_xid();
++
++	/* skip the init task, global and per guest */
++	if (task_is_init(p))
+ 		return true;
+ 	if (p->flags & PF_KTHREAD)
+ 		return true;
+ 
++	/* skip other guest and host processes if oom in guest */
++	if (xid && vx_task_xid(p) != xid)
++		return true;
++
+ 	/* When mem_cgroup_out_of_memory() and p is not member of the group */
+ 	if (memcg && !task_in_mem_cgroup(p, memcg))
+ 		return true;
+@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct
+ 		dump_header(p, gfp_mask, order, memcg, nodemask);
+ 
+ 	task_lock(p);
+-	pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n",
+-		message, task_pid_nr(p), p->comm, points);
++	pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n",
++		message, task_pid_nr(p), p->xid, p->comm, points);
+ 	task_unlock(p);
+ 
+ 	/*
+@@ -518,8 +527,8 @@ void oom_kill_process(struct task_struct
+ 
+ 	/* mm cannot safely be dereferenced after task_unlock(victim) */
+ 	mm = victim->mm;
+-	pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+-		task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
++	pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
++		task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm),
+ 		K(get_mm_counter(victim->mm, MM_ANONPAGES)),
+ 		K(get_mm_counter(victim->mm, MM_FILEPAGES)));
+ 	task_unlock(victim);
+@@ -589,6 +598,8 @@ int unregister_oom_notifier(struct notif
+ }
+ EXPORT_SYMBOL_GPL(unregister_oom_notifier);
+ 
++long vs_oom_action(unsigned int);
++
+ /*
+  * Try to acquire the OOM killer lock for the zones in zonelist.  Returns zero
+  * if a parallel OOM killing is already taking place that includes a zone in
+@@ -738,7 +749,12 @@ void out_of_memory(struct zonelist *zone
+ 	/* Found nothing?!?! Either we hang forever, or we panic. */
+ 	if (!p) {
+ 		dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
+-		panic("Out of memory and no killable processes...\n");
++
++		/* avoid panic for guest OOM */
++		if (vx_current_xid())
++			vs_oom_action(LINUX_REBOOT_CMD_OOM);
++		else
++			panic("Out of memory and no killable processes...\n");
+ 	}
+ 	if (PTR_ERR(p) != -1UL) {
+ 		oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
+diff -NurpP --minimal linux-3.7.10/mm/page_alloc.c linux-3.7.10-vs2.3.5.6/mm/page_alloc.c
+--- linux-3.7.10/mm/page_alloc.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/page_alloc.c	2013-03-02 15:26:03.000000000 +0000
+@@ -58,6 +58,8 @@
+ #include <linux/prefetch.h>
+ #include <linux/migrate.h>
+ #include <linux/page-debug-flags.h>
++#include <linux/vs_base.h>
++#include <linux/vs_limit.h>
+ 
+ #include <asm/tlbflush.h>
+ #include <asm/div64.h>
+@@ -2813,6 +2815,9 @@ void si_meminfo(struct sysinfo *val)
+ 	val->totalhigh = totalhigh_pages;
+ 	val->freehigh = nr_free_highpages();
+ 	val->mem_unit = PAGE_SIZE;
++
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_meminfo(val);
+ }
+ 
+ EXPORT_SYMBOL(si_meminfo);
+@@ -2833,6 +2838,9 @@ void si_meminfo_node(struct sysinfo *val
+ 	val->freehigh = 0;
+ #endif
+ 	val->mem_unit = PAGE_SIZE;
++
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_meminfo(val);
+ }
+ #endif
+ 
+diff -NurpP --minimal linux-3.7.10/mm/pgtable-generic.c linux-3.7.10-vs2.3.5.6/mm/pgtable-generic.c
+--- linux-3.7.10/mm/pgtable-generic.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/pgtable-generic.c	2012-12-18 15:13:16.000000000 +0000
+@@ -6,6 +6,8 @@
+  *  Copyright (C) 2010  Linus Torvalds
+  */
+ 
++#include <linux/mm.h>
++
+ #include <linux/pagemap.h>
+ #include <asm/tlb.h>
+ #include <asm-generic/pgtable.h>
+diff -NurpP --minimal linux-3.7.10/mm/shmem.c linux-3.7.10-vs2.3.5.6/mm/shmem.c
+--- linux-3.7.10/mm/shmem.c	2013-03-02 09:55:01.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/shmem.c	2013-03-02 15:26:03.000000000 +0000
+@@ -1820,7 +1820,7 @@ static int shmem_statfs(struct dentry *d
+ {
+ 	struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
+ 
+-	buf->f_type = TMPFS_MAGIC;
++	buf->f_type = TMPFS_SUPER_MAGIC;
+ 	buf->f_bsize = PAGE_CACHE_SIZE;
+ 	buf->f_namelen = NAME_MAX;
+ 	if (sbinfo->max_blocks) {
+@@ -2510,7 +2510,7 @@ int shmem_fill_super(struct super_block
+ 	sb->s_maxbytes = MAX_LFS_FILESIZE;
+ 	sb->s_blocksize = PAGE_CACHE_SIZE;
+ 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+-	sb->s_magic = TMPFS_MAGIC;
++	sb->s_magic = TMPFS_SUPER_MAGIC;
+ 	sb->s_op = &shmem_ops;
+ 	sb->s_time_gran = 1;
+ #ifdef CONFIG_TMPFS_XATTR
+diff -NurpP --minimal linux-3.7.10/mm/slab.c linux-3.7.10-vs2.3.5.6/mm/slab.c
+--- linux-3.7.10/mm/slab.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/slab.c	2012-12-18 15:13:16.000000000 +0000
+@@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_
+ #define STATS_INC_FREEMISS(x)	do { } while (0)
+ #endif
+ 
++#include "slab_vs.h"
++
+ #if DEBUG
+ 
+ /*
+@@ -3479,6 +3481,7 @@ retry:
+ 
+ 	obj = slab_get_obj(cachep, slabp, nodeid);
+ 	check_slabp(cachep, slabp);
++	vx_slab_alloc(cachep, flags);
+ 	l3->free_objects--;
+ 	/* move slabp to correct slabp list: */
+ 	list_del(&slabp->list);
+@@ -3556,6 +3559,7 @@ slab_alloc_node(struct kmem_cache *cache
+ 	/* ___cache_alloc_node can fall back to other nodes */
+ 	ptr = ____cache_alloc_node(cachep, flags, nodeid);
+   out:
++	vx_slab_alloc(cachep, flags);
+ 	local_irq_restore(save_flags);
+ 	ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller);
+ 	kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags,
+@@ -3746,6 +3750,7 @@ static inline void __cache_free(struct k
+ 	check_irq_off();
+ 	kmemleak_free_recursive(objp, cachep->flags);
+ 	objp = cache_free_debugcheck(cachep, objp, caller);
++	vx_slab_free(cachep);
+ 
+ 	kmemcheck_slab_free(cachep, objp, cachep->object_size);
+ 
+diff -NurpP --minimal linux-3.7.10/mm/slab_vs.h linux-3.7.10-vs2.3.5.6/mm/slab_vs.h
+--- linux-3.7.10/mm/slab_vs.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/slab_vs.h	2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,29 @@
++
++#include <linux/vserver/context.h>
++
++#include <linux/vs_context.h>
++
++static inline
++void vx_slab_alloc(struct kmem_cache *cachep, gfp_t flags)
++{
++	int what = gfp_zone(cachep->allocflags);
++	struct vx_info *vxi = current_vx_info();
++
++	if (!vxi)
++		return;
++
++	atomic_add(cachep->size, &vxi->cacct.slab[what]);
++}
++
++static inline
++void vx_slab_free(struct kmem_cache *cachep)
++{
++	int what = gfp_zone(cachep->allocflags);
++	struct vx_info *vxi = current_vx_info();
++
++	if (!vxi)
++		return;
++
++	atomic_sub(cachep->size, &vxi->cacct.slab[what]);
++}
++
+diff -NurpP --minimal linux-3.7.10/mm/swapfile.c linux-3.7.10-vs2.3.5.6/mm/swapfile.c
+--- linux-3.7.10/mm/swapfile.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/mm/swapfile.c	2012-12-18 15:13:16.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <asm/tlbflush.h>
+ #include <linux/swapops.h>
+ #include <linux/page_cgroup.h>
++#include <linux/vs_base.h>
+ 
+ static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
+ 				 unsigned char);
+@@ -1685,6 +1686,16 @@ static int swap_show(struct seq_file *sw
+ 
+ 	if (si == SEQ_START_TOKEN) {
+ 		seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
++		if (vx_flags(VXF_VIRT_MEM, 0)) {
++			struct sysinfo si;
++
++			vx_vsi_swapinfo(&si);
++			if (si.totalswap < (1 << 10))
++				return 0;
++			seq_printf(swap, "%s\t\t\t\t\t%s\t%lu\t%lu\t%d\n",
++				"hdv0", "partition", si.totalswap >> 10,
++				(si.totalswap - si.freeswap) >> 10, -1);
++		}
+ 		return 0;
+ 	}
+ 
+@@ -2112,6 +2123,8 @@ void si_swapinfo(struct sysinfo *val)
+ 	val->freeswap = nr_swap_pages + nr_to_be_unused;
+ 	val->totalswap = total_swap_pages + nr_to_be_unused;
+ 	spin_unlock(&swap_lock);
++	if (vx_flags(VXF_VIRT_MEM, 0))
++		vx_vsi_swapinfo(val);
+ }
+ 
+ /*
+diff -NurpP --minimal linux-3.7.10/net/bridge/br_multicast.c linux-3.7.10-vs2.3.5.6/net/bridge/br_multicast.c
+--- linux-3.7.10/net/bridge/br_multicast.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/bridge/br_multicast.c	2012-12-18 15:13:16.000000000 +0000
+@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
+ 	ip6h->hop_limit = 1;
+ 	ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
+ 	if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
+-			       &ip6h->saddr)) {
++			       &ip6h->saddr, NULL)) {
+ 		kfree_skb(skb);
+ 		return NULL;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/core/dev.c linux-3.7.10-vs2.3.5.6/net/core/dev.c
+--- linux-3.7.10/net/core/dev.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/core/dev.c	2013-02-19 14:41:41.000000000 +0000
+@@ -126,6 +126,7 @@
+ #include <linux/in.h>
+ #include <linux/jhash.h>
+ #include <linux/random.h>
++#include <linux/vs_inet.h>
+ #include <trace/events/napi.h>
+ #include <trace/events/net.h>
+ #include <trace/events/skb.h>
+@@ -620,7 +621,8 @@ struct net_device *__dev_get_by_name(str
+ 	struct hlist_head *head = dev_name_hash(net, name);
+ 
+ 	hlist_for_each_entry(dev, p, head, name_hlist)
+-		if (!strncmp(dev->name, name, IFNAMSIZ))
++		if (!strncmp(dev->name, name, IFNAMSIZ) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -646,7 +648,8 @@ struct net_device *dev_get_by_name_rcu(s
+ 	struct hlist_head *head = dev_name_hash(net, name);
+ 
+ 	hlist_for_each_entry_rcu(dev, p, head, name_hlist)
+-		if (!strncmp(dev->name, name, IFNAMSIZ))
++		if (!strncmp(dev->name, name, IFNAMSIZ) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -697,7 +700,8 @@ struct net_device *__dev_get_by_index(st
+ 	struct hlist_head *head = dev_index_hash(net, ifindex);
+ 
+ 	hlist_for_each_entry(dev, p, head, index_hlist)
+-		if (dev->ifindex == ifindex)
++		if ((dev->ifindex == ifindex) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -715,7 +719,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
+  *	about locking. The caller must hold RCU lock.
+  */
+ 
+-struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex)
+ {
+ 	struct hlist_node *p;
+ 	struct net_device *dev;
+@@ -727,6 +731,16 @@ struct net_device *dev_get_by_index_rcu(
+ 
+ 	return NULL;
+ }
++EXPORT_SYMBOL(dev_get_by_index_real_rcu);
++
++struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex)
++{
++	struct net_device *dev = dev_get_by_index_real_rcu(net, ifindex);
++
++	if (nx_dev_visible(current_nx_info(), dev))
++		return dev;
++	return NULL;
++}
+ EXPORT_SYMBOL(dev_get_by_index_rcu);
+ 
+ 
+@@ -775,7 +789,8 @@ struct net_device *dev_getbyhwaddr_rcu(s
+ 
+ 	for_each_netdev_rcu(net, dev)
+ 		if (dev->type == type &&
+-		    !memcmp(dev->dev_addr, ha, dev->addr_len))
++		    !memcmp(dev->dev_addr, ha, dev->addr_len) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
+ 
+ 	return NULL;
+@@ -787,9 +802,11 @@ struct net_device *__dev_getfirstbyhwtyp
+ 	struct net_device *dev;
+ 
+ 	ASSERT_RTNL();
+-	for_each_netdev(net, dev)
+-		if (dev->type == type)
++	for_each_netdev(net, dev) {
++		if ((dev->type == type) &&
++		    nx_dev_visible(current_nx_info(), dev))
+ 			return dev;
++	}
+ 
+ 	return NULL;
+ }
+@@ -907,6 +924,8 @@ static int __dev_alloc_name(struct net *
+ 				continue;
+ 			if (i < 0 || i >= max_netdevices)
+ 				continue;
++			if (!nx_dev_visible(current_nx_info(), d))
++				continue;
+ 
+ 			/*  avoid cases where sscanf is not exact inverse of printf */
+ 			snprintf(buf, IFNAMSIZ, name, i);
+@@ -4129,6 +4148,8 @@ static int dev_ifconf(struct net *net, c
+ 
+ 	total = 0;
+ 	for_each_netdev(net, dev) {
++		if (!nx_dev_visible(current_nx_info(), dev))
++			continue;
+ 		for (i = 0; i < NPROTO; i++) {
+ 			if (gifconf_list[i]) {
+ 				int done;
+@@ -4231,6 +4252,10 @@ static void dev_seq_printf_stats(struct
+ 	struct rtnl_link_stats64 temp;
+ 	const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
+ 
++	/* device visible inside network context? */
++	if (!nx_dev_visible(current_nx_info(), dev))
++		return;
++
+ 	seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
+ 		   "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
+ 		   dev->name, stats->rx_bytes, stats->rx_packets,
+diff -NurpP --minimal linux-3.7.10/net/core/rtnetlink.c linux-3.7.10-vs2.3.5.6/net/core/rtnetlink.c
+--- linux-3.7.10/net/core/rtnetlink.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/core/rtnetlink.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+ 		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+ 			if (idx < s_idx)
+ 				goto cont;
++			if (!nx_dev_visible(skb->sk->sk_nx_info, dev))
++				continue;
+ 			if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
+ 					     NETLINK_CB(cb->skb).portid,
+ 					     cb->nlh->nlmsg_seq, 0,
+@@ -1971,6 +1973,9 @@ void rtmsg_ifinfo(int type, struct net_d
+ 	int err = -ENOBUFS;
+ 	size_t if_info_size;
+ 
++	if (!nx_dev_visible(current_nx_info(), dev))
++		return;
++
+ 	skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
+ 	if (skb == NULL)
+ 		goto errout;
+diff -NurpP --minimal linux-3.7.10/net/core/sock.c linux-3.7.10-vs2.3.5.6/net/core/sock.c
+--- linux-3.7.10/net/core/sock.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/core/sock.c	2012-12-18 15:13:16.000000000 +0000
+@@ -132,6 +132,10 @@
+ #include <net/netprio_cgroup.h>
+ 
+ #include <linux/filter.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
+ 
+ #include <trace/events/sock.h>
+ 
+@@ -1183,6 +1187,8 @@ static struct sock *sk_prot_alloc(struct
+ 			goto out_free_sec;
+ 		sk_tx_queue_clear(sk);
+ 	}
++		sock_vx_init(sk);
++		sock_nx_init(sk);
+ 
+ 	return sk;
+ 
+@@ -1295,6 +1301,11 @@ static void __sk_free(struct sock *sk)
+ 		put_cred(sk->sk_peer_cred);
+ 	put_pid(sk->sk_peer_pid);
+ 	put_net(sock_net(sk));
++	vx_sock_dec(sk);
++	clr_vx_info(&sk->sk_vx_info);
++	sk->sk_xid = -1;
++	clr_nx_info(&sk->sk_nx_info);
++	sk->sk_nid = -1;
+ 	sk_prot_free(sk->sk_prot_creator, sk);
+ }
+ 
+@@ -1355,6 +1366,8 @@ struct sock *sk_clone_lock(const struct
+ 
+ 		/* SANITY */
+ 		get_net(sock_net(newsk));
++		sock_vx_init(newsk);
++		sock_nx_init(newsk);
+ 		sk_node_init(&newsk->sk_node);
+ 		sock_lock_init(newsk);
+ 		bh_lock_sock(newsk);
+@@ -1411,6 +1424,12 @@ struct sock *sk_clone_lock(const struct
+ 		smp_wmb();
+ 		atomic_set(&newsk->sk_refcnt, 2);
+ 
++		set_vx_info(&newsk->sk_vx_info, sk->sk_vx_info);
++		newsk->sk_xid = sk->sk_xid;
++		vx_sock_inc(newsk);
++		set_nx_info(&newsk->sk_nx_info, sk->sk_nx_info);
++		newsk->sk_nid = sk->sk_nid;
++
+ 		/*
+ 		 * Increment the counter in the same struct proto as the master
+ 		 * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
+@@ -2206,6 +2225,12 @@ void sock_init_data(struct socket *sock,
+ 
+ 	sk->sk_stamp = ktime_set(-1L, 0);
+ 
++	set_vx_info(&sk->sk_vx_info, current_vx_info());
++	sk->sk_xid = vx_current_xid();
++	vx_sock_inc(sk);
++	set_nx_info(&sk->sk_nx_info, current_nx_info());
++	sk->sk_nid = nx_current_nid();
++
+ 	/*
+ 	 * Before updating sk_refcnt, we must commit prior changes to memory
+ 	 * (Documentation/RCU/rculist_nulls.txt for details)
+diff -NurpP --minimal linux-3.7.10/net/ipv4/af_inet.c linux-3.7.10-vs2.3.5.6/net/ipv4/af_inet.c
+--- linux-3.7.10/net/ipv4/af_inet.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/af_inet.c	2012-12-18 15:13:16.000000000 +0000
+@@ -118,6 +118,7 @@
+ #ifdef CONFIG_IP_MROUTE
+ #include <linux/mroute.h>
+ #endif
++#include <linux/vs_limit.h>
+ 
+ 
+ /* The inetsw table contains everything that inet_create needs to
+@@ -346,9 +347,13 @@ lookup_protocol:
+ 	}
+ 
+ 	err = -EPERM;
++	if ((protocol == IPPROTO_ICMP) &&
++		nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
++		goto override;
++
+ 	if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ 		goto out_rcu_unlock;
+-
++override:
+ 	err = -EAFNOSUPPORT;
+ 	if (!inet_netns_ok(net, protocol))
+ 		goto out_rcu_unlock;
+@@ -473,6 +478,7 @@ int inet_bind(struct socket *sock, struc
+ 	struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
+ 	struct sock *sk = sock->sk;
+ 	struct inet_sock *inet = inet_sk(sk);
++	struct nx_v4_sock_addr nsa;
+ 	unsigned short snum;
+ 	int chk_addr_ret;
+ 	int err;
+@@ -496,7 +502,11 @@ int inet_bind(struct socket *sock, struc
+ 			goto out;
+ 	}
+ 
+-	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
++	err = v4_map_sock_addr(inet, addr, &nsa);
++	if (err)
++		goto out;
++
++	chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
+ 
+ 	/* Not specified by any standard per-se, however it breaks too
+ 	 * many applications when removed.  It is unfortunate since
+@@ -508,7 +518,7 @@ int inet_bind(struct socket *sock, struc
+ 	err = -EADDRNOTAVAIL;
+ 	if (!sysctl_ip_nonlocal_bind &&
+ 	    !(inet->freebind || inet->transparent) &&
+-	    addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
++	    nsa.saddr != htonl(INADDR_ANY) &&
+ 	    chk_addr_ret != RTN_LOCAL &&
+ 	    chk_addr_ret != RTN_MULTICAST &&
+ 	    chk_addr_ret != RTN_BROADCAST)
+@@ -533,7 +543,7 @@ int inet_bind(struct socket *sock, struc
+ 	if (sk->sk_state != TCP_CLOSE || inet->inet_num)
+ 		goto out_release_sock;
+ 
+-	inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++	v4_set_sock_addr(inet, &nsa);
+ 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
+ 		inet->inet_saddr = 0;  /* Use device */
+ 
+@@ -752,11 +762,13 @@ int inet_getname(struct socket *sock, st
+ 		     peer == 1))
+ 			return -ENOTCONN;
+ 		sin->sin_port = inet->inet_dport;
+-		sin->sin_addr.s_addr = inet->inet_daddr;
++		sin->sin_addr.s_addr =
++			nx_map_sock_lback(sk->sk_nx_info, inet->inet_daddr);
+ 	} else {
+ 		__be32 addr = inet->inet_rcv_saddr;
+ 		if (!addr)
+ 			addr = inet->inet_saddr;
++		addr = nx_map_sock_lback(sk->sk_nx_info, addr);
+ 		sin->sin_port = inet->inet_sport;
+ 		sin->sin_addr.s_addr = addr;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/ipv4/arp.c linux-3.7.10-vs2.3.5.6/net/ipv4/arp.c
+--- linux-3.7.10/net/ipv4/arp.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/arp.c	2012-12-18 15:13:16.000000000 +0000
+@@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc
+ 	struct net_device *dev = n->dev;
+ 	int hatype = dev->type;
+ 
++	/* FIXME: check for network context */
+ 	read_lock(&n->lock);
+ 	/* Convert hardware address to XX:XX:XX:XX ... form. */
+ #if IS_ENABLED(CONFIG_AX25)
+@@ -1349,6 +1350,7 @@ static void arp_format_pneigh_entry(stru
+ 	int hatype = dev ? dev->type : 0;
+ 	char tbuf[16];
+ 
++	/* FIXME: check for network context */
+ 	sprintf(tbuf, "%pI4", n->key);
+ 	seq_printf(seq, "%-16s 0x%-10x0x%-10x%s     *        %s\n",
+ 		   tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
+diff -NurpP --minimal linux-3.7.10/net/ipv4/devinet.c linux-3.7.10-vs2.3.5.6/net/ipv4/devinet.c
+--- linux-3.7.10/net/ipv4/devinet.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/devinet.c	2012-12-18 15:13:16.000000000 +0000
+@@ -513,6 +513,7 @@ struct in_device *inetdev_by_index(struc
+ }
+ EXPORT_SYMBOL(inetdev_by_index);
+ 
++
+ /* Called only from RTNL semaphored context. No locks. */
+ 
+ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,
+@@ -754,6 +755,8 @@ int devinet_ioctl(struct net *net, unsig
+ 
+ 	in_dev = __in_dev_get_rtnl(dev);
+ 	if (in_dev) {
++		struct nx_info *nxi = current_nx_info();
++
+ 		if (tryaddrmatch) {
+ 			/* Matthias Andree */
+ 			/* compare label and address (4.4BSD style) */
+@@ -762,6 +765,8 @@ int devinet_ioctl(struct net *net, unsig
+ 			   This is checked above. */
+ 			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
+ 			     ifap = &ifa->ifa_next) {
++				if (!nx_v4_ifa_visible(nxi, ifa))
++					continue;
+ 				if (!strcmp(ifr.ifr_name, ifa->ifa_label) &&
+ 				    sin_orig.sin_addr.s_addr ==
+ 							ifa->ifa_local) {
+@@ -774,9 +779,12 @@ int devinet_ioctl(struct net *net, unsig
+ 		   comparing just the label */
+ 		if (!ifa) {
+ 			for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL;
+-			     ifap = &ifa->ifa_next)
++			     ifap = &ifa->ifa_next) {
++				if (!nx_v4_ifa_visible(nxi, ifa))
++					continue;
+ 				if (!strcmp(ifr.ifr_name, ifa->ifa_label))
+ 					break;
++			}
+ 		}
+ 	}
+ 
+@@ -929,6 +937,8 @@ static int inet_gifconf(struct net_devic
+ 		goto out;
+ 
+ 	for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
++		if (!nx_v4_ifa_visible(current_nx_info(), ifa))
++			continue;
+ 		if (!buf) {
+ 			done += sizeof(ifr);
+ 			continue;
+@@ -1288,6 +1298,7 @@ static int inet_dump_ifaddr(struct sk_bu
+ 	struct net_device *dev;
+ 	struct in_device *in_dev;
+ 	struct in_ifaddr *ifa;
++	struct sock *sk = skb->sk;
+ 	struct hlist_head *head;
+ 	struct hlist_node *node;
+ 
+@@ -1310,6 +1321,8 @@ static int inet_dump_ifaddr(struct sk_bu
+ 
+ 			for (ifa = in_dev->ifa_list, ip_idx = 0; ifa;
+ 			     ifa = ifa->ifa_next, ip_idx++) {
++			if (sk && !nx_v4_ifa_visible(sk->sk_nx_info, ifa))
++				continue;
+ 				if (ip_idx < s_ip_idx)
+ 					continue;
+ 				if (inet_fill_ifaddr(skb, ifa,
+diff -NurpP --minimal linux-3.7.10/net/ipv4/fib_trie.c linux-3.7.10-vs2.3.5.6/net/ipv4/fib_trie.c
+--- linux-3.7.10/net/ipv4/fib_trie.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/fib_trie.c	2012-12-18 15:13:16.000000000 +0000
+@@ -2557,6 +2557,7 @@ static int fib_route_seq_show(struct seq
+ 			    || fa->fa_type == RTN_MULTICAST)
+ 				continue;
+ 
++			/* FIXME: check for network context? */
+ 			if (fi)
+ 				seq_printf(seq,
+ 					 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
+diff -NurpP --minimal linux-3.7.10/net/ipv4/inet_connection_sock.c linux-3.7.10-vs2.3.5.6/net/ipv4/inet_connection_sock.c
+--- linux-3.7.10/net/ipv4/inet_connection_sock.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/inet_connection_sock.c	2013-01-16 00:19:03.000000000 +0000
+@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
+ }
+ EXPORT_SYMBOL(inet_get_local_port_range);
+ 
++int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
++{
++	__be32	sk1_rcv_saddr = sk_rcv_saddr(sk1),
++		sk2_rcv_saddr = sk_rcv_saddr(sk2);
++
++	if (inet_v6_ipv6only(sk2))
++		return 0;
++
++	if (sk1_rcv_saddr &&
++	    sk2_rcv_saddr &&
++	    sk1_rcv_saddr == sk2_rcv_saddr)
++		return 1;
++
++	if (sk1_rcv_saddr &&
++	    !sk2_rcv_saddr &&
++	    v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, NXA_MASK_BIND))
++		return 1;
++
++	if (sk2_rcv_saddr &&
++	    !sk1_rcv_saddr &&
++	    v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, NXA_MASK_BIND))
++		return 1;
++
++	if (!sk1_rcv_saddr &&
++	    !sk2_rcv_saddr &&
++	    nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info))
++		return 1;
++
++	return 0;
++}
++
+ int inet_csk_bind_conflict(const struct sock *sk,
+ 			   const struct inet_bind_bucket *tb, bool relax)
+ {
+@@ -75,9 +106,7 @@ int inet_csk_bind_conflict(const struct
+ 		     sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) {
+ 			if (!reuse || !sk2->sk_reuse ||
+ 			    sk2->sk_state == TCP_LISTEN) {
+-				const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
+-				if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) ||
+-				    sk2_rcv_saddr == sk_rcv_saddr(sk))
++				if (ipv4_rcv_saddr_equal(sk, sk2))
+ 					break;
+ 			}
+ 			if (!relax && reuse && sk2->sk_reuse &&
+diff -NurpP --minimal linux-3.7.10/net/ipv4/inet_diag.c linux-3.7.10-vs2.3.5.6/net/ipv4/inet_diag.c
+--- linux-3.7.10/net/ipv4/inet_diag.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/inet_diag.c	2012-12-18 15:13:16.000000000 +0000
+@@ -31,6 +31,8 @@
+ 
+ #include <linux/inet.h>
+ #include <linux/stddef.h>
++#include <linux/vs_network.h>
++#include <linux/vs_inet.h>
+ 
+ #include <linux/inet_diag.h>
+ #include <linux/sock_diag.h>
+@@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s
+ 
+ 	r->id.idiag_sport = inet->inet_sport;
+ 	r->id.idiag_dport = inet->inet_dport;
+-	r->id.idiag_src[0] = inet->inet_rcv_saddr;
+-	r->id.idiag_dst[0] = inet->inet_daddr;
++	r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info,
++		inet->inet_rcv_saddr);
++	r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info,
++		inet->inet_daddr);
+ 
+ 	/* IPv6 dual-stack sockets use inet->tos for IPv4 connections,
+ 	 * hence this needs to be included regardless of socket family.
+@@ -239,8 +243,8 @@ static int inet_twsk_diag_fill(struct in
+ 	sock_diag_save_cookie(tw, r->id.idiag_cookie);
+ 	r->id.idiag_sport     = tw->tw_sport;
+ 	r->id.idiag_dport     = tw->tw_dport;
+-	r->id.idiag_src[0]    = tw->tw_rcv_saddr;
+-	r->id.idiag_dst[0]    = tw->tw_daddr;
++	r->id.idiag_src[0]    = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr);
++	r->id.idiag_dst[0]    = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr);
+ 	r->idiag_state	      = tw->tw_substate;
+ 	r->idiag_timer	      = 3;
+ 	r->idiag_expires      = DIV_ROUND_UP(tmo * 1000, HZ);
+@@ -284,12 +288,14 @@ int inet_diag_dump_one_icsk(struct inet_
+ 
+ 	err = -EINVAL;
+ 	if (req->sdiag_family == AF_INET) {
++		/* TODO: lback */
+ 		sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
+ 				 req->id.idiag_dport, req->id.idiag_src[0],
+ 				 req->id.idiag_sport, req->id.idiag_if);
+ 	}
+ #if IS_ENABLED(CONFIG_IPV6)
+ 	else if (req->sdiag_family == AF_INET6) {
++		/* TODO: lback */
+ 		sk = inet6_lookup(net, hashinfo,
+ 				  (struct in6_addr *)req->id.idiag_dst,
+ 				  req->id.idiag_dport,
+@@ -491,6 +497,7 @@ int inet_diag_bc_sk(const struct nlattr
+ 	} else
+ #endif
+ 	{
++			/* TODO: lback */
+ 		entry.saddr = &inet->inet_rcv_saddr;
+ 		entry.daddr = &inet->inet_daddr;
+ 	}
+@@ -649,6 +656,7 @@ static int inet_twsk_diag_dump(struct in
+ 		} else
+ #endif
+ 		{
++			/* TODO: lback */
+ 			entry.saddr = &tw->tw_rcv_saddr;
+ 			entry.daddr = &tw->tw_daddr;
+ 		}
+@@ -727,8 +735,8 @@ static int inet_diag_fill_req(struct sk_
+ 
+ 	r->id.idiag_sport = inet->inet_sport;
+ 	r->id.idiag_dport = ireq->rmt_port;
+-	r->id.idiag_src[0] = ireq->loc_addr;
+-	r->id.idiag_dst[0] = ireq->rmt_addr;
++	r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr);
++	r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr);
+ 	r->idiag_expires = jiffies_to_msecs(tmo);
+ 	r->idiag_rqueue = 0;
+ 	r->idiag_wqueue = 0;
+@@ -791,6 +799,7 @@ static int inet_diag_dump_reqs(struct sk
+ 			    r->id.idiag_dport)
+ 				continue;
+ 
++			/* TODO: lback */
+ 			if (bc) {
+ 				inet_diag_req_addrs(sk, req, &entry);
+ 				entry.dport = ntohs(ireq->rmt_port);
+@@ -847,6 +856,8 @@ void inet_diag_dump_icsk(struct inet_has
+ 				if (!net_eq(sock_net(sk), net))
+ 					continue;
+ 
++				if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (num < s_num) {
+ 					num++;
+ 					continue;
+@@ -919,6 +930,8 @@ skip_listen_ht:
+ 
+ 			if (!net_eq(sock_net(sk), net))
+ 				continue;
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (num < s_num)
+ 				goto next_normal;
+ 			if (!(r->idiag_states & (1 << sk->sk_state)))
+@@ -947,7 +960,8 @@ next_normal:
+ 				    &head->twchain) {
+ 				if (!net_eq(twsk_net(tw), net))
+ 					continue;
+-
++				if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (num < s_num)
+ 					goto next_dying;
+ 				if (r->sdiag_family != AF_UNSPEC &&
+diff -NurpP --minimal linux-3.7.10/net/ipv4/inet_hashtables.c linux-3.7.10-vs2.3.5.6/net/ipv4/inet_hashtables.c
+--- linux-3.7.10/net/ipv4/inet_hashtables.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/inet_hashtables.c	2012-12-18 15:13:16.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
++#include <net/route.h>
+ #include <net/ip.h>
+ 
+ /*
+@@ -156,6 +157,11 @@ static inline int compute_score(struct s
+ 			if (rcv_saddr != daddr)
+ 				return -1;
+ 			score += 2;
++		} else {
++			/* block non nx_info ips */
++			if (!v4_addr_in_nx_info(sk->sk_nx_info,
++				daddr, NXA_MASK_BIND))
++				return -1;
+ 		}
+ 		if (sk->sk_bound_dev_if) {
+ 			if (sk->sk_bound_dev_if != dif)
+@@ -173,7 +179,6 @@ static inline int compute_score(struct s
+  * wildcarded during the search since they can never be otherwise.
+  */
+ 
+-
+ struct sock *__inet_lookup_listener(struct net *net,
+ 				    struct inet_hashinfo *hashinfo,
+ 				    const __be32 daddr, const unsigned short hnum,
+@@ -196,6 +201,7 @@ begin:
+ 			hiscore = score;
+ 		}
+ 	}
++
+ 	/*
+ 	 * if the nulls value we got at the end of this lookup is
+ 	 * not the expected one, we must restart lookup.
+diff -NurpP --minimal linux-3.7.10/net/ipv4/netfilter.c linux-3.7.10-vs2.3.5.6/net/ipv4/netfilter.c
+--- linux-3.7.10/net/ipv4/netfilter.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/netfilter.c	2012-12-18 15:13:16.000000000 +0000
+@@ -6,7 +6,7 @@
+ #include <linux/skbuff.h>
+ #include <linux/gfp.h>
+ #include <linux/export.h>
+-#include <net/route.h>
++// #include <net/route.h>
+ #include <net/xfrm.h>
+ #include <net/ip.h>
+ #include <net/netfilter/nf_queue.h>
+diff -NurpP --minimal linux-3.7.10/net/ipv4/raw.c linux-3.7.10-vs2.3.5.6/net/ipv4/raw.c
+--- linux-3.7.10/net/ipv4/raw.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/raw.c	2013-02-19 14:41:41.000000000 +0000
+@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
+ 
+ 		if (net_eq(sock_net(sk), net) && inet->inet_num == num	&&
+ 		    !(inet->inet_daddr && inet->inet_daddr != raddr) 	&&
+-		    !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
++		    v4_sock_addr_match(sk->sk_nx_info, inet, laddr)	&&
+ 		    !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
+ 			goto found; /* gotcha */
+ 	}
+@@ -397,6 +397,12 @@ static int raw_send_hdrinc(struct sock *
+ 		icmp_out_count(net, ((struct icmphdr *)
+ 			skb_transport_header(skb))->type);
+ 
++	err = -EPERM;
++	if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
++		sk->sk_nx_info &&
++		!v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
++		goto error_free;
++
+ 	err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL,
+ 		      rt->dst.dev, dst_output);
+ 	if (err > 0)
+@@ -582,6 +588,16 @@ static int raw_sendmsg(struct kiocb *ioc
+ 			goto done;
+ 	}
+ 
++	if (sk->sk_nx_info) {
++		rt = ip_v4_find_src(sock_net(sk), sk->sk_nx_info, &fl4);
++		if (IS_ERR(rt)) {
++			err = PTR_ERR(rt);
++			rt = NULL;
++			goto done;
++		}
++		ip_rt_put(rt);
++	}
++
+ 	security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+ 	rt = ip_route_output_flow(sock_net(sk), &fl4, sk);
+ 	if (IS_ERR(rt)) {
+@@ -658,17 +674,19 @@ static int raw_bind(struct sock *sk, str
+ {
+ 	struct inet_sock *inet = inet_sk(sk);
+ 	struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
++	struct nx_v4_sock_addr nsa = { 0 };
+ 	int ret = -EINVAL;
+ 	int chk_addr_ret;
+ 
+ 	if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
+ 		goto out;
+-	chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr);
++	v4_map_sock_addr(inet, addr, &nsa);
++	chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr);
+ 	ret = -EADDRNOTAVAIL;
+-	if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
++	if (nsa.saddr && chk_addr_ret != RTN_LOCAL &&
+ 	    chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
+ 		goto out;
+-	inet->inet_rcv_saddr = inet->inet_saddr = addr->sin_addr.s_addr;
++	v4_set_sock_addr(inet, &nsa);
+ 	if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
+ 		inet->inet_saddr = 0;  /* Use device */
+ 	sk_dst_reset(sk);
+@@ -720,7 +738,8 @@ static int raw_recvmsg(struct kiocb *ioc
+ 	/* Copy the address. */
+ 	if (sin) {
+ 		sin->sin_family = AF_INET;
+-		sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++		sin->sin_addr.s_addr =
++			nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr);
+ 		sin->sin_port = 0;
+ 		memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
+ 	}
+@@ -917,7 +936,8 @@ static struct sock *raw_get_first(struct
+ 		struct hlist_node *node;
+ 
+ 		sk_for_each(sk, node, &state->h->ht[state->bucket])
+-			if (sock_net(sk) == seq_file_net(seq))
++			if ((sock_net(sk) == seq_file_net(seq)) &&
++				nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
+ 				goto found;
+ 	}
+ 	sk = NULL;
+@@ -933,7 +953,8 @@ static struct sock *raw_get_next(struct
+ 		sk = sk_next(sk);
+ try_again:
+ 		;
+-	} while (sk && sock_net(sk) != seq_file_net(seq));
++	} while (sk && ((sock_net(sk) != seq_file_net(seq)) ||
++		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 
+ 	if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
+ 		sk = sk_head(&state->h->ht[state->bucket]);
+diff -NurpP --minimal linux-3.7.10/net/ipv4/route.c linux-3.7.10-vs2.3.5.6/net/ipv4/route.c
+--- linux-3.7.10/net/ipv4/route.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/route.c	2013-02-19 14:41:41.000000000 +0000
+@@ -2002,7 +2002,7 @@ struct rtable *__ip_route_output_key(str
+ 
+ 
+ 	if (fl4->flowi4_oif) {
+-		dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif);
++		dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif);
+ 		rth = ERR_PTR(-ENODEV);
+ 		if (dev_out == NULL)
+ 			goto out;
+diff -NurpP --minimal linux-3.7.10/net/ipv4/tcp.c linux-3.7.10-vs2.3.5.6/net/ipv4/tcp.c
+--- linux-3.7.10/net/ipv4/tcp.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/tcp.c	2013-02-19 14:41:41.000000000 +0000
+@@ -268,6 +268,7 @@
+ #include <linux/crypto.h>
+ #include <linux/time.h>
+ #include <linux/slab.h>
++#include <linux/in.h>
+ 
+ #include <net/icmp.h>
+ #include <net/inet_common.h>
+diff -NurpP --minimal linux-3.7.10/net/ipv4/tcp_ipv4.c linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_ipv4.c
+--- linux-3.7.10/net/ipv4/tcp_ipv4.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_ipv4.c	2013-02-19 14:41:41.000000000 +0000
+@@ -2261,6 +2261,12 @@ static void *listening_get_next(struct s
+ 		req = req->dl_next;
+ 		while (1) {
+ 			while (req) {
++				vxdprintk(VXD_CBIT(net, 6),
++					"sk,req: %p [#%d] (from %d)", req->sk,
++					(req->sk)?req->sk->sk_nid:0, nx_current_nid());
++				if (req->sk &&
++					!nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (req->rsk_ops->family == st->family) {
+ 					cur = req;
+ 					goto out;
+@@ -2285,6 +2291,10 @@ get_req:
+ 	}
+ get_sk:
+ 	sk_nulls_for_each_from(sk, node) {
++		vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)",
++			sk, sk->sk_nid, nx_current_nid());
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (!net_eq(sock_net(sk), net))
+ 			continue;
+ 		if (sk->sk_family == st->family) {
+@@ -2361,6 +2371,11 @@ static void *established_get_first(struc
+ 
+ 		spin_lock_bh(lock);
+ 		sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
++			vxdprintk(VXD_CBIT(net, 6),
++				"sk,egf: %p [#%d] (from %d)",
++				sk, sk->sk_nid, nx_current_nid());
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (sk->sk_family != st->family ||
+ 			    !net_eq(sock_net(sk), net)) {
+ 				continue;
+@@ -2371,6 +2386,11 @@ static void *established_get_first(struc
+ 		st->state = TCP_SEQ_STATE_TIME_WAIT;
+ 		inet_twsk_for_each(tw, node,
+ 				   &tcp_hashinfo.ehash[st->bucket].twchain) {
++			vxdprintk(VXD_CBIT(net, 6),
++				"tw: %p [#%d] (from %d)",
++				tw, tw->tw_nid, nx_current_nid());
++			if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (tw->tw_family != st->family ||
+ 			    !net_eq(twsk_net(tw), net)) {
+ 				continue;
+@@ -2400,7 +2420,9 @@ static void *established_get_next(struct
+ 		tw = cur;
+ 		tw = tw_next(tw);
+ get_tw:
+-		while (tw && (tw->tw_family != st->family || !net_eq(twsk_net(tw), net))) {
++		while (tw && (tw->tw_family != st->family ||
++			!net_eq(twsk_net(tw), net) ||
++			!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) {
+ 			tw = tw_next(tw);
+ 		}
+ 		if (tw) {
+@@ -2424,6 +2446,11 @@ get_tw:
+ 		sk = sk_nulls_next(sk);
+ 
+ 	sk_nulls_for_each_from(sk, node) {
++		vxdprintk(VXD_CBIT(net, 6),
++			"sk,egn: %p [#%d] (from %d)",
++			sk, sk->sk_nid, nx_current_nid());
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
+ 			goto found;
+ 	}
+@@ -2629,9 +2656,9 @@ static void get_openreq4(const struct so
+ 	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
+ 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
+ 		i,
+-		ireq->loc_addr,
++		nx_map_sock_lback(current_nx_info(), ireq->loc_addr),
+ 		ntohs(inet_sk(sk)->inet_sport),
+-		ireq->rmt_addr,
++		nx_map_sock_lback(current_nx_info(), ireq->rmt_addr),
+ 		ntohs(ireq->rmt_port),
+ 		TCP_SYN_RECV,
+ 		0, 0, /* could print option size, but that is af dependent. */
+@@ -2654,8 +2681,8 @@ static void get_tcp4_sock(struct sock *s
+ 	const struct inet_connection_sock *icsk = inet_csk(sk);
+ 	const struct inet_sock *inet = inet_sk(sk);
+ 	struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq;
+-	__be32 dest = inet->inet_daddr;
+-	__be32 src = inet->inet_rcv_saddr;
++	__be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++	__be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ 	__u16 destp = ntohs(inet->inet_dport);
+ 	__u16 srcp = ntohs(inet->inet_sport);
+ 	int rx_queue;
+@@ -2711,8 +2738,8 @@ static void get_timewait4_sock(const str
+ 	__u16 destp, srcp;
+ 	long delta = tw->tw_ttd - jiffies;
+ 
+-	dest  = tw->tw_daddr;
+-	src   = tw->tw_rcv_saddr;
++	dest  = nx_map_sock_lback(current_nx_info(), tw->tw_daddr);
++	src   = nx_map_sock_lback(current_nx_info(), tw->tw_rcv_saddr);
+ 	destp = ntohs(tw->tw_dport);
+ 	srcp  = ntohs(tw->tw_sport);
+ 
+diff -NurpP --minimal linux-3.7.10/net/ipv4/tcp_minisocks.c linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_minisocks.c
+--- linux-3.7.10/net/ipv4/tcp_minisocks.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/tcp_minisocks.c	2012-12-18 15:13:16.000000000 +0000
+@@ -23,6 +23,9 @@
+ #include <linux/slab.h>
+ #include <linux/sysctl.h>
+ #include <linux/workqueue.h>
++#include <linux/vs_limit.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_context.h>
+ #include <net/tcp.h>
+ #include <net/inet_common.h>
+ #include <net/xfrm.h>
+@@ -289,6 +292,11 @@ void tcp_time_wait(struct sock *sk, int
+ 		tcptw->tw_ts_recent	= tp->rx_opt.ts_recent;
+ 		tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp;
+ 
++		tw->tw_xid		= sk->sk_xid;
++		tw->tw_vx_info		= NULL;
++		tw->tw_nid		= sk->sk_nid;
++		tw->tw_nx_info		= NULL;
++
+ #if IS_ENABLED(CONFIG_IPV6)
+ 		if (tw->tw_family == PF_INET6) {
+ 			struct ipv6_pinfo *np = inet6_sk(sk);
+diff -NurpP --minimal linux-3.7.10/net/ipv4/udp.c linux-3.7.10-vs2.3.5.6/net/ipv4/udp.c
+--- linux-3.7.10/net/ipv4/udp.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv4/udp.c	2013-02-19 14:41:41.000000000 +0000
+@@ -300,14 +300,7 @@ fail:
+ }
+ EXPORT_SYMBOL(udp_lib_get_port);
+ 
+-static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+-{
+-	struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
+-
+-	return 	(!ipv6_only_sock(sk2)  &&
+-		 (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr ||
+-		   inet1->inet_rcv_saddr == inet2->inet_rcv_saddr));
+-}
++extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *);
+ 
+ static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr,
+ 				       unsigned int port)
+@@ -342,6 +335,11 @@ static inline int compute_score(struct s
+ 			if (inet->inet_rcv_saddr != daddr)
+ 				return -1;
+ 			score += 2;
++		} else {
++			/* block non nx_info ips */
++			if (!v4_addr_in_nx_info(sk->sk_nx_info,
++				daddr, NXA_MASK_BIND))
++				return -1;
+ 		}
+ 		if (inet->inet_daddr) {
+ 			if (inet->inet_daddr != saddr)
+@@ -445,6 +443,7 @@ exact_match:
+ 	return result;
+ }
+ 
++
+ /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
+  * harder than this. -DaveM
+  */
+@@ -490,6 +489,11 @@ begin:
+ 	sk_nulls_for_each_rcu(sk, node, &hslot->head) {
+ 		score = compute_score(sk, net, saddr, hnum, sport,
+ 				      daddr, dport, dif);
++		/* FIXME: disabled?
++		if (score == 9) {
++			result = sk;
++			break;
++		} else */
+ 		if (score > badness) {
+ 			result = sk;
+ 			badness = score;
+@@ -503,6 +507,7 @@ begin:
+ 	if (get_nulls_value(node) != slot)
+ 		goto begin;
+ 
++
+ 	if (result) {
+ 		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
+ 			result = NULL;
+@@ -512,6 +517,7 @@ begin:
+ 			goto begin;
+ 		}
+ 	}
++
+ 	rcu_read_unlock();
+ 	return result;
+ }
+@@ -555,8 +561,7 @@ static inline struct sock *udp_v4_mcast_
+ 		    udp_sk(s)->udp_port_hash != hnum ||
+ 		    (inet->inet_daddr && inet->inet_daddr != rmt_addr) ||
+ 		    (inet->inet_dport != rmt_port && inet->inet_dport) ||
+-		    (inet->inet_rcv_saddr &&
+-		     inet->inet_rcv_saddr != loc_addr) ||
++		    !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr)	||
+ 		    ipv6_only_sock(s) ||
+ 		    (s->sk_bound_dev_if && s->sk_bound_dev_if != dif))
+ 			continue;
+@@ -939,6 +944,16 @@ int udp_sendmsg(struct kiocb *iocb, stru
+ 				   inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
+ 				   faddr, saddr, dport, inet->inet_sport);
+ 
++		if (sk->sk_nx_info) {
++			rt = ip_v4_find_src(net, sk->sk_nx_info, fl4);
++			if (IS_ERR(rt)) {
++				err = PTR_ERR(rt);
++				rt = NULL;
++				goto out;
++			}
++			ip_rt_put(rt);
++		}
++
+ 		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
+ 		rt = ip_route_output_flow(net, fl4, sk);
+ 		if (IS_ERR(rt)) {
+@@ -1244,7 +1259,8 @@ try_again:
+ 	if (sin) {
+ 		sin->sin_family = AF_INET;
+ 		sin->sin_port = udp_hdr(skb)->source;
+-		sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
++		sin->sin_addr.s_addr = nx_map_sock_lback(
++			skb->sk->sk_nx_info, ip_hdr(skb)->saddr);
+ 		memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+ 	}
+ 	if (inet->cmsg_flags)
+@@ -1993,6 +2009,8 @@ static struct sock *udp_get_first(struct
+ 		sk_nulls_for_each(sk, node, &hslot->head) {
+ 			if (!net_eq(sock_net(sk), net))
+ 				continue;
++			if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++				continue;
+ 			if (sk->sk_family == state->family)
+ 				goto found;
+ 		}
+@@ -2010,7 +2028,9 @@ static struct sock *udp_get_next(struct
+ 
+ 	do {
+ 		sk = sk_nulls_next(sk);
+-	} while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
++	} while (sk && (!net_eq(sock_net(sk), net) ||
++		sk->sk_family != state->family ||
++		!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 
+ 	if (!sk) {
+ 		if (state->bucket <= state->udp_table->mask)
+@@ -2106,8 +2126,8 @@ static void udp4_format_sock(struct sock
+ 		int bucket, int *len)
+ {
+ 	struct inet_sock *inet = inet_sk(sp);
+-	__be32 dest = inet->inet_daddr;
+-	__be32 src  = inet->inet_rcv_saddr;
++	__be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr);
++	__be32 src = nx_map_sock_lback(current_nx_info(), inet->inet_rcv_saddr);
+ 	__u16 destp	  = ntohs(inet->inet_dport);
+ 	__u16 srcp	  = ntohs(inet->inet_sport);
+ 
+diff -NurpP --minimal linux-3.7.10/net/ipv6/Kconfig linux-3.7.10-vs2.3.5.6/net/ipv6/Kconfig
+--- linux-3.7.10/net/ipv6/Kconfig	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/Kconfig	2012-12-18 15:13:16.000000000 +0000
+@@ -4,8 +4,8 @@
+ 
+ #   IPv6 as module will cause a CRASH if you try to unload it
+ menuconfig IPV6
+-	tristate "The IPv6 protocol"
+-	default m
++	bool "The IPv6 protocol"
++	default n
+ 	---help---
+ 	  This is complemental support for the IP version 6.
+ 	  You will still be able to do traditional IPv4 networking as well.
+diff -NurpP --minimal linux-3.7.10/net/ipv6/addrconf.c linux-3.7.10-vs2.3.5.6/net/ipv6/addrconf.c
+--- linux-3.7.10/net/ipv6/addrconf.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/addrconf.c	2013-02-19 14:41:41.000000000 +0000
+@@ -92,6 +92,8 @@
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <linux/export.h>
++#include <linux/vs_network.h>
++#include <linux/vs_inet6.h>
+ 
+ /* Set to 3 to get tracing... */
+ #define ACONF_DEBUG 2
+@@ -1094,7 +1096,7 @@ out:
+ 
+ int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
+ 		       const struct in6_addr *daddr, unsigned int prefs,
+-		       struct in6_addr *saddr)
++		       struct in6_addr *saddr, struct nx_info *nxi)
+ {
+ 	struct ipv6_saddr_score scores[2],
+ 				*score = &scores[0], *hiscore = &scores[1];
+@@ -1166,6 +1168,8 @@ int ipv6_dev_get_saddr(struct net *net,
+ 					       dev->name);
+ 				continue;
+ 			}
++			if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1))
++				continue;
+ 
+ 			score->rule = -1;
+ 			bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
+@@ -3135,7 +3139,10 @@ static void if6_seq_stop(struct seq_file
+ static int if6_seq_show(struct seq_file *seq, void *v)
+ {
+ 	struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
+-	seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
++
++	if (nx_check(0, VS_ADMIN|VS_WATCH) ||
++	    v6_addr_in_nx_info(current_nx_info(), &ifp->addr, -1))
++		seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
+ 		   &ifp->addr,
+ 		   ifp->idev->dev->ifindex,
+ 		   ifp->prefix_len,
+@@ -3641,6 +3648,11 @@ static int in6_dump_addrs(struct inet6_d
+ 	struct ifacaddr6 *ifaca;
+ 	int err = 1;
+ 	int ip_idx = *p_ip_idx;
++	struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
++
++	/* disable ipv6 on non v6 guests */
++	if (nxi && !nx_info_has_v6(nxi))
++		return skb->len;
+ 
+ 	read_lock_bh(&idev->lock);
+ 	switch (type) {
+@@ -3651,6 +3663,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		list_for_each_entry(ifa, &idev->addr_list, if_list) {
+ 			if (++ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1))
++					continue;
+ 			err = inet6_fill_ifaddr(skb, ifa,
+ 						NETLINK_CB(cb->skb).portid,
+ 						cb->nlh->nlmsg_seq,
+@@ -3667,6 +3681,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		     ifmca = ifmca->next, ip_idx++) {
+ 			if (ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1))
++					continue;
+ 			err = inet6_fill_ifmcaddr(skb, ifmca,
+ 						  NETLINK_CB(cb->skb).portid,
+ 						  cb->nlh->nlmsg_seq,
+@@ -3682,6 +3698,8 @@ static int in6_dump_addrs(struct inet6_d
+ 		     ifaca = ifaca->aca_next, ip_idx++) {
+ 			if (ip_idx < s_ip_idx)
+ 				continue;
++				if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1))
++					continue;
+ 			err = inet6_fill_ifacaddr(skb, ifaca,
+ 						  NETLINK_CB(cb->skb).portid,
+ 						  cb->nlh->nlmsg_seq,
+@@ -4065,6 +4083,11 @@ static int inet6_dump_ifinfo(struct sk_b
+ 	struct inet6_dev *idev;
+ 	struct hlist_head *head;
+ 	struct hlist_node *node;
++	struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL;
++
++	/* FIXME: maybe disable ipv6 on non v6 guests?
++	if (skb->sk && skb->sk->sk_vx_info)
++		return skb->len; */
+ 
+ 	s_h = cb->args[0];
+ 	s_idx = cb->args[1];
+@@ -4076,6 +4099,8 @@ static int inet6_dump_ifinfo(struct sk_b
+ 		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
+ 			if (idx < s_idx)
+ 				goto cont;
++			if (!v6_dev_in_nx_info(dev, nxi))
++				goto cont;
+ 			idev = __in6_dev_get(dev);
+ 			if (!idev)
+ 				goto cont;
+diff -NurpP --minimal linux-3.7.10/net/ipv6/af_inet6.c linux-3.7.10-vs2.3.5.6/net/ipv6/af_inet6.c
+--- linux-3.7.10/net/ipv6/af_inet6.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/af_inet6.c	2012-12-18 15:13:16.000000000 +0000
+@@ -43,6 +43,8 @@
+ #include <linux/netdevice.h>
+ #include <linux/icmpv6.h>
+ #include <linux/netfilter_ipv6.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <net/ip.h>
+ #include <net/ipv6.h>
+@@ -160,9 +162,12 @@ lookup_protocol:
+ 	}
+ 
+ 	err = -EPERM;
++	if ((protocol == IPPROTO_ICMPV6) &&
++		nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
++		goto override;
+ 	if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+ 		goto out_rcu_unlock;
+-
++override:
+ 	sock->ops = answer->ops;
+ 	answer_prot = answer->prot;
+ 	answer_no_check = answer->no_check;
+@@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru
+ 	struct inet_sock *inet = inet_sk(sk);
+ 	struct ipv6_pinfo *np = inet6_sk(sk);
+ 	struct net *net = sock_net(sk);
++	struct nx_v6_sock_addr nsa;
+ 	__be32 v4addr = 0;
+ 	unsigned short snum;
+ 	int addr_type = 0;
+@@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru
+ 	if (addr->sin6_family != AF_INET6)
+ 		return -EAFNOSUPPORT;
+ 
++	err = v6_map_sock_addr(inet, addr, &nsa);
++	if (err)
++		return err;
++
+ 	addr_type = ipv6_addr_type(&addr->sin6_addr);
+ 	if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
+ 		return -EINVAL;
+@@ -308,6 +318,7 @@ int inet6_bind(struct socket *sock, stru
+ 		/* Reproduce AF_INET checks to make the bindings consistent */
+ 		v4addr = addr->sin6_addr.s6_addr32[3];
+ 		chk_addr_ret = inet_addr_type(net, v4addr);
++
+ 		if (!sysctl_ip_nonlocal_bind &&
+ 		    !(inet->freebind || inet->transparent) &&
+ 		    v4addr != htonl(INADDR_ANY) &&
+@@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru
+ 			err = -EADDRNOTAVAIL;
+ 			goto out;
+ 		}
++		if (!v4_addr_in_nx_info(sk->sk_nx_info, v4addr, NXA_MASK_BIND)) {
++			err = -EADDRNOTAVAIL;
++			goto out;
++		}
+ 	} else {
+ 		if (addr_type != IPV6_ADDR_ANY) {
+ 			struct net_device *dev = NULL;
+@@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru
+ 				}
+ 			}
+ 
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++				err = -EADDRNOTAVAIL;
++				goto out_unlock;
++			}
++
+ 			/* ipv4 addr of the socket is invalid.  Only the
+ 			 * unspecified and mapped address have a v4 equivalent.
+ 			 */
+@@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru
+ 		}
+ 	}
+ 
++	/* what's that for? */
++	v6_set_sock_addr(inet, &nsa);
++
+ 	inet->inet_rcv_saddr = v4addr;
+ 	inet->inet_saddr = v4addr;
+ 
+@@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s
+ 			return -ENOTCONN;
+ 		sin->sin6_port = inet->inet_dport;
+ 		sin->sin6_addr = np->daddr;
++		/* FIXME: remap lback? */
+ 		if (np->sndflow)
+ 			sin->sin6_flowinfo = np->flow_label;
+ 	} else {
++		/* FIXME: remap lback? */
+ 		if (ipv6_addr_any(&np->rcv_saddr))
+ 			sin->sin6_addr = np->saddr;
+ 		else
+diff -NurpP --minimal linux-3.7.10/net/ipv6/datagram.c linux-3.7.10-vs2.3.5.6/net/ipv6/datagram.c
+--- linux-3.7.10/net/ipv6/datagram.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/datagram.c	2012-12-18 15:13:16.000000000 +0000
+@@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s
+ 
+ 			rcu_read_lock();
+ 			if (fl6->flowi6_oif) {
+-				dev = dev_get_by_index_rcu(net, fl6->flowi6_oif);
++				dev = dev_get_by_index_real_rcu(net, fl6->flowi6_oif);
+ 				if (!dev) {
+ 					rcu_read_unlock();
+ 					return -ENODEV;
+diff -NurpP --minimal linux-3.7.10/net/ipv6/fib6_rules.c linux-3.7.10-vs2.3.5.6/net/ipv6/fib6_rules.c
+--- linux-3.7.10/net/ipv6/fib6_rules.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/fib6_rules.c	2012-12-18 15:13:16.000000000 +0000
+@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
+ 					       ip6_dst_idev(&rt->dst)->dev,
+ 					       &flp6->daddr,
+ 					       rt6_flags2srcprefs(flags),
+-					       &saddr))
++					       &saddr, NULL))
+ 				goto again;
+ 			if (!ipv6_prefix_equal(&saddr, &r->src.addr,
+ 					       r->src.plen))
+diff -NurpP --minimal linux-3.7.10/net/ipv6/inet6_hashtables.c linux-3.7.10-vs2.3.5.6/net/ipv6/inet6_hashtables.c
+--- linux-3.7.10/net/ipv6/inet6_hashtables.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/inet6_hashtables.c	2012-12-18 15:13:16.000000000 +0000
+@@ -16,6 +16,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/random.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <net/inet_connection_sock.h>
+ #include <net/inet_hashtables.h>
+@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established(
+ 	unsigned int slot = hash & hashinfo->ehash_mask;
+ 	struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
+ 
+-
+ 	rcu_read_lock();
+ begin:
+ 	sk_nulls_for_each_rcu(sk, node, &head->chain) {
+@@ -95,7 +95,7 @@ begin:
+ 				sock_put(sk);
+ 				goto begin;
+ 			}
+-		goto out;
++			goto out;
+ 		}
+ 	}
+ 	if (get_nulls_value(node) != slot)
+@@ -141,6 +141,9 @@ static inline int compute_score(struct s
+ 			if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
+ 				return -1;
+ 			score++;
++		} else {
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++				return -1;
+ 		}
+ 		if (sk->sk_bound_dev_if) {
+ 			if (sk->sk_bound_dev_if != dif)
+diff -NurpP --minimal linux-3.7.10/net/ipv6/ip6_output.c linux-3.7.10-vs2.3.5.6/net/ipv6/ip6_output.c
+--- linux-3.7.10/net/ipv6/ip6_output.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/ip6_output.c	2013-02-19 14:41:41.000000000 +0000
+@@ -964,7 +964,8 @@ static int ip6_dst_lookup_tail(struct so
+ 		struct rt6_info *rt = (struct rt6_info *) *dst;
+ 		err = ip6_route_get_saddr(net, rt, &fl6->daddr,
+ 					  sk ? inet6_sk(sk)->srcprefs : 0,
+-					  &fl6->saddr);
++					  &fl6->saddr,
++					  sk ? sk->sk_nx_info : NULL);
+ 		if (err)
+ 			goto out_err_release;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/ipv6/ndisc.c linux-3.7.10-vs2.3.5.6/net/ipv6/ndisc.c
+--- linux-3.7.10/net/ipv6/ndisc.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/ndisc.c	2013-01-16 00:19:03.000000000 +0000
+@@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev
+ 	} else {
+ 		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
+ 				       inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs,
+-				       &tmpaddr))
++				       &tmpaddr, NULL))
+ 			return;
+ 		src_addr = &tmpaddr;
+ 	}
+diff -NurpP --minimal linux-3.7.10/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.7.10-vs2.3.5.6/net/ipv6/netfilter/ip6t_MASQUERADE.c
+--- linux-3.7.10/net/ipv6/netfilter/ip6t_MASQUERADE.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/netfilter/ip6t_MASQUERADE.c	2012-12-18 15:13:16.000000000 +0000
+@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons
+ 			    ctinfo == IP_CT_RELATED_REPLY));
+ 
+ 	if (ipv6_dev_get_saddr(dev_net(par->out), par->out,
+-			       &ipv6_hdr(skb)->daddr, 0, &src) < 0)
++			       &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0)
+ 		return NF_DROP;
+ 
+ 	nfct_nat(ct)->masq_index = par->out->ifindex;
+diff -NurpP --minimal linux-3.7.10/net/ipv6/raw.c linux-3.7.10-vs2.3.5.6/net/ipv6/raw.c
+--- linux-3.7.10/net/ipv6/raw.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/raw.c	2012-12-18 15:13:16.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include <linux/icmpv6.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter_ipv6.h>
++#include <linux/vs_inet6.h>
+ #include <linux/skbuff.h>
+ #include <linux/compat.h>
+ #include <asm/uaccess.h>
+@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s
+ 				goto out_unlock;
+ 		}
+ 
++		if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) {
++			err = -EADDRNOTAVAIL;
++			if (dev)
++				dev_put(dev);
++			goto out;
++		}
++
+ 		/* ipv4 addr of the socket is invalid.  Only the
+ 		 * unspecified and mapped address have a v4 equivalent.
+ 		 */
+diff -NurpP --minimal linux-3.7.10/net/ipv6/route.c linux-3.7.10-vs2.3.5.6/net/ipv6/route.c
+--- linux-3.7.10/net/ipv6/route.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/route.c	2013-02-19 14:41:41.000000000 +0000
+@@ -57,6 +57,7 @@
+ #include <net/xfrm.h>
+ #include <net/netevent.h>
+ #include <net/netlink.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -2116,15 +2117,17 @@ int ip6_route_get_saddr(struct net *net,
+ 			struct rt6_info *rt,
+ 			const struct in6_addr *daddr,
+ 			unsigned int prefs,
+-			struct in6_addr *saddr)
++			struct in6_addr *saddr,
++			struct nx_info *nxi)
+ {
+ 	struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt);
+ 	int err = 0;
+-	if (rt->rt6i_prefsrc.plen)
++	if (rt->rt6i_prefsrc.plen && (!nxi ||
++	    v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR)))
+ 		*saddr = rt->rt6i_prefsrc.addr;
+ 	else
+ 		err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
+-					 daddr, prefs, saddr);
++					 daddr, prefs, saddr, nxi);
+ 	return err;
+ }
+ 
+@@ -2478,7 +2481,8 @@ static int rt6_fill_node(struct net *net
+ 				goto nla_put_failure;
+ 	} else if (dst) {
+ 		struct in6_addr saddr_buf;
+-		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 &&
++		if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf,
++		    (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 &&
+ 		    nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
+ 			goto nla_put_failure;
+ 	}
+@@ -2692,6 +2696,7 @@ static int rt6_info_route(struct rt6_inf
+ 	struct seq_file *m = p_arg;
+ 	struct neighbour *n;
+ 
++	/* FIXME: check for network context? */
+ 	seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
+ 
+ #ifdef CONFIG_IPV6_SUBTREES
+diff -NurpP --minimal linux-3.7.10/net/ipv6/tcp_ipv6.c linux-3.7.10-vs2.3.5.6/net/ipv6/tcp_ipv6.c
+--- linux-3.7.10/net/ipv6/tcp_ipv6.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/tcp_ipv6.c	2013-01-16 00:19:03.000000000 +0000
+@@ -71,6 +71,7 @@
+ 
+ #include <linux/crypto.h>
+ #include <linux/scatterlist.h>
++#include <linux/vs_inet6.h>
+ 
+ static void	tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
+ static void	tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
+@@ -175,8 +176,15 @@ static int tcp_v6_connect(struct sock *s
+ 	 *	connect() to INADDR_ANY means loopback (BSD'ism).
+ 	 */
+ 
+-	if(ipv6_addr_any(&usin->sin6_addr))
+-		usin->sin6_addr.s6_addr[15] = 0x1;
++	if(ipv6_addr_any(&usin->sin6_addr)) {
++		struct nx_info *nxi =  sk->sk_nx_info;
++
++		if (nxi && nx_info_has_v6(nxi))
++			/* FIXME: remap lback? */
++			usin->sin6_addr = nxi->v6.ip;
++		else
++			usin->sin6_addr.s6_addr[15] = 0x1;
++	}
+ 
+ 	addr_type = ipv6_addr_type(&usin->sin6_addr);
+ 
+diff -NurpP --minimal linux-3.7.10/net/ipv6/udp.c linux-3.7.10-vs2.3.5.6/net/ipv6/udp.c
+--- linux-3.7.10/net/ipv6/udp.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/udp.c	2012-12-18 15:13:16.000000000 +0000
+@@ -45,42 +45,68 @@
+ #include <net/tcp_states.h>
+ #include <net/ip6_checksum.h>
+ #include <net/xfrm.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #include <trace/events/skb.h>
+ #include "udp_impl.h"
+ 
+-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
++int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+ {
+-	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
++	const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr;
+ 	const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
+-	__be32 sk1_rcv_saddr = sk_rcv_saddr(sk);
++	__be32 sk1_rcv_saddr = sk_rcv_saddr(sk1);
+ 	__be32 sk2_rcv_saddr = sk_rcv_saddr(sk2);
+-	int sk_ipv6only = ipv6_only_sock(sk);
++	int sk1_ipv6only = ipv6_only_sock(sk1);
+ 	int sk2_ipv6only = inet_v6_ipv6only(sk2);
+-	int addr_type = ipv6_addr_type(sk_rcv_saddr6);
++	int addr_type = ipv6_addr_type(sk1_rcv_saddr6);
+ 	int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
+ 
+ 	/* if both are mapped, treat as IPv4 */
+-	if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED)
+-		return (!sk2_ipv6only &&
++	if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) {
++		if (!sk2_ipv6only &&
+ 			(!sk1_rcv_saddr || !sk2_rcv_saddr ||
+-			  sk1_rcv_saddr == sk2_rcv_saddr));
++			  sk1_rcv_saddr == sk2_rcv_saddr))
++			goto vs_v4;
++		else
++			return 0;
++	}
+ 
+ 	if (addr_type2 == IPV6_ADDR_ANY &&
+ 	    !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
+-		return 1;
++		goto vs;
+ 
+ 	if (addr_type == IPV6_ADDR_ANY &&
+-	    !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
+-		return 1;
++	    !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
++		goto vs;
+ 
+ 	if (sk2_rcv_saddr6 &&
+-	    ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6))
+-		return 1;
++	    ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6))
++		goto vs;
+ 
+ 	return 0;
++
++vs_v4:
++	if (!sk1_rcv_saddr && !sk2_rcv_saddr)
++		return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++	if (!sk2_rcv_saddr)
++		return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1);
++	if (!sk1_rcv_saddr)
++		return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1);
++	return 1;
++vs:
++	if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY)
++		return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++	else if (addr_type2 == IPV6_ADDR_ANY)
++		return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1);
++	else if (addr_type == IPV6_ADDR_ANY) {
++		if (addr_type2 == IPV6_ADDR_MAPPED)
++			return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info);
++		else
++			return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1);
++	}
++	return 1;
+ }
+ 
+ static unsigned int udp6_portaddr_hash(struct net *net,
+@@ -144,6 +170,10 @@ static inline int compute_score(struct s
+ 			if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
+ 				return -1;
+ 			score++;
++		} else {
++			/* block non nx_info ips */
++			if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1))
++				return -1;
+ 		}
+ 		if (!ipv6_addr_any(&np->daddr)) {
+ 			if (!ipv6_addr_equal(&np->daddr, saddr))
+diff -NurpP --minimal linux-3.7.10/net/ipv6/xfrm6_policy.c linux-3.7.10-vs2.3.5.6/net/ipv6/xfrm6_policy.c
+--- linux-3.7.10/net/ipv6/xfrm6_policy.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/ipv6/xfrm6_policy.c	2012-12-18 15:13:16.000000000 +0000
+@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
+ 	dev = ip6_dst_idev(dst)->dev;
+ 	ipv6_dev_get_saddr(dev_net(dev), dev,
+ 			   (struct in6_addr *)&daddr->a6, 0,
+-			   (struct in6_addr *)&saddr->a6);
++			   (struct in6_addr *)&saddr->a6, NULL);
+ 	dst_release(dst);
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7.10-vs2.3.5.6/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.7.10/net/netfilter/ipvs/ip_vs_xmit.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/netfilter/ipvs/ip_vs_xmit.c	2012-12-18 15:13:16.000000000 +0000
+@@ -273,7 +273,7 @@ __ip_vs_route_output_v6(struct net *net,
+ 		return dst;
+ 	if (ipv6_addr_any(&fl6.saddr) &&
+ 	    ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev,
+-			       &fl6.daddr, 0, &fl6.saddr) < 0)
++			       &fl6.daddr, 0, &fl6.saddr, NULL) < 0)
+ 		goto out_err;
+ 	if (do_xfrm) {
+ 		dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
+diff -NurpP --minimal linux-3.7.10/net/netlink/af_netlink.c linux-3.7.10-vs2.3.5.6/net/netlink/af_netlink.c
+--- linux-3.7.10/net/netlink/af_netlink.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/netlink/af_netlink.c	2012-12-18 15:13:16.000000000 +0000
+@@ -55,6 +55,9 @@
+ #include <linux/types.h>
+ #include <linux/audit.h>
+ #include <linux/mutex.h>
++#include <linux/vs_context.h>
++#include <linux/vs_network.h>
++#include <linux/vs_limit.h>
+ 
+ #include <net/net_namespace.h>
+ #include <net/sock.h>
+@@ -1981,6 +1984,8 @@ static struct sock *netlink_seq_socket_i
+ 			sk_for_each(s, node, &hash->table[j]) {
+ 				if (sock_net(s) != seq_file_net(seq))
+ 					continue;
++				if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++					continue;
+ 				if (off == pos) {
+ 					iter->link = i;
+ 					iter->hash_idx = j;
+@@ -2015,7 +2020,8 @@ static void *netlink_seq_next(struct seq
+ 	s = v;
+ 	do {
+ 		s = sk_next(s);
+-	} while (s && sock_net(s) != seq_file_net(seq));
++	} while (s && (sock_net(s) != seq_file_net(seq) ||
++		!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)));
+ 	if (s)
+ 		return s;
+ 
+@@ -2027,7 +2033,8 @@ static void *netlink_seq_next(struct seq
+ 
+ 		for (; j <= hash->mask; j++) {
+ 			s = sk_head(&hash->table[j]);
+-			while (s && sock_net(s) != seq_file_net(seq))
++			while (s && (sock_net(s) != seq_file_net(seq) ||
++				!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)))
+ 				s = sk_next(s);
+ 			if (s) {
+ 				iter->link = i;
+diff -NurpP --minimal linux-3.7.10/net/socket.c linux-3.7.10-vs2.3.5.6/net/socket.c
+--- linux-3.7.10/net/socket.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/socket.c	2012-12-18 15:13:16.000000000 +0000
+@@ -99,6 +99,10 @@
+ 
+ #include <net/sock.h>
+ #include <linux/netfilter.h>
++#include <linux/vs_base.h>
++#include <linux/vs_socket.h>
++#include <linux/vs_inet.h>
++#include <linux/vs_inet6.h>
+ 
+ #include <linux/if_tun.h>
+ #include <linux/ipv6_route.h>
+@@ -619,6 +623,7 @@ static inline int __sock_sendmsg_nosec(s
+ 				       struct msghdr *msg, size_t size)
+ {
+ 	struct sock_iocb *si = kiocb_to_siocb(iocb);
++	size_t len;
+ 
+ 	sock_update_classid(sock->sk);
+ 
+@@ -627,7 +632,22 @@ static inline int __sock_sendmsg_nosec(s
+ 	si->msg = msg;
+ 	si->size = size;
+ 
+-	return sock->ops->sendmsg(iocb, sock, msg, size);
++	len = sock->ops->sendmsg(iocb, sock, msg, size);
++	if (sock->sk) {
++		if (len == size)
++			vx_sock_send(sock->sk, size);
++		else
++			vx_sock_fail(sock->sk, size);
++	}
++	vxdprintk(VXD_CBIT(net, 7),
++		"__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu",
++		sock, sock->sk,
++		(sock->sk)?sock->sk->sk_nx_info:0,
++		(sock->sk)?sock->sk->sk_vx_info:0,
++		(sock->sk)?sock->sk->sk_xid:0,
++		(sock->sk)?sock->sk->sk_nid:0,
++		(unsigned int)size, len);
++	return len;
+ }
+ 
+ static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
+@@ -783,6 +803,7 @@ static inline int __sock_recvmsg_nosec(s
+ 				       struct msghdr *msg, size_t size, int flags)
+ {
+ 	struct sock_iocb *si = kiocb_to_siocb(iocb);
++	int len;
+ 
+ 	sock_update_classid(sock->sk);
+ 
+@@ -792,7 +813,18 @@ static inline int __sock_recvmsg_nosec(s
+ 	si->size = size;
+ 	si->flags = flags;
+ 
+-	return sock->ops->recvmsg(iocb, sock, msg, size, flags);
++	len = sock->ops->recvmsg(iocb, sock, msg, size, flags);
++	if ((len >= 0) && sock->sk)
++		vx_sock_recv(sock->sk, len);
++	vxdprintk(VXD_CBIT(net, 7),
++		"__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d",
++		sock, sock->sk,
++		(sock->sk)?sock->sk->sk_nx_info:0,
++		(sock->sk)?sock->sk->sk_vx_info:0,
++		(sock->sk)?sock->sk->sk_xid:0,
++		(sock->sk)?sock->sk->sk_nid:0,
++		(unsigned int)size, len);
++	return len;
+ }
+ 
+ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
+@@ -1277,6 +1309,13 @@ int __sock_create(struct net *net, int f
+ 	if (type < 0 || type >= SOCK_MAX)
+ 		return -EINVAL;
+ 
++	if (!nx_check(0, VS_ADMIN)) {
++		if (family == PF_INET && !current_nx_info_has_v4())
++			return -EAFNOSUPPORT;
++		if (family == PF_INET6 && !current_nx_info_has_v6())
++			return -EAFNOSUPPORT;
++	}
++
+ 	/* Compatibility.
+ 
+ 	   This uglymoron is moved from INET layer to here to avoid
+@@ -1411,6 +1450,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+ 	if (retval < 0)
+ 		goto out;
+ 
++	set_bit(SOCK_USER_SOCKET, &sock->flags);
+ 	retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
+ 	if (retval < 0)
+ 		goto out_release;
+@@ -1452,10 +1492,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+ 	err = sock_create(family, type, protocol, &sock1);
+ 	if (err < 0)
+ 		goto out;
++	set_bit(SOCK_USER_SOCKET, &sock1->flags);
+ 
+ 	err = sock_create(family, type, protocol, &sock2);
+ 	if (err < 0)
+ 		goto out_release_1;
++	set_bit(SOCK_USER_SOCKET, &sock2->flags);
+ 
+ 	err = sock1->ops->socketpair(sock1, sock2);
+ 	if (err < 0)
+diff -NurpP --minimal linux-3.7.10/net/sunrpc/auth.c linux-3.7.10-vs2.3.5.6/net/sunrpc/auth.c
+--- linux-3.7.10/net/sunrpc/auth.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/sunrpc/auth.c	2012-12-18 15:13:16.000000000 +0000
+@@ -15,6 +15,7 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/gss_api.h>
+ #include <linux/spinlock.h>
++#include <linux/vs_tag.h>
+ 
+ #ifdef RPC_DEBUG
+ # define RPCDBG_FACILITY	RPCDBG_AUTH
+@@ -481,6 +482,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
+ 	memset(&acred, 0, sizeof(acred));
+ 	acred.uid = cred->fsuid;
+ 	acred.gid = cred->fsgid;
++	acred.tag = dx_current_tag();
+ 	acred.group_info = get_group_info(((struct cred *)cred)->group_info);
+ 
+ 	ret = auth->au_ops->lookup_cred(auth, &acred, flags);
+@@ -521,6 +523,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+ 	struct auth_cred acred = {
+ 		.uid = 0,
+ 		.gid = 0,
++		.tag = dx_current_tag(),
+ 	};
+ 
+ 	dprintk("RPC: %5u looking up %s cred\n",
+diff -NurpP --minimal linux-3.7.10/net/sunrpc/auth_unix.c linux-3.7.10-vs2.3.5.6/net/sunrpc/auth_unix.c
+--- linux-3.7.10/net/sunrpc/auth_unix.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/sunrpc/auth_unix.c	2012-12-18 15:13:16.000000000 +0000
+@@ -13,11 +13,13 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/auth.h>
+ #include <linux/user_namespace.h>
++#include <linux/vs_tag.h>
+ 
+ #define NFS_NGROUPS	16
+ 
+ struct unx_cred {
+ 	struct rpc_cred		uc_base;
++	tag_t			uc_tag;
+ 	gid_t			uc_gid;
+ 	gid_t			uc_gids[NFS_NGROUPS];
+ };
+@@ -79,6 +81,7 @@ unx_create_cred(struct rpc_auth *auth, s
+ 		groups = NFS_NGROUPS;
+ 
+ 	cred->uc_gid = acred->gid;
++	cred->uc_tag = acred->tag;
+ 	for (i = 0; i < groups; i++) {
+ 		gid_t gid;
+ 		gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
+@@ -123,7 +126,9 @@ unx_match(struct auth_cred *acred, struc
+ 	unsigned int i;
+ 
+ 
+-	if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)
++	if (cred->uc_uid != acred->uid ||
++		cred->uc_gid != acred->gid ||
++		cred->uc_tag != acred->tag)
+ 		return 0;
+ 
+ 	if (acred->group_info != NULL)
+@@ -152,7 +157,7 @@ unx_marshal(struct rpc_task *task, __be3
+ 	struct rpc_clnt	*clnt = task->tk_client;
+ 	struct unx_cred	*cred = container_of(task->tk_rqstp->rq_cred, struct unx_cred, uc_base);
+ 	__be32		*base, *hold;
+-	int		i;
++	int		i, tag;
+ 
+ 	*p++ = htonl(RPC_AUTH_UNIX);
+ 	base = p++;
+@@ -162,9 +167,12 @@ unx_marshal(struct rpc_task *task, __be3
+ 	 * Copy the UTS nodename captured when the client was created.
+ 	 */
+ 	p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
++	tag = task->tk_client->cl_tag;
+ 
+-	*p++ = htonl((u32) cred->uc_uid);
+-	*p++ = htonl((u32) cred->uc_gid);
++	*p++ = htonl((u32) TAGINO_UID(tag,
++		cred->uc_uid, cred->uc_tag));
++	*p++ = htonl((u32) TAGINO_GID(tag,
++		cred->uc_gid, cred->uc_tag));
+ 	hold = p++;
+ 	for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
+ 		*p++ = htonl((u32) cred->uc_gids[i]);
+diff -NurpP --minimal linux-3.7.10/net/sunrpc/clnt.c linux-3.7.10-vs2.3.5.6/net/sunrpc/clnt.c
+--- linux-3.7.10/net/sunrpc/clnt.c	2013-03-02 09:55:02.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/sunrpc/clnt.c	2013-02-05 01:14:43.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <linux/in6.h>
+ #include <linux/un.h>
+ #include <linux/rcupdate.h>
++#include <linux/vs_cvirt.h>
+ 
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/rpc_pipe_fs.h>
+@@ -481,6 +482,9 @@ struct rpc_clnt *rpc_create(struct rpc_c
+ 	if (!(args->flags & RPC_CLNT_CREATE_QUIET))
+ 		clnt->cl_chatty = 1;
+ 
++	/* TODO: handle RPC_CLNT_CREATE_TAGGED
++	if (args->flags & RPC_CLNT_CREATE_TAGGED)
++		clnt->cl_tag = 1; */
+ 	return clnt;
+ }
+ EXPORT_SYMBOL_GPL(rpc_create);
+diff -NurpP --minimal linux-3.7.10/net/unix/af_unix.c linux-3.7.10-vs2.3.5.6/net/unix/af_unix.c
+--- linux-3.7.10/net/unix/af_unix.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/net/unix/af_unix.c	2012-12-18 15:13:16.000000000 +0000
+@@ -114,6 +114,8 @@
+ #include <linux/mount.h>
+ #include <net/checksum.h>
+ #include <linux/security.h>
++#include <linux/vs_context.h>
++#include <linux/vs_limit.h>
+ 
+ struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
+ EXPORT_SYMBOL_GPL(unix_socket_table);
+@@ -271,6 +273,8 @@ static struct sock *__unix_find_socket_b
+ 		if (!net_eq(sock_net(s), net))
+ 			continue;
+ 
++		if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (u->addr->len == len &&
+ 		    !memcmp(u->addr->name, sunname, len))
+ 			goto found;
+@@ -2259,6 +2263,8 @@ static struct sock *unix_from_bucket(str
+ 	for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
+ 		if (sock_net(sk) != seq_file_net(seq))
+ 			continue;
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (++count == offset)
+ 			break;
+ 	}
+@@ -2276,6 +2282,8 @@ static struct sock *unix_next_socket(str
+ 		sk = sk_next(sk);
+ 		if (!sk)
+ 			goto next_bucket;
++		if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT))
++			continue;
+ 		if (sock_net(sk) == seq_file_net(seq))
+ 			return sk;
+ 	}
+diff -NurpP --minimal linux-3.7.10/scripts/checksyscalls.sh linux-3.7.10-vs2.3.5.6/scripts/checksyscalls.sh
+--- linux-3.7.10/scripts/checksyscalls.sh	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/scripts/checksyscalls.sh	2012-12-18 15:13:16.000000000 +0000
+@@ -193,7 +193,6 @@ cat << EOF
+ #define __IGNORE_afs_syscall
+ #define __IGNORE_getpmsg
+ #define __IGNORE_putpmsg
+-#define __IGNORE_vserver
+ EOF
+ }
+ 
+diff -NurpP --minimal linux-3.7.10/security/commoncap.c linux-3.7.10-vs2.3.5.6/security/commoncap.c
+--- linux-3.7.10/security/commoncap.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/security/commoncap.c	2012-12-18 15:13:16.000000000 +0000
+@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
+ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
+ 		int cap, int audit)
+ {
++	struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */
++
+ 	for (;;) {
+ 		/* The owner of the user namespace has all caps. */
+ 		if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner, cred->euid))
+ 			return 0;
+ 
+ 		/* Do we have the necessary capabilities? */
+-		if (targ_ns == cred->user_ns)
+-			return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
++		if (targ_ns == cred->user_ns) {
++			if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
++			    cap_raised(cred->cap_effective, cap))
++				return 0;
++			return vx_cap_raised(vxi, cred->cap_effective, cap) ? 0 : -EPERM;
++		}
+ 
+ 		/* Have we tried all of the parent namespaces? */
+ 		if (targ_ns == &init_user_ns)
+@@ -619,7 +625,7 @@ int cap_inode_setxattr(struct dentry *de
+ 
+ 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ 		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+-	    !capable(CAP_SYS_ADMIN))
++		!vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ 		return -EPERM;
+ 	return 0;
+ }
+@@ -645,7 +651,7 @@ int cap_inode_removexattr(struct dentry
+ 
+ 	if (!strncmp(name, XATTR_SECURITY_PREFIX,
+ 		     sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+-	    !capable(CAP_SYS_ADMIN))
++		!vx_capable(CAP_SYS_ADMIN, VXC_FS_SECURITY))
+ 		return -EPERM;
+ 	return 0;
+ }
+diff -NurpP --minimal linux-3.7.10/security/selinux/hooks.c linux-3.7.10-vs2.3.5.6/security/selinux/hooks.c
+--- linux-3.7.10/security/selinux/hooks.c	2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.10-vs2.3.5.6/security/selinux/hooks.c	2012-12-18 15:13:16.000000000 +0000
+@@ -66,7 +66,6 @@
+ #include <linux/dccp.h>
+ #include <linux/quota.h>
+ #include <linux/un.h>		/* for Unix socket types */
+-#include <net/af_unix.h>	/* for Unix socket types */
+ #include <linux/parser.h>
+ #include <linux/nfs_mount.h>
+ #include <net/ipv6.h>