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 d0b438eff82d4924ca50585e7516e7fda5a54634..f2677c90d96e1ea140bb908c14dcab3aac49bd7e 100644 (file)
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -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[] = {
        {