commit 3b1ada55b905f306411f481df52b586cc8a407b8
author Eric Biggers <ebiggers@google.com> Mon Dec 09 13:23:48 2019 -0800
committer Eric Biggers <ebiggers@google.com> Tue Dec 31 10:33:51 2019 -0600
tree 0094f32a9629ba5745aa68482804887466f48981
parent b7e8d3d27edde7a05e195e0015bc6873f6263a30

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>

fs/ext4/dir.c

diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 9f00fc0..4e09327 100644
--- 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;
 	}
 

fs/f2fs/dir.c

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index c967cac..d9ad842 100644
--- 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);

fs/ubifs/dir.c

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 0b98e3c..acc4f94 100644
--- 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);