dm: refactor start_io_acct
Mikulas Patocka
maintainerPATCH 1/4 dm: refactor start_io_acct
This patch refactors start_io_acct, so that it doesn't take a pointer to struct dm_io - so that it could be used in the following patch.
Signed-off-by Mikulas Patocka <[email protected]>
--- drivers/md/dm.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/md/dm.c +12 -18
@@ -580,7 +580,10 @@ out:return r; } -static void start_io_acct (struct dm_io *io); +static void start_io_acct (struct mapped_device *md,struct bio *bio) +{ +generic_start_io_acct (md->queue,bio_op (bio),bio_sectors (bio), &dm_disk (md)->part0); +}static struct dm_io *alloc_io (struct mapped_device *md,struct bio *bio) {
@@ -604,7 +607,14 @@ static struct dm_io *alloc_io(struct map io->md = md;spin_lock_init (&io->endio_lock); -start_io_acct (io); + io->start_time = jiffies; + +start_io_acct (md, bio); + +if (unlikely (dm_stats_used (&md->stats))) +dm_stats_account_io (&md->stats,bio_data_dir (bio), + bio->bi_iter.bi_sector,bio_sectors (bio), + false,0 , &io->stats_aux);return io; }
@@ -668,22 +678,6 @@ static bool md_in_flight(struct mapped_dreturn md_in_flight_bios (md); } -static void start_io_acct (struct dm_io *io) -{ -struct mapped_device *md = io->md; -struct bio *bio = io->orig_bio; - - io->start_time = jiffies; - -generic_start_io_acct (md->queue,bio_op (bio),bio_sectors (bio), - &dm_disk (md)->part0); - -if (unlikely (dm_stats_used (&md->stats))) -dm_stats_account_io (&md->stats,bio_data_dir (bio), - bio->bi_iter.bi_sector,bio_sectors (bio), - false,0 , &io->stats_aux); -} -static void end_io_acct (struct dm_io *io) {struct mapped_device *md = io->md;