commit aa4df5c45b99438282db3a94cb7682c480e0eccd
author Sami Tolvanen <samitolvanen@google.com> Thu May 28 16:12:24 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 28 16:12:25 2015 +0000
tree a37550c760bf26300ed6e6277510b96da8c753c8
parent f272b9e777de92f96b9298889bf145e40c5db2e3
parent cc2428c8181d18c9a88db908fa4eabd2db5601ad

Merge "Handle BLKDISCARD failures"

updater/blockimg.c

diff --git a/updater/blockimg.c b/updater/blockimg.c
index ce63600..42060f5 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;
             }
         }
     }