commit 1441a9654feee7e32ec6b39b1992c27635feb50f
author Elliott Hughes <enh@google.com> Fri May 29 18:02:56 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 29 18:02:57 2015 +0000
tree fd19402dc59c103a853e13860522bab4a7913ac9
parent 74f5e0e09e16ba38d007fdc4aeede20129c817bc
parent b3ac676192a093c561b7f15064cbd67733407b12

Merge "Really don't use TEMP_FAILURE_RETRY with close in recovery."

applypatch/applypatch.c

diff --git a/applypatch/applypatch.c b/applypatch/applypatch.c
index 6f02a38..2358d42 100644
--- a/applypatch/applypatch.c
+++ b/applypatch/applypatch.c
@@ -662,7 +662,7 @@
         printf("failed to statfs %s: %s\n", filename, strerror(errno));
         return -1;
     }
-    return sf.f_bsize * sf.f_bfree;
+    return sf.f_bsize * sf.f_bavail;
 }
 
 int CacheSizeCheck(size_t bytes) {

updater/blockimg.c

diff --git a/updater/blockimg.c b/updater/blockimg.c
index 54f76ff..5d0f156 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1485,7 +1485,6 @@
 
     if (!S_ISBLK(st.st_mode)) {
         fprintf(stderr, "not a block device; skipping erase\n");
-        rc = 0;
         goto pceout;
     }
 
@@ -1509,7 +1508,7 @@
 
             if (ioctl(params->fd, BLKDISCARD, &blocks) == -1) {
                 fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno));
-                // Continue anyway, nothing we can do
+                goto pceout;
             }
         }
     }