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

Commit ddc3415a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: simplify xfs_trans_ijoin* again 



There is no reason to keep a reference to the inode even if we unlock
it during transaction commit because we never drop a reference between
the ijoin and commit.  Also use this fact to merge xfs_trans_ijoin_ref
back into xfs_trans_ijoin - the third argument decides if an unlock
is needed now.

I'm actually starting to wonder if allowing inodes to be unlocked
at transaction commit really is worth the effort.  The only real
benefit is that they can be unlocked earlier when commiting a
synchronous transactions, but that could be solved by doing the
log force manually after the unlock, too.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 23bb0be1

fs/xfs/xfs_attr.c

+14 −14
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ xfs_attr_set_int( 
		return (error);

	}



	xfs_trans_ijoin(args.trans, dp);

	xfs_trans_ijoin(args.trans, dp, 0);



	/*

	 * If the attribute list is non-existent or a shortform list,
@@ -389,7 +389,7 @@ xfs_attr_set_int( 
		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args.trans, dp);

			xfs_trans_ijoin(args.trans, dp, 0);



		/*

		 * Commit the leaf transformation.  We'll need another (linked)
@@ -537,7 +537,7 @@ xfs_attr_remove_int(xfs_inode_t *dp, struct xfs_name *name, int flags) 
	 * No need to make quota reservations here. We expect to release some

	 * blocks not allocate in the common case.

	 */

	xfs_trans_ijoin(args.trans, dp);

	xfs_trans_ijoin(args.trans, dp, 0);



	/*

	 * Decide on what work routines to call based on the inode size.
@@ -809,7 +809,7 @@ xfs_attr_inactive(xfs_inode_t *dp) 
	 * No need to make quota reservations here. We expect to release some

	 * blocks, not allocate, in the common case.

	 */

	xfs_trans_ijoin(trans, dp);

	xfs_trans_ijoin(trans, dp, 0);



	/*

	 * Decide on what work routines to call based on the inode size.
@@ -961,7 +961,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp);

			xfs_trans_ijoin(args->trans, dp, 0);



		/*

		 * Commit the current trans (including the inode) and start
@@ -1063,7 +1063,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp);

				xfs_trans_ijoin(args->trans, dp, 0);

		} else

			xfs_da_buf_done(bp);
@@ -1137,7 +1137,7 @@ xfs_attr_leaf_removename(xfs_da_args_t *args) 
		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp);

			xfs_trans_ijoin(args->trans, dp, 0);

	} else

		xfs_da_buf_done(bp);

	return(0);
@@ -1291,7 +1291,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp);

				xfs_trans_ijoin(args->trans, dp, 0);



			/*

			 * Commit the node conversion and start the next
@@ -1328,7 +1328,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp);

			xfs_trans_ijoin(args->trans, dp, 0);

	} else {

		/*

		 * Addition succeeded, update Btree hashvals.
@@ -1440,7 +1440,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp);

				xfs_trans_ijoin(args->trans, dp, 0);

		}



		/*
@@ -1572,7 +1572,7 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp);

			xfs_trans_ijoin(args->trans, dp, 0);



		/*

		 * Commit the Btree join operation and start a new trans.
@@ -1623,7 +1623,7 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
			 * in all transactions.

			 */

			if (committed)

				xfs_trans_ijoin(args->trans, dp);

				xfs_trans_ijoin(args->trans, dp, 0);

		} else

			xfs_da_brelse(args->trans, bp);

	}
@@ -2060,7 +2060,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) 
		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, dp);

			xfs_trans_ijoin(args->trans, dp, 0);



		ASSERT(nmap == 1);

		ASSERT((map.br_startblock != DELAYSTARTBLOCK) &&
@@ -2207,7 +2207,7 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) 
		 * a new one.  We need the inode to be in all transactions.

		 */

		if (committed)

			xfs_trans_ijoin(args->trans, args->dp);

			xfs_trans_ijoin(args->trans, args->dp, 0);



		/*

		 * Close out trans and start the next one in the chain.

fs/xfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -2195,7 +2195,7 @@ xfs_bmap_rtalloc( 
	 * Lock out other modifications to the RT bitmap inode.

	 */

	xfs_ilock(mp->m_rbmip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin_ref(ap->tp, mp->m_rbmip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(ap->tp, mp->m_rbmip, XFS_ILOCK_EXCL);



	/*

	 * If it's an allocation to an empty file at offset 0,
@@ -3460,7 +3460,7 @@ xfs_bmap_add_attrfork( 
	}

	ASSERT(ip->i_d.di_anextents == 0);



	xfs_trans_ijoin_ref(tp, ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	switch (ip->i_d.di_format) {

fs/xfs/xfs_dfrag.c

+2 −2
Original line number Diff line number Diff line
@@ -425,8 +425,8 @@ xfs_swap_extents( 
	}





	xfs_trans_ijoin_ref(tp, ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);

	xfs_trans_ijoin_ref(tp, tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);

	xfs_trans_ijoin(tp, tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);



	xfs_trans_log_inode(tp, ip,  ilf_fields);

	xfs_trans_log_inode(tp, tip, tilf_fields);

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ xfs_qm_dqalloc( 
		return (ESRCH);

	}



	xfs_trans_ijoin_ref(tp, quotip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL);

	nmaps = 1;

	error = xfs_bmapi_write(tp, quotip, offset_fsb,

				XFS_DQUOT_CLUSTER_SIZE_FSB, XFS_BMAPI_METADATA,

fs/xfs/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ xfs_file_fsync( 
		 * transaction.	 So we play it safe and fire off the

		 * transaction anyway.

		 */

		xfs_trans_ijoin(tp, ip);

		xfs_trans_ijoin(tp, ip, 0);

		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

		error = xfs_trans_commit(tp, 0);