commit cd391c23882cfa876c06fdf26146469489f41e8b
author Sami Tolvanen <samitolvanen@google.com> Thu May 28 16:21:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 28 16:21:04 2015 +0000
tree a37550c760bf26300ed6e6277510b96da8c753c8
parent 9a5e2a2611997d7803f079b8adb3535b6abc80fb
parent aa4df5c45b99438282db3a94cb7682c480e0eccd

am aa4df5c4: Merge "Handle BLKDISCARD failures"

* commit 'aa4df5c45b99438282db3a94cb7682c480e0eccd':
  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;
             }
         }
     }