Commit 2c3234d1 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

xfs: rename flist/free_list to dfops 



Mechanical change of flist/free_list to dfops, since they're now
deferred ops, not just a freeing list.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 310a75a3

fs/xfs/libxfs/xfs_attr.c

+31 −31
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ xfs_attr_set( 
{

	struct xfs_mount	*mp = dp->i_mount;

	struct xfs_da_args	args;

	struct xfs_defer_ops	flist;

	struct xfs_defer_ops	dfops;

	struct xfs_trans_res	tres;

	xfs_fsblock_t		firstblock;

	int			rsvd = (flags & ATTR_ROOT) != 0;
@@ -222,7 +222,7 @@ xfs_attr_set( 
	args.value = value;

	args.valuelen = valuelen;

	args.firstblock = &firstblock;

	args.flist = &flist;

	args.dfops = &dfops;

	args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;

	args.total = xfs_attr_calc_size(&args, &local);
@@ -317,13 +317,13 @@ xfs_attr_set( 
		 * It won't fit in the shortform, transform to a leaf block.

		 * GROT: another possible req'mt for a double-split btree op.

		 */

		xfs_defer_init(args.flist, args.firstblock);

		xfs_defer_init(args.dfops, args.firstblock);

		error = xfs_attr_shortform_to_leaf(&args);

		if (!error)

			error = xfs_defer_finish(&args.trans, args.flist, dp);

			error = xfs_defer_finish(&args.trans, args.dfops, dp);

		if (error) {

			args.trans = NULL;

			xfs_defer_cancel(&flist);

			xfs_defer_cancel(&dfops);

			goto out;

		}
@@ -383,7 +383,7 @@ xfs_attr_remove( 
{

	struct xfs_mount	*mp = dp->i_mount;

	struct xfs_da_args	args;

	struct xfs_defer_ops	flist;

	struct xfs_defer_ops	dfops;

	xfs_fsblock_t		firstblock;

	int			error;
@@ -400,7 +400,7 @@ xfs_attr_remove( 
		return error;



	args.firstblock = &firstblock;

	args.flist = &flist;

	args.dfops = &dfops;



	/*

	 * we have no control over the attribute names that userspace passes us
@@ -585,13 +585,13 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
		 * Commit that transaction so that the node_addname() call

		 * can manage its own transactions.

		 */

		xfs_defer_init(args->flist, args->firstblock);

		xfs_defer_init(args->dfops, args->firstblock);

		error = xfs_attr3_leaf_to_node(args);

		if (!error)

			error = xfs_defer_finish(&args->trans, args->flist, dp);

			error = xfs_defer_finish(&args->trans, args->dfops, dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->flist);

			xfs_defer_cancel(args->dfops);

			return error;

		}
@@ -675,15 +675,15 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
		 * If the result is small enough, shrink it all into the inode.

		 */

		if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {

			xfs_defer_init(args->flist, args->firstblock);

			xfs_defer_init(args->dfops, args->firstblock);

			error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);

			/* bp is gone due to xfs_da_shrink_inode */

			if (!error)

				error = xfs_defer_finish(&args->trans,

							args->flist, dp);

							args->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->flist);

				xfs_defer_cancel(args->dfops);

				return error;

			}

		}
@@ -738,14 +738,14 @@ xfs_attr_leaf_removename(xfs_da_args_t *args) 
	 * If the result is small enough, shrink it all into the inode.

	 */

	if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {

		xfs_defer_init(args->flist, args->firstblock);

		xfs_defer_init(args->dfops, args->firstblock);

		error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);

		/* bp is gone due to xfs_da_shrink_inode */

		if (!error)

			error = xfs_defer_finish(&args->trans, args->flist, dp);

			error = xfs_defer_finish(&args->trans, args->dfops, dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->flist);

			xfs_defer_cancel(args->dfops);

			return error;

		}

	}
@@ -864,14 +864,14 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
			 */

			xfs_da_state_free(state);

			state = NULL;

			xfs_defer_init(args->flist, args->firstblock);

			xfs_defer_init(args->dfops, args->firstblock);

			error = xfs_attr3_leaf_to_node(args);

			if (!error)

				error = xfs_defer_finish(&args->trans,

							args->flist, dp);

							args->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->flist);

				xfs_defer_cancel(args->dfops);

				goto out;

			}
