| Message ID | 20180309075312.62357-4-shengyong1@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 39bf464c35f1..c424af0ccda9 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4151,8 +4151,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) && !ext4_has_feature_encrypt(sb)) { - ext4_set_feature_encrypt(sb); - ext4_commit_super(sb, 1); + ext4_msg(sb, KERN_ERR, + "Encrypt does not support or filesystem is read-only"); + goto failed_mount_wq; } /*
When mounting with test_dummy_encryption option, if encrypt feature is not set, return fail instead of setting encrypt feature forcely. CC: linux-ext4@vger.kernel.org Signed-off-by: Sheng Yong <shengyong1@huawei.com> --- fs/ext4/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)