diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-25 01:01:50 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-25 01:01:50 +0000 |
commit | 4992ec87d697ea4ae6c4bdf69a266993a9837db1 (patch) | |
tree | a9efafcae02ba58640ef52784deeb8838c98c74f /misc/mke2fs.c | |
parent | e7b5937033309fb350b78e894861a2fb59dbffac (diff) | |
parent | 656231487d8f0f30fb9cf1716cb994d22fbe6fb6 (diff) | |
download | e2fsprogs-4992ec87d697ea4ae6c4bdf69a266993a9837db1.tar.gz |
Snap for 6626136 from 656231487d8f0f30fb9cf1716cb994d22fbe6fb6 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: If3d1b7ea94978296321526d41f458c5598a22ddc
Diffstat (limited to 'misc/mke2fs.c')
-rw-r--r-- | misc/mke2fs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index da29ab39..879e3914 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -2460,15 +2460,6 @@ profile_error: } } - if (ext2fs_has_feature_casefold(&fs_param) && - ext2fs_has_feature_encrypt(&fs_param)) { - com_err(program_name, 0, "%s", - _("The encrypt and casefold features are not " - "compatible.\nThey can not be both enabled " - "simultaneously.\n")); - exit (1); - } - /* Don't allow user to set both metadata_csum and uninit_bg bits. */ if (ext2fs_has_feature_metadata_csum(&fs_param) && ext2fs_has_feature_gdt_csum(&fs_param)) |