[dm-devel] [dm-5.19 PATCH 04/21] dm: simplify dm_io access in dm_split_and_process_bio
Mike Snitzer
snitzer at kernel.org
Mon Apr 18 02:27:16 UTC 2022
Use local variable instead of redudant access using ci.io
Signed-off-by: Mike Snitzer <snitzer at kernel.org>
---
drivers/md/dm.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 88ff5c3311aa..48f93c55c992 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1566,10 +1566,12 @@ static void dm_split_and_process_bio(struct mapped_device *md,
struct dm_table *map, struct bio *bio)
{
struct clone_info ci;
+ struct dm_io *io;
struct bio *orig_bio = NULL;
blk_status_t error = BLK_STS_OK;
init_clone_info(&ci, md, map, bio);
+ io = ci.io;
if (bio->bi_opf & REQ_PREFLUSH) {
__send_empty_flush(&ci);
@@ -1578,14 +1580,14 @@ static void dm_split_and_process_bio(struct mapped_device *md,
}
error = __split_and_process_bio(&ci);
- ci.io->map_task = NULL;
+ io->map_task = NULL;
if (error || !ci.sector_count)
goto out;
/*
* Remainder must be passed to submit_bio_noacct() so it gets handled
* *after* bios already submitted have been completely processed.
- * We take a clone of the original to store in ci.io->orig_bio to be
+ * We take a clone of the original to store in io->orig_bio to be
* used by dm_end_io_acct() and for dm_io_complete() to use for
* completion handling.
*/
@@ -1597,9 +1599,9 @@ static void dm_split_and_process_bio(struct mapped_device *md,
out:
if (!orig_bio)
orig_bio = bio;
- smp_store_release(&ci.io->orig_bio, orig_bio);
- if (dm_io_flagged(ci.io, DM_IO_START_ACCT))
- dm_start_io_acct(ci.io, NULL);
+ smp_store_release(&io->orig_bio, orig_bio);
+ if (dm_io_flagged(io, DM_IO_START_ACCT))
+ dm_start_io_acct(io, NULL);
/*
* Drop the extra reference count for non-POLLED bio, and hold one
@@ -1611,7 +1613,7 @@ static void dm_split_and_process_bio(struct mapped_device *md,
if (error || !ci.submit_as_polled)
dm_io_dec_pending(ci.io, error);
else
- dm_queue_poll_io(bio, ci.io);
+ dm_queue_poll_io(bio, io);
}
static void dm_submit_bio(struct bio *bio)
--
2.15.0
More information about the dm-devel
mailing list