ecryptfs: Remove redundant if checks in encrypt_and_encode_filename
PATCH 1/1 ecryptfs: Remove redundant if checks in encrypt_and_encode_filename
The outer if already checks if 'mount_crypt_stat' is true. Drop checking 'mount_crypt_stat' again. Use ecryptfs_printk() while we're at it.
Signed-off-by Thorsten Blum <[email protected]>
--- fs/ecryptfs/crypto.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
fs/ecryptfs/crypto.c +10 -11
@@ -1818,8 +1818,9 @@ int ecryptfs_encrypt_and_encode_filename( filename->filename_size = name_size; rc =ecryptfs_encrypt_filename (filename, mount_crypt_stat);if (rc) { -printk (KERN_ERR "%s: Error attempting to encrypt " -"filename; rc = [%d]\n" , __func__, rc); +ecryptfs_printk (KERN_ERR , +"Error attempting to encrypt filename; rc = [%d]\n" , + rc);kfree (filename); goto out; }
@@ -1827,9 +1828,8 @@ int ecryptfs_encrypt_and_encode_filename(NULL , &encoded_name_no_prefix_size, filename->encrypted_filename, filename->encrypted_filename_size); -if (mount_crypt_stat - && (mount_crypt_stat->flags - &ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK )) +if (mount_crypt_stat->flags + &ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK ) (*encoded_name_size) = (ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE + encoded_name_no_prefix_size);
@@ -1844,9 +1844,8 @@ int ecryptfs_encrypt_and_encode_filename(kfree (filename); goto out; } -if (mount_crypt_stat - && (mount_crypt_stat->flags - &ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK )) { +if (mount_crypt_stat->flags + &ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK ) {memcpy ((*encoded_name),ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX ,ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE );
@@ -1864,9 +1863,9 @@ int ecryptfs_encrypt_and_encode_filename( rc = -EOPNOTSUPP ; }if (rc) { -printk (KERN_ERR "%s: Error attempting to encode " -"encrypted filename; rc = [%d]\n" , __func__, - rc); +ecryptfs_printk (KERN_ERR , +"Error attempting to encode encrypted filename; rc = [%d]\n" , + rc);kfree ((*encoded_name)); (*encoded_name) =NULL ; (*encoded_name_size) =0 ;
Signature · 2 lines
Thorsten Blum <[email protected]> GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4