tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Handle BLKDISCARD failures"

Browse source
This commit is contained in:
Sami Tolvanen 2015-05-28 16:12:24 +00:00 committed by Gerrit Code Review
commit aa4df5c45b
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
updater/blockimg.c
View file

@ -1485,7 +1485,6 @@ static int PerformCommandErase(CommandParameters* params) {
if (!S_ISBLK(st.st_mode)) { if (!S_ISBLK(st.st_mode)) {
fprintf(stderr, "not a block device; skipping erase\n"); fprintf(stderr, "not a block device; skipping erase\n");
rc = 0;
goto pceout; goto pceout;
} }
@ -1509,7 +1508,7 @@ static int PerformCommandErase(CommandParameters* params) {
if (ioctl(params->fd, BLKDISCARD, &blocks) == -1) { if (ioctl(params->fd, BLKDISCARD, &blocks) == -1) {
fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno)); fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno));
// Continue anyway, nothing we can do goto pceout;
} }
} }
} }