diff options
author | Christoph Hellwig <hch@lst.de> | 2011-07-08 08:34:47 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2011-07-08 08:34:47 -0400 |
commit | f3ca87389dbff0a3dc1a7cb2fa7c62e25421c66c (patch) | |
tree | 39a6aa16be0bbab79e65525d57404b23eaff0205 /fs/xfs/xfs_inode.c | |
parent | 7a249cf83da1813cfa71cfe1e265b40045eceb47 (diff) |
xfs: remove i_transp
Remove the transaction pointer in the inode. It's only used to avoid
passing down an argument in the bmap code, and for a few asserts in
the transaction code right now.
Also use the local variable ip in a few more places in xfs_inode_item_unlock,
so that it isn't only used for debug builds after the above change.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index aa143b870afb..db310f8fb76a 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -1261,7 +1261,6 @@ xfs_itruncate_extents( | |||
1261 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_IOLOCK_EXCL)); | 1261 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_IOLOCK_EXCL)); |
1262 | ASSERT(new_size <= ip->i_size); | 1262 | ASSERT(new_size <= ip->i_size); |
1263 | ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); | 1263 | ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); |
1264 | ASSERT(ip->i_transp == tp); | ||
1265 | ASSERT(ip->i_itemp != NULL); | 1264 | ASSERT(ip->i_itemp != NULL); |
1266 | ASSERT(ip->i_itemp->ili_lock_flags == 0); | 1265 | ASSERT(ip->i_itemp->ili_lock_flags == 0); |
1267 | ASSERT(!XFS_NOT_DQATTACHED(mp, ip)); | 1266 | ASSERT(!XFS_NOT_DQATTACHED(mp, ip)); |
@@ -1436,7 +1435,6 @@ xfs_iunlink( | |||
1436 | 1435 | ||
1437 | ASSERT(ip->i_d.di_nlink == 0); | 1436 | ASSERT(ip->i_d.di_nlink == 0); |
1438 | ASSERT(ip->i_d.di_mode != 0); | 1437 | ASSERT(ip->i_d.di_mode != 0); |
1439 | ASSERT(ip->i_transp == tp); | ||
1440 | 1438 | ||
1441 | mp = tp->t_mountp; | 1439 | mp = tp->t_mountp; |
1442 | 1440 | ||
@@ -1828,7 +1826,6 @@ xfs_ifree( | |||
1828 | xfs_buf_t *ibp; | 1826 | xfs_buf_t *ibp; |
1829 | 1827 | ||
1830 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); | 1828 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); |
1831 | ASSERT(ip->i_transp == tp); | ||
1832 | ASSERT(ip->i_d.di_nlink == 0); | 1829 | ASSERT(ip->i_d.di_nlink == 0); |
1833 | ASSERT(ip->i_d.di_nextents == 0); | 1830 | ASSERT(ip->i_d.di_nextents == 0); |
1834 | ASSERT(ip->i_d.di_anextents == 0); | 1831 | ASSERT(ip->i_d.di_anextents == 0); |