Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

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

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 1d7ab73b10148448e07c905b561c0e95087ba608..baa36c6fb71e44405f8ac23edc39918c65eb75f7 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -303,16 +303,16 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
        if (test_opt(sb, NOBH))
                seq_puts(seq, ",nobh");
 
-       if (sbi->s_mount_opt & EXT2_MOUNT_USRQUOTA)
+       if (test_opt(sb, USRQUOTA))
                seq_puts(seq, ",usrquota");
 
-       if (sbi->s_mount_opt & EXT2_MOUNT_GRPQUOTA)
+       if (test_opt(sb, GRPQUOTA))
                seq_puts(seq, ",grpquota");
 
-       if (sbi->s_mount_opt & EXT2_MOUNT_XIP)
+       if (test_opt(sb, XIP))
                seq_puts(seq, ",xip");
 
-       if (sbi->s_mount_opt & EXT2_MOUNT_DAX)
+       if (test_opt(sb, DAX))
                seq_puts(seq, ",dax");
 
        if (!test_opt(sb, RESERVATION))
@@ -935,8 +935,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        sbi->s_resgid = opts.s_resgid;
 
        sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
-               ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?
-                SB_POSIXACL : 0);
+               (test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);
        sb->s_iflags |= SB_I_CGROUPWB;
 
        if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV &&
@@ -967,11 +966,11 @@ 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 (sbi->s_mount_opt & EXT2_MOUNT_DAX) {
+       if (test_opt(sb, DAX)) {
                if (!bdev_dax_supported(sb->s_bdev, blocksize)) {
                        ext2_msg(sb, KERN_ERR,
                                "DAX unsupported by block device. Turning off DAX.");
-                       sbi->s_mount_opt &= ~EXT2_MOUNT_DAX;
+                       clear_opt(sbi->s_mount_opt, DAX);
                }
        }
 
@@ -1003,6 +1002,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
 
        sb->s_maxbytes = ext2_max_size(sb->s_blocksize_bits);
        sb->s_max_links = EXT2_LINK_MAX;
+       sb->s_time_min = S32_MIN;
+       sb->s_time_max = S32_MAX;
 
        if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV) {
                sbi->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE;
@@ -1404,7 +1405,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
        sbi->s_resuid = new_opts.s_resuid;
        sbi->s_resgid = new_opts.s_resgid;
        sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |
-               ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? SB_POSIXACL : 0);
+               (test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);
        spin_unlock(&sbi->s_lock);
 
        return 0;