commit f2853e27472728d3a24293ab4bfc445c74be6a15
author Tao Bao <tbao@google.com> Sat Jul 11 20:32:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 11 20:32:32 2015 +0000
tree a01544b99af8c148b9f3d66b5542107624f48f1d
parent 4e6507f32817e2943b1f27d12f56b485993c2a44
parent 65c230f4b3c9fd6b42f6502b96e5b47c7b1c2f61

am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""

* commit '65c230f4b3c9fd6b42f6502b96e5b47c7b1c2f61':
  Revert "Zero blocks before BLKDISCARD"

updater/blockimg.c

diff --git a/updater/blockimg.c b/updater/blockimg.c
index 0bd2559..a6a3895 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1465,7 +1465,6 @@
 static int PerformCommandErase(CommandParameters* params) {
     char* range = NULL;
     int i;
-    int j;
     int rc = -1;
     RangeSet* tgt = NULL;
     struct stat st;
@@ -1492,7 +1491,7 @@
     range = strtok_r(NULL, " ", &params->cpos);
 
     if (range == NULL) {
-        fprintf(stderr, "missing target blocks for erase\n");
+        fprintf(stderr, "missing target blocks for zero\n");
         goto pceout;
     }
 
@@ -1501,22 +1500,7 @@
     if (params->canwrite) {
         fprintf(stderr, " erasing %d blocks\n", tgt->size);
 
-        allocate(BLOCKSIZE, &params->buffer, &params->bufsize);
-        memset(params->buffer, 0, BLOCKSIZE);
-
         for (i = 0; i < tgt->count; ++i) {
-            // Always zero the blocks first to work around possibly flaky BLKDISCARD
-            // Bug: 20881595
-            if (!check_lseek(params->fd, (off64_t) tgt->pos[i * 2] * BLOCKSIZE, SEEK_SET)) {
-                goto pceout;
-            }
-
-            for (j = tgt->pos[i * 2]; j < tgt->pos[i * 2 + 1]; ++j) {
-                if (write_all(params->fd, params->buffer, BLOCKSIZE) == -1) {
-                    goto pceout;
-                }
-            }
-
             // offset in bytes
             blocks[0] = tgt->pos[i * 2] * (uint64_t) BLOCKSIZE;
             // length in bytes