Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 411b14e6 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: xfs_defer_capture should absorb remaining block reservations 



commit 4f9a60c48078c0efa3459678fa8d6e050e8ada5d upstream.

When xfs_defer_capture extracts the deferred ops and transaction state
from a transaction, it should record the remaining block reservations so
that when we continue the dfops chain, we can reserve the same number of
blocks to use.  We capture the reservations for both data and realtime
volumes.

This adds the requirement that every log intent item recovery function
must be careful to reserve enough blocks to handle both itself and all
defer ops that it can queue.  On the other hand, this enables us to do
away with the handwaving block estimation nonsense that was going on in
xlog_finish_defer_ops.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3324249e

fs/xfs/libxfs/xfs_defer.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -589,6 +589,10 @@ xfs_defer_ops_capture( 
	dfc->dfc_tpflags = tp->t_flags & XFS_TRANS_LOWMODE;

	dfc->dfc_tpflags = tp->t_flags & XFS_TRANS_LOWMODE;

	tp->t_flags &= ~XFS_TRANS_LOWMODE;

	tp->t_flags &= ~XFS_TRANS_LOWMODE;





	/* Capture the remaining block reservations along with the dfops. */

	dfc->dfc_blkres = tp->t_blk_res - tp->t_blk_res_used;

	dfc->dfc_rtxres = tp->t_rtx_res - tp->t_rtx_res_used;



	return dfc;

	return dfc;

}

}

fs/xfs/libxfs/xfs_defer.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,10 @@ struct xfs_defer_capture { 
	/* Deferred ops state saved from the transaction. */

	/* Deferred ops state saved from the transaction. */

	struct list_head	dfc_dfops;

	struct list_head	dfc_dfops;

	unsigned int		dfc_tpflags;

	unsigned int		dfc_tpflags;



	/* Block reservations for the data and rt devices. */

	unsigned int		dfc_blkres;

	unsigned int		dfc_rtxres;

};

};





/*

/*

fs/xfs/xfs_log_recover.c

+3 −18
Original line number Original line Diff line number Diff line
@@ -4766,27 +4766,12 @@ xlog_finish_defer_ops( 
{

{

	struct xfs_defer_capture *dfc, *next;

	struct xfs_defer_capture *dfc, *next;

	struct xfs_trans	*tp;

	struct xfs_trans	*tp;

	int64_t			freeblks;

	uint64_t		resblks;

	int			error = 0;

	int			error = 0;





	list_for_each_entry_safe(dfc, next, capture_list, dfc_list) {

	list_for_each_entry_safe(dfc, next, capture_list, dfc_list) {

		/*

		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate,

		 * We're finishing the defer_ops that accumulated as a result

				dfc->dfc_blkres, dfc->dfc_rtxres,

		 * of recovering unfinished intent items during log recovery.

				XFS_TRANS_RESERVE, &tp);

		 * We reserve an itruncate transaction because it is the

		 * largest permanent transaction type.  Since we're the only

		 * user of the fs right now, take 93% (15/16) of the available

		 * free blocks.  Use weird math to avoid a 64-bit division.

		 */

		freeblks = percpu_counter_sum(&mp->m_fdblocks);

		if (freeblks <= 0)

			return -ENOSPC;



		resblks = min_t(uint64_t, UINT_MAX, freeblks);

		resblks = (resblks * 15) >> 4;

		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, resblks,

				0, XFS_TRANS_RESERVE, &tp);

		if (error)

		if (error)

			return error;

			return error;