| Message ID | 20211122130625.1136848-7-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/14] block: move GENHD_FL_NATIVE_CAPACITY to disk->state | expand |
On Mon, 22 Nov 2021 at 14:06, Christoph Hellwig <hch@lst.de> wrote: > > The GENHD_FL_NO_PART_SCAN controls more than just partitions canning, > so rename it to GENHD_FL_NO_PART. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > block/genhd.c | 2 +- > drivers/block/loop.c | 8 ++++---- > drivers/block/n64cart.c | 2 +- > drivers/mmc/core/block.c | 4 ++-- > include/linux/genhd.h | 13 ++++++------- > 5 files changed, 14 insertions(+), 15 deletions(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 0cf3d30429e14..b37925ed1d7e9 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -500,7 +500,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, > * and don't bother scanning for partitions either. > */ > disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; > - disk->flags |= GENHD_FL_NO_PART_SCAN; > + disk->flags |= GENHD_FL_NO_PART; > } else { > ret = bdi_register(disk->bdi, "%u:%u", > disk->major, disk->first_minor); > diff --git a/drivers/block/loop.c b/drivers/block/loop.c > index a154cab6cd989..7219d98c6fb8a 100644 > --- a/drivers/block/loop.c > +++ b/drivers/block/loop.c > @@ -1061,7 +1061,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, > lo->lo_flags |= LO_FLAGS_PARTSCAN; > partscan = lo->lo_flags & LO_FLAGS_PARTSCAN; > if (partscan) > - lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN; > + lo->lo_disk->flags &= ~GENHD_FL_NO_PART; > > loop_global_unlock(lo, is_loop); > if (partscan) > @@ -1191,7 +1191,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) > mutex_lock(&lo->lo_mutex); > lo->lo_flags = 0; > if (!part_shift) > - lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN; > + lo->lo_disk->flags |= GENHD_FL_NO_PART; > lo->lo_state = Lo_unbound; > mutex_unlock(&lo->lo_mutex); > > @@ -1301,7 +1301,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) > > if (!err && (lo->lo_flags & LO_FLAGS_PARTSCAN) && > !(prev_lo_flags & LO_FLAGS_PARTSCAN)) { > - lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN; > + lo->lo_disk->flags &= ~GENHD_FL_NO_PART; > partscan = true; > } > out_unlock: > @@ -2032,7 +2032,7 @@ static int loop_add(int i) > * userspace tools. Parameters like this in general should be avoided. > */ > if (!part_shift) > - disk->flags |= GENHD_FL_NO_PART_SCAN; > + disk->flags |= GENHD_FL_NO_PART; > disk->flags |= GENHD_FL_EXT_DEVT; > atomic_set(&lo->lo_refcnt, 0); > mutex_init(&lo->lo_mutex); > diff --git a/drivers/block/n64cart.c b/drivers/block/n64cart.c > index 78282f01f5813..4db9a8c244af5 100644 > --- a/drivers/block/n64cart.c > +++ b/drivers/block/n64cart.c > @@ -136,7 +136,7 @@ static int __init n64cart_probe(struct platform_device *pdev) > goto out; > > disk->first_minor = 0; > - disk->flags = GENHD_FL_NO_PART_SCAN; > + disk->flags = GENHD_FL_NO_PART; > disk->fops = &n64cart_fops; > disk->private_data = &pdev->dev; > strcpy(disk->disk_name, "n64cart"); > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index 90e1bcd03b46c..a71b3512c877a 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -2397,8 +2397,8 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, > set_disk_ro(md->disk, md->read_only || default_ro); > md->disk->flags = GENHD_FL_EXT_DEVT; > if (area_type & (MMC_BLK_DATA_AREA_RPMB | MMC_BLK_DATA_AREA_BOOT)) > - md->disk->flags |= GENHD_FL_NO_PART_SCAN > - | GENHD_FL_SUPPRESS_PARTITION_INFO; > + md->disk->flags |= GENHD_FL_NO_PART | > + GENHD_FL_SUPPRESS_PARTITION_INFO; > > /* > * As discussed on lkml, GENHD_FL_REMOVABLE should: > diff --git a/include/linux/genhd.h b/include/linux/genhd.h > index 74518c576fbb9..0b9be3df94898 100644 > --- a/include/linux/genhd.h > +++ b/include/linux/genhd.h > @@ -56,15 +56,15 @@ struct partition_meta_info { > * (``BLOCK_EXT_MAJOR``). > * This affects the maximum number of partitions. > * > - * ``GENHD_FL_NO_PART_SCAN`` (0x0200): partition scanning is disabled. > - * Used for loop devices in their default settings and some MMC > - * devices. > + * ``GENHD_FL_NO_PART`` (0x0200): partition support is disabled. > + * The kernel will not scan for partitions from add_disk, and users > + * can't add partitions manually. > * > * ``GENHD_FL_HIDDEN`` (0x0400): the block device is hidden; it > * doesn't produce events, doesn't appear in sysfs, and doesn't have > * an associated ``bdev``. > * Implies ``GENHD_FL_SUPPRESS_PARTITION_INFO`` and > - * ``GENHD_FL_NO_PART_SCAN``. > + * ``GENHD_FL_NO_PART``. > * Used for multipath devices. > */ > #define GENHD_FL_REMOVABLE 0x0001 > @@ -72,7 +72,7 @@ struct partition_meta_info { > /* 4 is unused (used to be GENHD_FL_MEDIA_CHANGE_NOTIFY) */ > #define GENHD_FL_SUPPRESS_PARTITION_INFO 0x0020 > #define GENHD_FL_EXT_DEVT 0x0040 > -#define GENHD_FL_NO_PART_SCAN 0x0200 > +#define GENHD_FL_NO_PART 0x0200 > #define GENHD_FL_HIDDEN 0x0400 > > enum { > @@ -180,8 +180,7 @@ static inline int disk_max_parts(struct gendisk *disk) > > static inline bool disk_part_scan_enabled(struct gendisk *disk) > { > - return disk_max_parts(disk) > 1 && > - !(disk->flags & GENHD_FL_NO_PART_SCAN); > + return disk_max_parts(disk) > 1 && !(disk->flags & GENHD_FL_NO_PART); > } > > static inline dev_t disk_devt(struct gendisk *disk) > -- > 2.30.2 >
diff --git a/block/genhd.c b/block/genhd.c index 0cf3d30429e14..b37925ed1d7e9 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -500,7 +500,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, * and don't bother scanning for partitions either. */ disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; - disk->flags |= GENHD_FL_NO_PART_SCAN; + disk->flags |= GENHD_FL_NO_PART; } else { ret = bdi_register(disk->bdi, "%u:%u", disk->major, disk->first_minor); diff --git a/drivers/block/loop.c b/drivers/block/loop.c index a154cab6cd989..7219d98c6fb8a 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1061,7 +1061,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, lo->lo_flags |= LO_FLAGS_PARTSCAN; partscan = lo->lo_flags & LO_FLAGS_PARTSCAN; if (partscan) - lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN; + lo->lo_disk->flags &= ~GENHD_FL_NO_PART; loop_global_unlock(lo, is_loop); if (partscan) @@ -1191,7 +1191,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) mutex_lock(&lo->lo_mutex); lo->lo_flags = 0; if (!part_shift) - lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN; + lo->lo_disk->flags |= GENHD_FL_NO_PART; lo->lo_state = Lo_unbound; mutex_unlock(&lo->lo_mutex); @@ -1301,7 +1301,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) if (!err && (lo->lo_flags & LO_FLAGS_PARTSCAN) && !(prev_lo_flags & LO_FLAGS_PARTSCAN)) { - lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN; + lo->lo_disk->flags &= ~GENHD_FL_NO_PART; partscan = true; } out_unlock: @@ -2032,7 +2032,7 @@ static int loop_add(int i) * userspace tools. Parameters like this in general should be avoided. */ if (!part_shift) - disk->flags |= GENHD_FL_NO_PART_SCAN; + disk->flags |= GENHD_FL_NO_PART; disk->flags |= GENHD_FL_EXT_DEVT; atomic_set(&lo->lo_refcnt, 0); mutex_init(&lo->lo_mutex); diff --git a/drivers/block/n64cart.c b/drivers/block/n64cart.c index 78282f01f5813..4db9a8c244af5 100644 --- a/drivers/block/n64cart.c +++ b/drivers/block/n64cart.c @@ -136,7 +136,7 @@ static int __init n64cart_probe(struct platform_device *pdev) goto out; disk->first_minor = 0; - disk->flags = GENHD_FL_NO_PART_SCAN; + disk->flags = GENHD_FL_NO_PART; disk->fops = &n64cart_fops; disk->private_data = &pdev->dev; strcpy(disk->disk_name, "n64cart"); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 90e1bcd03b46c..a71b3512c877a 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2397,8 +2397,8 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, set_disk_ro(md->disk, md->read_only || default_ro); md->disk->flags = GENHD_FL_EXT_DEVT; if (area_type & (MMC_BLK_DATA_AREA_RPMB | MMC_BLK_DATA_AREA_BOOT)) - md->disk->flags |= GENHD_FL_NO_PART_SCAN - | GENHD_FL_SUPPRESS_PARTITION_INFO; + md->disk->flags |= GENHD_FL_NO_PART | + GENHD_FL_SUPPRESS_PARTITION_INFO; /* * As discussed on lkml, GENHD_FL_REMOVABLE should: diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 74518c576fbb9..0b9be3df94898 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -56,15 +56,15 @@ struct partition_meta_info { * (``BLOCK_EXT_MAJOR``). * This affects the maximum number of partitions. * - * ``GENHD_FL_NO_PART_SCAN`` (0x0200): partition scanning is disabled. - * Used for loop devices in their default settings and some MMC - * devices. + * ``GENHD_FL_NO_PART`` (0x0200): partition support is disabled. + * The kernel will not scan for partitions from add_disk, and users + * can't add partitions manually. * * ``GENHD_FL_HIDDEN`` (0x0400): the block device is hidden; it * doesn't produce events, doesn't appear in sysfs, and doesn't have * an associated ``bdev``. * Implies ``GENHD_FL_SUPPRESS_PARTITION_INFO`` and - * ``GENHD_FL_NO_PART_SCAN``. + * ``GENHD_FL_NO_PART``. * Used for multipath devices. */ #define GENHD_FL_REMOVABLE 0x0001 @@ -72,7 +72,7 @@ struct partition_meta_info { /* 4 is unused (used to be GENHD_FL_MEDIA_CHANGE_NOTIFY) */ #define GENHD_FL_SUPPRESS_PARTITION_INFO 0x0020 #define GENHD_FL_EXT_DEVT 0x0040 -#define GENHD_FL_NO_PART_SCAN 0x0200 +#define GENHD_FL_NO_PART 0x0200 #define GENHD_FL_HIDDEN 0x0400 enum { @@ -180,8 +180,7 @@ static inline int disk_max_parts(struct gendisk *disk) static inline bool disk_part_scan_enabled(struct gendisk *disk) { - return disk_max_parts(disk) > 1 && - !(disk->flags & GENHD_FL_NO_PART_SCAN); + return disk_max_parts(disk) > 1 && !(disk->flags & GENHD_FL_NO_PART); } static inline dev_t disk_devt(struct gendisk *disk)
The GENHD_FL_NO_PART_SCAN controls more than just partitions canning, so rename it to GENHD_FL_NO_PART. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/genhd.c | 2 +- drivers/block/loop.c | 8 ++++---- drivers/block/n64cart.c | 2 +- drivers/mmc/core/block.c | 4 ++-- include/linux/genhd.h | 13 ++++++------- 5 files changed, 14 insertions(+), 15 deletions(-)