summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-07-03 07:36:51 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-03 07:36:51 +0200
commitde9496d7d3854326ce8acbcf9d249570e24b9a94 (patch)
treea5225cfa2cac2878d0ad582c0f576d61d0fb75bc /updater
parentam 2b3c599c: am c3dddce2: More accurate checking for overlapped ranges. (diff)
parentam 7125f959: Revert "Zero blocks before BLKDISCARD" (diff)
downloadandroid_bootable_recovery-de9496d7d3854326ce8acbcf9d249570e24b9a94.tar
android_bootable_recovery-de9496d7d3854326ce8acbcf9d249570e24b9a94.tar.gz
android_bootable_recovery-de9496d7d3854326ce8acbcf9d249570e24b9a94.tar.bz2
android_bootable_recovery-de9496d7d3854326ce8acbcf9d249570e24b9a94.tar.lz
android_bootable_recovery-de9496d7d3854326ce8acbcf9d249570e24b9a94.tar.xz
android_bootable_recovery-de9496d7d3854326ce8acbcf9d249570e24b9a94.tar.zst
android_bootable_recovery-de9496d7d3854326ce8acbcf9d249570e24b9a94.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/blockimg.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/updater/blockimg.c b/updater/blockimg.c
index 0bd2559f7..a6a389507 100644
--- a/updater/blockimg.c
+++ b/updater/blockimg.c
@@ -1465,7 +1465,6 @@ pcdout:
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 @@ static int PerformCommandErase(CommandParameters* params) {
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 @@ static int PerformCommandErase(CommandParameters* params) {
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