[PATCH] ubifs: use IS_ENCRYPTED() instead of ubifs_crypt_is_encrypted()

Eric Biggers ebiggers at kernel.org
Mon Jan 20 10:47:24 PST 2020


On Mon, Jan 20, 2020 at 10:44:29AM +0100, Richard Weinberger wrote:
> 
> ----- Ursprüngliche Mail -----
> > Von: "Eric Biggers" <ebiggers at kernel.org>
> > An: "Richard Weinberger" <richard.weinberger at gmail.com>
> > CC: "richard" <richard at nod.at>, "linux-mtd" <linux-mtd at lists.infradead.org>, "linux-fscrypt"
> > <linux-fscrypt at vger.kernel.org>, "Chandan Rajendra" <chandan at linux.vnet.ibm.com>
> > Gesendet: Montag, 20. Januar 2020 07:54:22
> > Betreff: Re: [PATCH] ubifs: use IS_ENCRYPTED() instead of ubifs_crypt_is_encrypted()
> 
> > On Thu, Jan 09, 2020 at 09:01:09AM +0100, Richard Weinberger wrote:
> >> On Fri, Jan 3, 2020 at 6:09 PM Eric Biggers <ebiggers at kernel.org> wrote:
> >> >
> >> > On Mon, Dec 09, 2019 at 01:27:21PM -0800, Eric Biggers wrote:
> >> > > From: Eric Biggers <ebiggers at google.com>
> >> > >
> >> > > There's no need for the ubifs_crypt_is_encrypted() function anymore.
> >> > > Just use IS_ENCRYPTED() instead, like ext4 and f2fs do.  IS_ENCRYPTED()
> >> > > checks the VFS-level flag instead of the UBIFS-specific flag, but it
> >> > > shouldn't change any behavior since the flags are kept in sync.
> >> > >
> >> > > Signed-off-by: Eric Biggers <ebiggers at google.com>
> >> > > ---
> >> > >  fs/ubifs/dir.c     | 8 ++++----
> >> > >  fs/ubifs/file.c    | 4 ++--
> >> > >  fs/ubifs/journal.c | 6 +++---
> >> > >  fs/ubifs/ubifs.h   | 7 -------
> >> > >  4 files changed, 9 insertions(+), 16 deletions(-)
> >> >
> >> > Richard, can you consider applying this to the UBIFS tree for 5.6?
> >> 
> >> Sure. I'm back from the x-mas break and start collecting patches.
> >> 
> > 
> > Ping?  I see the other UBIFS patches I sent in linux-ubifs.git#linux-next,
> > but not this one.
> 
> Oh dear, I reviewed but forgot to apply it. Now I'm already traveling without my
> kernel.org PGP keys.
> 
> The patch is simple and sane, so I'm totally fine if you carry it via fscrypt.
> Another option is that Miquel carries it via MTD this time.
> 
> In any case:
> 
> Acked-by: Richard Weinberger <richard at nod.at>
> 
> Sorry for messing this up. :-(
> 

I just went ahead and applied it to the fscrypt tree with your Acked-by, since
it doesn't conflict with anything in the UBIFS tree.  Thanks,

- Eric



More information about the linux-mtd mailing list