From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 14 Jun 2011 08:07:39 +0000 (+0100)
Subject: Fix errno return in safezero()
X-Git-Tag: v0.9.3-rc1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a81822063dd7a1b3dde2992b4ef54bd5a0612067;p=thirdparty%2Flibvirt.git

Fix errno return in safezero()

Most of the safezero() implementations return -1 on error,
setting errno. The safezero() impl using posix_fallocate()
though returned a positive errno value on error (due to
the unusual API contract of posix_fallocate() compared to
most syscall APIs).

* src/util/util.c: Ensure safezero() returns -1 and sets
  errno on error.
* src/storage/storage_backend.c: Change safezero != 0 to
  < 0 for detecting errors
---

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 8d0ea9eee6..a6e66e1c1e 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -331,7 +331,7 @@ createRawFile(int fd, virStorageVolDefPtr vol,
 
                 if (bytes > remain)
                     bytes = remain;
-                if (safezero(fd, 0, vol->allocation - remain, bytes) != 0) {
+                if (safezero(fd, 0, vol->allocation - remain, bytes) < 0) {
                     ret = -errno;
                     virReportSystemError(errno, _("cannot fill file '%s'"),
                                          vol->target.path);
@@ -340,7 +340,7 @@ createRawFile(int fd, virStorageVolDefPtr vol,
                 remain -= bytes;
             }
         } else { /* No progress bars to be shown */
-            if (safezero(fd, 0, 0, remain) != 0) {
+            if (safezero(fd, 0, 0, remain) < 0) {
                 ret = -errno;
                 virReportSystemError(errno, _("cannot fill file '%s'"),
                                      vol->target.path);
diff --git a/src/util/util.c b/src/util/util.c
index df4dfacfed..8f6d887229 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -136,7 +136,11 @@ safewrite(int fd, const void *buf, size_t count)
 #ifdef HAVE_POSIX_FALLOCATE
 int safezero(int fd, int flags ATTRIBUTE_UNUSED, off_t offset, off_t len)
 {
-    return posix_fallocate(fd, offset, len);
+    int ret = posix_fallocate(fd, offset, len);
+    if (ret == 0)
+        return 0;
+    errno = ret;
+    return -1;
 }
 #else