diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-04-20 11:01:53 +0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-05-19 18:58:15 +0400 |
| commit | 191f8488f9f7600a96e1500ee2ee74a407e2eb1c (patch) | |
| tree | 23dbc84d31563e64ff60d99a2974727ca3bf8e42 /fs/xfs/quota/xfs_dquot.c | |
| parent | 8a7b8a89a3ae5b510396cdcc821698d4aa20afcf (diff) | |
| download | linux-191f8488f9f7600a96e1500ee2ee74a407e2eb1c.tar.xz | |
xfs: remove a few macro indirections in the quota code
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/quota/xfs_dquot.c')
| -rw-r--r-- | fs/xfs/quota/xfs_dquot.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c index 9b1e8be98820..b89ec5df0129 100644 --- a/fs/xfs/quota/xfs_dquot.c +++ b/fs/xfs/quota/xfs_dquot.c @@ -956,16 +956,17 @@ xfs_qm_dqget( */ if (ip) { xfs_ilock(ip, XFS_ILOCK_EXCL); - if (! XFS_IS_DQTYPE_ON(mp, type)) { - /* inode stays locked on return */ - xfs_qm_dqdestroy(dqp); - return XFS_ERROR(ESRCH); - } + /* * A dquot could be attached to this inode by now, since * we had dropped the ilock. */ if (type == XFS_DQ_USER) { + if (!XFS_IS_UQUOTA_ON(mp)) { + /* inode stays locked on return */ + xfs_qm_dqdestroy(dqp); + return XFS_ERROR(ESRCH); + } if (ip->i_udquot) { xfs_qm_dqdestroy(dqp); dqp = ip->i_udquot; @@ -973,6 +974,11 @@ xfs_qm_dqget( goto dqret; } } else { + if (!XFS_IS_OQUOTA_ON(mp)) { + /* inode stays locked on return */ + xfs_qm_dqdestroy(dqp); + return XFS_ERROR(ESRCH); + } if (ip->i_gdquot) { xfs_qm_dqdestroy(dqp); dqp = ip->i_gdquot; |