[PATCH v20 06/13] blk-zoned: Split blk_zone_wplug_bio_work()

[Bart Van Assche <bvanassche@xxxxxxx>]

Prepare for submitting multiple bios from inside a single
blk_zone_wplug_bio_work() call. No functionality has been changed.

Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
 block/blk-zoned.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 2a85e3b7b081..d2aa7671ddd6 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1257,10 +1257,8 @@ void blk_zone_write_plug_finish_request(struct request *req)
 	disk_put_zone_wplug(zwplug);
 }
 
-static void blk_zone_wplug_bio_work(struct work_struct *work)
+static void blk_zone_submit_one_bio(struct blk_zone_wplug *zwplug)
 {
-	struct blk_zone_wplug *zwplug =
-		container_of(work, struct blk_zone_wplug, bio_work);
 	struct block_device *bdev;
 	unsigned long flags;
 	struct bio *bio;
@@ -1276,7 +1274,7 @@ static void blk_zone_wplug_bio_work(struct work_struct *work)
 	if (!bio) {
 		zwplug->flags &= ~BLK_ZONE_WPLUG_PLUGGED;
 		spin_unlock_irqrestore(&zwplug->lock, flags);
-		goto put_zwplug;
+		return;
 	}
 
 	if (!blk_zone_wplug_prepare_bio(zwplug, bio)) {
@@ -1300,8 +1298,15 @@ static void blk_zone_wplug_bio_work(struct work_struct *work)
 	} else {
 		blk_mq_submit_bio(bio);
 	}
+}
+
+static void blk_zone_wplug_bio_work(struct work_struct *work)
+{
+	struct blk_zone_wplug *zwplug =
+		container_of(work, struct blk_zone_wplug, bio_work);
+
+	blk_zone_submit_one_bio(zwplug);
 
-put_zwplug:
 	/* Drop the reference we took in disk_zone_wplug_schedule_bio_work(). */
 	disk_put_zone_wplug(zwplug);
 }