From nobody Sun Oct 5 21:17:19 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580492911608507.20344909731205; Fri, 31 Jan 2020 09:48:31 -0800 (PST) Received: from localhost ([::1]:57234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixaP8-0007oO-Hi for importer@patchew.org; Fri, 31 Jan 2020 12:48:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41274) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixaLZ-0002dH-2I for qemu-devel@nongnu.org; Fri, 31 Jan 2020 12:44:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixaLX-0004Me-TZ for qemu-devel@nongnu.org; Fri, 31 Jan 2020 12:44:48 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:37655 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixaLX-0004Lz-Q6 for qemu-devel@nongnu.org; Fri, 31 Jan 2020 12:44:47 -0500 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-340-ZmvyKsZBONawh1gVfeoFCg-1; Fri, 31 Jan 2020 12:44:45 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C03A88F4966; Fri, 31 Jan 2020 17:44:43 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-181.phx2.redhat.com [10.3.116.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A166811E3; Fri, 31 Jan 2020 17:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580492687; 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=B51it5BXKL4ctGbDQxLb2aHXVzqtTtPhPQiH6qrqs8g=; b=KhtwGyRTLypocGK523GiaWvsKwbRIS6QVEYONWgyW3RpT+S64CBnzDsckOHKaxk/aDZoXh k2fxHRqvOVsR4VI83Fn7CxEk6Jnd4DTfcJO5UPtAgzCltCmp318sxfIVVgTfvIM4BA+IhE a/1ZT+AwYh1z3TmDr9rrQPUX3Rjcw/Q= From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH 07/17] gluster: Drop useless has_zero_init callback Date: Fri, 31 Jan 2020 11:44:26 -0600 Message-Id: <20200131174436.2961874-8-eblake@redhat.com> In-Reply-To: <20200131174436.2961874-1-eblake@redhat.com> References: <20200131174436.2961874-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ZmvyKsZBONawh1gVfeoFCg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: david.edmondson@oracle.com, Kevin Wolf , "open list:GLUSTER" , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" block.c already defaults to 0 if we don't provide a callback; there's no need to write a callback that always fails. Signed-off-by: Eric Blake Reviewed-by: Alberto Garcia Reviewed-by: Niels de Vos Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/gluster.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 4fa4a77a4777..9d952c70981b 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -1357,12 +1357,6 @@ static int64_t qemu_gluster_allocated_file_size(Bloc= kDriverState *bs) } } -static int qemu_gluster_has_zero_init(BlockDriverState *bs) -{ - /* GlusterFS volume could be backed by a block device */ - return 0; -} - /* * Find allocation range in @bs around offset @start. * May change underlying file descriptor's file offset. @@ -1567,8 +1561,6 @@ static BlockDriver bdrv_gluster =3D { .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, .bdrv_co_flush_to_disk =3D qemu_gluster_co_flush_to_disk, - .bdrv_has_zero_init =3D qemu_gluster_has_zero_init, - .bdrv_has_zero_init_truncate =3D qemu_gluster_has_zero_init, #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_pdiscard =3D qemu_gluster_co_pdiscard, #endif @@ -1599,8 +1591,6 @@ static BlockDriver bdrv_gluster_tcp =3D { .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, .bdrv_co_flush_to_disk =3D qemu_gluster_co_flush_to_disk, - .bdrv_has_zero_init =3D qemu_gluster_has_zero_init, - .bdrv_has_zero_init_truncate =3D qemu_gluster_has_zero_init, #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_pdiscard =3D qemu_gluster_co_pdiscard, #endif @@ -1631,8 +1621,6 @@ static BlockDriver bdrv_gluster_unix =3D { .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, .bdrv_co_flush_to_disk =3D qemu_gluster_co_flush_to_disk, - .bdrv_has_zero_init =3D qemu_gluster_has_zero_init, - .bdrv_has_zero_init_truncate =3D qemu_gluster_has_zero_init, #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_pdiscard =3D qemu_gluster_co_pdiscard, #endif @@ -1669,8 +1657,6 @@ static BlockDriver bdrv_gluster_rdma =3D { .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, .bdrv_co_flush_to_disk =3D qemu_gluster_co_flush_to_disk, - .bdrv_has_zero_init =3D qemu_gluster_has_zero_init, - .bdrv_has_zero_init_truncate =3D qemu_gluster_has_zero_init, #ifdef CONFIG_GLUSTERFS_DISCARD .bdrv_co_pdiscard =3D qemu_gluster_co_pdiscard, #endif --=20 2.24.1