Commit f8c7511d authored by Ricardo B. Marliere's avatar Ricardo B. Marliere Committed by Jens Axboe
Browse files

block: make block_class constant 



Since commit 43a7206b ("driver core: class: make class_register() take
a const *"), the driver core allows for struct class to be in read-only
memory, so move the block_class structure to be declared at build time
placing it into read-only memory, instead of having to be dynamically
allocated at boot time.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Suggested-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRicardo B. Marliere <ricardo@marliere.net>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240305-class_cleanup-block-v1-1-130bb27b9c72@marliere.net


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

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ static int block_uevent(const struct device *dev, struct kobj_uevent_env *env) 
	return add_uevent_var(env, "DISKSEQ=%llu", disk->diskseq);

}



struct class block_class = {

const struct class block_class = {

	.name		= "block",

	.dev_uevent	= block_uevent,

};

drivers/base/base.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static inline int devtmpfs_init(void) { return 0; } 
#endif



#ifdef CONFIG_BLOCK

extern struct class block_class;

extern const struct class block_class;

static inline bool is_blockdev(struct device *dev)

{

	return dev->class == &block_class;

include/linux/blkdev.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct blk_crypto_profile; 


extern const struct device_type disk_type;

extern const struct device_type part_type;

extern struct class block_class;

extern const struct class block_class;



/*

 * Maximum number of blkcg policies allowed to be registered concurrently.