@@ -892,13 +892,13 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		 * in the index/blkno/rmtblkno/rmtblkcnt fields and

		 * in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields.

		 */

		xfs_defer_init(args->flist, args->firstblock);

		xfs_defer_init(args->dfops, args->firstblock);

		error = xfs_da3_split(state);

		if (!error)

			error = xfs_defer_finish(&args->trans, args->flist, dp);

			error = xfs_defer_finish(&args->trans, args->dfops, dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->flist);

			xfs_defer_cancel(args->dfops);

			goto out;

		}

	} else {
@@ -991,14 +991,14 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		 * Check to see if the tree needs to be collapsed.

		 */

		if (retval && (state->path.active > 1)) {

			xfs_defer_init(args->flist, args->firstblock);

			xfs_defer_init(args->dfops, args->firstblock);

			error = xfs_da3_join(state);

			if (!error)

				error = xfs_defer_finish(&args->trans,

							args->flist, dp);

							args->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->flist);

				xfs_defer_cancel(args->dfops);

				goto out;

			}

		}
@@ -1114,13 +1114,13 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
	 * Check to see if the tree needs to be collapsed.

	 */

	if (retval && (state->path.active > 1)) {

		xfs_defer_init(args->flist, args->firstblock);

		xfs_defer_init(args->dfops, args->firstblock);

		error = xfs_da3_join(state);

		if (!error)

			error = xfs_defer_finish(&args->trans, args->flist, dp);

			error = xfs_defer_finish(&args->trans, args->dfops, dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->flist);

			xfs_defer_cancel(args->dfops);

			goto out;

		}

		/*
@@ -1147,15 +1147,15 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
			goto out;



		if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {

			xfs_defer_init(args->flist, args->firstblock);

			xfs_defer_init(args->dfops, args->firstblock);

			error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);

			/* bp is gone due to xfs_da_shrink_inode */

			if (!error)

				error = xfs_defer_finish(&args->trans,

							args->flist, dp);

							args->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->flist);

				xfs_defer_cancel(args->dfops);

				goto out;

			}

		} else

fs/xfs/libxfs/xfs_attr_leaf.c

+2 −2
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ xfs_attr_shortform_to_leaf(xfs_da_args_t *args) 
	nargs.dp = dp;

	nargs.geo = args->geo;

	nargs.firstblock = args->firstblock;

	nargs.flist = args->flist;

	nargs.dfops = args->dfops;

	nargs.total = args->total;

	nargs.whichfork = XFS_ATTR_FORK;

	nargs.trans = args->trans;
@@ -922,7 +922,7 @@ xfs_attr3_leaf_to_shortform( 
	nargs.geo = args->geo;

	nargs.dp = dp;

	nargs.firstblock = args->firstblock;

	nargs.flist = args->flist;

	nargs.dfops = args->dfops;

	nargs.total = args->total;

	nargs.whichfork = XFS_ATTR_FORK;

	nargs.trans = args->trans;

fs/xfs/libxfs/xfs_attr_remote.c

+9 −9
Original line number Diff line number Diff line
@@ -461,16 +461,16 @@ xfs_attr_rmtval_set( 
		 * extent and then crash then the block may not contain the

		 * correct metadata after log recovery occurs.

		 */

		xfs_defer_init(args->flist, args->firstblock);

		xfs_defer_init(args->dfops, args->firstblock);

		nmap = 1;

		error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)lblkno,

				  blkcnt, XFS_BMAPI_ATTRFORK, args->firstblock,

				  args->total, &map, &nmap, args->flist);

				  args->total, &map, &nmap, args->dfops);

		if (!error)

			error = xfs_defer_finish(&args->trans, args->flist, dp);

			error = xfs_defer_finish(&args->trans, args->dfops, dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->flist);

			xfs_defer_cancel(args->dfops);

			return error;

		}
