From: Josh Durgin Date: Wed, 12 Jun 2013 21:43:10 +0000 (-0700) Subject: rbd: fetch object order before using it X-Git-Tag: next-20130619~100^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=764684ef34af685cd8d46830a73826443f9129df;p=karo-tx-linux.git rbd: fetch object order before using it rbd_dev_v2_header_onetime() fetches striping information, and checks whether the image can be read by compariing the stripe unit to the object size. It determines the object size by shifting the object order, which is 0 at this point since it has not been read yet. Move the call to get the image size and object order before rbd_dev_v2_header_onetime() so it is set before use. Signed-off-by: Josh Durgin Reviewed-by: Sage Weil --- diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 6efb7e579c47..f24e241bb44f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4290,6 +4290,10 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev) bool first_time = rbd_dev->header.object_prefix == NULL; int ret; + ret = rbd_dev_v2_image_size(rbd_dev); + if (ret) + return ret; + if (first_time) { ret = rbd_dev_v2_header_onetime(rbd_dev); if (ret) @@ -4323,10 +4327,6 @@ static int rbd_dev_v2_header_info(struct rbd_device *rbd_dev) "is EXPERIMENTAL!"); } - ret = rbd_dev_v2_image_size(rbd_dev); - if (ret) - return ret; - if (rbd_dev->spec->snap_id == CEPH_NOSNAP) if (rbd_dev->mapping.size != rbd_dev->header.image_size) rbd_dev->mapping.size = rbd_dev->header.image_size;