vserver 2.0 rc7

[linux-2.6.git] / fs / xfs / quota / xfs_quota_priv.h

diff --git a/fs/xfs/quota/xfs_quota_priv.h b/fs/xfs/quota/xfs_quota_priv.h
index eeda93a..414b600 100644 (file)
--- a/fs/xfs/quota/xfs_quota_priv.h
+++ b/fs/xfs/quota/xfs_quota_priv.h
@@ -104,15 +104,15 @@ static inline int XQMISLCKD(struct xfs_dqhash *h)
 #define XFS_IS_DQTYPE_ON(mp, type)   (type == XFS_DQ_USER ? \
                                      XFS_IS_UQUOTA_ON(mp):XFS_IS_GQUOTA_ON(mp))
 #define XFS_IS_DQUOT_UNINITIALIZED(dqp) ( \
-       INT_ISZERO(dqp->q_core.d_blk_hardlimit, ARCH_CONVERT) && \
-       INT_ISZERO(dqp->q_core.d_blk_softlimit, ARCH_CONVERT) && \
-       INT_ISZERO(dqp->q_core.d_rtb_hardlimit, ARCH_CONVERT) && \
-       INT_ISZERO(dqp->q_core.d_rtb_softlimit, ARCH_CONVERT) && \
-       INT_ISZERO(dqp->q_core.d_ino_hardlimit, ARCH_CONVERT) && \
-       INT_ISZERO(dqp->q_core.d_ino_softlimit, ARCH_CONVERT) && \
-       INT_ISZERO(dqp->q_core.d_bcount, ARCH_CONVERT)        && \
-       INT_ISZERO(dqp->q_core.d_rtbcount, ARCH_CONVERT)      && \
-       INT_ISZERO(dqp->q_core.d_icount, ARCH_CONVERT))
+       !dqp->q_core.d_blk_hardlimit && \
+       !dqp->q_core.d_blk_softlimit && \
+       !dqp->q_core.d_rtb_hardlimit && \
+       !dqp->q_core.d_rtb_softlimit && \
+       !dqp->q_core.d_ino_hardlimit && \
+       !dqp->q_core.d_ino_softlimit && \
+       !dqp->q_core.d_bcount && \
+       !dqp->q_core.d_rtbcount && \
+       !dqp->q_core.d_icount)
 
 #define HL_PREVP       dq_hashlist.ql_prevp
 #define HL_NEXT                dq_hashlist.ql_next
@@ -174,7 +174,7 @@ for ((dqp) = (qlist)->qh_next; (dqp) != (xfs_dquot_t *)(qlist); \
                                         (tp)->t_dqinfo->dqa_usrdquots : \
                                         (tp)->t_dqinfo->dqa_grpdquots)
 #define XFS_IS_SUSER_DQUOT(dqp)                \
-       (INT_ISZERO((dqp)->q_core.d_id, ARCH_CONVERT))
+       (!((dqp)->q_core.d_id))
 
 #define XFS_PURGE_INODE(ip)            \
        {                               \