diff options
| author | Jan Kara <jack@suse.com> | 2015-07-28 14:57:14 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:13 +0100 |
| commit | 78ad4aa10cd0ccaa4c940c0ac7f16de5f5e3c9ef (patch) | |
| tree | fdf1dc14a3a133a26a9dc2f00ba3ae204ac1e346 /include/linux | |
| parent | c5ae4d405db417bc72b97b498a0db8a92a4216c5 (diff) | |
| download | lwn-78ad4aa10cd0ccaa4c940c0ac7f16de5f5e3c9ef.tar.gz lwn-78ad4aa10cd0ccaa4c940c0ac7f16de5f5e3c9ef.zip | |
jbd2: avoid infinite loop when destroying aborted journal
commit 841df7df196237ea63233f0f9eaa41db53afd70f upstream.
Commit 6f6a6fda2945 "jbd2: fix ocfs2 corrupt when updating journal
superblock fails" changed jbd2_cleanup_journal_tail() to return EIO
when the journal is aborted. That makes logic in
jbd2_log_do_checkpoint() bail out which is fine, except that
jbd2_journal_destroy() expects jbd2_log_do_checkpoint() to always make
a progress in cleaning the journal. Without it jbd2_journal_destroy()
just loops in an infinite loop.
Fix jbd2_journal_destroy() to cleanup journal checkpoint lists of
jbd2_log_do_checkpoint() fails with error.
Reported-by: Eryu Guan <guaneryu@gmail.com>
Tested-by: Eryu Guan <guaneryu@gmail.com>
Fixes: 6f6a6fda294506dfe0e3e0a253bb2d2923f28f0a
Signed-off-by: Jan Kara <jack@suse.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Roland Dreier <roland@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/jbd2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 4920c55c7625..fbfd0c426d51 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -980,8 +980,9 @@ int __jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block); extern void jbd2_journal_commit_transaction(journal_t *); /* Checkpoint list management */ -int __jbd2_journal_clean_checkpoint_list(journal_t *journal); +int __jbd2_journal_clean_checkpoint_list(journal_t *journal, bool destroy); int __jbd2_journal_remove_checkpoint(struct journal_head *); +void jbd2_journal_destroy_checkpoint(journal_t *journal); void __jbd2_journal_insert_checkpoint(struct journal_head *, transaction_t *); |