* [PATCH] ubifs: remove unnecessary calls to set up directory key
@ 2019-03-15 20:54 Eric Biggers
2019-03-15 21:05 ` Richard Weinberger
0 siblings, 1 reply; 3+ messages in thread
From: Eric Biggers @ 2019-03-15 20:54 UTC (permalink / raw)
To: linux-mtd; +Cc: linux-fscrypt
From: Eric Biggers <ebiggers@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@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;
--
2.21.0.360.g471c308f928-goog
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ubifs: remove unnecessary calls to set up directory key
2019-03-15 20:54 [PATCH] ubifs: remove unnecessary calls to set up directory key Eric Biggers
@ 2019-03-15 21:05 ` Richard Weinberger
2019-04-18 19:29 ` Eric Biggers
0 siblings, 1 reply; 3+ messages in thread
From: Richard Weinberger @ 2019-03-15 21:05 UTC (permalink / raw)
To: Eric Biggers; +Cc: linux-fscrypt, linux-mtd
On Fri, Mar 15, 2019 at 9:55 PM Eric Biggers <ebiggers@kernel.org> wrote:
>
> From: Eric Biggers <ebiggers@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@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
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ubifs: remove unnecessary calls to set up directory key
2019-03-15 21:05 ` Richard Weinberger
@ 2019-04-18 19:29 ` Eric Biggers
0 siblings, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2019-04-18 19:29 UTC (permalink / raw)
To: Richard Weinberger; +Cc: linux-fscrypt, linux-mtd
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@kernel.org> wrote:
> >
> > From: Eric Biggers <ebiggers@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@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
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-18 19:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-15 20:54 [PATCH] ubifs: remove unnecessary calls to set up directory key Eric Biggers
2019-03-15 21:05 ` Richard Weinberger
2019-04-18 19:29 ` Eric Biggers
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).