From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1609087688; cv=none; d=zohomail.com; s=zohoarc; b=eNIMJt2vf0lrXk77Oh1KjUVeIuhSCTFNUJxCb84mVNV9X36ZCy3fzznuaLkFC24VUHRXMk/wYl48zrsZz+6ueInrUc49ZmWb+wEYeWplwRVQmGyNY0D/YiFxPfbFD2vQjBIUsPVgXjEyWsynXk1EpM7tU6T90cV8xmrYAbCcmFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609087688; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Gzr1BbRvVMNwqAzn9KoKkQ+4f12wh4Jy3/RypW/C5kM=; b=DOBhMb99Kx1fJ217sZo0mPwZySmBPdrtq59rdrQkEPkvYZGxfYJxwV6PRtsJbdNhVKFv4CZgAHLyHDVcpFSiXWY0XIhYKggMTbFGYImsflo8AWE6P2bW56Zr9IyehG1Aa9l6CDRVvg//NqYWNvey+2FfP3xGH1KtpQU7lQGFeSw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1609087688104706.7318047595558; Sun, 27 Dec 2020 08:48:08 -0800 (PST) Received: from localhost ([::1]:36496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktZDD-0006do-DG for importer@patchew.org; Sun, 27 Dec 2020 11:48:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktZ8G-0001R3-At for qemu-devel@nongnu.org; Sun, 27 Dec 2020 11:43:00 -0500 Received: from kerio.kamp.de ([195.62.97.192]:33896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktZ89-0003wv-Pm for qemu-devel@nongnu.org; Sun, 27 Dec 2020 11:43:00 -0500 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Sun, 27 Dec 2020 17:42:42 +0100 Received: (qmail 22369 invoked from network); 27 Dec 2020 16:42:44 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 27 Dec 2020 16:42:44 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 596F513DD23; Sun, 27 Dec 2020 17:42:44 +0100 (CET) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH 2/7] block/rbd: store object_size in BDRVRBDState Date: Sun, 27 Dec 2020 17:42:31 +0100 Message-Id: <20201227164236.10143-3-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201227164236.10143-1-pl@kamp.de> References: <20201227164236.10143-1-pl@kamp.de> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.62.97.192; envelope-from=pl@kamp.de; helo=kerio.kamp.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ct@flyingcircus.io, mreitz@redhat.com, dillaman@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Lieven --- 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; =20 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 *o= ptions, int flags, const QDictEntry *e; Error *local_err =3D NULL; char *keypairs, *secretid; + rbd_image_info_t info; int r; =20 keypairs =3D g_strdup(qdict_get_try_str(options, "=3Dkeyvalue-pairs")); @@ -727,13 +729,15 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, goto failed_open; } =20 - r =3D rbd_get_size(s->image, &s->image_size); + r =3D 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 =3D info.size; + s->object_size =3D info.obj_size; =20 /* 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 =3D bs->opaque; - rbd_image_info_t info; - int r; - - r =3D rbd_stat(s->image, &info, sizeof(info)); - if (r < 0) { - return r; - } - - bdi->cluster_size =3D info.obj_size; + bdi->cluster_size =3D s->object_size; return 0; } =20 --=20 2.17.1