diff options
| author | Theodore Ts'o | 2016-11-27 02:32:46 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2016-12-11 22:26:08 +0100 |
| commit | 3325bea5b26ac67e2521383f10e5ea0156c9a4b6 (patch) | |
| tree | 10786f5a7f95b56fdf38615b197aa37f068af3f5 /fs/crypto/keyinfo.c | |
| parent | fscrypto: move ioctl processing more fully into common code (diff) | |
| download | kernel-qcow2-linux-3325bea5b26ac67e2521383f10e5ea0156c9a4b6.tar.gz kernel-qcow2-linux-3325bea5b26ac67e2521383f10e5ea0156c9a4b6.tar.xz kernel-qcow2-linux-3325bea5b26ac67e2521383f10e5ea0156c9a4b6.zip | |
fscrypt: rename get_crypt_info() to fscrypt_get_crypt_info()
To avoid namespace collisions, rename get_crypt_info() to
fscrypt_get_crypt_info(). The function is only used inside the
fs/crypto directory, so declare it in the new header file,
fscrypt_private.h.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto/keyinfo.c')
| -rw-r--r-- | fs/crypto/keyinfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index 67fb6d8876d0..35d3317a27b3 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -10,7 +10,7 @@ #include <keys/user-type.h> #include <linux/scatterlist.h> -#include <linux/fscrypto.h> +#include "fscrypt_private.h" static void derive_crypt_complete(struct crypto_async_request *req, int rc) { @@ -178,7 +178,7 @@ static void put_crypt_info(struct fscrypt_info *ci) kmem_cache_free(fscrypt_info_cachep, ci); } -int get_crypt_info(struct inode *inode) +int fscrypt_get_crypt_info(struct inode *inode) { struct fscrypt_info *crypt_info; struct fscrypt_context ctx; @@ -327,7 +327,7 @@ int fscrypt_get_encryption_info(struct inode *inode) (ci->ci_keyring_key->flags & ((1 << KEY_FLAG_INVALIDATED) | (1 << KEY_FLAG_REVOKED) | (1 << KEY_FLAG_DEAD))))) - return get_crypt_info(inode); + return fscrypt_get_crypt_info(inode); return 0; } EXPORT_SYMBOL(fscrypt_get_encryption_info); |