Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / tools / hv / hv_fcopy_daemon.c

diff --git a/kernel/tools/hv/hv_fcopy_daemon.c b/kernel/tools/hv/hv_fcopy_daemon.c
index 5480e4e..f1d7426 100644 (file)
--- a/kernel/tools/hv/hv_fcopy_daemon.c
+++ b/kernel/tools/hv/hv_fcopy_daemon.c
@@ -37,12 +37,14 @@
 
 static int target_fd;
 static char target_fname[W_MAX_PATH];
+static unsigned long long filesize;
 
 static int hv_start_fcopy(struct hv_start_fcopy *smsg)
 {
        int error = HV_E_FAIL;
        char *q, *p;
 
+       filesize = 0;
        p = (char *)smsg->path_name;
        snprintf(target_fname, sizeof(target_fname), "%s/%s",
                 (char *)smsg->path_name, (char *)smsg->file_name);
@@ -98,14 +100,26 @@ done:
 static int hv_copy_data(struct hv_do_fcopy *cpmsg)
 {
        ssize_t bytes_written;
+       int ret = 0;
 
        bytes_written = pwrite(target_fd, cpmsg->data, cpmsg->size,
                                cpmsg->offset);
 
-       if (bytes_written != cpmsg->size)
-               return HV_E_FAIL;
+       filesize += cpmsg->size;
+       if (bytes_written != cpmsg->size) {
+               switch (errno) {
+               case ENOSPC:
+                       ret = HV_ERROR_DISK_FULL;
+                       break;
+               default:
+                       ret = HV_E_FAIL;
+                       break;
+               }
+               syslog(LOG_ERR, "pwrite failed to write %llu bytes: %ld (%s)",
+                      filesize, (long)bytes_written, strerror(errno));
+       }
 
-       return 0;
+       return ret;
 }
 
 static int hv_copy_finished(void)