Re: [PATCH] ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Mar 15, 2019 at 9:55 PM Eric Biggers <ebiggers@xxxxxxxxxx> wrote:
>
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> ---
>  fs/ubifs/ioctl.c | 7 +------
>  1 file changed, 1 insertion(+), 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;

Thanks for that one too. :-)

-- 
Thanks,
//richard

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/



[Index of Archives]     [LARTC]     [Bugtraq]     [Yosemite Forum]     [Photo]

  Powered by Linux