Commit 8ad7c629 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the ip argument to xfs_defer_finish 



And instead require callers to explicitly join the inode using
xfs_defer_ijoin.  Also consolidate the defer error handling in
a few places using a goto label.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 882d8785

fs/xfs/libxfs/xfs_attr.c

+73 −67
Original line number Diff line number Diff line
@@ -328,13 +328,12 @@ xfs_attr_set( 
		 */

		xfs_defer_init(args.dfops, args.firstblock);

		error = xfs_attr_shortform_to_leaf(&args);

		if (!error)

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

		if (error) {

			args.trans = NULL;

			xfs_defer_cancel(&dfops);

			goto out;

		}

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args.dfops, dp);

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

		if (error)

			goto out_defer_cancel;



		/*

		 * Commit the leaf transformation.  We'll need another (linked)
@@ -373,6 +372,9 @@ xfs_attr_set( 


	return error;



out_defer_cancel:

	xfs_defer_cancel(&dfops);

	args.trans = NULL;

out:

	if (args.trans)

		xfs_trans_cancel(args.trans);
@@ -593,13 +595,12 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
		 */

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

		error = xfs_attr3_leaf_to_node(args);

		if (!error)

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

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->dfops);

			return error;

		}

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->dfops, dp);

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

		if (error)

			goto out_defer_cancel;



		/*

		 * Commit the current trans (including the inode) and start
@@ -684,14 +685,12 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
			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->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->dfops);

				return error;

			}

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->dfops, dp);

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

			if (error)

				goto out_defer_cancel;

		}



		/*
@@ -706,6 +705,10 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
		error = xfs_attr3_leaf_clearflag(args);

	}

	return error;

out_defer_cancel:

	xfs_defer_cancel(args->dfops);

	args->trans = NULL;

	return error;

}



/*
@@ -747,15 +750,18 @@ xfs_attr_leaf_removename(xfs_da_args_t *args) 
		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->dfops, dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->dfops);

			return error;

		}

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->dfops, dp);

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

		if (error)

			goto out_defer_cancel;

	}

	return 0;

out_defer_cancel:

	xfs_defer_cancel(args->dfops);

	args->trans = NULL;

	return error;

}



/*
@@ -872,14 +878,12 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
			state = NULL;

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

			error = xfs_attr3_leaf_to_node(args);

			if (!error)

				error = xfs_defer_finish(&args->trans,

							args->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->dfops);

				goto out;

			}

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->dfops, dp);

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

			if (error)

				goto out_defer_cancel;



			/*

			 * Commit the node conversion and start the next
@@ -900,13 +904,12 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		 */

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

		error = xfs_da3_split(state);

		if (!error)

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

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->dfops);

			goto out;

		}

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->dfops, dp);

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

		if (error)

			goto out_defer_cancel;

	} else {

		/*

		 * Addition succeeded, update Btree hashvals.
@@ -999,14 +1002,12 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		if (retval && (state->path.active > 1)) {

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

			error = xfs_da3_join(state);

			if (!error)

				error = xfs_defer_finish(&args->trans,

							args->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->dfops);

				goto out;

			}

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->dfops, dp);

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

			if (error)

				goto out_defer_cancel;

		}



		/*
@@ -1032,6 +1033,10 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
	if (error)

		return error;

	return retval;

out_defer_cancel:

	xfs_defer_cancel(args->dfops);

	args->trans = NULL;

	goto out;

}



/*
@@ -1122,13 +1127,12 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
	if (retval && (state->path.active > 1)) {

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

		error = xfs_da3_join(state);

		if (!error)

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

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->dfops);

			goto out;

		}

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->dfops, dp);

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

		if (error)

			goto out_defer_cancel;

		/*

		 * Commit the Btree join operation and start a new trans.

		 */
@@ -1156,14 +1160,12 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
			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->dfops, dp);

			if (error) {

				args->trans = NULL;

				xfs_defer_cancel(args->dfops);

				goto out;

			}

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->dfops, dp);

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

			if (error)

				goto out_defer_cancel;

		} else

			xfs_trans_brelse(args->trans, bp);

	}
@@ -1172,6 +1174,10 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
out:

	xfs_da_state_free(state);

	return error;

out_defer_cancel:

	xfs_defer_cancel(args->dfops);

	args->trans = NULL;

	goto out;

}



/*

fs/xfs/libxfs/xfs_attr_remote.c

+20 −15
Original line number Diff line number Diff line
@@ -467,13 +467,12 @@ xfs_attr_rmtval_set( 
		error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)lblkno,

				  blkcnt, XFS_BMAPI_ATTRFORK, args->firstblock,

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

		if (!error)

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

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->dfops);

			return error;

		}

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->dfops, dp);

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

		if (error)

			goto out_defer_cancel;



		ASSERT(nmap == 1);

		ASSERT((map.br_startblock != DELAYSTARTBLOCK) &&
@@ -539,6 +538,10 @@ xfs_attr_rmtval_set( 
	}

	ASSERT(valuelen == 0);

	return 0;

out_defer_cancel:

	xfs_defer_cancel(args->dfops);

	args->trans = NULL;

	return error;

}



/*
@@ -609,14 +612,12 @@ xfs_attr_rmtval_remove( 
		error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,

				    XFS_BMAPI_ATTRFORK, 1, args->firstblock,

				    args->dfops, &done);

		if (!error)

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

						args->dp);

		if (error) {

			args->trans = NULL;

			xfs_defer_cancel(args->dfops);

			return error;

		}

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->dfops, args->dp);

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

		if (error)

			goto out_defer_cancel;



		/*

		 * Close out trans and start the next one in the chain.
@@ -626,4 +627,8 @@ xfs_attr_rmtval_remove( 
			return error;

	}

	return 0;

out_defer_cancel:

	xfs_defer_cancel(args->dfops);

	args->trans = NULL;

	return error;

}

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ xfs_bmap_add_attrfork( 
			xfs_log_sb(tp);

	}



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

	error = xfs_defer_finish(&tp, &dfops);

	if (error)

		goto bmap_cancel;

	error = xfs_trans_commit(tp);
@@ -6402,7 +6402,7 @@ xfs_bmap_split_extent( 
	if (error)

		goto out;



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

	error = xfs_defer_finish(&tp, &dfops);

	if (error)

		goto out;

fs/xfs/libxfs/xfs_defer.c

+2 −6
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ xfs_defer_has_unfinished_work( 


/*

 * Add this inode to the deferred op.  Each joined inode is relogged

 * each time we roll the transaction, in addition to any inode passed

 * to xfs_defer_finish().

 * each time we roll the transaction.

 */

int

xfs_defer_ijoin(
@@ -310,8 +309,7 @@ xfs_defer_ijoin( 
int

xfs_defer_finish(

	struct xfs_trans		**tp,

	struct xfs_defer_ops		*dop,

	struct xfs_inode		*ip)

	struct xfs_defer_ops		*dop)

{

	struct xfs_defer_pending	*dfp;

	struct list_head		*li;
@@ -324,8 +322,6 @@ xfs_defer_finish( 


	trace_xfs_defer_finish((*tp)->t_mountp, dop);



	xfs_defer_ijoin(dop, ip);



	/* Until we run out of pending work to finish... */

	while (xfs_defer_has_unfinished_work(dop)) {

		/* Log intents for work items sitting in the intake. */

fs/xfs/libxfs/xfs_defer.h

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ struct xfs_defer_ops { 


void xfs_defer_add(struct xfs_defer_ops *dop, enum xfs_defer_ops_type type,

		struct list_head *h);

int xfs_defer_finish(struct xfs_trans **tp, struct xfs_defer_ops *dop,

		struct xfs_inode *ip);

int xfs_defer_finish(struct xfs_trans **tp, struct xfs_defer_ops *dop);

void xfs_defer_cancel(struct xfs_defer_ops *dop);

void xfs_defer_init(struct xfs_defer_ops *dop, xfs_fsblock_t *fbp);

bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);