block: Fix handling of non-empty flush write requests to zones

[thirdparty/kernel/stable.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 434d45219e2347c67379fa3aefa5c2f0058f6207..0fae9bd0ecd417a17d220de50a3f22b3f7bb5dca 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3001,12 +3001,12 @@ new_request:
                return;
        }
 
+       if (bio_zone_write_plugging(bio))
+               blk_zone_write_plug_init_request(rq);
+
        if (op_is_flush(bio->bi_opf) && blk_insert_flush(rq))
                return;
 
-       if (bio_zone_write_plugging(bio))
-               blk_zone_write_plug_attempt_merge(rq);
-
        if (plug) {
                blk_add_rq_to_plug(plug, rq);
                return;