diff options
-rw-r--r-- | fs/ext4/ext4_jbd2.c | 5 | ||||
-rw-r--r-- | fs/ext4/super.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index 90f7c2e84db..c19ab6addb2 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c | |||
@@ -151,11 +151,10 @@ int __ext4_handle_dirty_super(const char *where, unsigned int line, | |||
151 | if (err) | 151 | if (err) |
152 | ext4_journal_abort_handle(where, line, __func__, | 152 | ext4_journal_abort_handle(where, line, __func__, |
153 | bh, handle, err); | 153 | bh, handle, err); |
154 | } else if (now) { | 154 | } else { |
155 | ext4_superblock_csum_set(sb, | 155 | ext4_superblock_csum_set(sb, |
156 | (struct ext4_super_block *)bh->b_data); | 156 | (struct ext4_super_block *)bh->b_data); |
157 | mark_buffer_dirty(bh); | 157 | mark_buffer_dirty(bh); |
158 | } else | 158 | } |
159 | sb->s_dirt = 1; | ||
160 | return err; | 159 | return err; |
161 | } | 160 | } |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index bebf8e5bf08..662e93e8c25 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -896,7 +896,7 @@ static void ext4_put_super(struct super_block *sb) | |||
896 | EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER); | 896 | EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER); |
897 | es->s_state = cpu_to_le16(sbi->s_mount_state); | 897 | es->s_state = cpu_to_le16(sbi->s_mount_state); |
898 | } | 898 | } |
899 | if (sb->s_dirt || !(sb->s_flags & MS_RDONLY)) | 899 | if (!(sb->s_flags & MS_RDONLY)) |
900 | ext4_commit_super(sb, 1); | 900 | ext4_commit_super(sb, 1); |
901 | 901 | ||
902 | if (sbi->s_proc) { | 902 | if (sbi->s_proc) { |