1 files changed, 5 insertions, 6 deletions

diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
index 4f0ebfc43cc9..55abbca2883d 100644
--- a/fs/xfs/xfs_dquot.h
+++ b/fs/xfs/xfs_dquot.h
@@ -53,6 +53,7 @@ typedef struct xfs_dquot {
         xfs_fileoff_t    q_fileoffset;  /* offset in quotas file */
 
         struct xfs_dquot*q_gdquot;      /* group dquot, hint only */
+        struct xfs_dquot*q_pdquot;      /* project dquot, hint only */
         xfs_disk_dquot_t q_core;        /* actual usage & quotas */
         xfs_dq_logitem_t q_logitem;     /* dquot log item */
         xfs_qcnt_t       q_res_bcount;  /* total regular nblks used+reserved */
@@ -118,8 +119,9 @@ static inline int xfs_this_quota_on(struct xfs_mount *mp, int type)
         case XFS_DQ_USER:
                 return XFS_IS_UQUOTA_ON(mp);
         case XFS_DQ_GROUP:
+                return XFS_IS_GQUOTA_ON(mp);
         case XFS_DQ_PROJ:
-                return XFS_IS_OQUOTA_ON(mp);
+                return XFS_IS_PQUOTA_ON(mp);
         default:
                 return 0;
         }
@@ -131,8 +133,9 @@ static inline xfs_dquot_t *xfs_inode_dquot(struct xfs_inode *ip, int type)
         case XFS_DQ_USER:
                 return ip->i_udquot;
         case XFS_DQ_GROUP:
-        case XFS_DQ_PROJ:
                 return ip->i_gdquot;
+        case XFS_DQ_PROJ:
+                return ip->i_pdquot;
         default:
                 return NULL;
         }
@@ -143,10 +146,6 @@ static inline xfs_dquot_t *xfs_inode_dquot(struct xfs_inode *ip, int type)
 #define XFS_QM_ISUDQ(dqp)       ((dqp)->dq_flags & XFS_DQ_USER)
 #define XFS_QM_ISPDQ(dqp)       ((dqp)->dq_flags & XFS_DQ_PROJ)
 #define XFS_QM_ISGDQ(dqp)       ((dqp)->dq_flags & XFS_DQ_GROUP)
-#define XFS_DQ_TO_QINF(dqp)     ((dqp)->q_mount->m_quotainfo)
-#define XFS_DQ_TO_QIP(dqp)      (XFS_QM_ISUDQ(dqp) ? \
-                                 XFS_DQ_TO_QINF(dqp)->qi_uquotaip : \
-                                 XFS_DQ_TO_QINF(dqp)->qi_gquotaip)
 
 extern int              xfs_qm_dqread(struct xfs_mount *, xfs_dqid_t, uint,
                                         uint, struct xfs_dquot  **);