update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/block/null_blk_main.c
similarity index 98%rename from kernel/drivers/block/null_blk_main.crename to kernel/drivers/block/null_blk/main.c
..
..
@@ -1309,8 +1309,7 @@
1309
1309
 	case NULL_IRQ_SOFTIRQ:
1310
1310
 		switch (cmd->nq->dev->queue_mode) {
1311
1311
 		case NULL_Q_MQ:
1312
-			if (likely(!blk_should_fake_timeout(cmd->rq->q)))
1313
-				blk_mq_complete_request(cmd->rq);
1312
+			blk_mq_complete_request(cmd->rq);
1314
1313
 			break;
1315
1314
 		case NULL_Q_BIO:
1316
1315
 			/*
..
..
@@ -1486,7 +1485,8 @@
1486
1485
 	cmd->rq = bd->rq;
1487
1486
 	cmd->error = BLK_STS_OK;
1488
1487
 	cmd->nq = nq;
1489
-	cmd->fake_timeout = should_timeout_request(bd->rq);
1488
+	cmd->fake_timeout = should_timeout_request(bd->rq) ||
1489
+		blk_should_fake_timeout(bd->rq->q);
1490
1490
 
1491
1491
 	blk_mq_start_request(bd->rq);
1492
1492
 
..
..
@@ -1738,6 +1738,11 @@
1738
1738
 
1739
1739
 static int null_validate_conf(struct nullb_device *dev)
1740
1740
 {
1741
+	if (dev->queue_mode == NULL_Q_RQ) {
1742
+		pr_err("legacy IO path is no longer available\n");
1743
+		return -EINVAL;
1744
+	}
1745
+
1741
1746
 	dev->blocksize = round_down(dev->blocksize, 512);
1742
1747
 	dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);
1743
1748