commit 03673fb00c2ede2da044eef49a97f427bf603ff4
Author: Jan Rękorajski <[email protected]>
Date: Fri Mar 27 09:07:08 2015 +0100
- updated patches for 3.19
kernel-aufs3.patch | 18 +++++-------------
kernel-imq.patch | 2 +-
kernel-layer7.patch | 8 ++++----
3 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/kernel-aufs3.patch b/kernel-aufs3.patch
index 68ab2f5..31e984e 100644
--- a/kernel-aufs3.patch
+++ b/kernel-aufs3.patch
@@ -26,12 +26,12 @@ index 8523f9b..11f8f74 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -56,6 +56,7 @@ header-y += atmppp.h
- header-y += atmsap.h
- header-y += atmsvc.h
+ header-y += atm_tcp.h
+ header-y += atm_zatm.h
header-y += audit.h
+header-y += aufs_type.h
- header-y += auto_fs.h
header-y += auto_fs4.h
+ header-y += auto_fs.h
header-y += auxvec.h
aufs3.18.1+ base patch
@@ -393,7 +393,7 @@ index 0938b30..0b66856 100644
- get_file(f);
+ vma_get_file(vma);
up_read(¤t->mm->mmap_sem);
- error = do_fallocate(f,
+ error = vfs_fallocate(f,
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
offset, end - start);
- fput(f);
@@ -767,14 +767,6 @@ index de92c13..65d8ab0 100644
long vfs_truncate(struct path *path, loff_t length)
{
-@@ -298,6 +299,7 @@ int do_fallocate(struct file *file, int mode, loff_t
offset, loff_t len)
- sb_end_write(inode->i_sb);
- return ret;
- }
-+EXPORT_SYMBOL(do_fallocate);
-
- SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
- {
diff --git a/fs/splice.c b/fs/splice.c
index 619359a..c14f60e 100644
--- a/fs/splice.c
@@ -13601,7 +13593,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c
linux/fs/aufs/f_op.c
+ fi_write_unlock(file);
+
+ lockdep_off();
-+ err = do_fallocate(h_file, mode, offset, len);
++ err = vfs_fallocate(h_file, mode, offset, len);
+ lockdep_on();
+ ii_write_lock_child(inode);
+ au_cpup_attr_timesizes(inode);
diff --git a/kernel-imq.patch b/kernel-imq.patch
index baebad1..086f5f0 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1376,9 +1376,9 @@ index 3d13874..9842f21 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -131,6 +131,9 @@
- #include <linux/vmalloc.h>
#include <linux/if_macvlan.h>
#include <linux/errqueue.h>
+ #include <linux/hrtimer.h>
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+#include <linux/imq.h>
+#endif
diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index a390ab2..612c295 100644
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -2067,8 +2067,8 @@
--- linux-2.6.28-stock/net/netfilter/nf_conntrack_standalone.c 2009-01-07
16:05:35.000000000 -0600
+++ linux-2.6.28/net/netfilter/nf_conntrack_standalone.c 2009-01-07
16:07:31.000000000 -0600
@@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file *
- return -ENOSPC;
- #endif
+
+ ct_show_delta_time(s, ct);
+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) ||
defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
+ if(ct->layer7.app_proto &&
@@ -2076,9 +2076,9 @@
+ return -ENOSPC;
+#endif
+
- if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
- return -ENOSPC;
+ seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use));
+ if (seq_has_overflowed(s))
--- linux-2.6.28-stock/include/net/netfilter/nf_conntrack.h 2009-01-07
16:05:30.000000000 -0600
+++ linux-2.6.28/include/net/netfilter/nf_conntrack.h 2009-01-07
16:07:31.000000000 -0600
@@ -118,6 +118,22 @@ struct nf_conn
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/2c0d7e89f7a30f409c049cd5b520aa296476b8a5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
