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

Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am: cb114c36d8

Browse source 
am: b7b419541b

Change-Id: I00d955ad5e8671c57b6a3acbe1e694fbf0b28d69
This commit is contained in:
Jaegeuk Kim 2018-08-03 17:11:47 -07:00 committed by android-build-merger
commit 2db64225ca
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
secdiscard.cpp
View file

@ -57,7 +57,33 @@ int main(int argc, const char * const argv[]) {
usage(argv[0]); usage(argv[0]);
return -1; return -1;
} }
for (auto const &target: options.targets) { for (auto const &target: options.targets) {
// F2FS-specific ioctl
// It requires the below kernel commit merged in v4.16-rc1.
// 1ad71a27124c ("f2fs: add an ioctl to disable GC for specific file")
// In android-4.4,
// 56ee1e817908 ("f2fs: updates on v4.16-rc1")
// In android-4.9,
// 2f17e34672a8 ("f2fs: updates on v4.16-rc1")
// In android-4.14,
// ce767d9a55bc ("f2fs: updates on v4.16-rc1")
#ifndef F2FS_IOC_SET_PIN_FILE
#ifndef F2FS_IOCTL_MAGIC
#define F2FS_IOCTL_MAGIC 0xf5
#endif
#define F2FS_IOC_SET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 13, __u32)
#define F2FS_IOC_GET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 14, __u32)
#endif
android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(
target.c_str(), O_WRONLY, 0)));
if (fd == -1) {
LOG(ERROR) << "Secure discard open failed for: " << target;
return 0;
}
__u32 set = 1;
ioctl(fd, F2FS_IOC_SET_PIN_FILE, &set);
LOG(DEBUG) << "Securely discarding '" << target << "' unlink=" << options.unlink; LOG(DEBUG) << "Securely discarding '" << target << "' unlink=" << options.unlink;
if (!secdiscard_path(target)) { if (!secdiscard_path(target)) {
LOG(ERROR) << "Secure discard failed for: " << target; LOG(ERROR) << "Secure discard failed for: " << target;
@ -67,6 +93,8 @@ int main(int argc, const char * const argv[]) {
PLOG(ERROR) << "Unable to unlink: " << target; PLOG(ERROR) << "Unable to unlink: " << target;
} }
} }
set = 0;
ioctl(fd, F2FS_IOC_SET_PIN_FILE, &set);
LOG(DEBUG) << "Discarded: " << target; LOG(DEBUG) << "Discarded: " << target;
} }
return 0; return 0;