These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ext2 / super.c

diff --git a/kernel/fs/ext2/super.c b/kernel/fs/ext2/super.c
index d0e746e..748d35a 100644 (file)
--- a/kernel/fs/ext2/super.c
+++ b/kernel/fs/ext2/super.c
@@ -192,6 +192,9 @@ static void init_once(void *foo)
        init_rwsem(&ei->xattr_sem);
 #endif
        mutex_init(&ei->truncate_mutex);
+#ifdef CONFIG_FS_DAX
+       init_rwsem(&ei->dax_sem);
+#endif
        inode_init_once(&ei->vfs_inode);
 }
 
@@ -566,6 +569,8 @@ static int parse_options(char *options, struct super_block *sb)
                        /* Fall through */
                case Opt_dax:
 #ifdef CONFIG_FS_DAX
+                       ext2_msg(sb, KERN_WARNING,
+               "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
                        set_opt(sbi->s_mount_opt, DAX);
 #else
                        ext2_msg(sb, KERN_INFO, "dax option not supported");
@@ -882,6 +887,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
                 MS_POSIXACL : 0);
+       sb->s_iflags |= SB_I_CGROUPWB;
 
        if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV &&
            (EXT2_HAS_COMPAT_FEATURE(sb, ~0U) ||