@@ -504,7 +504,7 @@ xfs_attr_rmtval_set( 


		ASSERT(blkcnt > 0);



		xfs_defer_init(args->flist, args->firstblock);

		xfs_defer_init(args->dfops, args->firstblock);

		nmap = 1;

		error = xfs_bmapi_read(dp, (xfs_fileoff_t)lblkno,

				       blkcnt, &map, &nmap,
@@ -604,16 +604,16 @@ xfs_attr_rmtval_remove( 
	blkcnt = args->rmtblkcnt;

	done = 0;

	while (!done) {

		xfs_defer_init(args->flist, args->firstblock);

		xfs_defer_init(args->dfops, args->firstblock);

		error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,

				    XFS_BMAPI_ATTRFORK, 1, args->firstblock,

				    args->flist, &done);

				    args->dfops, &done);

		if (!error)

			error = xfs_defer_finish(&args->trans, args->flist,

			error = xfs_defer_finish(&args->trans, args->dfops,

						args->dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->flist);

			xfs_defer_cancel(args->dfops);

			return error;

		}

fs/xfs/libxfs/xfs_bmap.c

+58 −58
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ xfs_bmap_validate_ret( 
void

xfs_bmap_add_free(

	struct xfs_mount	*mp,		/* mount point structure */

	struct xfs_defer_ops	*flist,		/* list of extents */

	struct xfs_defer_ops	*dfops,		/* list of extents */

	xfs_fsblock_t		bno,		/* fs block number of extent */

	xfs_filblks_t		len)		/* length of extent */

{
@@ -596,7 +596,7 @@ xfs_bmap_add_free( 
	new = kmem_zone_alloc(xfs_bmap_free_item_zone, KM_SLEEP);

	new->xefi_startblock = bno;

	new->xefi_blockcount = (xfs_extlen_t)len;

	xfs_defer_add(flist, XFS_DEFER_OPS_TYPE_FREE, &new->xefi_list);

	xfs_defer_add(dfops, XFS_DEFER_OPS_TYPE_FREE, &new->xefi_list);

}



/*
@@ -649,7 +649,7 @@ xfs_bmap_btree_to_extents( 
	cblock = XFS_BUF_TO_BLOCK(cbp);

	if ((error = xfs_btree_check_block(cur, cblock, 0, cbp)))

		return error;

	xfs_bmap_add_free(mp, cur->bc_private.b.flist, cbno, 1);

	xfs_bmap_add_free(mp, cur->bc_private.b.dfops, cbno, 1);

	ip->i_d.di_nblocks--;

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L);

	xfs_trans_binval(tp, cbp);
@@ -672,7 +672,7 @@ xfs_bmap_extents_to_btree( 
	xfs_trans_t		*tp,		/* transaction pointer */

	xfs_inode_t		*ip,		/* incore inode pointer */

	xfs_fsblock_t		*firstblock,	/* first-block-allocated */

	struct xfs_defer_ops	*flist,		/* blocks freed in xaction */

	struct xfs_defer_ops	*dfops,		/* blocks freed in xaction */

	xfs_btree_cur_t		**curp,		/* cursor returned to caller */

	int			wasdel,		/* converting a delayed alloc */

	int			*logflagsp,	/* inode logging flags */
@@ -721,7 +721,7 @@ xfs_bmap_extents_to_btree( 
	 */

	cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

	cur->bc_private.b.firstblock = *firstblock;

	cur->bc_private.b.flist = flist;

	cur->bc_private.b.dfops = dfops;

	cur->bc_private.b.flags = wasdel ? XFS_BTCUR_BPRV_WASDEL : 0;

	/*

	 * Convert to a btree with two levels, one record in root.
@@ -734,7 +734,7 @@ xfs_bmap_extents_to_btree( 
	if (*firstblock == NULLFSBLOCK) {

		args.type = XFS_ALLOCTYPE_START_BNO;

		args.fsbno = XFS_INO_TO_FSB(mp, ip->i_ino);

	} else if (flist->dop_low) {

	} else if (dfops->dop_low) {

		args.type = XFS_ALLOCTYPE_START_BNO;

		args.fsbno = *firstblock;

	} else {
@@ -755,7 +755,7 @@ xfs_bmap_extents_to_btree( 
	ASSERT(args.fsbno != NULLFSBLOCK);

	ASSERT(*firstblock == NULLFSBLOCK ||

	       args.agno == XFS_FSB_TO_AGNO(mp, *firstblock) ||

	       (flist->dop_low &&

	       (dfops->dop_low &&

		args.agno > XFS_FSB_TO_AGNO(mp, *firstblock)));

	*firstblock = cur->bc_private.b.firstblock = args.fsbno;

	cur->bc_private.b.allocated++;
@@ -940,7 +940,7 @@ xfs_bmap_add_attrfork_btree( 
	xfs_trans_t		*tp,		/* transaction pointer */

	xfs_inode_t		*ip,		/* incore inode pointer */

	xfs_fsblock_t		*firstblock,	/* first block allocated */

	struct xfs_defer_ops	*flist,		/* blocks to free at commit */

	struct xfs_defer_ops	*dfops,		/* blocks to free at commit */

	int			*flags)		/* inode logging flags */

{

	xfs_btree_cur_t		*cur;		/* btree cursor */
@@ -953,7 +953,7 @@ xfs_bmap_add_attrfork_btree( 
		*flags |= XFS_ILOG_DBROOT;

	else {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, XFS_DATA_FORK);

		cur->bc_private.b.flist = flist;

		cur->bc_private.b.dfops = dfops;

		cur->bc_private.b.firstblock = *firstblock;

		if ((error = xfs_bmbt_lookup_ge(cur, 0, 0, 0, &stat)))

			goto error0;
@@ -983,7 +983,7 @@ xfs_bmap_add_attrfork_extents( 
	xfs_trans_t		*tp,		/* transaction pointer */

	xfs_inode_t		*ip,		/* incore inode pointer */

	xfs_fsblock_t		*firstblock,	/* first block allocated */

	struct xfs_defer_ops	*flist,		/* blocks to free at commit */

	struct xfs_defer_ops	*dfops,		/* blocks to free at commit */

	int			*flags)		/* inode logging flags */

{

	xfs_btree_cur_t		*cur;		/* bmap btree cursor */
@@ -992,7 +992,7 @@ xfs_bmap_add_attrfork_extents( 
	if (ip->i_d.di_nextents * sizeof(xfs_bmbt_rec_t) <= XFS_IFORK_DSIZE(ip))

		return 0;

	cur = NULL;

	error = xfs_bmap_extents_to_btree(tp, ip, firstblock, flist, &cur, 0,

	error = xfs_bmap_extents_to_btree(tp, ip, firstblock, dfops, &cur, 0,

		flags, XFS_DATA_FORK);

	if (cur) {

		cur->bc_private.b.allocated = 0;
@@ -1018,7 +1018,7 @@ xfs_bmap_add_attrfork_local( 
	xfs_trans_t		*tp,		/* transaction pointer */

	xfs_inode_t		*ip,		/* incore inode pointer */

	xfs_fsblock_t		*firstblock,	/* first block allocated */

	struct xfs_defer_ops	*flist,		/* blocks to free at commit */

	struct xfs_defer_ops	*dfops,		/* blocks to free at commit */

	int			*flags)		/* inode logging flags */

{

	xfs_da_args_t		dargs;		/* args for dir/attr code */
@@ -1031,7 +1031,7 @@ xfs_bmap_add_attrfork_local( 
		dargs.geo = ip->i_mount->m_dir_geo;

		dargs.dp = ip;

		dargs.firstblock = firstblock;

		dargs.flist = flist;

		dargs.dfops = dfops;

		dargs.total = dargs.geo->fsbcount;

		dargs.whichfork = XFS_DATA_FORK;

		dargs.trans = tp;
@@ -1059,7 +1059,7 @@ xfs_bmap_add_attrfork( 
	int			rsvd)		/* xact may use reserved blks */

{

	xfs_fsblock_t		firstblock;	/* 1st block/ag allocated */

	struct xfs_defer_ops	flist;		/* freed extent records */

	struct xfs_defer_ops	dfops;		/* freed extent records */

	xfs_mount_t		*mp;		/* mount structure */

	xfs_trans_t		*tp;		/* transaction pointer */

	int			blks;		/* space reservation */
@@ -1125,18 +1125,18 @@ xfs_bmap_add_attrfork( 
	ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, KM_SLEEP);

	ip->i_afp->if_flags = XFS_IFEXTENTS;

	logflags = 0;

	xfs_defer_init(&flist, &firstblock);

	xfs_defer_init(&dfops, &firstblock);

	switch (ip->i_d.di_format) {

	case XFS_DINODE_FMT_LOCAL:

		error = xfs_bmap_add_attrfork_local(tp, ip, &firstblock, &flist,

		error = xfs_bmap_add_attrfork_local(tp, ip, &firstblock, &dfops,

			&logflags);

		break;

	case XFS_DINODE_FMT_EXTENTS:

		error = xfs_bmap_add_attrfork_extents(tp, ip, &firstblock,

			&flist, &logflags);

			&dfops, &logflags);

		break;

	case XFS_DINODE_FMT_BTREE:

		error = xfs_bmap_add_attrfork_btree(tp, ip, &firstblock, &flist,

		error = xfs_bmap_add_attrfork_btree(tp, ip, &firstblock, &dfops,

			&logflags);

		break;

	default:
@@ -1165,7 +1165,7 @@ xfs_bmap_add_attrfork( 
			xfs_log_sb(tp);

	}



	error = xfs_defer_finish(&tp, &flist, NULL);

	error = xfs_defer_finish(&tp, &dfops, NULL);

	if (error)

		goto bmap_cancel;

	error = xfs_trans_commit(tp);
@@ -1173,7 +1173,7 @@ xfs_bmap_add_attrfork( 
	return error;



bmap_cancel:

	xfs_defer_cancel(&flist);

	xfs_defer_cancel(&dfops);

trans_cancel:

	xfs_trans_cancel(tp);

	xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -1970,7 +1970,7 @@ xfs_bmap_add_extent_delay_real( 


		if (xfs_bmap_needs_btree(bma->ip, whichfork)) {

			error = xfs_bmap_extents_to_btree(bma->tp, bma->ip,

					bma->firstblock, bma->flist,

					bma->firstblock, bma->dfops,

					&bma->cur, 1, &tmp_rval, whichfork);

			rval |= tmp_rval;

			if (error)
@@ -2054,7 +2054,7 @@ xfs_bmap_add_extent_delay_real( 


		if (xfs_bmap_needs_btree(bma->ip, whichfork)) {

			error = xfs_bmap_extents_to_btree(bma->tp, bma->ip,

				bma->firstblock, bma->flist, &bma->cur, 1,

				bma->firstblock, bma->dfops, &bma->cur, 1,

				&tmp_rval, whichfork);

			rval |= tmp_rval;

			if (error)
@@ -2123,7 +2123,7 @@ xfs_bmap_add_extent_delay_real( 


		if (xfs_bmap_needs_btree(bma->ip, whichfork)) {

			error = xfs_bmap_extents_to_btree(bma->tp, bma->ip,

					bma->firstblock, bma->flist, &bma->cur,

					bma->firstblock, bma->dfops, &bma->cur,

					1, &tmp_rval, whichfork);

			rval |= tmp_rval;

			if (error)
@@ -2172,7 +2172,7 @@ xfs_bmap_add_extent_delay_real( 


		ASSERT(bma->cur == NULL);

		error = xfs_bmap_extents_to_btree(bma->tp, bma->ip,

				bma->firstblock, bma->flist, &bma->cur,

				bma->firstblock, bma->dfops, &bma->cur,

				da_old > 0, &tmp_logflags, whichfork);

		bma->logflags |= tmp_logflags;

		if (error)
@@ -2214,7 +2214,7 @@ xfs_bmap_add_extent_unwritten_real( 
	xfs_btree_cur_t		**curp,	/* if *curp is null, not a btree */

	xfs_bmbt_irec_t		*new,	/* new data to add to file extents */

	xfs_fsblock_t		*first,	/* pointer to firstblock variable */

	struct xfs_defer_ops	*flist,	/* list of extents to be freed */

	struct xfs_defer_ops	*dfops,	/* list of extents to be freed */

	int			*logflagsp) /* inode logging flags */

{

	xfs_btree_cur_t		*cur;	/* btree cursor */
@@ -2707,7 +2707,7 @@ xfs_bmap_add_extent_unwritten_real( 
		int	tmp_logflags;	/* partial log flag return val */



		ASSERT(cur == NULL);

		error = xfs_bmap_extents_to_btree(tp, ip, first, flist, &cur,

		error = xfs_bmap_extents_to_btree(tp, ip, first, dfops, &cur,

				0, &tmp_logflags, XFS_DATA_FORK);

		*logflagsp |= tmp_logflags;

		if (error)
@@ -3100,7 +3100,7 @@ xfs_bmap_add_extent_hole_real( 


		ASSERT(bma->cur == NULL);

		error = xfs_bmap_extents_to_btree(bma->tp, bma->ip,

				bma->firstblock, bma->flist, &bma->cur,

				bma->firstblock, bma->dfops, &bma->cur,

				0, &tmp_logflags, whichfork);

		bma->logflags |= tmp_logflags;

		if (error)
@@ -3675,7 +3675,7 @@ xfs_bmap_btalloc( 
			error = xfs_bmap_btalloc_nullfb(ap, &args, &blen);

		if (error)

			return error;

	} else if (ap->flist->dop_low) {

	} else if (ap->dfops->dop_low) {

		if (xfs_inode_is_filestream(ap->ip))

			args.type = XFS_ALLOCTYPE_FIRST_AG;

		else
@@ -3708,7 +3708,7 @@ xfs_bmap_btalloc( 
	 * is >= the stripe unit and the allocation offset is

	 * at the end of file.

	 */

	if (!ap->flist->dop_low && ap->aeof) {

	if (!ap->dfops->dop_low && ap->aeof) {

		if (!ap->offset) {

			args.alignment = stripe_align;

			atype = args.type;
@@ -3801,7 +3801,7 @@ xfs_bmap_btalloc( 
		args.minleft = 0;

		if ((error = xfs_alloc_vextent(&args)))

			return error;

		ap->flist->dop_low = true;

		ap->dfops->dop_low = true;

	}

	if (args.fsbno != NULLFSBLOCK) {

		/*
@@ -3811,7 +3811,7 @@ xfs_bmap_btalloc( 
		ASSERT(*ap->firstblock == NULLFSBLOCK ||

		       XFS_FSB_TO_AGNO(mp, *ap->firstblock) ==

		       XFS_FSB_TO_AGNO(mp, args.fsbno) ||

		       (ap->flist->dop_low &&

		       (ap->dfops->dop_low &&

			XFS_FSB_TO_AGNO(mp, *ap->firstblock) <

			XFS_FSB_TO_AGNO(mp, args.fsbno)));
@@ -3819,7 +3819,7 @@ xfs_bmap_btalloc( 
		if (*ap->firstblock == NULLFSBLOCK)

			*ap->firstblock = args.fsbno;

		ASSERT(nullfb || fb_agno == args.agno ||

		       (ap->flist->dop_low && fb_agno < args.agno));

		       (ap->dfops->dop_low && fb_agno < args.agno));

		ap->length = args.len;

		ap->ip->i_d.di_nblocks += args.len;

		xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
@@ -4286,7 +4286,7 @@ xfs_bmapi_allocate( 
	if (error)

		return error;



	if (bma->flist->dop_low)

	if (bma->dfops->dop_low)

		bma->minleft = 0;

	if (bma->cur)

		bma->cur->bc_private.b.firstblock = *bma->firstblock;
@@ -4295,7 +4295,7 @@ xfs_bmapi_allocate( 
	if ((ifp->if_flags & XFS_IFBROOT) && !bma->cur) {

		bma->cur = xfs_bmbt_init_cursor(mp, bma->tp, bma->ip, whichfork);

		bma->cur->bc_private.b.firstblock = *bma->firstblock;

		bma->cur->bc_private.b.flist = bma->flist;

		bma->cur->bc_private.b.dfops = bma->dfops;

	}

	/*

	 * Bump the number of extents we've allocated
@@ -4376,7 +4376,7 @@ xfs_bmapi_convert_unwritten( 
		bma->cur = xfs_bmbt_init_cursor(bma->ip->i_mount, bma->tp,

					bma->ip, whichfork);

		bma->cur->bc_private.b.firstblock = *bma->firstblock;

		bma->cur->bc_private.b.flist = bma->flist;

		bma->cur->bc_private.b.dfops = bma->dfops;

	}

	mval->br_state = (mval->br_state == XFS_EXT_UNWRITTEN)

				? XFS_EXT_NORM : XFS_EXT_UNWRITTEN;
@@ -4393,7 +4393,7 @@ xfs_bmapi_convert_unwritten( 
	}



	error = xfs_bmap_add_extent_unwritten_real(bma->tp, bma->ip, &bma->idx,

			&bma->cur, mval, bma->firstblock, bma->flist,

			&bma->cur, mval, bma->firstblock, bma->dfops,

			&tmp_logflags);

	/*

	 * Log the inode core unconditionally in the unwritten extent conversion
@@ -4447,7 +4447,7 @@ xfs_bmapi_write( 
	xfs_extlen_t		total,		/* total blocks needed */

	struct xfs_bmbt_irec	*mval,		/* output: map values */

	int			*nmap,		/* i/o: mval size/count */

	struct xfs_defer_ops	*flist)		/* i/o: list extents to free */

	struct xfs_defer_ops	*dfops)		/* i/o: list extents to free */

{

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp;
@@ -4537,7 +4537,7 @@ xfs_bmapi_write( 
	bma.ip = ip;

	bma.total = total;

	bma.userdata = 0;

	bma.flist = flist;

	bma.dfops = dfops;

	bma.firstblock = firstblock;



	while (bno < end && n < *nmap) {
@@ -4651,7 +4651,7 @@ xfs_bmapi_write( 
			       XFS_FSB_TO_AGNO(mp, *firstblock) ==

			       XFS_FSB_TO_AGNO(mp,

				       bma.cur->bc_private.b.firstblock) ||

			       (flist->dop_low &&

			       (dfops->dop_low &&

				XFS_FSB_TO_AGNO(mp, *firstblock) <

				XFS_FSB_TO_AGNO(mp,

					bma.cur->bc_private.b.firstblock)));
@@ -4735,7 +4735,7 @@ xfs_bmap_del_extent( 
	xfs_inode_t		*ip,	/* incore inode pointer */

	xfs_trans_t		*tp,	/* current transaction pointer */

	xfs_extnum_t		*idx,	/* extent number to update/delete */

	struct xfs_defer_ops	*flist,	/* list of extents to be freed */

	struct xfs_defer_ops	*dfops,	/* list of extents to be freed */

	xfs_btree_cur_t		*cur,	/* if null, not a btree */

	xfs_bmbt_irec_t		*del,	/* data to remove from extents */

	int			*logflagsp, /* inode logging flags */
@@ -5023,7 +5023,7 @@ xfs_bmap_del_extent( 
	 * If we need to, add to list of extents to delete.

	 */

	if (do_fx)

		xfs_bmap_add_free(mp, flist, del->br_startblock,

		xfs_bmap_add_free(mp, dfops, del->br_startblock,

			del->br_blockcount);

	/*

	 * Adjust inode # blocks in the file.
@@ -5064,7 +5064,7 @@ xfs_bunmapi( 
	xfs_extnum_t		nexts,		/* number of extents max */

	xfs_fsblock_t		*firstblock,	/* first allocated block

						   controls a.g. for allocs */

	struct xfs_defer_ops	*flist,		/* i/o: list extents to free */

	struct xfs_defer_ops	*dfops,		/* i/o: list extents to free */

	int			*done)		/* set if not done yet */

{

	xfs_btree_cur_t		*cur;		/* bmap btree cursor */
@@ -5137,7 +5137,7 @@ xfs_bunmapi( 
		ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE);

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_private.b.firstblock = *firstblock;

		cur->bc_private.b.flist = flist;

		cur->bc_private.b.dfops = dfops;

		cur->bc_private.b.flags = 0;

	} else

		cur = NULL;
@@ -5231,7 +5231,7 @@ xfs_bunmapi( 
			}

			del.br_state = XFS_EXT_UNWRITTEN;

			error = xfs_bmap_add_extent_unwritten_real(tp, ip,

					&lastx, &cur, &del, firstblock, flist,

					&lastx, &cur, &del, firstblock, dfops,

					&logflags);

			if (error)

				goto error0;
@@ -5290,7 +5290,7 @@ xfs_bunmapi( 
				lastx--;

				error = xfs_bmap_add_extent_unwritten_real(tp,

						ip, &lastx, &cur, &prev,

						firstblock, flist, &logflags);

						firstblock, dfops, &logflags);

				if (error)

					goto error0;

				goto nodelete;
@@ -5299,7 +5299,7 @@ xfs_bunmapi( 
				del.br_state = XFS_EXT_UNWRITTEN;

				error = xfs_bmap_add_extent_unwritten_real(tp,

						ip, &lastx, &cur, &del,

						firstblock, flist, &logflags);

						firstblock, dfops, &logflags);

				if (error)

					goto error0;

				goto nodelete;
@@ -5357,7 +5357,7 @@ xfs_bunmapi( 
		} else if (cur)

			cur->bc_private.b.flags &= ~XFS_BTCUR_BPRV_WASDEL;



		error = xfs_bmap_del_extent(ip, tp, &lastx, flist, cur, &del,

		error = xfs_bmap_del_extent(ip, tp, &lastx, dfops, cur, &del,

				&tmp_logflags, whichfork);

		logflags |= tmp_logflags;

		if (error)
@@ -5391,7 +5391,7 @@ xfs_bunmapi( 
	 */

	if (xfs_bmap_needs_btree(ip, whichfork)) {

		ASSERT(cur == NULL);

		error = xfs_bmap_extents_to_btree(tp, ip, firstblock, flist,

		error = xfs_bmap_extents_to_btree(tp, ip, firstblock, dfops,

			&cur, 0, &tmp_logflags, whichfork);

		logflags |= tmp_logflags;

		if (error)
@@ -5680,7 +5680,7 @@ xfs_bmap_shift_extents( 
	int			*done,

	xfs_fileoff_t		stop_fsb,

	xfs_fsblock_t		*firstblock,

	struct xfs_defer_ops	*flist,

	struct xfs_defer_ops	*dfops,

	enum shift_direction	direction,

	int			num_exts)

{
@@ -5725,7 +5725,7 @@ xfs_bmap_shift_extents( 
	if (ifp->if_flags & XFS_IFBROOT) {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_private.b.firstblock = *firstblock;

		cur->bc_private.b.flist = flist;

		cur->bc_private.b.dfops = dfops;

		cur->bc_private.b.flags = 0;

	}
@@ -5834,7 +5834,7 @@ xfs_bmap_split_extent_at( 
	struct xfs_inode	*ip,

	xfs_fileoff_t		split_fsb,

	xfs_fsblock_t		*firstfsb,

	struct xfs_defer_ops	*free_list)

	struct xfs_defer_ops	*dfops)

{

	int				whichfork = XFS_DATA_FORK;

	struct xfs_btree_cur		*cur = NULL;
@@ -5896,7 +5896,7 @@ xfs_bmap_split_extent_at( 
	if (ifp->if_flags & XFS_IFBROOT) {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_private.b.firstblock = *firstfsb;

		cur->bc_private.b.flist = free_list;

		cur->bc_private.b.dfops = dfops;

		cur->bc_private.b.flags = 0;

		error = xfs_bmbt_lookup_eq(cur, got.br_startoff,

				got.br_startblock,
@@ -5949,7 +5949,7 @@ xfs_bmap_split_extent_at( 
		int tmp_logflags; /* partial log flag return val */



		ASSERT(cur == NULL);

		error = xfs_bmap_extents_to_btree(tp, ip, firstfsb, free_list,

		error = xfs_bmap_extents_to_btree(tp, ip, firstfsb, dfops,

				&cur, 0, &tmp_logflags, whichfork);

		logflags |= tmp_logflags;

	}
@@ -5973,7 +5973,7 @@ xfs_bmap_split_extent( 
{

	struct xfs_mount        *mp = ip->i_mount;

	struct xfs_trans        *tp;

	struct xfs_defer_ops    free_list;

	struct xfs_defer_ops    dfops;

	xfs_fsblock_t           firstfsb;

	int                     error;
@@ -5985,21 +5985,21 @@ xfs_bmap_split_extent( 
	xfs_ilock(ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);



	xfs_defer_init(&free_list, &firstfsb);

	xfs_defer_init(&dfops, &firstfsb);



	error = xfs_bmap_split_extent_at(tp, ip, split_fsb,

			&firstfsb, &free_list);

			&firstfsb, &dfops);

	if (error)

		goto out;



	error = xfs_defer_finish(&tp, &free_list, NULL);

	error = xfs_defer_finish(&tp, &dfops, NULL);

	if (error)

		goto out;



	return xfs_trans_commit(tp);



out:

	xfs_defer_cancel(&free_list);

	xfs_defer_cancel(&dfops);

	xfs_trans_cancel(tp);

	return error;

}

fs/xfs/libxfs/xfs_bmap.h

+5 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ extern kmem_zone_t *xfs_bmap_free_item_zone; 
 */

struct xfs_bmalloca {

	xfs_fsblock_t		*firstblock; /* i/o first block allocated */

	struct xfs_defer_ops	*flist;	/* bmap freelist */

	struct xfs_defer_ops	*dfops;	/* bmap freelist */

	struct xfs_trans	*tp;	/* transaction pointer */

	struct xfs_inode	*ip;	/* incore inode pointer */

	struct xfs_bmbt_irec	prev;	/* extent before the new one */
@@ -164,7 +164,7 @@ void xfs_bmap_trace_exlist(struct xfs_inode *ip, xfs_extnum_t cnt, 


int	xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);

void	xfs_bmap_local_to_extents_empty(struct xfs_inode *ip, int whichfork);

void	xfs_bmap_add_free(struct xfs_mount *mp, struct xfs_defer_ops *flist,

void	xfs_bmap_add_free(struct xfs_mount *mp, struct xfs_defer_ops *dfops,

			  xfs_fsblock_t bno, xfs_filblks_t len);

void	xfs_bmap_compute_maxlevels(struct xfs_mount *mp, int whichfork);

int	xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip,
@@ -186,18 +186,18 @@ int xfs_bmapi_write(struct xfs_trans *tp, struct xfs_inode *ip, 
		xfs_fileoff_t bno, xfs_filblks_t len, int flags,

		xfs_fsblock_t *firstblock, xfs_extlen_t total,

		struct xfs_bmbt_irec *mval, int *nmap,

		struct xfs_defer_ops *flist);

		struct xfs_defer_ops *dfops);

int	xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t bno, xfs_filblks_t len, int flags,

		xfs_extnum_t nexts, xfs_fsblock_t *firstblock,

		struct xfs_defer_ops *flist, int *done);

		struct xfs_defer_ops *dfops, int *done);

int	xfs_check_nostate_extents(struct xfs_ifork *ifp, xfs_extnum_t idx,

		xfs_extnum_t num);

uint	xfs_default_attroffset(struct xfs_inode *ip);

int	xfs_bmap_shift_extents(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb,

		int *done, xfs_fileoff_t stop_fsb, xfs_fsblock_t *firstblock,

		struct xfs_defer_ops *flist, enum shift_direction direction,

		struct xfs_defer_ops *dfops, enum shift_direction direction,

		int num_exts);

int	xfs_bmap_split_extent(struct xfs_inode *ip, xfs_fileoff_t split_offset);