diff options
| author | Eric Biggers | 2019-03-15 21:55:03 +0100 |
|---|---|---|
| committer | Richard Weinberger | 2019-05-07 21:36:39 +0200 |
| commit | cf3949670f709d86d975b0cfa4e65be2b40d1e78 (patch) | |
| tree | e644c1bd2d601e74d39bce0827d9350f58c4368d /fs/ubifs | |
| parent | ubifs: remove unnecessary calls to set up directory key (diff) | |
| download | kernel-qcow2-linux-cf3949670f709d86d975b0cfa4e65be2b40d1e78.tar.gz kernel-qcow2-linux-cf3949670f709d86d975b0cfa4e65be2b40d1e78.tar.xz kernel-qcow2-linux-cf3949670f709d86d975b0cfa4e65be2b40d1e78.zip | |
ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy()
When !CONFIG_FS_ENCRYPTION, fscrypt_ioctl_get_policy() is already
stubbed out to return -EOPNOTSUPP, so the extra #ifdef is not needed.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/ioctl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 82e4e6a30b04..cd1d4212fc45 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -205,13 +205,8 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return -EOPNOTSUPP; #endif } - case FS_IOC_GET_ENCRYPTION_POLICY: { -#ifdef CONFIG_FS_ENCRYPTION + case FS_IOC_GET_ENCRYPTION_POLICY: return fscrypt_ioctl_get_policy(file, (void __user *)arg); -#else - return -EOPNOTSUPP; -#endif - } default: return -ENOTTY; |