diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-06-10 15:52:04 +0000 |
|---|---|---|
| committer | Sami Tolvanen <samitolvanen@google.com> | 2015-06-10 15:52:04 +0000 |
| commit | 6abd52f62be24981398a99ebefc8717eb2294f97 (patch) | |
| tree | a626f37dc489f48f4d0d5b6c251e0884f53bf1a3 /updater | |
| parent | 604c583c9dd3d47906b1a57c14a7e9650df7471e (diff) | |
| download | bootable_recovery-6abd52f62be24981398a99ebefc8717eb2294f97.zip bootable_recovery-6abd52f62be24981398a99ebefc8717eb2294f97.tar.gz bootable_recovery-6abd52f62be24981398a99ebefc8717eb2294f97.tar.bz2 | |
Revert "Zero blocks before BLKDISCARD"
This reverts commit 604c583c9dd3d47906b1a57c14a7e9650df7471e.
Change-Id: I2b0b283dc3f44bae55c5e9f7231d7c712630c2b5
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/blockimg.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/updater/blockimg.c b/updater/blockimg.c index a2786c8..7b8721d 100644 --- a/updater/blockimg.c +++ b/updater/blockimg.c @@ -39,6 +39,11 @@ #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 @@ -1217,7 +1222,8 @@ static int PerformCommandZero(CommandParameters* params) { } if (params->cmdname[0] == 'z') { - // Update only for the zero command, as the erase command will call this + // Update only for the zero command, as the erase command will call + // this if DEBUG_ERASE is defined. params->written += tgt->size; } @@ -1403,10 +1409,8 @@ static int PerformCommandErase(CommandParameters* params) { struct stat st; uint64_t blocks[2]; - // Always zero the blocks first to work around possibly flaky BLKDISCARD - // Bug: 20881595 - if (PerformCommandZero(params) != 0) { - goto pceout; + if (DEBUG_ERASE) { + return PerformCommandZero(params); } if (!params) { |