|
@@ -836,9 +836,6 @@ static void ext4_put_super(struct super_block *sb)
|
|
|
destroy_workqueue(sbi->dio_unwritten_wq);
|
|
|
|
|
|
lock_super(sb);
|
|
|
- if (sb->s_dirt)
|
|
|
- ext4_commit_super(sb, 1);
|
|
|
-
|
|
|
if (sbi->s_journal) {
|
|
|
err = jbd2_journal_destroy(sbi->s_journal);
|
|
|
sbi->s_journal = NULL;
|
|
@@ -855,8 +852,10 @@ static void ext4_put_super(struct super_block *sb)
|
|
|
if (!(sb->s_flags & MS_RDONLY)) {
|
|
|
EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
|
|
|
es->s_state = cpu_to_le16(sbi->s_mount_state);
|
|
|
- ext4_commit_super(sb, 1);
|
|
|
}
|
|
|
+ if (sb->s_dirt || !(sb->s_flags & MS_RDONLY))
|
|
|
+ ext4_commit_super(sb, 1);
|
|
|
+
|
|
|
if (sbi->s_proc) {
|
|
|
remove_proc_entry("options", sbi->s_proc);
|
|
|
remove_proc_entry(sb->s_id, ext4_proc_root);
|