From ea9964664fde6c725302af4d515750a04f984c0e Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Wed, 29 Aug 2012 17:11:07 -0500
Subject: [PATCH] --- yaml --- r: 331673 b: refs/heads/master c:
 12f029448c3d73e0f30bc5aee5964442aa95c0f4 h: refs/heads/master i:   331671:
 e27f32d10257d97e197c4f8251c78292698bad9e v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/rbd.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 701feba42613..1bc401ba9a68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86ff77bb68c6cda783b195a260f68fd5d32f7aaf
+refs/heads/master: 12f029448c3d73e0f30bc5aee5964442aa95c0f4
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index fa99b94b9dbb..3274943b2342 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/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);