From c3592848d1fa0bd7b09ae64eb0cf1becaa885de9 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 3 May 2018 08:16:40 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-4.15.0-20.21 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...se-extent-block-in-dealloc-without-m.patch | 26 +++++++++---------- ...-while-clearing-neighbor-proxy-table.patch | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch b/patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch index b2bba0b..cdd7cf9 100644 --- a/patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch +++ b/patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch @@ -66,23 +66,11 @@ Signed-off-by: Linus Torvalds (cherry picked from commit 71a36944042b7d9dd71f6a5d1c5ea1c2353b5d42) Signed-off-by: Fabian Grünbichler --- - fs/ocfs2/alloc.h | 1 + fs/ocfs2/alloc.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + fs/ocfs2/alloc.h | 1 + fs/ocfs2/aops.c | 6 ++ 3 files changed, 203 insertions(+), 10 deletions(-) -diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h -index 27b75cf32cfa..250bcacdf9e9 100644 ---- a/fs/ocfs2/alloc.h -+++ b/fs/ocfs2/alloc.h -@@ -61,6 +61,7 @@ struct ocfs2_extent_tree { - ocfs2_journal_access_func et_root_journal_access; - void *et_object; - unsigned int et_max_leaf_clusters; -+ struct ocfs2_cached_dealloc_ctxt *et_dealloc; - }; - - /* diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index ab5105f9767e..2f2c76193f54 100644 --- a/fs/ocfs2/alloc.c @@ -348,6 +336,18 @@ index ab5105f9767e..2f2c76193f54 100644 int ocfs2_cache_block_dealloc(struct ocfs2_cached_dealloc_ctxt *ctxt, int type, int slot, u64 suballoc, u64 blkno, unsigned int bit) +diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h +index 27b75cf32cfa..250bcacdf9e9 100644 +--- a/fs/ocfs2/alloc.h ++++ b/fs/ocfs2/alloc.h +@@ -61,6 +61,7 @@ struct ocfs2_extent_tree { + ocfs2_journal_access_func et_root_journal_access; + void *et_object; + unsigned int et_max_leaf_clusters; ++ struct ocfs2_cached_dealloc_ctxt *et_dealloc; + }; + + /* diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 256986aca8df..e8e205bf2e41 100644 --- a/fs/ocfs2/aops.c diff --git a/patches/kernel/0008-net-fix-deadlock-while-clearing-neighbor-proxy-table.patch b/patches/kernel/0008-net-fix-deadlock-while-clearing-neighbor-proxy-table.patch index a7e0ff2..2c4fee6 100644 --- a/patches/kernel/0008-net-fix-deadlock-while-clearing-neighbor-proxy-table.patch +++ b/patches/kernel/0008-net-fix-deadlock-while-clearing-neighbor-proxy-table.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 9 Apr 2018 14:56:29 +0200 -Subject: [PATCH linux] net: fix deadlock while clearing neighbor proxy table +Subject: [PATCH] net: fix deadlock while clearing neighbor proxy table When coming from ndisc_netdev_event() in net/ipv6/ndisc.c, neigh_ifdown() is called with &nd_tbl, locking this while @@ -25,7 +25,7 @@ Signed-off-by: Wolfgang Bumiller 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c -index 7b7a14abba28..e22d2aefbd78 100644 +index 7f831711b6e0..ff6c491d92ac 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -55,7 +55,8 @@ static void neigh_timer_handler(struct timer_list *t); @@ -91,5 +91,5 @@ index 7b7a14abba28..e22d2aefbd78 100644 } -- -2.11.0 +2.14.2