[packages/kernel/LINUX_4_1] - up to 4.1.41
arekm
arekm at pld-linux.org
Wed Jun 21 10:35:58 CEST 2017
commit 0d85ed731e3bda3203852a8167e6f7958fe6c9c1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jun 21 10:35:50 2017 +0200
- up to 4.1.41
kernel-small_fixes.patch | 833 +--------------
kernel-vserver-2.3.patch | 2510 +++++++++++++++++++++++-----------------------
kernel.spec | 9 +-
3 files changed, 1263 insertions(+), 2089 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 1b104112..60a1ab74 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -5,9 +5,6 @@
# PENDING STABLE PATCHES:
# https://git.kernel.org/cgit/linux/kernel/git/sashal/linux-stable.git/log/?h=linux-4.1.y-queue
#
-# OTHER PATCHES:
-# http://kernel.opensuse.org/cgit/kernel/log/?h=openSUSE-42.1 ; see series.conf
-#
# TODO:
# - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
# - IPv4 source address selection for multihomed vservers is completely broken
@@ -76,7 +73,7 @@
%define rel 1
%define basever 4.1
-%define postver .40
+%define postver .41
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -125,7 +122,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: fe9dc0f6729f36400ea81aa41d614c37
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: 983f7240b2089186027fbef6dec65430
+# Patch0-md5: e18a0bf791e017b96754237b1ce20c25
%endif
Source1: kernel.sysconfig
@@ -192,7 +189,7 @@ Patch59: kernel-rndis_host-wm5.patch
# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
Patch85: kernel-hostap.patch
-%define vserver_patch 4.1.27-vs2.3.8.5.2
+%define vserver_patch 4.1.40-vs2.3.8.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-small_fixes.patch b/kernel-small_fixes.patch
index 1e3ab989..5607d7d0 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -214,89 +214,6 @@ index 96bd1e2bffaf..389939f74dd5 100644
--
1.8.5.6
-patches.fixes/mm-mempolicy.c-fix-error-handling-in-set_mempolicy-a.patch
-From cf01fb9985e8deb25ccf0ea54d916b8871ae0e62 Mon Sep 17 00:00:00 2001
-From: Chris Salls <salls at cs.ucsb.edu>
-Date: Fri, 7 Apr 2017 23:48:11 -0700
-Subject: [PATCH] mm/mempolicy.c: fix error handling in set_mempolicy and
- mbind.
-Git-commit: cf01fb9985e8deb25ccf0ea54d916b8871ae0e62
-Patch-mainline: 4.11-rc5
-References: bnc#1033336, CVE-2017-7616
-
-In the case that compat_get_bitmap fails we do not want to copy the
-bitmap to the user as it will contain uninitialized stack data and leak
-sensitive data.
-
-Signed-off-by: Chris Salls <salls at cs.ucsb.edu>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-Acked-by: Michal Hocko <mhocko at suse.cz>
-
----
- mm/mempolicy.c | 20 ++++++++------------
- 1 file changed, 8 insertions(+), 12 deletions(-)
-
-diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index 75b2745bac41..37d0b334bfe9 100644
---- a/mm/mempolicy.c
-+++ b/mm/mempolicy.c
-@@ -1529,7 +1529,6 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
- COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask,
- compat_ulong_t, maxnode)
- {
-- long err = 0;
- unsigned long __user *nm = NULL;
- unsigned long nr_bits, alloc_size;
- DECLARE_BITMAP(bm, MAX_NUMNODES);
-@@ -1538,14 +1537,13 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
- alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8;
-
- if (nmask) {
-- err = compat_get_bitmap(bm, nmask, nr_bits);
-+ if (compat_get_bitmap(bm, nmask, nr_bits))
-+ return -EFAULT;
- nm = compat_alloc_user_space(alloc_size);
-- err |= copy_to_user(nm, bm, alloc_size);
-+ if (copy_to_user(nm, bm, alloc_size))
-+ return -EFAULT;
- }
-
-- if (err)
-- return -EFAULT;
--
- return sys_set_mempolicy(mode, nm, nr_bits+1);
- }
-
-@@ -1553,7 +1551,6 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
- compat_ulong_t, mode, compat_ulong_t __user *, nmask,
- compat_ulong_t, maxnode, compat_ulong_t, flags)
- {
-- long err = 0;
- unsigned long __user *nm = NULL;
- unsigned long nr_bits, alloc_size;
- nodemask_t bm;
-@@ -1562,14 +1559,13 @@ static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
- alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8;
-
- if (nmask) {
-- err = compat_get_bitmap(nodes_addr(bm), nmask, nr_bits);
-+ if (compat_get_bitmap(nodes_addr(bm), nmask, nr_bits))
-+ return -EFAULT;
- nm = compat_alloc_user_space(alloc_size);
-- err |= copy_to_user(nm, nodes_addr(bm), alloc_size);
-+ if (copy_to_user(nm, nodes_addr(bm), alloc_size))
-+ return -EFAULT;
- }
-
-- if (err)
-- return -EFAULT;
--
- return sys_mbind(start, len, mode, nm, nr_bits+1, flags);
- }
-
---
-1.8.5.6
-
patches.fixes/rds-fix-an-infoleak-in-rds_inc_info_copy.patch
From: Kangjie Lu <kangjielu at gmail.com>
Date: Thu, 2 Jun 2016 04:11:20 -0400
@@ -1170,58 +1087,6 @@ index b4b2bb4eccf8..fcf10252017e 100644
--
2.11.1
-patches.fixes/dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch
-From: Andrey Konovalov <andreyknvl at google.com>
-Date: Thu, 16 Feb 2017 17:22:46 +0100
-Subject: dccp: fix freeing skb too early for IPV6_RECVPKTINFO
-Patch-mainline: v4.10
-Git-commit: 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4
-References: CVE-2017-6074 bsc#1026024
-
-In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet
-is forcibly freed via __kfree_skb in dccp_rcv_state_process if
-dccp_v6_conn_request successfully returns.
-
-However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb
-is saved to ireq->pktopts and the ref count for skb is incremented in
-dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed
-in dccp_rcv_state_process.
-
-Fix by calling consume_skb instead of doing goto discard and therefore
-calling __kfree_skb.
-
-Similar fixes for TCP:
-
-fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed.
-0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now
-simply consumed
-
-Signed-off-by: Andrey Konovalov <andreyknvl at google.com>
-Acked-by: Eric Dumazet <edumazet at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
-Acked-by: Michal Kubecek <mkubecek at suse.cz>
-
----
- net/dccp/input.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/net/dccp/input.c b/net/dccp/input.c
-index 3bd14e885396..dbe2573f6ba1 100644
---- a/net/dccp/input.c
-+++ b/net/dccp/input.c
-@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
- if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
- skb) < 0)
- return 1;
-- goto discard;
-+ consume_skb(skb);
-+ return 0;
- }
- if (dh->dccph_type == DCCP_PKT_RESET)
- goto discard;
---
-2.11.1
-
patches.fixes/tcp-avoid-infinite-loop-in-tcp_splice_read.patch
From: Eric Dumazet <edumazet at google.com>
Date: Fri, 3 Feb 2017 14:59:38 -0800
@@ -1786,186 +1651,6 @@ index 1c1b9ed94719..2dc882637cdf 100644
--
2.12.2
-patches.fixes/ping-implement-proper-locking.patch
-From: Eric Dumazet <edumazet at google.com>
-Date: Fri, 24 Mar 2017 19:36:13 -0700
-Subject: ping: implement proper locking
-Patch-mainline: v4.11-rc6
-Git-commit: 43a6684519ab0a6c52024b5e25322476cabad893
-References: CVE-2017-2671 bsc#1031003
-
-We got a report of yet another bug in ping
-
-http://www.openwall.com/lists/oss-security/2017/03/24/6
-
-->disconnect() is not called with socket lock held.
-
-Fix this by acquiring ping rwlock earlier.
-
-Thanks to Daniel, Alexander and Andrey for letting us know this problem.
-
-Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
-Signed-off-by: Eric Dumazet <edumazet at google.com>
-Reported-by: Daniel Jiang <danieljiang0415 at gmail.com>
-Reported-by: Solar Designer <solar at openwall.com>
-Reported-by: Andrey Konovalov <andreyknvl at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
-Acked-by: Michal Kubecek <mkubecek at suse.cz>
-
----
- net/ipv4/ping.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
-index 3dac3d4aa26f..b670627106ef 100644
---- a/net/ipv4/ping.c
-+++ b/net/ipv4/ping.c
-@@ -154,17 +154,18 @@ void ping_hash(struct sock *sk)
- void ping_unhash(struct sock *sk)
- {
- struct inet_sock *isk = inet_sk(sk);
-+
- pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num);
-+ write_lock_bh(&ping_table.lock);
- if (sk_hashed(sk)) {
-- write_lock_bh(&ping_table.lock);
- hlist_nulls_del(&sk->sk_nulls_node);
- sk_nulls_node_init(&sk->sk_nulls_node);
- sock_put(sk);
- isk->inet_num = 0;
- isk->inet_sport = 0;
- sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
-- write_unlock_bh(&ping_table.lock);
- }
-+ write_unlock_bh(&ping_table.lock);
- }
- EXPORT_SYMBOL_GPL(ping_unhash);
-
---
-2.12.2
-
-patches.fixes/net-packet-fix-overflow-in-check-for-priv-area-size.patch
-From: Andrey Konovalov <andreyknvl at google.com>
-Date: Wed, 29 Mar 2017 16:11:20 +0200
-Subject: net/packet: fix overflow in check for priv area size
-Patch-mainline: v4.11-rc6
-Git-commit: 2b6867c2ce76c596676bec7d2d525af525fdc6e2
-References: CVE-2017-7308 bsc#1031579
-
-Subtracting tp_sizeof_priv from tp_block_size and casting to int
-to check whether one is less then the other doesn't always work
-(both of them are unsigned ints).
-
-Compare them as is instead.
-
-Also cast tp_sizeof_priv to u64 before using BLK_PLUS_PRIV, as
-it can overflow inside BLK_PLUS_PRIV otherwise.
-
-Signed-off-by: Andrey Konovalov <andreyknvl at google.com>
-Acked-by: Eric Dumazet <edumazet at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
-Acked-by: Michal Kubecek <mkubecek at suse.cz>
-
----
- net/packet/af_packet.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 3d6b2e111a55..6dcbc1249836 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -3870,8 +3870,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
- if (unlikely(req->tp_block_size & (PAGE_SIZE - 1)))
- goto out;
- if (po->tp_version >= TPACKET_V3 &&
-- (int)(req->tp_block_size -
-- BLK_PLUS_PRIV(req_u->req3.tp_sizeof_priv)) <= 0)
-+ req->tp_block_size <=
-+ BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv))
- goto out;
- if (unlikely(req->tp_frame_size < po->tp_hdrlen +
- po->tp_reserve))
---
-2.12.2
-
-patches.fixes/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch
-From: Andrey Konovalov <andreyknvl at google.com>
-Date: Wed, 29 Mar 2017 16:11:21 +0200
-Subject: net/packet: fix overflow in check for tp_frame_nr
-Patch-mainline: v4.11-rc6
-Git-commit: 8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b
-References: CVE-2017-7308 bsc#1031579
-
-When calculating rb->frames_per_block * req->tp_block_nr the result
-can overflow.
-
-Add a check that tp_block_size * tp_block_nr <= UINT_MAX.
-
-Since frames_per_block <= tp_block_size, the expression would
-never overflow.
-
-Signed-off-by: Andrey Konovalov <andreyknvl at google.com>
-Acked-by: Eric Dumazet <edumazet at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
-Acked-by: Michal Kubecek <mkubecek at suse.cz>
-
----
- net/packet/af_packet.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 6dcbc1249836..2bc45a85dd8c 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -3882,6 +3882,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
- rb->frames_per_block = req->tp_block_size/req->tp_frame_size;
- if (unlikely(rb->frames_per_block <= 0))
- goto out;
-+ if (unlikely(req->tp_block_size > UINT_MAX / req->tp_block_nr))
-+ goto out;
- if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
- req->tp_frame_nr))
- goto out;
---
-2.12.2
-
-patches.fixes/net-packet-fix-overflow-in-check-for-tp_reserve.patch
-From: Andrey Konovalov <andreyknvl at google.com>
-Date: Wed, 29 Mar 2017 16:11:22 +0200
-Subject: net/packet: fix overflow in check for tp_reserve
-Patch-mainline: v4.11-rc6
-Git-commit: bcc5364bdcfe131e6379363f089e7b4108d35b70
-References: CVE-2017-7308 bsc#1031579
-
-When calculating po->tp_hdrlen + po->tp_reserve the result can overflow.
-
-Fix by checking that tp_reserve <= INT_MAX on assign.
-
-Signed-off-by: Andrey Konovalov <andreyknvl at google.com>
-Acked-by: Eric Dumazet <edumazet at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
-Acked-by: Michal Kubecek <mkubecek at suse.cz>
-
----
- net/packet/af_packet.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 2bc45a85dd8c..b07f96947aee 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -3377,6 +3377,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
- return -EBUSY;
- if (copy_from_user(&val, optval, sizeof(val)))
- return -EFAULT;
-+ if (val > INT_MAX)
-+ return -EINVAL;
- po->tp_reserve = val;
- return 0;
- }
---
-2.12.2
-
patches.fixes/net-socket-fix-recvmmsg-not-returning-error-from-soc.patch
From: Maxime Jayat <maxime.jayat at mobile-devices.fr>
Date: Tue, 21 Feb 2017 18:35:51 +0100
@@ -2401,347 +2086,6 @@ Acked-by: Johannes Thumshirn <jthumshirn at suse.de>
iov_for_each(iov, i, *iter) {
unsigned long uaddr = (unsigned long) iov.iov_base;
-patches.fixes/media-xc2028-avoid-use-after-free
-From 8dfbcc4351a0b6d2f2d77f367552f48ffefafe18 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
-Date: Thu, 28 Jan 2016 09:22:44 -0200
-Subject: [PATCH] [media] xc2028: avoid use after free
-Git-commit: 8dfbcc4351a0b6d2f2d77f367552f48ffefafe18
-Patch-mainline: 4.6-rc1
-References: CVE-2016-7913,bsc#1010478
-
-If struct xc2028_config is passed without a firmware name,
-the following trouble may happen:
-
-[11009.907205] xc2028 5-0061: type set to XCeive xc2028/xc3028 tuner
-[11009.907491] ==================================================================
-[11009.907750] BUG: KASAN: use-after-free in strcmp+0x96/0xb0 at addr ffff8803bd78ab40
-[11009.907992] Read of size 1 by task modprobe/28992
-[11009.907994] =============================================================================
-[11009.907997] BUG kmalloc-16 (Tainted: G W ): kasan: bad access detected
-[11009.907999] -----------------------------------------------------------------------------
-
-[11009.908008] INFO: Allocated in xhci_urb_enqueue+0x214/0x14c0 [xhci_hcd] age=0 cpu=3 pid=28992
-[11009.908012] ___slab_alloc+0x581/0x5b0
-[11009.908014] __slab_alloc+0x51/0x90
-[11009.908017] __kmalloc+0x27b/0x350
-[11009.908022] xhci_urb_enqueue+0x214/0x14c0 [xhci_hcd]
-[11009.908026] usb_hcd_submit_urb+0x1e8/0x1c60
-[11009.908029] usb_submit_urb+0xb0e/0x1200
-[11009.908032] usb_serial_generic_write_start+0xb6/0x4c0
-[11009.908035] usb_serial_generic_write+0x92/0xc0
-[11009.908039] usb_console_write+0x38a/0x560
-[11009.908045] call_console_drivers.constprop.14+0x1ee/0x2c0
-[11009.908051] console_unlock+0x40d/0x900
-[11009.908056] vprintk_emit+0x4b4/0x830
-[11009.908061] vprintk_default+0x1f/0x30
-[11009.908064] printk+0x99/0xb5
-[11009.908067] kasan_report_error+0x10a/0x550
-[11009.908070] __asan_report_load1_noabort+0x43/0x50
-[11009.908074] INFO: Freed in xc2028_set_config+0x90/0x630 [tuner_xc2028] age=1 cpu=3 pid=28992
-[11009.908077] __slab_free+0x2ec/0x460
-[11009.908080] kfree+0x266/0x280
-[11009.908083] xc2028_set_config+0x90/0x630 [tuner_xc2028]
-[11009.908086] xc2028_attach+0x310/0x8a0 [tuner_xc2028]
-[11009.908090] em28xx_attach_xc3028.constprop.7+0x1f9/0x30d [em28xx_dvb]
-[11009.908094] em28xx_dvb_init.part.3+0x8e4/0x5cf4 [em28xx_dvb]
-[11009.908098] em28xx_dvb_init+0x81/0x8a [em28xx_dvb]
-[11009.908101] em28xx_register_extension+0xd9/0x190 [em28xx]
-[11009.908105] em28xx_dvb_register+0x10/0x1000 [em28xx_dvb]
-[11009.908108] do_one_initcall+0x141/0x300
-[11009.908111] do_init_module+0x1d0/0x5ad
-[11009.908114] load_module+0x6666/0x9ba0
-[11009.908117] SyS_finit_module+0x108/0x130
-[11009.908120] entry_SYSCALL_64_fastpath+0x16/0x76
-[11009.908123] INFO: Slab 0xffffea000ef5e280 objects=25 used=25 fp=0x (null) flags=0x2ffff8000004080
-[11009.908126] INFO: Object 0xffff8803bd78ab40 @offset=2880 fp=0x0000000000000001
-
-[11009.908130] Bytes b4 ffff8803bd78ab30: 01 00 00 00 2a 07 00 00 9d 28 00 00 01 00 00 00 ....*....(......
-[11009.908133] Object ffff8803bd78ab40: 01 00 00 00 00 00 00 00 b0 1d c3 6a 00 88 ff ff ...........j....
-[11009.908137] CPU: 3 PID: 28992 Comm: modprobe Tainted: G B W 4.5.0-rc1+ #43
-[11009.908140] Hardware name: /NUC5i7RYB, BIOS RYBDWi35.86A.0350.2015.0812.1722 08/12/2015
-[11009.908142] ffff8803bd78a000 ffff8802c273f1b8 ffffffff81932007 ffff8803c6407a80
-[11009.908148] ffff8802c273f1e8 ffffffff81556759 ffff8803c6407a80 ffffea000ef5e280
-[11009.908153] ffff8803bd78ab40 dffffc0000000000 ffff8802c273f210 ffffffff8155ccb4
-[11009.908158] Call Trace:
-[11009.908162] [<ffffffff81932007>] dump_stack+0x4b/0x64
-[11009.908165] [<ffffffff81556759>] print_trailer+0xf9/0x150
-[11009.908168] [<ffffffff8155ccb4>] object_err+0x34/0x40
-[11009.908171] [<ffffffff8155f260>] kasan_report_error+0x230/0x550
-[11009.908175] [<ffffffff81237d71>] ? trace_hardirqs_off_caller+0x21/0x290
-[11009.908179] [<ffffffff8155e926>] ? kasan_unpoison_shadow+0x36/0x50
-[11009.908182] [<ffffffff8155f5c3>] __asan_report_load1_noabort+0x43/0x50
-[11009.908185] [<ffffffff8155ea00>] ? __asan_register_globals+0x50/0xa0
-[11009.908189] [<ffffffff8194cea6>] ? strcmp+0x96/0xb0
-[11009.908192] [<ffffffff8194cea6>] strcmp+0x96/0xb0
-[11009.908196] [<ffffffffa13ba4ac>] xc2028_set_config+0x15c/0x630 [tuner_xc2028]
-[11009.908200] [<ffffffffa13bac90>] xc2028_attach+0x310/0x8a0 [tuner_xc2028]
-[11009.908203] [<ffffffff8155ea78>] ? memset+0x28/0x30
-[11009.908206] [<ffffffffa13ba980>] ? xc2028_set_config+0x630/0x630 [tuner_xc2028]
-[11009.908211] [<ffffffffa157a59a>] em28xx_attach_xc3028.constprop.7+0x1f9/0x30d [em28xx_dvb]
-[11009.908215] [<ffffffffa157aa2a>] ? em28xx_dvb_init.part.3+0x37c/0x5cf4 [em28xx_dvb]
-[11009.908219] [<ffffffffa157a3a1>] ? hauppauge_hvr930c_init+0x487/0x487 [em28xx_dvb]
-[11009.908222] [<ffffffffa01795ac>] ? lgdt330x_attach+0x1cc/0x370 [lgdt330x]
-[11009.908226] [<ffffffffa01793e0>] ? i2c_read_demod_bytes.isra.2+0x210/0x210 [lgdt330x]
-[11009.908230] [<ffffffff812e87d0>] ? ref_module.part.15+0x10/0x10
-[11009.908233] [<ffffffff812e56e0>] ? module_assert_mutex_or_preempt+0x80/0x80
-[11009.908238] [<ffffffffa157af92>] em28xx_dvb_init.part.3+0x8e4/0x5cf4 [em28xx_dvb]
-[11009.908242] [<ffffffffa157a6ae>] ? em28xx_attach_xc3028.constprop.7+0x30d/0x30d [em28xx_dvb]
-[11009.908245] [<ffffffff8195222d>] ? string+0x14d/0x1f0
-[11009.908249] [<ffffffff8195381f>] ? symbol_string+0xff/0x1a0
-[11009.908253] [<ffffffff81953720>] ? uuid_string+0x6f0/0x6f0
-[11009.908257] [<ffffffff811a775e>] ? __kernel_text_address+0x7e/0xa0
-[11009.908260] [<ffffffff8104b02f>] ? print_context_stack+0x7f/0xf0
-[11009.908264] [<ffffffff812e9846>] ? __module_address+0xb6/0x360
-[11009.908268] [<ffffffff8137fdc9>] ? is_ftrace_trampoline+0x99/0xe0
-[11009.908271] [<ffffffff811a775e>] ? __kernel_text_address+0x7e/0xa0
-[11009.908275] [<ffffffff81240a70>] ? debug_check_no_locks_freed+0x290/0x290
-[11009.908278] [<ffffffff8104a24b>] ? dump_trace+0x11b/0x300
-[11009.908282] [<ffffffffa13e8143>] ? em28xx_register_extension+0x23/0x190 [em28xx]
-[11009.908285] [<ffffffff81237d71>] ? trace_hardirqs_off_caller+0x21/0x290
-[11009.908289] [<ffffffff8123ff56>] ? trace_hardirqs_on_caller+0x16/0x590
-[11009.908292] [<ffffffff812404dd>] ? trace_hardirqs_on+0xd/0x10
-[11009.908296] [<ffffffffa13e8143>] ? em28xx_register_extension+0x23/0x190 [em28xx]
-[11009.908299] [<ffffffff822dcbb0>] ? mutex_trylock+0x400/0x400
-[11009.908302] [<ffffffff810021a1>] ? do_one_initcall+0x131/0x300
-[11009.908306] [<ffffffff81296dc7>] ? call_rcu_sched+0x17/0x20
-[11009.908309] [<ffffffff8159e708>] ? put_object+0x48/0x70
-[11009.908314] [<ffffffffa1579f11>] em28xx_dvb_init+0x81/0x8a [em28xx_dvb]
-[11009.908317] [<ffffffffa13e81f9>] em28xx_register_extension+0xd9/0x190 [em28xx]
-[11009.908320] [<ffffffffa0150000>] ? 0xffffffffa0150000
-[11009.908324] [<ffffffffa0150010>] em28xx_dvb_register+0x10/0x1000 [em28xx_dvb]
-[11009.908327] [<ffffffff810021b1>] do_one_initcall+0x141/0x300
-[11009.908330] [<ffffffff81002070>] ? try_to_run_init_process+0x40/0x40
-[11009.908333] [<ffffffff8123ff56>] ? trace_hardirqs_on_caller+0x16/0x590
-[11009.908337] [<ffffffff8155e926>] ? kasan_unpoison_shadow+0x36/0x50
-[11009.908340] [<ffffffff8155e926>] ? kasan_unpoison_shadow+0x36/0x50
-[11009.908343] [<ffffffff8155e926>] ? kasan_unpoison_shadow+0x36/0x50
-[11009.908346] [<ffffffff8155ea37>] ? __asan_register_globals+0x87/0xa0
-[11009.908350] [<ffffffff8144da7b>] do_init_module+0x1d0/0x5ad
-[11009.908353] [<ffffffff812f2626>] load_module+0x6666/0x9ba0
-[11009.908356] [<ffffffff812e9c90>] ? symbol_put_addr+0x50/0x50
-[11009.908361] [<ffffffffa1580037>] ? em28xx_dvb_init.part.3+0x5989/0x5cf4 [em28xx_dvb]
-[11009.908366] [<ffffffff812ebfc0>] ? module_frob_arch_sections+0x20/0x20
-[11009.908369] [<ffffffff815bc940>] ? open_exec+0x50/0x50
-[11009.908374] [<ffffffff811671bb>] ? ns_capable+0x5b/0xd0
-[11009.908377] [<ffffffff812f5e58>] SyS_finit_module+0x108/0x130
-[11009.908379] [<ffffffff812f5d50>] ? SyS_init_module+0x1f0/0x1f0
-[11009.908383] [<ffffffff81004044>] ? lockdep_sys_exit_thunk+0x12/0x14
-[11009.908394] [<ffffffff822e6936>] entry_SYSCALL_64_fastpath+0x16/0x76
-[11009.908396] Memory state around the buggy address:
-[11009.908398] ffff8803bd78aa00: 00 00 fc fc fc fc fc fc fc fc fc fc fc fc fc fc
-[11009.908401] ffff8803bd78aa80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
-[11009.908403] >ffff8803bd78ab00: fc fc fc fc fc fc fc fc 00 00 fc fc fc fc fc fc
-[11009.908405] ^
-[11009.908407] ffff8803bd78ab80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
-[11009.908409] ffff8803bd78ac00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
-[11009.908411] ==================================================================
-
-In order to avoid it, let's set the cached value of the firmware
-name to NULL after freeing it. While here, return an error if
-the memory allocation fails.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
-Acked-by: Takashi Iwai <tiwai at suse.de>
-
----
- drivers/media/tuners/tuner-xc2028.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/media/tuners/tuner-xc2028.c
-+++ b/drivers/media/tuners/tuner-xc2028.c
-@@ -1403,11 +1403,12 @@ static int xc2028_set_config(struct dvb_
- * in order to avoid troubles during device release.
- */
- kfree(priv->ctrl.fname);
-+ priv->ctrl.fname = NULL;
- memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
- if (p->fname) {
- priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
- if (priv->ctrl.fname == NULL)
-- rc = -ENOMEM;
-+ return -ENOMEM;
- }
-
- /*
-patches.fixes/media-xc2028-unlock-on-error-in-xc2028_set_config
-From 210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d Mon Sep 17 00:00:00 2001
-From: Dan Carpenter <dan.carpenter at oracle.com>
-Date: Wed, 3 Feb 2016 13:34:00 -0200
-Subject: [PATCH] [media] xc2028: unlock on error in xc2028_set_config()
-Git-commit: 210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d
-Patch-mainline: 4.6-rc1
-References: CVE-2016-7913 bsc#1010478
-
-We have to unlock before returning -ENOMEM.
-
-Fixes: 8dfbcc4351a0 ('[media] xc2028: avoid use after free')
-
-Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
-Acked-by: Takashi Iwai <tiwai at suse.de>
-
----
- drivers/media/tuners/tuner-xc2028.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/media/tuners/tuner-xc2028.c
-+++ b/drivers/media/tuners/tuner-xc2028.c
-@@ -1407,8 +1407,10 @@ static int xc2028_set_config(struct dvb_
- memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
- if (p->fname) {
- priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
-- if (priv->ctrl.fname == NULL)
-- return -ENOMEM;
-+ if (priv->ctrl.fname == NULL) {
-+ rc = -ENOMEM;
-+ goto unlock;
-+ }
- }
-
- /*
-@@ -1440,6 +1442,7 @@ static int xc2028_set_config(struct dvb_
- } else
- priv->state = XC2028_WAITING_FIRMWARE;
- }
-+unlock:
- mutex_unlock(&priv->lock);
-
- return rc;
-patches.fixes/xc2028-Fix-use-after-free-bug-properly
-From 22a1e7783e173ab3d86018eb590107d68df46c11 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai at suse.de>
-Date: Thu, 17 Nov 2016 10:49:31 +0100
-Subject: [PATCH] xc2028: Fix use-after-free bug properly
-Git-commit: 22a1e7783e173ab3d86018eb590107d68df46c11
-References: CVE-2016-7913 bsc#1010478
-Patch-mainline: 4.9-rc7
-
-The commit 8dfbcc4351a0 ("[media] xc2028: avoid use after free") tried
-to address the reported use-after-free by clearing the reference.
-
-However, it's clearing the wrong pointer; it sets NULL to
-priv->ctrl.fname, but it's anyway overwritten by the next line
-memcpy(&priv->ctrl, p, sizeof(priv->ctrl)).
-
-OTOH, the actual code accessing the freed string is the strcmp() call
-with priv->fname:
- if (!firmware_name[0] && p->fname &&
- priv->fname && strcmp(p->fname, priv->fname))
- free_firmware(priv);
-
-where priv->fname points to the previous file name, and this was
-already freed by kfree().
-
-For fixing the bug properly, this patch does the following:
-
-- Keep the copy of firmware file name in only priv->fname,
- priv->ctrl.fname isn't changed;
-- The allocation is done only when the firmware gets loaded;
-- The kfree() is called in free_firmware() commonly
-
-Fixes: commit 8dfbcc4351a0 ('[media] xc2028: avoid use after free')
-Cc: <stable at vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai at suse.de>
-Signed-off-by: Mauro Carvalho Chehab <mchehab at s-opensource.com>
-
----
- drivers/media/tuners/tuner-xc2028.c | 37 ++++++++++++++++---------------------
- 1 file changed, 16 insertions(+), 21 deletions(-)
-
-diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
-index 317ef63ee789..8d96a22647b3 100644
---- a/drivers/media/tuners/tuner-xc2028.c
-+++ b/drivers/media/tuners/tuner-xc2028.c
-@@ -281,6 +281,14 @@ static void free_firmware(struct xc2028_data *priv)
- int i;
- tuner_dbg("%s called\n", __func__);
-
-+ /* free allocated f/w string */
-+ if (priv->fname != firmware_name)
-+ kfree(priv->fname);
-+ priv->fname = NULL;
-+
-+ priv->state = XC2028_NO_FIRMWARE;
-+ memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
-+
- if (!priv->firm)
- return;
-
-@@ -291,9 +299,6 @@ static void free_firmware(struct xc2028_data *priv)
-
- priv->firm = NULL;
- priv->firm_size = 0;
-- priv->state = XC2028_NO_FIRMWARE;
--
-- memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
- }
-
- static int load_all_firmwares(struct dvb_frontend *fe,
-@@ -884,9 +889,8 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
- return 0;
-
- fail:
-- priv->state = XC2028_NO_FIRMWARE;
-+ free_firmware(priv);
-
-- memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
- if (retry_count < 8) {
- msleep(50);
- retry_count++;
-@@ -1332,11 +1336,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
- mutex_lock(&xc2028_list_mutex);
-
- /* only perform final cleanup if this is the last instance */
-- if (hybrid_tuner_report_instance_count(priv) == 1) {
-+ if (hybrid_tuner_report_instance_count(priv) == 1)
- free_firmware(priv);
-- kfree(priv->ctrl.fname);
-- priv->ctrl.fname = NULL;
-- }
-
- if (priv)
- hybrid_tuner_release_state(priv);
-@@ -1399,19 +1400,8 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
-
- /*
- * Copy the config data.
-- * For the firmware name, keep a local copy of the string,
-- * in order to avoid troubles during device release.
- */
-- kfree(priv->ctrl.fname);
-- priv->ctrl.fname = NULL;
- memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
-- if (p->fname) {
-- priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
-- if (priv->ctrl.fname == NULL) {
-- rc = -ENOMEM;
-- goto unlock;
-- }
-- }
-
- /*
- * If firmware name changed, frees firmware. As free_firmware will
-@@ -1426,10 +1416,15 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
-
- if (priv->state == XC2028_NO_FIRMWARE) {
- if (!firmware_name[0])
-- priv->fname = priv->ctrl.fname;
-+ priv->fname = kstrdup(p->fname, GFP_KERNEL);
- else
- priv->fname = firmware_name;
-
-+ if (!priv->fname) {
-+ rc = -ENOMEM;
-+ goto unlock;
-+ }
-+
- rc = request_firmware_nowait(THIS_MODULE, 1,
- priv->fname,
- priv->i2c_props.adap->dev.parent,
---
-2.10.2
-
patches.fixes/irda-fix-lockdep-annotations-in-hashbin_delete.patch
From: "David S. Miller" <davem at davemloft.net>
Date: Fri, 17 Feb 2017 16:19:39 -0500
@@ -3842,103 +3186,7 @@ index fd7de04..0a791a2 100644
}
#else
static inline void perf_event_exit_cpu(int cpu) { }
-patches.fixes/vfio-pci-fix-integer-overflows-bitmask-check
-From: Vlad Tsyrklevich <vlad at tsyrklevich.net>
-Date: Wed, 12 Oct 2016 18:51:24 +0200
-Subject: vfio/pci: Fix integer overflows, bitmask check
-Git-commit: 05692d7005a364add85c6e25a6c4447ce08f913a
-Patch-mainline: v4.9-rc4
-References: bsc#1007197, CVE-2016-9083, CVE-2016-9084
-
-The VFIO_DEVICE_SET_IRQS ioctl did not sufficiently sanitize
-user-supplied integers, potentially allowing memory corruption. This
-patch adds appropriate integer overflow checks, checks the range bounds
-for VFIO_IRQ_SET_DATA_NONE, and also verifies that only single element
-in the VFIO_IRQ_SET_DATA_TYPE_MASK bitmask is set.
-VFIO_IRQ_SET_ACTION_TYPE_MASK is already correctly checked later in
-vfio_pci_set_irqs_ioctl().
-
-Furthermore, a kzalloc is changed to a kcalloc because the use of a
-kzalloc with an integer multiplication allowed an integer overflow
-condition to be reached without this patch. kcalloc checks for overflow
-and should prevent a similar occurrence.
-
-Signed-off-by: Vlad Tsyrklevich <vlad at tsyrklevich.net>
-Signed-off-by: Alex Williamson <alex.williamson at redhat.com>
-Acked-by: Joerg Roedel <jroedel at suse.de>
----
- drivers/vfio/pci/vfio_pci.c | 33 +++++++++++++++++++++------------
- drivers/vfio/pci/vfio_pci_intrs.c | 2 +-
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
---- a/drivers/vfio/pci/vfio_pci.c
-+++ b/drivers/vfio/pci/vfio_pci.c
-@@ -562,8 +562,9 @@ static long vfio_pci_ioctl(void *device_
-
- } else if (cmd == VFIO_DEVICE_SET_IRQS) {
- struct vfio_irq_set hdr;
-+ size_t size;
- u8 *data = NULL;
-- int ret = 0;
-+ int max, ret = 0;
-
- minsz = offsetofend(struct vfio_irq_set, count);
-
-@@ -571,23 +572,31 @@ static long vfio_pci_ioctl(void *device_
- return -EFAULT;
-
- if (hdr.argsz < minsz || hdr.index >= VFIO_PCI_NUM_IRQS ||
-+ hdr.count >= (U32_MAX - hdr.start) ||
- hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK |
- VFIO_IRQ_SET_ACTION_TYPE_MASK))
- return -EINVAL;
-
-- if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) {
-- size_t size;
-- int max = vfio_pci_get_irq_count(vdev, hdr.index);
--
-- if (hdr.flags & VFIO_IRQ_SET_DATA_BOOL)
-- size = sizeof(uint8_t);
-- else if (hdr.flags & VFIO_IRQ_SET_DATA_EVENTFD)
-- size = sizeof(int32_t);
-- else
-- return -EINVAL;
-+ max = vfio_pci_get_irq_count(vdev, hdr.index);
-+ if (hdr.start >= max || hdr.start + hdr.count > max)
-+ return -EINVAL;
-+
-+ switch (hdr.flags & VFIO_IRQ_SET_DATA_TYPE_MASK) {
-+ case VFIO_IRQ_SET_DATA_NONE:
-+ size = 0;
-+ break;
-+ case VFIO_IRQ_SET_DATA_BOOL:
-+ size = sizeof(uint8_t);
-+ break;
-+ case VFIO_IRQ_SET_DATA_EVENTFD:
-+ size = sizeof(int32_t);
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-
-- if (hdr.argsz - minsz < hdr.count * size ||
-- hdr.start >= max || hdr.start + hdr.count > max)
-+ if (size) {
-+ if (hdr.argsz - minsz < hdr.count * size)
- return -EINVAL;
-
- data = memdup_user((void __user *)(arg + minsz),
---- a/drivers/vfio/pci/vfio_pci_intrs.c
-+++ b/drivers/vfio/pci/vfio_pci_intrs.c
-@@ -255,7 +255,7 @@ static int vfio_msi_enable(struct vfio_p
- if (!is_irq_none(vdev))
- return -EINVAL;
-
-- vdev->ctx = kzalloc(nvec * sizeof(struct vfio_pci_irq_ctx), GFP_KERNEL);
-+ vdev->ctx = kcalloc(nvec, sizeof(struct vfio_pci_irq_ctx), GFP_KERNEL);
- if (!vdev->ctx)
- return -ENOMEM;
-
+
patches.fixes/kvm-x86-Check-memopp-before-dereference-CVE-2016-863
From d9092f52d7e61dd1557f2db2400ddb430e85937e Mon Sep 17 00:00:00 2001
From: Owen Hofmann <osh at google.com>
@@ -4271,83 +3519,4 @@ Acked-by: Joerg Roedel <jroedel at suse.de>
return __load_segment_descriptor(ctxt, selector, seg, cpl,
X86_TRANSFER_NONE, NULL);
}
-patches.fixes/kvm-fix-page-struct-leak-in-handle_vmon
-From: Paolo Bonzini <pbonzini at redhat.com>
-Date: Tue, 24 Jan 2017 11:56:21 +0100
-Subject: kvm: fix page struct leak in handle_vmon
-Git-commit: 06ce521af9558814b8606c0476c54497cf83a653
-Patch-mainline: v3.20-rc1
-References: CVE-2017-2596 bsc#1022785
-
-handle_vmon gets a reference on VMXON region page,
-but does not release it. Release the reference.
-
-Found by syzkaller; based on a patch by Dmitry.
-Reported-by: Dmitry Vyukov <dvyukov at google.com>
-Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
-Acked-by: Joerg Roedel <jroedel at suse.de>
----
- arch/x86/kvm/vmx.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/arch/x86/kvm/vmx.c
-+++ b/arch/x86/kvm/vmx.c
-@@ -6532,14 +6532,20 @@ static int nested_vmx_check_vmptr(struct
- }
-
- page = nested_get_page(vcpu, vmptr);
-- if (page == NULL ||
-- *(u32 *)kmap(page) != VMCS12_REVISION) {
-+ if (page == NULL) {
- nested_vmx_failInvalid(vcpu);
-+ skip_emulated_instruction(vcpu);
-+ return 1;
-+ }
-+ if (*(u32 *)kmap(page) != VMCS12_REVISION) {
- kunmap(page);
-+ nested_release_page_clean(page);
-+ nested_vmx_failInvalid(vcpu);
- skip_emulated_instruction(vcpu);
- return 1;
- }
- kunmap(page);
-+ nested_release_page_clean(page);
- vmx->nested.vmxon_ptr = vmptr;
- break;
- case EXIT_REASON_VMCLEAR:
-patches.fixes/staging-dgnc-fix-info-leak-in-ioctl.patch
-From 4b6184336ebb5c8dc1eae7f7ab46ee608a748b05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Salva=20Peir=C3=B3?= <speirofr at gmail.com>
-Date: Wed, 14 Oct 2015 17:48:02 +0200
-Subject: [PATCH] staging/dgnc: fix info leak in ioctl
-Mime-version: 1.0
-Content-type: text/plain; charset=UTF-8
-Content-transfer-encoding: 8bit
-Git-commit: 4b6184336ebb5c8dc1eae7f7ab46ee608a748b05
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
-Patch-mainline: Queued in subsystem maintainer repository
-References: CVE-2015-7885, boo#951627
-
-The dgnc_mgmt_ioctl() code fails to initialize the 16 _reserved bytes of
-struct digi_dinfo after the ->dinfo_nboards member. Add an explicit
-memset(0) before filling the structure to avoid the info leak.
-
-Signed-off-by: Salva Peiró <speirofr at gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-Acked-by: Takashi Iwai <tiwai at suse.de>
-
----
- drivers/staging/dgnc/dgnc_mgmt.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/staging/dgnc/dgnc_mgmt.c
-+++ b/drivers/staging/dgnc/dgnc_mgmt.c
-@@ -115,6 +115,7 @@ long dgnc_mgmt_ioctl(struct file *file,
-
- spin_lock_irqsave(&dgnc_global_lock, flags);
-
-+ memset(&ddi, 0, sizeof(ddi));
- ddi.dinfo_nboards = dgnc_NumBoards;
- sprintf(ddi.dinfo_version, "%s", DG_PART);
-
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 25df4048..fa4f391f 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-4.1.27/Documentation/vserver/debug.txt linux-4.1.27-vs2.3.8.5.2/Documentation/vserver/debug.txt
---- linux-4.1.27/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/Documentation/vserver/debug.txt 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/Documentation/vserver/debug.txt linux-4.1.40-vs2.3.8.5.3/Documentation/vserver/debug.txt
+--- linux-4.1.40/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/Documentation/vserver/debug.txt 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-4.1.27/Documentation/vserver/debug.txt linux-4.1.27-
+ 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-4.1.27/arch/alpha/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/alpha/Kconfig
---- linux-4.1.27/arch/alpha/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/alpha/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/alpha/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/alpha/Kconfig
+--- linux-4.1.40/arch/alpha/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/alpha/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -744,6 +744,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-4.1.27/arch/alpha/Kconfig linux-4.1.27-vs2.3.8.5.2/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/alpha/kernel/systbls.S linux-4.1.27-vs2.3.8.5.2/arch/alpha/kernel/systbls.S
---- linux-4.1.27/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/alpha/kernel/systbls.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/alpha/kernel/systbls.S linux-4.1.40-vs2.3.8.5.3/arch/alpha/kernel/systbls.S
+--- linux-4.1.40/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/alpha/kernel/systbls.S 2016-07-05 04:41:47.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -180,9 +180,9 @@ diff -NurpP --minimal linux-4.1.27/arch/alpha/kernel/systbls.S linux-4.1.27-vs2.
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-4.1.27/arch/alpha/kernel/traps.c linux-4.1.27-vs2.3.8.5.2/arch/alpha/kernel/traps.c
---- linux-4.1.27/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/alpha/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/alpha/kernel/traps.c linux-4.1.40-vs2.3.8.5.3/arch/alpha/kernel/traps.c
+--- linux-4.1.40/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/alpha/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
@@ -174,7 +174,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-4.1.27/arch/alpha/kernel/traps.c linux-4.1.27-vs2.3.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-4.1.27/arch/arm/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/arm/Kconfig
---- linux-4.1.27/arch/arm/Kconfig 2016-07-05 04:28:15.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/arm/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/arm/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/arm/Kconfig
+--- linux-4.1.40/arch/arm/Kconfig 2017-05-30 07:35:04.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/arm/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -2110,6 +2110,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-4.1.27/arch/arm/Kconfig linux-4.1.27-vs2.3.8.5.2/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/arm/kernel/calls.S linux-4.1.27-vs2.3.8.5.2/arch/arm/kernel/calls.S
---- linux-4.1.27/arch/arm/kernel/calls.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/arm/kernel/calls.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/arm/kernel/calls.S linux-4.1.40-vs2.3.8.5.3/arch/arm/kernel/calls.S
+--- linux-4.1.40/arch/arm/kernel/calls.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/arm/kernel/calls.S 2016-07-05 04:41:47.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -217,9 +217,9 @@ diff -NurpP --minimal linux-4.1.27/arch/arm/kernel/calls.S linux-4.1.27-vs2.3.8.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-4.1.27/arch/arm/kernel/traps.c linux-4.1.27-vs2.3.8.5.2/arch/arm/kernel/traps.c
---- linux-4.1.27/arch/arm/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/arm/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/arm/kernel/traps.c linux-4.1.40-vs2.3.8.5.3/arch/arm/kernel/traps.c
+--- linux-4.1.40/arch/arm/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/arm/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
@@ -250,8 +250,8 @@ static int __die(const char *str, int er
print_modules();
@@ -231,9 +231,9 @@ diff -NurpP --minimal linux-4.1.27/arch/arm/kernel/traps.c linux-4.1.27-vs2.3.8.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-4.1.27/arch/cris/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/cris/Kconfig
---- linux-4.1.27/arch/cris/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/cris/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/cris/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/cris/Kconfig
+--- linux-4.1.40/arch/cris/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/cris/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -570,6 +570,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -243,9 +243,9 @@ diff -NurpP --minimal linux-4.1.27/arch/cris/Kconfig linux-4.1.27-vs2.3.8.5.2/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/ia64/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/ia64/Kconfig
---- linux-4.1.27/arch/ia64/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/ia64/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/ia64/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/ia64/Kconfig
+--- linux-4.1.40/arch/ia64/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/ia64/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -628,6 +628,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-4.1.27/arch/ia64/Kconfig linux-4.1.27-vs2.3.8.5.2/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/ia64/kernel/entry.S linux-4.1.27-vs2.3.8.5.2/arch/ia64/kernel/entry.S
---- linux-4.1.27/arch/ia64/kernel/entry.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/ia64/kernel/entry.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/ia64/kernel/entry.S linux-4.1.40-vs2.3.8.5.3/arch/ia64/kernel/entry.S
+--- linux-4.1.40/arch/ia64/kernel/entry.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/ia64/kernel/entry.S 2016-07-05 04:41:47.000000000 +0000
@@ -1706,7 +1706,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -267,9 +267,9 @@ diff -NurpP --minimal linux-4.1.27/arch/ia64/kernel/entry.S linux-4.1.27-vs2.3.8
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-4.1.27/arch/ia64/kernel/ptrace.c linux-4.1.27-vs2.3.8.5.2/arch/ia64/kernel/ptrace.c
---- linux-4.1.27/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/ia64/kernel/ptrace.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/ia64/kernel/ptrace.c linux-4.1.40-vs2.3.8.5.3/arch/ia64/kernel/ptrace.c
+--- linux-4.1.40/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/ia64/kernel/ptrace.c 2016-07-05 04:41:47.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -278,9 +278,9 @@ diff -NurpP --minimal linux-4.1.27/arch/ia64/kernel/ptrace.c linux-4.1.27-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-4.1.27/arch/ia64/kernel/traps.c linux-4.1.27-vs2.3.8.5.2/arch/ia64/kernel/traps.c
---- linux-4.1.27/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/ia64/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/ia64/kernel/traps.c linux-4.1.40-vs2.3.8.5.3/arch/ia64/kernel/traps.c
+--- linux-4.1.40/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/ia64/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -305,9 +305,9 @@ diff -NurpP --minimal linux-4.1.27/arch/ia64/kernel/traps.c linux-4.1.27-vs2.3.8
}
}
}
-diff -NurpP --minimal linux-4.1.27/arch/m32r/kernel/traps.c linux-4.1.27-vs2.3.8.5.2/arch/m32r/kernel/traps.c
---- linux-4.1.27/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/m32r/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/m32r/kernel/traps.c linux-4.1.40-vs2.3.8.5.3/arch/m32r/kernel/traps.c
+--- linux-4.1.40/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/m32r/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -320,9 +320,9 @@ diff -NurpP --minimal linux-4.1.27/arch/m32r/kernel/traps.c linux-4.1.27-vs2.3.8
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-4.1.27/arch/m68k/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/m68k/Kconfig
---- linux-4.1.27/arch/m68k/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/m68k/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/m68k/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/m68k/Kconfig
+--- linux-4.1.40/arch/m68k/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/m68k/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -163,6 +163,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -332,9 +332,9 @@ diff -NurpP --minimal linux-4.1.27/arch/m68k/Kconfig linux-4.1.27-vs2.3.8.5.2/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/mips/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/mips/Kconfig
---- linux-4.1.27/arch/mips/Kconfig 2016-07-05 04:28:16.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/mips/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/mips/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/mips/Kconfig
+--- linux-4.1.40/arch/mips/Kconfig 2017-05-30 07:35:04.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/mips/Kconfig 2017-05-30 07:39:22.000000000 +0000
@@ -2888,6 +2888,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-4.1.27/arch/mips/Kconfig linux-4.1.27-vs2.3.8.5.2/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/ptrace.c linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/ptrace.c
---- linux-4.1.27/arch/mips/kernel/ptrace.c 2016-07-05 04:28:16.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/ptrace.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/mips/kernel/ptrace.c linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/ptrace.c
+--- linux-4.1.40/arch/mips/kernel/ptrace.c 2017-05-30 07:35:04.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/ptrace.c 2016-07-05 04:41:47.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
@@ -365,9 +365,9 @@ diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/ptrace.c linux-4.1.27-vs2.3.
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-4.1.27/arch/mips/kernel/scall32-o32.S linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall32-o32.S
---- linux-4.1.27/arch/mips/kernel/scall32-o32.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall32-o32.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/mips/kernel/scall32-o32.S linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall32-o32.S
+--- linux-4.1.40/arch/mips/kernel/scall32-o32.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall32-o32.S 2016-07-05 04:41:47.000000000 +0000
@@ -502,7 +502,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
@@ -377,9 +377,9 @@ diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/scall32-o32.S linux-4.1.27-v
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/scall64-64.S linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall64-64.S
---- linux-4.1.27/arch/mips/kernel/scall64-64.S 2016-07-05 04:28:16.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall64-64.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/mips/kernel/scall64-64.S linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall64-64.S
+--- linux-4.1.40/arch/mips/kernel/scall64-64.S 2017-05-30 07:35:04.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall64-64.S 2016-07-05 04:41:47.000000000 +0000
@@ -355,7 +355,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -389,9 +389,9 @@ diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/scall64-64.S linux-4.1.27-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/scall64-n32.S linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall64-n32.S
---- linux-4.1.27/arch/mips/kernel/scall64-n32.S 2016-07-05 04:28:16.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall64-n32.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/mips/kernel/scall64-n32.S linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall64-n32.S
+--- linux-4.1.40/arch/mips/kernel/scall64-n32.S 2017-05-30 07:35:04.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall64-n32.S 2016-10-25 21:31:17.000000000 +0000
@@ -348,7 +348,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -401,9 +401,9 @@ diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/scall64-n32.S linux-4.1.27-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/scall64-o32.S linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall64-o32.S
---- linux-4.1.27/arch/mips/kernel/scall64-o32.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/scall64-o32.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/mips/kernel/scall64-o32.S linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall64-o32.S
+--- linux-4.1.40/arch/mips/kernel/scall64-o32.S 2017-05-30 07:35:04.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/scall64-o32.S 2016-10-25 21:31:17.000000000 +0000
@@ -487,7 +487,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -413,9 +413,9 @@ diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/scall64-o32.S linux-4.1.27-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/traps.c linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/traps.c
---- linux-4.1.27/arch/mips/kernel/traps.c 2016-07-05 04:28:16.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/mips/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/mips/kernel/traps.c linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/traps.c
+--- linux-4.1.40/arch/mips/kernel/traps.c 2017-05-30 07:35:04.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/mips/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
@@ -349,9 +349,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -430,9 +430,9 @@ diff -NurpP --minimal linux-4.1.27/arch/mips/kernel/traps.c linux-4.1.27-vs2.3.8
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-4.1.27/arch/parisc/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/parisc/Kconfig
---- linux-4.1.27/arch/parisc/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/parisc/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/parisc/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/parisc/Kconfig
+--- linux-4.1.40/arch/parisc/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/parisc/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -338,6 +338,8 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
@@ -442,9 +442,9 @@ diff -NurpP --minimal linux-4.1.27/arch/parisc/Kconfig linux-4.1.27-vs2.3.8.5.2/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/parisc/kernel/syscall_table.S linux-4.1.27-vs2.3.8.5.2/arch/parisc/kernel/syscall_table.S
---- linux-4.1.27/arch/parisc/kernel/syscall_table.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/parisc/kernel/syscall_table.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/parisc/kernel/syscall_table.S linux-4.1.40-vs2.3.8.5.3/arch/parisc/kernel/syscall_table.S
+--- linux-4.1.40/arch/parisc/kernel/syscall_table.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/parisc/kernel/syscall_table.S 2016-07-05 04:41:47.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -454,9 +454,9 @@ diff -NurpP --minimal linux-4.1.27/arch/parisc/kernel/syscall_table.S linux-4.1.
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-4.1.27/arch/parisc/kernel/traps.c linux-4.1.27-vs2.3.8.5.2/arch/parisc/kernel/traps.c
---- linux-4.1.27/arch/parisc/kernel/traps.c 2016-07-05 04:28:16.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/parisc/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/parisc/kernel/traps.c linux-4.1.40-vs2.3.8.5.3/arch/parisc/kernel/traps.c
+--- linux-4.1.40/arch/parisc/kernel/traps.c 2017-05-30 07:35:05.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/parisc/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
@@ -480,9 +480,9 @@ diff -NurpP --minimal linux-4.1.27/arch/parisc/kernel/traps.c linux-4.1.27-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-4.1.27/arch/powerpc/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/powerpc/Kconfig
---- linux-4.1.27/arch/powerpc/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/powerpc/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/powerpc/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/powerpc/Kconfig
+--- linux-4.1.40/arch/powerpc/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/powerpc/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -1077,6 +1077,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -492,9 +492,9 @@ diff -NurpP --minimal linux-4.1.27/arch/powerpc/Kconfig linux-4.1.27-vs2.3.8.5.2
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-4.1.27/arch/powerpc/include/uapi/asm/unistd.h linux-4.1.27-vs2.3.8.5.2/arch/powerpc/include/uapi/asm/unistd.h
---- linux-4.1.27/arch/powerpc/include/uapi/asm/unistd.h 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/powerpc/include/uapi/asm/unistd.h linux-4.1.40-vs2.3.8.5.3/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.1.40/arch/powerpc/include/uapi/asm/unistd.h 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:41:47.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -504,9 +504,9 @@ diff -NurpP --minimal linux-4.1.27/arch/powerpc/include/uapi/asm/unistd.h linux-
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-4.1.27/arch/powerpc/kernel/traps.c linux-4.1.27-vs2.3.8.5.2/arch/powerpc/kernel/traps.c
---- linux-4.1.27/arch/powerpc/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/powerpc/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/powerpc/kernel/traps.c linux-4.1.40-vs2.3.8.5.3/arch/powerpc/kernel/traps.c
+--- linux-4.1.40/arch/powerpc/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/powerpc/kernel/traps.c 2016-07-05 04:41:47.000000000 +0000
@@ -1313,8 +1313,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-4.1.27/arch/powerpc/kernel/traps.c linux-4.1.27-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-4.1.27/arch/s390/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/s390/Kconfig
---- linux-4.1.27/arch/s390/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/s390/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/s390/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/s390/Kconfig
+--- linux-4.1.40/arch/s390/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/s390/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -653,6 +653,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -531,9 +531,9 @@ diff -NurpP --minimal linux-4.1.27/arch/s390/Kconfig linux-4.1.27-vs2.3.8.5.2/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/s390/include/asm/tlb.h linux-4.1.27-vs2.3.8.5.2/arch/s390/include/asm/tlb.h
---- linux-4.1.27/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/s390/include/asm/tlb.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/s390/include/asm/tlb.h linux-4.1.40-vs2.3.8.5.3/arch/s390/include/asm/tlb.h
+--- linux-4.1.40/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/s390/include/asm/tlb.h 2016-07-05 04:41:47.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -542,9 +542,9 @@ diff -NurpP --minimal linux-4.1.27/arch/s390/include/asm/tlb.h linux-4.1.27-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-4.1.27/arch/s390/include/uapi/asm/unistd.h linux-4.1.27-vs2.3.8.5.2/arch/s390/include/uapi/asm/unistd.h
---- linux-4.1.27/arch/s390/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/s390/include/uapi/asm/unistd.h linux-4.1.40-vs2.3.8.5.3/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.1.40/arch/s390/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:41:47.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -554,9 +554,9 @@ diff -NurpP --minimal linux-4.1.27/arch/s390/include/uapi/asm/unistd.h linux-4.1
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-4.1.27/arch/s390/kernel/ptrace.c linux-4.1.27-vs2.3.8.5.2/arch/s390/kernel/ptrace.c
---- linux-4.1.27/arch/s390/kernel/ptrace.c 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/s390/kernel/ptrace.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/s390/kernel/ptrace.c linux-4.1.40-vs2.3.8.5.3/arch/s390/kernel/ptrace.c
+--- linux-4.1.40/arch/s390/kernel/ptrace.c 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/s390/kernel/ptrace.c 2016-07-05 04:41:47.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -565,9 +565,9 @@ diff -NurpP --minimal linux-4.1.27/arch/s390/kernel/ptrace.c linux-4.1.27-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-4.1.27/arch/s390/kernel/syscalls.S linux-4.1.27-vs2.3.8.5.2/arch/s390/kernel/syscalls.S
---- linux-4.1.27/arch/s390/kernel/syscalls.S 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/s390/kernel/syscalls.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/s390/kernel/syscalls.S linux-4.1.40-vs2.3.8.5.3/arch/s390/kernel/syscalls.S
+--- linux-4.1.40/arch/s390/kernel/syscalls.S 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/s390/kernel/syscalls.S 2016-07-05 04:41:47.000000000 +0000
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,compat_sys_clo
SYSCALL(sys_clock_gettime,compat_sys_clock_gettime) /* 260 */
SYSCALL(sys_clock_getres,compat_sys_clock_getres)
@@ -577,9 +577,9 @@ diff -NurpP --minimal linux-4.1.27/arch/s390/kernel/syscalls.S linux-4.1.27-vs2.
SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64)
SYSCALL(sys_statfs64,compat_sys_statfs64)
SYSCALL(sys_fstatfs64,compat_sys_fstatfs64)
-diff -NurpP --minimal linux-4.1.27/arch/sh/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/sh/Kconfig
---- linux-4.1.27/arch/sh/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/sh/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/sh/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/sh/Kconfig
+--- linux-4.1.40/arch/sh/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/sh/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -882,6 +882,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -589,9 +589,9 @@ diff -NurpP --minimal linux-4.1.27/arch/sh/Kconfig linux-4.1.27-vs2.3.8.5.2/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/sh/kernel/irq.c linux-4.1.27-vs2.3.8.5.2/arch/sh/kernel/irq.c
---- linux-4.1.27/arch/sh/kernel/irq.c 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/sh/kernel/irq.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/sh/kernel/irq.c linux-4.1.40-vs2.3.8.5.3/arch/sh/kernel/irq.c
+--- linux-4.1.40/arch/sh/kernel/irq.c 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/sh/kernel/irq.c 2016-07-05 04:41:47.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -600,9 +600,9 @@ diff -NurpP --minimal linux-4.1.27/arch/sh/kernel/irq.c linux-4.1.27-vs2.3.8.5.2
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-4.1.27/arch/sparc/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/sparc/Kconfig
---- linux-4.1.27/arch/sparc/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/sparc/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/sparc/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/sparc/Kconfig
+--- linux-4.1.40/arch/sparc/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/sparc/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -564,6 +564,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -612,9 +612,9 @@ diff -NurpP --minimal linux-4.1.27/arch/sparc/Kconfig linux-4.1.27-vs2.3.8.5.2/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/sparc/include/uapi/asm/unistd.h linux-4.1.27-vs2.3.8.5.2/arch/sparc/include/uapi/asm/unistd.h
---- linux-4.1.27/arch/sparc/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/sparc/include/uapi/asm/unistd.h linux-4.1.40-vs2.3.8.5.3/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.1.40/arch/sparc/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:41:47.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -624,9 +624,9 @@ diff -NurpP --minimal linux-4.1.27/arch/sparc/include/uapi/asm/unistd.h linux-4.
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-4.1.27/arch/sparc/kernel/systbls_32.S linux-4.1.27-vs2.3.8.5.2/arch/sparc/kernel/systbls_32.S
---- linux-4.1.27/arch/sparc/kernel/systbls_32.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/sparc/kernel/systbls_32.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/sparc/kernel/systbls_32.S linux-4.1.40-vs2.3.8.5.3/arch/sparc/kernel/systbls_32.S
+--- linux-4.1.40/arch/sparc/kernel/systbls_32.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/sparc/kernel/systbls_32.S 2016-07-05 04:41:47.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
@@ -636,9 +636,9 @@ diff -NurpP --minimal linux-4.1.27/arch/sparc/kernel/systbls_32.S linux-4.1.27-v
/*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-4.1.27/arch/sparc/kernel/systbls_64.S linux-4.1.27-vs2.3.8.5.2/arch/sparc/kernel/systbls_64.S
---- linux-4.1.27/arch/sparc/kernel/systbls_64.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/sparc/kernel/systbls_64.S 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/sparc/kernel/systbls_64.S linux-4.1.40-vs2.3.8.5.3/arch/sparc/kernel/systbls_64.S
+--- linux-4.1.40/arch/sparc/kernel/systbls_64.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/sparc/kernel/systbls_64.S 2016-07-05 04:41:47.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys_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
@@ -657,9 +657,9 @@ diff -NurpP --minimal linux-4.1.27/arch/sparc/kernel/systbls_64.S linux-4.1.27-v
/*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-4.1.27/arch/um/Kconfig.rest linux-4.1.27-vs2.3.8.5.2/arch/um/Kconfig.rest
---- linux-4.1.27/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/um/Kconfig.rest 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/um/Kconfig.rest linux-4.1.40-vs2.3.8.5.3/arch/um/Kconfig.rest
+--- linux-4.1.40/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/um/Kconfig.rest 2016-07-05 04:41:47.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -669,9 +669,9 @@ diff -NurpP --minimal linux-4.1.27/arch/um/Kconfig.rest linux-4.1.27-vs2.3.8.5.2
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/x86/Kconfig linux-4.1.27-vs2.3.8.5.2/arch/x86/Kconfig
---- linux-4.1.27/arch/x86/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/x86/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/x86/Kconfig linux-4.1.40-vs2.3.8.5.3/arch/x86/Kconfig
+--- linux-4.1.40/arch/x86/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/x86/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -2587,6 +2587,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -681,9 +681,9 @@ diff -NurpP --minimal linux-4.1.27/arch/x86/Kconfig linux-4.1.27-vs2.3.8.5.2/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.27/arch/x86/syscalls/syscall_32.tbl linux-4.1.27-vs2.3.8.5.2/arch/x86/syscalls/syscall_32.tbl
---- linux-4.1.27/arch/x86/syscalls/syscall_32.tbl 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/x86/syscalls/syscall_32.tbl 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/x86/syscalls/syscall_32.tbl linux-4.1.40-vs2.3.8.5.3/arch/x86/syscalls/syscall_32.tbl
+--- linux-4.1.40/arch/x86/syscalls/syscall_32.tbl 2017-05-30 07:35:05.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/x86/syscalls/syscall_32.tbl 2016-10-25 21:31:17.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -693,9 +693,9 @@ diff -NurpP --minimal linux-4.1.27/arch/x86/syscalls/syscall_32.tbl linux-4.1.27
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-4.1.27/arch/x86/syscalls/syscall_64.tbl linux-4.1.27-vs2.3.8.5.2/arch/x86/syscalls/syscall_64.tbl
---- linux-4.1.27/arch/x86/syscalls/syscall_64.tbl 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/arch/x86/syscalls/syscall_64.tbl 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/arch/x86/syscalls/syscall_64.tbl linux-4.1.40-vs2.3.8.5.3/arch/x86/syscalls/syscall_64.tbl
+--- linux-4.1.40/arch/x86/syscalls/syscall_64.tbl 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/arch/x86/syscalls/syscall_64.tbl 2016-07-05 04:41:47.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -705,9 +705,9 @@ diff -NurpP --minimal linux-4.1.27/arch/x86/syscalls/syscall_64.tbl linux-4.1.27
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-4.1.27/block/ioprio.c linux-4.1.27-vs2.3.8.5.2/block/ioprio.c
---- linux-4.1.27/block/ioprio.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/block/ioprio.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/block/ioprio.c linux-4.1.40-vs2.3.8.5.3/block/ioprio.c
+--- linux-4.1.40/block/ioprio.c 2017-05-30 07:35:06.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/block/ioprio.c 2016-10-25 21:31:17.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -725,7 +725,7 @@ diff -NurpP --minimal linux-4.1.27/block/ioprio.c linux-4.1.27-vs2.3.8.5.2/block
ret = set_task_ioprio(p, ioprio);
if (ret)
break;
-@@ -200,6 +203,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
+@@ -202,6 +205,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which,
else
pgrp = find_vpid(who);
do_each_pid_thread(pgrp, PIDTYPE_PGID, p) {
@@ -734,9 +734,9 @@ diff -NurpP --minimal linux-4.1.27/block/ioprio.c linux-4.1.27-vs2.3.8.5.2/block
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-4.1.27/drivers/block/Kconfig linux-4.1.27-vs2.3.8.5.2/drivers/block/Kconfig
---- linux-4.1.27/drivers/block/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/block/Kconfig 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/block/Kconfig linux-4.1.40-vs2.3.8.5.3/drivers/block/Kconfig
+--- linux-4.1.40/drivers/block/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/block/Kconfig 2016-07-05 04:41:47.000000000 +0000
@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -751,9 +751,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/block/Kconfig linux-4.1.27-vs2.3.8.5.
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-4.1.27/drivers/block/Makefile linux-4.1.27-vs2.3.8.5.2/drivers/block/Makefile
---- linux-4.1.27/drivers/block/Makefile 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/block/Makefile 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/block/Makefile linux-4.1.40-vs2.3.8.5.3/drivers/block/Makefile
+--- linux-4.1.40/drivers/block/Makefile 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/block/Makefile 2016-07-05 04:41:47.000000000 +0000
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
@@ -762,9 +762,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/block/Makefile linux-4.1.27-vs2.3.8.5
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-4.1.27/drivers/block/loop.c linux-4.1.27-vs2.3.8.5.2/drivers/block/loop.c
---- linux-4.1.27/drivers/block/loop.c 2016-07-05 04:28:18.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/block/loop.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/block/loop.c linux-4.1.40-vs2.3.8.5.3/drivers/block/loop.c
+--- linux-4.1.40/drivers/block/loop.c 2017-05-30 07:35:06.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/block/loop.c 2017-05-30 07:39:22.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/miscdevice.h>
#include <linux/falloc.h>
@@ -820,9 +820,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/block/loop.c linux-4.1.27-vs2.3.8.5.2
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-4.1.27/drivers/block/loop.h linux-4.1.27-vs2.3.8.5.2/drivers/block/loop.h
---- linux-4.1.27/drivers/block/loop.h 2016-07-05 04:28:18.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/block/loop.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/block/loop.h linux-4.1.40-vs2.3.8.5.3/drivers/block/loop.h
+--- linux-4.1.40/drivers/block/loop.h 2017-05-30 07:35:06.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/block/loop.h 2016-07-05 04:41:47.000000000 +0000
@@ -43,6 +43,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -831,9 +831,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/block/loop.h linux-4.1.27-vs2.3.8.5.2
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-4.1.27/drivers/block/vroot.c linux-4.1.27-vs2.3.8.5.2/drivers/block/vroot.c
---- linux-4.1.27/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/block/vroot.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/block/vroot.c linux-4.1.40-vs2.3.8.5.3/drivers/block/vroot.c
+--- linux-4.1.40/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/block/vroot.c 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1125,9 +1125,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/block/vroot.c linux-4.1.27-vs2.3.8.5.
+
+#endif
+
-diff -NurpP --minimal linux-4.1.27/drivers/infiniband/core/addr.c linux-4.1.27-vs2.3.8.5.2/drivers/infiniband/core/addr.c
---- linux-4.1.27/drivers/infiniband/core/addr.c 2015-07-06 20:41:38.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/infiniband/core/addr.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/infiniband/core/addr.c linux-4.1.40-vs2.3.8.5.3/drivers/infiniband/core/addr.c
+--- linux-4.1.40/drivers/infiniband/core/addr.c 2015-07-06 20:41:38.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/infiniband/core/addr.c 2016-07-05 04:41:47.000000000 +0000
@@ -284,7 +284,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1137,9 +1137,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/infiniband/core/addr.c linux-4.1.27-v
if (ret)
goto put;
-diff -NurpP --minimal linux-4.1.27/drivers/md/dm-ioctl.c linux-4.1.27-vs2.3.8.5.2/drivers/md/dm-ioctl.c
---- linux-4.1.27/drivers/md/dm-ioctl.c 2015-07-06 20:41:38.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/md/dm-ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/md/dm-ioctl.c linux-4.1.40-vs2.3.8.5.3/drivers/md/dm-ioctl.c
+--- linux-4.1.40/drivers/md/dm-ioctl.c 2017-05-30 07:35:07.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/md/dm-ioctl.c 2017-05-30 07:39:23.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1225,9 +1225,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/md/dm-ioctl.c linux-4.1.27-vs2.3.8.5.
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-4.1.27/drivers/md/dm.c linux-4.1.27-vs2.3.8.5.2/drivers/md/dm.c
---- linux-4.1.27/drivers/md/dm.c 2016-07-05 04:28:21.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/md/dm.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/md/dm.c linux-4.1.40-vs2.3.8.5.3/drivers/md/dm.c
+--- linux-4.1.40/drivers/md/dm.c 2017-05-30 07:35:07.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/md/dm.c 2016-10-25 21:31:18.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/ktime.h>
#include <linux/elevator.h> /* for rq_end_sector() */
@@ -1292,7 +1292,7 @@ diff -NurpP --minimal linux-4.1.27/drivers/md/dm.c linux-4.1.27-vs2.3.8.5.2/driv
/*-----------------------------------------------------------------
* CRUD START:
* A more elegant soln is in the works that uses the queue
-@@ -2294,6 +2307,7 @@ static struct mapped_device *alloc_dev(i
+@@ -2302,6 +2315,7 @@ static struct mapped_device *alloc_dev(i
INIT_LIST_HEAD(&md->table_devices);
spin_lock_init(&md->uevent_lock);
@@ -1300,9 +1300,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/md/dm.c linux-4.1.27-vs2.3.8.5.2/driv
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-4.1.27/drivers/md/dm.h linux-4.1.27-vs2.3.8.5.2/drivers/md/dm.h
---- linux-4.1.27/drivers/md/dm.h 2015-07-06 20:41:38.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/md/dm.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/md/dm.h linux-4.1.40-vs2.3.8.5.3/drivers/md/dm.h
+--- linux-4.1.40/drivers/md/dm.h 2015-07-06 20:41:38.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/md/dm.h 2016-07-05 04:41:47.000000000 +0000
@@ -51,6 +51,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1312,9 +1312,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/md/dm.h linux-4.1.27-vs2.3.8.5.2/driv
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-4.1.27/drivers/net/tun.c linux-4.1.27-vs2.3.8.5.2/drivers/net/tun.c
---- linux-4.1.27/drivers/net/tun.c 2015-07-06 20:41:39.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/net/tun.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/net/tun.c linux-4.1.40-vs2.3.8.5.3/drivers/net/tun.c
+--- linux-4.1.40/drivers/net/tun.c 2017-05-30 07:35:08.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/net/tun.c 2016-10-25 21:31:18.000000000 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1373,9 +1373,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/net/tun.c linux-4.1.27-vs2.3.8.5.2/dr
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-4.1.27/drivers/scsi/cxgbi/libcxgbi.c linux-4.1.27-vs2.3.8.5.2/drivers/scsi/cxgbi/libcxgbi.c
---- linux-4.1.27/drivers/scsi/cxgbi/libcxgbi.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/scsi/cxgbi/libcxgbi.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/scsi/cxgbi/libcxgbi.c linux-4.1.40-vs2.3.8.5.3/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.1.40/drivers/scsi/cxgbi/libcxgbi.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/scsi/cxgbi/libcxgbi.c 2016-07-05 04:41:47.000000000 +0000
@@ -764,7 +764,8 @@ static struct cxgbi_sock *cxgbi_check_ro
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
@@ -1386,9 +1386,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/scsi/cxgbi/libcxgbi.c linux-4.1.27-vs
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-diff -NurpP --minimal linux-4.1.27/drivers/tty/sysrq.c linux-4.1.27-vs2.3.8.5.2/drivers/tty/sysrq.c
---- linux-4.1.27/drivers/tty/sysrq.c 2016-07-05 04:28:28.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/tty/sysrq.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/tty/sysrq.c linux-4.1.40-vs2.3.8.5.3/drivers/tty/sysrq.c
+--- linux-4.1.40/drivers/tty/sysrq.c 2017-05-30 07:35:10.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/tty/sysrq.c 2017-05-30 07:39:23.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
@@ -1440,9 +1440,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/tty/sysrq.c linux-4.1.27-vs2.3.8.5.2/
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-4.1.27/drivers/tty/tty_io.c linux-4.1.27-vs2.3.8.5.2/drivers/tty/tty_io.c
---- linux-4.1.27/drivers/tty/tty_io.c 2016-07-05 04:28:28.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/drivers/tty/tty_io.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/drivers/tty/tty_io.c linux-4.1.40-vs2.3.8.5.3/drivers/tty/tty_io.c
+--- linux-4.1.40/drivers/tty/tty_io.c 2017-05-30 07:35:10.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/drivers/tty/tty_io.c 2016-07-05 04:41:47.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1469,9 +1469,9 @@ diff -NurpP --minimal linux-4.1.27/drivers/tty/tty_io.c linux-4.1.27-vs2.3.8.5.2
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-4.1.27/fs/attr.c linux-4.1.27-vs2.3.8.5.2/fs/attr.c
---- linux-4.1.27/fs/attr.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/attr.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/attr.c linux-4.1.40-vs2.3.8.5.3/fs/attr.c
+--- linux-4.1.40/fs/attr.c 2017-05-30 07:35:11.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/attr.c 2017-05-30 07:39:23.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1482,7 +1482,7 @@ diff -NurpP --minimal linux-4.1.27/fs/attr.c linux-4.1.27-vs2.3.8.5.2/fs/attr.c
/**
* setattr_prepare - check if attribute changes to a dentry are allowed
-@@ -77,6 +80,10 @@ int setattr_prepare(struct dentry *dentry
+@@ -80,6 +83,10 @@ int setattr_prepare(struct dentry *dentr
return -EPERM;
}
@@ -1493,7 +1493,7 @@ diff -NurpP --minimal linux-4.1.27/fs/attr.c linux-4.1.27-vs2.3.8.5.2/fs/attr.c
kill_priv:
/* User has permission for the change */
if (ia_valid & ATTR_KILL_PRIV) {
-@@ -147,6 +154,8 @@ void setattr_copy(struct inode *inode, c
+@@ -160,6 +167,8 @@ void setattr_copy(struct inode *inode, c
inode->i_uid = attr->ia_uid;
if (ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -1502,7 +1502,7 @@ diff -NurpP --minimal linux-4.1.27/fs/attr.c linux-4.1.27-vs2.3.8.5.2/fs/attr.c
if (ia_valid & ATTR_ATIME)
inode->i_atime = timespec_trunc(attr->ia_atime,
inode->i_sb->s_time_gran);
-@@ -197,7 +206,8 @@ int notify_change(struct dentry * dentry
+@@ -210,7 +219,8 @@ int notify_change(struct dentry * dentry
WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex));
@@ -1512,9 +1512,9 @@ diff -NurpP --minimal linux-4.1.27/fs/attr.c linux-4.1.27-vs2.3.8.5.2/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-4.1.27/fs/block_dev.c linux-4.1.27-vs2.3.8.5.2/fs/block_dev.c
---- linux-4.1.27/fs/block_dev.c 2016-07-05 04:28:29.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/block_dev.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/block_dev.c linux-4.1.40-vs2.3.8.5.3/fs/block_dev.c
+--- linux-4.1.40/fs/block_dev.c 2017-05-30 07:35:11.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/block_dev.c 2017-05-30 07:39:23.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1523,7 +1523,7 @@ diff -NurpP --minimal linux-4.1.27/fs/block_dev.c linux-4.1.27-vs2.3.8.5.2/fs/bl
#include <asm/uaccess.h>
#include "internal.h"
-@@ -611,6 +612,7 @@ struct block_device *bdget(dev_t dev)
+@@ -610,6 +611,7 @@ struct block_device *bdget(dev_t dev)
bdev->bd_invalidated = 0;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
@@ -1531,7 +1531,7 @@ diff -NurpP --minimal linux-4.1.27/fs/block_dev.c linux-4.1.27-vs2.3.8.5.2/fs/bl
inode->i_bdev = bdev;
inode->i_data.a_ops = &def_blk_aops;
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
-@@ -657,6 +659,11 @@ EXPORT_SYMBOL(bdput);
+@@ -656,6 +658,11 @@ EXPORT_SYMBOL(bdput);
static struct block_device *bd_acquire(struct inode *inode)
{
struct block_device *bdev;
@@ -1543,7 +1543,7 @@ diff -NurpP --minimal linux-4.1.27/fs/block_dev.c linux-4.1.27-vs2.3.8.5.2/fs/bl
spin_lock(&bdev_lock);
bdev = inode->i_bdev;
-@@ -667,7 +674,7 @@ static struct block_device *bd_acquire(s
+@@ -666,7 +673,7 @@ static struct block_device *bd_acquire(s
}
spin_unlock(&bdev_lock);
@@ -1552,9 +1552,9 @@ diff -NurpP --minimal linux-4.1.27/fs/block_dev.c linux-4.1.27-vs2.3.8.5.2/fs/bl
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-4.1.27/fs/btrfs/ctree.h linux-4.1.27-vs2.3.8.5.2/fs/btrfs/ctree.h
---- linux-4.1.27/fs/btrfs/ctree.h 2016-07-05 04:28:29.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/btrfs/ctree.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/btrfs/ctree.h linux-4.1.40-vs2.3.8.5.3/fs/btrfs/ctree.h
+--- linux-4.1.40/fs/btrfs/ctree.h 2017-05-30 07:35:11.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/btrfs/ctree.h 2016-07-05 04:41:47.000000000 +0000
@@ -731,11 +731,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1607,9 +1607,9 @@ diff -NurpP --minimal linux-4.1.27/fs/btrfs/ctree.h linux-4.1.27-vs2.3.8.5.2/fs/
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-4.1.27/fs/btrfs/disk-io.c linux-4.1.27-vs2.3.8.5.2/fs/btrfs/disk-io.c
---- linux-4.1.27/fs/btrfs/disk-io.c 2016-07-05 04:28:29.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/btrfs/disk-io.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/btrfs/disk-io.c linux-4.1.40-vs2.3.8.5.3/fs/btrfs/disk-io.c
+--- linux-4.1.40/fs/btrfs/disk-io.c 2017-05-30 07:35:11.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/btrfs/disk-io.c 2016-07-05 04:41:47.000000000 +0000
@@ -2687,6 +2687,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1620,9 +1620,9 @@ diff -NurpP --minimal linux-4.1.27/fs/btrfs/disk-io.c linux-4.1.27-vs2.3.8.5.2/f
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-4.1.27/fs/btrfs/inode.c linux-4.1.27-vs2.3.8.5.2/fs/btrfs/inode.c
---- linux-4.1.27/fs/btrfs/inode.c 2016-07-05 04:28:29.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/btrfs/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/btrfs/inode.c linux-4.1.40-vs2.3.8.5.3/fs/btrfs/inode.c
+--- linux-4.1.40/fs/btrfs/inode.c 2017-05-30 07:35:11.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/btrfs/inode.c 2017-05-30 07:39:23.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
@@ -1703,9 +1703,9 @@ diff -NurpP --minimal linux-4.1.27/fs/btrfs/inode.c linux-4.1.27-vs2.3.8.5.2/fs/
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-4.1.27/fs/btrfs/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/btrfs/ioctl.c
---- linux-4.1.27/fs/btrfs/ioctl.c 2016-07-05 04:28:29.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/btrfs/ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/btrfs/ioctl.c linux-4.1.40-vs2.3.8.5.3/fs/btrfs/ioctl.c
+--- linux-4.1.40/fs/btrfs/ioctl.c 2017-05-30 07:35:11.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/btrfs/ioctl.c 2017-05-30 07:39:23.000000000 +0000
@@ -107,10 +107,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1884,9 +1884,9 @@ diff -NurpP --minimal linux-4.1.27/fs/btrfs/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-4.1.27/fs/btrfs/super.c linux-4.1.27-vs2.3.8.5.2/fs/btrfs/super.c
---- linux-4.1.27/fs/btrfs/super.c 2016-07-05 04:28:29.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/btrfs/super.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/btrfs/super.c linux-4.1.40-vs2.3.8.5.3/fs/btrfs/super.c
+--- linux-4.1.40/fs/btrfs/super.c 2017-05-30 07:35:11.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/btrfs/super.c 2016-10-25 21:31:19.000000000 +0000
@@ -325,7 +325,7 @@ enum {
Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl, Opt_datacow,
@@ -1942,9 +1942,9 @@ diff -NurpP --minimal linux-4.1.27/fs/btrfs/super.c linux-4.1.27-vs2.3.8.5.2/fs/
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-4.1.27/fs/char_dev.c linux-4.1.27-vs2.3.8.5.2/fs/char_dev.c
---- linux-4.1.27/fs/char_dev.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/char_dev.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/char_dev.c linux-4.1.40-vs2.3.8.5.3/fs/char_dev.c
+--- linux-4.1.40/fs/char_dev.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/char_dev.c 2016-07-05 04:41:47.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1977,9 +1977,9 @@ diff -NurpP --minimal linux-4.1.27/fs/char_dev.c linux-4.1.27-vs2.3.8.5.2/fs/cha
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcache.c
---- linux-4.1.27/fs/dcache.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/dcache.c 2016-07-06 06:40:31.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/dcache.c linux-4.1.40-vs2.3.8.5.3/fs/dcache.c
+--- linux-4.1.40/fs/dcache.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/dcache.c 2017-05-30 07:39:23.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
@@ -1988,7 +1988,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
#include "internal.h"
#include "mount.h"
-@@ -651,6 +652,7 @@ static inline bool fast_dput(struct dent
+@@ -650,6 +651,7 @@ static inline bool fast_dput(struct dent
spin_lock(&dentry->d_lock);
if (dentry->d_lockref.count > 1) {
dentry->d_lockref.count--;
@@ -1996,7 +1996,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
spin_unlock(&dentry->d_lock);
return 1;
}
-@@ -778,6 +780,7 @@ repeat:
+@@ -779,6 +781,7 @@ repeat:
dentry_lru_add(dentry);
dentry->d_lockref.count--;
@@ -2004,7 +2004,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
spin_unlock(&dentry->d_lock);
return;
-@@ -793,6 +796,7 @@ EXPORT_SYMBOL(dput);
+@@ -796,6 +799,7 @@ EXPORT_SYMBOL(dput);
static inline void __dget_dlock(struct dentry *dentry)
{
dentry->d_lockref.count++;
@@ -2012,7 +2012,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
}
static inline void __dget(struct dentry *dentry)
-@@ -805,6 +809,8 @@ struct dentry *dget_parent(struct dentry
+@@ -808,6 +812,8 @@ struct dentry *dget_parent(struct dentry
int gotref;
struct dentry *ret;
@@ -2021,7 +2021,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
/*
* Do optimistic parent lookup without any
* locking.
-@@ -835,6 +841,7 @@ repeat:
+@@ -838,6 +844,7 @@ repeat:
rcu_read_unlock();
BUG_ON(!ret->d_lockref.count);
ret->d_lockref.count++;
@@ -2029,7 +2029,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
spin_unlock(&ret->d_lock);
return ret;
}
-@@ -989,6 +996,7 @@ static void shrink_dentry_list(struct li
+@@ -992,6 +999,7 @@ static void shrink_dentry_list(struct li
parent = lock_parent(dentry);
if (dentry->d_lockref.count != 1) {
dentry->d_lockref.count--;
@@ -2037,7 +2037,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
spin_unlock(&dentry->d_lock);
if (parent)
spin_unlock(&parent->d_lock);
-@@ -1547,6 +1555,9 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1553,6 +1561,9 @@ struct dentry *__d_alloc(struct super_bl
struct dentry *dentry;
char *dname;
@@ -2047,7 +2047,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
if (!dentry)
return NULL;
-@@ -1585,6 +1596,7 @@ struct dentry *__d_alloc(struct super_bl
+@@ -1591,6 +1602,7 @@ struct dentry *__d_alloc(struct super_bl
dentry->d_lockref.count = 1;
dentry->d_flags = 0;
@@ -2055,7 +2055,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
spin_lock_init(&dentry->d_lock);
seqcount_init(&dentry->d_seq);
dentry->d_inode = NULL;
-@@ -2318,6 +2330,7 @@ struct dentry *__d_lookup(const struct d
+@@ -2324,6 +2336,7 @@ struct dentry *__d_lookup(const struct d
}
dentry->d_lockref.count++;
@@ -2063,7 +2063,7 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-@@ -3335,6 +3348,7 @@ static enum d_walk_ret d_genocide_kill(v
+@@ -3341,6 +3354,7 @@ static enum d_walk_ret d_genocide_kill(v
if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
dentry->d_flags |= DCACHE_GENOCIDE;
dentry->d_lockref.count--;
@@ -2071,9 +2071,9 @@ diff -NurpP --minimal linux-4.1.27/fs/dcache.c linux-4.1.27-vs2.3.8.5.2/fs/dcach
}
}
return D_WALK_CONTINUE;
-diff -NurpP --minimal linux-4.1.27/fs/devpts/inode.c linux-4.1.27-vs2.3.8.5.2/fs/devpts/inode.c
---- linux-4.1.27/fs/devpts/inode.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/devpts/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/devpts/inode.c linux-4.1.40-vs2.3.8.5.3/fs/devpts/inode.c
+--- linux-4.1.40/fs/devpts/inode.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/devpts/inode.c 2016-07-05 04:41:47.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2161,9 +2161,9 @@ diff -NurpP --minimal linux-4.1.27/fs/devpts/inode.c linux-4.1.27-vs2.3.8.5.2/fs
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-4.1.27/fs/ext2/balloc.c linux-4.1.27-vs2.3.8.5.2/fs/ext2/balloc.c
---- linux-4.1.27/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/balloc.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/balloc.c linux-4.1.40-vs2.3.8.5.3/fs/ext2/balloc.c
+--- linux-4.1.40/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/balloc.c 2016-07-05 04:41:47.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2172,9 +2172,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext2/balloc.c linux-4.1.27-vs2.3.8.5.2/fs/
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-4.1.27/fs/ext2/ext2.h linux-4.1.27-vs2.3.8.5.2/fs/ext2/ext2.h
---- linux-4.1.27/fs/ext2/ext2.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/ext2.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/ext2.h linux-4.1.40-vs2.3.8.5.3/fs/ext2/ext2.h
+--- linux-4.1.40/fs/ext2/ext2.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/ext2.h 2016-07-05 04:41:47.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) */
@@ -2222,18 +2222,18 @@ diff -NurpP --minimal linux-4.1.27/fs/ext2/ext2.h linux-4.1.27-vs2.3.8.5.2/fs/ex
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-4.1.27/fs/ext2/file.c linux-4.1.27-vs2.3.8.5.2/fs/ext2/file.c
---- linux-4.1.27/fs/ext2/file.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/file.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/file.c linux-4.1.40-vs2.3.8.5.3/fs/ext2/file.c
+--- linux-4.1.40/fs/ext2/file.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/file.c 2016-07-05 04:41:47.000000000 +0000
@@ -118,4 +118,5 @@ const struct inode_operations ext2_file_
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-4.1.27/fs/ext2/ialloc.c linux-4.1.27-vs2.3.8.5.2/fs/ext2/ialloc.c
---- linux-4.1.27/fs/ext2/ialloc.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/ialloc.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/ialloc.c linux-4.1.40-vs2.3.8.5.3/fs/ext2/ialloc.c
+--- linux-4.1.40/fs/ext2/ialloc.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/ialloc.c 2016-07-05 04:41:47.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2250,9 +2250,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext2/ialloc.c linux-4.1.27-vs2.3.8.5.2/fs/
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.1.27/fs/ext2/inode.c linux-4.1.27-vs2.3.8.5.2/fs/ext2/inode.c
---- linux-4.1.27/fs/ext2/inode.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/inode.c linux-4.1.40-vs2.3.8.5.3/fs/ext2/inode.c
+--- linux-4.1.40/fs/ext2/inode.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/inode.c 2017-05-30 07:39:23.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
@@ -2387,9 +2387,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext2/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-4.1.27/fs/ext2/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/ext2/ioctl.c
---- linux-4.1.27/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/ioctl.c linux-4.1.40-vs2.3.8.5.3/fs/ext2/ioctl.c
+--- linux-4.1.40/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/ioctl.c 2016-07-05 04:41:47.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2439,9 +2439,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext2/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/e
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.1.27/fs/ext2/namei.c linux-4.1.27-vs2.3.8.5.2/fs/ext2/namei.c
---- linux-4.1.27/fs/ext2/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/namei.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/namei.c linux-4.1.40-vs2.3.8.5.3/fs/ext2/namei.c
+--- linux-4.1.40/fs/ext2/namei.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/namei.c 2016-07-05 04:41:47.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2466,9 +2466,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext2/namei.c linux-4.1.27-vs2.3.8.5.2/fs/e
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-4.1.27/fs/ext2/super.c linux-4.1.27-vs2.3.8.5.2/fs/ext2/super.c
---- linux-4.1.27/fs/ext2/super.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext2/super.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext2/super.c linux-4.1.40-vs2.3.8.5.3/fs/ext2/super.c
+--- linux-4.1.40/fs/ext2/super.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext2/super.c 2016-07-05 04:41:47.000000000 +0000
@@ -405,7 +405,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2534,9 +2534,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext2/super.c linux-4.1.27-vs2.3.8.5.2/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.1.27/fs/ext3/ext3.h linux-4.1.27-vs2.3.8.5.2/fs/ext3/ext3.h
---- linux-4.1.27/fs/ext3/ext3.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext3/ext3.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext3/ext3.h linux-4.1.40-vs2.3.8.5.3/fs/ext3/ext3.h
+--- linux-4.1.40/fs/ext3/ext3.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext3/ext3.h 2016-07-05 04:41:47.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) */
@@ -2588,9 +2588,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext3/ext3.h linux-4.1.27-vs2.3.8.5.2/fs/ex
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-4.1.27/fs/ext3/file.c linux-4.1.27-vs2.3.8.5.2/fs/ext3/file.c
---- linux-4.1.27/fs/ext3/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext3/file.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext3/file.c linux-4.1.40-vs2.3.8.5.3/fs/ext3/file.c
+--- linux-4.1.40/fs/ext3/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext3/file.c 2016-07-05 04:41:47.000000000 +0000
@@ -75,5 +75,6 @@ const struct inode_operations ext3_file_
.get_acl = ext3_get_acl,
.set_acl = ext3_set_acl,
@@ -2598,9 +2598,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext3/file.c linux-4.1.27-vs2.3.8.5.2/fs/ex
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-4.1.27/fs/ext3/ialloc.c linux-4.1.27-vs2.3.8.5.2/fs/ext3/ialloc.c
---- linux-4.1.27/fs/ext3/ialloc.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext3/ialloc.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext3/ialloc.c linux-4.1.40-vs2.3.8.5.3/fs/ext3/ialloc.c
+--- linux-4.1.40/fs/ext3/ialloc.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext3/ialloc.c 2016-07-05 04:41:47.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2617,9 +2617,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext3/ialloc.c linux-4.1.27-vs2.3.8.5.2/fs/
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.1.27/fs/ext3/inode.c linux-4.1.27-vs2.3.8.5.2/fs/ext3/inode.c
---- linux-4.1.27/fs/ext3/inode.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext3/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext3/inode.c linux-4.1.40-vs2.3.8.5.3/fs/ext3/inode.c
+--- linux-4.1.40/fs/ext3/inode.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext3/inode.c 2017-05-30 07:39:23.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/mpage.h>
#include <linux/namei.h>
@@ -2751,9 +2751,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext3/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-4.1.27/fs/ext3/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/ext3/ioctl.c
---- linux-4.1.27/fs/ext3/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext3/ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext3/ioctl.c linux-4.1.40-vs2.3.8.5.3/fs/ext3/ioctl.c
+--- linux-4.1.40/fs/ext3/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext3/ioctl.c 2016-07-05 04:41:47.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2821,9 +2821,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext3/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/e
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.1.27/fs/ext3/namei.c linux-4.1.27-vs2.3.8.5.2/fs/ext3/namei.c
---- linux-4.1.27/fs/ext3/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext3/namei.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext3/namei.c linux-4.1.40-vs2.3.8.5.3/fs/ext3/namei.c
+--- linux-4.1.40/fs/ext3/namei.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext3/namei.c 2016-07-05 04:41:47.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2849,9 +2849,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext3/namei.c linux-4.1.27-vs2.3.8.5.2/fs/e
.get_acl = ext3_get_acl,
.set_acl = ext3_set_acl,
};
-diff -NurpP --minimal linux-4.1.27/fs/ext3/super.c linux-4.1.27-vs2.3.8.5.2/fs/ext3/super.c
---- linux-4.1.27/fs/ext3/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext3/super.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext3/super.c linux-4.1.40-vs2.3.8.5.3/fs/ext3/super.c
+--- linux-4.1.40/fs/ext3/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext3/super.c 2016-07-05 04:41:47.000000000 +0000
@@ -837,7 +837,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2918,10 +2918,10 @@ diff -NurpP --minimal linux-4.1.27/fs/ext3/super.c linux-4.1.27-vs2.3.8.5.2/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.1.27/fs/ext4/ext4.h linux-4.1.27-vs2.3.8.5.2/fs/ext4/ext4.h
---- linux-4.1.27/fs/ext4/ext4.h 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext4/ext4.h 2016-07-05 04:41:47.000000000 +0000
-@@ -377,7 +377,10 @@ struct flex_groups {
+diff -NurpP --minimal linux-4.1.40/fs/ext4/ext4.h linux-4.1.40-vs2.3.8.5.3/fs/ext4/ext4.h
+--- linux-4.1.40/fs/ext4/ext4.h 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext4/ext4.h 2017-05-30 07:39:23.000000000 +0000
+@@ -378,7 +378,10 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */
@@ -2932,7 +2932,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/ext4.h linux-4.1.27-vs2.3.8.5.2/fs/ex
#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */
#define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */
-@@ -673,7 +676,7 @@ struct ext4_inode {
+@@ -674,7 +677,7 @@ struct ext4_inode {
__le16 l_i_uid_high; /* these 2 fields */
__le16 l_i_gid_high; /* were reserved2[0] */
__le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
@@ -2941,7 +2941,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/ext4.h linux-4.1.27-vs2.3.8.5.2/fs/ex
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -793,6 +796,7 @@ do { \
+@@ -794,6 +797,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
@@ -2949,7 +2949,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/ext4.h linux-4.1.27-vs2.3.8.5.2/fs/ex
#define i_checksum_lo osd2.linux2.l_i_checksum_lo
#elif defined(__GNU__)
-@@ -1031,6 +1035,7 @@ struct ext4_inode_info {
+@@ -1033,6 +1037,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
@@ -2957,7 +2957,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/ext4.h linux-4.1.27-vs2.3.8.5.2/fs/ex
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-@@ -2312,6 +2317,7 @@ extern int ext4_punch_hole(struct inode
+@@ -2314,6 +2319,7 @@ extern int ext4_punch_hole(struct inode
extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks);
extern void ext4_set_inode_flags(struct inode *);
extern void ext4_get_inode_flags(struct ext4_inode_info *);
@@ -2965,9 +2965,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/ext4.h linux-4.1.27-vs2.3.8.5.2/fs/ex
extern int ext4_alloc_da_blocks(struct inode *inode);
extern void ext4_set_aops(struct inode *inode);
extern int ext4_writepage_trans_blocks(struct inode *);
-diff -NurpP --minimal linux-4.1.27/fs/ext4/file.c linux-4.1.27-vs2.3.8.5.2/fs/ext4/file.c
---- linux-4.1.27/fs/ext4/file.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext4/file.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext4/file.c linux-4.1.40-vs2.3.8.5.3/fs/ext4/file.c
+--- linux-4.1.40/fs/ext4/file.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext4/file.c 2016-07-05 04:41:47.000000000 +0000
@@ -659,5 +659,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
@@ -2975,9 +2975,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/file.c linux-4.1.27-vs2.3.8.5.2/fs/ex
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-4.1.27/fs/ext4/ialloc.c linux-4.1.27-vs2.3.8.5.2/fs/ext4/ialloc.c
---- linux-4.1.27/fs/ext4/ialloc.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext4/ialloc.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext4/ialloc.c linux-4.1.40-vs2.3.8.5.3/fs/ext4/ialloc.c
+--- linux-4.1.40/fs/ext4/ialloc.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext4/ialloc.c 2016-07-05 04:41:47.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2994,9 +2994,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/ialloc.c linux-4.1.27-vs2.3.8.5.2/fs/
} else
inode_init_owner(inode, dir, mode);
dquot_initialize(inode);
-diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/ext4/inode.c
---- linux-4.1.27/fs/ext4/inode.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext4/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext4/inode.c linux-4.1.40-vs2.3.8.5.3/fs/ext4/inode.c
+--- linux-4.1.40/fs/ext4/inode.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext4/inode.c 2017-05-30 07:39:23.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -3005,7 +3005,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4020,12 +4021,15 @@ void ext4_set_inode_flags(struct inode *
+@@ -4043,12 +4044,15 @@ void ext4_set_inode_flags(struct inode *
unsigned int flags = EXT4_I(inode)->i_flags;
unsigned int new_fl = 0;
@@ -3023,7 +3023,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
if (flags & EXT4_NOATIME_FL)
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
-@@ -4033,31 +4037,52 @@ void ext4_set_inode_flags(struct inode *
+@@ -4056,31 +4060,52 @@ void ext4_set_inode_flags(struct inode *
if (test_opt(inode->i_sb, DAX))
new_fl |= S_DAX;
inode_set_flags(inode, new_fl,
@@ -3081,7 +3081,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4161,8 +4186,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -4184,8 +4209,10 @@ struct inode *ext4_iget(struct super_blo
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
@@ -3094,7 +3094,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -4467,8 +4494,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4490,8 +4517,10 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
@@ -3107,7 +3107,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -4491,6 +4520,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4514,6 +4543,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -3117,7 +3117,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4735,7 +4767,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4758,7 +4790,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
@@ -3127,7 +3127,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4758,6 +4791,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4781,6 +4814,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -3136,9 +3136,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/inode.c linux-4.1.27-vs2.3.8.5.2/fs/e
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-4.1.27/fs/ext4/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/ext4/ioctl.c
---- linux-4.1.27/fs/ext4/ioctl.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext4/ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext4/ioctl.c linux-4.1.40-vs2.3.8.5.3/fs/ext4/ioctl.c
+--- linux-4.1.40/fs/ext4/ioctl.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext4/ioctl.c 2016-10-25 21:31:19.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/mount.h>
#include <linux/file.h>
@@ -3204,9 +3204,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/e
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-4.1.27/fs/ext4/namei.c linux-4.1.27-vs2.3.8.5.2/fs/ext4/namei.c
---- linux-4.1.27/fs/ext4/namei.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext4/namei.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ext4/namei.c linux-4.1.40-vs2.3.8.5.3/fs/ext4/namei.c
+--- linux-4.1.40/fs/ext4/namei.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext4/namei.c 2016-07-05 04:41:47.000000000 +0000
@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3231,18 +3231,18 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/namei.c linux-4.1.27-vs2.3.8.5.2/fs/e
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-4.1.27/fs/ext4/super.c linux-4.1.27-vs2.3.8.5.2/fs/ext4/super.c
---- linux-4.1.27/fs/ext4/super.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ext4/super.c 2016-07-05 04:41:47.000000000 +0000
-@@ -1146,6 +1146,7 @@ enum {
- Opt_dioread_nolock, Opt_dioread_lock,
+diff -NurpP --minimal linux-4.1.40/fs/ext4/super.c linux-4.1.40-vs2.3.8.5.3/fs/ext4/super.c
+--- linux-4.1.40/fs/ext4/super.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ext4/super.c 2017-05-30 07:39:23.000000000 +0000
+@@ -1147,6 +1147,7 @@ enum {
+ Opt_no_mbcache,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
Opt_max_dir_size_kb, Opt_nojournal_checksum,
+ Opt_tag, Opt_notag, Opt_tagid
};
static const match_table_t tokens = {
-@@ -1231,6 +1232,9 @@ static const match_table_t tokens = {
+@@ -1233,6 +1234,9 @@ static const match_table_t tokens = {
{Opt_removed, "reservation"}, /* mount option from ext2/3 */
{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
{Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
@@ -3252,7 +3252,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/super.c linux-4.1.27-vs2.3.8.5.2/fs/e
{Opt_err, NULL},
};
-@@ -1473,6 +1477,20 @@ static int handle_mount_opt(struct super
+@@ -1476,6 +1480,20 @@ static int handle_mount_opt(struct super
case Opt_nolazytime:
sb->s_flags &= ~MS_LAZYTIME;
return 1;
@@ -3273,7 +3273,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/super.c linux-4.1.27-vs2.3.8.5.2/fs/e
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3652,6 +3670,9 @@ static int ext4_fill_super(struct super_
+@@ -3686,6 +3704,9 @@ static int ext4_fill_super(struct super_
clear_opt(sb, DELALLOC);
}
@@ -3283,7 +3283,7 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/super.c linux-4.1.27-vs2.3.8.5.2/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4963,6 +4984,14 @@ static int ext4_remount(struct super_blo
+@@ -5016,6 +5037,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -3298,9 +3298,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ext4/super.c linux-4.1.27-vs2.3.8.5.2/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.1.27/fs/fcntl.c linux-4.1.27-vs2.3.8.5.2/fs/fcntl.c
---- linux-4.1.27/fs/fcntl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/fcntl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/fcntl.c linux-4.1.40-vs2.3.8.5.3/fs/fcntl.c
+--- linux-4.1.40/fs/fcntl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/fcntl.c 2016-07-05 04:41:47.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/pid_namespace.h>
#include <linux/user_namespace.h>
@@ -3318,9 +3318,9 @@ diff -NurpP --minimal linux-4.1.27/fs/fcntl.c linux-4.1.27-vs2.3.8.5.2/fs/fcntl.
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-4.1.27/fs/file.c linux-4.1.27-vs2.3.8.5.2/fs/file.c
---- linux-4.1.27/fs/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/file.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/file.c linux-4.1.40-vs2.3.8.5.3/fs/file.c
+--- linux-4.1.40/fs/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/file.c 2016-07-05 04:41:47.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3375,9 +3375,9 @@ diff -NurpP --minimal linux-4.1.27/fs/file.c linux-4.1.27-vs2.3.8.5.2/fs/file.c
return fd;
-diff -NurpP --minimal linux-4.1.27/fs/file_table.c linux-4.1.27-vs2.3.8.5.2/fs/file_table.c
---- linux-4.1.27/fs/file_table.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/file_table.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/file_table.c linux-4.1.40-vs2.3.8.5.3/fs/file_table.c
+--- linux-4.1.40/fs/file_table.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/file_table.c 2016-07-05 04:41:47.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
@@ -3414,9 +3414,9 @@ diff -NurpP --minimal linux-4.1.27/fs/file_table.c linux-4.1.27-vs2.3.8.5.2/fs/f
file_free(file);
}
}
-diff -NurpP --minimal linux-4.1.27/fs/fs_struct.c linux-4.1.27-vs2.3.8.5.2/fs/fs_struct.c
---- linux-4.1.27/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/fs_struct.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/fs_struct.c linux-4.1.40-vs2.3.8.5.3/fs/fs_struct.c
+--- linux-4.1.40/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/fs_struct.c 2016-07-05 04:41:47.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3441,9 +3441,9 @@ diff -NurpP --minimal linux-4.1.27/fs/fs_struct.c linux-4.1.27-vs2.3.8.5.2/fs/fs
}
return fs;
}
-diff -NurpP --minimal linux-4.1.27/fs/gfs2/file.c linux-4.1.27-vs2.3.8.5.2/fs/gfs2/file.c
---- linux-4.1.27/fs/gfs2/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/gfs2/file.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/gfs2/file.c linux-4.1.40-vs2.3.8.5.3/fs/gfs2/file.c
+--- linux-4.1.40/fs/gfs2/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/gfs2/file.c 2016-07-05 04:41:47.000000000 +0000
@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
@@ -3566,9 +3566,9 @@ diff -NurpP --minimal linux-4.1.27/fs/gfs2/file.c linux-4.1.27-vs2.3.8.5.2/fs/gf
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-4.1.27/fs/gfs2/inode.h linux-4.1.27-vs2.3.8.5.2/fs/gfs2/inode.h
---- linux-4.1.27/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/gfs2/inode.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/gfs2/inode.h linux-4.1.40-vs2.3.8.5.3/fs/gfs2/inode.h
+--- linux-4.1.40/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/gfs2/inode.h 2016-07-05 04:41:47.000000000 +0000
@@ -118,6 +118,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3577,9 +3577,9 @@ diff -NurpP --minimal linux-4.1.27/fs/gfs2/inode.h linux-4.1.27-vs2.3.8.5.2/fs/g
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-4.1.27/fs/hostfs/hostfs.h linux-4.1.27-vs2.3.8.5.2/fs/hostfs/hostfs.h
---- linux-4.1.27/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/hostfs/hostfs.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/hostfs/hostfs.h linux-4.1.40-vs2.3.8.5.3/fs/hostfs/hostfs.h
+--- linux-4.1.40/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/hostfs/hostfs.h 2016-07-05 04:41:47.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
@@ -3588,9 +3588,9 @@ diff -NurpP --minimal linux-4.1.27/fs/hostfs/hostfs.h linux-4.1.27-vs2.3.8.5.2/f
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-4.1.27/fs/inode.c linux-4.1.27-vs2.3.8.5.2/fs/inode.c
---- linux-4.1.27/fs/inode.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/inode.c linux-4.1.40-vs2.3.8.5.3/fs/inode.c
+--- linux-4.1.40/fs/inode.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/inode.c 2016-07-05 04:41:47.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
@@ -3653,9 +3653,9 @@ diff -NurpP --minimal linux-4.1.27/fs/inode.c linux-4.1.27-vs2.3.8.5.2/fs/inode.
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-4.1.27/fs/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/ioctl.c
---- linux-4.1.27/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ioctl.c linux-4.1.40-vs2.3.8.5.3/fs/ioctl.c
+--- linux-4.1.40/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ioctl.c 2016-07-05 04:41:47.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3666,9 +3666,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/ioctl.
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-4.1.27/fs/jfs/file.c linux-4.1.27-vs2.3.8.5.2/fs/jfs/file.c
---- linux-4.1.27/fs/jfs/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/file.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/file.c linux-4.1.40-vs2.3.8.5.3/fs/jfs/file.c
+--- linux-4.1.40/fs/jfs/file.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/file.c 2017-05-30 07:39:23.000000000 +0000
@@ -110,7 +110,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3687,9 +3687,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/file.c linux-4.1.27-vs2.3.8.5.2/fs/jfs
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-4.1.27/fs/jfs/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/jfs/ioctl.c
---- linux-4.1.27/fs/jfs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/ioctl.c linux-4.1.40-vs2.3.8.5.3/fs/jfs/ioctl.c
+--- linux-4.1.40/fs/jfs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/ioctl.c 2016-07-05 04:41:47.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3747,9 +3747,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/jf
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_dinode.h linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_dinode.h
---- linux-4.1.27/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_dinode.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/jfs_dinode.h linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_dinode.h
+--- linux-4.1.40/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_dinode.h 2016-07-05 04:41:47.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3766,9 +3766,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_dinode.h linux-4.1.27-vs2.3.8.5.2/
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_filsys.h linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_filsys.h
---- linux-4.1.27/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_filsys.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/jfs_filsys.h linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_filsys.h
+--- linux-4.1.40/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_filsys.h 2016-07-05 04:41:47.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3777,9 +3777,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_filsys.h linux-4.1.27-vs2.3.8.5.2/
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_imap.c linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_imap.c
---- linux-4.1.27/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_imap.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/jfs_imap.c linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_imap.c
+--- linux-4.1.40/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_imap.c 2016-07-05 04:41:47.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3843,9 +3843,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_imap.c linux-4.1.27-vs2.3.8.5.2/fs
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_inode.c linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_inode.c
---- linux-4.1.27/fs/jfs/jfs_inode.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/jfs_inode.c linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_inode.c
+--- linux-4.1.40/fs/jfs/jfs_inode.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_inode.c 2016-07-05 04:41:47.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3917,9 +3917,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_inode.c linux-4.1.27-vs2.3.8.5.2/f
}
/*
-diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_inode.h linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_inode.h
---- linux-4.1.27/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/jfs_inode.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/jfs_inode.h linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_inode.h
+--- linux-4.1.40/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/jfs_inode.h 2016-07-05 04:41:47.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);
@@ -3928,9 +3928,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/jfs_inode.h linux-4.1.27-vs2.3.8.5.2/f
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-4.1.27/fs/jfs/namei.c linux-4.1.27-vs2.3.8.5.2/fs/jfs/namei.c
---- linux-4.1.27/fs/jfs/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/namei.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/namei.c linux-4.1.40-vs2.3.8.5.3/fs/jfs/namei.c
+--- linux-4.1.40/fs/jfs/namei.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/namei.c 2016-07-05 04:41:47.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3955,9 +3955,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/namei.c linux-4.1.27-vs2.3.8.5.2/fs/jf
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-4.1.27/fs/jfs/super.c linux-4.1.27-vs2.3.8.5.2/fs/jfs/super.c
---- linux-4.1.27/fs/jfs/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/jfs/super.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/jfs/super.c linux-4.1.40-vs2.3.8.5.3/fs/jfs/super.c
+--- linux-4.1.40/fs/jfs/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/jfs/super.c 2016-07-05 04:41:47.000000000 +0000
@@ -206,7 +206,8 @@ enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -4024,9 +4024,9 @@ diff -NurpP --minimal linux-4.1.27/fs/jfs/super.c linux-4.1.27-vs2.3.8.5.2/fs/jf
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-4.1.27/fs/libfs.c linux-4.1.27-vs2.3.8.5.2/fs/libfs.c
---- linux-4.1.27/fs/libfs.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/libfs.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/libfs.c linux-4.1.40-vs2.3.8.5.3/fs/libfs.c
+--- linux-4.1.40/fs/libfs.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/libfs.c 2017-05-30 07:39:23.000000000 +0000
@@ -146,13 +146,14 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4078,9 +4078,9 @@ diff -NurpP --minimal linux-4.1.27/fs/libfs.c linux-4.1.27-vs2.3.8.5.2/fs/libfs.
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -NurpP --minimal linux-4.1.27/fs/locks.c linux-4.1.27-vs2.3.8.5.2/fs/locks.c
---- linux-4.1.27/fs/locks.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/locks.c 2016-07-06 06:54:00.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/locks.c linux-4.1.40-vs2.3.8.5.3/fs/locks.c
+--- linux-4.1.40/fs/locks.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/locks.c 2016-10-25 21:31:19.000000000 +0000
@@ -129,6 +129,8 @@
#include <linux/hashtable.h>
#include <linux/percpu.h>
@@ -4276,10 +4276,10 @@ diff -NurpP --minimal linux-4.1.27/fs/locks.c linux-4.1.27-vs2.3.8.5.2/fs/locks.
return 0;
}
-diff -NurpP --minimal linux-4.1.27/fs/mount.h linux-4.1.27-vs2.3.8.5.2/fs/mount.h
---- linux-4.1.27/fs/mount.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/mount.h 2016-07-05 04:41:47.000000000 +0000
-@@ -65,6 +65,7 @@ struct mount {
+diff -NurpP --minimal linux-4.1.40/fs/mount.h linux-4.1.40-vs2.3.8.5.3/fs/mount.h
+--- linux-4.1.40/fs/mount.h 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/mount.h 2017-05-30 07:39:23.000000000 +0000
+@@ -67,6 +67,7 @@ struct mount {
struct hlist_head mnt_pins;
struct fs_pin mnt_umount;
struct dentry *mnt_ex_mountpoint;
@@ -4287,9 +4287,9 @@ diff -NurpP --minimal linux-4.1.27/fs/mount.h linux-4.1.27-vs2.3.8.5.2/fs/mount.
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-4.1.27/fs/namei.c linux-4.1.27-vs2.3.8.5.2/fs/namei.c
---- linux-4.1.27/fs/namei.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/namei.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/namei.c linux-4.1.40-vs2.3.8.5.3/fs/namei.c
+--- linux-4.1.40/fs/namei.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/namei.c 2016-07-05 04:41:47.000000000 +0000
@@ -34,10 +34,20 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4851,9 +4851,9 @@ diff -NurpP --minimal linux-4.1.27/fs/namei.c linux-4.1.27-vs2.3.8.5.2/fs/namei.
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/namespace.c
---- linux-4.1.27/fs/namespace.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/namespace.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/namespace.c linux-4.1.40-vs2.3.8.5.3/fs/namespace.c
+--- linux-4.1.40/fs/namespace.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/namespace.c 2017-05-30 07:39:23.000000000 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
@@ -4866,7 +4866,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
#include "pnode.h"
#include "internal.h"
-@@ -927,6 +932,10 @@ vfs_kern_mount(struct file_system_type *
+@@ -959,6 +964,10 @@ vfs_kern_mount(struct file_system_type *
if (!type)
return ERR_PTR(-ENODEV);
@@ -4877,7 +4877,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
mnt = alloc_vfsmnt(name);
if (!mnt)
return ERR_PTR(-ENOMEM);
-@@ -1002,6 +1011,7 @@ static struct mount *clone_mnt(struct mo
+@@ -1034,6 +1043,7 @@ static struct mount *clone_mnt(struct mo
mnt->mnt.mnt_root = dget(root);
mnt->mnt_mountpoint = mnt->mnt.mnt_root;
mnt->mnt_parent = mnt;
@@ -4885,7 +4885,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
lock_mount_hash();
list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
unlock_mount_hash();
-@@ -1570,7 +1580,8 @@ out_unlock:
+@@ -1608,7 +1618,8 @@ out_unlock:
*/
static inline bool may_mount(void)
{
@@ -4895,7 +4895,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
}
/*
-@@ -2029,6 +2040,7 @@ static int do_change_type(struct path *p
+@@ -2109,6 +2120,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
@@ -4903,7 +4903,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -2057,12 +2069,14 @@ static bool has_locked_children(struct m
+@@ -2137,12 +2149,14 @@ static bool has_locked_children(struct m
* do loopback mount.
*/
static int do_loopback(struct path *path, const char *old_name,
@@ -4919,7 +4919,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -2142,7 +2156,7 @@ static int change_mount_flags(struct vfs
+@@ -2222,7 +2236,7 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
@@ -4928,7 +4928,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2650,6 +2664,7 @@ long do_mount(const char *dev_name, cons
+@@ -2730,6 +2744,7 @@ long do_mount(const char *dev_name, cons
struct path path;
int retval = 0;
int mnt_flags = 0;
@@ -4936,7 +4936,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2675,6 +2690,12 @@ long do_mount(const char *dev_name, cons
+@@ -2755,6 +2770,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
@@ -4949,7 +4949,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2699,15 +2720,17 @@ long do_mount(const char *dev_name, cons
+@@ -2779,15 +2800,17 @@ long do_mount(const char *dev_name, cons
mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK;
}
@@ -4969,7 +4969,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2824,6 +2847,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -2907,6 +2930,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
p = next_mnt(p, old);
}
namespace_unlock();
@@ -4977,7 +4977,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
if (rootmnt)
mntput(rootmnt);
-@@ -2998,9 +3022,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -3082,9 +3106,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
old_mnt = real_mount(old.mnt);
@@ -4990,7 +4990,7 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -3138,6 +3163,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -3222,6 +3247,7 @@ void put_mnt_ns(struct mnt_namespace *ns
if (!atomic_dec_and_test(&ns->count))
return;
drop_collected_mounts(&ns->root->mnt);
@@ -4998,9 +4998,9 @@ diff -NurpP --minimal linux-4.1.27/fs/namespace.c linux-4.1.27-vs2.3.8.5.2/fs/na
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-4.1.27/fs/nfs/client.c linux-4.1.27-vs2.3.8.5.2/fs/nfs/client.c
---- linux-4.1.27/fs/nfs/client.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfs/client.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfs/client.c linux-4.1.40-vs2.3.8.5.3/fs/nfs/client.c
+--- linux-4.1.40/fs/nfs/client.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfs/client.c 2016-07-05 04:41:47.000000000 +0000
@@ -692,6 +692,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5022,9 +5022,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfs/client.c linux-4.1.27-vs2.3.8.5.2/fs/n
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-4.1.27/fs/nfs/dir.c linux-4.1.27-vs2.3.8.5.2/fs/nfs/dir.c
---- linux-4.1.27/fs/nfs/dir.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfs/dir.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfs/dir.c linux-4.1.40-vs2.3.8.5.3/fs/nfs/dir.c
+--- linux-4.1.40/fs/nfs/dir.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfs/dir.c 2016-10-25 21:31:19.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5041,9 +5041,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfs/dir.c linux-4.1.27-vs2.3.8.5.2/fs/nfs/
no_entry:
res = d_splice_alias(inode, dentry);
if (res != NULL) {
-diff -NurpP --minimal linux-4.1.27/fs/nfs/inode.c linux-4.1.27-vs2.3.8.5.2/fs/nfs/inode.c
---- linux-4.1.27/fs/nfs/inode.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfs/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfs/inode.c linux-4.1.40-vs2.3.8.5.3/fs/nfs/inode.c
+--- linux-4.1.40/fs/nfs/inode.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfs/inode.c 2016-07-05 04:41:47.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
@@ -5169,9 +5169,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfs/inode.c linux-4.1.27-vs2.3.8.5.2/fs/nf
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-4.1.27/fs/nfs/nfs3xdr.c linux-4.1.27-vs2.3.8.5.2/fs/nfs/nfs3xdr.c
---- linux-4.1.27/fs/nfs/nfs3xdr.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfs/nfs3xdr.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfs/nfs3xdr.c linux-4.1.40-vs2.3.8.5.3/fs/nfs/nfs3xdr.c
+--- linux-4.1.40/fs/nfs/nfs3xdr.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfs/nfs3xdr.c 2016-07-05 04:41:47.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5317,9 +5317,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfs/nfs3xdr.c linux-4.1.27-vs2.3.8.5.2/fs/
}
/*
-diff -NurpP --minimal linux-4.1.27/fs/nfs/super.c linux-4.1.27-vs2.3.8.5.2/fs/nfs/super.c
---- linux-4.1.27/fs/nfs/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfs/super.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfs/super.c linux-4.1.40-vs2.3.8.5.3/fs/nfs/super.c
+--- linux-4.1.40/fs/nfs/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfs/super.c 2016-07-05 04:41:47.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -5393,9 +5393,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfs/super.c linux-4.1.27-vs2.3.8.5.2/fs/nf
/*
* options that take text values
-diff -NurpP --minimal linux-4.1.27/fs/nfsd/auth.c linux-4.1.27-vs2.3.8.5.2/fs/nfsd/auth.c
---- linux-4.1.27/fs/nfsd/auth.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfsd/auth.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfsd/auth.c linux-4.1.40-vs2.3.8.5.3/fs/nfsd/auth.c
+--- linux-4.1.40/fs/nfsd/auth.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfsd/auth.c 2016-07-05 04:41:47.000000000 +0000
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir at monad.swb.de> */
@@ -5414,9 +5414,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfsd/auth.c linux-4.1.27-vs2.3.8.5.2/fs/nf
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-4.1.27/fs/nfsd/nfs3xdr.c linux-4.1.27-vs2.3.8.5.2/fs/nfsd/nfs3xdr.c
---- linux-4.1.27/fs/nfsd/nfs3xdr.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfsd/nfs3xdr.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfsd/nfs3xdr.c linux-4.1.40-vs2.3.8.5.3/fs/nfsd/nfs3xdr.c
+--- linux-4.1.40/fs/nfsd/nfs3xdr.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfsd/nfs3xdr.c 2017-05-30 07:39:23.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5470,9 +5470,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfsd/nfs3xdr.c linux-4.1.27-vs2.3.8.5.2/fs
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-4.1.27/fs/nfsd/nfs4xdr.c linux-4.1.27-vs2.3.8.5.2/fs/nfsd/nfs4xdr.c
---- linux-4.1.27/fs/nfsd/nfs4xdr.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfsd/nfs4xdr.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfsd/nfs4xdr.c linux-4.1.40-vs2.3.8.5.3/fs/nfsd/nfs4xdr.c
+--- linux-4.1.40/fs/nfsd/nfs4xdr.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfsd/nfs4xdr.c 2017-05-30 07:39:23.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5500,9 +5500,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfsd/nfs4xdr.c linux-4.1.27-vs2.3.8.5.2/fs
if (status)
goto out;
}
-diff -NurpP --minimal linux-4.1.27/fs/nfsd/nfsxdr.c linux-4.1.27-vs2.3.8.5.2/fs/nfsd/nfsxdr.c
---- linux-4.1.27/fs/nfsd/nfsxdr.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/nfsd/nfsxdr.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/nfsd/nfsxdr.c linux-4.1.40-vs2.3.8.5.3/fs/nfsd/nfsxdr.c
+--- linux-4.1.40/fs/nfsd/nfsxdr.c 2017-05-30 07:35:12.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/nfsd/nfsxdr.c 2017-05-30 07:39:23.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
@@ -5554,9 +5554,9 @@ diff -NurpP --minimal linux-4.1.27/fs/nfsd/nfsxdr.c linux-4.1.27-vs2.3.8.5.2/fs/
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-4.1.27/fs/ocfs2/dlmglue.c linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/dlmglue.c
---- linux-4.1.27/fs/ocfs2/dlmglue.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/dlmglue.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/dlmglue.c linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/dlmglue.c
+--- linux-4.1.40/fs/ocfs2/dlmglue.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/dlmglue.c 2017-05-30 07:39:23.000000000 +0000
@@ -2083,6 +2083,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode));
@@ -5573,9 +5573,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/dlmglue.c linux-4.1.27-vs2.3.8.5.2/f
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-4.1.27/fs/ocfs2/dlmglue.h linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/dlmglue.h
---- linux-4.1.27/fs/ocfs2/dlmglue.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/dlmglue.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/dlmglue.h linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/dlmglue.h
+--- linux-4.1.40/fs/ocfs2/dlmglue.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/dlmglue.h 2016-07-05 04:41:47.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5586,9 +5586,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/dlmglue.h linux-4.1.27-vs2.3.8.5.2/f
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-4.1.27/fs/ocfs2/file.c linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/file.c
---- linux-4.1.27/fs/ocfs2/file.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/file.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/file.c linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/file.c
+--- linux-4.1.40/fs/ocfs2/file.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/file.c 2017-05-30 07:39:23.000000000 +0000
@@ -1146,7 +1146,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5598,9 +5598,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/file.c linux-4.1.27-vs2.3.8.5.2/fs/o
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-4.1.27/fs/ocfs2/inode.c linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/inode.c
---- linux-4.1.27/fs/ocfs2/inode.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/inode.c linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/inode.c
+--- linux-4.1.40/fs/ocfs2/inode.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/inode.c 2016-07-05 04:41:47.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5697,9 +5697,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/inode.c linux-4.1.27-vs2.3.8.5.2/fs/
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-4.1.27/fs/ocfs2/inode.h linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/inode.h
---- linux-4.1.27/fs/ocfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/inode.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/inode.h linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/inode.h
+--- linux-4.1.40/fs/ocfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/inode.h 2016-07-05 04:41:47.000000000 +0000
@@ -161,6 +161,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5708,9 +5708,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/inode.h linux-4.1.27-vs2.3.8.5.2/fs/
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-4.1.27/fs/ocfs2/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/ioctl.c
---- linux-4.1.27/fs/ocfs2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/ioctl.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/ioctl.c linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/ioctl.c
+--- linux-4.1.40/fs/ocfs2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/ioctl.c 2016-07-05 04:41:47.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5774,9 +5774,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/ioctl.c linux-4.1.27-vs2.3.8.5.2/fs/
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-4.1.27/fs/ocfs2/namei.c linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/namei.c
---- linux-4.1.27/fs/ocfs2/namei.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/namei.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/namei.c linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/namei.c
+--- linux-4.1.40/fs/ocfs2/namei.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/namei.c 2016-07-05 04:41:47.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5809,9 +5809,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/namei.c linux-4.1.27-vs2.3.8.5.2/fs/
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-4.1.27/fs/ocfs2/ocfs2.h linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/ocfs2.h
---- linux-4.1.27/fs/ocfs2/ocfs2.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/ocfs2.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/ocfs2.h linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/ocfs2.h
+--- linux-4.1.40/fs/ocfs2/ocfs2.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/ocfs2.h 2016-07-05 04:41:47.000000000 +0000
@@ -286,6 +286,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
@@ -5820,9 +5820,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/ocfs2.h linux-4.1.27-vs2.3.8.5.2/fs/
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-4.1.27/fs/ocfs2/ocfs2_fs.h linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/ocfs2_fs.h
---- linux-4.1.27/fs/ocfs2/ocfs2_fs.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/ocfs2_fs.h linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/ocfs2_fs.h
+--- linux-4.1.40/fs/ocfs2/ocfs2_fs.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:41:47.000000000 +0000
@@ -275,6 +275,11 @@
#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
@@ -5835,9 +5835,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/ocfs2_fs.h linux-4.1.27-vs2.3.8.5.2/
#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-4.1.27/fs/ocfs2/super.c linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/super.c
---- linux-4.1.27/fs/ocfs2/super.c 2016-07-05 04:28:30.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/ocfs2/super.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/ocfs2/super.c linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/super.c
+--- linux-4.1.40/fs/ocfs2/super.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/ocfs2/super.c 2016-07-05 04:41:47.000000000 +0000
@@ -192,6 +192,7 @@ enum {
Opt_resv_level,
Opt_dir_resv_level,
@@ -5901,9 +5901,9 @@ diff -NurpP --minimal linux-4.1.27/fs/ocfs2/super.c linux-4.1.27-vs2.3.8.5.2/fs/
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-4.1.27/fs/open.c linux-4.1.27-vs2.3.8.5.2/fs/open.c
---- linux-4.1.27/fs/open.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/open.c 2016-07-05 05:07:17.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/open.c linux-4.1.40-vs2.3.8.5.3/fs/open.c
+--- linux-4.1.40/fs/open.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/open.c 2016-07-05 05:07:17.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5971,9 +5971,9 @@ diff -NurpP --minimal linux-4.1.27/fs/open.c linux-4.1.27-vs2.3.8.5.2/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-4.1.27/fs/proc/array.c linux-4.1.27-vs2.3.8.5.2/fs/proc/array.c
---- linux-4.1.27/fs/proc/array.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/array.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/array.c linux-4.1.40-vs2.3.8.5.3/fs/proc/array.c
+--- linux-4.1.40/fs/proc/array.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/array.c 2016-07-05 04:41:47.000000000 +0000
@@ -83,6 +83,8 @@
#include <linux/tracehook.h>
#include <linux/string_helpers.h>
@@ -6090,9 +6090,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/array.c linux-4.1.27-vs2.3.8.5.2/fs/p
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-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/proc/base.c
---- linux-4.1.27/fs/proc/base.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/base.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/base.c linux-4.1.40-vs2.3.8.5.3/fs/proc/base.c
+--- linux-4.1.40/fs/proc/base.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/base.c 2017-05-30 07:39:23.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -6102,7 +6102,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -891,11 +893,15 @@ static ssize_t oom_adj_write(struct file
+@@ -892,11 +894,15 @@ static ssize_t oom_adj_write(struct file
oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
if (oom_adj < task->signal->oom_score_adj &&
@@ -6119,7 +6119,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
/*
* /proc/pid/oom_adj is provided for legacy purposes, ask users to use
* /proc/pid/oom_score_adj instead.
-@@ -1483,6 +1489,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1484,6 +1490,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
@@ -6128,7 +6128,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
security_task_to_inode(task, inode);
out:
-@@ -1528,6 +1536,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1529,6 +1537,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
@@ -6137,7 +6137,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1556,6 +1566,19 @@ int pid_revalidate(struct dentry *dentry
+@@ -1557,6 +1567,19 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
@@ -6157,7 +6157,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -2093,6 +2116,13 @@ static struct dentry *proc_pident_lookup
+@@ -2094,6 +2117,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -6171,7 +6171,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2544,6 +2574,11 @@ static int proc_pid_personality(struct s
+@@ -2545,6 +2575,11 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
@@ -6183,7 +6183,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2610,6 +2645,8 @@ static const struct pid_entry tgid_base_
+@@ -2611,6 +2646,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
ONE("cgroup", S_IRUGO, proc_cgroup_show),
#endif
@@ -6192,7 +6192,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
ONE("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -2824,7 +2861,7 @@ retry:
+@@ -2825,7 +2862,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -6201,7 +6201,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -2882,8 +2919,10 @@ int proc_pid_readdir(struct file *file,
+@@ -2883,8 +2920,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
@@ -6213,7 +6213,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -2980,6 +3019,7 @@ static const struct pid_entry tid_base_s
+@@ -2981,6 +3020,7 @@ static const struct pid_entry tid_base_s
REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations),
#endif
@@ -6221,7 +6221,7 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3046,6 +3086,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3047,6 +3087,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(&dentry->d_name);
if (tid == ~0U)
goto out;
@@ -6230,9 +6230,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/base.c linux-4.1.27-vs2.3.8.5.2/fs/pr
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-4.1.27/fs/proc/generic.c linux-4.1.27-vs2.3.8.5.2/fs/proc/generic.c
---- linux-4.1.27/fs/proc/generic.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/generic.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/generic.c linux-4.1.40-vs2.3.8.5.3/fs/proc/generic.c
+--- linux-4.1.40/fs/proc/generic.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/generic.c 2017-05-30 07:39:23.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6308,9 +6308,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/generic.c linux-4.1.27-vs2.3.8.5.2/fs
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-4.1.27/fs/proc/inode.c linux-4.1.27-vs2.3.8.5.2/fs/proc/inode.c
---- linux-4.1.27/fs/proc/inode.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/inode.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/inode.c linux-4.1.40-vs2.3.8.5.3/fs/proc/inode.c
+--- linux-4.1.40/fs/proc/inode.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/inode.c 2016-07-05 04:41:47.000000000 +0000
@@ -432,6 +432,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6320,9 +6320,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/inode.c linux-4.1.27-vs2.3.8.5.2/fs/p
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-4.1.27/fs/proc/internal.h linux-4.1.27-vs2.3.8.5.2/fs/proc/internal.h
---- linux-4.1.27/fs/proc/internal.h 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/internal.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/internal.h linux-4.1.40-vs2.3.8.5.3/fs/proc/internal.h
+--- linux-4.1.40/fs/proc/internal.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/internal.h 2016-07-05 04:41:47.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -6389,9 +6389,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/internal.h linux-4.1.27-vs2.3.8.5.2/f
/*
* base.c
-diff -NurpP --minimal linux-4.1.27/fs/proc/loadavg.c linux-4.1.27-vs2.3.8.5.2/fs/proc/loadavg.c
---- linux-4.1.27/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/loadavg.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/loadavg.c linux-4.1.40-vs2.3.8.5.3/fs/proc/loadavg.c
+--- linux-4.1.40/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/loadavg.c 2016-07-05 04:41:47.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6421,9 +6421,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/loadavg.c linux-4.1.27-vs2.3.8.5.2/fs
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-4.1.27/fs/proc/meminfo.c linux-4.1.27-vs2.3.8.5.2/fs/proc/meminfo.c
---- linux-4.1.27/fs/proc/meminfo.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/meminfo.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/meminfo.c linux-4.1.40-vs2.3.8.5.3/fs/proc/meminfo.c
+--- linux-4.1.40/fs/proc/meminfo.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/meminfo.c 2016-07-05 04:41:47.000000000 +0000
@@ -44,7 +44,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
@@ -6434,9 +6434,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/meminfo.c linux-4.1.27-vs2.3.8.5.2/fs
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-4.1.27/fs/proc/root.c linux-4.1.27-vs2.3.8.5.2/fs/proc/root.c
---- linux-4.1.27/fs/proc/root.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/root.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/root.c linux-4.1.40-vs2.3.8.5.3/fs/proc/root.c
+--- linux-4.1.40/fs/proc/root.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/root.c 2016-07-05 04:41:47.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6478,9 +6478,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/root.c linux-4.1.27-vs2.3.8.5.2/fs/pr
.subdir = RB_ROOT,
.name = "/proc",
};
-diff -NurpP --minimal linux-4.1.27/fs/proc/self.c linux-4.1.27-vs2.3.8.5.2/fs/proc/self.c
---- linux-4.1.27/fs/proc/self.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/self.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/self.c linux-4.1.40-vs2.3.8.5.3/fs/proc/self.c
+--- linux-4.1.40/fs/proc/self.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/self.c 2016-07-05 04:41:47.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/namei.h>
#include <linux/slab.h>
@@ -6498,9 +6498,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/self.c linux-4.1.27-vs2.3.8.5.2/fs/pr
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-4.1.27/fs/proc/stat.c linux-4.1.27-vs2.3.8.5.2/fs/proc/stat.c
---- linux-4.1.27/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/stat.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/stat.c linux-4.1.40-vs2.3.8.5.3/fs/proc/stat.c
+--- linux-4.1.40/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/stat.c 2016-07-05 04:41:47.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6549,9 +6549,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/stat.c linux-4.1.27-vs2.3.8.5.2/fs/pr
/* 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-4.1.27/fs/proc/uptime.c linux-4.1.27-vs2.3.8.5.2/fs/proc/uptime.c
---- linux-4.1.27/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc/uptime.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc/uptime.c linux-4.1.40-vs2.3.8.5.3/fs/proc/uptime.c
+--- linux-4.1.40/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc/uptime.c 2016-07-05 04:41:47.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6571,9 +6571,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc/uptime.c linux-4.1.27-vs2.3.8.5.2/fs/
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-4.1.27/fs/proc_namespace.c linux-4.1.27-vs2.3.8.5.2/fs/proc_namespace.c
---- linux-4.1.27/fs/proc_namespace.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/proc_namespace.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/proc_namespace.c linux-4.1.40-vs2.3.8.5.3/fs/proc_namespace.c
+--- linux-4.1.40/fs/proc_namespace.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/proc_namespace.c 2016-07-05 04:41:47.000000000 +0000
@@ -45,6 +45,8 @@ static int show_sb_opts(struct seq_file
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
@@ -6687,9 +6687,9 @@ diff -NurpP --minimal linux-4.1.27/fs/proc_namespace.c linux-4.1.27-vs2.3.8.5.2/
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-4.1.27/fs/quota/dquot.c linux-4.1.27-vs2.3.8.5.2/fs/quota/dquot.c
---- linux-4.1.27/fs/quota/dquot.c 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/quota/dquot.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/quota/dquot.c linux-4.1.40-vs2.3.8.5.3/fs/quota/dquot.c
+--- linux-4.1.40/fs/quota/dquot.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/quota/dquot.c 2016-07-05 04:41:47.000000000 +0000
@@ -1624,6 +1624,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots;
@@ -6728,9 +6728,9 @@ diff -NurpP --minimal linux-4.1.27/fs/quota/dquot.c linux-4.1.27-vs2.3.8.5.2/fs/
if (!dquot_active(inode))
return;
-diff -NurpP --minimal linux-4.1.27/fs/quota/quota.c linux-4.1.27-vs2.3.8.5.2/fs/quota/quota.c
---- linux-4.1.27/fs/quota/quota.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/quota/quota.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/quota/quota.c linux-4.1.40-vs2.3.8.5.3/fs/quota/quota.c
+--- linux-4.1.40/fs/quota/quota.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/quota/quota.c 2016-07-05 04:41:47.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6818,9 +6818,9 @@ diff -NurpP --minimal linux-4.1.27/fs/quota/quota.c linux-4.1.27-vs2.3.8.5.2/fs/
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-4.1.27/fs/stat.c linux-4.1.27-vs2.3.8.5.2/fs/stat.c
---- linux-4.1.27/fs/stat.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/stat.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/stat.c linux-4.1.40-vs2.3.8.5.3/fs/stat.c
+--- linux-4.1.40/fs/stat.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/stat.c 2016-07-05 04:41:47.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6829,9 +6829,9 @@ diff -NurpP --minimal linux-4.1.27/fs/stat.c linux-4.1.27-vs2.3.8.5.2/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-4.1.27/fs/statfs.c linux-4.1.27-vs2.3.8.5.2/fs/statfs.c
---- linux-4.1.27/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/statfs.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/statfs.c linux-4.1.40-vs2.3.8.5.3/fs/statfs.c
+--- linux-4.1.40/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/statfs.c 2016-07-05 04:41:47.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6850,9 +6850,9 @@ diff -NurpP --minimal linux-4.1.27/fs/statfs.c linux-4.1.27-vs2.3.8.5.2/fs/statf
return retval;
}
-diff -NurpP --minimal linux-4.1.27/fs/super.c linux-4.1.27-vs2.3.8.5.2/fs/super.c
---- linux-4.1.27/fs/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/super.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/super.c linux-4.1.40-vs2.3.8.5.3/fs/super.c
+--- linux-4.1.40/fs/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/super.c 2016-07-05 04:41:47.000000000 +0000
@@ -33,6 +33,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
@@ -6876,9 +6876,9 @@ diff -NurpP --minimal linux-4.1.27/fs/super.c linux-4.1.27-vs2.3.8.5.2/fs/super.
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-4.1.27/fs/utimes.c linux-4.1.27-vs2.3.8.5.2/fs/utimes.c
---- linux-4.1.27/fs/utimes.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/utimes.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/utimes.c linux-4.1.40-vs2.3.8.5.3/fs/utimes.c
+--- linux-4.1.40/fs/utimes.c 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/utimes.c 2017-05-30 07:39:23.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6909,9 +6909,9 @@ diff -NurpP --minimal linux-4.1.27/fs/utimes.c linux-4.1.27-vs2.3.8.5.2/fs/utime
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-4.1.27/fs/xattr.c linux-4.1.27-vs2.3.8.5.2/fs/xattr.c
---- linux-4.1.27/fs/xattr.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/fs/xattr.c 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/fs/xattr.c linux-4.1.40-vs2.3.8.5.3/fs/xattr.c
+--- linux-4.1.40/fs/xattr.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/fs/xattr.c 2016-07-05 04:41:47.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6929,9 +6929,9 @@ diff -NurpP --minimal linux-4.1.27/fs/xattr.c linux-4.1.27-vs2.3.8.5.2/fs/xattr.
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-4.1.27/include/linux/capability.h linux-4.1.27-vs2.3.8.5.2/include/linux/capability.h
---- linux-4.1.27/include/linux/capability.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/capability.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/capability.h linux-4.1.40-vs2.3.8.5.3/include/linux/capability.h
+--- linux-4.1.40/include/linux/capability.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/capability.h 2017-05-30 07:39:23.000000000 +0000
@@ -79,7 +79,8 @@ extern const kernel_cap_t __cap_init_eff
#else /* HAND-CODED capability initializers */
@@ -6942,9 +6942,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/capability.h linux-4.1.27-vs2.3
# define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }})
# define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }})
-diff -NurpP --minimal linux-4.1.27/include/linux/cred.h linux-4.1.27-vs2.3.8.5.2/include/linux/cred.h
---- linux-4.1.27/include/linux/cred.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/cred.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/cred.h linux-4.1.40-vs2.3.8.5.3/include/linux/cred.h
+--- linux-4.1.40/include/linux/cred.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/cred.h 2016-07-05 04:41:47.000000000 +0000
@@ -159,6 +159,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 *);
@@ -6985,9 +6985,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/cred.h linux-4.1.27-vs2.3.8.5.2
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-4.1.27/include/linux/dcache.h linux-4.1.27-vs2.3.8.5.2/include/linux/dcache.h
---- linux-4.1.27/include/linux/dcache.h 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/dcache.h 2016-07-06 06:58:45.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/dcache.h linux-4.1.40-vs2.3.8.5.3/include/linux/dcache.h
+--- linux-4.1.40/include/linux/dcache.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/dcache.h 2016-07-06 06:58:45.000000000 +0000
@@ -10,6 +10,7 @@
#include <linux/cache.h>
#include <linux/rcupdate.h>
@@ -7008,18 +7008,18 @@ diff -NurpP --minimal linux-4.1.27/include/linux/dcache.h linux-4.1.27-vs2.3.8.5
return dentry;
}
-diff -NurpP --minimal linux-4.1.27/include/linux/devpts_fs.h linux-4.1.27-vs2.3.8.5.2/include/linux/devpts_fs.h
---- linux-4.1.27/include/linux/devpts_fs.h 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/devpts_fs.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/devpts_fs.h linux-4.1.40-vs2.3.8.5.3/include/linux/devpts_fs.h
+--- linux-4.1.40/include/linux/devpts_fs.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/devpts_fs.h 2016-07-05 04:41:47.000000000 +0000
@@ -49,5 +49,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-4.1.27/include/linux/fs.h linux-4.1.27-vs2.3.8.5.2/include/linux/fs.h
---- linux-4.1.27/include/linux/fs.h 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/fs.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/fs.h linux-4.1.40-vs2.3.8.5.3/include/linux/fs.h
+--- linux-4.1.40/include/linux/fs.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/fs.h 2017-05-30 07:39:23.000000000 +0000
@@ -225,6 +225,7 @@ typedef void (dax_iodone_t)(struct buffe
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
@@ -7185,9 +7185,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/fs.h linux-4.1.27-vs2.3.8.5.2/i
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-4.1.27/include/linux/init_task.h linux-4.1.27-vs2.3.8.5.2/include/linux/init_task.h
---- linux-4.1.27/include/linux/init_task.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/init_task.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/init_task.h linux-4.1.40-vs2.3.8.5.3/include/linux/init_task.h
+--- linux-4.1.40/include/linux/init_task.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/init_task.h 2016-07-05 04:41:47.000000000 +0000
@@ -258,6 +258,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
INIT_NUMA_BALANCING(tsk) \
@@ -7199,9 +7199,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/init_task.h linux-4.1.27-vs2.3.
}
-diff -NurpP --minimal linux-4.1.27/include/linux/ipc.h linux-4.1.27-vs2.3.8.5.2/include/linux/ipc.h
---- linux-4.1.27/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/ipc.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/ipc.h linux-4.1.40-vs2.3.8.5.3/include/linux/ipc.h
+--- linux-4.1.40/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/ipc.h 2016-07-05 04:41:47.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -7210,9 +7210,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/ipc.h linux-4.1.27-vs2.3.8.5.2/
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-4.1.27/include/linux/memcontrol.h linux-4.1.27-vs2.3.8.5.2/include/linux/memcontrol.h
---- linux-4.1.27/include/linux/memcontrol.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/memcontrol.h 2016-07-06 06:59:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/memcontrol.h linux-4.1.40-vs2.3.8.5.3/include/linux/memcontrol.h
+--- linux-4.1.40/include/linux/memcontrol.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/memcontrol.h 2016-07-06 06:59:44.000000000 +0000
@@ -66,6 +66,7 @@ enum mem_cgroup_events_index {
MEMCG_NR_EVENTS,
};
@@ -7233,9 +7233,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/memcontrol.h linux-4.1.27-vs2.3
static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-4.1.27/include/linux/mount.h linux-4.1.27-vs2.3.8.5.2/include/linux/mount.h
---- linux-4.1.27/include/linux/mount.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/mount.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/mount.h linux-4.1.40-vs2.3.8.5.3/include/linux/mount.h
+--- linux-4.1.40/include/linux/mount.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/mount.h 2017-05-30 07:39:23.000000000 +0000
@@ -63,6 +63,9 @@ struct mnt_namespace;
#define MNT_MARKED 0x4000000
#define MNT_UMOUNT 0x8000000
@@ -7246,9 +7246,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/mount.h linux-4.1.27-vs2.3.8.5.
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-4.1.27/include/linux/net.h linux-4.1.27-vs2.3.8.5.2/include/linux/net.h
---- linux-4.1.27/include/linux/net.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/net.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/net.h linux-4.1.40-vs2.3.8.5.3/include/linux/net.h
+--- linux-4.1.40/include/linux/net.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/net.h 2016-07-05 04:41:47.000000000 +0000
@@ -39,6 +39,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
@@ -7257,10 +7257,10 @@ diff -NurpP --minimal linux-4.1.27/include/linux/net.h linux-4.1.27-vs2.3.8.5.2/
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-4.1.27/include/linux/netdevice.h linux-4.1.27-vs2.3.8.5.2/include/linux/netdevice.h
---- linux-4.1.27/include/linux/netdevice.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/netdevice.h 2016-07-05 04:41:47.000000000 +0000
-@@ -2200,6 +2200,7 @@ static inline int dev_recursion_level(vo
+diff -NurpP --minimal linux-4.1.40/include/linux/netdevice.h linux-4.1.40-vs2.3.8.5.3/include/linux/netdevice.h
+--- linux-4.1.40/include/linux/netdevice.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/netdevice.h 2017-05-30 07:39:23.000000000 +0000
+@@ -2223,6 +2223,7 @@ static inline int dev_recursion_level(vo
struct net_device *dev_get_by_index(struct net *net, int ifindex);
struct net_device *__dev_get_by_index(struct net *net, int ifindex);
@@ -7268,9 +7268,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/netdevice.h linux-4.1.27-vs2.3.
struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
int netdev_get_name(struct net *net, char *name, int ifindex);
int dev_restart(struct net_device *dev);
-diff -NurpP --minimal linux-4.1.27/include/linux/nsproxy.h linux-4.1.27-vs2.3.8.5.2/include/linux/nsproxy.h
---- linux-4.1.27/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/nsproxy.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/nsproxy.h linux-4.1.40-vs2.3.8.5.3/include/linux/nsproxy.h
+--- linux-4.1.40/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/nsproxy.h 2016-07-05 04:41:47.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -7320,9 +7320,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/nsproxy.h linux-4.1.27-vs2.3.8.
}
#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/pid.h linux-4.1.27-vs2.3.8.5.2/include/linux/pid.h
---- linux-4.1.27/include/linux/pid.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/pid.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/pid.h linux-4.1.40-vs2.3.8.5.3/include/linux/pid.h
+--- linux-4.1.40/include/linux/pid.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/pid.h 2016-07-05 04:41:47.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -7341,9 +7341,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/pid.h linux-4.1.27-vs2.3.8.5.2/
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-4.1.27/include/linux/quotaops.h linux-4.1.27-vs2.3.8.5.2/include/linux/quotaops.h
---- linux-4.1.27/include/linux/quotaops.h 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/quotaops.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/quotaops.h linux-4.1.40-vs2.3.8.5.3/include/linux/quotaops.h
+--- linux-4.1.40/include/linux/quotaops.h 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/quotaops.h 2016-07-05 04:41:47.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -7385,10 +7385,10 @@ diff -NurpP --minimal linux-4.1.27/include/linux/quotaops.h linux-4.1.27-vs2.3.8
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-4.1.27/include/linux/sched.h linux-4.1.27-vs2.3.8.5.2/include/linux/sched.h
---- linux-4.1.27/include/linux/sched.h 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/sched.h 2016-07-05 04:41:47.000000000 +0000
-@@ -1502,6 +1502,14 @@ struct task_struct {
+diff -NurpP --minimal linux-4.1.40/include/linux/sched.h linux-4.1.40-vs2.3.8.5.3/include/linux/sched.h
+--- linux-4.1.40/include/linux/sched.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/sched.h 2017-05-30 07:39:23.000000000 +0000
+@@ -1504,6 +1504,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -7403,7 +7403,7 @@ diff -NurpP --minimal linux-4.1.27/include/linux/sched.h linux-4.1.27-vs2.3.8.5.
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1808,6 +1816,11 @@ struct pid_namespace;
+@@ -1810,6 +1818,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
@@ -7415,7 +7415,7 @@ diff -NurpP --minimal linux-4.1.27/include/linux/sched.h linux-4.1.27-vs2.3.8.5.
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1821,7 +1834,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1823,7 +1836,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
@@ -7425,7 +7425,7 @@ diff -NurpP --minimal linux-4.1.27/include/linux/sched.h linux-4.1.27-vs2.3.8.5.
}
-@@ -1834,7 +1848,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1836,7 +1850,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
@@ -7434,9 +7434,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/sched.h linux-4.1.27-vs2.3.8.5.
}
-diff -NurpP --minimal linux-4.1.27/include/linux/shmem_fs.h linux-4.1.27-vs2.3.8.5.2/include/linux/shmem_fs.h
---- linux-4.1.27/include/linux/shmem_fs.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/shmem_fs.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/shmem_fs.h linux-4.1.40-vs2.3.8.5.3/include/linux/shmem_fs.h
+--- linux-4.1.40/include/linux/shmem_fs.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/shmem_fs.h 2016-07-05 04:41:47.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
@@ -7447,9 +7447,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/shmem_fs.h linux-4.1.27-vs2.3.8
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-diff -NurpP --minimal linux-4.1.27/include/linux/stat.h linux-4.1.27-vs2.3.8.5.2/include/linux/stat.h
---- linux-4.1.27/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/stat.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/stat.h linux-4.1.40-vs2.3.8.5.3/include/linux/stat.h
+--- linux-4.1.40/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/stat.h 2016-07-05 04:41:47.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -7458,9 +7458,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/stat.h linux-4.1.27-vs2.3.8.5.2
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-4.1.27/include/linux/sunrpc/auth.h linux-4.1.27-vs2.3.8.5.2/include/linux/sunrpc/auth.h
---- linux-4.1.27/include/linux/sunrpc/auth.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/sunrpc/auth.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/sunrpc/auth.h linux-4.1.40-vs2.3.8.5.3/include/linux/sunrpc/auth.h
+--- linux-4.1.40/include/linux/sunrpc/auth.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/sunrpc/auth.h 2016-07-05 04:41:47.000000000 +0000
@@ -36,6 +36,7 @@ enum {
struct auth_cred {
kuid_t uid;
@@ -7469,9 +7469,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/sunrpc/auth.h linux-4.1.27-vs2.
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-4.1.27/include/linux/sunrpc/clnt.h linux-4.1.27-vs2.3.8.5.2/include/linux/sunrpc/clnt.h
---- linux-4.1.27/include/linux/sunrpc/clnt.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/sunrpc/clnt.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/sunrpc/clnt.h linux-4.1.40-vs2.3.8.5.3/include/linux/sunrpc/clnt.h
+--- linux-4.1.40/include/linux/sunrpc/clnt.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/sunrpc/clnt.h 2017-05-30 07:39:23.000000000 +0000
@@ -51,7 +51,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
@@ -7482,9 +7482,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/sunrpc/clnt.h linux-4.1.27-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-4.1.27/include/linux/types.h linux-4.1.27-vs2.3.8.5.2/include/linux/types.h
---- linux-4.1.27/include/linux/types.h 2016-07-05 04:28:31.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/types.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/types.h linux-4.1.40-vs2.3.8.5.3/include/linux/types.h
+--- linux-4.1.40/include/linux/types.h 2017-05-30 07:35:13.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/types.h 2016-07-05 04:41:47.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -7495,9 +7495,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/types.h linux-4.1.27-vs2.3.8.5.
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-4.1.27/include/linux/uidgid.h linux-4.1.27-vs2.3.8.5.2/include/linux/uidgid.h
---- linux-4.1.27/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/uidgid.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/uidgid.h linux-4.1.40-vs2.3.8.5.3/include/linux/uidgid.h
+--- linux-4.1.40/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/uidgid.h 2016-07-05 04:41:47.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -7594,9 +7594,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/uidgid.h linux-4.1.27-vs2.3.8.5
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-4.1.27/include/linux/vroot.h linux-4.1.27-vs2.3.8.5.2/include/linux/vroot.h
---- linux-4.1.27/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vroot.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vroot.h linux-4.1.40-vs2.3.8.5.3/include/linux/vroot.h
+--- linux-4.1.40/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vroot.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7649,9 +7649,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vroot.h linux-4.1.27-vs2.3.8.5.
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_base.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_base.h
---- linux-4.1.27/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_base.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_base.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_base.h
+--- linux-4.1.40/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_base.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -7663,9 +7663,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_base.h linux-4.1.27-vs2.3.8.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_context.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_context.h
---- linux-4.1.27/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_context.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_context.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_context.h
+--- linux-4.1.40/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_context.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -7909,9 +7909,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_context.h linux-4.1.27-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_cowbl.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_cowbl.h
---- linux-4.1.27/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_cowbl.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_cowbl.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_cowbl.h
+--- linux-4.1.40/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_cowbl.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -7961,9 +7961,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_cowbl.h linux-4.1.27-vs2.3.8
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_cvirt.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_cvirt.h
---- linux-4.1.27/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_cvirt.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_cvirt.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_cvirt.h
+--- linux-4.1.40/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_cvirt.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -8015,9 +8015,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_cvirt.h linux-4.1.27-vs2.3.8
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_device.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_device.h
---- linux-4.1.27/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_device.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_device.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_device.h
+--- linux-4.1.40/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_device.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -8064,9 +8064,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_device.h linux-4.1.27-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_dlimit.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_dlimit.h
---- linux-4.1.27/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_dlimit.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_dlimit.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_dlimit.h
+--- linux-4.1.40/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_dlimit.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -8283,9 +8283,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_dlimit.h linux-4.1.27-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_inet.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_inet.h
---- linux-4.1.27/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_inet.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_inet.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_inet.h
+--- linux-4.1.40/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_inet.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -8651,9 +8651,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_inet.h linux-4.1.27-vs2.3.8.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_inet6.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_inet6.h
---- linux-4.1.27/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_inet6.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_inet6.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_inet6.h
+--- linux-4.1.40/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_inet6.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -8912,9 +8912,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_inet6.h linux-4.1.27-vs2.3.8
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_limit.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_limit.h
---- linux-4.1.27/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_limit.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_limit.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_limit.h
+--- linux-4.1.40/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_limit.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -9056,9 +9056,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_limit.h linux-4.1.27-vs2.3.8
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_network.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_network.h
---- linux-4.1.27/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_network.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_network.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_network.h
+--- linux-4.1.40/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_network.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -9229,9 +9229,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_network.h linux-4.1.27-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_pid.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_pid.h
---- linux-4.1.27/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_pid.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_pid.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_pid.h
+--- linux-4.1.40/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_pid.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -9283,9 +9283,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_pid.h linux-4.1.27-vs2.3.8.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_sched.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_sched.h
---- linux-4.1.27/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_sched.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_sched.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_sched.h
+--- linux-4.1.40/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_sched.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -9327,9 +9327,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_sched.h linux-4.1.27-vs2.3.8
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_socket.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_socket.h
---- linux-4.1.27/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_socket.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_socket.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_socket.h
+--- linux-4.1.40/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_socket.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -9398,9 +9398,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_socket.h linux-4.1.27-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_tag.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_tag.h
---- linux-4.1.27/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_tag.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_tag.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_tag.h
+--- linux-4.1.40/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_tag.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -9449,9 +9449,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_tag.h linux-4.1.27-vs2.3.8.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vs_time.h linux-4.1.27-vs2.3.8.5.2/include/linux/vs_time.h
---- linux-4.1.27/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vs_time.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vs_time.h linux-4.1.40-vs2.3.8.5.3/include/linux/vs_time.h
+--- linux-4.1.40/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vs_time.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -9472,9 +9472,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vs_time.h linux-4.1.27-vs2.3.8.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vserver/base.h linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/base.h
---- linux-4.1.27/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/base.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vserver/base.h linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/base.h
+--- linux-4.1.40/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/base.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
@@ -9660,9 +9660,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vserver/base.h linux-4.1.27-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct.h linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct.h
---- linux-4.1.27/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vserver/cacct.h linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct.h
+--- linux-4.1.40/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
@@ -9679,9 +9679,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct.h linux-4.1.27-vs
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct_cmd.h linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct_cmd.h
---- linux-4.1.27/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct_cmd.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vserver/cacct_cmd.h linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct_cmd.h
+--- linux-4.1.40/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct_cmd.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
@@ -9693,9 +9693,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct_cmd.h linux-4.1.2
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct_def.h linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct_def.h
---- linux-4.1.27/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct_def.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vserver/cacct_def.h linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct_def.h
+--- linux-4.1.40/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct_def.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
@@ -9740,9 +9740,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct_def.h linux-4.1.2
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct_int.h linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct_int.h
---- linux-4.1.27/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/cacct_int.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vserver/cacct_int.h linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct_int.h
+--- linux-4.1.40/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/cacct_int.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
@@ -9761,9 +9761,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vserver/cacct_int.h linux-4.1.2
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-4.1.27/include/linux/vserver/check.h linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/check.h
---- linux-4.1.27/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/check.h 2016-07-05 04:41:47.000000000 +0000
+diff -NurpP --minimal linux-4.1.40/include/linux/vserver/check.h linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/check.h
+--- linux-4.1.40/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.40-vs2.3.8.5.3/include/linux/vserver/check.h 2016-07-05 04:41:47.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
@@ -9854,9 +9854,9 @@ diff -NurpP --minimal linux-4.1.27/include/linux/vserver/check.h linux-4.1.27-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-4.1.27/include/linux/vserver/context.h linux-4.1.27-vs2.3.8.5.2/include/linux/vserver/context.h
---- linux-4.1.27/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
<Skipped 2761 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/0d85ed731e3bda3203852a8167e6f7958fe6c9c1
More information about the pld-cvs-commit
mailing list