From 3710ebfbdc9a64bffa51f6b92cb3ca58eb9ceb74 Mon Sep 17 00:00:00 2001 From: Jerome Marchand Date: Fri, 8 Feb 2008 12:06:21 +0100 Subject: [PATCH] --- yaml --- r: 84904 b: refs/heads/master c: c3c930d93365c495fbc1df28649da7cd4b97f4af h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 4 ---- trunk/fs/partitions/check.c | 2 -- trunk/include/linux/genhd.h | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index f0addc79d015..a43c87e3abd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28f39d553ee242000e62f6c589ee3dc6de3f9aaa +refs/heads/master: c3c930d93365c495fbc1df28649da7cd4b97f4af diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 2358fc5de5a4..e9754dc98ec4 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -1219,10 +1219,6 @@ static inline void blk_partition_remap(struct bio *bio) if (bio_sectors(bio) && bdev != bdev->bd_contains) { struct hd_struct *p = bdev->bd_part; - const int rw = bio_data_dir(bio); - - p->sectors[rw] += bio_sectors(bio); - p->ios[rw]++; bio->bi_sector += p->start_sect; bio->bi_bdev = bdev->bd_contains; diff --git a/trunk/fs/partitions/check.c b/trunk/fs/partitions/check.c index 950bdb4b8f53..03f808c5b79d 100644 --- a/trunk/fs/partitions/check.c +++ b/trunk/fs/partitions/check.c @@ -330,8 +330,6 @@ void delete_partition(struct gendisk *disk, int part) disk->part[part-1] = NULL; p->start_sect = 0; p->nr_sects = 0; - p->ios[0] = p->ios[1] = 0; - p->sectors[0] = p->sectors[1] = 0; part_stat_set_all(p, 0); kobject_put(p->holder_dir); device_del(&p->dev); diff --git a/trunk/include/linux/genhd.h b/trunk/include/linux/genhd.h index 4cf25a5f4159..09a3b18918c7 100644 --- a/trunk/include/linux/genhd.h +++ b/trunk/include/linux/genhd.h @@ -105,7 +105,6 @@ struct hd_struct { sector_t nr_sects; struct device dev; struct kobject *holder_dir; - unsigned ios[2], sectors[2]; /* READs and WRITEs */ int policy, partno; #ifdef CONFIG_FAIL_MAKE_REQUEST int make_it_fail;