Commit fe5ed6c2 authored Dec 12, 2018 by Pan Bian Committed by Darrick J. Wong Dec 12, 2018

xfs: libxfs: move xfs_perag_put late



The function xfs_alloc_get_freelist calls xfs_perag_put to drop the
reference. However, pag->pagf_btreeblks is read and written after the
put operation. This patch moves the put operation later.

Signed-off-by: Pan Bian <bianpan2016@163.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
[darrick: minor changelog edits]
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent d6f215f3

fs/xfs/libxfs/xfs_alloc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2435,7 +2435,6 @@ xfs_alloc_get_freelist(
		be32_add_cpu(&agf->agf_flcount, -1);
		xfs_trans_agflist_delta(tp, -1);
		pag->pagf_flcount--;
		xfs_perag_put(pag);

		logflags = XFS_AGF_FLFIRST \| XFS_AGF_FLCOUNT;
		if (btreeblk) {
		@@ -2443,6 +2442,7 @@ xfs_alloc_get_freelist(
		pag->pagf_btreeblks++;
		logflags \|= XFS_AGF_BTREEBLKS;
		}
		xfs_perag_put(pag);

		xfs_alloc_log_agf(tp, agbp, logflags);
		*bnop = bno;

Admin message