diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-12-03 10:39:02 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-12-03 08:51:24 -0700 |
| commit | 979d54475e0b75a28e55528617fecf83b4a221da (patch) | |
| tree | c227276082fc142bf06eb8396984f618f9db0fc1 /drivers/block/null_blk_main.c | |
| parent | null_blk: fix zone size paramter check (diff) | |
| download | linux-dev-979d54475e0b75a28e55528617fecf83b4a221da.tar.xz linux-dev-979d54475e0b75a28e55528617fecf83b4a221da.zip | |
null_blk: cleanup null_gendisk_register
Use a saner size calculation, and do a trivial cleanup on the zone
revalidation to prepare to future changes.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | drivers/block/null_blk_main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c index 53ba9c7f2786..dd6026289fbf 100644 --- a/drivers/block/null_blk_main.c +++ b/drivers/block/null_blk_main.c @@ -1559,14 +1559,14 @@ static int init_driver_queues(struct nullb *nullb) static int null_gendisk_register(struct nullb *nullb) { + sector_t size = ((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT; struct gendisk *disk; - sector_t size; + int ret; disk = nullb->disk = alloc_disk_node(1, nullb->dev->home_node); if (!disk) return -ENOMEM; - size = (sector_t)nullb->dev->size * 1024 * 1024ULL; - set_capacity(disk, size >> 9); + set_capacity(disk, size); disk->flags |= GENHD_FL_EXT_DEVT | GENHD_FL_SUPPRESS_PARTITION_INFO; disk->major = null_major; @@ -1577,9 +1577,8 @@ static int null_gendisk_register(struct nullb *nullb) strncpy(disk->disk_name, nullb->disk_name, DISK_NAME_LEN); if (nullb->dev->zoned) { - int ret = blk_revalidate_disk_zones(disk); - - if (ret != 0) + ret = blk_revalidate_disk_zones(disk); + if (ret) return ret; } |