null_blk: fix wrong capacity when bs is not 512 bytes
Subsystems (2)
PATCH 1/1 null_blk: fix wrong capacity when bs is not 512 bytes
set_capacity() sets device's capacity using 512 bytes sectors. null_blk calculates the number of sectors by size / bs, which set_capacity is called with. This led to null_blk exposing the wrong number of sectors when bs is not 512 bytes.
Signed-off-by Matias Bjørling <[email protected]>
--- drivers/block/null_blk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/null_blk.c +1 -2
@@ -588,8 +588,7 @@ static int null_add_dev(void)blk_queue_physical_block_size (nullb->q, bs); size = gb *1024 *1024 *1024ULL ; -sector_div (size, bs); -set_capacity (disk, size); +set_capacity (disk, size >>9 ); disk->flags |=GENHD_FL_EXT_DEVT |GENHD_FL_SUPPRESS_PARTITION_INFO ; disk->major = null_major;
Signature · 1 line
2.1.4
Quoted 15 lines · Matias Bjørling
set_capacity()sets device's capacity using 512 bytes sectors.null_blkcalculates the number of sectors by size / bs, whichset_capacityis called with. This led tonull_blkexposing the wrong number of sectors when bs is not 512 bytes.Signed-off-by Matias Bjørling <[email protected]>--- drivers/block/null_blk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/block/null_blk.c +0
-0
drivers/block/null_blk.c static int null_add_dev(void) · line 594
Quoted 9 lines
drivers/block/null_blk.c +1
-2@@ -588,8 +588,7 @@ static int null_add_dev(void)blk_queue_physical_block_size (nullb->q, bs); size = gb *1024 *1024 *1024ULL ; -sector_div (size, bs); -set_capacity (disk, size); +set_capacity (disk, size >>9 ); disk->flags |=GENHD_FL_EXT_DEVT |GENHD_FL_SUPPRESS_PARTITION_INFO ; disk->major = null_major;
Looks correct.
Reviewed-by Ross Zwisler <[email protected]>