tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <thorsten.blum@linux.dev>
Signed-off-by: Tyler Hicks <code@tyhicks.com>

authored by

Thorsten Blum and committed by
Tyler Hicks fb1b02dc 3b7f363b

+10 -11
+10 -11
fs/ecryptfs/crypto.c
··· 1802 1802 filename->filename_size = name_size; 1803 1803 rc = ecryptfs_encrypt_filename(filename, mount_crypt_stat); 1804 1804 if (rc) { 1805 - printk(KERN_ERR "%s: Error attempting to encrypt " 1806 - "filename; rc = [%d]\n", __func__, rc); 1805 + ecryptfs_printk(KERN_ERR, 1806 + "Error attempting to encrypt filename; rc = [%d]\n", 1807 + rc); 1807 1808 kfree(filename); 1808 1809 goto out; 1809 1810 } ··· 1812 1811 NULL, &encoded_name_no_prefix_size, 1813 1812 filename->encrypted_filename, 1814 1813 filename->encrypted_filename_size); 1815 - if (mount_crypt_stat 1816 - && (mount_crypt_stat->flags 1817 - & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK)) 1814 + if (mount_crypt_stat->flags 1815 + & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK) 1818 1816 (*encoded_name_size) = 1819 1817 (ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE 1820 1818 + encoded_name_no_prefix_size); ··· 1828 1828 kfree(filename); 1829 1829 goto out; 1830 1830 } 1831 - if (mount_crypt_stat 1832 - && (mount_crypt_stat->flags 1833 - & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK)) { 1831 + if (mount_crypt_stat->flags 1832 + & ECRYPTFS_GLOBAL_ENCFN_USE_MOUNT_FNEK) { 1834 1833 memcpy((*encoded_name), 1835 1834 ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX, 1836 1835 ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE); ··· 1847 1848 rc = -EOPNOTSUPP; 1848 1849 } 1849 1850 if (rc) { 1850 - printk(KERN_ERR "%s: Error attempting to encode " 1851 - "encrypted filename; rc = [%d]\n", __func__, 1852 - rc); 1851 + ecryptfs_printk(KERN_ERR, 1852 + "Error attempting to encode encrypted filename; rc = [%d]\n", 1853 + rc); 1853 1854 kfree((*encoded_name)); 1854 1855 (*encoded_name) = NULL; 1855 1856 (*encoded_name_size) = 0;