Revert "ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY"

This reverts commit e2968fb8e7980dccc199dac2593ad476db20969f.

For various reasons, we've had to start enforcing upstream that ext4
encryption can only be used if the filesystem superblock has the
EXT4_FEATURE_INCOMPAT_ENCRYPT flag set, as was the intended design.
Unfortunately, Android isn't ready for this quite yet, since its
userspace still needs to be updated to set the flag at mkfs time, or
else fix it later with tune2fs.  It will need some more time to be fixed
properly, so for now to avoid breaking some devices, revert the kernel
change.

Bug: 36231741
Signed-off-by: Eric Biggers <ebiggers@google.com>
Change-Id: I30bd54afb68dbaf9801f8954099dffa90a2f8df1

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index c21826be1cb36309ee17a2a15ffca2f854f17f1b..3a2594665b44ef672b2c33e457912009b5681468 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -626,9 +626,6 @@ resizefs_out:
                struct ext4_encryption_policy policy;
                int err = 0;
 
-               if (!ext4_has_feature_encrypt(sb))
-                       return -EOPNOTSUPP;
-
                if (copy_from_user(&policy,
                                   (struct ext4_encryption_policy __user *)arg,
                                   sizeof(policy))) {