diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-06-23 21:52:50 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-07-26 14:16:44 -0400 |
commit | f2d6761433d69d94e0b39ac44ef0f0f0b0508065 (patch) | |
tree | 12b33cc84c66146b9dc16f8df4884a7e6345f20f /fs/xfs/quota/xfs_qm.c | |
parent | ef35e9255d4ed12522e836fbcec861e7306d794a (diff) |
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/quota/xfs_qm.c')
-rw-r--r-- | fs/xfs/quota/xfs_qm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 7a33d65e2d28..9a92407109a1 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
@@ -1662,7 +1662,8 @@ xfs_qm_dqusage_adjust( | |||
1662 | * making us disable quotas for the file system. | 1662 | * making us disable quotas for the file system. |
1663 | */ | 1663 | */ |
1664 | if ((error = xfs_qm_dqget_noattach(ip, &udqp, &gdqp))) { | 1664 | if ((error = xfs_qm_dqget_noattach(ip, &udqp, &gdqp))) { |
1665 | xfs_iput(ip, XFS_ILOCK_EXCL); | 1665 | xfs_iunlock(ip, XFS_ILOCK_EXCL); |
1666 | IRELE(ip); | ||
1666 | *res = BULKSTAT_RV_GIVEUP; | 1667 | *res = BULKSTAT_RV_GIVEUP; |
1667 | return error; | 1668 | return error; |
1668 | } | 1669 | } |
@@ -1675,7 +1676,8 @@ xfs_qm_dqusage_adjust( | |||
1675 | * Walk thru the extent list and count the realtime blocks. | 1676 | * Walk thru the extent list and count the realtime blocks. |
1676 | */ | 1677 | */ |
1677 | if ((error = xfs_qm_get_rtblks(ip, &rtblks))) { | 1678 | if ((error = xfs_qm_get_rtblks(ip, &rtblks))) { |
1678 | xfs_iput(ip, XFS_ILOCK_EXCL); | 1679 | xfs_iunlock(ip, XFS_ILOCK_EXCL); |
1680 | IRELE(ip); | ||
1679 | if (udqp) | 1681 | if (udqp) |
1680 | xfs_qm_dqput(udqp); | 1682 | xfs_qm_dqput(udqp); |
1681 | if (gdqp) | 1683 | if (gdqp) |