mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
block/rbd: store object_size in BDRVRBDState
Signed-off-by: Peter Lieven <pl@kamp.de> Reviewed-by: Ilya Dryomov <idryomov@gmail.com> Message-Id: <20210702172356.11574-3-idryomov@gmail.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
48672ac058
commit
832a93dcb8
18
block/rbd.c
18
block/rbd.c
|
@ -102,6 +102,7 @@ typedef struct BDRVRBDState {
|
||||||
char *snap;
|
char *snap;
|
||||||
char *namespace;
|
char *namespace;
|
||||||
uint64_t image_size;
|
uint64_t image_size;
|
||||||
|
uint64_t object_size;
|
||||||
} BDRVRBDState;
|
} BDRVRBDState;
|
||||||
|
|
||||||
static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
||||||
|
@ -958,6 +959,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
const QDictEntry *e;
|
const QDictEntry *e;
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
char *keypairs, *secretid;
|
char *keypairs, *secretid;
|
||||||
|
rbd_image_info_t info;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
|
keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
|
||||||
|
@ -1035,12 +1037,14 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
r = rbd_get_size(s->image, &s->image_size);
|
r = rbd_stat(s->image, &info, sizeof(info));
|
||||||
if (r < 0) {
|
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);
|
s->image_name);
|
||||||
goto failed_post_open;
|
goto failed_post_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
|
/* If we are using an rbd snapshot, we must be r/o, otherwise
|
||||||
* leave as-is */
|
* leave as-is */
|
||||||
|
@ -1253,15 +1257,7 @@ static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverState *bs,
|
||||||
static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi)
|
static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi)
|
||||||
{
|
{
|
||||||
BDRVRBDState *s = bs->opaque;
|
BDRVRBDState *s = bs->opaque;
|
||||||
rbd_image_info_t info;
|
bdi->cluster_size = s->object_size;
|
||||||
int r;
|
|
||||||
|
|
||||||
r = rbd_stat(s->image, &info, sizeof(info));
|
|
||||||
if (r < 0) {
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
bdi->cluster_size = info.obj_size;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue