Commit 7465d7ac authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm: eliminate need for start_io_acct() forward declaration 



Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 9679b5a7

drivers/md/dm.c

+38 −40
Original line number Diff line number Diff line
@@ -591,7 +591,44 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, 
	return r;

}



static void start_io_acct(struct dm_io *io);

u64 dm_start_time_ns_from_clone(struct bio *bio)

{

	struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone);

	struct dm_io *io = tio->io;



	return jiffies_to_nsecs(io->start_time);

}

EXPORT_SYMBOL_GPL(dm_start_time_ns_from_clone);



static void start_io_acct(struct dm_io *io)

{

	struct mapped_device *md = io->md;

	struct bio *bio = io->orig_bio;



	io->start_time = bio_start_io_acct(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);

}



static void end_io_acct(struct dm_io *io)

{

	struct mapped_device *md = io->md;

	struct bio *bio = io->orig_bio;

	unsigned long duration = jiffies - io->start_time;



	bio_end_io_acct(bio, io->start_time);



	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),

				    true, duration, &io->stats_aux);



	/* nudge anyone waiting on suspend queue */

	if (unlikely(wq_has_sleeper(&md->wait)))

		wake_up(&md->wait);

}



static struct dm_io *alloc_io(struct mapped_device *md, struct bio *bio)

{
@@ -657,45 +694,6 @@ static void free_tio(struct dm_target_io *tio) 
	bio_put(&tio->clone);

}



u64 dm_start_time_ns_from_clone(struct bio *bio)

{

	struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone);

	struct dm_io *io = tio->io;



	return jiffies_to_nsecs(io->start_time);

}

EXPORT_SYMBOL_GPL(dm_start_time_ns_from_clone);



static void start_io_acct(struct dm_io *io)

{

	struct mapped_device *md = io->md;

	struct bio *bio = io->orig_bio;



	io->start_time = bio_start_io_acct(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);

}



static void end_io_acct(struct dm_io *io)

{

	struct mapped_device *md = io->md;

	struct bio *bio = io->orig_bio;

	unsigned long duration = jiffies - io->start_time;



	bio_end_io_acct(bio, io->start_time);



	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),

				    true, duration, &io->stats_aux);



	/* nudge anyone waiting on suspend queue */

	if (unlikely(wq_has_sleeper(&md->wait)))

		wake_up(&md->wait);

}



/*

 * Add the bio to the list of deferred io.

 */