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

Commit bece9b92 authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

fscrypt: remove unnecessary extern keywords 

Remove the unnecessary 'extern' keywords from function declarations.
This makes it so that we don't have a mix of both styles, so it won't be
ambiguous what to use in new fscrypt patches.  This also makes the code
shorter and matches the 'checkpatch --strict' expectation.

Link: https://lore.kernel.org/r/20200511191358.53096-4-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 612381d5

fs/crypto/fscrypt_private.h

+40 −44
Original line number Diff line number Diff line
@@ -231,15 +231,14 @@ typedef enum { 


/* crypto.c */

extern struct kmem_cache *fscrypt_info_cachep;

extern int fscrypt_initialize(unsigned int cop_flags);

extern int fscrypt_crypt_block(const struct inode *inode,

			       fscrypt_direction_t rw, u64 lblk_num,

			       struct page *src_page, struct page *dest_page,

			       unsigned int len, unsigned int offs,

			       gfp_t gfp_flags);

extern struct page *fscrypt_alloc_bounce_page(gfp_t gfp_flags);



extern void __printf(3, 4) __cold

int fscrypt_initialize(unsigned int cop_flags);

int fscrypt_crypt_block(const struct inode *inode, fscrypt_direction_t rw,

			u64 lblk_num, struct page *src_page,

			struct page *dest_page, unsigned int len,

			unsigned int offs, gfp_t gfp_flags);

struct page *fscrypt_alloc_bounce_page(gfp_t gfp_flags);



void __printf(3, 4) __cold

fscrypt_msg(const struct inode *inode, const char *level, const char *fmt, ...);



#define fscrypt_warn(inode, fmt, ...)		\
@@ -264,12 +263,10 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 lblk_num, 
			 const struct fscrypt_info *ci);



/* fname.c */

extern int fscrypt_fname_encrypt(const struct inode *inode,

				 const struct qstr *iname,

int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname,

			  u8 *out, unsigned int olen);

extern bool fscrypt_fname_encrypted_size(const struct inode *inode,

					 u32 orig_len, u32 max_len,

					 u32 *encrypted_len_ret);

bool fscrypt_fname_encrypted_size(const struct inode *inode, u32 orig_len,

				  u32 max_len, u32 *encrypted_len_ret);

extern const struct dentry_operations fscrypt_d_ops;



/* hkdf.c */
@@ -278,7 +275,7 @@ struct fscrypt_hkdf { 
	struct crypto_shash *hmac_tfm;

};



extern int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key,

int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key,

		      unsigned int master_key_size);



/*
@@ -294,11 +291,11 @@ extern int fscrypt_init_hkdf(struct fscrypt_hkdf *hkdf, const u8 *master_key, 
#define HKDF_CONTEXT_IV_INO_LBLK_64_KEY	4

#define HKDF_CONTEXT_DIRHASH_KEY	5



extern int fscrypt_hkdf_expand(const struct fscrypt_hkdf *hkdf, u8 context,

int fscrypt_hkdf_expand(const struct fscrypt_hkdf *hkdf, u8 context,

			const u8 *info, unsigned int infolen,

			u8 *okm, unsigned int okmlen);



extern void fscrypt_destroy_hkdf(struct fscrypt_hkdf *hkdf);

void fscrypt_destroy_hkdf(struct fscrypt_hkdf *hkdf);



/* keyring.c */
@@ -436,14 +433,14 @@ static inline int master_key_spec_len(const struct fscrypt_key_specifier *spec) 
	return 0;

}



extern struct key *

struct key *

fscrypt_find_master_key(struct super_block *sb,

			const struct fscrypt_key_specifier *mk_spec);



