Commit 3b5149ac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove GENHD_FL_SUPPRESS_PARTITION_INFO 



This flag is not set directly anywhere and only inherited from
GENHD_FL_HIDDEN.  Just check for GENHD_FL_HIDDEN instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211122130625.1136848-11-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 79b0f79a

block/genhd.c

+3 −8
Original line number Diff line number Diff line
@@ -496,10 +496,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, 


	if (disk->flags & GENHD_FL_HIDDEN) {

		/*

		 * Don't let hidden disks show up in /proc/partitions,

		 * and don't bother scanning for partitions either.

		 * Don't bother scanning for partitions.

		 */

		disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;

		disk->flags |= GENHD_FL_NO_PART;

	} else {

		ret = bdi_register(disk->bdi, "%u:%u",
@@ -725,8 +723,7 @@ void __init printk_all_partitions(void) 
		 * Don't show empty devices or things that have been

		 * suppressed

		 */

		if (get_capacity(disk) == 0 ||

		    (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO))

		if (get_capacity(disk) == 0 || (disk->flags & GENHD_FL_HIDDEN))

			continue;



		/*
@@ -819,9 +816,7 @@ static int show_partition(struct seq_file *seqf, void *v) 
	struct block_device *part;

	unsigned long idx;



	if (!get_capacity(sgp))

		return 0;

	if (sgp->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)

	if (!get_capacity(sgp) || (sgp->flags & GENHD_FL_HIDDEN))

		return 0;



	rcu_read_lock();

include/linux/genhd.h

+1 −8
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ struct partition_meta_info { 
 * Must not be set for devices which are removed entirely when the

 * media is removed.

 *

 * ``GENHD_FL_SUPPRESS_PARTITION_INFO`` (0x0020): don't include

 * partition information in ``/proc/partitions`` or in the output of

 * printk_all_partitions().

 * Used for the null block device and some MMC devices.

 *

 * ``GENHD_FL_EXT_DEVT`` (0x0040): the driver supports extended

 * dynamic ``dev_t``, i.e. it wants extended device numbers

 * (``BLOCK_EXT_MAJOR``).
@@ -63,14 +58,12 @@ struct partition_meta_info { 
 * ``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``.

 * Implies ``GENHD_FL_NO_PART``.

 * Used for multipath devices.

 */

#define GENHD_FL_REMOVABLE			0x0001

/* 2 is unused (used to be GENHD_FL_DRIVERFS) */

/* 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			0x0200

#define GENHD_FL_HIDDEN				0x0400