[PATCH 32/45] block: move the start_sect field to struct block_device

[Christoph Hellwig <hch@xxxxxx>]

Move the start_sect field to struct block_device in preparation
of killing struct hd_struct.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
 block/blk-core.c          |  5 +++--
 block/blk-lib.c           |  2 +-
 block/genhd.c             |  4 ++--
 block/partitions/core.c   | 17 +++++++++--------
 include/linux/blk_types.h |  1 +
 include/linux/blkdev.h    |  4 ++--
 include/linux/genhd.h     |  3 +--
 kernel/trace/blktrace.c   | 11 +++--------
 8 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index d2c9cb24e087f3..9a3793d5ce38d4 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -757,9 +757,10 @@ static inline int blk_partition_remap(struct bio *bio)
        if (bio_sectors(bio)) {
                if (bio_check_eod(bio, bdev_nr_sectors(p->bdev)))
                        goto out;
-               bio->bi_iter.bi_sector += p->start_sect;
+               bio->bi_iter.bi_sector += p->bdev->bd_start_sect;
                trace_block_bio_remap(bio->bi_disk->queue, bio, part_devt(p),
-                                     bio->bi_iter.bi_sector - p->start_sect);
+                                     bio->bi_iter.bi_sector -
+                                     p->bdev->bd_start_sect);
        }
        bio->bi_partno = 0;
        ret = 0;