extern int fscrypt_verify_key_added(struct super_block *sb,

int fscrypt_verify_key_added(struct super_block *sb,

			     const u8 identifier[FSCRYPT_KEY_IDENTIFIER_SIZE]);



extern int __init fscrypt_init_keyring(void);

int __init fscrypt_init_keyring(void);



/* keysetup.c */
@@ -457,32 +454,31 @@ struct fscrypt_mode { 


extern struct fscrypt_mode fscrypt_modes[];



extern struct crypto_skcipher *

fscrypt_allocate_skcipher(struct fscrypt_mode *mode, const u8 *raw_key,

struct crypto_skcipher *fscrypt_allocate_skcipher(struct fscrypt_mode *mode,

						  const u8 *raw_key,

						  const struct inode *inode);



extern int fscrypt_set_per_file_enc_key(struct fscrypt_info *ci,

					const u8 *raw_key);

int fscrypt_set_per_file_enc_key(struct fscrypt_info *ci, const u8 *raw_key);



extern int fscrypt_derive_dirhash_key(struct fscrypt_info *ci,

int fscrypt_derive_dirhash_key(struct fscrypt_info *ci,

			       const struct fscrypt_master_key *mk);



/* keysetup_v1.c */



extern void fscrypt_put_direct_key(struct fscrypt_direct_key *dk);

void fscrypt_put_direct_key(struct fscrypt_direct_key *dk);



extern int fscrypt_setup_v1_file_key(struct fscrypt_info *ci,

int fscrypt_setup_v1_file_key(struct fscrypt_info *ci,

			      const u8 *raw_master_key);



extern int fscrypt_setup_v1_file_key_via_subscribed_keyrings(

					struct fscrypt_info *ci);

int fscrypt_setup_v1_file_key_via_subscribed_keyrings(struct fscrypt_info *ci);



/* policy.c */



extern bool fscrypt_policies_equal(const union fscrypt_policy *policy1,

bool fscrypt_policies_equal(const union fscrypt_policy *policy1,

			    const union fscrypt_policy *policy2);

extern bool fscrypt_supported_policy(const union fscrypt_policy *policy_u,

bool fscrypt_supported_policy(const union fscrypt_policy *policy_u,

			      const struct inode *inode);

extern int fscrypt_policy_from_context(union fscrypt_policy *policy_u,

int fscrypt_policy_from_context(union fscrypt_policy *policy_u,

				const union fscrypt_context *ctx_u,

				int ctx_size);

include/linux/fscrypt.h

+70 −73
Original line number Diff line number Diff line
@@ -108,22 +108,21 @@ static inline void fscrypt_handle_d_move(struct dentry *dentry) 
}



/* crypto.c */

extern void fscrypt_enqueue_decrypt_work(struct work_struct *);

void fscrypt_enqueue_decrypt_work(struct work_struct *);



extern struct page *fscrypt_encrypt_pagecache_blocks(struct page *page,

struct page *fscrypt_encrypt_pagecache_blocks(struct page *page,

					      unsigned int len,

					      unsigned int offs,

					      gfp_t gfp_flags);

extern int fscrypt_encrypt_block_inplace(const struct inode *inode,

					 struct page *page, unsigned int len,

					 unsigned int offs, u64 lblk_num,

					 gfp_t gfp_flags);

int fscrypt_encrypt_block_inplace(const struct inode *inode, struct page *page,

				  unsigned int len, unsigned int offs,

				  u64 lblk_num, gfp_t gfp_flags);



extern int fscrypt_decrypt_pagecache_blocks(struct page *page, unsigned int len,

int fscrypt_decrypt_pagecache_blocks(struct page *page, unsigned int len,

				     unsigned int offs);

extern int fscrypt_decrypt_block_inplace(const struct inode *inode,

					 struct page *page, unsigned int len,

					 unsigned int offs, u64 lblk_num);

int fscrypt_decrypt_block_inplace(const struct inode *inode, struct page *page,

				  unsigned int len, unsigned int offs,

				  u64 lblk_num);



static inline bool fscrypt_is_bounce_page(struct page *page)

{
@@ -135,34 +134,32 @@ static inline struct page *fscrypt_pagecache_page(struct page *bounce_page) 
	return (struct page *)page_private(bounce_page);

}



extern void fscrypt_free_bounce_page(struct page *bounce_page);

void fscrypt_free_bounce_page(struct page *bounce_page);



/* policy.c */

extern int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg);

extern int fscrypt_ioctl_get_policy(struct file *filp, void __user *arg);

extern int fscrypt_ioctl_get_policy_ex(struct file *filp, void __user *arg);

extern int fscrypt_ioctl_get_nonce(struct file *filp, void __user *arg);

extern int fscrypt_has_permitted_context(struct inode *parent,

					 struct inode *child);

extern int fscrypt_inherit_context(struct inode *parent, struct inode *child,

int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg);

int fscrypt_ioctl_get_policy(struct file *filp, void __user *arg);

int fscrypt_ioctl_get_policy_ex(struct file *filp, void __user *arg);

int fscrypt_ioctl_get_nonce(struct file *filp, void __user *arg);

int fscrypt_has_permitted_context(struct inode *parent, struct inode *child);

int fscrypt_inherit_context(struct inode *parent, struct inode *child,

			    void *fs_data, bool preload);



/* keyring.c */

extern void fscrypt_sb_free(struct super_block *sb);

extern int fscrypt_ioctl_add_key(struct file *filp, void __user *arg);

extern int fscrypt_ioctl_remove_key(struct file *filp, void __user *arg);

extern int fscrypt_ioctl_remove_key_all_users(struct file *filp,

					      void __user *arg);

extern int fscrypt_ioctl_get_key_status(struct file *filp, void __user *arg);

void fscrypt_sb_free(struct super_block *sb);

int fscrypt_ioctl_add_key(struct file *filp, void __user *arg);

int fscrypt_ioctl_remove_key(struct file *filp, void __user *arg);

int fscrypt_ioctl_remove_key_all_users(struct file *filp, void __user *arg);

int fscrypt_ioctl_get_key_status(struct file *filp, void __user *arg);



/* keysetup.c */

extern int fscrypt_get_encryption_info(struct inode *inode);

extern void fscrypt_put_encryption_info(struct inode *inode);

extern void fscrypt_free_inode(struct inode *inode);

extern int fscrypt_drop_inode(struct inode *inode);

int fscrypt_get_encryption_info(struct inode *inode);

void fscrypt_put_encryption_info(struct inode *inode);

void fscrypt_free_inode(struct inode *inode);

int fscrypt_drop_inode(struct inode *inode);



/* fname.c */

extern int fscrypt_setup_filename(struct inode *inode, const struct qstr *iname,

int fscrypt_setup_filename(struct inode *inode, const struct qstr *iname,

			   int lookup, struct fscrypt_name *fname);



static inline void fscrypt_free_filename(struct fscrypt_name *fname)
@@ -170,46 +167,46 @@ static inline void fscrypt_free_filename(struct fscrypt_name *fname) 
	kfree(fname->crypto_buf.name);

}



extern int fscrypt_fname_alloc_buffer(const struct inode *inode,

				      u32 max_encrypted_len,

int fscrypt_fname_alloc_buffer(const struct inode *inode, u32 max_encrypted_len,

			       struct fscrypt_str *crypto_str);

extern void fscrypt_fname_free_buffer(struct fscrypt_str *crypto_str);

extern int fscrypt_fname_disk_to_usr(const struct inode *inode,

void fscrypt_fname_free_buffer(struct fscrypt_str *crypto_str);

int fscrypt_fname_disk_to_usr(const struct inode *inode,

			      u32 hash, u32 minor_hash,

			      const struct fscrypt_str *iname,

			      struct fscrypt_str *oname);

extern bool fscrypt_match_name(const struct fscrypt_name *fname,

bool fscrypt_match_name(const struct fscrypt_name *fname,

			const u8 *de_name, u32 de_name_len);

extern u64 fscrypt_fname_siphash(const struct inode *dir,

				 const struct qstr *name);

u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name);



/* bio.c */

extern void fscrypt_decrypt_bio(struct bio *bio);

extern int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,

void fscrypt_decrypt_bio(struct bio *bio);

int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,

			  sector_t pblk, unsigned int len);



/* hooks.c */

extern int fscrypt_file_open(struct inode *inode, struct file *filp);

extern int __fscrypt_prepare_link(struct inode *inode, struct inode *dir,

int fscrypt_file_open(struct inode *inode, struct file *filp);

int __fscrypt_prepare_link(struct inode *inode, struct inode *dir,

			   struct dentry *dentry);

extern int __fscrypt_prepare_rename(struct inode *old_dir,

				    struct dentry *old_dentry,

				    struct inode *new_dir,

				    struct dentry *new_dentry,

int __fscrypt_prepare_rename(struct inode *old_dir, struct dentry *old_dentry,

			     struct inode *new_dir, struct dentry *new_dentry,

			     unsigned int flags);

extern int __fscrypt_prepare_lookup(struct inode *dir, struct dentry *dentry,

int __fscrypt_prepare_lookup(struct inode *dir, struct dentry *dentry,

			     struct fscrypt_name *fname);

extern int fscrypt_prepare_setflags(struct inode *inode,

int fscrypt_prepare_setflags(struct inode *inode,

			     unsigned int oldflags, unsigned int flags);

extern int __fscrypt_prepare_symlink(struct inode *dir, unsigned int len,

int __fscrypt_prepare_symlink(struct inode *dir, unsigned int len,

			      unsigned int max_len,

			      struct fscrypt_str *disk_link);

extern int __fscrypt_encrypt_symlink(struct inode *inode, const char *target,

				     unsigned int len,

				     struct fscrypt_str *disk_link);

extern const char *fscrypt_get_symlink(struct inode *inode, const void *caddr,

int __fscrypt_encrypt_symlink(struct inode *inode, const char *target,

			      unsigned int len, struct fscrypt_str *disk_link);

const char *fscrypt_get_symlink(struct inode *inode, const void *caddr,

				unsigned int max_size,

				struct delayed_call *done);

static inline void fscrypt_set_ops(struct super_block *sb,

				   const struct fscrypt_operations *s_cop)

{

	sb->s_cop = s_cop;

}

#else  /* !CONFIG_FS_ENCRYPTION */



static inline bool fscrypt_has_encryption_key(const struct inode *inode)