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>

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index ff001d9b4582cabe0c9d6ca4dfc79421993e0aa3..c10a2d2d99479c5fa790e1886e56d32259f4f5d7 100644 (file)
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -1802,8 +1802,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;
                }
@@ -1811,9 +1812,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);
@@ -1828,9 +1828,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);
@@ -1848,9 +1847,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;