Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[sfrench/cifs-2.6.git] / fs / ext4 / dir.c

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 0129d14629881e45c21c89a025be6fa2cec24675..1f340743c9a890152bae85c701a8650d7b76d197 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;
        }