[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 2/2] check for close() errors on qcow2_create()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] Re: [PATCH 2/2] check for close() errors on qcow2_create() |
Date: |
Fri, 8 Oct 2010 14:39:09 -0300 |
User-agent: |
Mutt/1.5.20 (2009-08-17) |
On Fri, Oct 08, 2010 at 12:14:07PM +0200, Kevin Wolf wrote:
> Am 07.10.2010 22:25, schrieb Eduardo Habkost:
> > 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.
[...]
> > exit_close:
> > - close(fd);
> > + cret = close(fd);
> > + if (ret == 0 && cret < 0)
> > + ret = -errno;
>
> Braces are missing here.
Updated patch below.
I won't resubmit the series as a new thread, as it depends on deciding
what to do about the qcow2_create() rewrite.
Signed-off-by: Eduardo Habkost <address@hidden>
---
block/qcow2.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index c5fb28e..e2e9a95 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,10 @@ 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