From 654531df2aed7a0f0025bfaaf3b71df21b33eac0 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 5 Apr 2015 20:42:58 -0400 Subject: [PATCH] tune2fs: add ability to enable the encrypt feature Signed-off-by: Theodore Ts'o --- misc/tune2fs.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 550932d..f930df2 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -149,7 +149,8 @@ static __u32 ok_features[3] = { EXT3_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_FLEX_BG | EXT4_FEATURE_INCOMPAT_MMP | - EXT4_FEATURE_INCOMPAT_64BIT, + EXT4_FEATURE_INCOMPAT_64BIT | + EXT4_FEATURE_INCOMPAT_ENCRYPT, /* R/O compat */ EXT2_FEATURE_RO_COMPAT_LARGE_FILE | EXT4_FEATURE_RO_COMPAT_HUGE_FILE| @@ -1303,6 +1304,13 @@ mmp_error: grpquota = QOPT_DISABLE; } + if (FEATURE_ON(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_ENCRYPT)) { + fs->super->s_encrypt_algos[0] = + EXT4_ENCRYPTION_MODE_AES_256_XTS; + fs->super->s_encrypt_algos[1] = + EXT4_ENCRYPTION_MODE_AES_256_CTS; + } + if (sb->s_rev_level == EXT2_GOOD_OLD_REV && (sb->s_feature_compat || sb->s_feature_ro_compat || sb->s_feature_incompat)) -- 1.8.3.1