am aa4df5c4: Merge "Handle BLKDISCARD failures"

* commit 'aa4df5c45b99438282db3a94cb7682c480e0eccd': Handle BLKDISCARD failures
2015-05-28 16:21:04 +00:00
parent 9a5e2a2611 aa4df5c45b
commit cd391c2388
1 changed files with 1 additions and 2 deletions
@@ -1485,7 +1485,6 @@ static int PerformCommandErase(CommandParameters* params) {

    if (!S_ISBLK(st.st_mode)) {
        fprintf(stderr, "not a block device; skipping erase\n");
-        rc = 0;
        goto pceout;
    }

@@ -1509,7 +1508,7 @@ static int PerformCommandErase(CommandParameters* params) {

            if (ioctl(params->fd, BLKDISCARD, &blocks) == -1) {
                fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno));
-                // Continue anyway, nothing we can do
+                goto pceout;
            }
        }
    }