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

Merge "cryptfs: support make_f2fs with quota" am: 7807866abe

Browse source 
am: 4d1c7765c8

Change-Id: Ica0836d567049774eeaf41d7f75d5cd83045edfe
This commit is contained in:
Jaegeuk Kim 2017-11-14 03:03:10 +00:00 committed by android-build-merger
commit 5968445892
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cryptfs.cpp
View file

@ -1938,16 +1938,19 @@ static int cryptfs_enable_wipe(char *crypto_blkdev, off64_t size, int type)
args[0], args[1], args[2], args[3], args[4], args[5]); args[0], args[1], args[2], args[3], args[4], args[5]);
} else if (type == F2FS_FS) { } else if (type == F2FS_FS) {
args[0] = "/system/bin/make_f2fs"; args[0] = "/system/bin/make_f2fs";
args[1] = "-t"; args[1] = "-f";
args[2] = "-d1"; args[2] = "-d1";
args[3] = "-f"; args[3] = "-O";
args[4] = "-O encrypt"; args[4] = "encrypt";
args[5] = crypto_blkdev; args[5] = "-O";
args[6] = "quota";
args[7] = crypto_blkdev;
snprintf(size_str, sizeof(size_str), "%" PRId64, size); snprintf(size_str, sizeof(size_str), "%" PRId64, size);
args[6] = size_str; args[8] = size_str;
num_args = 7; num_args = 9;
SLOGI("Making empty filesystem with command %s %s %s %s %s %s %s\n", SLOGI("Making empty filesystem with command %s %s %s %s %s %s %s %s %s\n",
args[0], args[1], args[2], args[3], args[4], args[5], args[6]); args[0], args[1], args[2], args[3], args[4], args[5],
args[6], args[7], args[8]);
} else { } else {
SLOGE("cryptfs_enable_wipe(): unknown filesystem type %d\n", type); SLOGE("cryptfs_enable_wipe(): unknown filesystem type %d\n", type);
return -1; return -1;