From 901d1cfea30ef0b55e17a7f0f03c089f582fcf08 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Tue, 3 Jul 2012 16:01:19 -0500 Subject: [PATCH] --- yaml --- r: 331689 b: refs/heads/master c: 6e14b1a6c3b8d7e48ece68733d2dac0464611ee4 h: refs/heads/master i: 331687: 9fa3c4dd195cff8d6654be84aad6fd49e3a32477 v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c643a86fd384..c0322999e787 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8b1e2db52de61f575981d0c23da785a7c5b4a77 +refs/heads/master: 6e14b1a6c3b8d7e48ece68733d2dac0464611ee4 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index b51f1c997c1d..2f1bef8c1d88 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -2241,7 +2241,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; @@ -2269,7 +2269,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; @@ -2906,6 +2906,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 @@ -2936,11 +2937,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",