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

Commit fcd12835 authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

eCryptfs: grammatical fix (destruct to destroy) 



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: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af655dc6

fs/ecryptfs/crypto.c

+4 −4
Original line number Diff line number Diff line
@@ -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.

 *

 * 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;
@@ -236,7 +236,7 @@ void ecryptfs_destruct_crypt_stat(struct ecryptfs_crypt_stat *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_global_auth_tok *auth_tok, *auth_tok_tmp;
@@ -1880,7 +1880,7 @@ int ecryptfs_init_crypto(void) 
	return 0;

}



int ecryptfs_destruct_crypto(void)

int ecryptfs_destroy_crypto(void)

{

	struct ecryptfs_key_tfm *key_tfm, *key_tfm_tmp;

fs/ecryptfs/ecryptfs_kernel.h

+3 −3
Original line number Diff line number Diff line
@@ -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);

void ecryptfs_rotate_iv(unsigned char *iv);

void ecryptfs_init_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);

void ecryptfs_destruct_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);

void ecryptfs_destruct_mount_crypt_stat(

void ecryptfs_destroy_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat);

void ecryptfs_destroy_mount_crypt_stat(

	struct ecryptfs_mount_crypt_stat *mount_crypt_stat);

int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat);

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,

			 size_t key_size);

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,

					       struct mutex **tfm_mutex,

					       char *cipher_name);

fs/ecryptfs/main.c

+2 −2
Original line number Diff line number Diff line
@@ -796,8 +796,8 @@ static void do_sysfs_unregistration(void) 
{

	int rc;



	if ((rc = ecryptfs_destruct_crypto())) {

		printk(KERN_ERR "Failure whilst attempting to destruct crypto; "

	if ((rc = ecryptfs_destroy_crypto())) {

		printk(KERN_ERR "Failure whilst attempting to destroy crypto; "

		       "rc = [%d]\n", rc);

	}

	sysfs_remove_file(&ecryptfs_subsys.kobj,

fs/ecryptfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void ecryptfs_destroy_inode(struct inode *inode) 
	struct ecryptfs_inode_info *inode_info;



	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);

}
@@ -104,7 +104,7 @@ static void ecryptfs_put_super(struct super_block *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);

	ecryptfs_set_superblock_private(sb, NULL);

}