btrfs: don't run delayed_iputs in commit

[sfrench/cifs-2.6.git] / fs / ext2 / super.c

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 8ff53f8da3bcc414fdad44ac3bb76a88258e4d51..73bd58fa13de40e8c010bfcd0fb96764ab792f79 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -682,7 +682,8 @@ static int ext2_setup_super (struct super_block * sb,
                        "running e2fsck is recommended");
        else if (le32_to_cpu(es->s_checkinterval) &&
                (le32_to_cpu(es->s_lastcheck) +
-                       le32_to_cpu(es->s_checkinterval) <= get_seconds()))
+                       le32_to_cpu(es->s_checkinterval) <=
+                       ktime_get_real_seconds()))
                ext2_msg(sb, KERN_WARNING,
                        "warning: checktime reached, "
                        "running e2fsck is recommended");
@@ -1248,7 +1249,7 @@ void ext2_sync_super(struct super_block *sb, struct ext2_super_block *es,
        spin_lock(&EXT2_SB(sb)->s_lock);
        es->s_free_blocks_count = cpu_to_le32(ext2_count_free_blocks(sb));
        es->s_free_inodes_count = cpu_to_le32(ext2_count_free_inodes(sb));
-       es->s_wtime = cpu_to_le32(get_seconds());
+       es->s_wtime = cpu_to_le32(ktime_get_real_seconds());
        /* unlock before we do IO */
        spin_unlock(&EXT2_SB(sb)->s_lock);
        mark_buffer_dirty(EXT2_SB(sb)->s_sbh);
@@ -1360,7 +1361,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
                 * the rdonly flag and then mark the partition as valid again.
                 */
                es->s_state = cpu_to_le16(sbi->s_mount_state);
-               es->s_mtime = cpu_to_le32(get_seconds());
+               es->s_mtime = cpu_to_le32(ktime_get_real_seconds());
                spin_unlock(&sbi->s_lock);
 
                err = dquot_suspend(sb, -1);