Merge branch 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux.git] / fs / ubifs / ioctl.c

diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c
index 3c7b29de0ca7353c039bdbb56be5c3e2d6b136f9..78d713644df3c00cf5f3be6ae51b742a47345417 100644 (file)
--- a/fs/ubifs/ioctl.c
+++ b/fs/ubifs/ioctl.c
@@ -181,6 +181,26 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                mnt_drop_write_file(file);
                return err;
        }
+       case FS_IOC_SET_ENCRYPTION_POLICY: {
+#ifdef CONFIG_UBIFS_FS_ENCRYPTION
+               struct ubifs_info *c = inode->i_sb->s_fs_info;
+
+               err = ubifs_enable_encryption(c);
+               if (err)
+                       return err;
+
+               return fscrypt_ioctl_set_policy(file, (const void __user *)arg);
+#else
+               return -EOPNOTSUPP;
+#endif
+       }
+       case FS_IOC_GET_ENCRYPTION_POLICY: {
+#ifdef CONFIG_UBIFS_FS_ENCRYPTION
+               return fscrypt_ioctl_get_policy(file, (void __user *)arg);
+#else
+               return -EOPNOTSUPP;
+#endif
+       }
 
        default:
                return -ENOTTY;