[PATCH v8 08/20] fscrypt: rename keyinfo.c to keysetup.c
STALE2608d
From: Eric Biggers <ebiggers@kernel.org>
Date: 2019-08-05 16:29:09
Also in:
keyrings, linux-crypto, linux-ext4, linux-f2fs-devel, linux-fscrypt, linux-fsdevel
Subsystem:
filesystems (vfs and infrastructure), fscrypt: file system level encryption support, the rest · Maintainers:
Alexander Viro, Christian Brauner, Eric Biggers, Theodore Y. Ts'o, Jaegeuk Kim, Linus Torvalds
Revision v8 of 7 in this series.
Revisions (7)
From: Eric Biggers <redacted>
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.
Signed-off-by: Eric Biggers <redacted>
---
fs/crypto/Makefile | 2 +-
fs/crypto/fscrypt_private.h | 2 +-
fs/crypto/{keyinfo.c => keysetup.c} | 0
include/linux/fscrypt.h | 4 ++--
4 files changed, 4 insertions(+), 4 deletions(-)
rename fs/crypto/{keyinfo.c => keysetup.c} (100%)
diff --git a/fs/crypto/Makefile b/fs/crypto/Makefile
index 1fba255c34ca56..ad14d4c29784a6 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 387b44b255f6ab..794dcba25ca826 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
similarity index 100%
rename from fs/crypto/keyinfo.c
rename to fs/crypto/keysetup.c
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index 81c0c754f8b21b..583802cb2e35d0 100644
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h@@ -138,7 +138,7 @@ extern int fscrypt_ioctl_get_policy(struct file *, void __user *); extern int fscrypt_has_permitted_context(struct inode *, struct inode *); extern int fscrypt_inherit_context(struct inode *, struct inode *, void *, bool); -/* keyinfo.c */ +/* keysetup.c */ extern int fscrypt_get_encryption_info(struct inode *); extern void fscrypt_put_encryption_info(struct inode *); extern void fscrypt_free_inode(struct inode *);
@@ -367,7 +367,7 @@ static inline int fscrypt_inherit_context(struct inode *parent, return -EOPNOTSUPP; } -/* keyinfo.c */ +/* keysetup.c */ static inline int fscrypt_get_encryption_info(struct inode *inode) { return -EOPNOTSUPP;
--
2.22.0.770.g0f2c4a37fd-goog