fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info()

fscrypt_get_encryption_info() returns 0 if the encryption key is
unavailable; it never returns ENOKEY.  So remove checks for ENOKEY.

Link: https://lore.kernel.org/r/20191209212348.243331-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 9f00fc0bf21d2ac59d8f589bd58061d091dcb478..4e093277c8bfbe5b0d45a11a8253b1f51adc9847 100644 (file)
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -120,7 +120,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
 
        if (IS_ENCRYPTED(inode)) {
                err = fscrypt_get_encryption_info(inode);
-               if (err && err != -ENOKEY)
+               if (err)
                        return err;
        }
 

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index c967cacf979ef1cb52700d7aa34d93b649a4c19b..d9ad842945df5dac94c64b46975800791fcad7bf 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -987,7 +987,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
 
        if (IS_ENCRYPTED(inode)) {
                err = fscrypt_get_encryption_info(inode);
-               if (err && err != -ENOKEY)
+               if (err)
                        goto out;
 
                err = fscrypt_fname_alloc_buffer(inode, F2FS_NAME_LEN, &fstr);

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 0b98e3c8b461dee38ca9666b152962dc37dfa9b1..acc4f942d25b6ca4184620d7d97a9ab8410fc791 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -512,7 +512,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);