---

yaml --- r: 84904 b: refs/heads/master c: c3c930d h: refs/heads/master v: v3
git-mirror · Feb 8, 2008 · 3710ebf · 3710ebf
1 parent d609035
commit 3710ebf
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;