PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures"

Browse Source 
* commit 'cd391c23882cfa876c06fdf26146469489f41e8b':
  Handle BLKDISCARD failures
This commit is contained in:
Sami Tolvanen
2015-05-28 17:19:37 +00:00
committed by Android Git Automerger
parent d026a28c22 cd391c2388
commit e938682e0e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/blockimg.c
+1 -2
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;
} }
} }
} }