Unverified Commit 6314c95e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10011 xfs: fix mount hung while sb recover fail 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4C6PCMZPP3OJHAFM5RZJTRAOMVQRCJIJ/ 
 
https://gitee.com/openeuler/kernel/issues/IAC63K 
 
Link:https://gitee.com/openeuler/kernel/pulls/10011

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 0b035e19 da9b6a5c

fs/xfs/xfs_buf_item_recover.c

+3 −2
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ xlog_recover_buf_commit_pass2( 
			bp->b_ops->verify_write(bp);

			error = bp->b_error;

			if (error)

				goto out_release;

				goto out_writebuf;



			if (be32_to_cpu(sb->sb_agcount) > mp->m_sb.sb_agcount) {

				error = xfs_initialize_perag(mp,
@@ -988,13 +988,14 @@ xlog_recover_buf_commit_pass2( 
						be64_to_cpu(sb->sb_dblocks),

						&mp->m_maxagi);

				if (error)

					goto out_release;

					goto out_writebuf;

			}



			xfs_sb_from_disk(&mp->m_sb, sb);

		}

	}



out_writebuf:

	/*

	 * Perform delayed write on the buffer.  Asynchronous writes will be

	 * slower when taking into account all the buffers to be flushed.