Merge tag 'for-linus-20181012' of git://git.kernel.dk/linux-block

cafa017d · Greg Kroah-Hartman <[email protected]> · 2018-10-13 09:07:23 +02:00

Jens writes:
  "block fix for 4.19-rc

   Just a single fix that should go in, fixing a regression introduced
   in the blk-wbt code."

* tag 'for-linus-20181012' of git://git.kernel.dk/linux-block:
  blk-wbt: wake up all when we scale up, not down

Commit: cafa017dc5df8abc38308fedae3f1bd7ff67802d
Parents: ed66c252 · 5e65a203

Merge commit. Changes below are compared with the first parent: ed66c252.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
block/blk-wbt.c	modified	+1	−1	View file

block/blk-wbt.c

View file

diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 8e20a06..8ac93fc 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -310,6 +310,7 @@ static void scale_up(struct rq_wb *rwb)
 	rq_depth_scale_up(&rwb->rq_depth);
 	calc_wb_limits(rwb);
 	rwb->unknown_cnt = 0;
+	rwb_wake_all(rwb);
 	rwb_trace_step(rwb, "scale up");
 }
 
@@ -318,7 +319,6 @@ static void scale_down(struct rq_wb *rwb, bool hard_throttle)
 	rq_depth_scale_down(&rwb->rq_depth, hard_throttle);
 	calc_wb_limits(rwb);
 	rwb->unknown_cnt = 0;
-	rwb_wake_all(rwb);
 	rwb_trace_step(rwb, "scale down");
 }
 