block: change request end_io handler to pass back a return value

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

diff --git a/block/blk-mq.c b/block/blk-mq.c
index b32f70f..a21631d 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1001,7 +1001,8 @@ inline void __blk_mq_end_request(struct request *rq, blk_status_t error)
 
        if (rq->end_io) {
                rq_qos_done(rq->q, rq);
-               rq->end_io(rq, error);
+               if (rq->end_io(rq, error) == RQ_END_IO_FREE)
+                       blk_mq_free_request(rq);
        } else {
                blk_mq_free_request(rq);
        }
@@ -1295,12 +1296,13 @@ struct blk_rq_wait {
        blk_status_t ret;
 };
 
-static void blk_end_sync_rq(struct request *rq, blk_status_t ret)
+static enum rq_end_io_ret blk_end_sync_rq(struct request *rq, blk_status_t ret)
 {
        struct blk_rq_wait *wait = rq->end_io_data;
 
        wait->ret = ret;
        complete(&wait->done);
+       return RQ_END_IO_NONE;
 }
 
 bool blk_rq_is_poll(struct request *rq)
@@ -1534,10 +1536,12 @@ static bool blk_mq_req_expired(struct request *rq, unsigned long *next)
 
 void blk_mq_put_rq_ref(struct request *rq)
 {
-       if (is_flush_rq(rq))
-               rq->end_io(rq, 0);
-       else if (req_ref_put_and_test(rq))
+       if (is_flush_rq(rq)) {
+               if (rq->end_io(rq, 0) == RQ_END_IO_FREE)
+                       blk_mq_free_request(rq);
+       } else if (req_ref_put_and_test(rq)) {
                __blk_mq_free_request(rq);
+       }
 }
 
 static bool blk_mq_check_expired(struct request *rq, void *priv)