From nobody Wed Feb 11 08:39:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491565872783719.3740874481576; Fri, 7 Apr 2017 04:51:12 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 73FB4C065846; Fri, 7 Apr 2017 11:51:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4923F189DC; Fri, 7 Apr 2017 11:51:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DFFCA18521C6; Fri, 7 Apr 2017 11:51:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37Bo7so011475 for ; Fri, 7 Apr 2017 07:50:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 65D4FA8865; Fri, 7 Apr 2017 11:50:07 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20D3EA887A for ; Fri, 7 Apr 2017 11:50:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 73FB4C065846 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 73FB4C065846 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 07:49:58 -0400 Message-Id: <20170407114959.22362-3-jferlan@redhat.com> In-Reply-To: <20170407114959.22362-1-jferlan@redhat.com> References: <20170407114959.22362-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] logical: Use virStorageBackendZeroDeviceHeader to clear header X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 07 Apr 2017 11:51:12 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than open code it, use the new function which uses the wipe algorithm Signed-off-by: John Ferlan --- src/storage/storage_backend_logical.c | 44 +------------------------------= ---- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index d87aaf0..3aaad04 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -92,9 +92,6 @@ virStorageBackendLogicalRemoveDevice(const char *path) static int virStorageBackendLogicalInitializeDevice(const char *path) { - int fd =3D -1; - char zeros[4 * PV_BLANK_SECTOR_SIZE] =3D {0}; - off_t size; int ret =3D -1; virCommandPtr pvcmd =3D NULL; =20 @@ -103,46 +100,8 @@ virStorageBackendLogicalInitializeDevice(const char *p= ath) * a whole disk as a PV. So we just blank them out regardless * rather than trying to figure out if we're a disk or partition */ - if ((fd =3D open(path, O_WRONLY)) < 0) { - virReportSystemError(errno, _("cannot open device '%s'"), path); + if (virStorageBackendZeroDeviceHeader(path, 4 * PV_BLANK_SECTOR_SIZE) = < 0) return -1; - } - - if ((size =3D lseek(fd, 0, SEEK_END)) =3D=3D (off_t)-1) { - virReportSystemError(errno, - _("failed to seek to end of %s"), path); - goto cleanup; - } - - if (size < 4 * PV_BLANK_SECTOR_SIZE) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("cannot initialize '%s' detected size=3D'%zd' les= s " - "than minimum required=3D'%d"), - path, (ssize_t) size, 4 * PV_BLANK_SECTOR_SIZE); - goto cleanup; - } - if ((size =3D lseek(fd, 0, SEEK_SET)) =3D=3D (off_t)-1) { - virReportSystemError(errno, - _("failed to seek to start of %s"), path); - goto cleanup; - } - - if (safewrite(fd, zeros, sizeof(zeros)) < 0) { - virReportSystemError(errno, _("cannot clear device header of '%s'"= ), - path); - goto cleanup; - } - - if (fsync(fd) < 0) { - virReportSystemError(errno, _("cannot flush header of device'%s'"), - path); - goto cleanup; - } - - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, _("cannot close device '%s'"), path); - goto cleanup; - } =20 /* * Initialize the physical volume because vgcreate is not @@ -155,7 +114,6 @@ virStorageBackendLogicalInitializeDevice(const char *pa= th) ret =3D 0; =20 cleanup: - VIR_FORCE_CLOSE(fd); virCommandFree(pvcmd); =20 return ret; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list