commit 0460f697a18fa2ea2b98380e663b7d33d9cbdb00
author Sami Tolvanen <samitolvanen@google.com> Wed Jun 10 15:52:04 2015 +0000
committer The Android Automerger <android-build@google.com> Wed Jun 10 09:54:41 2015 -0700
tree a626f37dc489f48f4d0d5b6c251e0884f53bf1a3
parent 604c583c9dd3d47906b1a57c14a7e9650df7471e

Revert "Zero blocks before BLKDISCARD"

This reverts commit 604c583c9dd3d47906b1a57c14a7e9650df7471e.

Change-Id: I2b0b283dc3f44bae55c5e9f7231d7c712630c2b5

updater/blockimg.c

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 @@
     }
 
     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 @@
     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) {