summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/rbd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index cc7c60e8f277..7c66173e2d83 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4245,6 +4245,10 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev)
4245 4245
4246 down_write(&rbd_dev->header_rwsem); 4246 down_write(&rbd_dev->header_rwsem);
4247 4247
4248 ret = rbd_dev_v2_image_size(rbd_dev);
4249 if (ret)
4250 goto out;
4251
4248 if (first_time) { 4252 if (first_time) {
4249 ret = rbd_dev_v2_header_onetime(rbd_dev); 4253 ret = rbd_dev_v2_header_onetime(rbd_dev);
4250 if (ret) 4254 if (ret)
@@ -4278,10 +4282,6 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev)
4278 "is EXPERIMENTAL!"); 4282 "is EXPERIMENTAL!");
4279 } 4283 }
4280 4284
4281 ret = rbd_dev_v2_image_size(rbd_dev);
4282 if (ret)
4283 goto out;
4284
4285 if (rbd_dev->spec->snap_id == CEPH_NOSNAP) 4285 if (rbd_dev->spec->snap_id == CEPH_NOSNAP)
4286 if (rbd_dev->mapping.size != rbd_dev->header.image_size) 4286 if (rbd_dev->mapping.size != rbd_dev->header.image_size)
4287 rbd_dev->mapping.size = rbd_dev->header.image_size; 4287 rbd_dev->mapping.size = rbd_dev->header.image_size;