From: "Steven Rostedt (VMware)" <rost...@goodmis.org>
Revert swork version of: block: blk-mq: move blk_queue_usage_counter_release()
into process context
In order to switch to upstream, we need to revert the swork code.
Signed-off-by: Steven Rostedt (VMware) <rost...@goodmis.org>
---
block/blk-core.c | 14 +-------------
include/linux/blkdev.h | 2 --
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index f7e16b4466f0..3f08d6fd0787 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -969,21 +969,12 @@ void blk_queue_exit(struct request_queue *q)
percpu_ref_put(&q->q_usage_counter);
}
-static void blk_queue_usage_counter_release_swork(struct swork_event *sev)
-{
- struct request_queue *q =
- container_of(sev, struct request_queue, mq_pcpu_wake);
-
- wake_up_all(&q->mq_freeze_wq);
-}
-
static void blk_queue_usage_counter_release(struct percpu_ref *ref)
{
struct request_queue *q =
container_of(ref, struct request_queue, q_usage_counter);
- if (wq_has_sleeper(&q->mq_freeze_wq))
- swork_queue(&q->mq_pcpu_wake);
+ wake_up_all(&q->mq_freeze_wq);
}
static void blk_rq_timed_out_timer(struct timer_list *t)
@@ -1080,7 +1071,6 @@ struct request_queue *blk_alloc_queue_node(gfp_t
gfp_mask, int node_id,
queue_flag_set_unlocked(QUEUE_FLAG_BYPASS, q);
init_waitqueue_head(&q->mq_freeze_wq);
- INIT_SWORK(&q->mq_pcpu_wake, blk_queue_usage_counter_release_swork);
/*
* Init percpu_ref in atomic mode so that it's faster to shutdown.
@@ -3970,8 +3960,6 @@ int __init blk_dev_init(void)
if (!kblockd_workqueue)
panic("Failed to create kblockd\n");
- BUG_ON(swork_get());
-
request_cachep = kmem_cache_create("blkdev_requests",
sizeof(struct request), 0, SLAB_PANIC, NULL);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 7b7c0bc6a514..f1960add94df 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -27,7 +27,6 @@
#include <linux/percpu-refcount.h>
#include <linux/scatterlist.h>
#include <linux/blkzoned.h>
-#include <linux/swork.h>
struct module;
struct scsi_ioctl_command;
@@ -656,7 +655,6 @@ struct request_queue {
#endif
struct rcu_head rcu_head;
wait_queue_head_t mq_freeze_wq;
- struct swork_event mq_pcpu_wake;
struct percpu_ref q_usage_counter;
struct list_head all_q_node;
--
2.20.1
