[06/10] block, bfq: remove redundant bfqd->rq_in_driver > 0 check in bfq_add_request

Message ID 20221108045224.19092-7-shikemeng@huawei.com
State New
Headers
Series A few bugfix and cleancode patch for bfq |

Commit Message

Kemeng Shi Nov. 8, 2022, 4:52 a.m. UTC
  The bfqd->rq_in_driver > 0 check is along with previous
"bfqd->rq_in_driver == 0 ||" check, so no need to re-check
bfqd->rq_in_driver > 0.

Signed-off-by: Kemeng Shi <shikemeng@huawei.com>
---
 block/bfq-iosched.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Patch

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index aad88ca5e5a5..be923be48647 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -2254,8 +2254,7 @@  static void bfq_add_request(struct request *rq)
 		 */
 		if (bfqq == bfqd->in_service_queue &&
 		    (bfqd->rq_in_driver == 0 ||
-		     (bfqq->last_serv_time_ns > 0 &&
-		      bfqd->rqs_injected && bfqd->rq_in_driver > 0)) &&
+		     (bfqq->last_serv_time_ns > 0 && bfqd->rqs_injected)) &&
 		    time_is_before_eq_jiffies(bfqq->decrease_time_jif +
 					      msecs_to_jiffies(10))) {
 			bfqd->last_empty_occupied_ns = ktime_get_ns();