From 4c06f21d0e6f45bfb3b41e2afb56378eab6440f0 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 3 Dec 2008 12:20:35 +0100
Subject: [PATCH] --- yaml --- r: 124935 b: refs/heads/master c:
 070c4616ec62fc207e2aeef9d0f28af294c651d0 h: refs/heads/master i:   124933:
 e73c8a5d239b79bc0a595dc6e2f733a3429565fd   124931:
 a9f0a7bae669f8446fdbe24bf47cb364b028754c   124927:
 b705b13ea68f6eaf64b3148df179ea14f1d659f9 v: v3

---
 [refs]                         |  2 +-
 trunk/fs/xfs/xfs_trans_inode.c | 30 +-----------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 53a87f7a157e..678f8b25c875 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b56757becf8bc62292263a24a23cf55edb4be55f
+refs/heads/master: 070c4616ec62fc207e2aeef9d0f28af294c651d0
diff --git a/trunk/fs/xfs/xfs_trans_inode.c b/trunk/fs/xfs/xfs_trans_inode.c
index 2a1c0f071f91..23d276af2e0c 100644
--- a/trunk/fs/xfs/xfs_trans_inode.c
+++ b/trunk/fs/xfs/xfs_trans_inode.c
@@ -85,7 +85,6 @@ xfs_trans_iget(
 {
 	int			error;
 	xfs_inode_t		*ip;
-	xfs_inode_log_item_t	*iip;
 
 	/*
 	 * If the transaction pointer is NULL, just call the normal
@@ -138,34 +137,7 @@ xfs_trans_iget(
 	}
 	ASSERT(ip != NULL);
 
-	/*
-	 * 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;
-
+	xfs_trans_ijoin(tp, ip, lock_flags);
 	*ipp = ip;
 	return 0;
 }