| Message ID | 20221203140747.1942969-1-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: remove devnode callback from struct block_device_operations | expand |
On Sat, 03 Dec 2022 15:07:47 +0100, Greg Kroah-Hartman wrote: > With the removal of the pktcdvd driver, there are no in-kernel users of > the devnode callback in struct block_device_operations, so it can be > safely removed. If it is needed for new block drivers in the future, it > can be brought back. > > Applied, thanks! [1/1] block: remove devnode callback from struct block_device_operations commit: 85d6ce58e493ac8b7122e2fbe3f41b94d6ebdc11 Best regards,
diff --git a/block/genhd.c b/block/genhd.c index 0f9769db2de8..1a2f3fa5678f 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1193,21 +1193,10 @@ struct class block_class = { .dev_uevent = block_uevent, }; -static char *block_devnode(struct device *dev, umode_t *mode, - kuid_t *uid, kgid_t *gid) -{ - struct gendisk *disk = dev_to_disk(dev); - - if (disk->fops->devnode) - return disk->fops->devnode(disk, mode); - return NULL; -} - const struct device_type disk_type = { .name = "disk", .groups = disk_attr_groups, .release = disk_release, - .devnode = block_devnode, }; #ifdef CONFIG_PROC_FS diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 891f8cbcd043..b767c6b86856 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1413,7 +1413,6 @@ struct block_device_operations { void (*swap_slot_free_notify) (struct block_device *, unsigned long); int (*report_zones)(struct gendisk *, sector_t sector, unsigned int nr_zones, report_zones_cb cb, void *data); - char *(*devnode)(struct gendisk *disk, umode_t *mode); /* returns the length of the identifier or a negative errno: */ int (*get_unique_id)(struct gendisk *disk, u8 id[16], enum blk_unique_id id_type);
With the removal of the pktcdvd driver, there are no in-kernel users of the devnode callback in struct block_device_operations, so it can be safely removed. If it is needed for new block drivers in the future, it can be brought back. Cc: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- block/genhd.c | 11 ----------- include/linux/blkdev.h | 1 - 2 files changed, 12 deletions(-)