Commit 070c4616 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Niv Sardi

use xfs_trans_ijoin in xfs_trans_iget

Use xfs_trans_ijoin in xfs_trans_iget in case we need to join an inode into
a transaction instead of opencoding it.  Based on a discussion with and an
incomplete patch from Niv Sardi.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarNiv Sardi <xaiki@sgi.com>
parent b56757be
...@@ -85,7 +85,6 @@ xfs_trans_iget( ...@@ -85,7 +85,6 @@ xfs_trans_iget(
{ {
int error; int error;
xfs_inode_t *ip; xfs_inode_t *ip;
xfs_inode_log_item_t *iip;
/* /*
* If the transaction pointer is NULL, just call the normal * If the transaction pointer is NULL, just call the normal
...@@ -138,34 +137,7 @@ xfs_trans_iget( ...@@ -138,34 +137,7 @@ xfs_trans_iget(
} }
ASSERT(ip != NULL); ASSERT(ip != NULL);
/* xfs_trans_ijoin(tp, ip, lock_flags);
* Get a log_item_desc to point at the new item.
*/
if (ip->i_itemp == NULL)
xfs_inode_item_init(ip, mp);
iip = ip->i_itemp;
(void) xfs_trans_add_item(tp, (xfs_log_item_t *)(iip));
xfs_trans_inode_broot_debug(ip);
/*
* If the IO lock has been acquired, mark that in
* the inode log item so we'll know to unlock it
* when the transaction commits.
*/
ASSERT(iip->ili_flags == 0);
if (lock_flags & XFS_IOLOCK_EXCL) {
iip->ili_flags |= XFS_ILI_IOLOCKED_EXCL;
} else if (lock_flags & XFS_IOLOCK_SHARED) {
iip->ili_flags |= XFS_ILI_IOLOCKED_SHARED;
}
/*
* Initialize i_transp so we can find it with xfs_inode_incore()
* above.
*/
ip->i_transp = tp;
*ipp = ip; *ipp = ip;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment