diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-03-12 08:18:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-12 08:18:36 +0000 |
| commit | d3b42f102b3b4f2445eaffde6f5d8c315f8de838 (patch) | |
| tree | 8f9f0d9cf91c6953f6b2ce5d302d093576d7dc4c | |
| parent | 8f1c5b47f4b2051483f7b7f17ae943973f9323b4 (diff) | |
| parent | 9a79248c083d502958a7c833bcaa8879fbe09682 (diff) | |
ext4: preserve the needs_recovery flag when the journal is aborted
am: 9a79248c08
Change-Id: I46020005a8613c856baf796a1bd799958e9345d0
| -rw-r--r-- | fs/ext4/super.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index b405a7b74ce0..2f7b74e07fb0 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -793,6 +793,7 @@ static void ext4_put_super(struct super_block *sb) { struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_super_block *es = sbi->s_es; + int aborted = 0; int i, err; ext4_unregister_li_request(sb); @@ -802,9 +803,10 @@ static void ext4_put_super(struct super_block *sb) destroy_workqueue(sbi->rsv_conversion_wq); if (sbi->s_journal) { + aborted = is_journal_aborted(sbi->s_journal); err = jbd2_journal_destroy(sbi->s_journal); sbi->s_journal = NULL; - if (err < 0) + if ((err < 0) && !aborted) ext4_abort(sb, "Couldn't clean up the journal"); } @@ -816,7 +818,7 @@ static void ext4_put_super(struct super_block *sb) ext4_ext_release(sb); ext4_xattr_put_super(sb); - if (!(sb->s_flags & MS_RDONLY)) { + if (!(sb->s_flags & MS_RDONLY) && !aborted) { ext4_clear_feature_journal_needs_recovery(sb); es->s_state = cpu_to_le16(sbi->s_mount_state); } |