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

gregkh · gregkh · commit cafa017dc5df · 2018-10-13T09:07:23.000+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
diff --git 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");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,7 @@ static void scale_up(struct rq_wb *rwb)`
`310`	`310`	`rq_depth_scale_up(&rwb->rq_depth);`
`311`	`311`	`calc_wb_limits(rwb);`
`312`	`312`	`rwb->unknown_cnt = 0;`
	`313`	`+ rwb_wake_all(rwb);`
`313`	`314`	`rwb_trace_step(rwb, "scale up");`
`314`	`315`	`}`
`315`	`316`
`@@ -318,7 +319,6 @@ static void scale_down(struct rq_wb *rwb, bool hard_throttle)`
`318`	`319`	`rq_depth_scale_down(&rwb->rq_depth, hard_throttle);`
`319`	`320`	`calc_wb_limits(rwb);`
`320`	`321`	`rwb->unknown_cnt = 0;`
`321`		`- rwb_wake_all(rwb);`
`322`	`322`	`rwb_trace_step(rwb, "scale down");`
`323`	`323`	`}`
`324`	`324`