From: Mike Snitzer <snitzer@redhat.com>
Date: Mon, 10 Dec 2018 16:55:56 +0000 (-0500)
Subject: dm rq: cleanup leftover code from recently removed q->mq_ops branching
X-Git-Tag: Ubuntu-5.13.0-19.19~9488^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=34743bfddef2c50af20234ae873324ca49320a55;p=mirror_ubuntu-jammy-kernel.git

dm rq: cleanup leftover code from recently removed q->mq_ops branching

When commit 6a23e05c2fe3c6 ("dm: remove legacy request-based IO path")
removed some q->mq_ops branching from map_request() it left in place a
goto that was only needed if that branching (and conditional 'r'
assignment) existed.  Now that the branching is gone map_request()'s
goto can be removed too.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---

diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index 202e9be5aea7..4eb5f8c56535 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -372,7 +372,6 @@ static int map_request(struct dm_rq_target_io *tio)
 	blk_status_t ret;
 
 	r = ti->type->clone_and_map_rq(ti, rq, &tio->info, &clone);
-check_again:
 	switch (r) {
 	case DM_MAPIO_SUBMITTED:
 		/* The target has taken the I/O to submit by itself later */
@@ -392,8 +391,7 @@ check_again:
 			blk_rq_unprep_clone(clone);
 			tio->ti->type->release_clone_rq(clone);
 			tio->clone = NULL;
-			r = DM_MAPIO_REQUEUE;
-			goto check_again;
+			return DM_MAPIO_REQUEUE;
 		}
 		break;
 	case DM_MAPIO_REQUEUE: