Skip to content

Commit

Permalink
jbd2: don't abort the journal when freeing buffers
Browse files Browse the repository at this point in the history
Now that we can be sure the journal is aborted once a buffer has failed
to be written back to disk, we can remove the journal abort logic in
jbd2_journal_try_to_free_buffers() which was introduced in
commit c044f3d ("jbd2: abort journal if free a async write error
metadata buffer"), because it may cost and propably is not safe.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210610112440.3438139-4-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  • Loading branch information
Zhang Yi authored and Theodore Ts'o committed Jun 24, 2021
1 parent fcf3754 commit 235d680
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions fs/jbd2/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -2123,7 +2123,6 @@ int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page)
{
struct buffer_head *head;
struct buffer_head *bh;
bool has_write_io_error = false;
int ret = 0;

J_ASSERT(PageLocked(page));
Expand All @@ -2148,26 +2147,10 @@ int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page)
jbd2_journal_put_journal_head(jh);
if (buffer_jbd(bh))
goto busy;

/*
* If we free a metadata buffer which has been failed to
* write out, the jbd2 checkpoint procedure will not detect
* this failure and may lead to filesystem inconsistency
* after cleanup journal tail.
*/
if (buffer_write_io_error(bh)) {
pr_err("JBD2: Error while async write back metadata bh %llu.",
(unsigned long long)bh->b_blocknr);
has_write_io_error = true;
}
} while ((bh = bh->b_this_page) != head);

ret = try_to_free_buffers(page);

busy:
if (has_write_io_error)
jbd2_journal_abort(journal, -EIO);

return ret;
}

Expand Down

0 comments on commit 235d680

Please sign in to comment.