p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fscrypt: don't special-case EOPNOTSUPP from fscrypt_get_encryption_info() 

In fscrypt_setup_filename(), remove the unnecessary check for
fscrypt_get_encryption_info() returning EOPNOTSUPP.  There's no reason
to handle this error differently from any other.  I think there may have
been some confusion because the "notsupp" version of
fscrypt_get_encryption_info() returns EOPNOTSUPP -- but that's not
applicable from inside fs/crypto/.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Eric Biggers 2018-04-30 15:51:41 -07:00 committed by Theodore Ts'o
parent 101c97a3e6
commit 17bfde6097
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/crypto/fname.c
View File

@ -335,7 +335,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,
return 0; return 0;
} }
ret = fscrypt_get_encryption_info(dir); ret = fscrypt_get_encryption_info(dir);
if (ret && ret != -EOPNOTSUPP) if (ret)
return ret; return ret;
if (dir->i_crypt_info) { if (dir->i_crypt_info) {