PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""

Browse Source 
* commit 'e6f6097a7d59ae8443d7c7e5e39ecdc43b77f3ab':
  Revert "Zero blocks before BLKDISCARD"
This commit is contained in:
Sami Tolvanen
2015-06-10 16:06:49 +00:00
committed by Android Git Automerger
parent b89452efa8 e6f6097a7d
commit 059e391f9e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/blockimg.c
+9 -5
View File
@@ -39,6 +39,11 @@
#define BLOCKSIZE 4096 #define BLOCKSIZE 4096
// Set this to 0 to interpret 'erase' transfers to mean do a
// BLKDISCARD ioctl (the normal behavior). Set to 1 to interpret
// erase to mean fill the region with zeroes.
#define DEBUG_ERASE 0
#ifndef BLKDISCARD #ifndef BLKDISCARD
#define BLKDISCARD _IO(0x12,119) #define BLKDISCARD _IO(0x12,119)
#endif #endif
@@ -1278,7 +1283,8 @@ static int PerformCommandZero(CommandParameters* params) {
} }
if (params->cmdname[0] == 'z') { if (params->cmdname[0] == 'z') {
// Update only for the zero command, as the erase command will call this // Update only for the zero command, as the erase command will call
// this if DEBUG_ERASE is defined.
params->written += tgt->size; params->written += tgt->size;
} }
@@ -1464,10 +1470,8 @@ static int PerformCommandErase(CommandParameters* params) {
struct stat st; struct stat st;
uint64_t blocks[2]; uint64_t blocks[2];
// Always zero the blocks first to work around possibly flaky BLKDISCARD if (DEBUG_ERASE) {
// Bug: 20881595 return PerformCommandZero(params);
if (PerformCommandZero(params) != 0) {
goto pceout;
} }
if (!params) { if (!params) {