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

Commit 3d3c8b52 authored by Jie Liu's avatar Jie Liu Committed by Ben Myers
Browse files

xfs: refactor xfs_trans_reserve() interface 



With the new xfs_trans_res structure has been introduced, the log
reservation size, log count as well as log flags are pre-initialized
at mount time.  So it's time to refine xfs_trans_reserve() interface
to be more neat.

Also, introduce a new helper M_RES() to return a pointer to the
mp->m_resv structure to simplify the input.

Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 783cb6d1

fs/xfs/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ xfs_setfilesize_trans_alloc( 


	tp = xfs_trans_alloc(mp, XFS_TRANS_FSYNC_TS);



	error = xfs_trans_reserve(tp, 0, XFS_FSYNC_TS_LOG_RES(mp), 0, 0, 0);

	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_fsyncts, 0, 0);

	if (error) {

		xfs_trans_cancel(tp, 0);

		return error;

fs/xfs/xfs_attr.c

+16 −17
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ xfs_attr_set_int( 
	xfs_fsblock_t		firstblock;

	xfs_bmap_free_t		flist;

	int			error, err2, committed;

	xfs_mount_t	*mp = dp->i_mount;

	struct xfs_mount	*mp = dp->i_mount;

	struct xfs_trans_res	tres;

	int			rsvd = (flags & ATTR_ROOT) != 0;

	int			local;
@@ -292,11 +293,11 @@ xfs_attr_set_int( 
	if (rsvd)

		args.trans->t_flags |= XFS_TRANS_RESERVE;



	error = xfs_trans_reserve(args.trans, args.total,

				  XFS_ATTRSETM_LOG_RES(mp) +

				  XFS_ATTRSETRT_LOG_RES(mp) * args.total,

				  0, XFS_TRANS_PERM_LOG_RES,

				  XFS_ATTRSET_LOG_COUNT);

	tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +

			 M_RES(mp)->tr_attrsetrt.tr_logres * args.total;

	tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;

	tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;

	error = xfs_trans_reserve(args.trans, &tres, args.total, 0);

	if (error) {

		xfs_trans_cancel(args.trans, 0);

		return(error);
@@ -516,11 +517,9 @@ xfs_attr_remove_int(xfs_inode_t *dp, struct xfs_name *name, int flags) 
	if (flags & ATTR_ROOT)

		args.trans->t_flags |= XFS_TRANS_RESERVE;



	if ((error = xfs_trans_reserve(args.trans,

				      XFS_ATTRRM_SPACE_RES(mp),

				      XFS_ATTRRM_LOG_RES(mp),

				      0, XFS_TRANS_PERM_LOG_RES,

				      XFS_ATTRRM_LOG_COUNT))) {

	error = xfs_trans_reserve(args.trans, &M_RES(mp)->tr_attrrm,

				  XFS_ATTRRM_SPACE_RES(mp), 0);

	if (error) {

		xfs_trans_cancel(args.trans, 0);

		return(error);

	}

fs/xfs/xfs_attr_inactive.c

+2 −3
Original line number Diff line number Diff line
@@ -412,9 +412,8 @@ xfs_attr_inactive(xfs_inode_t *dp) 
	 * the log.

	 */

	trans = xfs_trans_alloc(mp, XFS_TRANS_ATTRINVAL);

	if ((error = xfs_trans_reserve(trans, 0, XFS_ATTRINVAL_LOG_RES(mp), 0,

				      XFS_TRANS_PERM_LOG_RES,

				      XFS_ATTRINVAL_LOG_COUNT))) {

	error = xfs_trans_reserve(trans, &M_RES(mp)->tr_attrinval, 0, 0);

	if (error) {

		xfs_trans_cancel(trans, 0);

		return(error);

	}

fs/xfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1148,8 +1148,8 @@ xfs_bmap_add_attrfork( 
	blks = XFS_ADDAFORK_SPACE_RES(mp);

	if (rsvd)

		tp->t_flags |= XFS_TRANS_RESERVE;

	if ((error = xfs_trans_reserve(tp, blks, XFS_ADDAFORK_LOG_RES(mp), 0,

			XFS_TRANS_PERM_LOG_RES, XFS_ADDAFORK_LOG_COUNT)))

	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_addafork, blks, 0);

	if (error)

		goto error0;

	xfs_ilock(ip, XFS_ILOCK_EXCL);

	error = xfs_trans_reserve_quota_nblks(tp, ip, blks, 0, rsvd ?

fs/xfs/xfs_bmap_util.c

+15 −27
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ xfs_bmap_finish( 
	xfs_efi_log_item_t	*efi;		/* extent free intention */

	int			error;		/* error return value */

	xfs_bmap_free_item_t	*free;		/* free extent item */

	unsigned int		logres;		/* new log reservation */

	unsigned int		logcount;	/* new log count */

	struct xfs_trans_res	tres;		/* new log reservation */

	xfs_mount_t		*mp;		/* filesystem mount structure */

	xfs_bmap_free_item_t	*next;		/* next item on free list */

	xfs_trans_t		*ntp;		/* new transaction pointer */
@@ -94,8 +93,10 @@ xfs_bmap_finish( 
	for (free = flist->xbf_first; free; free = free->xbfi_next)

		xfs_trans_log_efi_extent(ntp, efi, free->xbfi_startblock,

			free->xbfi_blockcount);

	logres = ntp->t_log_res;

	logcount = ntp->t_log_count;



	tres.tr_logres = ntp->t_log_res;

	tres.tr_logcount = ntp->t_log_count;

	tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;

	ntp = xfs_trans_dup(*tp);

	error = xfs_trans_commit(*tp, 0);

	*tp = ntp;
@@ -113,8 +114,8 @@ xfs_bmap_finish( 
	 */

	xfs_log_ticket_put(ntp->t_ticket);



	if ((error = xfs_trans_reserve(ntp, 0, logres, 0, XFS_TRANS_PERM_LOG_RES,

			logcount)))

	error = xfs_trans_reserve(ntp, &tres, 0, 0);

	if (error)

		return error;

	efd = xfs_trans_get_efd(ntp, efi, flist->xbf_count);

	for (free = flist->xbf_first; free != NULL; free = next) {
@@ -929,10 +930,7 @@ xfs_free_eofblocks( 
			}

		}



		error = xfs_trans_reserve(tp, 0,

					  XFS_ITRUNCATE_LOG_RES(mp),

					  0, XFS_TRANS_PERM_LOG_RES,

					  XFS_ITRUNCATE_LOG_COUNT);

		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_itruncate, 0, 0);

		if (error) {

			ASSERT(XFS_FORCED_SHUTDOWN(mp));

			xfs_trans_cancel(tp, 0);
@@ -1085,10 +1083,8 @@ xfs_alloc_file_space( 
		 * Allocate and setup the transaction.

		 */

		tp = xfs_trans_alloc(mp, XFS_TRANS_DIOSTRAT);

		error = xfs_trans_reserve(tp, resblks,

					  XFS_WRITE_LOG_RES(mp), resrtextents,

					  XFS_TRANS_PERM_LOG_RES,

					  XFS_WRITE_LOG_COUNT);

		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,

					  resblks, resrtextents);

		/*

		 * Check for running out of space

		 */
@@ -1378,12 +1374,7 @@ xfs_free_file_space( 
		 */

		tp = xfs_trans_alloc(mp, XFS_TRANS_DIOSTRAT);

		tp->t_flags |= XFS_TRANS_RESERVE;

		error = xfs_trans_reserve(tp,

					  resblks,

					  XFS_WRITE_LOG_RES(mp),

					  0,

					  XFS_TRANS_PERM_LOG_RES,

					  XFS_WRITE_LOG_COUNT);

		error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write, resblks, 0);



		/*

		 * check for running out of space
@@ -1657,10 +1648,8 @@ xfs_change_file_space( 
	 * update the inode timestamp, mode, and prealloc flag bits

	 */

	tp = xfs_trans_alloc(mp, XFS_TRANS_WRITEID);



	if ((error = xfs_trans_reserve(tp, 0, XFS_WRITEID_LOG_RES(mp),

				      0, 0, 0))) {

		/* ASSERT(0); */

	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_writeid, 0, 0);

	if (error) {

		xfs_trans_cancel(tp, 0);

		return error;

	}
@@ -1905,9 +1894,8 @@ xfs_swap_extents( 
	truncate_pagecache_range(VFS_I(ip), 0, -1);



	tp = xfs_trans_alloc(mp, XFS_TRANS_SWAPEXT);

	if ((error = xfs_trans_reserve(tp, 0,

				     XFS_ICHANGE_LOG_RES(mp), 0,

				     0, 0))) {

	error = xfs_trans_reserve(tp, &M_RES(mp)->tr_ichange, 0, 0);

	if (error) {

		xfs_iunlock(ip,  XFS_IOLOCK_EXCL);

		xfs_iunlock(tip, XFS_IOLOCK_EXCL);

		xfs_trans_cancel(tp, 0);