[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/7] block/rbd: store object_size in BDRVRBDState
From: |
Peter Lieven |
Subject: |
[PATCH 2/7] block/rbd: store object_size in BDRVRBDState |
Date: |
Sun, 27 Dec 2020 17:42:31 +0100 |
Signed-off-by: Peter Lieven <pl@kamp.de>
---
block/rbd.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 650e27c351..bc8cf8af9b 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -90,6 +90,7 @@ typedef struct BDRVRBDState {
char *snap;
char *namespace;
uint64_t image_size;
+ uint64_t object_size;
} BDRVRBDState;
static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
@@ -663,6 +664,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict
*options, int flags,
const QDictEntry *e;
Error *local_err = NULL;
char *keypairs, *secretid;
+ rbd_image_info_t info;
int r;
keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
@@ -727,13 +729,15 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict
*options, int flags,
goto failed_open;
}
- r = rbd_get_size(s->image, &s->image_size);
+ r = rbd_stat(s->image, &info, sizeof(info));
if (r < 0) {
- error_setg_errno(errp, -r, "error getting image size from %s",
+ error_setg_errno(errp, -r, "error getting image info from %s",
s->image_name);
rbd_close(s->image);
goto failed_open;
}
+ s->image_size = info.size;
+ s->object_size = info.obj_size;
/* If we are using an rbd snapshot, we must be r/o, otherwise
* leave as-is */
@@ -945,15 +949,7 @@ static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverState *bs,
static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi)
{
BDRVRBDState *s = bs->opaque;
- rbd_image_info_t info;
- int r;
-
- r = rbd_stat(s->image, &info, sizeof(info));
- if (r < 0) {
- return r;
- }
-
- bdi->cluster_size = info.obj_size;
+ bdi->cluster_size = s->object_size;
return 0;
}
--
2.17.1
- [PATCH 0/7] block/rbd: migrate to coroutines and add write zeroes support, Peter Lieven, 2020/12/27
- [PATCH 1/7] block/rbd: bump librbd requirement to luminous release, Peter Lieven, 2020/12/27
- [PATCH 2/7] block/rbd: store object_size in BDRVRBDState,
Peter Lieven <=
- [PATCH 3/7] block/rbd: use stored image_size in qemu_rbd_getlength, Peter Lieven, 2020/12/27
- [PATCH 5/7] block/rbd: migrate from aio to coroutines, Peter Lieven, 2020/12/27
- [PATCH 4/7] block/rbd: add bdrv_{attach,detach}_aio_context, Peter Lieven, 2020/12/27
- [PATCH 7/7] block/rbd: change request alignment to 1 byte, Peter Lieven, 2020/12/27
- [PATCH 6/7] block/rbd: add write zeroes support, Peter Lieven, 2020/12/27