Unverified Commit ed435e21 authored Jul 30, 2024 by openeuler-ci-bot Committed by Gitee Jul 30, 2024

!10366 v2 jbd2: stop waiting for space when jbd2_cleanup_journal_tail() returns error

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UQM5FW6QNITHIW27RQGHD5Y6DDRCRMU4/ 
 
https://gitee.com/openeuler/kernel/issues/IAG7MT 
 
Link:https://gitee.com/openeuler/kernel/pulls/10366

 

Reviewed-by: zhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

parents 2d99a8d0 f2768637

fs/jbd2/checkpoint.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -98,8 +98,11 @@ __releases(&journal->j_state_lock)
		write_unlock(&journal->j_state_lock);
		if (chkpt) {
		jbd2_log_do_checkpoint(journal);
		} else if (jbd2_cleanup_journal_tail(journal) == 0) {
		/* We were able to recover space; yay! */
		} else if (jbd2_cleanup_journal_tail(journal) <= 0) {
		/*
		* We were able to recover space or the
		* journal was aborted due to an error.
		*/
		;
		} else if (tid) {
		/*

fs/jbd2/journal.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1621,6 +1621,8 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags)
		/* Buffer got discarded which means block device got invalidated */
		if (!buffer_mapped(bh)) {
		unlock_buffer(bh);
		if (!is_journal_aborted(journal))
		jbd2_journal_abort(journal, -EIO);
		return -EIO;
		}