On 09/07/2012 02:15 PM, Alex Elder wrote:
There are three fields that are not yet updated for format 2 rbd
image headers: the version of the header object; the encryption
type; and the compression type. There is no interface defined for
fetching the latter two, so just initialize them explicitly to 0 for
now.
Encryption and compression type are never actually used, even for
format 1 images. They were just placeholders.
Reviewed-by: Josh Durgin <josh.durgin@xxxxxxxxxxx>
Change rbd_dev_v2_snap_context() so the caller can be supplied the
version for the header object.
Signed-off-by: Alex Elder <elder@xxxxxxxxxxx>
---
drivers/block/rbd.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c6922a1..ad27be2 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2235,7 +2235,7 @@ static int rbd_dev_v2_features(struct rbd_device
*rbd_dev)
&rbd_dev->header.features);
}
-static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev)
+static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev, u64 *ver)
{
size_t size;
int ret;
@@ -2263,7 +2263,7 @@ static int rbd_dev_v2_snap_context(struct
rbd_device *rbd_dev)
"rbd", "get_snapcontext",
NULL, 0,
reply_buf, size,
- CEPH_OSD_FLAG_READ, NULL);
+ CEPH_OSD_FLAG_READ, ver);
dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
if (ret < 0)
goto out;
@@ -2899,6 +2899,7 @@ static int rbd_dev_v2_probe(struct rbd_device
*rbd_dev)
{
size_t size;
int ret;
+ u64 ver = 0;
/*
* Image id was filled in by the caller. Record the header
@@ -2929,11 +2930,18 @@ static int rbd_dev_v2_probe(struct rbd_device
*rbd_dev)
if (ret < 0)
goto out_err;
- /* Get the snapshot context */
+ /* crypto and compression type aren't (yet) supported for v2 images */
+
+ rbd_dev->header.crypt_type = 0;
+ rbd_dev->header.comp_type = 0;
- ret = rbd_dev_v2_snap_context(rbd_dev);
+ /* Get the snapshot context, plus the header version */
+
+ ret = rbd_dev_v2_snap_context(rbd_dev, &ver);
if (ret)
goto out_err;
+ rbd_dev->header.obj_version = ver;
+
rbd_dev->image_format = 2;
dout("discovered version 2 image, header name is %s\n",
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
