diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-12-13 03:50:28 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-12-13 03:50:28 +0100 |
| commit | a551d7c8deefb6d9fb45a1de03a617dd064e0419 (patch) | |
| tree | c58f83ef3edd83d55f8f574cfe7ba023e029090b /fs/ext4/ioctl.c | |
| parent | dax: Fix sleep in atomic contex in grab_mapping_entry() (diff) | |
| parent | fscrypt: Rename FS_WRITE_PATH_FL to FS_CTX_HAS_BOUNCE_BUFFER_FL (diff) | |
| download | linux-a551d7c8deefb6d9fb45a1de03a617dd064e0419.tar.xz linux-a551d7c8deefb6d9fb45a1de03a617dd064e0419.zip | |
Merge branch 'fscrypt' into dev
Diffstat (limited to 'fs/ext4/ioctl.c')
| -rw-r--r-- | fs/ext4/ioctl.c | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index fcc9510a819c..49fd1371bfa2 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -787,22 +787,12 @@ resizefs_out: } case EXT4_IOC_PRECACHE_EXTENTS: return ext4_ext_precache(inode); - case EXT4_IOC_SET_ENCRYPTION_POLICY: { -#ifdef CONFIG_EXT4_FS_ENCRYPTION - struct fscrypt_policy policy; + case EXT4_IOC_SET_ENCRYPTION_POLICY: if (!ext4_has_feature_encrypt(sb)) return -EOPNOTSUPP; + return fscrypt_ioctl_set_policy(filp, (const void __user *)arg); - if (copy_from_user(&policy, - (struct fscrypt_policy __user *)arg, - sizeof(policy))) - return -EFAULT; - return fscrypt_process_policy(filp, &policy); -#else - return -EOPNOTSUPP; -#endif - } case EXT4_IOC_GET_ENCRYPTION_PWSALT: { #ifdef CONFIG_EXT4_FS_ENCRYPTION int err, err2; @@ -843,23 +833,9 @@ resizefs_out: return -EOPNOTSUPP; #endif } - case EXT4_IOC_GET_ENCRYPTION_POLICY: { -#ifdef CONFIG_EXT4_FS_ENCRYPTION - struct fscrypt_policy policy; - int err = 0; + case EXT4_IOC_GET_ENCRYPTION_POLICY: + return fscrypt_ioctl_get_policy(filp, (void __user *)arg); - if (!ext4_encrypted_inode(inode)) - return -ENOENT; - err = fscrypt_get_policy(inode, &policy); - if (err) - return err; - if (copy_to_user((void __user *)arg, &policy, sizeof(policy))) - return -EFAULT; - return 0; -#else - return -EOPNOTSUPP; -#endif - } case EXT4_IOC_FSGETXATTR: { struct fsxattr fa; |