diff options
| author | Daniel Rosenberg <drosen@google.com> | 2020-06-24 22:31:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 22:31:19 +0000 |
| commit | ce190a697c68bf81806e1fcfdebc1e953d327b02 (patch) | |
| tree | c0b034292c6914416083821710296bf4c3e3be9d | |
| parent | 69eb917828307ab6d11823fa394fede1d47f6b8a (diff) | |
| parent | 4e37e48fd37040a069776abd7f6f04bfd52f6e6c (diff) | |
| download | e2fsprogs-ce190a697c68bf81806e1fcfdebc1e953d327b02.tar.gz | |
ANDROID: mke2fs: Support encrypt+casefold am: 4e37e48fd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835204
Change-Id: I1fbcab417833b19b697d1a8a2a135d7afc53d22b
| -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)) |