aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2022-01-13 10:24:56 -0800
committerJaegeuk Kim <jaegeuk@kernel.org>2022-03-01 21:23:02 -0800
commit0d3d26dd26f528edbfa972cad3439daa2972020d (patch)
tree5a9442196353d916bb500d09e5bfb50db4e34295
parent1de1db84d2a4a0ddfe90362d07dbec1dbc423323 (diff)
downloadf2fs-tools-0d3d26dd26f528edbfa972cad3439daa2972020d.tar.gz
mkfs.f2fs: set project quota by default for -g android for v4.14+
With this patch, "-g android" enables project quota only by default, if the kernel is over v4.14. Otherwise, it enables usr/grp/proj all together. 1) -O quota : enables usr/grp 2) -O project_quota -O extra_attr : enabled prj 3) -O quota -O project_quota -O extra_attr : enables usr/grp/proj 4) -g android : enables proj (4.14+), usr/grp/proj (old kernel) 5) -g android -O project_quota -O extra_attr : enables usr/grp/proj Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--mkfs/f2fs_format_main.c35
1 files changed, 33 insertions, 2 deletions
diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
index 8d4dbe1..ad3b7ac 100644
--- a/mkfs/f2fs_format_main.c
+++ b/mkfs/f2fs_format_main.c
@@ -12,6 +12,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <string.h>
+#include <stdbool.h>
#include <unistd.h>
#include <sys/stat.h>
#ifndef ANDROID_WINDOWS_HOST
@@ -31,6 +32,9 @@
#include "quota.h"
#include "f2fs_format_utils.h"
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
#ifdef WITH_ANDROID
#include <sparse/sparse.h>
extern struct sparse_file *f2fs_sparse_file;
@@ -104,11 +108,34 @@ static void f2fs_show_info()
MSG(0, "Info: Enable Compression\n");
}
+#if defined(ANDROID_TARGET) && defined(HAVE_SYS_UTSNAME_H)
+static bool kernel_version_over(unsigned int min_major, unsigned int min_minor)
+{
+ unsigned int major, minor;
+ struct utsname uts;
+
+ if ((uname(&uts) != 0) ||
+ (sscanf(uts.release, "%u.%u", &major, &minor) != 2))
+ return false;
+ if (major > min_major)
+ return true;
+ if (major == min_major && minor >= min_minor)
+ return true;
+ return false;
+}
+#else
+static bool kernel_version_over(unsigned int UNUSED(min_major),
+ unsigned int UNUSED(min_minor))
+{
+ return false;
+}
+#endif
+
static void add_default_options(void)
{
switch (c.defset) {
case CONF_ANDROID:
- /* -d1 -f -O encrypt -O quota -O verity -w 4096 -R 0:0 */
+ /* -d1 -f -w 4096 -R 0:0 */
c.dbg_lv = 1;
force_overwrite = 1;
c.wanted_sector_size = 4096;
@@ -118,8 +145,12 @@ static void add_default_options(void)
if (c.feature & cpu_to_le32(F2FS_FEATURE_RO))
return;
+ /* -O encrypt -O project_quota,extra_attr,{quota} -O verity */
c.feature |= cpu_to_le32(F2FS_FEATURE_ENCRYPT);
- c.feature |= cpu_to_le32(F2FS_FEATURE_QUOTA_INO);
+ if (!kernel_version_over(4, 14))
+ c.feature |= cpu_to_le32(F2FS_FEATURE_QUOTA_INO);
+ c.feature |= cpu_to_le32(F2FS_FEATURE_PRJQUOTA);
+ c.feature |= cpu_to_le32(F2FS_FEATURE_EXTRA_ATTR);
c.feature |= cpu_to_le32(F2FS_FEATURE_VERITY);
break;
}