refresh block-blk-mq-use-swait.patch

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 20 insertions, 15 deletions

diff --git a/patches/block-blk-mq-use-swait.patch b/patches/block-blk-mq-use-swait.patch
index 6c36fa46406f29..a86d664d9aac13 100644
--- a/patches/block-blk-mq-use-swait.patch
+++ b/patches/block-blk-mq-use-swait.patch
@@ -1,6 +1,7 @@
+From 459343e8b75f18c14c02705e56f5c5aa5792c612 Mon Sep 17 00:00:00 2001
 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 Date: Fri, 13 Feb 2015 11:01:26 +0100
-Subject: block: blk-mq: Use swait
+Subject: [PATCH] block: blk-mq: Use swait
 
 | BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:914
 | in_atomic(): 1, irqs_disabled(): 0, pid: 255, name: kworker/u257:6
@@ -37,24 +38,21 @@ Subject: block: blk-mq: Use swait
 |  [<ffffffff8108ee81>] process_one_work+0x201/0x5e0
 
 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- block/blk-core.c       |    6 +++---
- block/blk-mq.c         |    8 ++++----
- include/linux/blkdev.h |    2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
 
+diff --git a/block/blk-core.c b/block/blk-core.c
+index 259e9bd12e64..9281f3f34c68 100644
 --- a/block/blk-core.c
 +++ b/block/blk-core.c
-@@ -678,7 +678,7 @@ int blk_queue_enter(struct request_queue
- 		if (nowait)
- 			return -EBUSY;
+@@ -690,7 +690,7 @@ int blk_queue_enter(struct request_queue *q, bool nowait)
+ 		 */
+ 		smp_rmb();
  
 -		ret = wait_event_interruptible(q->mq_freeze_wq,
 +		ret = swait_event_interruptible(q->mq_freeze_wq,
  				!atomic_read(&q->mq_freeze_depth) ||
  				blk_queue_dying(q));
  		if (blk_queue_dying(q))
-@@ -698,7 +698,7 @@ static void blk_queue_usage_counter_rele
+@@ -710,7 +710,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
  	struct request_queue *q =
  		container_of(ref, struct request_queue, q_usage_counter);
  
@@ -63,7 +61,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  static void blk_rq_timed_out_timer(unsigned long data)
-@@ -766,7 +766,7 @@ struct request_queue *blk_alloc_queue_no
+@@ -782,7 +782,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
  	q->bypass_depth = 1;
  	__set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
  
@@ -72,9 +70,11 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  
  	/*
  	 * Init percpu_ref in atomic mode so that it's faster to shutdown.
+diff --git a/block/blk-mq.c b/block/blk-mq.c
+index 3beaa45dfcfd..e989d26ecea4 100644
 --- a/block/blk-mq.c
 +++ b/block/blk-mq.c
-@@ -79,14 +79,14 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_st
+@@ -99,14 +99,14 @@ EXPORT_SYMBOL_GPL(blk_freeze_queue_start);
  
  void blk_mq_freeze_queue_wait(struct request_queue *q)
  {
@@ -91,7 +91,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  					percpu_ref_is_zero(&q->q_usage_counter),
  					timeout);
  }
-@@ -127,7 +127,7 @@ void blk_mq_unfreeze_queue(struct reques
+@@ -147,7 +147,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q)
  	WARN_ON_ONCE(freeze_depth < 0);
  	if (!freeze_depth) {
  		percpu_ref_reinit(&q->q_usage_counter);
@@ -100,7 +100,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	}
  }
  EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
-@@ -173,7 +173,7 @@ void blk_mq_wake_waiters(struct request_
+@@ -193,7 +193,7 @@ void blk_mq_wake_waiters(struct request_queue *q)
  	 * dying, we need to ensure that processes currently waiting on
  	 * the queue are notified as well.
  	 */
@@ -109,9 +109,11 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
+diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
+index 835dbbb62223..69b1a4fdff00 100644
 --- a/include/linux/blkdev.h
 +++ b/include/linux/blkdev.h
-@@ -566,7 +566,7 @@ struct request_queue {
+@@ -572,7 +572,7 @@ struct request_queue {
  	struct throtl_data *td;
  #endif
  	struct rcu_head		rcu_head;
@@ -120,3 +122,6 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	struct percpu_ref	q_usage_counter;
  	struct list_head	all_q_node;
  
+-- 
+2.1.4
+