diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-06-09 23:28:46 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-09 23:28:46 +0200 |
| commit | 2fd12979eac8987d4aaa89b56c508a710450c33d (patch) | |
| tree | 46d64e674bd137408ae0cc04eb6ea74075af2050 | |
| parent | am 3f9db6af: Merge "recovery: Switch to clang" (diff) | |
| parent | Merge "Zero blocks before BLKDISCARD" (diff) | |
| download | android_bootable_recovery-2fd12979eac8987d4aaa89b56c508a710450c33d.tar android_bootable_recovery-2fd12979eac8987d4aaa89b56c508a710450c33d.tar.gz android_bootable_recovery-2fd12979eac8987d4aaa89b56c508a710450c33d.tar.bz2 android_bootable_recovery-2fd12979eac8987d4aaa89b56c508a710450c33d.tar.lz android_bootable_recovery-2fd12979eac8987d4aaa89b56c508a710450c33d.tar.xz android_bootable_recovery-2fd12979eac8987d4aaa89b56c508a710450c33d.tar.zst android_bootable_recovery-2fd12979eac8987d4aaa89b56c508a710450c33d.zip | |
| -rw-r--r-- | updater/blockimg.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/updater/blockimg.c b/updater/blockimg.c index 5d0f1560c..dfba7e420 100644 --- a/updater/blockimg.c +++ b/updater/blockimg.c @@ -39,11 +39,6 @@ #define BLOCKSIZE 4096 -// Set this to 0 to interpret 'erase' transfers to mean do a -// BLKDISCARD ioctl (the normal behavior). Set to 1 to interpret -// erase to mean fill the region with zeroes. -#define DEBUG_ERASE 0 - #ifndef BLKDISCARD #define BLKDISCARD _IO(0x12,119) #endif @@ -1283,8 +1278,7 @@ static int PerformCommandZero(CommandParameters* params) { } if (params->cmdname[0] == 'z') { - // Update only for the zero command, as the erase command will call - // this if DEBUG_ERASE is defined. + // Update only for the zero command, as the erase command will call this params->written += tgt->size; } @@ -1470,8 +1464,10 @@ static int PerformCommandErase(CommandParameters* params) { struct stat st; uint64_t blocks[2]; - if (DEBUG_ERASE) { - return PerformCommandZero(params); + // Always zero the blocks first to work around possibly flaky BLKDISCARD + // Bug: 20881595 + if (PerformCommandZero(params) != 0) { + goto pceout; } if (!params) { |