diff options
author | NeilBrown <neilb@suse.de> | 2010-03-25 01:20:56 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-05-18 01:27:52 -0400 |
commit | 490773268cf64f68da2470e07b52c7944da6312d (patch) | |
tree | d394aafa7203c316db6b63f128b8894e18993fca /drivers/md/raid1.c | |
parent | 2b7f22284d71975e37a82db154386348eec0e52c (diff) |
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: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r-- | drivers/md/raid1.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 23a7516abbfd..e277013ac808 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -787,7 +787,6 @@ static int make_request(struct request_queue *q, struct bio * bio) | |||
787 | struct page **behind_pages = NULL; | 787 | struct page **behind_pages = NULL; |
788 | const int rw = bio_data_dir(bio); | 788 | const int rw = bio_data_dir(bio); |
789 | const bool do_sync = bio_rw_flagged(bio, BIO_RW_SYNCIO); | 789 | const bool do_sync = bio_rw_flagged(bio, BIO_RW_SYNCIO); |
790 | int cpu; | ||
791 | bool do_barriers; | 790 | bool do_barriers; |
792 | mdk_rdev_t *blocked_rdev; | 791 | mdk_rdev_t *blocked_rdev; |
793 | 792 | ||
@@ -833,12 +832,6 @@ static int make_request(struct request_queue *q, struct bio * bio) | |||
833 | 832 | ||
834 | bitmap = mddev->bitmap; | 833 | bitmap = mddev->bitmap; |
835 | 834 | ||
836 | cpu = part_stat_lock(); | ||
837 | part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]); | ||
838 | part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw], | ||
839 | bio_sectors(bio)); | ||
840 | part_stat_unlock(); | ||
841 | |||
842 | /* | 835 | /* |
843 | * make_request() can abort the operation when READA is being | 836 | * make_request() can abort the operation when READA is being |
844 | * used and no empty request is available. | 837 | * used and no empty request is available. |