Merge "cryptfs: support make_f2fs with quota"
am: 7807866abe
Change-Id: I9b52d87df0a6ddc3c29b4bd5d302e300747ad4c1
diff --git a/cryptfs.cpp b/cryptfs.cpp
index d4ac76a..5b863ba 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -1945,16 +1945,19 @@
args[0], args[1], args[2], args[3], args[4], args[5]);
} else if (type == F2FS_FS) {
args[0] = "/system/bin/make_f2fs";
- args[1] = "-t";
+ args[1] = "-f";
args[2] = "-d1";
- args[3] = "-f";
- args[4] = "-O encrypt";
- args[5] = crypto_blkdev;
+ args[3] = "-O";
+ args[4] = "encrypt";
+ args[5] = "-O";
+ args[6] = "quota";
+ args[7] = crypto_blkdev;
snprintf(size_str, sizeof(size_str), "%" PRId64, size);
- args[6] = size_str;
- num_args = 7;
- SLOGI("Making empty filesystem with command %s %s %s %s %s %s %s\n",
- args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
+ args[8] = size_str;
+ num_args = 9;
+ 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[7], args[8]);
} else {
SLOGE("cryptfs_enable_wipe(): unknown filesystem type %d\n", type);
return -1;