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

Merge "Remove excess logging in secdiscard"

Browse source
This commit is contained in:
Treehugger Robot 2019-03-22 13:05:35 +00:00 committed by Gerrit Code Review
commit b640f4e337
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
FileDeviceUtils.cpp
View file

@ -61,7 +61,6 @@ std::string BlockDeviceForPath(const std::string& path) {
LOG(ERROR) << "Didn't find a mountpoint to match path " << path;
return "";
}
LOG(DEBUG) << "For path " << path << " block device is " << result;
return result;
}

4
secdiscard.cpp
View file

@ -94,7 +94,6 @@ int main(int argc, const char* const argv[]) {
}
set = 0;
ioctl(fd, F2FS_IOC_SET_PIN_FILE, &set);
LOG(DEBUG) << "Discarded: " << target;
}
return 0;
}
@ -143,9 +142,8 @@ bool secdiscard_path(const std::string& path) {
range[0] = fiemap->fm_extents[i].fe_physical;
range[1] = fiemap->fm_extents[i].fe_length;
if (ioctl(fs_fd.get(), BLKSECDISCARD, range) == -1) {
PLOG(ERROR) << "Unable to BLKSECDISCARD " << path;
// Use zero overwrite as a fallback for BLKSECDISCARD
if (!overwrite_with_zeros(fs_fd.get(), range[0], range[1])) return false;
LOG(DEBUG) << "Used zero overwrite";
}
}
return true;