summaryrefslogtreecommitdiff
path: root/fs/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-08-05 05:35:45 +0300
committerEric Biggers <ebiggers@google.com>2019-08-13 05:06:06 +0300
commitfeed825861919ac3fac4b2ab83673dd5225f7f0d (patch)
tree847366a45149de2bd984b0b3bc4c44ced1c3e838 /fs/crypto
parent0109ce76dd6e9e69559e56ea9f10d1e12ca4a50b (diff)
downloadlinux-feed825861919ac3fac4b2ab83673dd5225f7f0d.tar.xz
fscrypt: rename keyinfo.c to keysetup.c
Rename keyinfo.c to keysetup.c since this better describes what the file does (sets up the key), and it matches the new file keysetup_v1.c. Reviewed-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto')
-rw-r--r--fs/crypto/Makefile2
-rw-r--r--fs/crypto/fscrypt_private.h2
-rw-r--r--fs/crypto/keysetup.c (renamed from fs/crypto/keyinfo.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/fs/crypto/Makefile b/fs/crypto/Makefile
index 1fba255c34ca..ad14d4c29784 100644
--- a/fs/crypto/Makefile
+++ b/fs/crypto/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_FS_ENCRYPTION) += fscrypto.o
fscrypto-y := crypto.o \
fname.o \
hooks.o \
- keyinfo.o \
+ keysetup.o \
keysetup_v1.o \
policy.o
diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h
index 387b44b255f6..794dcba25ca8 100644
--- a/fs/crypto/fscrypt_private.h
+++ b/fs/crypto/fscrypt_private.h
@@ -156,7 +156,7 @@ extern bool fscrypt_fname_encrypted_size(const struct inode *inode,
u32 orig_len, u32 max_len,
u32 *encrypted_len_ret);
-/* keyinfo.c */
+/* keysetup.c */
struct fscrypt_mode {
const char *friendly_name;
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keysetup.c
index f4a47448e9ef..f4a47448e9ef 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keysetup.c