commit 7125f9594db027ce4313d940ce2cafac67ae8c31
author Tao Bao <tbao@google.com> Tue Jun 30 23:09:12 2015 -0700
committer Tao Bao <tbao@google.com> Tue Jun 30 23:10:44 2015 -0700
tree 618806a885d90b8e42bde8857b29b1829631c897
parent c3dddce205ef44933813394013ee5ef89b63653b

Revert "Zero blocks before BLKDISCARD"

This reverts commit b65f0272c860771f2105668accd175be1ed95ae9.

It slows down the update too much on some devices (e.g. increased
from 8 mins to 40 mins to take a full OTA update).

Bug: 22129621
Change-Id: I4e8d4f6734967caf4f0d19c734027f7b6c107370

updater/blockimg.c

diff --git a/updater/blockimg.c b/updater/blockimg.c
index 1e95f4e..5b8a6a3 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1404,7 +1404,6 @@
 static int PerformCommandErase(CommandParameters* params) {
     char* range = NULL;
     int i;
-    int j;
     int rc = -1;
     RangeSet* tgt = NULL;
     struct stat st;
@@ -1431,7 +1430,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;
     }
 
@@ -1440,22 +1439,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