Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49077326 authored by NeilBrown's avatar NeilBrown
Browse files

md: move io accounting out of personalities into md_make_request 



While I generally prefer letting personalities do as much as possible,
given that we have a central md_make_request anyway we may as well use
it to simplify code.
Also this centralises knowledge of ->gendisk which will help later.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 2b7f2228

drivers/md/linear.c

+0 −8
Original line number Diff line number Diff line
@@ -288,23 +288,15 @@ static int linear_stop (mddev_t *mddev) 


static int linear_make_request (struct request_queue *q, struct bio *bio)

{

	const int rw = bio_data_dir(bio);

	mddev_t *mddev = q->queuedata;

	dev_info_t *tmp_dev;

	sector_t start_sector;

	int cpu;



	if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER))) {

		md_barrier_request(mddev, bio);

		return 0;

	}



	cpu = part_stat_lock();

	part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);

	part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw],

		      bio_sectors(bio));

	part_stat_unlock();



	rcu_read_lock();

	tmp_dev = which_dev(mddev, bio->bi_sector);

	start_sector = tmp_dev->end_sector - tmp_dev->rdev->sectors;

drivers/md/md.c

+11 −0
Original line number Diff line number Diff line
@@ -214,8 +214,11 @@ static DEFINE_SPINLOCK(all_mddevs_lock); 
 */

static int md_make_request(struct request_queue *q, struct bio *bio)

{

	const int rw = bio_data_dir(bio);

	mddev_t *mddev = q->queuedata;

	int rv;

	int cpu;



	if (mddev == NULL || mddev->pers == NULL) {

		bio_io_error(bio);

		return 0;
@@ -236,7 +239,15 @@ static int md_make_request(struct request_queue *q, struct bio *bio) 
	}

	atomic_inc(&mddev->active_io);

	rcu_read_unlock();



	rv = mddev->pers->make_request(q, bio);



	cpu = part_stat_lock();

	part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);

	part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw],

		      bio_sectors(bio));

	part_stat_unlock();



	if (atomic_dec_and_test(&mddev->active_io) && mddev->suspended)

		wake_up(&mddev->sb_wait);

drivers/md/multipath.c

+0 −8
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio) 
	multipath_conf_t *conf = mddev->private;

	struct multipath_bh * mp_bh;

	struct multipath_info *multipath;

	const int rw = bio_data_dir(bio);

	int cpu;



	if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER))) {

		md_barrier_request(mddev, bio);
@@ -154,12 +152,6 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio) 
	mp_bh->master_bio = bio;

	mp_bh->mddev = mddev;



	cpu = part_stat_lock();

	part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);

	part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw],

		      bio_sectors(bio));

	part_stat_unlock();



	mp_bh->path = multipath_map(conf);

	if (mp_bh->path < 0) {

		bio_endio(bio, -EIO);

drivers/md/raid0.c

+0 −8
Original line number Diff line number Diff line
@@ -472,20 +472,12 @@ static int raid0_make_request(struct request_queue *q, struct bio *bio) 
	sector_t sector_offset;

	struct strip_zone *zone;

	mdk_rdev_t *tmp_dev;

	const int rw = bio_data_dir(bio);

	int cpu;



	if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER))) {

		md_barrier_request(mddev, bio);

		return 0;

	}



	cpu = part_stat_lock();

	part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);

	part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw],

		      bio_sectors(bio));

	part_stat_unlock();



	chunk_sects = mddev->chunk_sectors;

	if (unlikely(!is_io_in_chunk_boundary(mddev, chunk_sects, bio))) {

		sector_t sector = bio->bi_sector;

drivers/md/raid1.c

+0 −7
Original line number Diff line number Diff line
@@ -787,7 +787,6 @@ static int make_request(struct request_queue *q, struct bio * bio) 
	struct page **behind_pages = NULL;

	const int rw = bio_data_dir(bio);

	const bool do_sync = bio_rw_flagged(bio, BIO_RW_SYNCIO);

	int cpu;

	bool do_barriers;

	mdk_rdev_t *blocked_rdev;
@@ -833,12 +832,6 @@ static int make_request(struct request_queue *q, struct bio * bio) 


	bitmap = mddev->bitmap;



	cpu = part_stat_lock();

	part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);

	part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw],

		      bio_sectors(bio));

	part_stat_unlock();



	/*

	 * make_request() can abort the operation when READA is being

	 * used and no empty request is available.