Merge tag 'timers-urgent-2022-04-17' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 9c14dea..937bb6b 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -123,7 +123,6 @@ static const char *const blk_op_name[] = {
        REQ_OP_NAME(ZONE_CLOSE),
        REQ_OP_NAME(ZONE_FINISH),
        REQ_OP_NAME(ZONE_APPEND),
-       REQ_OP_NAME(WRITE_SAME),
        REQ_OP_NAME(WRITE_ZEROES),
        REQ_OP_NAME(DRV_IN),
        REQ_OP_NAME(DRV_OUT),
@@ -688,7 +687,7 @@ static void __submit_bio(struct bio *bio)
  *
  * bio_list_on_stack[0] contains bios submitted by the current ->submit_bio.
  * bio_list_on_stack[1] contains bios that were submitted before the current
- *     ->submit_bio_bio, but that haven't been processed yet.
+ *     ->submit_bio, but that haven't been processed yet.
  */
 static void __submit_bio_noacct(struct bio *bio)
 {
@@ -828,10 +827,6 @@ void submit_bio_noacct(struct bio *bio)
                if (!blk_queue_secure_erase(q))
                        goto not_supported;
                break;
-       case REQ_OP_WRITE_SAME:
-               if (!q->limits.max_write_same_sectors)
-                       goto not_supported;
-               break;
        case REQ_OP_ZONE_APPEND:
                status = blk_check_zone_append(q, bio);
                if (status != BLK_STS_OK)
@@ -903,13 +898,7 @@ void submit_bio(struct bio *bio)
         * go through the normal accounting stuff before submission.
         */
        if (bio_has_data(bio)) {
-               unsigned int count;
-
-               if (unlikely(bio_op(bio) == REQ_OP_WRITE_SAME))
-                       count = queue_logical_block_size(
-                                       bdev_get_queue(bio->bi_bdev)) >> 9;
-               else
-                       count = bio_sectors(bio);
+               unsigned int count = bio_sectors(bio);
 
                if (op_is_write(bio_op(bio))) {
                        count_vm_events(PGPGOUT, count);
@@ -955,7 +944,7 @@ int bio_poll(struct bio *bio, struct io_comp_batch *iob, unsigned int flags)
 {
        struct request_queue *q = bdev_get_queue(bio->bi_bdev);
        blk_qc_t cookie = READ_ONCE(bio->bi_cookie);
-       int ret;
+       int ret = 0;
 
        if (cookie == BLK_QC_T_NONE ||
            !test_bit(QUEUE_FLAG_POLL, &q->queue_flags))
@@ -965,10 +954,14 @@ int bio_poll(struct bio *bio, struct io_comp_batch *iob, unsigned int flags)
 
        if (blk_queue_enter(q, BLK_MQ_REQ_NOWAIT))
                return 0;
-       if (WARN_ON_ONCE(!queue_is_mq(q)))
-               ret = 0;        /* not yet implemented, should not happen */
-       else
+       if (queue_is_mq(q)) {
                ret = blk_mq_poll(q, cookie, iob, flags);
+       } else {
+               struct gendisk *disk = q->disk;
+
+               if (disk && disk->fops->poll_bio)
+                       ret = disk->fops->poll_bio(bio, iob, flags);
+       }
        blk_queue_exit(q);
        return ret;
 }