Messages in this thread Patch in this message | | | From | Richard Weinberger <> | Subject | [PATCH 3/4] ubifs: Simplify fscrypt_get_encryption_info() error handling | Date | Thu, 14 Mar 2019 18:15:58 +0100 |
| |
fscrypt_get_encryption_info() does not return -ENOKEY, there is no need to handle this case.
Signed-off-by: Richard Weinberger <richard@nod.at> --- fs/ubifs/dir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 5767b373a8ff..b0cb913697c5 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -526,7 +526,7 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx) if (encrypted) { err = fscrypt_get_encryption_info(dir); - if (err && err != -ENOKEY) + if (err) return err; err = fscrypt_fname_alloc_buffer(dir, UBIFS_MAX_NLEN, &fstr); @@ -794,7 +794,7 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) if (ubifs_crypt_is_encrypted(dir)) { err = fscrypt_get_encryption_info(dir); - if (err && err != -ENOKEY) + if (err) return err; } @@ -904,7 +904,7 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry) if (ubifs_crypt_is_encrypted(dir)) { err = fscrypt_get_encryption_info(dir); - if (err && err != -ENOKEY) + if (err) return err; } -- 2.21.0
| |