From 09aa22322bfd80fd40b66d0bf584960f6969f244 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 16 Oct 2019 09:05:04 -0700 Subject: [PATCH] drop io_uring patch from 5.3 to fix build issues --- ...-flush-workqueues-on-fileset-removal.patch | 38 ------------------- queue-5.3/series | 1 - 2 files changed, 39 deletions(-) delete mode 100644 queue-5.3/io_uring-only-flush-workqueues-on-fileset-removal.patch diff --git a/queue-5.3/io_uring-only-flush-workqueues-on-fileset-removal.patch b/queue-5.3/io_uring-only-flush-workqueues-on-fileset-removal.patch deleted file mode 100644 index eef21813824..00000000000 --- a/queue-5.3/io_uring-only-flush-workqueues-on-fileset-removal.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8a99734081775c012a4a6c442fdef0379fe52bdf Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Wed, 9 Oct 2019 14:40:13 -0600 -Subject: io_uring: only flush workqueues on fileset removal - -From: Jens Axboe - -commit 8a99734081775c012a4a6c442fdef0379fe52bdf upstream. - -We should not remove the workqueue, we just need to ensure that the -workqueues are synced. The workqueues are torn down on ctx removal. - -Cc: stable@vger.kernel.org -Fixes: 6b06314c47e1 ("io_uring: add file set registration") -Reported-by: Stefan Hajnoczi -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman - ---- - fs/io_uring.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/fs/io_uring.c -+++ b/fs/io_uring.c -@@ -2565,8 +2565,12 @@ static void io_finish_async(struct io_ri - static void io_destruct_skb(struct sk_buff *skb) - { - struct io_ring_ctx *ctx = skb->sk->sk_user_data; -+ int i; -+ -+ for (i = 0; i < ARRAY_SIZE(ctx->sqo_wq); i++) -+ if (ctx->sqo_wq[i]) -+ flush_workqueue(ctx->sqo_wq[i]); - -- io_finish_async(ctx); - unix_destruct_scm(skb); - } - diff --git a/queue-5.3/series b/queue-5.3/series index c1af39e2acb..50c98ebfc51 100644 --- a/queue-5.3/series +++ b/queue-5.3/series @@ -68,7 +68,6 @@ perf-inject-jit-fix-jit_code_move-filename.patch drm-i915-perform-ggtt-restore-much-earlier-during-resume.patch blk-wbt-fix-performance-regression-in-wbt-scale_up-scale_down.patch selinux-fix-context-string-corruption-in-convert_context.patch -io_uring-only-flush-workqueues-on-fileset-removal.patch cifs-gracefully-handle-queryinfo-errors-during-open.patch cifs-force-revalidate-inode-when-dentry-is-stale.patch cifs-force-reval-dentry-if-lookup_reval-flag-is-set.patch -- 2.47.2