diff options
| author | Zhang Yi <yi.zhang@huawei.com> | 2021-06-10 19:24:34 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-06-24 10:33:49 -0400 |
| commit | fcf37549ae19e904bc6a5eadf5c25eca36100c5e (patch) | |
| tree | ebf28dd880ff6385014c42b7b04e4c7a46d678ee /include/linux/jbd2.h | |
| parent | 1866cba842437f3e7a5a8ee5b558744d9ae844d0 (diff) | |
| download | lwn-fcf37549ae19e904bc6a5eadf5c25eca36100c5e.tar.gz lwn-fcf37549ae19e904bc6a5eadf5c25eca36100c5e.zip | |
jbd2: ensure abort the journal if detect IO error when writing original buffer back
Although we merged c044f3d8360 ("jbd2: abort journal if free a async
write error metadata buffer"), there is a race between
jbd2_journal_try_to_free_buffers() and jbd2_journal_destroy(), so the
jbd2_log_do_checkpoint() may still fail to detect the buffer write
io error flag which may lead to filesystem inconsistency.
jbd2_journal_try_to_free_buffers() ext4_put_super()
jbd2_journal_destroy()
__jbd2_journal_remove_checkpoint()
detect buffer write error jbd2_log_do_checkpoint()
jbd2_cleanup_journal_tail()
<--- lead to inconsistency
jbd2_journal_abort()
Fix this issue by introducing a new atomic flag which only have one
JBD2_CHECKPOINT_IO_ERROR bit now, and set it in
__jbd2_journal_remove_checkpoint() when freeing a checkpoint buffer
which has write_io_error flag. Then jbd2_journal_destroy() will detect
this mark and abort the journal to prevent updating log tail.
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210610112440.3438139-3-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'include/linux/jbd2.h')
| -rw-r--r-- | include/linux/jbd2.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 8543233b0388..d5db408ae064 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -780,6 +780,11 @@ struct journal_s unsigned long j_flags; /** + * @j_atomic_flags: Atomic journaling state flags. + */ + unsigned long j_atomic_flags; + + /** * @j_errno: * * Is there an outstanding uncleared error on the journal (from a prior @@ -1376,6 +1381,12 @@ JBD2_FEATURE_INCOMPAT_FUNCS(fast_commit, FAST_COMMIT) JBD2_JOURNAL_FLUSH_ZEROOUT) /* + * Journal atomic flag definitions + */ +#define JBD2_CHECKPOINT_IO_ERROR 0x001 /* Detect io error while writing + * buffer back to disk */ + +/* * Function declarations for the journaling transaction and buffer * management */ |