diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-09-10 17:31:04 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-14 08:06:36 -0800 |
| commit | 7a71dacba604fee399884a5f3d2c53e21e9c3a79 (patch) | |
| tree | 75466f790556d9a32c00a98a825c5aa5e4d34168 | |
| parent | 44373f34a740e9155cc011734ae0342b34e40d2c (diff) | |
ext4: Don't update superblock write time when filesystem is read-only
(cherry picked from commit 71290b368ad5e1e0b0b300c9d5638490a9fd1a2d)
This avoids updating the superblock write time when we are mounting
the root file system read/only but we need to replay the journal; at
that point, for people who are east of GMT and who make their clock
tick in localtime for Windows bug-for-bug compatibility, and this will
cause e2fsck to complain and force a full file system check.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/ext4/super.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 4037fe0b5a5c..d9ed5c219487 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3230,7 +3230,18 @@ static int ext4_commit_super(struct super_block *sb, int sync) clear_buffer_write_io_error(sbh); set_buffer_uptodate(sbh); } - es->s_wtime = cpu_to_le32(get_seconds()); + /* + * If the file system is mounted read-only, don't update the + * superblock write time. This avoids updating the superblock + * write time when we are mounting the root file system + * read/only but we need to replay the journal; at that point, + * for people who are east of GMT and who make their clock + * tick in localtime for Windows bug-for-bug compatibility, + * the clock is set in the future, and this will cause e2fsck + * to complain and force a full file system check. + */ + if (!(sb->s_flags & MS_RDONLY)) + es->s_wtime = cpu_to_le32(get_seconds()); es->s_kbytes_written = cpu_to_le64(EXT4_SB(sb)->s_kbytes_written + ((part_stat_read(sb->s_bdev->bd_part, sectors[1]) - |