diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-06-24 03:52:50 +0200 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-07-26 20:16:44 +0200 |
| commit | f2d6761433d69d94e0b39ac44ef0f0f0b0508065 (patch) | |
| tree | 12b33cc84c66146b9dc16f8df4884a7e6345f20f /fs/xfs/xfs_inode_item.c | |
| parent | xfs: remove xfs_iput_new (diff) | |
| download | linux-f2d6761433d69d94e0b39ac44ef0f0f0b0508065.tar.xz linux-f2d6761433d69d94e0b39ac44ef0f0f0b0508065.zip | |
xfs: remove xfs_iput
xfs_iput is just a small wrapper for xfs_iunlock + IRELE. Having this
out of line wrapper means the trace events in those two can't track
their caller properly. So just remove the wrapper and opencode the
unlock + rele in the few callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_inode_item.c')
| -rw-r--r-- | fs/xfs/xfs_inode_item.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 2998b2cb7466..065c1ad9b708 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c @@ -660,8 +660,10 @@ xfs_inode_item_unlock( lock_flags = iip->ili_lock_flags; iip->ili_lock_flags = 0; - if (lock_flags) - xfs_iput(iip->ili_inode, lock_flags); + if (lock_flags) { + xfs_iunlock(iip->ili_inode, lock_flags); + IRELE(iip->ili_inode); + } } /* |