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

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

xfs: simplify inode to transaction joining 



Currently we need to either call IHOLD or xfs_trans_ihold on an inode when
joining it to a transaction via xfs_trans_ijoin.

This patches instead makes xfs_trans_ijoin usable on it's own by doing
an implicity xfs_trans_ihold, which also allows us to drop the third
argument.  For the case where we want to hold a reference on the inode
a xfs_trans_ijoin_ref wrapper is added which does the IHOLD and marks
the inode for needing an xfs_iput.  In addition to the cleaner interface
to the caller this also simplifies the implementation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 4d16e924

fs/xfs/linux-2.6/xfs_file.c

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

		 * transaction anyway.

		 */

		xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

		xfs_trans_ihold(tp, ip);

		xfs_trans_ijoin(tp, ip);

		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

		xfs_trans_set_sync(tp);

		error = _xfs_trans_commit(tp, 0, &log_flushed);

fs/xfs/linux-2.6/xfs_ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -1034,8 +1034,7 @@ xfs_ioctl_setattr( 
		}

	}



	xfs_trans_ijoin(tp, ip, lock_flags);

	xfs_trans_ihold(tp, ip);

	xfs_trans_ijoin(tp, ip);



	/*

	 * Change file ownership.  Must be the owner or privileged.

fs/xfs/linux-2.6/xfs_super.c

+1 −2
Original line number Diff line number Diff line
@@ -1023,8 +1023,7 @@ xfs_log_inode( 
	 * an inode in another recent transaction.  So we play it safe and

	 * fire off the transaction anyway.

	 */

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

	xfs_trans_ihold(tp, ip);

	xfs_trans_ijoin(tp, ip);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

	xfs_trans_set_sync(tp);

	error = xfs_trans_commit(tp, 0);

fs/xfs/linux-2.6/xfs_sync.c

+1 −2
Original line number Diff line number Diff line
@@ -362,8 +362,7 @@ xfs_commit_dummy_trans( 


	xfs_ilock(ip, XFS_ILOCK_EXCL);



	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);

	xfs_trans_ihold(tp, ip);

	xfs_trans_ijoin(tp, ip);

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

	error = xfs_trans_commit(tp, 0);

	xfs_iunlock(ip, XFS_ILOCK_EXCL);

fs/xfs/quota/xfs_dquot.c

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

	}



	/*

	 * xfs_trans_commit normally decrements the vnode ref count

	 * when it unlocks the inode. Since we want to keep the quota

	 * inode around, we bump the vnode ref count now.

	 */

	IHOLD(quotip);



	xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin_ref(tp, quotip, XFS_ILOCK_EXCL);

	nmaps = 1;

	if ((error = xfs_bmapi(tp, quotip,

			      offset_fsb, XFS_DQUOT_CLUSTER_SIZE_FSB,