Commit b5156e76 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: defer setting disk capacity 



Don't set the disk capacity until right before we announce the
device as available for use.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 129b79d4

drivers/block/rbd.c

+1 −2
Original line number Diff line number Diff line
@@ -3147,8 +3147,6 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) 


	rbd_dev->disk = disk;



	set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);



	return 0;

out_disk:

	put_disk(disk);
@@ -4784,6 +4782,7 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev) 


	/* Everything's ready.  Announce the disk to the world. */



	set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);

	set_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags);

	add_disk(rbd_dev->disk);