[packages/kernel] - up to 3.7.1; up vs patch and imq patch
arekm
arekm at pld-linux.org
Tue Dec 18 18:18:42 CET 2012
commit 4bf69007111dd2befdc840afc527163e83853de5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Dec 18 18:18:36 2012 +0100
- up to 3.7.1; up vs patch and imq patch
kernel-imq.patch | 206 +-
kernel-vserver-2.3.patch | 27551 +++++++++++++++++++++------------------------
kernel.spec | 10 +-
3 files changed, 12637 insertions(+), 15130 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 810547e..9738e12 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,9 +66,9 @@
%define have_pcmcia 0
%endif
-%define rel 0.1
+%define rel 1
%define basever 3.7
-%define postver .0
+%define postver .1
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -111,7 +111,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 21223369d682bcf44bcdfe1521095983
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5: 588a17953c84168285116823be669af3
+# Patch0-md5: c391dc1a1b4dae81aaef6f08a0594813
%endif
Source3: kernel-autoconf.h
@@ -161,7 +161,7 @@ Patch40: kernel-layer7.patch
# http://zph.bratcheda.org/linux-2.6.26.3-zph.patch
Patch49: kernel-zph.patch
-# based on http://www.linuximq.net/patchs/patch-imqmq-3.1.diff.bz2
+# http://www.linuximq.net/patches/patch-imqmq-3.5.diff.xz
Patch50: kernel-imq.patch
Patch51: http://downloads.sourceforge.net/project/reiser4/reiser4-for-linux-3.x/reiser4-for-3.6.4.patch.gz
@@ -182,7 +182,7 @@ Patch59: kernel-rndis_host-wm5.patch
# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
Patch85: kernel-hostap.patch
-# http://vserver.13thfloor.at/Experimental/patch-3.7-vs2.3.5.1.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.7.1-vs2.3.5.3.diff
# note there are additional patches from above url:
# - *fix* are real fixes (we want these)
# - *feat* are new features/tests (we don't want these)
diff --git a/kernel-imq.patch b/kernel-imq.patch
index a4ef462..6764dd8 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1,7 +1,7 @@
-diff -uNr linux-3.1/drivers/net/imq.c linux-3.1-imq/drivers/net/imq.c
---- linux-3.1/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.1-imq/drivers/net/imq.c 2011-11-04 12:16:10.454992642 +0200
-@@ -0,0 +1,850 @@
+diff -uNr linux-3.5/drivers/net/imq.c linux-3.5-imq/drivers/net/imq.c
+--- linux-3.5/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.5-imq/drivers/net/imq.c 2012-07-25 12:31:59.709321554 +0300
+@@ -0,0 +1,857 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
@@ -125,6 +125,12 @@ diff -uNr linux-3.1/drivers/net/imq.c linux-3.1-imq/drivers/net/imq.c
+ * - Clean-up, move 'get imq device pointer by imqX name' to
+ * separate function from imq_nf_queue().
+ *
++ * 2012/01/05 - Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
++ * - Port to 3.2
++ *
++ * 2012/03/19 - Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
++ * - Port to 3.3
++ *
+ * Also, many thanks to pablo Sebastian Greco for making the initial
+ * patch and to those who helped the testing.
+ *
@@ -287,13 +293,14 @@ diff -uNr linux-3.1/drivers/net/imq.c linux-3.1-imq/drivers/net/imq.c
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ case htons(ETH_P_IPV6): {
+ const struct ipv6hdr *iph = ipv6_hdr(skb);
-+ __be16 frag_off;
++ __be16 fo = 0;
++
+ if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr))))
+ goto other;
+
+ addr1 = iph->daddr.s6_addr32[3];
+ addr2 = iph->saddr.s6_addr32[3];
-+ ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto, &frag_off);
++ ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto, &fo);
+ if (unlikely(ihl < 0))
+ goto other;
+
@@ -852,12 +859,12 @@ diff -uNr linux-3.1/drivers/net/imq.c linux-3.1-imq/drivers/net/imq.c
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("imq");
+
-diff -uNr linux-3.1/drivers/net/Kconfig linux-3.1-imq/drivers/net/Kconfig
---- linux-3.1/drivers/net/Kconfig 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/drivers/net/Kconfig 2011-11-04 11:12:52.106390309 +0200
-@@ -124,6 +124,125 @@
- To compile this driver as a module, choose M here: the module
- will be called eql. If unsure, say N.
+diff -uNr linux-3.5/drivers/net/Kconfig linux-3.5-imq/drivers/net/Kconfig
+--- linux-3.5/drivers/net/Kconfig 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/drivers/net/Kconfig 2012-07-25 12:31:59.709321554 +0300
+@@ -192,6 +192,125 @@
+ depends on RIONET
+ default "128"
+config IMQ
+ tristate "IMQ (intermediate queueing device) support"
@@ -981,20 +988,20 @@ diff -uNr linux-3.1/drivers/net/Kconfig linux-3.1-imq/drivers/net/Kconfig
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
-diff -uNr linux-3.1/drivers/net/Makefile linux-3.1-imq/drivers/net/Makefile
---- linux-3.1/drivers/net/Makefile 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/drivers/net/Makefile 2011-11-04 11:12:52.106390309 +0200
-@@ -7,6 +7,7 @@
- #
- obj-$(CONFIG_BONDING) += bonding/
+diff -uNr linux-3.5/drivers/net/Makefile linux-3.5-imq/drivers/net/Makefile
+--- linux-3.5/drivers/net/Makefile 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/drivers/net/Makefile 2012-07-25 12:31:59.709321554 +0300
+@@ -9,6 +9,7 @@
obj-$(CONFIG_DUMMY) += dummy.o
-+obj-$(CONFIG_IMQ) += imq.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_IFB) += ifb.o
++obj-$(CONFIG_IMQ) += imq.o
obj-$(CONFIG_MACVLAN) += macvlan.o
-diff -uNr linux-3.1/include/linux/imq.h linux-3.1-imq/include/linux/imq.h
---- linux-3.1/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.1-imq/include/linux/imq.h 2011-11-04 11:12:52.109723710 +0200
+ obj-$(CONFIG_MACVTAP) += macvtap.o
+ obj-$(CONFIG_MII) += mii.o
+diff -uNr linux-3.5/include/linux/imq.h linux-3.5-imq/include/linux/imq.h
+--- linux-3.5/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.5-imq/include/linux/imq.h 2012-07-25 12:31:59.709321554 +0300
@@ -0,0 +1,13 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@@ -1009,9 +1016,9 @@ diff -uNr linux-3.1/include/linux/imq.h linux-3.1-imq/include/linux/imq.h
+
+#endif /* _IMQ_H */
+
-diff -uNr linux-3.1/include/linux/netfilter/xt_IMQ.h linux-3.1-imq/include/linux/netfilter/xt_IMQ.h
---- linux-3.1/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.1-imq/include/linux/netfilter/xt_IMQ.h 2011-11-04 11:12:52.109723710 +0200
+diff -uNr linux-3.5/include/linux/netfilter/xt_IMQ.h linux-3.5-imq/include/linux/netfilter/xt_IMQ.h
+--- linux-3.5/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.5-imq/include/linux/netfilter/xt_IMQ.h 2012-07-25 12:31:59.709321554 +0300
@@ -0,0 +1,9 @@
+#ifndef _XT_IMQ_H
+#define _XT_IMQ_H
@@ -1022,9 +1029,9 @@ diff -uNr linux-3.1/include/linux/netfilter/xt_IMQ.h linux-3.1-imq/include/linux
+
+#endif /* _XT_IMQ_H */
+
-diff -uNr linux-3.1/include/uapi/linux/netfilter.h linux-3.1-imq/include/uapi/linux/netfilter.h
---- linux-3.1/include/uapi/linux/netfilter.h 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/include/uapi/linux/netfilter.h 2011-11-04 11:12:52.109723710 +0200
+diff -uNr linux-3.5/include/uapi/linux/netfilter.h linux-3.5-imq/include/uapi/linux/netfilter.h
+--- linux-3.5/include/uapi/linux/netfilter.h 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/include/uapi/linux/netfilter.h 2012-07-25 12:31:59.709321554 +0300
@@ -22,7 +22,8 @@
#define NF_QUEUE 3
#define NF_REPEAT 4
@@ -1035,9 +1042,9 @@ diff -uNr linux-3.1/include/uapi/linux/netfilter.h linux-3.1-imq/include/uapi/li
/* we overload the higher bits for encoding auxiliary data such as the queue
* number or errno values. Not nice, but better than additional function
-diff -uNr linux-3.1/include/linux/netfilter_ipv4/ipt_IMQ.h linux-3.1-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-3.1/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.1-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2011-11-04 11:12:52.109723710 +0200
+diff -uNr linux-3.5/include/linux/netfilter_ipv4/ipt_IMQ.h linux-3.5-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-3.5/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.5-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2012-07-25 12:31:59.709321554 +0300
@@ -0,0 +1,10 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -1049,9 +1056,9 @@ diff -uNr linux-3.1/include/linux/netfilter_ipv4/ipt_IMQ.h linux-3.1-imq/include
+
+#endif /* _IPT_IMQ_H */
+
-diff -uNr linux-3.1/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-3.1-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-3.1/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.1-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2011-11-04 11:12:52.113057113 +0200
+diff -uNr linux-3.5/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-3.5-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-3.5/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.5-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2012-07-25 12:31:59.709321554 +0300
@@ -0,0 +1,10 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -1063,10 +1070,10 @@ diff -uNr linux-3.1/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-3.1-imq/includ
+
+#endif /* _IP6T_IMQ_H */
+
-diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
---- linux-3.1/include/linux/skbuff.h 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/include/linux/skbuff.h 2011-11-04 11:12:52.116390515 +0200
-@@ -29,6 +29,9 @@
+diff -uNr linux-3.5/include/linux/skbuff.h linux-3.5-imq/include/linux/skbuff.h
+--- linux-3.5/include/linux/skbuff.h 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/include/linux/skbuff.h 2012-07-25 12:31:59.712654956 +0300
+@@ -32,6 +32,9 @@
#include <linux/hrtimer.h>
#include <linux/dma-mapping.h>
#include <linux/netdev_features.h>
@@ -1076,7 +1083,7 @@ diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
/* Don't change this without changing skb_csum_unnecessary! */
#define CHECKSUM_NONE 0
-@@ -356,6 +359,9 @@
+@@ -402,6 +405,9 @@
* first. This is owned by whoever has the skb queued ATM.
*/
char cb[48] __aligned(8);
@@ -1086,7 +1093,7 @@ diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
unsigned long _skb_refdst;
#ifdef CONFIG_XFRM
-@@ -394,6 +400,9 @@
+@@ -440,6 +446,9 @@
#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
struct sk_buff *nfct_reasm;
#endif
@@ -1096,9 +1103,9 @@ diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -418,6 +427,10 @@
-
- /* 0/13 bit hole */
+@@ -471,6 +480,10 @@
+ /* 8/10 bit hole (depending on ndisc_nodetype presence) */
+ kmemcheck_bitfield_end(flags2);
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+ __u8 imq_flags:IMQ_F_BITS;
@@ -1107,7 +1114,7 @@ diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
#ifdef CONFIG_NET_DMA
dma_cookie_t dma_cookie;
#endif
-@@ -504,6 +517,12 @@
+@@ -555,6 +568,12 @@
return (struct rtable *)skb_dst(skb);
}
@@ -1120,7 +1127,7 @@ diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb);
-@@ -2157,6 +2176,10 @@
+@@ -2416,6 +2435,10 @@
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@@ -1131,9 +1138,9 @@ diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
-diff -uNr linux-3.1/include/net/netfilter/nf_queue.h linux-3.1-imq/include/net/netfilter/nf_queue.h
---- linux-3.1/include/net/netfilter/nf_queue.h 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/include/net/netfilter/nf_queue.h 2011-11-04 11:12:52.116390515 +0200
+diff -uNr linux-3.5/include/net/netfilter/nf_queue.h linux-3.5-imq/include/net/netfilter/nf_queue.h
+--- linux-3.5/include/net/netfilter/nf_queue.h 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/include/net/netfilter/nf_queue.h 2012-07-25 12:31:59.715988358 +0300
@@ -30,5 +30,11 @@
const struct nf_queue_handler *qh);
extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
@@ -1146,10 +1153,10 @@ diff -uNr linux-3.1/include/net/netfilter/nf_queue.h linux-3.1-imq/include/net/n
+#endif
#endif /* _NF_QUEUE_H */
-diff -uNr linux-3.1/net/core/dev.c linux-3.1-imq/net/core/dev.c
---- linux-3.1/net/core/dev.c 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/core/dev.c 2011-11-04 11:12:52.119723915 +0200
-@@ -98,6 +98,9 @@
+diff -uNr linux-3.5/net/core/dev.c linux-3.5-imq/net/core/dev.c
+--- linux-3.5/net/core/dev.c 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/core/dev.c 2012-07-25 12:31:59.719321759 +0300
+@@ -97,6 +97,9 @@
#include <net/net_namespace.h>
#include <net/sock.h>
#include <linux/rtnetlink.h>
@@ -1159,7 +1166,7 @@ diff -uNr linux-3.1/net/core/dev.c linux-3.1-imq/net/core/dev.c
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -2126,7 +2129,12 @@
+@@ -2171,7 +2174,12 @@
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
skb_dst_drop(skb);
@@ -1171,13 +1178,13 @@ diff -uNr linux-3.1/net/core/dev.c linux-3.1-imq/net/core/dev.c
+#endif
dev_queue_xmit_nit(skb, dev);
- skb_orphan_try(skb);
-diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
---- linux-3.1/net/core/skbuff.c 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/core/skbuff.c 2011-11-04 11:12:52.123057315 +0200
+ features = netif_skb_features(skb);
+diff -uNr linux-3.5/net/core/skbuff.c linux-3.5-imq/net/core/skbuff.c
+--- linux-3.5/net/core/skbuff.c 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/core/skbuff.c 2012-07-25 12:31:59.722655161 +0300
@@ -73,6 +73,9 @@
- static struct kmem_cache *skbuff_head_cache __read_mostly;
+ struct kmem_cache *skbuff_head_cache __read_mostly;
static struct kmem_cache *skbuff_fclone_cache __read_mostly;
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+static struct kmem_cache *skbuff_cb_store_cache __read_mostly;
@@ -1268,13 +1275,15 @@ diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
/* Pipe buffer operations for a socket. */
static const struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -392,6 +471,26 @@
+@@ -490,6 +569,29 @@
WARN_ON(in_irq());
skb->destructor(skb);
}
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
-+ /* This should not happen. When it does, avoid memleak by restoring
-+ the chain of cb-backups. */
++ /*
++ * This should not happen. When it does, avoid memleak by restoring
++ * the chain of cb-backups.
++ */
+ while (skb->cb_next != NULL) {
+ if (net_ratelimit())
+ printk(KERN_WARNING "IMQ: kfree_skb: skb->cb_next: "
@@ -1282,7 +1291,8 @@ diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
+
+ skb_restore_cb(skb);
+ }
-+ /* This should not happen either, nf_queue_entry is nullified in
++ /*
++ * This should not happen either, nf_queue_entry is nullified in
+ * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are
+ * leaking entry pointers, maybe memory. We don't know if this is
+ * pointer to already freed memory, or should this be freed.
@@ -1290,12 +1300,12 @@ diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
+ */
+ if (skb->nf_queue_entry && net_ratelimit())
+ printk(KERN_WARNING
-+ "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
++ "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
+#endif
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb->nfct);
#endif
-@@ -533,6 +632,9 @@
+@@ -635,6 +737,9 @@
new->sp = secpath_get(old->sp);
#endif
memcpy(new->cb, old->cb, sizeof(old->cb));
@@ -1305,7 +1315,7 @@ diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
new->csum = old->csum;
new->local_df = old->local_df;
new->pkt_type = old->pkt_type;
-@@ -2888,6 +2990,13 @@
+@@ -3029,6 +3134,13 @@
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);
@@ -1319,9 +1329,9 @@ diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
}
/**
-diff -uNr linux-3.1/net/ipv6/ip6_output.c linux-3.1-imq/net/ipv6/ip6_output.c
---- linux-3.1/net/ipv6/ip6_output.c 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/ipv6/ip6_output.c 2011-11-04 11:12:52.123057315 +0200
+diff -uNr linux-3.5/net/ipv6/ip6_output.c linux-3.5-imq/net/ipv6/ip6_output.c
+--- linux-3.5/net/ipv6/ip6_output.c 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/ipv6/ip6_output.c 2012-07-25 12:31:59.722655161 +0300
@@ -102,9 +102,6 @@
struct net_device *dev = dst->dev;
struct neighbour *neigh;
@@ -1344,10 +1354,10 @@ diff -uNr linux-3.1/net/ipv6/ip6_output.c linux-3.1-imq/net/ipv6/ip6_output.c
return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, dev,
ip6_finish_output,
!(IP6CB(skb)->flags & IP6SKB_REROUTED));
-diff -uNr linux-3.1/net/netfilter/core.c linux-3.1-imq/net/netfilter/core.c
---- linux-3.1/net/netfilter/core.c 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/netfilter/core.c 2011-11-04 11:12:52.123057315 +0200
-@@ -179,9 +179,11 @@
+diff -uNr linux-3.5/net/netfilter/core.c linux-3.5-imq/net/netfilter/core.c
+--- linux-3.5/net/netfilter/core.c 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/netfilter/core.c 2012-07-25 12:31:59.722655161 +0300
+@@ -190,9 +190,11 @@
ret = NF_DROP_GETERR(verdict);
if (ret == 0)
ret = -EPERM;
@@ -1361,12 +1371,12 @@ diff -uNr linux-3.1/net/netfilter/core.c linux-3.1-imq/net/netfilter/core.c
if (err < 0) {
if (err == -ECANCELED)
goto next_hook;
-diff -uNr linux-3.1/net/netfilter/Kconfig linux-3.1-imq/net/netfilter/Kconfig
---- linux-3.1/net/netfilter/Kconfig 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/netfilter/Kconfig 2011-11-04 11:12:52.123057315 +0200
-@@ -507,6 +507,18 @@
- For more information on the LEDs available on your system, see
- Documentation/leds-class.txt
+diff -uNr linux-3.5/net/netfilter/Kconfig linux-3.5-imq/net/netfilter/Kconfig
+--- linux-3.5/net/netfilter/Kconfig 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/netfilter/Kconfig 2012-07-25 12:31:59.722655161 +0300
+@@ -569,6 +569,18 @@
+
+ To compile it as a module, choose M here. If unsure, say N.
+config NETFILTER_XT_TARGET_IMQ
+ tristate '"IMQ" target support'
@@ -1383,20 +1393,20 @@ diff -uNr linux-3.1/net/netfilter/Kconfig linux-3.1-imq/net/netfilter/Kconfig
config NETFILTER_XT_TARGET_MARK
tristate '"MARK" target support'
depends on NETFILTER_ADVANCED
-diff -uNr linux-3.1/net/netfilter/Makefile linux-3.1-imq/net/netfilter/Makefile
---- linux-3.1/net/netfilter/Makefile 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/netfilter/Makefile 2011-11-04 11:12:52.123057315 +0200
-@@ -61,6 +61,7 @@
- obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
+diff -uNr linux-3.5/net/netfilter/Makefile linux-3.5-imq/net/netfilter/Makefile
+--- linux-3.5/net/netfilter/Makefile 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/netfilter/Makefile 2012-07-25 12:32:28.966592115 +0300
+@@ -60,6 +60,7 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o
-diff -uNr linux-3.1/net/netfilter/nf_internals.h linux-3.1-imq/net/netfilter/nf_internals.h
---- linux-3.1/net/netfilter/nf_internals.h 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/netfilter/nf_internals.h 2011-11-04 11:12:52.123057315 +0200
+ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
+diff -uNr linux-3.5/net/netfilter/nf_internals.h linux-3.5-imq/net/netfilter/nf_internals.h
+--- linux-3.5/net/netfilter/nf_internals.h 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/netfilter/nf_internals.h 2012-07-25 12:31:59.725988564 +0300
@@ -29,7 +29,7 @@
struct net_device *indev,
struct net_device *outdev,
@@ -1406,9 +1416,9 @@ diff -uNr linux-3.1/net/netfilter/nf_internals.h linux-3.1-imq/net/netfilter/nf_
extern int __init netfilter_queue_init(void);
/* nf_log.c */
-diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queue.c
---- linux-3.1/net/netfilter/nf_queue.c 2011-10-24 10:10:05.000000000 +0300
-+++ linux-3.1-imq/net/netfilter/nf_queue.c 2011-11-04 11:12:52.123057315 +0200
+diff -uNr linux-3.5/net/netfilter/nf_queue.c linux-3.5-imq/net/netfilter/nf_queue.c
+--- linux-3.5/net/netfilter/nf_queue.c 2012-07-21 23:58:29.000000000 +0300
++++ linux-3.5-imq/net/netfilter/nf_queue.c 2012-07-25 12:31:59.725988564 +0300
@@ -22,6 +22,26 @@
static DEFINE_MUTEX(queue_handler_mutex);
@@ -1482,7 +1492,7 @@ diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queu
if (!qh) {
status = -ESRCH;
goto err_unlock;
-@@ -209,7 +241,8 @@
+@@ -230,7 +262,8 @@
struct net_device *indev,
struct net_device *outdev,
int (*okfn)(struct sk_buff *),
@@ -1491,8 +1501,8 @@ diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queu
+ unsigned int queuetype)
{
struct sk_buff *segs;
- int err;
-@@ -217,7 +250,7 @@
+ int err = -EINVAL;
+@@ -238,7 +271,7 @@
if (!skb_is_gso(skb))
return __nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
@@ -1501,7 +1511,7 @@ diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queu
switch (pf) {
case NFPROTO_IPV4:
-@@ -299,7 +299,7 @@ int nf_queue(struct sk_buff *skb,
+@@ -266,7 +299,7 @@
if (err == 0) {
nf_bridge_adjust_segmented_data(segs);
err = __nf_queue(segs, elem, pf, hook, indev,
@@ -1510,7 +1520,7 @@ diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queu
}
if (err == 0)
queued++;
-@@ -299,9 +332,11 @@
+@@ -323,9 +356,11 @@
local_bh_enable();
break;
case NF_QUEUE:
@@ -1523,9 +1533,9 @@ diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queu
if (err < 0) {
if (err == -ECANCELED)
goto next_hook;
-diff -uNr linux-3.1/net/netfilter/xt_IMQ.c linux-3.1-imq/net/netfilter/xt_IMQ.c
---- linux-3.1/net/netfilter/xt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.1-imq/net/netfilter/xt_IMQ.c 2011-11-04 11:12:52.123057315 +0200
+diff -uNr linux-3.5/net/netfilter/xt_IMQ.c linux-3.5-imq/net/netfilter/xt_IMQ.c
+--- linux-3.5/net/netfilter/xt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.5-imq/net/netfilter/xt_IMQ.c 2012-07-25 12:31:59.725988564 +0300
@@ -0,0 +1,74 @@
+/*
+ * This target marks packets to be enqueued to an imq device
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 2788377..402d768 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3.5.1/Documentation/vserver/debug.txt
---- linux-3.7/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/Documentation/vserver/debug.txt 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/Documentation/vserver/debug.txt linux-3.7.1-vs2.3.5.3/Documentation/vserver/debug.txt
+--- linux-3.7.1/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/Documentation/vserver/debug.txt 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3.
+ 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/arch/alpha/Kconfig linux-3.7-vs2.3.5.1/arch/alpha/Kconfig
---- linux-3.7/arch/alpha/Kconfig 2012-12-11 15:45:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/alpha/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/alpha/Kconfig linux-3.7.1-vs2.3.5.3/arch/alpha/Kconfig
+--- linux-3.7.1/arch/alpha/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/alpha/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.7/arch/alpha/Kconfig linux-3.7-vs2.3.5.1/arch/alph
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/alpha/kernel/systbls.S linux-3.7-vs2.3.5.1/arch/alpha/kernel/systbls.S
---- linux-3.7/arch/alpha/kernel/systbls.S 2012-10-04 13:26:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/alpha/kernel/systbls.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/systbls.S linux-3.7.1-vs2.3.5.3/arch/alpha/kernel/systbls.S
+--- linux-3.7.1/arch/alpha/kernel/systbls.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.7/arch/alpha/kernel/systbls.S linux-3.7-vs2.3.5.1/
.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/arch/alpha/kernel/traps.c linux-3.7-vs2.3.5.1/arch/alpha/kernel/traps.c
---- linux-3.7/arch/alpha/kernel/traps.c 2012-12-11 15:45:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/alpha/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/alpha/kernel/traps.c
+--- linux-3.7.1/arch/alpha/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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());
@@ -193,9 +193,9 @@ diff -NurpP --minimal linux-3.7/arch/alpha/kernel/traps.c linux-3.7-vs2.3.5.1/ar
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.7/arch/arm/Kconfig linux-3.7-vs2.3.5.1/arch/arm/Kconfig
---- linux-3.7/arch/arm/Kconfig 2012-12-11 15:45:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/arm/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/arm/Kconfig linux-3.7.1-vs2.3.5.3/arch/arm/Kconfig
+--- linux-3.7.1/arch/arm/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/arm/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -2307,6 +2307,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.7/arch/arm/Kconfig linux-3.7-vs2.3.5.1/arch/arm/Kc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/arm/kernel/calls.S linux-3.7-vs2.3.5.1/arch/arm/kernel/calls.S
---- linux-3.7/arch/arm/kernel/calls.S 2012-12-11 15:45:45.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/calls.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/calls.S linux-3.7.1-vs2.3.5.3/arch/arm/kernel/calls.S
+--- linux-3.7.1/arch/arm/kernel/calls.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.7/arch/arm/kernel/calls.S linux-3.7-vs2.3.5.1/arch
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.7/arch/arm/kernel/process.c linux-3.7-vs2.3.5.1/arch/arm/kernel/process.c
---- linux-3.7/arch/arm/kernel/process.c 2012-12-11 15:45:45.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/process.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/process.c linux-3.7.1-vs2.3.5.3/arch/arm/kernel/process.c
+--- linux-3.7.1/arch/arm/kernel/process.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
{
@@ -230,9 +230,9 @@ diff -NurpP --minimal linux-3.7/arch/arm/kernel/process.c linux-3.7-vs2.3.5.1/ar
__show_regs(regs);
dump_stack();
}
-diff -NurpP --minimal linux-3.7/arch/arm/kernel/traps.c linux-3.7-vs2.3.5.1/arch/arm/kernel/traps.c
---- linux-3.7/arch/arm/kernel/traps.c 2012-10-04 13:26:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/arm/kernel/traps.c
+--- linux-3.7.1/arch/arm/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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();
@@ -244,9 +244,9 @@ diff -NurpP --minimal linux-3.7/arch/arm/kernel/traps.c linux-3.7-vs2.3.5.1/arch
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.7/arch/cris/Kconfig linux-3.7-vs2.3.5.1/arch/cris/Kconfig
---- linux-3.7/arch/cris/Kconfig 2012-12-11 15:46:01.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/cris/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/cris/Kconfig linux-3.7.1-vs2.3.5.3/arch/cris/Kconfig
+--- linux-3.7.1/arch/cris/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/cris/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -670,6 +670,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -256,9 +256,9 @@ diff -NurpP --minimal linux-3.7/arch/cris/Kconfig linux-3.7-vs2.3.5.1/arch/cris/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/h8300/Kconfig linux-3.7-vs2.3.5.1/arch/h8300/Kconfig
---- linux-3.7/arch/h8300/Kconfig 2012-12-11 15:46:02.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/h8300/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/h8300/Kconfig linux-3.7.1-vs2.3.5.3/arch/h8300/Kconfig
+--- linux-3.7.1/arch/h8300/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/h8300/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -217,6 +217,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -268,9 +268,9 @@ diff -NurpP --minimal linux-3.7/arch/h8300/Kconfig linux-3.7-vs2.3.5.1/arch/h830
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/ia64/Kconfig linux-3.7-vs2.3.5.1/arch/ia64/Kconfig
---- linux-3.7/arch/ia64/Kconfig 2012-12-11 15:46:03.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/ia64/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/ia64/Kconfig linux-3.7.1-vs2.3.5.3/arch/ia64/Kconfig
+--- linux-3.7.1/arch/ia64/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/ia64/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -644,6 +644,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -280,9 +280,9 @@ diff -NurpP --minimal linux-3.7/arch/ia64/Kconfig linux-3.7-vs2.3.5.1/arch/ia64/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/ia64/kernel/entry.S linux-3.7-vs2.3.5.1/arch/ia64/kernel/entry.S
---- linux-3.7/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/entry.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/entry.S linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/entry.S
+--- linux-3.7.1/arch/ia64/kernel/entry.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -292,9 +292,9 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/entry.S linux-3.7-vs2.3.5.1/arc
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.7/arch/ia64/kernel/process.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/process.c
---- linux-3.7/arch/ia64/kernel/process.c 2012-12-11 15:46:03.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/process.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/process.c linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/process.c
+--- linux-3.7.1/arch/ia64/kernel/process.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -306,9 +306,9 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/process.c linux-3.7-vs2.3.5.1/a
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/arch/ia64/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/ptrace.c
---- linux-3.7/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/ptrace.c
+--- linux-3.7.1/arch/ia64/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -317,9 +317,9 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.7/arch/ia64/kernel/traps.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/traps.c
---- linux-3.7/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/ia64/kernel/traps.c
+--- linux-3.7.1/arch/ia64/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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();
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/traps.c linux-3.7-vs2.3.5.1/arc
}
}
}
-diff -NurpP --minimal linux-3.7/arch/m32r/kernel/traps.c linux-3.7-vs2.3.5.1/arch/m32r/kernel/traps.c
---- linux-3.7/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/m32r/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/m32r/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/m32r/kernel/traps.c
+--- linux-3.7.1/arch/m32r/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -359,9 +359,9 @@ diff -NurpP --minimal linux-3.7/arch/m32r/kernel/traps.c linux-3.7-vs2.3.5.1/arc
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.7/arch/m68k/Kconfig linux-3.7-vs2.3.5.1/arch/m68k/Kconfig
---- linux-3.7/arch/m68k/Kconfig 2012-12-11 15:46:03.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/m68k/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/m68k/Kconfig linux-3.7.1-vs2.3.5.3/arch/m68k/Kconfig
+--- linux-3.7.1/arch/m68k/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/m68k/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -135,6 +135,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -371,9 +371,9 @@ diff -NurpP --minimal linux-3.7/arch/m68k/Kconfig linux-3.7-vs2.3.5.1/arch/m68k/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/mips/Kconfig linux-3.7-vs2.3.5.1/arch/mips/Kconfig
---- linux-3.7/arch/mips/Kconfig 2012-12-11 15:46:05.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/mips/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/mips/Kconfig linux-3.7.1-vs2.3.5.3/arch/mips/Kconfig
+--- linux-3.7.1/arch/mips/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/mips/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -2574,6 +2574,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -383,9 +383,9 @@ diff -NurpP --minimal linux-3.7/arch/mips/Kconfig linux-3.7-vs2.3.5.1/arch/mips/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/mips/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/mips/kernel/ptrace.c
---- linux-3.7/arch/mips/kernel/ptrace.c 2012-07-22 21:38:52.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/arch/mips/kernel/ptrace.c
+--- linux-3.7.1/arch/mips/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -404,9 +404,9 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar
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/arch/mips/kernel/scall32-o32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall32-o32.S
---- linux-3.7/arch/mips/kernel/scall32-o32.S 2012-12-11 15:46:07.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall32-o32.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall32-o32.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall32-o32.S
+--- linux-3.7.1/arch/mips/kernel/scall32-o32.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -416,9 +416,9 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall32-o32.S linux-3.7-vs2.3.5
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-64.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-64.S
---- linux-3.7/arch/mips/kernel/scall64-64.S 2012-12-11 15:46:07.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-64.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-64.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-64.S
+--- linux-3.7.1/arch/mips/kernel/scall64-64.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -428,9 +428,9 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-64.S linux-3.7-vs2.3.5.
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-n32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-n32.S
---- linux-3.7/arch/mips/kernel/scall64-n32.S 2012-12-11 15:46:07.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-n32.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-n32.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-n32.S
+--- linux-3.7.1/arch/mips/kernel/scall64-n32.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -440,9 +440,9 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-n32.S linux-3.7-vs2.3.5
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-o32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-o32.S
---- linux-3.7/arch/mips/kernel/scall64-o32.S 2012-12-11 15:46:07.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-o32.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-o32.S linux-3.7.1-vs2.3.5.3/arch/mips/kernel/scall64-o32.S
+--- linux-3.7.1/arch/mips/kernel/scall64-o32.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -452,9 +452,9 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-o32.S linux-3.7-vs2.3.5
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.7/arch/mips/kernel/traps.c linux-3.7-vs2.3.5.1/arch/mips/kernel/traps.c
---- linux-3.7/arch/mips/kernel/traps.c 2012-10-04 13:26:53.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/mips/kernel/traps.c
+--- linux-3.7.1/arch/mips/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -469,9 +469,9 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/traps.c linux-3.7-vs2.3.5.1/arc
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.7/arch/parisc/Kconfig linux-3.7-vs2.3.5.1/arch/parisc/Kconfig
---- linux-3.7/arch/parisc/Kconfig 2012-12-11 15:46:08.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/parisc/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/parisc/Kconfig linux-3.7.1-vs2.3.5.3/arch/parisc/Kconfig
+--- linux-3.7.1/arch/parisc/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/parisc/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -284,6 +284,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -481,9 +481,9 @@ diff -NurpP --minimal linux-3.7/arch/parisc/Kconfig linux-3.7-vs2.3.5.1/arch/par
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/parisc/kernel/syscall_table.S linux-3.7-vs2.3.5.1/arch/parisc/kernel/syscall_table.S
---- linux-3.7/arch/parisc/kernel/syscall_table.S 2012-12-11 15:46:09.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/parisc/kernel/syscall_table.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/syscall_table.S linux-3.7.1-vs2.3.5.3/arch/parisc/kernel/syscall_table.S
+--- linux-3.7.1/arch/parisc/kernel/syscall_table.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -493,9 +493,9 @@ diff -NurpP --minimal linux-3.7/arch/parisc/kernel/syscall_table.S linux-3.7-vs2
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.7/arch/parisc/kernel/traps.c linux-3.7-vs2.3.5.1/arch/parisc/kernel/traps.c
---- linux-3.7/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/parisc/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/parisc/kernel/traps.c
+--- linux-3.7.1/arch/parisc/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.7/arch/parisc/kernel/traps.c linux-3.7-vs2.3.5.1/a
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.7/arch/parisc/mm/fault.c linux-3.7-vs2.3.5.1/arch/parisc/mm/fault.c
---- linux-3.7/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/parisc/mm/fault.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/parisc/mm/fault.c linux-3.7.1-vs2.3.5.3/arch/parisc/mm/fault.c
+--- linux-3.7.1/arch/parisc/mm/fault.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/parisc/mm/fault.c 2012-12-18 15:13:16.000000000 +0000
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -534,9 +534,9 @@ diff -NurpP --minimal linux-3.7/arch/parisc/mm/fault.c linux-3.7-vs2.3.5.1/arch/
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/arch/powerpc/Kconfig linux-3.7-vs2.3.5.1/arch/powerpc/Kconfig
---- linux-3.7/arch/powerpc/Kconfig 2012-12-11 15:46:09.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/powerpc/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/Kconfig linux-3.7.1-vs2.3.5.3/arch/powerpc/Kconfig
+--- linux-3.7.1/arch/powerpc/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/powerpc/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -1014,6 +1014,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -546,9 +546,9 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/Kconfig linux-3.7-vs2.3.5.1/arch/po
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.7/arch/powerpc/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/powerpc/include/uapi/asm/unistd.h
---- linux-3.7/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 15:46:10.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 16:48:48.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.3/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/powerpc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -558,9 +558,9 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/include/uapi/asm/unistd.h linux-3.7
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/process.c linux-3.7-vs2.3.5.1/arch/powerpc/kernel/process.c
---- linux-3.7/arch/powerpc/kernel/process.c 2012-12-11 15:46:10.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/powerpc/kernel/process.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/process.c linux-3.7.1-vs2.3.5.3/arch/powerpc/kernel/process.c
+--- linux-3.7.1/arch/powerpc/kernel/process.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -573,9 +573,9 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/process.c linux-3.7-vs2.3.5.
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/traps.c linux-3.7-vs2.3.5.1/arch/powerpc/kernel/traps.c
---- linux-3.7/arch/powerpc/kernel/traps.c 2012-12-11 15:46:10.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/powerpc/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/traps.c linux-3.7.1-vs2.3.5.3/arch/powerpc/kernel/traps.c
+--- linux-3.7.1/arch/powerpc/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -588,9 +588,9 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/traps.c linux-3.7-vs2.3.5.1/
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.7/arch/s390/Kconfig linux-3.7-vs2.3.5.1/arch/s390/Kconfig
---- linux-3.7/arch/s390/Kconfig 2012-12-11 15:46:14.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/s390/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/s390/Kconfig linux-3.7.1-vs2.3.5.3/arch/s390/Kconfig
+--- linux-3.7.1/arch/s390/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/s390/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -530,6 +530,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -600,9 +600,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/Kconfig linux-3.7-vs2.3.5.1/arch/s390/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/s390/include/asm/tlb.h linux-3.7-vs2.3.5.1/arch/s390/include/asm/tlb.h
---- linux-3.7/arch/s390/include/asm/tlb.h 2012-12-11 15:46:14.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/s390/include/asm/tlb.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/s390/include/asm/tlb.h linux-3.7.1-vs2.3.5.3/arch/s390/include/asm/tlb.h
+--- linux-3.7.1/arch/s390/include/asm/tlb.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -611,9 +611,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/include/asm/tlb.h linux-3.7-vs2.3.5.1/
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.7/arch/s390/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/s390/include/uapi/asm/unistd.h
---- linux-3.7/arch/s390/include/uapi/asm/unistd.h 2012-12-11 15:46:14.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/s390/include/uapi/asm/unistd.h 2012-12-11 16:47:45.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/s390/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.3/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.7.1/arch/s390/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -623,9 +623,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/include/uapi/asm/unistd.h linux-3.7-vs
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.7/arch/s390/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/s390/kernel/ptrace.c
---- linux-3.7/arch/s390/kernel/ptrace.c 2012-12-11 15:46:15.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/s390/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/ptrace.c linux-3.7.1-vs2.3.5.3/arch/s390/kernel/ptrace.c
+--- linux-3.7.1/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -634,9 +634,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.7/arch/s390/kernel/syscalls.S linux-3.7-vs2.3.5.1/arch/s390/kernel/syscalls.S
---- linux-3.7/arch/s390/kernel/syscalls.S 2012-12-11 15:46:15.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/s390/kernel/syscalls.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/syscalls.S linux-3.7.1-vs2.3.5.3/arch/s390/kernel/syscalls.S
+--- linux-3.7.1/arch/s390/kernel/syscalls.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/kernel/syscalls.S linux-3.7-vs2.3.5.1/
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/arch/sh/Kconfig linux-3.7-vs2.3.5.1/arch/sh/Kconfig
---- linux-3.7/arch/sh/Kconfig 2012-12-11 15:46:15.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/sh/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/sh/Kconfig linux-3.7.1-vs2.3.5.3/arch/sh/Kconfig
+--- linux-3.7.1/arch/sh/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/sh/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -945,6 +945,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.7/arch/sh/Kconfig linux-3.7-vs2.3.5.1/arch/sh/Kcon
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/sh/kernel/irq.c linux-3.7-vs2.3.5.1/arch/sh/kernel/irq.c
---- linux-3.7/arch/sh/kernel/irq.c 2012-10-04 13:26:56.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/sh/kernel/irq.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/sh/kernel/irq.c linux-3.7.1-vs2.3.5.3/arch/sh/kernel/irq.c
+--- linux-3.7.1/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.7/arch/sh/kernel/irq.c linux-3.7-vs2.3.5.1/arch/sh
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.7/arch/sparc/Kconfig linux-3.7-vs2.3.5.1/arch/sparc/Kconfig
---- linux-3.7/arch/sparc/Kconfig 2012-12-11 15:46:15.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/sparc/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/sparc/Kconfig linux-3.7.1-vs2.3.5.3/arch/sparc/Kconfig
+--- linux-3.7.1/arch/sparc/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/sparc/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -564,6 +564,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/Kconfig linux-3.7-vs2.3.5.1/arch/spar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/sparc/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/sparc/include/uapi/asm/unistd.h
---- linux-3.7/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 15:46:16.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 16:43:01.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.3/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -693,9 +693,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/include/uapi/asm/unistd.h linux-3.7-v
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_32.S linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_32.S
---- linux-3.7/arch/sparc/kernel/systbls_32.S 2012-12-11 15:46:17.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_32.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_32.S linux-3.7.1-vs2.3.5.3/arch/sparc/kernel/systbls_32.S
+--- linux-3.7.1/arch/sparc/kernel/systbls_32.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -705,9 +705,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_32.S linux-3.7-vs2.3.5
/*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/arch/sparc/kernel/systbls_64.S linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_64.S
---- linux-3.7/arch/sparc/kernel/systbls_64.S 2012-12-11 15:46:17.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_64.S 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_64.S linux-3.7.1-vs2.3.5.3/arch/sparc/kernel/systbls_64.S
+--- linux-3.7.1/arch/sparc/kernel/systbls_64.S 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -726,9 +726,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_64.S linux-3.7-vs2.3.5
/*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/arch/um/Kconfig.rest linux-3.7-vs2.3.5.1/arch/um/Kconfig.rest
---- linux-3.7/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/um/Kconfig.rest 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/um/Kconfig.rest linux-3.7.1-vs2.3.5.3/arch/um/Kconfig.rest
+--- linux-3.7.1/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/um/Kconfig.rest 2012-12-18 15:13:16.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -738,14 +738,14 @@ diff -NurpP --minimal linux-3.7/arch/um/Kconfig.rest linux-3.7-vs2.3.5.1/arch/um
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/um/include/shared/kern_constants.h linux-3.7-vs2.3.5.1/arch/um/include/shared/kern_constants.h
---- linux-3.7/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/um/include/shared/kern_constants.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/kern_constants.h linux-3.7.1-vs2.3.5.3/arch/um/include/shared/kern_constants.h
+--- linux-3.7.1/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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/arch/um/include/shared/user_constants.h linux-3.7-vs2.3.5.1/arch/um/include/shared/user_constants.h
---- linux-3.7/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/um/include/shared/user_constants.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/user_constants.h linux-3.7.1-vs2.3.5.3/arch/um/include/shared/user_constants.h
+--- linux-3.7.1/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/um/include/shared/user_constants.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * DO NOT MODIFY.
@@ -787,9 +787,9 @@ diff -NurpP --minimal linux-3.7/arch/um/include/shared/user_constants.h linux-3.
+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
+
-diff -NurpP --minimal linux-3.7/arch/x86/Kconfig linux-3.7-vs2.3.5.1/arch/x86/Kconfig
---- linux-3.7/arch/x86/Kconfig 2012-12-11 15:46:18.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/x86/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/x86/Kconfig linux-3.7.1-vs2.3.5.3/arch/x86/Kconfig
+--- linux-3.7.1/arch/x86/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/arch/x86/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -2248,6 +2248,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -799,9 +799,9 @@ diff -NurpP --minimal linux-3.7/arch/x86/Kconfig linux-3.7-vs2.3.5.1/arch/x86/Kc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_32.tbl linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_32.tbl
---- linux-3.7/arch/x86/syscalls/syscall_32.tbl 2012-12-11 15:46:21.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_32.tbl 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_32.tbl linux-3.7.1-vs2.3.5.3/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.7.1/arch/x86/syscalls/syscall_32.tbl 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -811,9 +811,9 @@ diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_32.tbl linux-3.7-vs2.3
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/arch/x86/syscalls/syscall_64.tbl linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_64.tbl
---- linux-3.7/arch/x86/syscalls/syscall_64.tbl 2012-10-04 13:27:01.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_64.tbl 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_64.tbl linux-3.7.1-vs2.3.5.3/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.7.1/arch/x86/syscalls/syscall_64.tbl 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -823,9 +823,9 @@ diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_64.tbl linux-3.7-vs2.3
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/drivers/block/Kconfig linux-3.7-vs2.3.5.1/drivers/block/Kconfig
---- linux-3.7/drivers/block/Kconfig 2012-12-11 15:46:23.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/block/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/block/Kconfig linux-3.7.1-vs2.3.5.3/drivers/block/Kconfig
+--- linux-3.7.1/drivers/block/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/block/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -291,6 +291,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -840,9 +840,9 @@ diff -NurpP --minimal linux-3.7/drivers/block/Kconfig linux-3.7-vs2.3.5.1/driver
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.7/drivers/block/Makefile linux-3.7-vs2.3.5.1/drivers/block/Makefile
---- linux-3.7/drivers/block/Makefile 2012-12-11 15:46:23.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/block/Makefile 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/block/Makefile linux-3.7.1-vs2.3.5.3/drivers/block/Makefile
+--- linux-3.7.1/drivers/block/Makefile 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -851,9 +851,9 @@ diff -NurpP --minimal linux-3.7/drivers/block/Makefile linux-3.7-vs2.3.5.1/drive
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers/block/loop.c
---- linux-3.7/drivers/block/loop.c 2012-12-11 15:46:24.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/block/loop.c 2012-12-11 16:49:59.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/block/loop.c linux-3.7.1-vs2.3.5.3/drivers/block/loop.c
+--- linux-3.7.1/drivers/block/loop.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/block/loop.c 2012-12-18 15:13:16.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -909,9 +909,9 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/drivers/block/vroot.c
---- linux-3.7/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/block/vroot.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/block/vroot.c linux-3.7.1-vs2.3.5.3/drivers/block/vroot.c
+--- linux-3.7.1/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/block/vroot.c 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1204,9 +1204,9 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver
+
+#endif
+
-diff -NurpP --minimal linux-3.7/drivers/infiniband/Kconfig linux-3.7-vs2.3.5.1/drivers/infiniband/Kconfig
---- linux-3.7/drivers/infiniband/Kconfig 2012-07-22 21:39:06.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/infiniband/Kconfig 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/infiniband/Kconfig linux-3.7.1-vs2.3.5.3/drivers/infiniband/Kconfig
+--- linux-3.7.1/drivers/infiniband/Kconfig 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/infiniband/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1216,9 +1216,9 @@ diff -NurpP --minimal linux-3.7/drivers/infiniband/Kconfig linux-3.7-vs2.3.5.1/d
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.7/drivers/infiniband/core/addr.c linux-3.7-vs2.3.5.1/drivers/infiniband/core/addr.c
---- linux-3.7/drivers/infiniband/core/addr.c 2012-12-11 15:46:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/infiniband/core/addr.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/infiniband/core/addr.c linux-3.7.1-vs2.3.5.3/drivers/infiniband/core/addr.c
+--- linux-3.7.1/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)) {
@@ -1228,9 +1228,9 @@ diff -NurpP --minimal linux-3.7/drivers/infiniband/core/addr.c linux-3.7-vs2.3.5
if (ret)
goto put;
-diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/drivers/md/dm-ioctl.c
---- linux-3.7/drivers/md/dm-ioctl.c 2012-10-04 13:27:11.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/md/dm-ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/md/dm-ioctl.c linux-3.7.1-vs2.3.5.3/drivers/md/dm-ioctl.c
+--- linux-3.7.1/drivers/md/dm-ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/md/dm-ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1316,9 +1316,9 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/dm.c
---- linux-3.7/drivers/md/dm.c 2012-12-11 15:46:38.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/md/dm.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/md/dm.c linux-3.7.1-vs2.3.5.3/drivers/md/dm.c
+--- linux-3.7.1/drivers/md/dm.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/md/dm.c 2012-12-18 15:13:16.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1392,9 +1392,9 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.7/drivers/md/dm.h linux-3.7-vs2.3.5.1/drivers/md/dm.h
---- linux-3.7/drivers/md/dm.h 2012-10-04 13:27:11.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/md/dm.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/md/dm.h linux-3.7.1-vs2.3.5.3/drivers/md/dm.h
+--- linux-3.7.1/drivers/md/dm.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -1404,9 +1404,9 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.h linux-3.7-vs2.3.5.1/drivers/md/d
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/net/tun.c
---- linux-3.7/drivers/net/tun.c 2012-12-11 15:47:01.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/net/tun.c 2012-12-12 00:07:34.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/net/tun.c linux-3.7.1-vs2.3.5.3/drivers/net/tun.c
+--- linux-3.7.1/drivers/net/tun.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -1476,9 +1476,9 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.7/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7-vs2.3.5.1/drivers/staging/csr/csr_wifi_hip_xbv.c
---- linux-3.7/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-10-04 13:27:30.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7.1-vs2.3.5.3/drivers/staging/csr/csr_wifi_hip_xbv.c
+--- linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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];
@@ -1515,9 +1515,9 @@ diff -NurpP --minimal linux-3.7/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7
{
u8 buf[8];
s32 n;
-diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/tty/sysrq.c
---- linux-3.7/drivers/tty/sysrq.c 2012-12-11 15:47:24.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/tty/sysrq.c 2012-12-11 16:52:41.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/tty/sysrq.c linux-3.7.1-vs2.3.5.3/drivers/tty/sysrq.c
+--- linux-3.7.1/drivers/tty/sysrq.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/tty/sysrq.c 2012-12-18 15:13:16.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/input.h>
@@ -1552,11 +1552,10 @@ diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/
&sysrq_showstate_blocked_op, /* w */
/* x: May be registered on ppc/powerpc for xmon */
/* x: May be registered on sparc64 for global PMU dump */
-- NULL, /* x */
+#ifdef CONFIG_VSERVER_DEBUG
+ &sysrq_showvxinfo_op, /* x */
+#else
-+ NULL, /* x */
+ NULL, /* x */
+#endif
/* y: May be registered on sparc64 for global register dump */
NULL, /* y */
@@ -1570,9 +1569,9 @@ diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers/tty/tty_io.c
---- linux-3.7/drivers/tty/tty_io.c 2012-12-11 15:47:24.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/drivers/tty/tty_io.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/drivers/tty/tty_io.c linux-3.7.1-vs2.3.5.3/drivers/tty/tty_io.c
+--- linux-3.7.1/drivers/tty/tty_io.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/drivers/tty/tty_io.c 2012-12-18 15:13:16.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1599,9 +1598,9 @@ diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c
---- linux-3.7/fs/attr.c 2012-12-11 15:47:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/attr.c 2012-12-11 19:10:54.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/attr.c linux-3.7.1-vs2.3.5.3/fs/attr.c
+--- linux-3.7.1/fs/attr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/attr.c 2012-12-18 15:13:16.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1642,9 +1641,9 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev.c
---- linux-3.7/fs/block_dev.c 2012-12-11 15:47:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/block_dev.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/block_dev.c linux-3.7.1-vs2.3.5.3/fs/block_dev.c
+--- linux-3.7.1/fs/block_dev.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/block_dev.c 2012-12-18 15:13:16.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1682,9 +1681,9 @@ diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev.
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ctree.h
---- linux-3.7/fs/btrfs/ctree.h 2012-12-11 15:47:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/btrfs/ctree.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/ctree.h linux-3.7.1-vs2.3.5.3/fs/btrfs/ctree.h
+--- linux-3.7.1/fs/btrfs/ctree.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -1737,9 +1736,9 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ct
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/fs/btrfs/disk-io.c linux-3.7-vs2.3.5.1/fs/btrfs/disk-io.c
---- linux-3.7/fs/btrfs/disk-io.c 2012-12-11 15:47:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/btrfs/disk-io.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/disk-io.c linux-3.7.1-vs2.3.5.3/fs/btrfs/disk-io.c
+--- linux-3.7.1/fs/btrfs/disk-io.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
}
@@ -1750,9 +1749,9 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/disk-io.c linux-3.7-vs2.3.5.1/fs/btrfs/
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.7/fs/btrfs/inode.c linux-3.7-vs2.3.5.1/fs/btrfs/inode.c
---- linux-3.7/fs/btrfs/inode.c 2012-12-11 15:47:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/btrfs/inode.c 2012-12-11 21:52:49.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/inode.c linux-3.7.1-vs2.3.5.3/fs/btrfs/inode.c
+--- linux-3.7.1/fs/btrfs/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/btrfs/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -1819,9 +1818,9 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/inode.c linux-3.7-vs2.3.5.1/fs/btrfs/in
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/ioctl.c
---- linux-3.7/fs/btrfs/ioctl.c 2012-12-11 15:47:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/btrfs/ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/btrfs/ioctl.c
+--- linux-3.7.1/fs/btrfs/ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -1993,9 +1992,9 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.7/fs/btrfs/super.c linux-3.7-vs2.3.5.1/fs/btrfs/super.c
---- linux-3.7/fs/btrfs/super.c 2012-12-11 15:47:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/btrfs/super.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/super.c linux-3.7.1-vs2.3.5.3/fs/btrfs/super.c
+--- linux-3.7.1/fs/btrfs/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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,
@@ -2051,9 +2050,9 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/super.c linux-3.7-vs2.3.5.1/fs/btrfs/su
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c
---- linux-3.7/fs/char_dev.c 2012-12-11 15:47:32.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/char_dev.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/char_dev.c linux-3.7.1-vs2.3.5.3/fs/char_dev.c
+--- linux-3.7.1/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -2086,9 +2085,9 @@ diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.7/fs/dcache.c linux-3.7-vs2.3.5.1/fs/dcache.c
---- linux-3.7/fs/dcache.c 2012-12-11 15:47:32.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/dcache.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/dcache.c linux-3.7.1-vs2.3.5.3/fs/dcache.c
+--- linux-3.7.1/fs/dcache.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/dcache.c 2012-12-18 15:13:16.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
@@ -2140,9 +2139,9 @@ diff -NurpP --minimal linux-3.7/fs/dcache.c linux-3.7-vs2.3.5.1/fs/dcache.c
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/inode.c
---- linux-3.7/fs/devpts/inode.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/devpts/inode.c 2012-12-11 19:18:53.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/devpts/inode.c linux-3.7.1-vs2.3.5.3/fs/devpts/inode.c
+--- linux-3.7.1/fs/devpts/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/devpts/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2230,9 +2229,9 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.7/fs/ext2/balloc.c linux-3.7-vs2.3.5.1/fs/ext2/balloc.c
---- linux-3.7/fs/ext2/balloc.c 2012-12-11 15:47:32.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/balloc.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/balloc.c linux-3.7.1-vs2.3.5.3/fs/ext2/balloc.c
+--- linux-3.7.1/fs/ext2/balloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -2241,9 +2240,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/balloc.c linux-3.7-vs2.3.5.1/fs/ext2/bal
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2.h
---- linux-3.7/fs/ext2/ext2.h 2012-07-22 21:39:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/ext2.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/ext2.h linux-3.7.1-vs2.3.5.3/fs/ext2/ext2.h
+--- linux-3.7.1/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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) */
@@ -2291,18 +2290,18 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2.
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.7/fs/ext2/file.c linux-3.7-vs2.3.5.1/fs/ext2/file.c
---- linux-3.7/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/file.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/file.c linux-3.7.1-vs2.3.5.3/fs/ext2/file.c
+--- linux-3.7.1/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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/fs/ext2/ialloc.c linux-3.7-vs2.3.5.1/fs/ext2/ialloc.c
---- linux-3.7/fs/ext2/ialloc.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/ialloc.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext2/ialloc.c
+--- linux-3.7.1/fs/ext2/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -2319,9 +2318,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ialloc.c linux-3.7-vs2.3.5.1/fs/ext2/ial
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inode.c
---- linux-3.7/fs/ext2/inode.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/inode.c 2012-12-11 19:22:08.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/inode.c linux-3.7.1-vs2.3.5.3/fs/ext2/inode.c
+--- linux-3.7.1/fs/ext2/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext2/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
@@ -2454,9 +2453,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioctl.c
---- linux-3.7/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext2/ioctl.c
+--- linux-3.7.1/fs/ext2/ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext2/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2506,9 +2505,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioct
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.7/fs/ext2/namei.c linux-3.7-vs2.3.5.1/fs/ext2/namei.c
---- linux-3.7/fs/ext2/namei.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/namei.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/namei.c linux-3.7.1-vs2.3.5.3/fs/ext2/namei.c
+--- linux-3.7.1/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext2/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2533,9 +2532,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/namei.c linux-3.7-vs2.3.5.1/fs/ext2/name
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/super.c
---- linux-3.7/fs/ext2/super.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext2/super.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext2/super.c linux-3.7.1-vs2.3.5.3/fs/ext2/super.c
+--- linux-3.7.1/fs/ext2/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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,
@@ -2601,9 +2600,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/supe
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/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3.h
---- linux-3.7/fs/ext3/ext3.h 2012-07-22 21:39:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext3/ext3.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext3/ext3.h linux-3.7.1-vs2.3.5.3/fs/ext3/ext3.h
+--- linux-3.7.1/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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) */
@@ -2655,9 +2654,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3.
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.7/fs/ext3/file.c linux-3.7-vs2.3.5.1/fs/ext3/file.c
---- linux-3.7/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext3/file.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext3/file.c linux-3.7.1-vs2.3.5.3/fs/ext3/file.c
+--- linux-3.7.1/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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,
@@ -2665,9 +2664,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/file.c linux-3.7-vs2.3.5.1/fs/ext3/file.
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.7/fs/ext3/ialloc.c linux-3.7-vs2.3.5.1/fs/ext3/ialloc.c
---- linux-3.7/fs/ext3/ialloc.c 2012-07-22 21:39:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext3/ialloc.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext3/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext3/ialloc.c
+--- linux-3.7.1/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext3/ialloc.c 2012-12-18 15:13:16.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2684,9 +2683,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ialloc.c linux-3.7-vs2.3.5.1/fs/ext3/ial
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inode.c
---- linux-3.7/fs/ext3/inode.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext3/inode.c 2012-12-11 19:24:12.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext3/inode.c linux-3.7.1-vs2.3.5.3/fs/ext3/inode.c
+--- linux-3.7.1/fs/ext3/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext3/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -27,6 +27,8 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -2819,9 +2818,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inod
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.7/fs/ext3/ioctl.c linux-3.7-vs2.3.5.1/fs/ext3/ioctl.c
---- linux-3.7/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext3/ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext3/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext3/ioctl.c
+--- linux-3.7.1/fs/ext3/ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext3/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2889,9 +2888,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/ioctl.c linux-3.7-vs2.3.5.1/fs/ext3/ioct
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.7/fs/ext3/namei.c linux-3.7-vs2.3.5.1/fs/ext3/namei.c
---- linux-3.7/fs/ext3/namei.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext3/namei.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext3/namei.c linux-3.7.1-vs2.3.5.3/fs/ext3/namei.c
+--- linux-3.7.1/fs/ext3/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext3/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2917,9 +2916,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/namei.c linux-3.7-vs2.3.5.1/fs/ext3/name
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/super.c
---- linux-3.7/fs/ext3/super.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext3/super.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext3/super.c linux-3.7.1-vs2.3.5.3/fs/ext3/super.c
+--- linux-3.7.1/fs/ext3/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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,
@@ -2986,9 +2985,9 @@ diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/supe
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.7/fs/ext4/ext4.h linux-3.7-vs2.3.5.1/fs/ext4/ext4.h
---- linux-3.7/fs/ext4/ext4.h 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext4/ext4.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext4/ext4.h linux-3.7.1-vs2.3.5.3/fs/ext4/ext4.h
+--- linux-3.7.1/fs/ext4/ext4.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -3035,9 +3034,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ext4.h linux-3.7-vs2.3.5.1/fs/ext4/ext4.
/* 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/fs/ext4/file.c linux-3.7-vs2.3.5.1/fs/ext4/file.c
---- linux-3.7/fs/ext4/file.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext4/file.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext4/file.c linux-3.7.1-vs2.3.5.3/fs/ext4/file.c
+--- linux-3.7.1/fs/ext4/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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,
@@ -3045,9 +3044,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/file.c linux-3.7-vs2.3.5.1/fs/ext4/file.
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.7/fs/ext4/ialloc.c linux-3.7-vs2.3.5.1/fs/ext4/ialloc.c
---- linux-3.7/fs/ext4/ialloc.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext4/ialloc.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext4/ialloc.c linux-3.7.1-vs2.3.5.3/fs/ext4/ialloc.c
+--- linux-3.7.1/fs/ext4/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext4/ialloc.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3064,9 +3063,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ialloc.c linux-3.7-vs2.3.5.1/fs/ext4/ial
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inode.c
---- linux-3.7/fs/ext4/inode.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext4/inode.c 2012-12-11 19:25:58.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext4/inode.c linux-3.7.1-vs2.3.5.3/fs/ext4/inode.c
+--- linux-3.7.1/fs/ext4/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext4/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -3202,9 +3201,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioctl.c
---- linux-3.7/fs/ext4/ioctl.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext4/ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext4/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ext4/ioctl.c
+--- linux-3.7.1/fs/ext4/ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext4/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -14,12 +14,40 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3269,9 +3268,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.7/fs/ext4/namei.c linux-3.7-vs2.3.5.1/fs/ext4/namei.c
---- linux-3.7/fs/ext4/namei.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext4/namei.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext4/namei.c linux-3.7.1-vs2.3.5.3/fs/ext4/namei.c
+--- linux-3.7.1/fs/ext4/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext4/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3296,9 +3295,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/namei.c linux-3.7-vs2.3.5.1/fs/ext4/name
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/super.c
---- linux-3.7/fs/ext4/super.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ext4/super.c 2012-12-11 19:16:16.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ext4/super.c linux-3.7.1-vs2.3.5.3/fs/ext4/super.c
+--- linux-3.7.1/fs/ext4/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ext4/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -1222,7 +1222,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3364,9 +3363,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.7/fs/fcntl.c linux-3.7-vs2.3.5.1/fs/fcntl.c
---- linux-3.7/fs/fcntl.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/fcntl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/fcntl.c linux-3.7.1-vs2.3.5.3/fs/fcntl.c
+--- linux-3.7.1/fs/fcntl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/fcntl.c 2012-12-18 15:13:16.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
@@ -3384,9 +3383,9 @@ diff -NurpP --minimal linux-3.7/fs/fcntl.c linux-3.7-vs2.3.5.1/fs/fcntl.c
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c
---- linux-3.7/fs/file.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/file.c 2012-12-11 21:51:51.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/file.c linux-3.7.1-vs2.3.5.3/fs/file.c
+--- linux-3.7.1/fs/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3441,9 +3440,9 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c
return fd;
-diff -NurpP --minimal linux-3.7/fs/file_table.c linux-3.7-vs2.3.5.1/fs/file_table.c
---- linux-3.7/fs/file_table.c 2012-12-11 15:47:33.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/file_table.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/file_table.c linux-3.7.1-vs2.3.5.3/fs/file_table.c
+--- linux-3.7.1/fs/file_table.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/file_table.c 2012-12-18 15:13:16.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
@@ -3480,9 +3479,9 @@ diff -NurpP --minimal linux-3.7/fs/file_table.c linux-3.7-vs2.3.5.1/fs/file_tabl
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.7/fs/fs_struct.c linux-3.7-vs2.3.5.1/fs/fs_struct.c
---- linux-3.7/fs/fs_struct.c 2012-10-04 13:27:39.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/fs_struct.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/fs_struct.c linux-3.7.1-vs2.3.5.3/fs/fs_struct.c
+--- linux-3.7.1/fs/fs_struct.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/fs_struct.c 2012-12-18 15:13:16.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3507,9 +3506,9 @@ diff -NurpP --minimal linux-3.7/fs/fs_struct.c linux-3.7-vs2.3.5.1/fs/fs_struct.
}
return fs;
}
-diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file.c
---- linux-3.7/fs/gfs2/file.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/gfs2/file.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/gfs2/file.c linux-3.7.1-vs2.3.5.3/fs/gfs2/file.c
+--- linux-3.7.1/fs/gfs2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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,
@@ -3632,9 +3631,9 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file.
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.7/fs/gfs2/inode.h linux-3.7-vs2.3.5.1/fs/gfs2/inode.h
---- linux-3.7/fs/gfs2/inode.h 2012-07-22 21:39:40.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/gfs2/inode.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/gfs2/inode.h linux-3.7.1-vs2.3.5.3/fs/gfs2/inode.h
+--- linux-3.7.1/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -3643,9 +3642,9 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/inode.h linux-3.7-vs2.3.5.1/fs/gfs2/inod
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.7/fs/hostfs/hostfs.h linux-3.7-vs2.3.5.1/fs/hostfs/hostfs.h
---- linux-3.7/fs/hostfs/hostfs.h 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/hostfs/hostfs.h 2012-12-11 16:35:58.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/hostfs/hostfs.h linux-3.7.1-vs2.3.5.3/fs/hostfs/hostfs.h
+--- linux-3.7.1/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -3654,9 +3653,9 @@ diff -NurpP --minimal linux-3.7/fs/hostfs/hostfs.h linux-3.7-vs2.3.5.1/fs/hostfs
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c
---- linux-3.7/fs/inode.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/inode.c 2012-12-11 19:26:31.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/inode.c linux-3.7.1-vs2.3.5.3/fs/inode.c
+--- linux-3.7.1/fs/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -3719,9 +3718,9 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.7/fs/ioctl.c linux-3.7-vs2.3.5.1/fs/ioctl.c
---- linux-3.7/fs/ioctl.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ioctl.c
+--- linux-3.7.1/fs/ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3732,9 +3731,9 @@ diff -NurpP --minimal linux-3.7/fs/ioctl.c linux-3.7-vs2.3.5.1/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.7/fs/ioprio.c linux-3.7-vs2.3.5.1/fs/ioprio.c
---- linux-3.7/fs/ioprio.c 2012-07-22 21:39:40.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ioprio.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ioprio.c linux-3.7.1-vs2.3.5.3/fs/ioprio.c
+--- linux-3.7.1/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ioprio.c 2012-12-18 15:13:16.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3761,9 +3760,9 @@ diff -NurpP --minimal linux-3.7/fs/ioprio.c linux-3.7-vs2.3.5.1/fs/ioprio.c
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.7/fs/jfs/file.c linux-3.7-vs2.3.5.1/fs/jfs/file.c
---- linux-3.7/fs/jfs/file.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/file.c 2012-12-11 17:20:13.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/file.c linux-3.7.1-vs2.3.5.3/fs/jfs/file.c
+--- linux-3.7.1/fs/jfs/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -3782,9 +3781,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/file.c linux-3.7-vs2.3.5.1/fs/jfs/file.c
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl.c
---- linux-3.7/fs/jfs/ioctl.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/ioctl.c 2012-12-11 17:34:44.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/ioctl.c linux-3.7.1-vs2.3.5.3/fs/jfs/ioctl.c
+--- linux-3.7.1/fs/jfs/ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/jfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3842,9 +3841,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl.
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.7/fs/jfs/jfs_dinode.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_dinode.h
---- linux-3.7/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_dinode.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_dinode.h linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_dinode.h
+--- linux-3.7.1/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -3861,9 +3860,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_dinode.h linux-3.7-vs2.3.5.1/fs/jfs/j
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.7/fs/jfs/jfs_filsys.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_filsys.h
---- linux-3.7/fs/jfs/jfs_filsys.h 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_filsys.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_filsys.h linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_filsys.h
+--- linux-3.7.1/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -3872,9 +3871,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_filsys.h linux-3.7-vs2.3.5.1/fs/jfs/j
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs_imap.c
---- linux-3.7/fs/jfs/jfs_imap.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_imap.c 2012-12-11 22:02:05.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_imap.c linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_imap.c
+--- linux-3.7.1/fs/jfs/jfs_imap.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -3939,9 +3938,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.c
---- linux-3.7/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.c linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_inode.c
+--- linux-3.7.1/fs/jfs/jfs_inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4015,9 +4014,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jf
}
/*
-diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.h
---- linux-3.7/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.h linux-3.7.1-vs2.3.5.3/fs/jfs/jfs_inode.h
+--- linux-3.7.1/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -4026,9 +4025,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.h linux-3.7-vs2.3.5.1/fs/jfs/jf
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/fs/jfs/namei.c linux-3.7-vs2.3.5.1/fs/jfs/namei.c
---- linux-3.7/fs/jfs/namei.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/namei.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/namei.c linux-3.7.1-vs2.3.5.3/fs/jfs/namei.c
+--- linux-3.7.1/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/jfs/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4053,9 +4052,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/namei.c linux-3.7-vs2.3.5.1/fs/jfs/namei.
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super.c
---- linux-3.7/fs/jfs/super.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/jfs/super.c 2012-12-11 17:36:00.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/jfs/super.c linux-3.7.1-vs2.3.5.3/fs/jfs/super.c
+--- linux-3.7.1/fs/jfs/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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,
@@ -4122,9 +4121,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super.
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-3.7/fs/libfs.c linux-3.7-vs2.3.5.1/fs/libfs.c
---- linux-3.7/fs/libfs.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/libfs.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/libfs.c linux-3.7.1-vs2.3.5.3/fs/libfs.c
+--- linux-3.7.1/fs/libfs.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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.
*/
@@ -4170,9 +4169,9 @@ diff -NurpP --minimal linux-3.7/fs/libfs.c linux-3.7-vs2.3.5.1/fs/libfs.c
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c
---- linux-3.7/fs/locks.c 2012-12-11 15:47:34.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/locks.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/locks.c linux-3.7.1-vs2.3.5.3/fs/locks.c
+--- linux-3.7.1/fs/locks.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/locks.c 2012-12-18 15:13:16.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4370,9 +4369,9 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.7/fs/mount.h linux-3.7-vs2.3.5.1/fs/mount.h
---- linux-3.7/fs/mount.h 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/mount.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/mount.h linux-3.7.1-vs2.3.5.3/fs/mount.h
+--- linux-3.7.1/fs/mount.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -4381,9 +4380,9 @@ diff -NurpP --minimal linux-3.7/fs/mount.h linux-3.7-vs2.3.5.1/fs/mount.h
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c
---- linux-3.7/fs/namei.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/namei.c 2012-12-11 21:44:51.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/namei.c linux-3.7.1-vs2.3.5.3/fs/namei.c
+--- linux-3.7.1/fs/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -4931,9 +4930,9 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace.c
---- linux-3.7/fs/namespace.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/namespace.c 2012-12-11 17:17:30.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/namespace.c linux-3.7.1-vs2.3.5.3/fs/namespace.c
+--- linux-3.7.1/fs/namespace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -5120,9 +5119,9 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace.
kfree(ns);
}
-diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/client.c
---- linux-3.7/fs/nfs/client.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfs/client.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfs/client.c linux-3.7.1-vs2.3.5.3/fs/nfs/client.c
+--- linux-3.7.1/fs/nfs/client.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfs/client.c 2012-12-18 15:13:16.000000000 +0000
@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5144,9 +5143,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/clien
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.7/fs/nfs/dir.c linux-3.7-vs2.3.5.1/fs/nfs/dir.c
---- linux-3.7/fs/nfs/dir.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfs/dir.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfs/dir.c linux-3.7.1-vs2.3.5.3/fs/nfs/dir.c
+--- linux-3.7.1/fs/nfs/dir.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfs/dir.c 2012-12-18 15:13:16.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5163,9 +5162,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/dir.c linux-3.7-vs2.3.5.1/fs/nfs/dir.c
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.7/fs/nfs/inode.c linux-3.7-vs2.3.5.1/fs/nfs/inode.c
---- linux-3.7/fs/nfs/inode.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfs/inode.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfs/inode.c linux-3.7.1-vs2.3.5.3/fs/nfs/inode.c
+--- linux-3.7.1/fs/nfs/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfs/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
@@ -5315,9 +5314,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/inode.c linux-3.7-vs2.3.5.1/fs/nfs/inode.
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3xdr.c
---- linux-3.7/fs/nfs/nfs3xdr.c 2012-10-04 13:27:40.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfs/nfs3xdr.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfs/nfs3xdr.c linux-3.7.1-vs2.3.5.3/fs/nfs/nfs3xdr.c
+--- linux-3.7.1/fs/nfs/nfs3xdr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -5463,9 +5462,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3
}
/*
-diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super.c
---- linux-3.7/fs/nfs/super.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfs/super.c 2012-12-11 17:09:13.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfs/super.c linux-3.7.1-vs2.3.5.3/fs/nfs/super.c
+--- linux-3.7.1/fs/nfs/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfs/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/nsproxy.h>
#include <linux/rcupdate.h>
@@ -5539,9 +5538,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super.
/*
* options that take text values
-diff -NurpP --minimal linux-3.7/fs/nfsd/auth.c linux-3.7-vs2.3.5.1/fs/nfsd/auth.c
---- linux-3.7/fs/nfsd/auth.c 2012-07-22 21:39:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfsd/auth.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/auth.c linux-3.7.1-vs2.3.5.3/fs/nfsd/auth.c
+--- linux-3.7.1/fs/nfsd/auth.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfsd/auth.c 2012-12-18 15:13:16.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
@@ -5560,9 +5559,9 @@ diff -NurpP --minimal linux-3.7/fs/nfsd/auth.c linux-3.7-vs2.3.5.1/fs/nfsd/auth.
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.7/fs/nfsd/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfs3xdr.c
---- linux-3.7/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfs3xdr.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs3xdr.c linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs3xdr.c
+--- linux-3.7.1/fs/nfsd/nfs3xdr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000
@@ -7,6 +7,7 @@
*/
@@ -5613,9 +5612,9 @@ diff -NurpP --minimal linux-3.7/fs/nfsd/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nf
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.7/fs/nfsd/nfs4xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfs4xdr.c
---- linux-3.7/fs/nfsd/nfs4xdr.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfs4xdr.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs4xdr.c linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs4xdr.c
+--- linux-3.7.1/fs/nfsd/nfs4xdr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfsd/nfs4xdr.c 2012-12-18 15:13:16.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5645,9 +5644,9 @@ diff -NurpP --minimal linux-3.7/fs/nfsd/nfs4xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nf
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.7/fs/nfsd/nfsxdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfsxdr.c
---- linux-3.7/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfsxdr.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfsxdr.c linux-3.7.1-vs2.3.5.3/fs/nfsd/nfsxdr.c
+--- linux-3.7.1/fs/nfsd/nfsxdr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/nfsd/nfsxdr.c 2012-12-18 15:13:16.000000000 +0000
@@ -6,6 +6,7 @@
#include "xdr.h"
@@ -5696,9 +5695,9 @@ diff -NurpP --minimal linux-3.7/fs/nfsd/nfsxdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfs
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.c linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.c
---- linux-3.7/fs/ocfs2/dlmglue.c 2012-07-22 21:39:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/dlmglue.c
+--- linux-3.7.1/fs/ocfs2/dlmglue.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/dlmglue.c 2012-12-18 15:13:16.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);
@@ -5715,9 +5714,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.c linux-3.7-vs2.3.5.1/fs/ocfs2/
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/fs/ocfs2/dlmglue.h linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.h
---- linux-3.7/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/dlmglue.h
+--- linux-3.7.1/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -5728,9 +5727,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.h linux-3.7-vs2.3.5.1/fs/ocfs2/
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.7/fs/ocfs2/file.c linux-3.7-vs2.3.5.1/fs/ocfs2/file.c
---- linux-3.7/fs/ocfs2/file.c 2012-12-11 15:47:35.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/file.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/file.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/file.c
+--- linux-3.7.1/fs/ocfs2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -5740,9 +5739,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/file.c linux-3.7-vs2.3.5.1/fs/ocfs2/fil
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/inode.c
---- linux-3.7/fs/ocfs2/inode.c 2012-07-22 21:39:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/inode.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/inode.c
+--- linux-3.7.1/fs/ocfs2/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5839,9 +5838,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/in
/* 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/fs/ocfs2/inode.h linux-3.7-vs2.3.5.1/fs/ocfs2/inode.h
---- linux-3.7/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/inode.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/inode.h
+--- linux-3.7.1/fs/ocfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -5850,9 +5849,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.h linux-3.7-vs2.3.5.1/fs/ocfs2/in
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/ioctl.c
---- linux-3.7/fs/ocfs2/ioctl.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ioctl.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/ioctl.c
+--- linux-3.7.1/fs/ocfs2/ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
}
@@ -5916,9 +5915,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/io
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/fs/ocfs2/namei.c linux-3.7-vs2.3.5.1/fs/ocfs2/namei.c
---- linux-3.7/fs/ocfs2/namei.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/namei.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/namei.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/namei.c
+--- linux-3.7.1/fs/ocfs2/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5949,9 +5948,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/namei.c linux-3.7-vs2.3.5.1/fs/ocfs2/na
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/fs/ocfs2/ocfs2.h linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2.h
---- linux-3.7/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/ocfs2.h
+--- linux-3.7.1/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -5960,9 +5959,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2.h linux-3.7-vs2.3.5.1/fs/ocfs2/oc
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2_fs.h linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2_fs.h
---- linux-3.7/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2_fs.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2_fs.h linux-3.7.1-vs2.3.5.3/fs/ocfs2/ocfs2_fs.h
+--- linux-3.7.1/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -5975,9 +5974,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2_fs.h linux-3.7-vs2.3.5.1/fs/ocfs2
#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/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/super.c
---- linux-3.7/fs/ocfs2/super.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/ocfs2/super.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/super.c linux-3.7.1-vs2.3.5.3/fs/ocfs2/super.c
+--- linux-3.7.1/fs/ocfs2/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/ocfs2/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -6041,9 +6040,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.7/fs/open.c linux-3.7-vs2.3.5.1/fs/open.c
---- linux-3.7/fs/open.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/open.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/open.c linux-3.7.1-vs2.3.5.3/fs/open.c
+--- linux-3.7.1/fs/open.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/open.c 2012-12-18 15:13:16.000000000 +0000
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
@@ -6115,9 +6114,9 @@ diff -NurpP --minimal linux-3.7/fs/open.c linux-3.7-vs2.3.5.1/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/array.c
---- linux-3.7/fs/proc/array.c 2012-07-22 21:39:42.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/array.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/array.c linux-3.7.1-vs2.3.5.3/fs/proc/array.c
+--- linux-3.7.1/fs/proc/array.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/proc/array.c 2012-12-18 15:13:16.000000000 +0000
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
@@ -6231,9 +6230,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra
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/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base.c
---- linux-3.7/fs/proc/base.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/base.c 2012-12-11 19:34:49.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/base.c linux-3.7.1-vs2.3.5.3/fs/proc/base.c
+--- linux-3.7.1/fs/proc/base.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -6394,9 +6393,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base.
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/generic.c
---- linux-3.7/fs/proc/generic.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/generic.c 2012-12-11 19:15:21.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/generic.c linux-3.7.1-vs2.3.5.3/fs/proc/generic.c
+--- linux-3.7.1/fs/proc/generic.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/proc/generic.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6456,9 +6455,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/ge
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.7/fs/proc/inode.c linux-3.7-vs2.3.5.1/fs/proc/inode.c
---- linux-3.7/fs/proc/inode.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/inode.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/inode.c linux-3.7.1-vs2.3.5.3/fs/proc/inode.c
+--- linux-3.7.1/fs/proc/inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -6468,9 +6467,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/inode.c linux-3.7-vs2.3.5.1/fs/proc/inod
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.7/fs/proc/internal.h linux-3.7-vs2.3.5.1/fs/proc/internal.h
---- linux-3.7/fs/proc/internal.h 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/internal.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/internal.h linux-3.7.1-vs2.3.5.3/fs/proc/internal.h
+--- linux-3.7.1/fs/proc/internal.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/proc/internal.h 2012-12-18 15:13:16.000000000 +0000
@@ -11,6 +11,8 @@
#include <linux/sched.h>
@@ -6508,9 +6507,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/internal.h linux-3.7-vs2.3.5.1/fs/proc/i
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.7/fs/proc/loadavg.c linux-3.7-vs2.3.5.1/fs/proc/loadavg.c
---- linux-3.7/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/loadavg.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/loadavg.c linux-3.7.1-vs2.3.5.3/fs/proc/loadavg.c
+--- linux-3.7.1/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -6540,9 +6539,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/loadavg.c linux-3.7-vs2.3.5.1/fs/proc/lo
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.7/fs/proc/meminfo.c linux-3.7-vs2.3.5.1/fs/proc/meminfo.c
---- linux-3.7/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/meminfo.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/meminfo.c linux-3.7.1-vs2.3.5.3/fs/proc/meminfo.c
+--- linux-3.7.1/fs/proc/meminfo.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -6553,9 +6552,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/meminfo.c linux-3.7-vs2.3.5.1/fs/proc/me
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.7/fs/proc/root.c linux-3.7-vs2.3.5.1/fs/proc/root.c
---- linux-3.7/fs/proc/root.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/root.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/root.c linux-3.7.1-vs2.3.5.3/fs/proc/root.c
+--- linux-3.7.1/fs/proc/root.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -6587,9 +6586,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/root.c linux-3.7-vs2.3.5.1/fs/proc/root.
.name = "/proc",
};
-diff -NurpP --minimal linux-3.7/fs/proc/stat.c linux-3.7-vs2.3.5.1/fs/proc/stat.c
---- linux-3.7/fs/proc/stat.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/stat.c 2012-12-12 13:54:26.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/stat.c linux-3.7.1-vs2.3.5.3/fs/proc/stat.c
+--- linux-3.7.1/fs/proc/stat.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/proc/stat.c 2012-12-18 15:13:16.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6638,9 +6637,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/stat.c linux-3.7-vs2.3.5.1/fs/proc/stat.
/* 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/fs/proc/uptime.c linux-3.7-vs2.3.5.1/fs/proc/uptime.c
---- linux-3.7/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc/uptime.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc/uptime.c linux-3.7.1-vs2.3.5.3/fs/proc/uptime.c
+--- linux-3.7.1/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -6660,9 +6659,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/uptime.c linux-3.7-vs2.3.5.1/fs/proc/upt
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/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_namespace.c
---- linux-3.7/fs/proc_namespace.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/proc_namespace.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/proc_namespace.c linux-3.7.1-vs2.3.5.3/fs/proc_namespace.c
+--- linux-3.7.1/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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" },
@@ -6778,9 +6777,9 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.7/fs/quota/dquot.c linux-3.7-vs2.3.5.1/fs/quota/dquot.c
---- linux-3.7/fs/quota/dquot.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/quota/dquot.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/quota/dquot.c linux-3.7.1-vs2.3.5.3/fs/quota/dquot.c
+--- linux-3.7.1/fs/quota/dquot.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -6819,9 +6818,9 @@ diff -NurpP --minimal linux-3.7/fs/quota/dquot.c linux-3.7-vs2.3.5.1/fs/quota/dq
/* 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/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/quota.c
---- linux-3.7/fs/quota/quota.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/quota/quota.c 2012-12-11 22:07:44.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/quota/quota.c linux-3.7.1-vs2.3.5.3/fs/quota/quota.c
+--- linux-3.7.1/fs/quota/quota.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/quota/quota.c 2012-12-18 15:13:16.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6909,9 +6908,9 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.7/fs/stat.c linux-3.7-vs2.3.5.1/fs/stat.c
---- linux-3.7/fs/stat.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/stat.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/stat.c linux-3.7.1-vs2.3.5.3/fs/stat.c
+--- linux-3.7.1/fs/stat.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -6920,9 +6919,9 @@ diff -NurpP --minimal linux-3.7/fs/stat.c linux-3.7-vs2.3.5.1/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.7/fs/statfs.c linux-3.7-vs2.3.5.1/fs/statfs.c
---- linux-3.7/fs/statfs.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/statfs.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/statfs.c linux-3.7.1-vs2.3.5.3/fs/statfs.c
+--- linux-3.7.1/fs/statfs.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/statfs.c 2012-12-18 15:13:16.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6941,9 +6940,9 @@ diff -NurpP --minimal linux-3.7/fs/statfs.c linux-3.7-vs2.3.5.1/fs/statfs.c
return retval;
}
-diff -NurpP --minimal linux-3.7/fs/super.c linux-3.7-vs2.3.5.1/fs/super.c
---- linux-3.7/fs/super.c 2012-12-11 15:47:36.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/super.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/super.c linux-3.7.1-vs2.3.5.3/fs/super.c
+--- linux-3.7.1/fs/super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
@@ -6967,9 +6966,9 @@ diff -NurpP --minimal linux-3.7/fs/super.c linux-3.7-vs2.3.5.1/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.7/fs/sysfs/mount.c linux-3.7-vs2.3.5.1/fs/sysfs/mount.c
---- linux-3.7/fs/sysfs/mount.c 2012-10-04 13:27:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/sysfs/mount.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/sysfs/mount.c linux-3.7.1-vs2.3.5.3/fs/sysfs/mount.c
+--- linux-3.7.1/fs/sysfs/mount.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -6979,9 +6978,9 @@ diff -NurpP --minimal linux-3.7/fs/sysfs/mount.c linux-3.7-vs2.3.5.1/fs/sysfs/mo
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.7/fs/utimes.c linux-3.7-vs2.3.5.1/fs/utimes.c
---- linux-3.7/fs/utimes.c 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/utimes.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/utimes.c linux-3.7.1-vs2.3.5.3/fs/utimes.c
+--- linux-3.7.1/fs/utimes.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/utimes.c 2012-12-18 15:13:16.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -7011,9 +7010,9 @@ diff -NurpP --minimal linux-3.7/fs/utimes.c linux-3.7-vs2.3.5.1/fs/utimes.c
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.7/fs/xattr.c linux-3.7-vs2.3.5.1/fs/xattr.c
---- linux-3.7/fs/xattr.c 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xattr.c 2012-12-11 17:16:31.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xattr.c linux-3.7.1-vs2.3.5.3/fs/xattr.c
+--- linux-3.7.1/fs/xattr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/xattr.c 2012-12-18 15:13:16.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -7031,9 +7030,9 @@ diff -NurpP --minimal linux-3.7/fs/xattr.c linux-3.7-vs2.3.5.1/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_dinode.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_dinode.h
---- linux-3.7/fs/xfs/xfs_dinode.h 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_dinode.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_dinode.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_dinode.h
+--- linux-3.7.1/fs/xfs/xfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -7074,9 +7073,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_dinode.h linux-3.7-vs2.3.5.1/fs/xfs/x
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_fs.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_fs.h
---- linux-3.7/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_fs.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_fs.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_fs.h
+--- linux-3.7.1/fs/xfs/xfs_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -7097,9 +7096,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_fs.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_f
__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/fs/xfs/xfs_ialloc.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_ialloc.c
---- linux-3.7/fs/xfs/xfs_ialloc.c 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ialloc.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ialloc.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ialloc.c
+--- linux-3.7.1/fs/xfs/xfs_ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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"
@@ -7108,9 +7107,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ialloc.c linux-3.7-vs2.3.5.1/fs/xfs/x
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_inode.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.c
---- linux-3.7/fs/xfs/xfs_inode.c 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.c 2012-12-11 22:20:23.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_inode.c
+--- linux-3.7.1/fs/xfs/xfs_inode.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
*/
@@ -7285,9 +7284,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_inode.c linux-3.7-vs2.3.5.1/fs/xfs/xf
/* 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/fs/xfs/xfs_inode.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.h
---- linux-3.7/fs/xfs/xfs_inode.h 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_inode.h
+--- linux-3.7.1/fs/xfs/xfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -7308,9 +7307,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_inode.h linux-3.7-vs2.3.5.1/fs/xfs/xf
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/fs/xfs/xfs_ioctl.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.c
---- linux-3.7/fs/xfs/xfs_ioctl.c 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ioctl.c
+--- linux-3.7.1/fs/xfs/xfs_ioctl.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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"
@@ -7379,9 +7378,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ioctl.c linux-3.7-vs2.3.5.1/fs/xfs/xf
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ioctl.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.h
---- linux-3.7/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_ioctl.h
+--- linux-3.7.1/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -7395,9 +7394,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ioctl.h linux-3.7-vs2.3.5.1/fs/xfs/xf
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_iops.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_iops.c
---- linux-3.7/fs/xfs/xfs_iops.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_iops.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_iops.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_iops.c
+--- linux-3.7.1/fs/xfs/xfs_iops.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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"
@@ -7473,9 +7472,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_iops.c linux-3.7-vs2.3.5.1/fs/xfs/xfs
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_itable.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_itable.c
---- linux-3.7/fs/xfs/xfs_itable.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_itable.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_itable.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_itable.c
+--- linux-3.7.1/fs/xfs/xfs_itable.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -7484,9 +7483,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_itable.c linux-3.7-vs2.3.5.1/fs/xfs/x
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/fs/xfs/xfs_linux.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_linux.h
---- linux-3.7/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_linux.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_linux.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_linux.h
+--- linux-3.7.1/fs/xfs/xfs_linux.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_linux.h 2012-12-18 15:13:16.000000000 +0000
@@ -121,6 +121,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7495,9 +7494,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_linux.h linux-3.7-vs2.3.5.1/fs/xfs/xf
#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/fs/xfs/xfs_log_recover.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_log_recover.c
---- linux-3.7/fs/xfs/xfs_log_recover.c 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_log_recover.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_log_recover.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_log_recover.c
+--- linux-3.7.1/fs/xfs/xfs_log_recover.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_log_recover.c 2012-12-18 15:13:16.000000000 +0000
@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2(
}
@@ -7508,9 +7507,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_log_recover.c linux-3.7-vs2.3.5.1/fs/
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_mount.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_mount.h
---- linux-3.7/fs/xfs/xfs_mount.h 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_mount.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_mount.h linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_mount.h
+--- linux-3.7.1/fs/xfs/xfs_mount.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -7519,9 +7518,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_mount.h linux-3.7-vs2.3.5.1/fs/xfs/xf
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.7/fs/xfs/xfs_super.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_super.c
---- linux-3.7/fs/xfs/xfs_super.c 2012-12-11 15:47:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_super.c 2012-12-11 17:36:47.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_super.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_super.c
+--- linux-3.7.1/fs/xfs/xfs_super.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -7598,9 +7597,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_super.c linux-3.7-vs2.3.5.1/fs/xfs/xf
/*
* 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/fs/xfs/xfs_vnodeops.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_vnodeops.c
---- linux-3.7/fs/xfs/xfs_vnodeops.c 2012-10-04 13:27:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_vnodeops.c 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_vnodeops.c linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_vnodeops.c
+--- linux-3.7.1/fs/xfs/xfs_vnodeops.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/fs/xfs/xfs_vnodeops.c 2012-12-18 15:13:16.000000000 +0000
@@ -103,6 +103,77 @@ xfs_readlink_bmap(
return error;
}
@@ -7679,17 +7678,9 @@ diff -NurpP --minimal linux-3.7/fs/xfs/xfs_vnodeops.c linux-3.7-vs2.3.5.1/fs/xfs
int
xfs_readlink(
xfs_inode_t *ip,
-diff -NurpP --minimal linux-3.7/include/linux/Kbuild linux-3.7-vs2.3.5.1/include/linux/Kbuild
---- linux-3.7/include/linux/Kbuild 2012-12-11 15:47:38.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/Kbuild 2012-12-11 16:09:38.000000000 +0000
-@@ -3,3 +3,4 @@ header-y += hdlc/
- header-y += hsi/
- header-y += raid/
- header-y += usb/
-+header-y += vserver/
-diff -NurpP --minimal linux-3.7/include/linux/cred.h linux-3.7-vs2.3.5.1/include/linux/cred.h
---- linux-3.7/include/linux/cred.h 2012-07-22 21:39:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/cred.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/cred.h linux-3.7.1-vs2.3.5.3/include/linux/cred.h
+--- linux-3.7.1/include/linux/cred.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 *);
@@ -7730,18 +7721,18 @@ diff -NurpP --minimal linux-3.7/include/linux/cred.h linux-3.7-vs2.3.5.1/include
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.7/include/linux/devpts_fs.h linux-3.7-vs2.3.5.1/include/linux/devpts_fs.h
---- linux-3.7/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/devpts_fs.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/devpts_fs.h linux-3.7.1-vs2.3.5.3/include/linux/devpts_fs.h
+--- linux-3.7.1/include/linux/devpts_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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/include/linux/fs.h linux-3.7-vs2.3.5.1/include/linux/fs.h
---- linux-3.7/include/linux/fs.h 2012-12-11 15:47:41.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/fs.h 2012-12-11 21:23:03.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/fs.h linux-3.7.1-vs2.3.5.3/include/linux/fs.h
+--- linux-3.7.1/include/linux/fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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) */
@@ -7907,9 +7898,9 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l
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/include/linux/init_task.h linux-3.7-vs2.3.5.1/include/linux/init_task.h
---- linux-3.7/include/linux/init_task.h 2012-12-11 15:47:42.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/init_task.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/init_task.h linux-3.7.1-vs2.3.5.3/include/linux/init_task.h
+--- linux-3.7.1/include/linux/init_task.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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) \
@@ -7921,9 +7912,9 @@ diff -NurpP --minimal linux-3.7/include/linux/init_task.h linux-3.7-vs2.3.5.1/in
}
-diff -NurpP --minimal linux-3.7/include/linux/ipc.h linux-3.7-vs2.3.5.1/include/linux/ipc.h
---- linux-3.7/include/linux/ipc.h 2012-12-11 15:47:42.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/ipc.h 2012-12-11 22:24:37.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/ipc.h linux-3.7.1-vs2.3.5.3/include/linux/ipc.h
+--- linux-3.7.1/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -7932,9 +7923,9 @@ diff -NurpP --minimal linux-3.7/include/linux/ipc.h linux-3.7-vs2.3.5.1/include/
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.7/include/linux/ipc_namespace.h linux-3.7-vs2.3.5.1/include/linux/ipc_namespace.h
---- linux-3.7/include/linux/ipc_namespace.h 2012-07-22 21:39:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/ipc_namespace.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/ipc_namespace.h linux-3.7.1-vs2.3.5.3/include/linux/ipc_namespace.h
+--- linux-3.7.1/include/linux/ipc_namespace.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -7961,9 +7952,9 @@ diff -NurpP --minimal linux-3.7/include/linux/ipc_namespace.h linux-3.7-vs2.3.5.
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.7/include/linux/loop.h linux-3.7-vs2.3.5.1/include/linux/loop.h
---- linux-3.7/include/linux/loop.h 2012-12-11 15:47:42.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/loop.h 2012-12-11 22:34:03.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/loop.h linux-3.7.1-vs2.3.5.3/include/linux/loop.h
+--- linux-3.7.1/include/linux/loop.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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];
@@ -7972,9 +7963,9 @@ diff -NurpP --minimal linux-3.7/include/linux/loop.h linux-3.7-vs2.3.5.1/include
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.7/include/linux/memcontrol.h linux-3.7-vs2.3.5.1/include/linux/memcontrol.h
---- linux-3.7/include/linux/memcontrol.h 2012-12-11 15:47:42.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/memcontrol.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/memcontrol.h linux-3.7.1-vs2.3.5.3/include/linux/memcontrol.h
+--- linux-3.7.1/include/linux/memcontrol.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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);
@@ -7989,9 +7980,9 @@ diff -NurpP --minimal linux-3.7/include/linux/memcontrol.h linux-3.7-vs2.3.5.1/i
static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.7/include/linux/mm_types.h linux-3.7-vs2.3.5.1/include/linux/mm_types.h
---- linux-3.7/include/linux/mm_types.h 2012-12-11 15:47:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/mm_types.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/mm_types.h linux-3.7.1-vs2.3.5.3/include/linux/mm_types.h
+--- linux-3.7.1/include/linux/mm_types.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/mm_types.h 2012-12-18 15:13:16.000000000 +0000
@@ -365,6 +365,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -8000,9 +7991,9 @@ diff -NurpP --minimal linux-3.7/include/linux/mm_types.h linux-3.7-vs2.3.5.1/inc
unsigned long flags; /* Must use atomic bitops to access the bits */
-diff -NurpP --minimal linux-3.7/include/linux/mmzone.h linux-3.7-vs2.3.5.1/include/linux/mmzone.h
---- linux-3.7/include/linux/mmzone.h 2012-12-11 15:47:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/mmzone.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/mmzone.h linux-3.7.1-vs2.3.5.3/include/linux/mmzone.h
+--- linux-3.7.1/include/linux/mmzone.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;\
})
@@ -8017,9 +8008,9 @@ diff -NurpP --minimal linux-3.7/include/linux/mmzone.h linux-3.7-vs2.3.5.1/inclu
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.7/include/linux/mount.h linux-3.7-vs2.3.5.1/include/linux/mount.h
---- linux-3.7/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/mount.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/mount.h linux-3.7.1-vs2.3.5.3/include/linux/mount.h
+--- linux-3.7.1/include/linux/mount.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/mount.h 2012-12-18 15:13:16.000000000 +0000
@@ -47,6 +47,9 @@ struct mnt_namespace;
#define MNT_INTERNAL 0x4000
@@ -8030,9 +8021,9 @@ diff -NurpP --minimal linux-3.7/include/linux/mount.h linux-3.7-vs2.3.5.1/includ
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/include/linux/net.h linux-3.7-vs2.3.5.1/include/linux/net.h
---- linux-3.7/include/linux/net.h 2012-12-11 15:47:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/net.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/net.h linux-3.7.1-vs2.3.5.3/include/linux/net.h
+--- linux-3.7.1/include/linux/net.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -8041,9 +8032,9 @@ diff -NurpP --minimal linux-3.7/include/linux/net.h linux-3.7-vs2.3.5.1/include/
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.7/include/linux/netdevice.h linux-3.7-vs2.3.5.1/include/linux/netdevice.h
---- linux-3.7/include/linux/netdevice.h 2012-12-11 15:47:43.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/netdevice.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/netdevice.h linux-3.7.1-vs2.3.5.3/include/linux/netdevice.h
+--- linux-3.7.1/include/linux/netdevice.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/netdevice.h 2012-12-18 15:13:16.000000000 +0000
@@ -1637,6 +1637,7 @@ extern void netdev_resync_ops(struct ne
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -8052,9 +8043,9 @@ diff -NurpP --minimal linux-3.7/include/linux/netdevice.h linux-3.7-vs2.3.5.1/in
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/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/include/linux/nsproxy.h
---- linux-3.7/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/nsproxy.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/nsproxy.h linux-3.7.1-vs2.3.5.3/include/linux/nsproxy.h
+--- linux-3.7.1/include/linux/nsproxy.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/nsproxy.h 2012-12-18 15:13:16.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8104,9 +8095,9 @@ diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/incl
}
#endif
-diff -NurpP --minimal linux-3.7/include/linux/pid.h linux-3.7-vs2.3.5.1/include/linux/pid.h
---- linux-3.7/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/pid.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/pid.h linux-3.7.1-vs2.3.5.3/include/linux/pid.h
+--- linux-3.7.1/include/linux/pid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/pid.h 2012-12-18 15:13:16.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -8125,9 +8116,9 @@ diff -NurpP --minimal linux-3.7/include/linux/pid.h linux-3.7-vs2.3.5.1/include/
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.7/include/linux/proc_fs.h linux-3.7-vs2.3.5.1/include/linux/proc_fs.h
---- linux-3.7/include/linux/proc_fs.h 2012-07-22 21:39:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/proc_fs.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/proc_fs.h linux-3.7.1-vs2.3.5.3/include/linux/proc_fs.h
+--- linux-3.7.1/include/linux/proc_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -8163,9 +8154,9 @@ diff -NurpP --minimal linux-3.7/include/linux/proc_fs.h linux-3.7-vs2.3.5.1/incl
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/include/linux/quotaops.h
---- linux-3.7/include/linux/quotaops.h 2012-12-11 15:47:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/quotaops.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/quotaops.h linux-3.7.1-vs2.3.5.3/include/linux/quotaops.h
+--- linux-3.7.1/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/quotaops.h 2012-12-18 15:13:16.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8207,9 +8198,9 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/include/linux/sched.h
---- linux-3.7/include/linux/sched.h 2012-12-11 15:47:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/sched.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/sched.h linux-3.7.1-vs2.3.5.3/include/linux/sched.h
+--- linux-3.7.1/include/linux/sched.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/sched.h 2012-12-18 15:13:16.000000000 +0000
@@ -1378,6 +1378,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -8256,9 +8247,9 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ
}
-diff -NurpP --minimal linux-3.7/include/linux/shmem_fs.h linux-3.7-vs2.3.5.1/include/linux/shmem_fs.h
---- linux-3.7/include/linux/shmem_fs.h 2012-12-11 15:47:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/shmem_fs.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/shmem_fs.h linux-3.7.1-vs2.3.5.3/include/linux/shmem_fs.h
+--- linux-3.7.1/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/shmem_fs.h 2012-12-18 15:13:16.000000000 +0000
@@ -9,6 +9,9 @@
/* inode in-kernel data */
@@ -8269,9 +8260,9 @@ diff -NurpP --minimal linux-3.7/include/linux/shmem_fs.h linux-3.7-vs2.3.5.1/inc
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.7/include/linux/stat.h linux-3.7-vs2.3.5.1/include/linux/stat.h
---- linux-3.7/include/linux/stat.h 2012-12-11 15:47:45.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/stat.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/stat.h linux-3.7.1-vs2.3.5.3/include/linux/stat.h
+--- linux-3.7.1/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/stat.h 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -8280,9 +8271,9 @@ diff -NurpP --minimal linux-3.7/include/linux/stat.h linux-3.7-vs2.3.5.1/include
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.7/include/linux/sunrpc/auth.h linux-3.7-vs2.3.5.1/include/linux/sunrpc/auth.h
---- linux-3.7/include/linux/sunrpc/auth.h 2012-10-04 13:27:46.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/sunrpc/auth.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/auth.h linux-3.7.1-vs2.3.5.3/include/linux/sunrpc/auth.h
+--- linux-3.7.1/include/linux/sunrpc/auth.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/sunrpc/auth.h 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
@@ -8291,9 +8282,9 @@ diff -NurpP --minimal linux-3.7/include/linux/sunrpc/auth.h linux-3.7-vs2.3.5.1/
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.7/include/linux/sunrpc/clnt.h linux-3.7-vs2.3.5.1/include/linux/sunrpc/clnt.h
---- linux-3.7/include/linux/sunrpc/clnt.h 2012-12-11 15:47:45.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/sunrpc/clnt.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/clnt.h linux-3.7.1-vs2.3.5.3/include/linux/sunrpc/clnt.h
+--- linux-3.7.1/include/linux/sunrpc/clnt.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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 */
@@ -8304,9 +8295,9 @@ diff -NurpP --minimal linux-3.7/include/linux/sunrpc/clnt.h linux-3.7-vs2.3.5.1/
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.7/include/linux/sysfs.h linux-3.7-vs2.3.5.1/include/linux/sysfs.h
---- linux-3.7/include/linux/sysfs.h 2012-07-22 21:39:44.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/sysfs.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/sysfs.h linux-3.7.1-vs2.3.5.3/include/linux/sysfs.h
+--- linux-3.7.1/include/linux/sysfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -8316,9 +8307,9 @@ diff -NurpP --minimal linux-3.7/include/linux/sysfs.h linux-3.7-vs2.3.5.1/includ
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.7/include/linux/types.h linux-3.7-vs2.3.5.1/include/linux/types.h
---- linux-3.7/include/linux/types.h 2012-12-11 15:47:45.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/types.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/types.h linux-3.7.1-vs2.3.5.3/include/linux/types.h
+--- linux-3.7.1/include/linux/types.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
@@ -8329,9 +8320,9 @@ diff -NurpP --minimal linux-3.7/include/linux/types.h linux-3.7-vs2.3.5.1/includ
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/include/linux/uidgid.h
---- linux-3.7/include/linux/uidgid.h 2012-07-22 21:39:45.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/uidgid.h 2012-12-11 19:45:37.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/uidgid.h linux-3.7.1-vs2.3.5.3/include/linux/uidgid.h
+--- linux-3.7.1/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/uidgid.h 2012-12-18 15:13:16.000000000 +0000
@@ -23,13 +23,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -8451,9 +8442,9 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu
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/include/linux/utsname.h linux-3.7-vs2.3.5.1/include/linux/utsname.h
---- linux-3.7/include/linux/utsname.h 2012-12-11 15:47:45.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/utsname.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/utsname.h linux-3.7.1-vs2.3.5.3/include/linux/utsname.h
+--- linux-3.7.1/include/linux/utsname.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/utsname.h 2012-12-18 15:13:16.000000000 +0000
@@ -33,7 +33,8 @@ static inline void get_uts_ns(struct uts
}
@@ -8480,9 +8471,9 @@ diff -NurpP --minimal linux-3.7/include/linux/utsname.h linux-3.7-vs2.3.5.1/incl
}
#endif
-diff -NurpP --minimal linux-3.7/include/linux/vroot.h linux-3.7-vs2.3.5.1/include/linux/vroot.h
---- linux-3.7/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vroot.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vroot.h linux-3.7.1-vs2.3.5.3/include/linux/vroot.h
+--- linux-3.7.1/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vroot.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -8535,9 +8526,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vroot.h linux-3.7-vs2.3.5.1/includ
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.7/include/linux/vs_base.h linux-3.7-vs2.3.5.1/include/linux/vs_base.h
---- linux-3.7/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_base.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_base.h linux-3.7.1-vs2.3.5.3/include/linux/vs_base.h
+--- linux-3.7.1/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -8549,9 +8540,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_base.h linux-3.7-vs2.3.5.1/incl
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/include/linux/vs_context.h
---- linux-3.7/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_context.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_context.h linux-3.7.1-vs2.3.5.3/include/linux/vs_context.h
+--- linux-3.7.1/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -8795,9 +8786,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/i
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_cowbl.h linux-3.7-vs2.3.5.1/include/linux/vs_cowbl.h
---- linux-3.7/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_cowbl.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_cowbl.h linux-3.7.1-vs2.3.5.3/include/linux/vs_cowbl.h
+--- linux-3.7.1/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -8847,9 +8838,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_cowbl.h linux-3.7-vs2.3.5.1/inc
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_cvirt.h linux-3.7-vs2.3.5.1/include/linux/vs_cvirt.h
---- linux-3.7/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_cvirt.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_cvirt.h linux-3.7.1-vs2.3.5.3/include/linux/vs_cvirt.h
+--- linux-3.7.1/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -8901,9 +8892,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_cvirt.h linux-3.7-vs2.3.5.1/inc
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_device.h linux-3.7-vs2.3.5.1/include/linux/vs_device.h
---- linux-3.7/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_device.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_device.h linux-3.7.1-vs2.3.5.3/include/linux/vs_device.h
+--- linux-3.7.1/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -8950,9 +8941,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_device.h linux-3.7-vs2.3.5.1/in
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/include/linux/vs_dlimit.h
---- linux-3.7/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_dlimit.h 2012-12-11 19:37:05.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_dlimit.h linux-3.7.1-vs2.3.5.3/include/linux/vs_dlimit.h
+--- linux-3.7.1/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -9169,10 +9160,10 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/include/linux/vs_inet.h
---- linux-3.7/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_inet.h 2012-12-11 15:56:32.000000000 +0000
-@@ -0,0 +1,353 @@
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.3/include/linux/vs_inet.h
+--- linux-3.7.1/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vs_inet.h 2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,362 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+
@@ -9256,11 +9247,15 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl
+ (nxi->v4_bcast.s_addr == addr))
+ goto out;
+ ret = 5;
++
+ /* check for v4 addresses */
++ spin_lock(&nxi->addr_lock);
+ for (nxa = &nxi->v4; nxa; nxa = nxa->next)
+ if (v4_addr_match(nxa, addr, tmask))
-+ goto out;
++ goto out_unlock;
+ ret = 0;
++out_unlock:
++ spin_unlock(&nxi->addr_lock);
+out:
+ vxdprintk(VXD_CBIT(net, 0),
+ "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
@@ -9279,11 +9274,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl
+int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
+{
+ struct nx_addr_v4 *ptr;
++ int ret = 1;
+
++ spin_lock(&nxi->addr_lock);
+ for (ptr = &nxi->v4; ptr; ptr = ptr->next)
+ if (v4_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
++ goto out_unlock;
++ ret = 0;
++out_unlock:
++ spin_unlock(&nxi->addr_lock);
++ return ret;
+}
+
+#include <net/inet_sock.h>
@@ -9526,10 +9526,10 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h
---- linux-3.7/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h 2012-12-11 15:56:32.000000000 +0000
-@@ -0,0 +1,246 @@
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.3/include/linux/vs_inet6.h
+--- linux-3.7.1/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vs_inet6.h 2012-12-18 15:13:16.000000000 +0000
+@@ -0,0 +1,255 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+
@@ -9577,10 +9577,14 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc
+
+ if (!nxi)
+ goto out;
++
++ spin_lock(&nxi->addr_lock);
+ for (nxa = &nxi->v6; nxa; nxa = nxa->next)
+ if (v6_addr_match(nxa, addr, mask))
-+ goto out;
++ goto out_unlock;
+ ret = 0;
++out_unlock:
++ spin_unlock(&nxi->addr_lock);
+out:
+ vxdprintk(VXD_CBIT(net, 0),
+ "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
@@ -9599,11 +9603,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc
+int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
+{
+ struct nx_addr_v6 *ptr;
++ int ret = 1;
+
++ spin_lock(&nxi->addr_lock);
+ for (ptr = &nxi->v6; ptr; ptr = ptr->next)
+ if (v6_nx_addr_match(ptr, nxa, mask))
-+ return 1;
-+ return 0;
++ goto out_unlock;
++ ret = 0;
++out_unlock:
++ spin_unlock(&nxi->addr_lock);
++ return ret;
+}
+
+
@@ -9776,9 +9785,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/include/linux/vs_limit.h
---- linux-3.7/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_limit.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_limit.h linux-3.7.1-vs2.3.5.3/include/linux/vs_limit.h
+--- linux-3.7.1/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -9920,9 +9929,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/inc
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_network.h linux-3.7-vs2.3.5.1/include/linux/vs_network.h
---- linux-3.7/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_network.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_network.h linux-3.7.1-vs2.3.5.3/include/linux/vs_network.h
+--- linux-3.7.1/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -10093,9 +10102,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_network.h linux-3.7-vs2.3.5.1/i
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_pid.h linux-3.7-vs2.3.5.1/include/linux/vs_pid.h
---- linux-3.7/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_pid.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_pid.h linux-3.7.1-vs2.3.5.3/include/linux/vs_pid.h
+--- linux-3.7.1/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -10147,9 +10156,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_pid.h linux-3.7-vs2.3.5.1/inclu
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_sched.h linux-3.7-vs2.3.5.1/include/linux/vs_sched.h
---- linux-3.7/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_sched.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_sched.h linux-3.7.1-vs2.3.5.3/include/linux/vs_sched.h
+--- linux-3.7.1/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -10191,9 +10200,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_sched.h linux-3.7-vs2.3.5.1/inc
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_socket.h linux-3.7-vs2.3.5.1/include/linux/vs_socket.h
---- linux-3.7/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_socket.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_socket.h linux-3.7.1-vs2.3.5.3/include/linux/vs_socket.h
+--- linux-3.7.1/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -10262,9 +10271,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_socket.h linux-3.7-vs2.3.5.1/in
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/include/linux/vs_tag.h
---- linux-3.7/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_tag.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_tag.h linux-3.7.1-vs2.3.5.3/include/linux/vs_tag.h
+--- linux-3.7.1/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -10313,9 +10322,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/inclu
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vs_time.h linux-3.7-vs2.3.5.1/include/linux/vs_time.h
---- linux-3.7/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vs_time.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_time.h linux-3.7.1-vs2.3.5.3/include/linux/vs_time.h
+--- linux-3.7.1/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
@@ -10336,24 +10345,12 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_time.h linux-3.7-vs2.3.5.1/incl
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vserver/Kbuild linux-3.7-vs2.3.5.1/include/linux/vserver/Kbuild
---- linux-3.7/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/Kbuild 2012-12-11 15:56:32.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.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1/include/linux/vserver/base.h
---- linux-3.7/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/base.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/base.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/base.h
+--- linux-3.7.1/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/base.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,178 @@
-+#ifndef _VX_BASE_H
-+#define _VX_BASE_H
++#ifndef _VSERVER_BASE_H
++#define _VSERVER_BASE_H
+
+
+/* context state changes */
@@ -10530,12 +10527,12 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct.h
---- linux-3.7/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct.h 2012-12-11 15:56:32.000000000 +0000
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct.h
+--- linux-3.7.1/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,15 @@
-+#ifndef _VX_CACCT_H
-+#define _VX_CACCT_H
++#ifndef _VSERVER_CACCT_H
++#define _VSERVER_CACCT_H
+
+
+enum sock_acc_field {
@@ -10548,40 +10545,27 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct.h linux-3.7-vs2.3.5.
+ VXA_SOCK_SIZE /* array size */
+};
+
-+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_cmd.h
---- linux-3.7/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_cmd.h 2012-12-11 15:56:32.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];
-+};
-+
++#endif /* _VSERVER_CACCT_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_cmd.h
+--- linux-3.7.1/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
+
-+#ifdef __KERNEL__
+
+#include <linux/compiler.h>
++#include <uapi/vserver/cacct_cmd.h>
+
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_def.h
---- linux-3.7/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_def.h 2012-12-11 15:56:32.000000000 +0000
++#endif /* _VSERVER_CACCT_CMD_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_def.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_def.h
+--- linux-3.7.1/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_def.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,43 @@
-+#ifndef _VX_CACCT_DEF_H
-+#define _VX_CACCT_DEF_H
++#ifndef _VSERVER_CACCT_DEF_H
++#define _VSERVER_CACCT_DEF_H
+
+#include <asm/atomic.h>
+#include <linux/vserver/cacct.h>
@@ -10622,16 +10606,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_def.h linux-3.7-vs2.
+
+#endif
+
-+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_int.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_int.h
---- linux-3.7/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_int.h 2012-12-11 15:56:32.000000000 +0000
-@@ -0,0 +1,21 @@
-+#ifndef _VX_CACCT_INT_H
-+#define _VX_CACCT_INT_H
-+
-+
-+#ifdef __KERNEL__
++#endif /* _VSERVER_CACCT_DEF_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_int.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cacct_int.h
+--- linux-3.7.1/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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)
@@ -10646,14 +10627,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_int.h linux-3.7-vs2.
+ return atomic_long_read(&cacct->sock[type][pos].total);
+}
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.7/include/linux/vserver/check.h linux-3.7-vs2.3.5.1/include/linux/vserver/check.h
---- linux-3.7/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/check.h 2012-12-11 15:56:32.000000000 +0000
++#endif /* _VSERVER_CACCT_INT_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/check.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/check.h
+--- linux-3.7.1/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/check.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,89 @@
-+#ifndef _VS_CHECK_H
-+#define _VS_CHECK_H
++#ifndef _VSERVER_CHECK_H
++#define _VSERVER_CHECK_H
+
+
+#define MAX_S_CONTEXT 65535 /* Arbitrary limit */
@@ -10741,95 +10721,18 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/check.h linux-3.7-vs2.3.5.
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3.5.1/include/linux/vserver/context.h
---- linux-3.7/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/context.h 2012-12-11 15:56:32.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
-+
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/context.h
+--- linux-3.7.1/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
+
-+#ifdef __KERNEL__
+
+#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"
@@ -10931,263 +10834,89 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3.
+extern long vs_state_change(struct vx_info *, unsigned int);
+
+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.7/include/linux/vserver/context_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/context_cmd.h
---- linux-3.7/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/context_cmd.h 2012-12-11 15:56:32.000000000 +0000
-@@ -0,0 +1,162 @@
-+#ifndef _VX_CONTEXT_CMD_H
-+#define _VX_CONTEXT_CMD_H
-+
-+
-+/* vinfo commands */
++#endif /* _VSERVER_CONTEXT_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/context_cmd.h
+--- linux-3.7.1/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
+
-+#define VCMD_task_xid VC_CMD(VINFO, 1, 0)
++#include <uapi/vserver/context_cmd.h>
+
-+#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__ */
++extern int vc_ctx_create(uint32_t, void __user *);
++extern int vc_ctx_migrate(struct vx_info *, void __user *);
+
-+/* context commands */
++extern int vc_get_cflags(struct vx_info *, void __user *);
++extern int vc_set_cflags(struct vx_info *, void __user *);
+
-+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0)
-+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1)
++extern int vc_get_ccaps(struct vx_info *, void __user *);
++extern int vc_set_ccaps(struct vx_info *, void __user *);
+
-+struct vcmd_ctx_create {
-+ uint64_t flagword;
-+};
++extern int vc_get_bcaps(struct vx_info *, void __user *);
++extern int vc_set_bcaps(struct vx_info *, void __user *);
+
-+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0)
-+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1)
++extern int vc_get_umask(struct vx_info *, void __user *);
++extern int vc_set_umask(struct vx_info *, void __user *);
+
-+struct vcmd_ctx_migrate {
-+ uint64_t flagword;
-+};
++extern int vc_get_wmask(struct vx_info *, void __user *);
++extern int vc_set_wmask(struct vx_info *, void __user *);
+
-+#ifdef __KERNEL__
-+extern int vc_ctx_create(uint32_t, void __user *);
-+extern int vc_ctx_migrate(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 /* __KERNEL__ */
++#endif /* _VSERVER_CONTEXT_CMD_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt.h
+--- linux-3.7.1/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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;
+
-+/* flag commands */
++void vx_vsi_boottime(struct timespec *);
+
-+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0)
-+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0)
++void vx_vsi_uptime(struct timespec *, struct timespec *);
+
-+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 *);
++struct vx_info;
+
-+#endif /* __KERNEL__ */
++void vx_update_load(struct vx_info *);
+
+
-+/* context caps commands */
++int vx_do_syslog(int, char __user *, int);
+
-+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1)
-+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1)
++#endif /* _VSERVER_CVIRT_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_cmd.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt_cmd.h
+--- linux-3.7.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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
+
-+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 *);
++#include <linux/compiler.h>
++#include <uapi/vserver/cvirt_cmd.h>
+
-+#endif /* __KERNEL__ */
++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 *);
+
-+/* 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.7/include/linux/vserver/cvirt.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt.h
---- linux-3.7/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt.h 2012-12-11 15:56:32.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.7/include/linux/vserver/cvirt_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_cmd.h
---- linux-3.7/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_cmd.h 2012-12-11 15:56:32.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.7/include/linux/vserver/cvirt_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_def.h
---- linux-3.7/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_def.h 2012-12-11 15:56:32.000000000 +0000
-@@ -0,0 +1,80 @@
-+#ifndef _VX_CVIRT_DEF_H
-+#define _VX_CVIRT_DEF_H
++#endif /* _VSERVER_CVIRT_CMD_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_def.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/cvirt_def.h
+--- linux-3.7.1/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/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>
@@ -11265,13 +10994,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt_def.h linux-3.7-vs2.
+
+#endif
+
-+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5.1/include/linux/vserver/debug.h
---- linux-3.7/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/debug.h 2012-12-11 15:56:32.000000000 +0000
++#endif /* _VSERVER_CVIRT_DEF_H */
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug.h linux-3.7.1-vs2.3.5.3/include/linux/vserver/debug.h
+--- linux-3.7.1/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.1-vs2.3.5.3/include/linux/vserver/debug.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,145 @@
-+#ifndef _VX_DEBUG_H
-+#define _VX_DEBUG_H
++#ifndef _VSERVER_DEBUG_H
++#define _VSERVER_DEBUG_H
+
+
+#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m)))
@@ -11414,36 +11143,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5.
+#endif
+
+
-+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.7/include/linux/vserver/debug_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/debug_cmd.h
---- linux-3.7/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7-vs2.3.5.1/include/linux/vserver/debug_cmd.h 2012-12-11 15:56:32.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)
-+
<Skipped 28360 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/4bf69007111dd2befdc840afc527163e83853de5
More information about the pld-cvs-commit
mailing list