tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

null_blk: remove null_gendisk_register

null_gendisk_register isn't a very useful abstraction given that it
doesn't even allocate the gendisk. Merge it into the only caller
instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240220093248.3290292-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe 0a39e550 72ca2876

+16 -25
+16 -25
drivers/block/null_blk/main.c
··· 1735 1735 return 0; 1736 1736 } 1737 1737 1738 - static int null_gendisk_register(struct nullb *nullb) 1739 - { 1740 - sector_t size = ((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT; 1741 - struct gendisk *disk = nullb->disk; 1742 - 1743 - set_capacity(disk, size); 1744 - 1745 - disk->major = null_major; 1746 - disk->first_minor = nullb->index; 1747 - disk->minors = 1; 1748 - disk->fops = &null_ops; 1749 - disk->private_data = nullb; 1750 - strscpy_pad(disk->disk_name, nullb->disk_name, DISK_NAME_LEN); 1751 - 1752 - if (nullb->dev->zoned) { 1753 - int ret = null_register_zoned_dev(nullb); 1754 - 1755 - if (ret) 1756 - return ret; 1757 - } 1758 - 1759 - return add_disk(disk); 1760 - } 1761 - 1762 1738 static int null_init_tag_set(struct blk_mq_tag_set *set, int poll_queues) 1763 1739 { 1764 1740 set->ops = &null_mq_ops; ··· 1948 1972 sprintf(nullb->disk_name, "nullb%d", nullb->index); 1949 1973 } 1950 1974 1951 - rv = null_gendisk_register(nullb); 1975 + set_capacity(nullb->disk, 1976 + ((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT); 1977 + nullb->disk->major = null_major; 1978 + nullb->disk->first_minor = nullb->index; 1979 + nullb->disk->minors = 1; 1980 + nullb->disk->fops = &null_ops; 1981 + nullb->disk->private_data = nullb; 1982 + strscpy_pad(nullb->disk->disk_name, nullb->disk_name, DISK_NAME_LEN); 1983 + 1984 + if (nullb->dev->zoned) { 1985 + rv = null_register_zoned_dev(nullb); 1986 + if (rv) 1987 + goto out_ida_free; 1988 + } 1989 + 1990 + rv = add_disk(nullb->disk); 1952 1991 if (rv) 1953 1992 goto out_ida_free; 1954 1993