Skip to content

Commit

Permalink
ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Biggers authored and Richard Weinberger committed May 7, 2019
1 parent c64cda8 commit cf39496
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions fs/ubifs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit cf39496

Please sign in to comment.