mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

eCryptfs: grammatical fix (destruct to destroy)

Browse source 
Andrew Morton wrote:
> > +int ecryptfs_destruct_crypto(void)
>
> ecryptfs_destroy_crypto would be more grammatically correct ;)

Grammatical fix for some function names.

Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michael Halcrow 2007-10-16 01:28:01 -07:00 committed by Linus Torvalds
parent af655dc6a9
commit fcd1283566
4 changed files with 11 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
fs/ecryptfs/crypto.c
View file

@ -213,12 +213,12 @@ ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat)
} }
/** /**
* ecryptfs_destruct_crypt_stat * ecryptfs_destroy_crypt_stat
* @crypt_stat: Pointer to the crypt_stat struct to initialize. * @crypt_stat: Pointer to the crypt_stat struct to initialize.
* *
* Releases all memory associated with a crypt_stat struct. * Releases all memory associated with a crypt_stat struct.
*/ */
void ecryptfs_destruct_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat) void ecryptfs_destroy_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat)
{ {
struct ecryptfs_key_sig *key_sig, *key_sig_tmp; struct ecryptfs_key_sig *key_sig, *key_sig_tmp;
@ -236,7 +236,7 @@ void ecryptfs_destruct_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat)
memset(crypt_stat, 0, sizeof(struct ecryptfs_crypt_stat)); memset(crypt_stat, 0, sizeof(struct ecryptfs_crypt_stat));
} }
void ecryptfs_destruct_mount_crypt_stat( void ecryptfs_destroy_mount_crypt_stat(
struct ecryptfs_mount_crypt_stat *mount_crypt_stat) struct ecryptfs_mount_crypt_stat *mount_crypt_stat)
{ {
struct ecryptfs_global_auth_tok *auth_tok, *auth_tok_tmp; struct ecryptfs_global_auth_tok *auth_tok, *auth_tok_tmp;
@ -1880,7 +1880,7 @@ int ecryptfs_init_crypto(void)
return 0; return 0;
} }
int ecryptfs_destruct_crypto(void) int ecryptfs_destroy_crypto(void)
{ {
struct ecryptfs_key_tfm *key_tfm, *key_tfm_tmp; struct ecryptfs_key_tfm *key_tfm, *key_tfm_tmp;

6
fs/ecryptfs/ecryptfs_kernel.h
View file

@ -516,8 +516,8 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
int ecryptfs_compute_root_iv(struct ecryptfs_crypt_stat *crypt_stat); int ecryptfs_compute_root_iv(struct ecryptfs_crypt_stat *crypt_stat);
void ecryptfs_rotate_iv(unsigned char *iv); void ecryptfs_rotate_iv(unsigned char *iv);
void ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat); void ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);
void ecryptfs_destruct_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat); void ecryptfs_destroy_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);
void ecryptfs_destruct_mount_crypt_stat( void ecryptfs_destroy_mount_crypt_stat(
struct ecryptfs_mount_crypt_stat *mount_crypt_stat); struct ecryptfs_mount_crypt_stat *mount_crypt_stat);
int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat); int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat);
int ecryptfs_crypto_api_algify_cipher_name(char **algified_name, int ecryptfs_crypto_api_algify_cipher_name(char **algified_name,
@ -620,7 +620,7 @@ int
ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name, ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name,
size_t key_size); size_t key_size);
int ecryptfs_init_crypto(void); int ecryptfs_init_crypto(void);
int ecryptfs_destruct_crypto(void); int ecryptfs_destroy_crypto(void);
int ecryptfs_get_tfm_and_mutex_for_cipher_name(struct crypto_blkcipher **tfm, int ecryptfs_get_tfm_and_mutex_for_cipher_name(struct crypto_blkcipher **tfm,
struct mutex **tfm_mutex, struct mutex **tfm_mutex,
char *cipher_name); char *cipher_name);

4
fs/ecryptfs/main.c
View file

@ -796,8 +796,8 @@ static void do_sysfs_unregistration(void)
{ {
int rc; int rc;
if ((rc = ecryptfs_destruct_crypto())) { if ((rc = ecryptfs_destroy_crypto())) {
printk(KERN_ERR "Failure whilst attempting to destruct crypto; " printk(KERN_ERR "Failure whilst attempting to destroy crypto; "
"rc = [%d]\n", rc); "rc = [%d]\n", rc);
} }
sysfs_remove_file(&ecryptfs_subsys.kobj, sysfs_remove_file(&ecryptfs_subsys.kobj,

4
fs/ecryptfs/super.c
View file

@ -73,7 +73,7 @@ static void ecryptfs_destroy_inode(struct inode *inode)
struct ecryptfs_inode_info *inode_info; struct ecryptfs_inode_info *inode_info;
inode_info = ecryptfs_inode_to_private(inode); inode_info = ecryptfs_inode_to_private(inode);
ecryptfs_destruct_crypt_stat(&inode_info->crypt_stat); ecryptfs_destroy_crypt_stat(&inode_info->crypt_stat);
kmem_cache_free(ecryptfs_inode_info_cache, inode_info); kmem_cache_free(ecryptfs_inode_info_cache, inode_info);
} }
@ -104,7 +104,7 @@ static void ecryptfs_put_super(struct super_block *sb)
{ {
struct ecryptfs_sb_info *sb_info = ecryptfs_superblock_to_private(sb); struct ecryptfs_sb_info *sb_info = ecryptfs_superblock_to_private(sb);
ecryptfs_destruct_mount_crypt_stat(&sb_info->mount_crypt_stat); ecryptfs_destroy_mount_crypt_stat(&sb_info->mount_crypt_stat);
kmem_cache_free(ecryptfs_sb_info_cache, sb_info); kmem_cache_free(ecryptfs_sb_info_cache, sb_info);
ecryptfs_set_superblock_private(sb, NULL); ecryptfs_set_superblock_private(sb, NULL);
} }