Merge tag 'ecryptfs-4.15-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / fs / ecryptfs / main.c

diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 25aeaa7328badd90fafe2519f2ea4f65bd69e865..f2677c90d96e1ea140bb908c14dcab3aac49bd7e 100644 (file)
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -426,7 +426,7 @@ static int ecryptfs_parse_options(struct ecryptfs_sb_info *sbi, char *options,
                mount_crypt_stat->global_default_cipher_key_size);
        if (!cipher_code) {
                ecryptfs_printk(KERN_ERR,
                mount_crypt_stat->global_default_cipher_key_size);
        if (!cipher_code) {
                ecryptfs_printk(KERN_ERR,

-                               "eCryptfs doesn't support cipher: %s",
+                               "eCryptfs doesn't support cipher: %s\n",

                                mount_crypt_stat->global_default_cipher_name);
                rc = -EINVAL;
                goto out;
                                mount_crypt_stat->global_default_cipher_name);
                rc = -EINVAL;
                goto out;


@@ -781,7 +781,7 @@ static struct attribute *attributes[] = {
        NULL,
 };
 
        NULL,
 };
 

-static struct attribute_group attr_group = {
+static const struct attribute_group attr_group = {

        .attrs = attributes,
 };
 
        .attrs = attributes,
 };