diff --git a/block/blk-lib.c b/block/blk-lib.c
index e90614fd8d6a42..752f9c7220622a 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -65,7 +65,7 @@ int __blkdev_issue_discard(struct block_device *bdev, 
sector_t sector,
 
        /* In case the discard request is in a partition */
        if (bdev_is_partition(bdev))
-               part_offset = bdev->bd_part->start_sect;
+               part_offset = bdev->bd_start_sect;
 
        while (nr_sects) {
                sector_t granularity_aligned_lba, req_sects;
diff --git a/block/genhd.c b/block/genhd.c
index 0c0458367da7e4..8212a2dd10ec4e 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -295,8 +295,8 @@ EXPORT_SYMBOL_GPL(disk_part_iter_exit);
 
 static inline int sector_in_part(struct hd_struct *part, sector_t sector)
 {
-       return part->start_sect <= sector &&
-               sector < part->start_sect + bdev_nr_sectors(part->bdev);
+       return part->bdev->bd_start_sect <= sector &&
+               sector < part->bdev->bd_start_sect + 
bdev_nr_sectors(part->bdev);
 }
 
 /**
diff --git a/block/partitions/core.c b/block/partitions/core.c
index c3a4870bfb123d..aa4b836374b037 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -192,7 +192,7 @@ static ssize_t part_start_show(struct device *dev,
 {
        struct hd_struct *p = dev_to_part(dev);
 
-       return sprintf(buf, "%llu\n",(unsigned long long)p->start_sect);
+       return sprintf(buf, "%llu\n",(unsigned long 
long)p->bdev->bd_start_sect);
 }
 
 static ssize_t part_ro_show(struct device *dev,
@@ -209,7 +209,7 @@ static ssize_t part_alignment_offset_show(struct device 
*dev,
 
        return sprintf(buf, "%u\n",
                queue_limit_alignment_offset(&part_to_disk(p)->queue->limits,
-                               p->start_sect));
+                               p->bdev->bd_start_sect));
 }
 
 static ssize_t part_discard_alignment_show(struct device *dev,
@@ -219,7 +219,7 @@ static ssize_t part_discard_alignment_show(struct device 
*dev,
 
        return sprintf(buf, "%u\n",
                queue_limit_discard_alignment(&part_to_disk(p)->queue->limits,
-                               p->start_sect));
+                               p->bdev->bd_start_sect));
 }
 
 static DEVICE_ATTR(partition, 0444, part_partition_show, NULL);
@@ -301,7 +301,7 @@ static void hd_struct_free_work(struct work_struct *work)
         */
        put_device(disk_to_dev(disk));
 
-       part->start_sect = 0;
+       part->bdev->bd_start_sect = 0;
        bdev_set_nr_sectors(part->bdev, 0);
        part_stat_set_all(part, 0);
        put_device(part_to_dev(part));
@@ -416,7 +416,7 @@ static struct hd_struct *add_partition(struct gendisk 
*disk, int partno,
 
        pdev = part_to_dev(p);
 
-       p->start_sect = start;
+       bdev->bd_start_sect = start;
        bdev_set_nr_sectors(bdev, len);
        p->partno = partno;
        p->policy = get_disk_ro(disk);
@@ -508,8 +508,9 @@ static bool partition_overlaps(struct gendisk *disk, 
sector_t start,
        disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
        while ((part = disk_part_iter_next(&piter))) {
                if (part->partno == skip_partno ||
-                   start >= part->start_sect + bdev_nr_sectors(part->bdev) ||
-                   start + length <= part->start_sect)
+                   start >= part->bdev->bd_start_sect +
+                       bdev_nr_sectors(part->bdev) ||
+                   start + length <= part->bdev->bd_start_sect)
                        continue;
                overlap = true;
                break;
@@ -592,7 +593,7 @@ int bdev_resize_partition(struct block_device *bdev, int 
partno,
        mutex_lock_nested(&bdev->bd_mutex, 1);
 
        ret = -EINVAL;
-       if (start != part->start_sect)
+       if (start != part->bdev->bd_start_sect)
                goto out_unlock;
 
        ret = -EBUSY;
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 520011b95276fb..a690008f60cd92 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -20,6 +20,7 @@ typedef void (bio_end_io_t) (struct bio *);
 struct bio_crypt_ctx;
 
 struct block_device {
+       sector_t                bd_start_sect;
        struct disk_stats __percpu *bd_stats;
        unsigned long           bd_stamp;
        dev_t                   bd_dev;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index db1b11d6d07568..8fc0b266610f7f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1488,7 +1488,7 @@ static inline int bdev_alignment_offset(struct 
block_device *bdev)
                return -1;
        if (bdev_is_partition(bdev))
                return queue_limit_alignment_offset(&q->limits,
-                               bdev->bd_part->start_sect);
+                               bdev->bd_start_sect);
        return q->limits.alignment_offset;
 }
 
@@ -1529,7 +1529,7 @@ static inline int bdev_discard_alignment(struct 
block_device *bdev)
 
        if (bdev_is_partition(bdev))
                return queue_limit_discard_alignment(&q->limits,
-                               bdev->bd_part->start_sect);
+                               bdev->bd_start_sect);
        return q->limits.discard_alignment;
 }
 
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index dcc40c8217d095..a9d64da474233f 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -51,7 +51,6 @@ struct partition_meta_info {
 };
 
 struct hd_struct {
-       sector_t start_sect;
        struct percpu_ref ref;
 
        struct block_device *bdev;
@@ -299,7 +298,7 @@ extern void rand_initialize_disk(struct gendisk *disk);
 
 static inline sector_t get_start_sect(struct block_device *bdev)
 {
-       return bdev->bd_part->start_sect;
+       return bdev->bd_start_sect;
 }
 
 static inline sector_t bdev_nr_sectors(struct block_device *bdev)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 7076d588a50d69..8a723a91ec5a06 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -458,14 +458,9 @@ static struct rchan_callbacks blk_relay_callbacks = {
 static void blk_trace_setup_lba(struct blk_trace *bt,
                                struct block_device *bdev)
 {
-       struct hd_struct *part = NULL;
-
-       if (bdev)
-               part = bdev->bd_part;
-
-       if (part) {
-               bt->start_lba = part->start_sect;
-               bt->end_lba = part->start_sect + bdev_nr_sectors(bdev);
+       if (bdev) {
+               bt->start_lba = bdev->bd_start_sect;
+               bt->end_lba = bdev->bd_start_sect + bdev_nr_sectors(bdev);
        } else {
                bt->start_lba = 0;
                bt->end_lba = -1ULL;
-- 
2.29.2