Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c677e577 authored Aug 04, 2019 by Eric Biggers Committed by Jaegeuk Kim Sep 23, 2019

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>

parent 43d52193

fs/crypto/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@ obj-$(CONFIG_FS_ENCRYPTION) += fscrypto.o
	fscrypto-y := crypto.o \		fscrypto-y := crypto.o \
	fname.o \		fname.o \
	hooks.o \		hooks.o \
	keyinfo.o \		keysetup.o \
	keysetup_v1.o \		keysetup_v1.o \
	policy.o		policy.o

fs/crypto/fscrypt_private.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -156,7 +156,7 @@ extern bool fscrypt_fname_encrypted_size(const struct inode *inode,
	u32 orig_len, u32 max_len,		u32 orig_len, u32 max_len,
	u32 *encrypted_len_ret);		u32 *encrypted_len_ret);

	/* keyinfo.c */		/* keysetup.c */

	struct fscrypt_mode {		struct fscrypt_mode {
	const char *friendly_name;		const char *friendly_name;

fs/crypto/keyinfo.c→fs/crypto/keysetup.c

+0 −0

File moved.

include/linux/fscrypt.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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_has_permitted_context(struct inode , struct inode );
	extern int fscrypt_inherit_context(struct inode , struct inode ,		extern int fscrypt_inherit_context(struct inode , struct inode ,
	void *, bool);		void *, bool);
	/* keyinfo.c */		/* keysetup.c */
	extern int fscrypt_get_encryption_info(struct inode *);		extern int fscrypt_get_encryption_info(struct inode *);
	extern void fscrypt_put_encryption_info(struct inode *);		extern void fscrypt_put_encryption_info(struct inode *);
	extern void fscrypt_free_inode(struct inode *);		extern void fscrypt_free_inode(struct inode *);
	@@ -362,7 +362,7 @@ static inline int fscrypt_inherit_context(struct inode *parent,
	return -EOPNOTSUPP;		return -EOPNOTSUPP;
	}		}

	/* keyinfo.c */		/* keysetup.c */
	static inline int fscrypt_get_encryption_info(struct inode *inode)		static inline int fscrypt_get_encryption_info(struct inode *inode)
	{		{
	return -EOPNOTSUPP;		return -EOPNOTSUPP;