From nobody Tue Apr 8 14:25:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1625835535; cv=none; d=zohomail.com; s=zohoarc; b=JWhWd8wVFb1dU8MDyRvRb6MxJZLpmiSSeay66Z9q1MGnvm3cNtK6jf5vGFDw0YExTo6YWrgeEPeBkFMUnsjaRhr5TaocvAIUQgDZc2gVeTK9sfi4b3ssNJhWp/h6fRjBToOrrDLJPLGl+E99w4x0u/DHnRql2+agxVBxa4fihWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625835535; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HMNWLIiGeR4/AaSyndxXEIIgVoz2v7t75K4HHAzP9yY=; b=CfAZWFvk9OoWHWFQl+w6pVHK2r2dQ8Tm7O9JB+IuzIcZ1YU1MRm8EiuWTDIfD4MxhTFvWcOs/dejWOffyLnC5SVtAyN9PjAMFT9WWn3aPHeVKwMNXH1zvEWq20WijzppCtBjt/chJFg8kMFpW47obubmMp6n7K2VLP/YIS28AmM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625835535456586.8515084017847; Fri, 9 Jul 2021 05:58:55 -0700 (PDT) Received: from localhost ([::1]:38092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1q5m-00030v-EO for importer@patchew.org; Fri, 09 Jul 2021 08:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1pyC-0002Z1-8Y for qemu-devel@nongnu.org; Fri, 09 Jul 2021 08:51:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1pyA-0003LI-Gf for qemu-devel@nongnu.org; Fri, 09 Jul 2021 08:51:03 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-AN1O7YisPvOzZEk2q86drg-1; Fri, 09 Jul 2021 08:51:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 134F48030D7; Fri, 9 Jul 2021 12:50:59 +0000 (UTC) Received: from merkur.redhat.com (ovpn-113-203.ams2.redhat.com [10.36.113.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B71960843; Fri, 9 Jul 2021 12:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625835062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HMNWLIiGeR4/AaSyndxXEIIgVoz2v7t75K4HHAzP9yY=; b=LVpahvM4RKG7fcLPv/HpEQut+Mp2PQpfIhME2nY+wTRvDcYgTyIxQd/YwIRpRmPGeoWC5T M1C9qkzSAGsxKiJGzoSPhnucrjgmkkW4ziY2//YokU/d3fBfESgmTWECo/UQPgPcRM82Fm S5KXuqpzk7vMpLWpeSuF2RNrch8Fwio= X-MC-Unique: AN1O7YisPvOzZEk2q86drg-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 04/28] block/rbd: store object_size in BDRVRBDState Date: Fri, 9 Jul 2021 14:50:11 +0200 Message-Id: <20210709125035.191321-5-kwolf@redhat.com> In-Reply-To: <20210709125035.191321-1-kwolf@redhat.com> References: <20210709125035.191321-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.45, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1625835536026100001 Content-Type: text/plain; charset="utf-8" From: Peter Lieven Signed-off-by: Peter Lieven Reviewed-by: Ilya Dryomov Message-Id: <20210702172356.11574-3-idryomov@gmail.com> Signed-off-by: Kevin Wolf --- block/rbd.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index b4b928bbb9..1ebf8f7e48 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -102,6 +102,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, @@ -958,6 +959,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")); @@ -1035,12 +1037,14 @@ static int qemu_rbd_open(BlockDriverState *bs, QDic= t *options, int flags, #endif } =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); goto failed_post_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 */ @@ -1253,15 +1257,7 @@ static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverSta= te *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.31.1