From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40577 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3x1j-0002Ut-63 for qemu-devel@nongnu.org; Thu, 07 Oct 2010 16:25:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3x1Z-0000ET-S3 for qemu-devel@nongnu.org; Thu, 07 Oct 2010 16:25:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3x1Z-0000D7-Le for qemu-devel@nongnu.org; Thu, 07 Oct 2010 16:25:09 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o97KP775007631 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Oct 2010 16:25:07 -0400 From: Eduardo Habkost Date: Thu, 7 Oct 2010 17:25:05 -0300 Message-Id: <1286483105-9768-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1286483105-9768-1-git-send-email-ehabkost@redhat.com> References: <1286483105-9768-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] check for close() errors on qcow2_create() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf Errors when closing the file we just created should not be ignored. I/O errors may happen and "qemu-img create" should fail in those cases. If we are already exiting due to an error, we will still return the original error number, though. Signed-off-by: Eduardo Habkost --- block/qcow2.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index c5fb28e..d3a056b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -882,7 +882,7 @@ static int qcow_create2(const char *filename, int64_t total_size, uint64_t old_ref_clusters; QCowCreateState s1, *s = &s1; QCowExtension ext_bf = {0, 0}; - int ret; + int ret, cret; memset(s, 0, sizeof(*s)); @@ -1055,7 +1055,9 @@ exit: qemu_free(s->refcount_block); exit_close: - close(fd); + cret = close(fd); + if (ret == 0 && cret < 0) + ret = -errno; /* Preallocate metadata */ if (ret == 0 && prealloc) { -- 1.6.5.5