Commit cf394967 authored Mar 15, 2019 by Eric Biggers Committed by Richard Weinberger May 07, 2019

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>

parent c64cda8a

fs/ubifs/ioctl.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -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;

Admin message