diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-06-09 22:42:30 +0200 |
|---|---|---|
| committer | Sami Tolvanen <samitolvanen@google.com> | 2015-06-09 23:21:44 +0200 |
| commit | 604c583c9dd3d47906b1a57c14a7e9650df7471e (patch) | |
| tree | d1aa0e7ad15692da944a0de4ace55f940c600353 /updater | |
| parent | Merge "uncrypt: Write status when it reboots to factory reset" into mnc-dev (diff) | |
| download | android_bootable_recovery-604c583c9dd3d47906b1a57c14a7e9650df7471e.tar android_bootable_recovery-604c583c9dd3d47906b1a57c14a7e9650df7471e.tar.gz android_bootable_recovery-604c583c9dd3d47906b1a57c14a7e9650df7471e.tar.bz2 android_bootable_recovery-604c583c9dd3d47906b1a57c14a7e9650df7471e.tar.lz android_bootable_recovery-604c583c9dd3d47906b1a57c14a7e9650df7471e.tar.xz android_bootable_recovery-604c583c9dd3d47906b1a57c14a7e9650df7471e.tar.zst android_bootable_recovery-604c583c9dd3d47906b1a57c14a7e9650df7471e.zip | |
Diffstat (limited to 'updater')
| -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 7b8721dbf..a2786c832 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 @@ -1222,8 +1217,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; } @@ -1409,8 +1403,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) { |