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/fname.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/fname.c')
| -rw-r--r-- | fs/crypto/fname.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 6b45d9caeeb0..56ad9d195f18 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -12,7 +12,7 @@ #include <linux/scatterlist.h> #include <linux/ratelimit.h> -#include <linux/fscrypto.h> +#include "fscrypt_private.h" /** * fname_crypt_complete() - completion callback for filename crypto @@ -350,7 +350,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, fname->disk_name.len = iname->len; return 0; } - ret = get_crypt_info(dir); + ret = fscrypt_get_crypt_info(dir); if (ret && ret != -EOPNOTSUPP) return ret; |