From: Eric Biggers <ebiggers@kernel.org>
To: Richard Weinberger <richard.weinberger@gmail.com>
Cc: linux-fscrypt@vger.kernel.org, linux-mtd@lists.infradead.org
Subject: Re: [PATCH] ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy()
Date: Thu, 18 Apr 2019 12:29:53 -0700 [thread overview]
Message-ID: <20190418192953.GB20640@gmail.com> (raw)
In-Reply-To: <CAFLxGvx3M61E1+Ts38BYRYu93QzmH=XMWoYYrFHTqWXUM7zREg@mail.gmail.com>
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
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-04-18 19:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-15 20:55 [PATCH] ubifs: remove unnecessary #ifdef around fscrypt_ioctl_get_policy() Eric Biggers
2019-03-15 21:08 ` Richard Weinberger
2019-04-18 19:29 ` Eric Biggers [this message]
2019-04-18 19:31 ` Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190418192953.GB20640@gmail.com \
--to=ebiggers@kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard.weinberger@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).