Commit 235d6806 authored by Zhang Yi's avatar Zhang Yi Committed by Theodore Ts'o
Browse files

jbd2: don't abort the journal when freeing buffers 



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 c044f3d8 ("jbd2: abort journal if free a async write error
metadata buffer"), because it may cost and propably is not safe.

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210610112440.3438139-4-yi.zhang@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent fcf37549

fs/jbd2/transaction.c

+0 −17
Original line number Diff line number Diff line
@@ -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));
@@ -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;

}