Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[cascardo/linux.git] / fs / ext2 / super.c

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index ae55fdd..d0e746e 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -35,7 +35,6 @@
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
-#include "xip.h"
 
 static void ext2_sync_super(struct super_block *sb,
                            struct ext2_super_block *es, int wait);
@@ -292,9 +291,11 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
                seq_puts(seq, ",grpquota");
 #endif
 
-#if defined(CONFIG_EXT2_FS_XIP)
+#ifdef CONFIG_FS_DAX
        if (sbi->s_mount_opt & EXT2_MOUNT_XIP)
                seq_puts(seq, ",xip");
+       if (sbi->s_mount_opt & EXT2_MOUNT_DAX)
+               seq_puts(seq, ",dax");
 #endif
 
        if (!test_opt(sb, RESERVATION))
@@ -403,7 +404,7 @@ enum {
        Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic,
        Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
        Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
-       Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota,
+       Opt_acl, Opt_noacl, Opt_xip, Opt_dax, Opt_ignore, Opt_err, Opt_quota,
        Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
 };
 
@@ -432,6 +433,7 @@ static const match_table_t tokens = {
        {Opt_acl, "acl"},
        {Opt_noacl, "noacl"},
        {Opt_xip, "xip"},
+       {Opt_dax, "dax"},
        {Opt_grpquota, "grpquota"},
        {Opt_ignore, "noquota"},
        {Opt_quota, "quota"},
@@ -559,10 +561,14 @@ static int parse_options(char *options, struct super_block *sb)
                        break;
 #endif
                case Opt_xip:
-#ifdef CONFIG_EXT2_FS_XIP
-                       set_opt (sbi->s_mount_opt, XIP);
+                       ext2_msg(sb, KERN_INFO, "use dax instead of xip");
+                       set_opt(sbi->s_mount_opt, XIP);
+                       /* Fall through */
+               case Opt_dax:
+#ifdef CONFIG_FS_DAX
+                       set_opt(sbi->s_mount_opt, DAX);
 #else
-                       ext2_msg(sb, KERN_INFO, "xip option not supported");
+                       ext2_msg(sb, KERN_INFO, "dax option not supported");
 #endif
                        break;
 
@@ -877,9 +883,6 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
                ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
                 MS_POSIXACL : 0);
 
-       ext2_xip_verify_sb(sb); /* see if bdev supports xip, unset
-                                   EXT2_MOUNT_XIP if not */
-
        if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV &&
            (EXT2_HAS_COMPAT_FEATURE(sb, ~0U) ||
             EXT2_HAS_RO_COMPAT_FEATURE(sb, ~0U) ||
@@ -909,11 +912,17 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
 
        blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);
 
-       if (ext2_use_xip(sb) && blocksize != PAGE_SIZE) {
-               if (!silent)
+       if (sbi->s_mount_opt & EXT2_MOUNT_DAX) {
+               if (blocksize != PAGE_SIZE) {
                        ext2_msg(sb, KERN_ERR,
-                               "error: unsupported blocksize for xip");
-               goto failed_mount;
+                                       "error: unsupported blocksize for dax");
+                       goto failed_mount;
+               }
+               if (!sb->s_bdev->bd_disk->fops->direct_access) {
+                       ext2_msg(sb, KERN_ERR,
+                                       "error: device does not support dax");
+                       goto failed_mount;
+               }
        }
 
        /* If the blocksize doesn't match, re-read the thing.. */
@@ -1259,7 +1268,6 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
 {
        struct ext2_sb_info * sbi = EXT2_SB(sb);
        struct ext2_super_block * es;
-       unsigned long old_mount_opt = sbi->s_mount_opt;
        struct ext2_mount_options old_opts;
        unsigned long old_sb_flags;
        int err;
@@ -1284,22 +1292,11 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
 
-       ext2_xip_verify_sb(sb); /* see if bdev supports xip, unset
-                                   EXT2_MOUNT_XIP if not */
-
-       if ((ext2_use_xip(sb)) && (sb->s_blocksize != PAGE_SIZE)) {
-               ext2_msg(sb, KERN_WARNING,
-                       "warning: unsupported blocksize for xip");
-               err = -EINVAL;
-               goto restore_opts;
-       }
-
        es = sbi->s_es;
-       if ((sbi->s_mount_opt ^ old_mount_opt) & EXT2_MOUNT_XIP) {
+       if ((sbi->s_mount_opt ^ old_opts.s_mount_opt) & EXT2_MOUNT_DAX) {
                ext2_msg(sb, KERN_WARNING, "warning: refusing change of "
-                        "xip flag with busy inodes while remounting");
-               sbi->s_mount_opt &= ~EXT2_MOUNT_XIP;
-               sbi->s_mount_opt |= old_mount_opt & EXT2_MOUNT_XIP;
+                        "dax flag with busy inodes while remounting");
+               sbi->s_mount_opt ^= EXT2_MOUNT_DAX;
        }
        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) {
                spin_unlock(&sbi->s_lock);