From 8de9f065a4f6437ab0c9a9d69d5dff614471f522 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Wed, 1 Nov 2017 10:35:30 -0700 Subject: [PATCH] cryptfs: support make_f2fs with quota Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4 Signed-off-by: Jaegeuk Kim --- cryptfs.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/cryptfs.cpp b/cryptfs.cpp index d4ac76a..5b863ba 100644 --- a/cryptfs.cpp +++ b/cryptfs.cpp @@ -1945,16 +1945,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]); } 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;