Unverified Commit 0c2a6021 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8309 xfs: Fix file creation failure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/A4R567AJ7CDI47UN5IVSLZJJVX5B4DLJ/ 
 
https://gitee.com/openeuler/kernel/issues/I9TDTA 
 
Link:https://gitee.com/openeuler/kernel/pulls/8309

 

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

fs/xfs/libxfs/xfs_alloc.c

+14 −0
Original line number Diff line number Diff line
@@ -586,6 +586,13 @@ xfs_alloc_fixup_trees( 
		nfbno2 = rbno + rlen;

		nflen2 = (fbno + flen) - nfbno2;

	}



	/*

	 * Record the potential maximum free length in advance.

	 */

	if (nfbno1 != NULLAGBLOCK || nfbno2 != NULLAGBLOCK)

		cnt_cur->bc_ag.bc_free_longest = XFS_EXTLEN_MAX(nflen1, nflen2);



	/*

	 * Delete the entry from the by-size btree.

	 */
@@ -2019,6 +2026,13 @@ xfs_free_ag_extent( 
	 * Now allocate and initialize a cursor for the by-size tree.

	 */

	cnt_cur = xfs_allocbt_init_cursor(mp, tp, agbp, pag, XFS_BTNUM_CNT);

	/*

	 * Record the potential maximum free length in advance.

	 */

	if (haveleft)

		cnt_cur->bc_ag.bc_free_longest = ltlen;

	if (haveright)

		cnt_cur->bc_ag.bc_free_longest = gtlen;

	/*

	 * Have both left and right contiguous neighbors.

	 * Merge all three into a single free block.

fs/xfs/libxfs/xfs_alloc_btree.c

+8 −1
Original line number Diff line number Diff line
@@ -146,7 +146,14 @@ xfs_allocbt_update_lastrec( 
			rrp = XFS_ALLOC_REC_ADDR(cur->bc_mp, block, numrecs);

			len = rrp->ar_blockcount;

		} else {

			len = 0;

			/*

			 * Update in advance to prevent file creation failure

			 * for concurrent processes even though there is no

			 * numrec currently.

			 * And there's no need to worry as the value that no

			 * less than bc_free_longest will be inserted later.

			 */

			len = cpu_to_be32(cur->bc_ag.bc_free_longest);

		}



		break;

fs/xfs/libxfs/xfs_btree.h

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ union xfs_btree_irec { 
/* Per-AG btree information. */

struct xfs_btree_cur_ag {

	struct xfs_perag		*pag;

	xfs_extlen_t			bc_free_longest; /* the potential longest free extent */

	union {

		struct xfs_buf		*agbp;

		struct xbtree_afakeroot	*afake;	/* for staging cursor */