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

[sfrench/cifs-2.6.git] / fs / ecryptfs / main.c

diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 6b801186baa588ce996ed1a69cb6bc1dfe74b234..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,
-                               "eCryptfs doesn't support cipher: %s",
+                               "eCryptfs doesn't support cipher: %s\n",
                                mount_crypt_stat->global_default_cipher_name);
                rc = -EINVAL;
                goto out;
@@ -660,7 +660,7 @@ static struct ecryptfs_cache_info {
        struct kmem_cache **cache;
        const char *name;
        size_t size;
-       unsigned long flags;
+       slab_flags_t flags;
        void (*ctor)(void *obj);
 } ecryptfs_cache_infos[] = {
        {
@@ -781,7 +781,7 @@ static struct attribute *attributes[] = {
        NULL,
 };
 
-static struct attribute_group attr_group = {
+static const struct attribute_group attr_group = {
        .attrs = attributes,
 };