[PATCH] ubifs: remove unnecessary calls to set up directory key

Eric Biggers ebiggers at kernel.org
Thu Apr 18 12:29:32 PDT 2019


On Fri, Mar 15, 2019 at 10:05:59PM +0100, Richard Weinberger wrote:
> On Fri, Mar 15, 2019 at 9:55 PM Eric Biggers <ebiggers at kernel.org> wrote:
> >
> > From: Eric Biggers <ebiggers at google.com>
> >
> > In ubifs_unlink() and ubifs_rmdir(), remove the call to
> > fscrypt_get_encryption_info() that precedes fscrypt_setup_filename().
> > This call was unnecessary, because fscrypt_setup_filename() already
> > tries to set up the directory's encryption key.
> >
> > Signed-off-by: Eric Biggers <ebiggers at google.com>
> > ---
> >  fs/ubifs/dir.c | 12 ------------
> >  1 file changed, 12 deletions(-)
> >
> > diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
> > index 5767b373a8ff..c3311ea68fe5 100644
> > --- a/fs/ubifs/dir.c
> > +++ b/fs/ubifs/dir.c
> > @@ -792,12 +792,6 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry)
> >                 dentry, inode->i_ino,
> >                 inode->i_nlink, dir->i_ino);
> >
> > -       if (ubifs_crypt_is_encrypted(dir)) {
> > -               err = fscrypt_get_encryption_info(dir);
> > -               if (err && err != -ENOKEY)
> > -                       return err;
> > -       }
> > -
> >         err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &nm);
> >         if (err)
> >                 return err;
> > @@ -902,12 +896,6 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
> >         if (err)
> >                 return err;
> >
> > -       if (ubifs_crypt_is_encrypted(dir)) {
> > -               err = fscrypt_get_encryption_info(dir);
> > -               if (err && err != -ENOKEY)
> > -                       return err;
> > -       }
> > -
> >         err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &nm);
> >         if (err)
> >                 return err;
> 
> Thanks for the cleanup, Eric!
> 
> -- 
> Thanks,
> //richard

Richard, can you take this through the ubifs tree for 5.2?

- Eric



More information about the linux-mtd mailing list