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

Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91

Browse Source 
am: 159d267cc6

Change-Id: I7dd0df6adbe7315326064e5b660432dc60be6495
This commit is contained in:
Yifan Hong
2019-01-07 17:17:40 -08:00
committed by android-build-merger
parent ae8c2ca3ea 159d267cc6
commit d2e801fb93
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/blockimg.cpp
+10 -11
View File
@@ -178,14 +178,18 @@ static bool SetPartitionUpdatedMarker(const std::string& marker) {
return true; return true;
} }
static bool discard_blocks(int fd, off64_t offset, uint64_t size) { static bool discard_blocks(int fd, off64_t offset, uint64_t size, bool force = false) {
// Don't discard blocks unless the update is a retry run. // Don't discard blocks unless the update is a retry run or force == true
if (!is_retry) { if (!is_retry && !force) {
return true; return true;
} }
uint64_t args[2] = { static_cast<uint64_t>(offset), size }; uint64_t args[2] = { static_cast<uint64_t>(offset), size };
if (ioctl(fd, BLKDISCARD, &args) == -1) { if (ioctl(fd, BLKDISCARD, &args) == -1) {
// On devices that does not support BLKDISCARD, ignore the error.
if (errno == EOPNOTSUPP) {
return true;
}
PLOG(ERROR) << "BLKDISCARD ioctl failed"; PLOG(ERROR) << "BLKDISCARD ioctl failed";
return false; return false;
} }
@@ -1448,14 +1452,9 @@ static int PerformCommandErase(CommandParameters& params) {
LOG(INFO) << " erasing " << tgt.blocks() << " blocks"; LOG(INFO) << " erasing " << tgt.blocks() << " blocks";
for (const auto& [begin, end] : tgt) { for (const auto& [begin, end] : tgt) {
uint64_t blocks[2]; off64_t offset = static_cast<off64_t>(begin) * BLOCKSIZE;
// offset in bytes size_t size = (end - begin) * BLOCKSIZE;
blocks[0] = begin * static_cast<uint64_t>(BLOCKSIZE); if (!discard_blocks(params.fd, offset, size, true /* force */)) {
// length in bytes
blocks[1] = (end - begin) * static_cast<uint64_t>(BLOCKSIZE);
if (ioctl(params.fd, BLKDISCARD, &blocks) == -1) {
PLOG(ERROR) << "BLKDISCARD ioctl failed";
return -1; return -1;
} }
} }