From: Peter Lieven <pl@kamp.de>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, idryomov@redhat.com, berrange@redhat.com,
Peter Lieven <pl@kamp.de>,
qemu-devel@nongnu.org, ct@flyingcircus.io, pbonzini@redhat.com,
idryomov@gmail.com, mreitz@redhat.com, dillaman@redhat.com
Subject: [PATCH V4 2/6] block/rbd: store object_size in BDRVRBDState
Date: Fri, 2 Jul 2021 11:09:31 +0200 [thread overview]
Message-ID: <20210702090935.15300-3-pl@kamp.de> (raw)
In-Reply-To: <20210702090935.15300-1-pl@kamp.de>
Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
---
block/rbd.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 6b1cbe1d75..b4caea4f1b 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,
@@ -675,6 +676,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"));
@@ -739,13 +741,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 */
@@ -957,15 +961,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
next prev parent reply other threads:[~2021-07-02 9:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 9:09 [PATCH V4 0/6] block/rbd: migrate to coroutines and add write zeroes support Peter Lieven
2021-07-02 9:09 ` [PATCH V4 1/6] block/rbd: bump librbd requirement to luminous release Peter Lieven
2021-07-02 10:43 ` Ilya Dryomov
2021-07-02 9:09 ` Peter Lieven [this message]
2021-07-02 9:09 ` [PATCH V4 3/6] block/rbd: update s->image_size in qemu_rbd_getlength Peter Lieven
2021-07-02 10:45 ` Ilya Dryomov
2021-07-02 9:09 ` [PATCH V4 4/6] block/rbd: migrate from aio to coroutines Peter Lieven
2021-07-02 10:57 ` Ilya Dryomov
2021-07-02 9:09 ` [PATCH V4 5/6] block/rbd: add write zeroes support Peter Lieven
2021-07-02 12:24 ` Ilya Dryomov
2021-07-02 9:09 ` [PATCH V4 6/6] block/rbd: drop qemu_rbd_refresh_limits Peter Lieven
2021-07-02 12:46 ` [PATCH V4 0/6] block/rbd: migrate to coroutines and add write zeroes support Ilya Dryomov
2021-07-02 13:15 ` Peter Lieven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210702090935.15300-3-pl@kamp.de \
--to=pl@kamp.de \
--cc=berrange@redhat.com \
--cc=ct@flyingcircus.io \
--cc=dillaman@redhat.com \
--cc=idryomov@gmail.com \
--cc=idryomov@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).