aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-core.c4
-rw-r--r--fs/partitions/check.c2
-rw-r--r--include/linux/genhd.h1
3 files changed, 0 insertions, 7 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 2358fc5de5a4..e9754dc98ec4 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1219,10 +1219,6 @@ static inline void blk_partition_remap(struct bio *bio)
1219 1219
1220 if (bio_sectors(bio) && bdev != bdev->bd_contains) { 1220 if (bio_sectors(bio) && bdev != bdev->bd_contains) {
1221 struct hd_struct *p = bdev->bd_part; 1221 struct hd_struct *p = bdev->bd_part;
1222 const int rw = bio_data_dir(bio);
1223
1224 p->sectors[rw] += bio_sectors(bio);
1225 p->ios[rw]++;
1226 1222
1227 bio->bi_sector += p->start_sect; 1223 bio->bi_sector += p->start_sect;
1228 bio->bi_bdev = bdev->bd_contains; 1224 bio->bi_bdev = bdev->bd_contains;
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 950bdb4b8f53..03f808c5b79d 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -330,8 +330,6 @@ void delete_partition(struct gendisk *disk, int part)
330 disk->part[part-1] = NULL; 330 disk->part[part-1] = NULL;
331 p->start_sect = 0; 331 p->start_sect = 0;
332 p->nr_sects = 0; 332 p->nr_sects = 0;
333 p->ios[0] = p->ios[1] = 0;
334 p->sectors[0] = p->sectors[1] = 0;
335 part_stat_set_all(p, 0); 333 part_stat_set_all(p, 0);
336 kobject_put(p->holder_dir); 334 kobject_put(p->holder_dir);
337 device_del(&p->dev); 335 device_del(&p->dev);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 4cf25a5f4159..09a3b18918c7 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -105,7 +105,6 @@ struct hd_struct {
105 sector_t nr_sects; 105 sector_t nr_sects;
106 struct device dev; 106 struct device dev;
107 struct kobject *holder_dir; 107 struct kobject *holder_dir;
108 unsigned ios[2], sectors[2]; /* READs and WRITEs */
109 int policy, partno; 108 int policy, partno;
110#ifdef CONFIG_FAIL_MAKE_REQUEST 109#ifdef CONFIG_FAIL_MAKE_REQUEST
111 int make_it_fail; 110 int make_it_fail;