diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-12-03 17:07:47 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-12-03 19:19:48 +0300 |
| commit | 85d6ce58e493ac8b7122e2fbe3f41b94d6ebdc11 (patch) | |
| tree | 567ab41376168b04dd0479b2f1a05ffbd6b971d1 | |
| parent | 368c7f1f8a680734e14ccc62e3fda19bd08450bb (diff) | |
| download | linux-85d6ce58e493ac8b7122e2fbe3f41b94d6ebdc11.tar.xz | |
block: remove devnode callback from struct block_device_operations
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>
Link: https://lore.kernel.org/r/20221203140747.1942969-1-gregkh@linuxfoundation.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/genhd.c | 11 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/block/genhd.c b/block/genhd.c index 52d71a94a809..03a96d6473e1 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1196,21 +1196,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 469299ea0660..2db2ad72af0f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1395,7 +1395,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); |