commit abb78773a7f30a1bcb2742834749574436a7862e
author Sami Tolvanen <samitolvanen@google.com> Wed Jun 10 20:54:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 10 20:54:03 2015 +0000
tree d8e2db6df2b5f0f3043f70442cd60751af423489
parent 2cfa4d446b89536a7dc78e4b50a7cbb1676d9469
parent a66cdf40c3d9ee8248049ce076673e3fe96a7080

am a66cdf40: am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"

* commit 'a66cdf40c3d9ee8248049ce076673e3fe96a7080':
  Zero blocks before BLKDISCARD

updater/blockimg.c

diff --git a/updater/blockimg.c b/updater/blockimg.c
index 5d0f156..fc35abe 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1465,6 +1465,7 @@
 static int PerformCommandErase(CommandParameters* params) {
     char* range = NULL;
     int i;
+    int j;
     int rc = -1;
     RangeSet* tgt = NULL;
     struct stat st;
@@ -1491,7 +1492,7 @@
     range = strtok_r(NULL, " ", &params->cpos);
 
     if (range == NULL) {
-        fprintf(stderr, "missing target blocks for zero\n");
+        fprintf(stderr, "missing target blocks for erase\n");
         goto pceout;
     }
 
@@ -1500,7 +1501,22 @@
     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