diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/md/raid5.c | |
| parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
| parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
| download | linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.gz linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.bz2 linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 4683ca24c046..6497295ebfb9 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1462,6 +1462,7 @@ static int make_request (request_queue_t *q, struct bio * bi) sector_t new_sector; sector_t logical_sector, last_sector; struct stripe_head *sh; + const int rw = bio_data_dir(bi); if (unlikely(bio_barrier(bi))) { bio_endio(bi, bi->bi_size, -EOPNOTSUPP); @@ -1470,13 +1471,8 @@ static int make_request (request_queue_t *q, struct bio * bi) md_write_start(mddev, bi); - if (bio_data_dir(bi)==WRITE) { - disk_stat_inc(mddev->gendisk, writes); - disk_stat_add(mddev->gendisk, write_sectors, bio_sectors(bi)); - } else { - disk_stat_inc(mddev->gendisk, reads); - disk_stat_add(mddev->gendisk, read_sectors, bio_sectors(bi)); - } + disk_stat_inc(mddev->gendisk, ios[rw]); + disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bi)); logical_sector = bi->bi_sector & ~((sector_t)STRIPE_SECTORS-1); last_sector = bi->bi_sector + (bi->bi_size>>9); |