diff options
| author | Alex Elder <elder@inktank.com> | 2012-08-29 17:11:07 -0500 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-10-01 14:30:52 -0500 |
| commit | 12f029448c3d73e0f30bc5aee5964442aa95c0f4 (patch) | |
| tree | 7a4040f3cd518d82f9a774eb6a5e33a7d242894d | |
| parent | 86ff77bb68c6cda783b195a260f68fd5d32f7aaf (diff) | |
| download | linux-stable-12f029448c3d73e0f30bc5aee5964442aa95c0f4.tar.gz linux-stable-12f029448c3d73e0f30bc5aee5964442aa95c0f4.tar.bz2 linux-stable-12f029448c3d73e0f30bc5aee5964442aa95c0f4.zip | |
rbd: set initial capacity in rbd_init_disk()
Move the setting of the initial capacity for an rbd image mapping
into rb_init_disk().
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| -rw-r--r-- | drivers/block/rbd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index fa99b94b9dbb..3274943b2342 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1901,6 +1901,8 @@ 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); @@ -2646,7 +2648,6 @@ static ssize_t rbd_add(struct bus_type *bus, /* Everything's ready. Announce the disk to the world. */ - set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE); add_disk(rbd_dev->disk); pr_info("%s: added with size 0x%llx\n", rbd_dev->disk->disk_name, (unsigned long long) rbd_dev->mapping.size); |