diff options
author | Christoph Hellwig <hch@infradead.org> | 2008-03-27 03:01:08 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-04-17 21:49:08 -0400 |
commit | 433550990e6c2e94995239bac6a52b4df454cae0 (patch) | |
tree | 4536c63306b8e6656b969dc71b099e1b2c149454 /fs/xfs/quota | |
parent | df26cfe849d8fd767b26fcd4bfebfff67bda9f3a (diff) |
[XFS] remove most calls to VN_RELE
Most VN_RELE calls either directly contain a XFS_ITOV or have the
corresponding xfs_inode already in scope. Use the IRELE helper instead of
VN_RELE to clarify the code. With a little more work we can kill VN_RELE
altogether and define IRELE in terms of iput directly.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30710a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/quota')
-rw-r--r-- | fs/xfs/quota/xfs_qm.c | 6 | ||||
-rw-r--r-- | fs/xfs/quota/xfs_qm_syscalls.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 8e9c5ae6504d..adbc7bb9fbaa 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
@@ -1810,7 +1810,7 @@ xfs_qm_dqusage_adjust( | |||
1810 | * Now release the inode. This will send it to 'inactive', and | 1810 | * Now release the inode. This will send it to 'inactive', and |
1811 | * possibly even free blocks. | 1811 | * possibly even free blocks. |
1812 | */ | 1812 | */ |
1813 | VN_RELE(XFS_ITOV(ip)); | 1813 | IRELE(ip); |
1814 | 1814 | ||
1815 | /* | 1815 | /* |
1816 | * Goto next inode. | 1816 | * Goto next inode. |
@@ -1968,7 +1968,7 @@ xfs_qm_init_quotainos( | |||
1968 | if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, | 1968 | if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, |
1969 | 0, 0, &gip, 0))) { | 1969 | 0, 0, &gip, 0))) { |
1970 | if (uip) | 1970 | if (uip) |
1971 | VN_RELE(XFS_ITOV(uip)); | 1971 | IRELE(uip); |
1972 | return XFS_ERROR(error); | 1972 | return XFS_ERROR(error); |
1973 | } | 1973 | } |
1974 | } | 1974 | } |
@@ -1999,7 +1999,7 @@ xfs_qm_init_quotainos( | |||
1999 | sbflags | XFS_SB_GQUOTINO, flags); | 1999 | sbflags | XFS_SB_GQUOTINO, flags); |
2000 | if (error) { | 2000 | if (error) { |
2001 | if (uip) | 2001 | if (uip) |
2002 | VN_RELE(XFS_ITOV(uip)); | 2002 | IRELE(uip); |
2003 | 2003 | ||
2004 | return XFS_ERROR(error); | 2004 | return XFS_ERROR(error); |
2005 | } | 2005 | } |
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c index d2b8be7e75f9..3dc161f39d13 100644 --- a/fs/xfs/quota/xfs_qm_syscalls.c +++ b/fs/xfs/quota/xfs_qm_syscalls.c | |||
@@ -386,7 +386,7 @@ xfs_qm_scall_trunc_qfiles( | |||
386 | error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, 0, 0, &qip, 0); | 386 | error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, 0, 0, &qip, 0); |
387 | if (! error) { | 387 | if (! error) { |
388 | (void) xfs_truncate_file(mp, qip); | 388 | (void) xfs_truncate_file(mp, qip); |
389 | VN_RELE(XFS_ITOV(qip)); | 389 | IRELE(qip); |
390 | } | 390 | } |
391 | } | 391 | } |
392 | 392 | ||
@@ -395,7 +395,7 @@ xfs_qm_scall_trunc_qfiles( | |||
395 | error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, 0, 0, &qip, 0); | 395 | error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, 0, 0, &qip, 0); |
396 | if (! error) { | 396 | if (! error) { |
397 | (void) xfs_truncate_file(mp, qip); | 397 | (void) xfs_truncate_file(mp, qip); |
398 | VN_RELE(XFS_ITOV(qip)); | 398 | IRELE(qip); |
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
@@ -552,13 +552,13 @@ xfs_qm_scall_getqstat( | |||
552 | out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks; | 552 | out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks; |
553 | out->qs_uquota.qfs_nextents = uip->i_d.di_nextents; | 553 | out->qs_uquota.qfs_nextents = uip->i_d.di_nextents; |
554 | if (tempuqip) | 554 | if (tempuqip) |
555 | VN_RELE(XFS_ITOV(uip)); | 555 | IRELE(uip); |
556 | } | 556 | } |
557 | if (gip) { | 557 | if (gip) { |
558 | out->qs_gquota.qfs_nblks = gip->i_d.di_nblocks; | 558 | out->qs_gquota.qfs_nblks = gip->i_d.di_nblocks; |
559 | out->qs_gquota.qfs_nextents = gip->i_d.di_nextents; | 559 | out->qs_gquota.qfs_nextents = gip->i_d.di_nextents; |
560 | if (tempgqip) | 560 | if (tempgqip) |
561 | VN_RELE(XFS_ITOV(gip)); | 561 | IRELE(gip); |
562 | } | 562 | } |
563 | if (mp->m_quotainfo) { | 563 | if (mp->m_quotainfo) { |
564 | out->qs_incoredqs = XFS_QI_MPLNDQUOTS(mp); | 564 | out->qs_incoredqs = XFS_QI_MPLNDQUOTS(mp); |
@@ -1095,7 +1095,7 @@ again: | |||
1095 | * inactive code in hell. | 1095 | * inactive code in hell. |
1096 | */ | 1096 | */ |
1097 | if (vnode_refd) | 1097 | if (vnode_refd) |
1098 | VN_RELE(vp); | 1098 | IRELE(ip); |
1099 | XFS_MOUNT_ILOCK(mp); | 1099 | XFS_MOUNT_ILOCK(mp); |
1100 | /* | 1100 | /* |
1101 | * If an inode was inserted or removed, we gotta | 1101 | * If an inode was inserted or removed, we gotta |