tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am c4b6f87f: am 7125f959: Revert "Zero blocks before BLKDISCARD"

Browse source 
* commit 'c4b6f87f7ab969be7ee177baa8704774869ecb56':
  Revert "Zero blocks before BLKDISCARD"
This commit is contained in:
Tao Bao 2015-07-03 05:36:51 +00:00 committed by Android Git Automerger
commit de9496d7d3
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
updater/blockimg.c
View file

@ -1465,7 +1465,6 @@ pcdout:
static int PerformCommandErase(CommandParameters* params) { static int PerformCommandErase(CommandParameters* params) {
char* range = NULL; char* range = NULL;
int i; int i;
int j;
int rc = -1; int rc = -1;
RangeSet* tgt = NULL; RangeSet* tgt = NULL;
struct stat st; struct stat st;
@ -1492,7 +1491,7 @@ static int PerformCommandErase(CommandParameters* params) {
range = strtok_r(NULL, " ", &params->cpos); range = strtok_r(NULL, " ", &params->cpos);
if (range == NULL) { if (range == NULL) {
fprintf(stderr, "missing target blocks for erase\n"); fprintf(stderr, "missing target blocks for zero\n");
goto pceout; goto pceout;
} }
@ -1501,22 +1500,7 @@ static int PerformCommandErase(CommandParameters* params) {
if (params->canwrite) { if (params->canwrite) {
fprintf(stderr, " erasing %d blocks\n", tgt->size); 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) { 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 // offset in bytes
blocks[0] = tgt->pos[i * 2] * (uint64_t) BLOCKSIZE; blocks[0] = tgt->pos[i * 2] * (uint64_t) BLOCKSIZE;
// length in bytes // length in bytes