Linux Device Mapper development
 help / color / mirror / Atom feed
From: Mike Snitzer <snitzer@redhat.com>
To: dm-devel@redhat.com
Cc: linux-block@vger.kernel.org
Subject: [dm-devel] [PATCH 04/14] dm: reduce code duplication in __map_bio
Date: Thu, 10 Feb 2022 17:38:22 -0500	[thread overview]
Message-ID: <20220210223832.99412-5-snitzer@redhat.com> (raw)
In-Reply-To: <20220210223832.99412-1-snitzer@redhat.com>

Error path code (for handling DM_MAPIO_REQUEUE and DM_MAPIO_KILL) is
effectively identical.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---
 drivers/md/dm.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 56734aae718d..cc014e56252e 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1161,20 +1161,14 @@ static void __map_bio(struct bio *clone)
 		submit_bio_noacct(clone);
 		break;
 	case DM_MAPIO_KILL:
-		if (unlikely(swap_bios_limit(ti, clone))) {
-			struct mapped_device *md = io->md;
-			up(&md->swap_bios_semaphore);
-		}
-		free_tio(clone);
-		dm_io_dec_pending(io, BLK_STS_IOERR);
-		break;
 	case DM_MAPIO_REQUEUE:
-		if (unlikely(swap_bios_limit(ti, clone))) {
-			struct mapped_device *md = io->md;
-			up(&md->swap_bios_semaphore);
-		}
+		if (unlikely(swap_bios_limit(ti, clone)))
+			up(&io->md->swap_bios_semaphore);
 		free_tio(clone);
-		dm_io_dec_pending(io, BLK_STS_DM_REQUEUE);
+		if (r == DM_MAPIO_KILL)
+			dm_io_dec_pending(io, BLK_STS_IOERR);
+		else
+			dm_io_dec_pending(io, BLK_STS_DM_REQUEUE);
 		break;
 	default:
 		DMWARN("unimplemented target map return value: %d", r);
-- 
2.15.0

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel


  parent reply	other threads:[~2022-02-10 22:40 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-10 22:38 [dm-devel] [PATCH 00/14] dm: improve bio-based IO accounting Mike Snitzer
2022-02-10 22:38 ` [dm-devel] [PATCH 01/14] dm: rename split functions Mike Snitzer
2022-02-11  6:48   ` Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 02/14] dm: fold __clone_and_map_data_bio into __split_and_process_bio Mike Snitzer
2022-02-11  6:48   ` Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 03/14] dm: refactor dm_split_and_process_bio a bit Mike Snitzer
2022-02-11  6:52   ` Christoph Hellwig
2022-02-10 22:38 ` Mike Snitzer [this message]
2022-02-11  6:52   ` [dm-devel] [PATCH 04/14] dm: reduce code duplication in __map_bio Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 05/14] dm: remove impossible BUG_ON in __send_empty_flush Mike Snitzer
2022-02-11  6:53   ` Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 06/14] dm: remove unused mapped_device argument from free_tio Mike Snitzer
2022-02-11  6:53   ` Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 07/14] dm: remove code only needed before submit_bio recursion Mike Snitzer
2022-02-11  6:56   ` Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 08/14] dm: record old_sector in dm_target_io before calling map function Mike Snitzer
2022-02-11  6:56   ` Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 09/14] dm: prep for following changes Mike Snitzer
2022-02-11  6:57   ` Christoph Hellwig
2022-02-10 22:38 ` [dm-devel] [PATCH 10/14] dm: add dm_submit_bio_remap interface Mike Snitzer
2022-02-10 22:38 ` [dm-devel] [PATCH 11/14] dm crypt: use dm_submit_bio_remap Mike Snitzer
2022-02-10 22:38 ` [dm-devel] [PATCH 12/14] dm delay: dm_submit_bio_remap Mike Snitzer
2022-02-10 22:38 ` [dm-devel] [PATCH 13/14] dm: improve correctness and efficiency of bio-based IO accounting Mike Snitzer
2022-02-10 22:38 ` [dm-devel] [PATCH 14/14] block: add bio_start_io_acct_remapped for the benefit of DM Mike Snitzer
2022-02-11  7:07   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220210223832.99412-5-snitzer@redhat.com \
    --to=snitzer@redhat.com \
    --cc=dm-devel@redhat.com \
    --cc=linux-block@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox