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

Commit a8198666 authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

xfs: automatic dfops inode relogging 



Inodes that are held across deferred operations are explicitly
joined to the dfops structure to ensure appropriate relogging.
While inodes are currently joined explicitly, we can detect the
conditions that require relogging at dfops finish time by inspecting
the transaction item list for inodes with ili_lock_flags == 0.

Replace the xfs_defer_ijoin() infrastructure with such detection and
automatic relogging of held inodes. This eliminates the need for the
per-dfops inode list, replaced by an on-stack variant in
xfs_defer_trans_roll().

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-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 82ff27bc

fs/xfs/libxfs/xfs_attr.c

+0 −9
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ xfs_attr_set( 
		 * buffer and run into problems with the write verifier.

		 */

		xfs_trans_bhold(args.trans, leaf_bp);

		xfs_defer_ijoin(args.trans->t_dfops, dp);

		error = xfs_defer_finish(&args.trans);

		if (error)

			goto out;
@@ -589,7 +588,6 @@ xfs_attr_leaf_addname( 
		error = xfs_attr3_leaf_to_node(args);

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->trans->t_dfops, dp);

		error = xfs_defer_finish(&args->trans);

		if (error)

			goto out_defer_cancel;
@@ -678,7 +676,6 @@ xfs_attr_leaf_addname( 
			/* bp is gone due to xfs_da_shrink_inode */

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->trans->t_dfops, dp);

			error = xfs_defer_finish(&args->trans);

			if (error)

				goto out_defer_cancel;
@@ -742,7 +739,6 @@ xfs_attr_leaf_removename( 
		/* bp is gone due to xfs_da_shrink_inode */

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->trans->t_dfops, dp);

		error = xfs_defer_finish(&args->trans);

		if (error)

			goto out_defer_cancel;
@@ -869,7 +865,6 @@ xfs_attr_node_addname( 
			error = xfs_attr3_leaf_to_node(args);

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->trans->t_dfops, dp);

			error = xfs_defer_finish(&args->trans);

			if (error)

				goto out_defer_cancel;
@@ -894,7 +889,6 @@ xfs_attr_node_addname( 
		error = xfs_da3_split(state);

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->trans->t_dfops, dp);

		error = xfs_defer_finish(&args->trans);

		if (error)

			goto out_defer_cancel;
@@ -991,7 +985,6 @@ xfs_attr_node_addname( 
			error = xfs_da3_join(state);

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->trans->t_dfops, dp);

			error = xfs_defer_finish(&args->trans);

			if (error)

				goto out_defer_cancel;
@@ -1115,7 +1108,6 @@ xfs_attr_node_removename( 
		error = xfs_da3_join(state);

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->trans->t_dfops, dp);

		error = xfs_defer_finish(&args->trans);

		if (error)

			goto out_defer_cancel;
@@ -1147,7 +1139,6 @@ xfs_attr_node_removename( 
			/* bp is gone due to xfs_da_shrink_inode */

			if (error)

				goto out_defer_cancel;

			xfs_defer_ijoin(args->trans->t_dfops, dp);

			error = xfs_defer_finish(&args->trans);

			if (error)

				goto out_defer_cancel;

fs/xfs/libxfs/xfs_attr_remote.c

+0 −2
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ xfs_attr_rmtval_set( 
				  &nmap);

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->trans->t_dfops, dp);

		error = xfs_defer_finish(&args->trans);

		if (error)

			goto out_defer_cancel;
@@ -627,7 +626,6 @@ xfs_attr_rmtval_remove( 
				    XFS_BMAPI_ATTRFORK, 1, &done);

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->trans->t_dfops, args->dp);

		error = xfs_defer_finish(&args->trans);

		if (error)

			goto out_defer_cancel;

fs/xfs/libxfs/xfs_bmap.c

+0 −8
Original line number Diff line number Diff line
@@ -1119,7 +1119,6 @@ xfs_bmap_add_attrfork( 
			xfs_log_sb(tp);

	}



	xfs_defer_ijoin(tp->t_dfops, ip);

	error = xfs_trans_commit(tp);

	xfs_iunlock(ip, XFS_ILOCK_EXCL);

	return error;
@@ -5987,7 +5986,6 @@ __xfs_bmap_add( 
	int				whichfork,

	struct xfs_bmbt_irec		*bmap)

{

	int				error;

	struct xfs_bmap_intent		*bi;



	trace_xfs_bmap_defer(mp,
@@ -6006,12 +6004,6 @@ __xfs_bmap_add( 
	bi->bi_whichfork = whichfork;

	bi->bi_bmap = *bmap;



	error = xfs_defer_ijoin(dfops, bi->bi_owner);

	if (error) {

		kmem_free(bi);

		return error;

	}



	xfs_defer_add(dfops, XFS_DEFER_OPS_TYPE_BMAP, &bi->bi_list);

	return 0;

}

fs/xfs/libxfs/xfs_defer.c

+21 −38
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include "xfs_defer.h"

#include "xfs_trans.h"

#include "xfs_buf_item.h"

#include "xfs_inode.h"

#include "xfs_inode_item.h"

#include "xfs_trace.h"



/*
@@ -230,16 +232,14 @@ xfs_defer_trans_roll( 
{

	struct xfs_defer_ops		*dop = (*tp)->t_dfops;

	struct xfs_buf_log_item		*bli;

	struct xfs_inode_log_item	*ili;

	struct xfs_log_item		*lip;

	struct xfs_buf			*bplist[XFS_DEFER_OPS_NR_BUFS];

	int				bpcount = 0;

	struct xfs_inode		*iplist[XFS_DEFER_OPS_NR_INODES];

	int				bpcount = 0, ipcount = 0;

	int				i;

	int				error;



	/* Log all the joined inodes. */

	for (i = 0; i < XFS_DEFER_OPS_NR_INODES && dop->dop_inodes[i]; i++)

		xfs_trans_log_inode(*tp, dop->dop_inodes[i], XFS_ILOG_CORE);



	list_for_each_entry(lip, &(*tp)->t_items, li_trans) {

		switch (lip->li_type) {

		case XFS_LI_BUF:
@@ -254,6 +254,19 @@ xfs_defer_trans_roll( 
				bplist[bpcount++] = bli->bli_buf;

			}

			break;

		case XFS_LI_INODE:

			ili = container_of(lip, struct xfs_inode_log_item,

					   ili_item);

			if (ili->ili_lock_flags == 0) {

				if (ipcount >= XFS_DEFER_OPS_NR_INODES) {

					ASSERT(0);

					return -EFSCORRUPTED;

				}

				xfs_trans_log_inode(*tp, ili->ili_inode,

						    XFS_ILOG_CORE);

				iplist[ipcount++] = ili->ili_inode;

			}

			break;

		default:

			break;

		}
@@ -271,8 +284,8 @@ xfs_defer_trans_roll( 
	}



	/* Rejoin the joined inodes. */

	for (i = 0; i < XFS_DEFER_OPS_NR_INODES && dop->dop_inodes[i]; i++)

		xfs_trans_ijoin(*tp, dop->dop_inodes[i], 0);

	for (i = 0; i < ipcount; i++)

		xfs_trans_ijoin(*tp, iplist[i], 0);



	/* Rejoin the buffers and dirty them so the log moves forward. */

	for (i = 0; i < bpcount; i++) {
@@ -291,30 +304,6 @@ xfs_defer_has_unfinished_work( 
	return !list_empty(&dop->dop_pending) || !list_empty(&dop->dop_intake);

}



/*

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

 * each time we roll the transaction.

 */

int

xfs_defer_ijoin(

	struct xfs_defer_ops		*dop,

	struct xfs_inode		*ip)

{

	int				i;



	for (i = 0; i < XFS_DEFER_OPS_NR_INODES; i++) {

		if (dop->dop_inodes[i] == ip)

			return 0;

		else if (dop->dop_inodes[i] == NULL) {

			dop->dop_inodes[i] = ip;

			return 0;

		}

	}



	ASSERT(0);

	return -EFSCORRUPTED;

}



/*

 * Reset an already used dfops after finish.

 */
@@ -322,11 +311,7 @@ static void 
xfs_defer_reset(

	struct xfs_trans	*tp)

{

	struct xfs_defer_ops	*dop = tp->t_dfops;



	ASSERT(!xfs_defer_has_unfinished_work(dop));



	memset(dop->dop_inodes, 0, sizeof(dop->dop_inodes));

	ASSERT(!xfs_defer_has_unfinished_work(tp->t_dfops));



	/*

	 * Low mode state transfers across transaction rolls to mirror dfops
@@ -588,8 +573,6 @@ xfs_defer_move( 
	list_splice_init(&src->dop_intake, &dst->dop_intake);

	list_splice_init(&src->dop_pending, &dst->dop_pending);



	memcpy(dst->dop_inodes, src->dop_inodes, sizeof(dst->dop_inodes));



	/*

	 * Low free space mode was historically controlled by a dfops field.

	 * This meant that low mode state potentially carried across multiple

fs/xfs/libxfs/xfs_defer.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ int xfs_defer_finish(struct xfs_trans **tp); 
void xfs_defer_cancel(struct xfs_trans *);

void xfs_defer_init(struct xfs_trans *tp, struct xfs_defer_ops *dop);

bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);

int xfs_defer_ijoin(struct xfs_defer_ops *dop, struct xfs_inode *ip);

void xfs_defer_move(struct xfs_trans *dtp, struct xfs_trans *stp);



/* Description of a deferred type. */