| Message ID | 20190315205503.195400-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy() | expand |
On Fri, Mar 15, 2019 at 9:55 PM Eric Biggers <ebiggers@kernel.org> wrote: > > From: Eric Biggers <ebiggers@google.com> > > 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> > --- > 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. :-)
On Fri, Mar 15, 2019 at 10:08:02PM +0100, Richard Weinberger wrote: > On Fri, Mar 15, 2019 at 9:55 PM Eric Biggers <ebiggers@kernel.org> wrote: > > > > From: Eric Biggers <ebiggers@google.com> > > > > 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> > > --- > > 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 Richard, can you take this through the ubifs tree for 5.2? - Eric
Am Donnerstag, 18. April 2019, 21:29:53 CEST schrieb Eric Biggers: > On Fri, Mar 15, 2019 at 10:08:02PM +0100, Richard Weinberger wrote: > > On Fri, Mar 15, 2019 at 9:55 PM Eric Biggers <ebiggers@kernel.org> wrote: > > > > > > From: Eric Biggers <ebiggers@google.com> > > > > > > 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> > > > --- > > > 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. :-) > > > > Richard, can you take this through the ubifs tree for 5.2? Sure. Queued for 5.2. :-) Thanks, //richard
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;