Removes the now unused old partition statistic code.
Signed-off-by: Jerome Marchand <[email protected]>
---
block/blk-core.c | 4 ----
fs/partitions/check.c | 2 --
include/linux/genhd.h | 1 -
3 files changed, 7 deletions(-)
diff -uprN -X linux-2.6/Documentation/dontdiff linux-2.6.orig/block/blk-core.c linux-2.6/block/blk-core.c
--- linux-2.6.orig/block/blk-core.c 2008-01-31 17:38:43.000000000 +0100
+++ linux-2.6/block/blk-core.c 2008-01-31 18:05:08.000000000 +0100
@@ -1214,10 +1214,6 @@ static inline void blk_partition_remap(s
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 -uprN -X linux-2.6/Documentation/dontdiff linux-2.6.orig/fs/partitions/check.c linux-2.6/fs/partitions/check.c
--- linux-2.6.orig/fs/partitions/check.c 2008-01-31 17:58:31.000000000 +0100
+++ linux-2.6/fs/partitions/check.c 2008-01-31 18:05:08.000000000 +0100
@@ -330,8 +330,6 @@ void delete_partition(struct gendisk *di
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 -uprN -X linux-2.6/Documentation/dontdiff linux-2.6.orig/include/linux/genhd.h linux-2.6/include/linux/genhd.h
--- linux-2.6.orig/include/linux/genhd.h 2008-01-31 17:38:43.000000000 +0100
+++ linux-2.6/include/linux/genhd.h 2008-01-31 18:05:08.000000000 +0100
@@ -96,7 +96,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;