Unverified Commit 3e3fceae authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10358 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/2FNIDUCKOZZCQDLYNH2BYNVM2QMMS5UO/ 
 
https://gitee.com/openeuler/kernel/issues/IAG7MT 
 
Link:https://gitee.com/openeuler/kernel/pulls/10358

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents a080e375 5a439bea

fs/jbd2/checkpoint.c

+5 −2
Original line number Diff line number Diff line
@@ -86,8 +86,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) {

				/*