diff options
| author | Daniel Rosenberg <drosen@google.com> | 2020-06-24 22:31:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 22:31:17 +0000 |
| commit | 69eb917828307ab6d11823fa394fede1d47f6b8a (patch) | |
| tree | bb23bb66c95a5894dee88b105553cb80e185f0b9 | |
| parent | c5d2af2e669543f57b69602a5fe1c744908c34a9 (diff) | |
| parent | 5507593a03183b193c2684458148484010879dca (diff) | |
| download | e2fsprogs-69eb917828307ab6d11823fa394fede1d47f6b8a.tar.gz | |
ANDROID: tune2fs: Support encrypt+casefold am: 5507593a03
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11835203
Change-Id: Id85efdff53cb63e3245055389cb21191ec5c0363
| -rw-r--r-- | misc/tune2fs.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/misc/tune2fs.c b/misc/tune2fs.c index d9aba852..b01497cb 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -1405,12 +1405,6 @@ mmp_error: } if (FEATURE_ON(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_ENCRYPT)) { - if (ext2fs_has_feature_casefold(sb)) { - fputs(_("Cannot enable encrypt feature on filesystems " - "with the encoding feature enabled.\n"), - stderr); - return 1; - } fs->super->s_encrypt_algos[0] = EXT4_ENCRYPTION_MODE_AES_256_XTS; fs->super->s_encrypt_algos[1] = @@ -1418,12 +1412,6 @@ mmp_error: } if (FEATURE_ON(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_CASEFOLD)) { - if (ext2fs_has_feature_encrypt(sb)) { - fputs(_("Cannot enable casefold feature on filesystems " - "with the encrypt feature enabled.\n"), - stderr); - return 1; - } if (mount_flags & EXT2_MF_MOUNTED) { fputs(_("The casefold feature may only be enabled when " "the filesystem is unmounted.\n"), stderr); @@ -2173,11 +2161,6 @@ static int parse_extended_opts(ext2_filsys fs, const char *opts) r_usage++; continue; } - if (ext2fs_has_feature_encrypt(sb)) { - fprintf(stderr, _("error: Cannot enable casefolding if encryption is set\n")); - r_usage++; - continue; - } if (mount_flags & EXT2_MF_MOUNTED) { fputs(_("The casefold feature may only be enabled when " "the filesystem is unmounted.\n"), stderr); |