xfs
[Top] [All Lists]

[PATCH 2/4] xfs: Add pquota fields where gquota is used

To: xfs@xxxxxxxxxxx
Subject: [PATCH 2/4] xfs: Add pquota fields where gquota is used
From: Jeff Liu <jeff.liu@xxxxxxxxxx>
Date: Fri, 13 Jul 2012 16:35:49 +0800
Cc: Ben Myers <bpm@xxxxxxx>, Christoph Hellwig <hch@xxxxxxxxxxxxx>, Dave Chinner <david@xxxxxxxxxxxxx>, Mark Tinguely <tinguely@xxxxxxx>, Chandra Seetharaman <sekharan@xxxxxxxxxx>
Organization: Oracle
Reply-to: jeff.liu@xxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20
Add project quota changes to all the places where group quota field is used.
No externally visible changed and no superblock changes, yet.

Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx>
Signed-off-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>

---
 fs/xfs/xfs_dquot.c       |    2 +-
 fs/xfs/xfs_dquot.h       |   13 ++-
 fs/xfs/xfs_iget.c        |    2 +-
 fs/xfs/xfs_inode.h       |    1 +
 fs/xfs/xfs_ioctl.c       |   10 +-
 fs/xfs/xfs_iops.c        |    4 +-
 fs/xfs/xfs_qm.c          |  271 ++++++++++++++++++++++++++++++----------------
 fs/xfs/xfs_qm.h          |    7 ++
 fs/xfs/xfs_qm_bhv.c      |    2 +-
 fs/xfs/xfs_qm_syscalls.c |   19 +++-
 fs/xfs/xfs_quota.h       |   32 +++---
 fs/xfs/xfs_sb.h          |    1 +
 fs/xfs/xfs_super.c       |    6 +-
 fs/xfs/xfs_trans_dquot.c |   39 +++++--
 fs/xfs/xfs_vnodeops.c    |   28 ++++--
 15 files changed, 294 insertions(+), 143 deletions(-)

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index bf27fcc..f414dcd 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -540,7 +540,7 @@ xfs_qm_dqread(
 
        /*
         * get a pointer to the on-disk dquot and the buffer containing it
-        * dqp already knows its own type (GROUP/USER).
+        * dqp already knows its own type (GROUP/USER/PROJECT).
         */
        error = xfs_qm_dqtobp(&tp, dqp, &ddqp, &bp, flags);
        if (error) {
diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h
index 7d20af2..e734670 100644
--- a/fs/xfs/xfs_dquot.h
+++ b/fs/xfs/xfs_dquot.h
@@ -45,7 +45,8 @@ typedef struct xfs_dquot {
        int              q_bufoffset;   /* off of dq in buffer (# dquots) */
        xfs_fileoff_t    q_fileoffset;  /* offset in quotas file */
 
-       struct xfs_dquot*q_gdquot;      /* group dquot, hint only */
+       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 */
@@ -108,8 +109,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;
        }
@@ -121,8 +123,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;
        }
@@ -136,7 +139,9 @@ static inline xfs_dquot_t *xfs_inode_dquot(struct xfs_inode 
*ip, int type)
 #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)
+                                (XFS_QM_ISGDQ(dqp) ? \
+                                XFS_DQ_TO_QINF(dqp)->qi_gquotaip : \
+                                XFS_DQ_TO_QINF(dqp)->qi_pquotaip))
 
 extern int             xfs_qm_dqread(struct xfs_mount *, xfs_dqid_t, uint,
                                        uint, struct xfs_dquot  **);
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index 1bb4365..e97fb18 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -346,7 +346,7 @@ xfs_iget_cache_miss(
        iflags = XFS_INEW;
        if (flags & XFS_IGET_DONTCACHE)
                iflags |= XFS_IDONTCACHE;
-       ip->i_udquot = ip->i_gdquot = NULL;
+       ip->i_udquot = ip->i_gdquot = ip->i_pdquot = NULL;
        xfs_iflags_set(ip, iflags);
 
        /* insert the new inode */
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 1efff36..1124620 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -224,6 +224,7 @@ typedef struct xfs_inode {
        struct xfs_mount        *i_mount;       /* fs mount struct ptr */
        struct xfs_dquot        *i_udquot;      /* user dquot */
        struct xfs_dquot        *i_gdquot;      /* group dquot */
+       struct xfs_dquot        *i_pdquot;      /* project dquot */
 
        /* Inode location stuff */
        xfs_ino_t               i_ino;          /* inode number (agno/agino)*/
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 3a05a41..4fe1957 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -908,6 +908,7 @@ xfs_ioctl_setattr(
        unsigned int            lock_flags = 0;
        struct xfs_dquot        *udqp = NULL;
        struct xfs_dquot        *gdqp = NULL;
+       struct xfs_dquot        *pdqp = NULL;
        struct xfs_dquot        *olddquot = NULL;
        int                     code;
 
@@ -936,7 +937,7 @@ xfs_ioctl_setattr(
        if (XFS_IS_QUOTA_ON(mp) && (mask & FSX_PROJID)) {
                code = xfs_qm_vop_dqalloc(ip, ip->i_d.di_uid,
                                         ip->i_d.di_gid, fa->fsx_projid,
-                                        XFS_QMOPT_PQUOTA, &udqp, &gdqp);
+                                        XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp);
                if (code)
                        return code;
        }
@@ -973,8 +974,8 @@ xfs_ioctl_setattr(
                    XFS_IS_PQUOTA_ON(mp) &&
                    xfs_get_projid(ip) != fa->fsx_projid) {
                        ASSERT(tp);
-                       code = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp,
-                                               capable(CAP_FOWNER) ?
+                       code = xfs_qm_vop_chown_reserve(tp, ip, udqp, NULL,
+                                               pdqp, capable(CAP_FOWNER) ?
                                                XFS_QMOPT_FORCE_RES : 0);
                        if (code)       /* out of quota */
                                goto error_return;
@@ -1092,7 +1093,7 @@ xfs_ioctl_setattr(
                if (xfs_get_projid(ip) != fa->fsx_projid) {
                        if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) {
                                olddquot = xfs_qm_vop_chown(tp, ip,
-                                                       &ip->i_gdquot, gdqp);
+                                                       &ip->i_pdquot, pdqp);
                        }
                        xfs_set_projid(ip, fa->fsx_projid);
 
@@ -1140,6 +1141,7 @@ xfs_ioctl_setattr(
        xfs_qm_dqrele(olddquot);
        xfs_qm_dqrele(udqp);
        xfs_qm_dqrele(gdqp);
+       xfs_qm_dqrele(pdqp);
 
        return code;
 
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 1a25fd8..e8db154a 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -516,7 +516,7 @@ xfs_setattr_nonsize(
                ASSERT(udqp == NULL);
                ASSERT(gdqp == NULL);
                error = xfs_qm_vop_dqalloc(ip, uid, gid, xfs_get_projid(ip),
-                                        qflags, &udqp, &gdqp);
+                                        qflags, &udqp, &gdqp, NULL);
                if (error)
                        return error;
        }
@@ -552,7 +552,7 @@ xfs_setattr_nonsize(
                     (XFS_IS_GQUOTA_ON(mp) && igid != gid))) {
                        ASSERT(tp);
                        error = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp,
-                                               capable(CAP_FOWNER) ?
+                                               NULL, capable(CAP_FOWNER) ?
                                                XFS_QMOPT_FORCE_RES : 0);
                        if (error)      /* out of quota */
                                goto out_trans_cancel;
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index cf9e1ee..a18c5cd 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -394,8 +394,8 @@ xfs_qm_dqattach_one(
        /*
         * udqhint is the i_udquot field in inode, and is non-NULL only
         * when the type arg is group/project. Its purpose is to save a
-        * lookup by dqid (xfs_qm_dqget) by caching a group dquot inside
-        * the user dquot.
+        * lookup by dqid (xfs_qm_dqget) by caching a group/project dquot
+        * inside the user dquot.
         */
        if (udqhint) {
                ASSERT(type == XFS_DQ_GROUP || type == XFS_DQ_PROJ);
@@ -408,7 +408,11 @@ xfs_qm_dqattach_one(
                 * be reclaimed as long as we have a ref from inode and we
                 * hold the ilock.
                 */
-               dqp = udqhint->q_gdquot;
+               if (type == XFS_DQ_GROUP)
+                       dqp = udqhint->q_gdquot;
+               else
+                       dqp = udqhint->q_pdquot;
+
                if (dqp && be32_to_cpu(dqp->q_core.d_id) == id) {
                        ASSERT(*IO_idqpp == NULL);
 
@@ -451,28 +455,36 @@ xfs_qm_dqattach_one(
 
 
 /*
- * Given a udquot and gdquot, attach a ptr to the group dquot in the
- * udquot as a hint for future lookups.
+ * Given a udquot and gdquot, attach a ptr to the group/project dquot
+ * in the udquot as a hint for future lookups.
  */
 STATIC void
 xfs_qm_dqattach_grouphint(
-       xfs_dquot_t     *udq,
-       xfs_dquot_t     *gdq)
+       xfs_inode_t     *ip,
+       int             type)
 {
-       xfs_dquot_t     *tmp;
+       xfs_dquot_t     *udq = ip->i_udquot;
+       xfs_dquot_t     *gpdq, *tmp1;
+       xfs_dquot_t     **tmp;
 
+       gpdq = (type == XFS_DQ_GROUP) ? ip->i_gdquot : ip->i_pdquot;
        xfs_dqlock(udq);
 
-       tmp = udq->q_gdquot;
-       if (tmp) {
-               if (tmp == gdq)
+       tmp = (type == XFS_DQ_GROUP) ? &udq->q_gdquot : &udq->q_pdquot;
+       if (*tmp) {
+               if (*tmp == gpdq)
                        goto done;
 
-               udq->q_gdquot = NULL;
-               xfs_qm_dqrele(tmp);
+               tmp1 = *tmp;
+               *tmp = NULL;
+               xfs_qm_dqrele(tmp1);
        }
 
-       udq->q_gdquot = xfs_qm_dqhold(gdq);
+       if (type == XFS_DQ_GROUP)
+               udq->q_gdquot = xfs_qm_dqhold(gpdq);
+       if (type == XFS_DQ_PROJ)
+               udq->q_pdquot = xfs_qm_dqhold(gpdq);
+
 done:
        xfs_dqunlock(udq);
 }
@@ -526,14 +538,10 @@ xfs_qm_dqattach_locked(
        }
 
        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
-       if (XFS_IS_OQUOTA_ON(mp)) {
-               error = XFS_IS_GQUOTA_ON(mp) ?
-                       xfs_qm_dqattach_one(ip, ip->i_d.di_gid, XFS_DQ_GROUP,
-                                               flags & XFS_QMOPT_DQALLOC,
-                                               ip->i_udquot, &ip->i_gdquot) :
-                       xfs_qm_dqattach_one(ip, xfs_get_projid(ip), XFS_DQ_PROJ,
-                                               flags & XFS_QMOPT_DQALLOC,
-                                               ip->i_udquot, &ip->i_gdquot);
+       if (XFS_IS_GQUOTA_ON(mp)) {
+               error = xfs_qm_dqattach_one(ip, ip->i_d.di_gid, XFS_DQ_GROUP,
+                                           flags & XFS_QMOPT_DQALLOC,
+                                           ip->i_udquot, &ip->i_gdquot);
                /*
                 * Don't worry about the udquot that we may have
                 * attached above. It'll get detached, if not already.
@@ -543,14 +551,24 @@ xfs_qm_dqattach_locked(
                nquotas++;
        }
 
+       ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
+       if (XFS_IS_PQUOTA_ON(mp)) {
+               error = xfs_qm_dqattach_one(ip, xfs_get_projid(ip), XFS_DQ_PROJ,
+                                           flags & XFS_QMOPT_DQALLOC,
+                                           ip->i_udquot, &ip->i_pdquot);
+               if (error)
+                       goto done;
+               nquotas++;
+       }
+
        /*
-        * Attach this group quota to the user quota as a hint.
+        * Attach this group/project quota to the user quota as a hint.
         * This WON'T, in general, result in a thrash.
         */
-       if (nquotas == 2) {
+       if (nquotas > 1 && ip->i_udquot) {
                ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
-               ASSERT(ip->i_udquot);
-               ASSERT(ip->i_gdquot);
+               ASSERT(ip->i_gdquot || !XFS_IS_GQUOTA_ON(mp));
+               ASSERT(ip->i_pdquot || !XFS_IS_PQUOTA_ON(mp));
 
                /*
                 * We do not have i_udquot locked at this point, but this check
@@ -558,8 +576,12 @@ xfs_qm_dqattach_locked(
                 * 100% all the time. It is just a hint, and this will
                 * succeed in general.
                 */
-               if (ip->i_udquot->q_gdquot != ip->i_gdquot)
-                       xfs_qm_dqattach_grouphint(ip->i_udquot, ip->i_gdquot);
+               if (XFS_IS_GQUOTA_ON(mp) &&
+                   ip->i_udquot->q_gdquot != ip->i_gdquot)
+                       xfs_qm_dqattach_grouphint(ip, XFS_DQ_GROUP);
+               if (XFS_IS_PQUOTA_ON(mp) &&
+                   ip->i_udquot->q_pdquot != ip->i_pdquot)
+                       xfs_qm_dqattach_grouphint(ip, XFS_DQ_PROJ);
        }
 
  done:
@@ -567,8 +589,10 @@ xfs_qm_dqattach_locked(
        if (!error) {
                if (XFS_IS_UQUOTA_ON(mp))
                        ASSERT(ip->i_udquot);
-               if (XFS_IS_OQUOTA_ON(mp))
+               if (XFS_IS_GQUOTA_ON(mp))
                        ASSERT(ip->i_gdquot);
+               if (XFS_IS_PQUOTA_ON(mp))
+                       ASSERT(ip->i_pdquot);
        }
        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
 #endif
@@ -601,7 +625,7 @@ void
 xfs_qm_dqdetach(
        xfs_inode_t     *ip)
 {
-       if (!(ip->i_udquot || ip->i_gdquot))
+       if (!(ip->i_udquot || ip->i_gdquot || ip->i_pdquot))
                return;
 
        trace_xfs_dquot_dqdetach(ip);
@@ -616,6 +640,10 @@ xfs_qm_dqdetach(
                xfs_qm_dqrele(ip->i_gdquot);
                ip->i_gdquot = NULL;
        }
+       if (ip->i_pdquot) {
+               xfs_qm_dqrele(ip->i_pdquot);
+               ip->i_pdquot = NULL;
+       }
 }
 
 /*
@@ -646,6 +674,7 @@ xfs_qm_init_quotainfo(
 
        INIT_RADIX_TREE(&qinf->qi_uquota_tree, GFP_NOFS);
        INIT_RADIX_TREE(&qinf->qi_gquota_tree, GFP_NOFS);
+       INIT_RADIX_TREE(&qinf->qi_pquota_tree, GFP_NOFS);
        mutex_init(&qinf->qi_tree_lock);
 
        INIT_LIST_HEAD(&qinf->qi_lru_list);
@@ -748,6 +777,10 @@ xfs_qm_destroy_quotainfo(
                IRELE(qi->qi_gquotaip);
                qi->qi_gquotaip = NULL;
        }
+       if (qi->qi_pquotaip) {
+               IRELE(qi->qi_pquotaip);
+               qi->qi_pquotaip = NULL;
+       }
        mutex_destroy(&qi->qi_quotaofflock);
        kmem_free(qi);
        mp->m_quotainfo = NULL;
@@ -1227,7 +1260,7 @@ xfs_qm_quotacheck(
        int             done, count, error, error2;
        xfs_ino_t       lastino;
        size_t          structsz;
-       xfs_inode_t     *uip, *gip;
+       xfs_inode_t     *uip, *gip, *pip;
        uint            flags;
        LIST_HEAD       (buffer_list);
 
@@ -1236,7 +1269,8 @@ xfs_qm_quotacheck(
        lastino = 0;
        flags = 0;
 
-       ASSERT(mp->m_quotainfo->qi_uquotaip || mp->m_quotainfo->qi_gquotaip);
+       ASSERT(mp->m_quotainfo->qi_uquotaip || mp->m_quotainfo->qi_gquotaip ||
+              mp->m_quotainfo->qi_pquotaip);
        ASSERT(XFS_IS_QUOTA_RUNNING(mp));
 
        xfs_notice(mp, "Quotacheck needed: Please wait.");
@@ -1257,13 +1291,20 @@ xfs_qm_quotacheck(
 
        gip = mp->m_quotainfo->qi_gquotaip;
        if (gip) {
-               error = xfs_qm_dqiterate(mp, gip, XFS_IS_GQUOTA_ON(mp) ?
-                                        XFS_QMOPT_GQUOTA : XFS_QMOPT_PQUOTA,
+               error = xfs_qm_dqiterate(mp, gip, XFS_QMOPT_GQUOTA,
                                         &buffer_list);
                if (error)
                        goto error_return;
-               flags |= XFS_IS_GQUOTA_ON(mp) ?
-                        XFS_GQUOTA_CHKD : XFS_PQUOTA_CHKD;
+               flags |= XFS_GQUOTA_CHKD;
+       }
+
+       pip = mp->m_quotainfo->qi_pquotaip;
+       if (pip) {
+               error = xfs_qm_dqiterate(mp, pip, XFS_QMOPT_PQUOTA,
+                                        &buffer_list);
+               if (error)
+                       goto error_return;
+               flags |= XFS_PQUOTA_CHKD;
        }
 
        do {
@@ -1358,13 +1399,13 @@ STATIC int
 xfs_qm_init_quotainos(
        xfs_mount_t     *mp)
 {
-       xfs_inode_t     *uip, *gip;
+       xfs_inode_t     *uip, *gip, *pip;
        int             error;
        __int64_t       sbflags;
        uint            flags;
 
        ASSERT(mp->m_quotainfo);
-       uip = gip = NULL;
+       uip = gip = pip = NULL;
        sbflags = 0;
        flags = 0;
 
@@ -1379,7 +1420,7 @@ xfs_qm_init_quotainos(
                                             0, 0, &uip)))
                                return XFS_ERROR(error);
                }
-               if (XFS_IS_OQUOTA_ON(mp) &&
+               if (XFS_IS_GQUOTA_ON(mp) &&
                    mp->m_sb.sb_gquotino != NULLFSINO) {
                        ASSERT(mp->m_sb.sb_gquotino > 0);
                        if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,
@@ -1389,6 +1430,19 @@ xfs_qm_init_quotainos(
                                return XFS_ERROR(error);
                        }
                }
+               if (XFS_IS_PQUOTA_ON(mp) &&
+                   mp->m_sb.sb_pquotino != NULLFSINO) {
+                       ASSERT(mp->m_sb.sb_pquotino > 0);
+                       error = xfs_iget(mp, NULL, mp->m_sb.sb_pquotino,
+                                        0, 0, &pip);
+                       if (error) {
+                               if (uip)
+                                       IRELE(uip);
+                               if (gip)
+                                       IRELE(gip);
+                               return XFS_ERROR(error);
+                       }
+               }
        } else {
                flags |= XFS_QMOPT_SBVERSION;
                sbflags |= (XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO |
@@ -1396,24 +1450,23 @@ xfs_qm_init_quotainos(
        }
 
        /*
-        * Create the two inodes, if they don't exist already. The changes
+        * Create the three inodes, if they don't exist already. The changes
         * made above will get added to a transaction and logged in one of
         * the qino_alloc calls below.  If the device is readonly,
         * temporarily switch to read-write to do this.
         */
        if (XFS_IS_UQUOTA_ON(mp) && uip == NULL) {
                if ((error = xfs_qm_qino_alloc(mp, &uip,
-                                             sbflags | XFS_SB_UQUOTINO,
-                                             flags | XFS_QMOPT_UQUOTA)))
+                                              sbflags | XFS_SB_UQUOTINO,
+                                              flags | XFS_QMOPT_UQUOTA)))
                        return XFS_ERROR(error);
 
                flags &= ~XFS_QMOPT_SBVERSION;
        }
-       if (XFS_IS_OQUOTA_ON(mp) && gip == NULL) {
-               flags |= (XFS_IS_GQUOTA_ON(mp) ?
-                               XFS_QMOPT_GQUOTA : XFS_QMOPT_PQUOTA);
+       if (XFS_IS_GQUOTA_ON(mp) && gip == NULL) {
                error = xfs_qm_qino_alloc(mp, &gip,
-                                         sbflags | XFS_SB_GQUOTINO, flags);
+                                         sbflags | XFS_SB_GQUOTINO,
+                                         flags | XFS_QMOPT_GQUOTA);
                if (error) {
                        if (uip)
                                IRELE(uip);
@@ -1421,9 +1474,24 @@ xfs_qm_init_quotainos(
                        return XFS_ERROR(error);
                }
        }
+       /* Why not define a XFS_SB_PQUOTINO? */
+       if (XFS_IS_PQUOTA_ON(mp) && pip == NULL) {
+               error = xfs_qm_qino_alloc(mp, &pip,
+                                         sbflags | XFS_SB_GQUOTINO,
+                                         flags | XFS_QMOPT_PQUOTA);
+               if (error) {
+                       if (uip)
+                               IRELE(uip);
+                       if (gip)
+                               IRELE(gip);
+
+                       return XFS_ERROR(error);
+               }
+       }
 
        mp->m_quotainfo->qi_uquotaip = uip;
        mp->m_quotainfo->qi_gquotaip = gip;
+       mp->m_quotainfo->qi_pquotaip = pip;
 
        return 0;
 }
@@ -1621,10 +1689,11 @@ xfs_qm_vop_dqalloc(
        prid_t                  prid,
        uint                    flags,
        struct xfs_dquot        **O_udqpp,
-       struct xfs_dquot        **O_gdqpp)
+       struct xfs_dquot        **O_gdqpp,
+       struct xfs_dquot        **O_pdqpp)
 {
        struct xfs_mount        *mp = ip->i_mount;
-       struct xfs_dquot        *uq, *gq;
+       struct xfs_dquot        *uq, *gq, *pq;
        int                     error;
        uint                    lockflags;
 
@@ -1649,7 +1718,7 @@ xfs_qm_vop_dqalloc(
                }
        }
 
-       uq = gq = NULL;
+       uq = gq = pq = NULL;
        if ((flags & XFS_QMOPT_UQUOTA) && XFS_IS_UQUOTA_ON(mp)) {
                if (ip->i_d.di_uid != uid) {
                        /*
@@ -1662,11 +1731,10 @@ xfs_qm_vop_dqalloc(
                         * holding ilock.
                         */
                        xfs_iunlock(ip, lockflags);
-                       if ((error = xfs_qm_dqget(mp, NULL, (xfs_dqid_t) uid,
-                                                XFS_DQ_USER,
-                                                XFS_QMOPT_DQALLOC |
-                                                XFS_QMOPT_DOWARN,
-                                                &uq))) {
+                       if ((error = xfs_qm_dqget(mp, NULL, (xfs_dqid_t)uid,
+                                                 XFS_DQ_USER,
+                                                 XFS_QMOPT_DQALLOC |
+                                                 XFS_QMOPT_DOWARN, &uq))) {
                                ASSERT(error != ENOENT);
                                return error;
                        }
@@ -1689,10 +1757,9 @@ xfs_qm_vop_dqalloc(
                if (ip->i_d.di_gid != gid) {
                        xfs_iunlock(ip, lockflags);
                        if ((error = xfs_qm_dqget(mp, NULL, (xfs_dqid_t)gid,
-                                                XFS_DQ_GROUP,
-                                                XFS_QMOPT_DQALLOC |
-                                                XFS_QMOPT_DOWARN,
-                                                &gq))) {
+                                                 XFS_DQ_GROUP,
+                                                 XFS_QMOPT_DQALLOC |
+                                                 XFS_QMOPT_DOWARN, &gq))) {
                                if (uq)
                                        xfs_qm_dqrele(uq);
                                ASSERT(error != ENOENT);
@@ -1705,25 +1772,28 @@ xfs_qm_vop_dqalloc(
                        ASSERT(ip->i_gdquot);
                        gq = xfs_qm_dqhold(ip->i_gdquot);
                }
-       } else if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) {
+       }
+       if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) {
                if (xfs_get_projid(ip) != prid) {
                        xfs_iunlock(ip, lockflags);
                        if ((error = xfs_qm_dqget(mp, NULL, (xfs_dqid_t)prid,
-                                                XFS_DQ_PROJ,
-                                                XFS_QMOPT_DQALLOC |
-                                                XFS_QMOPT_DOWARN,
-                                                &gq))) {
+                                                 XFS_DQ_PROJ,
+                                                 XFS_QMOPT_DQALLOC |
+                                                 XFS_QMOPT_DOWARN, &pq))) {
                                if (uq)
                                        xfs_qm_dqrele(uq);
+                               if (gq)
+                                       xfs_qm_dqrele(gq);
                                ASSERT(error != ENOENT);
                                return (error);
                        }
                        xfs_dqunlock(gq);
+                       xfs_dqunlock(pq);
                        lockflags = XFS_ILOCK_SHARED;
                        xfs_ilock(ip, lockflags);
                } else {
-                       ASSERT(ip->i_gdquot);
-                       gq = xfs_qm_dqhold(ip->i_gdquot);
+                       ASSERT(ip->i_pdquot);
+                       pq = xfs_qm_dqhold(ip->i_pdquot);
                }
        }
        if (uq)
@@ -1738,6 +1808,10 @@ xfs_qm_vop_dqalloc(
                *O_gdqpp = gq;
        else if (gq)
                xfs_qm_dqrele(gq);
+       if (O_pdqpp)
+               *O_pdqpp = pq;
+       else if (pq)
+               xfs_qm_dqrele(pq);
        return 0;
 }
 
@@ -1790,11 +1864,13 @@ xfs_qm_vop_chown_reserve(
        xfs_inode_t     *ip,
        xfs_dquot_t     *udqp,
        xfs_dquot_t     *gdqp,
+       xfs_dquot_t     *pdqp,
        uint            flags)
 {
        xfs_mount_t     *mp = ip->i_mount;
        uint            delblks, blkflags, prjflags = 0;
-       xfs_dquot_t     *unresudq, *unresgdq, *delblksudq, *delblksgdq;
+       xfs_dquot_t     *unresudq, *unresgdq, *unrespdq;
+       xfs_dquot_t     *delblksudq, *delblksgdq, *delblkspdq;
        int             error;
 
 
@@ -1802,7 +1878,8 @@ xfs_qm_vop_chown_reserve(
        ASSERT(XFS_IS_QUOTA_RUNNING(mp));
 
        delblks = ip->i_delayed_blks;
-       delblksudq = delblksgdq = unresudq = unresgdq = NULL;
+       delblksudq = delblksgdq = delblkspdq = NULL;
+       unresudq = unresgdq = unrespdq = NULL;
        blkflags = XFS_IS_REALTIME_INODE(ip) ?
                        XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS;
 
@@ -1819,24 +1896,28 @@ xfs_qm_vop_chown_reserve(
                        unresudq = ip->i_udquot;
                }
        }
-       if (XFS_IS_OQUOTA_ON(ip->i_mount) && gdqp) {
-               if (XFS_IS_PQUOTA_ON(ip->i_mount) &&
-                    xfs_get_projid(ip) != be32_to_cpu(gdqp->q_core.d_id))
-                       prjflags = XFS_QMOPT_ENOSPC;
-
-               if (prjflags ||
-                   (XFS_IS_GQUOTA_ON(ip->i_mount) &&
-                    ip->i_d.di_gid != be32_to_cpu(gdqp->q_core.d_id))) {
-                       delblksgdq = gdqp;
-                       if (delblks) {
-                               ASSERT(ip->i_gdquot);
-                               unresgdq = ip->i_gdquot;
-                       }
+       if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp &&
+           ip->i_d.di_gid != be32_to_cpu(gdqp->q_core.d_id)) {
+               delblksgdq = gdqp;
+               if (delblks) {
+                       ASSERT(ip->i_gdquot);
+                       unresgdq = ip->i_gdquot;
+               }
+       }
+
+       if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp &&
+           xfs_get_projid(ip) != be32_to_cpu(pdqp->q_core.d_id)) {
+               prjflags = XFS_QMOPT_ENOSPC;
+               delblkspdq = pdqp;
+               if (delblks) {
+                       ASSERT(ip->i_pdquot);
+                       unrespdq = ip->i_pdquot;
                }
        }
 
        if ((error = xfs_trans_reserve_quota_bydquots(tp, ip->i_mount,
-                               delblksudq, delblksgdq, ip->i_d.di_nblocks, 1,
+                               delblksudq, delblksgdq, delblkspdq,
+                               ip->i_d.di_nblocks, 1,
                                flags | blkflags | prjflags)))
                return (error);
 
@@ -1850,15 +1931,16 @@ xfs_qm_vop_chown_reserve(
                /*
                 * Do the reservations first. Unreservation can't fail.
                 */
-               ASSERT(delblksudq || delblksgdq);
-               ASSERT(unresudq || unresgdq);
+               ASSERT(delblksudq || delblksgdq || delblkspdq);
+               ASSERT(unresudq || unresgdq || unrespdq);
                if ((error = xfs_trans_reserve_quota_bydquots(NULL, ip->i_mount,
-                               delblksudq, delblksgdq, (xfs_qcnt_t)delblks, 0,
+                               delblksudq, delblksgdq, delblkspdq,
+                               (xfs_qcnt_t)delblks, 0,
                                flags | blkflags | prjflags)))
                        return (error);
                xfs_trans_reserve_quota_bydquots(NULL, ip->i_mount,
-                               unresudq, unresgdq, -((xfs_qcnt_t)delblks), 0,
-                               blkflags);
+                               unresudq, unresgdq, unrespdq,
+                               -((xfs_qcnt_t)delblks), 0, blkflags);
        }
 
        return (0);
@@ -1897,7 +1979,8 @@ xfs_qm_vop_create_dqattach(
        struct xfs_trans        *tp,
        struct xfs_inode        *ip,
        struct xfs_dquot        *udqp,
-       struct xfs_dquot        *gdqp)
+       struct xfs_dquot        *gdqp,
+       struct xfs_dquot        *pdqp)
 {
        struct xfs_mount        *mp = tp->t_mountp;
 
@@ -1917,13 +2000,19 @@ xfs_qm_vop_create_dqattach(
        }
        if (gdqp) {
                ASSERT(ip->i_gdquot == NULL);
-               ASSERT(XFS_IS_OQUOTA_ON(mp));
-               ASSERT((XFS_IS_GQUOTA_ON(mp) ?
-                       ip->i_d.di_gid : xfs_get_projid(ip)) ==
-                               be32_to_cpu(gdqp->q_core.d_id));
+               ASSERT(XFS_IS_GQUOTA_ON(mp));
+               ASSERT(ip->i_d.di_gid == be32_to_cpu(gdqp->q_core.d_id));
 
                ip->i_gdquot = xfs_qm_dqhold(gdqp);
                xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1);
        }
+       if (pdqp) {
+               ASSERT(ip->i_pdquot == NULL);
+               ASSERT(XFS_IS_PQUOTA_ON(mp));
+               ASSERT(xfs_get_projid(ip) == be32_to_cpu(pdqp->q_core.d_id));
+
+               ip->i_pdquot = xfs_qm_dqhold(pdqp);
+               xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1);
+       }
 }
 
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index 44b858b..b64ae33 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -44,9 +44,11 @@ extern struct kmem_zone      *xfs_qm_dqtrxzone;
 typedef struct xfs_quotainfo {
        struct radix_tree_root qi_uquota_tree;
        struct radix_tree_root qi_gquota_tree;
+       struct radix_tree_root qi_pquota_tree;
        struct mutex qi_tree_lock;
        xfs_inode_t     *qi_uquotaip;    /* user quota inode */
        xfs_inode_t     *qi_gquotaip;    /* group quota inode */
+       xfs_inode_t     *qi_pquotaip;    /* proup quota inode */
        struct list_head qi_lru_list;
        struct mutex     qi_lru_lock;
        int              qi_lru_count;
@@ -72,12 +74,16 @@ typedef struct xfs_quotainfo {
 #define XFS_DQUOT_TREE(qi, type) \
        ((type & XFS_DQ_USER) ? \
         &((qi)->qi_uquota_tree) : \
+        (type & XFS_DQ_PROJ) ? \
+        &((qi)->qi_pquota_tree) : \
         &((qi)->qi_gquota_tree))
 
 
 extern void    xfs_trans_mod_dquot(xfs_trans_t *, xfs_dquot_t *, uint, long);
+#if 0
 extern int     xfs_trans_reserve_quota_bydquots(xfs_trans_t *, xfs_mount_t *,
                        xfs_dquot_t *, xfs_dquot_t *, long, long, uint);
+#endif
 extern void    xfs_trans_dqjoin(xfs_trans_t *, xfs_dquot_t *);
 extern void    xfs_trans_log_dquot(xfs_trans_t *, xfs_dquot_t *);
 
@@ -90,6 +96,7 @@ extern void   xfs_trans_log_dquot(xfs_trans_t *, xfs_dquot_t 
*);
 typedef struct xfs_dquot_acct {
        xfs_dqtrx_t     dqa_usrdquots[XFS_QM_TRANS_MAXDQS];
        xfs_dqtrx_t     dqa_grpdquots[XFS_QM_TRANS_MAXDQS];
+       xfs_dqtrx_t     dqa_prjdquots[XFS_QM_TRANS_MAXDQS];
 } xfs_dquot_acct_t;
 
 /*
diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c
index 6b39115..eb45424 100644
--- a/fs/xfs/xfs_qm_bhv.c
+++ b/fs/xfs/xfs_qm_bhv.c
@@ -115,7 +115,7 @@ xfs_qm_newmount(
             (pquotaondisk && !XFS_IS_PQUOTA_ON(mp)) ||
            (!pquotaondisk &&  XFS_IS_PQUOTA_ON(mp)) ||
             (gquotaondisk && !XFS_IS_GQUOTA_ON(mp)) ||
-           (!gquotaondisk &&  XFS_IS_OQUOTA_ON(mp)))  &&
+           (!gquotaondisk &&  XFS_IS_GQUOTA_ON(mp)))  &&
            xfs_dev_is_read_only(mp, "changing quota state")) {
                xfs_warn(mp, "please mount with%s%s%s%s.",
                        (!quotaondisk ? "out quota" : ""),
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 3f72a27..84f2fae 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -118,7 +118,8 @@ xfs_qm_scall_quotaoff(
                dqtype |= XFS_QMOPT_GQUOTA;
                flags |= (XFS_GQUOTA_CHKD | XFS_GQUOTA_ENFD);
                inactivate_flags |= XFS_GQUOTA_ACTIVE;
-       } else if (flags & XFS_PQUOTA_ACCT) {
+       }
+       if (flags & XFS_PQUOTA_ACCT) {
                dqtype |= XFS_QMOPT_PQUOTA;
                flags |= (XFS_PQUOTA_CHKD | XFS_PQUOTA_ENFD);
                inactivate_flags |= XFS_PQUOTA_ACTIVE;
@@ -213,10 +214,14 @@ xfs_qm_scall_quotaoff(
                IRELE(q->qi_uquotaip);
                q->qi_uquotaip = NULL;
        }
-       if ((dqtype & (XFS_QMOPT_GQUOTA|XFS_QMOPT_PQUOTA)) && q->qi_gquotaip) {
+       if ((dqtype & XFS_QMOPT_GQUOTA) && q->qi_gquotaip) {
                IRELE(q->qi_gquotaip);
                q->qi_gquotaip = NULL;
        }
+       if ((dqtype & XFS_QMOPT_PQUOTA) && q->qi_pquotaip) {
+               IRELE(q->qi_pquotaip);
+               q->qi_pquotaip = NULL;
+       }
 
 out_unlock:
        mutex_unlock(&q->qi_quotaofflock);
@@ -855,9 +860,11 @@ xfs_dqrele_inode(
 {
        /* skip quota inodes */
        if (ip == ip->i_mount->m_quotainfo->qi_uquotaip ||
-           ip == ip->i_mount->m_quotainfo->qi_gquotaip) {
+           ip == ip->i_mount->m_quotainfo->qi_gquotaip ||
+           ip == ip->i_mount->m_quotainfo->qi_pquotaip) {
                ASSERT(ip->i_udquot == NULL);
                ASSERT(ip->i_gdquot == NULL);
+               ASSERT(ip->i_pdquot == NULL);
                return 0;
        }
 
@@ -866,10 +873,14 @@ xfs_dqrele_inode(
                xfs_qm_dqrele(ip->i_udquot);
                ip->i_udquot = NULL;
        }
-       if (flags & (XFS_PQUOTA_ACCT|XFS_GQUOTA_ACCT) && ip->i_gdquot) {
+       if ((flags & XFS_GQUOTA_ACCT) && ip->i_gdquot) {
                xfs_qm_dqrele(ip->i_gdquot);
                ip->i_gdquot = NULL;
        }
+       if ((flags & XFS_PQUOTA_ACCT) && ip->i_pdquot) {
+               xfs_qm_dqrele(ip->i_pdquot);
+               ip->i_pdquot = NULL;
+       }
        xfs_iunlock(ip, XFS_ILOCK_EXCL);
        return 0;
 }
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index bba42e6..10cc0a3 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -205,8 +205,6 @@ typedef struct xfs_qoff_logformat {
 #define XFS_IS_QUOTA_ON(mp)    ((mp)->m_qflags & (XFS_UQUOTA_ACTIVE | \
                                                   XFS_GQUOTA_ACTIVE | \
                                                   XFS_PQUOTA_ACTIVE))
-#define XFS_IS_OQUOTA_ON(mp)   ((mp)->m_qflags & (XFS_GQUOTA_ACTIVE | \
-                                                  XFS_PQUOTA_ACTIVE))
 #define XFS_IS_UQUOTA_ON(mp)   ((mp)->m_qflags & XFS_UQUOTA_ACTIVE)
 #define XFS_IS_GQUOTA_ON(mp)   ((mp)->m_qflags & XFS_GQUOTA_ACTIVE)
 #define XFS_IS_PQUOTA_ON(mp)   ((mp)->m_qflags & XFS_PQUOTA_ACTIVE)
@@ -273,8 +271,10 @@ typedef struct xfs_qoff_logformat {
  */
 #define XFS_NOT_DQATTACHED(mp, ip) ((XFS_IS_UQUOTA_ON(mp) &&\
                                     (ip)->i_udquot == NULL) || \
-                                   (XFS_IS_OQUOTA_ON(mp) && \
-                                    (ip)->i_gdquot == NULL))
+                                   (XFS_IS_GQUOTA_ON(mp) && \
+                                    (ip)->i_gdquot == NULL) || \
+                                   (XFS_IS_PQUOTA_ON(mp) && \
+                                    (ip)->i_pdquot == NULL))
 
 #define XFS_QM_NEED_QUOTACHECK(mp) \
        ((XFS_IS_UQUOTA_ON(mp) && \
@@ -329,17 +329,18 @@ extern int xfs_trans_reserve_quota_nblks(struct xfs_trans 
*,
                struct xfs_inode *, long, long, uint);
 extern int xfs_trans_reserve_quota_bydquots(struct xfs_trans *,
                struct xfs_mount *, struct xfs_dquot *,
-               struct xfs_dquot *, long, long, uint);
+               struct xfs_dquot *, struct xfs_dquot *, long, long, uint);
 
 extern int xfs_qm_vop_dqalloc(struct xfs_inode *, uid_t, gid_t, prid_t, uint,
-               struct xfs_dquot **, struct xfs_dquot **);
+               struct xfs_dquot **, struct xfs_dquot **, struct xfs_dquot **);
 extern void xfs_qm_vop_create_dqattach(struct xfs_trans *, struct xfs_inode *,
-               struct xfs_dquot *, struct xfs_dquot *);
+               struct xfs_dquot *, struct xfs_dquot *, struct xfs_dquot *);
 extern int xfs_qm_vop_rename_dqattach(struct xfs_inode **);
 extern struct xfs_dquot *xfs_qm_vop_chown(struct xfs_trans *,
                struct xfs_inode *, struct xfs_dquot **, struct xfs_dquot *);
 extern int xfs_qm_vop_chown_reserve(struct xfs_trans *, struct xfs_inode *,
-               struct xfs_dquot *, struct xfs_dquot *, uint);
+               struct xfs_dquot *, struct xfs_dquot *, struct xfs_dquot *,
+               uint);
 extern int xfs_qm_dqattach(struct xfs_inode *, uint);
 extern int xfs_qm_dqattach_locked(struct xfs_inode *, uint);
 extern void xfs_qm_dqdetach(struct xfs_inode *);
@@ -353,10 +354,12 @@ extern void xfs_qm_unmount_quotas(struct xfs_mount *);
 #else
 static inline int
 xfs_qm_vop_dqalloc(struct xfs_inode *ip, uid_t uid, gid_t gid, prid_t prid,
-               uint flags, struct xfs_dquot **udqp, struct xfs_dquot **gdqp)
+               uint flags, struct xfs_dquot **udqp, struct xfs_dquot **gdqp,
+               struct xfs_dquot **pdqp)
 {
        *udqp = NULL;
        *gdqp = NULL;
+       *pdqp = NULL;
        return 0;
 }
 #define xfs_trans_dup_dqinfo(tp, tp2)
@@ -371,14 +374,15 @@ static inline int xfs_trans_reserve_quota_nblks(struct 
xfs_trans *tp,
 }
 static inline int xfs_trans_reserve_quota_bydquots(struct xfs_trans *tp,
                struct xfs_mount *mp, struct xfs_dquot *udqp,
-               struct xfs_dquot *gdqp, long nblks, long nions, uint flags)
+               struct xfs_dquot *gdqp, struct xfs_dquot *pdqp,
+               long nblks, long nions, uint flags)
 {
        return 0;
 }
-#define xfs_qm_vop_create_dqattach(tp, ip, u, g)
+#define xfs_qm_vop_create_dqattach(tp, ip, u, g, p)
 #define xfs_qm_vop_rename_dqattach(it)                                 (0)
 #define xfs_qm_vop_chown(tp, ip, old, new)                             (NULL)
-#define xfs_qm_vop_chown_reserve(tp, ip, u, g, fl)                     (0)
+#define xfs_qm_vop_chown_reserve(tp, ip, u, g, p, fl)                  (0)
 #define xfs_qm_dqattach(ip, fl)                                                
(0)
 #define xfs_qm_dqattach_locked(ip, fl)                                 (0)
 #define xfs_qm_dqdetach(ip)
@@ -392,8 +396,8 @@ static inline int xfs_trans_reserve_quota_bydquots(struct 
xfs_trans *tp,
 
 #define xfs_trans_unreserve_quota_nblks(tp, ip, nblks, ninos, flags) \
        xfs_trans_reserve_quota_nblks(tp, ip, -(nblks), -(ninos), flags)
-#define xfs_trans_reserve_quota(tp, mp, ud, gd, nb, ni, f) \
-       xfs_trans_reserve_quota_bydquots(tp, mp, ud, gd, nb, ni, \
+#define xfs_trans_reserve_quota(tp, mp, ud, gd, pd, nb, ni, f) \
+       xfs_trans_reserve_quota_bydquots(tp, mp, ud, gd, pd, nb, ni, \
                                f | XFS_QMOPT_RES_REGBLKS)
 
 extern int xfs_qm_dqcheck(struct xfs_mount *, xfs_disk_dquot_t *,
diff --git a/fs/xfs/xfs_sb.h b/fs/xfs/xfs_sb.h
index f429d9d..8fd7894 100644
--- a/fs/xfs/xfs_sb.h
+++ b/fs/xfs/xfs_sb.h
@@ -140,6 +140,7 @@ typedef struct xfs_sb {
         */
        xfs_ino_t       sb_uquotino;    /* user quota inode */
        xfs_ino_t       sb_gquotino;    /* group quota inode */
+#define sb_pquotino    sb_gquotino
        __uint16_t      sb_qflags;      /* quota flags */
        __uint8_t       sb_flags;       /* misc. flags */
        __uint8_t       sb_shared_vn;   /* shared version number */
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 61ac734..ed249a7 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -538,14 +538,14 @@ xfs_showargs(
        else if (mp->m_qflags & XFS_UQUOTA_ACCT)
                seq_puts(m, "," MNTOPT_UQUOTANOENF);
 
-       /* Either project or group quotas can be active, not both */
-
        if (mp->m_qflags & XFS_PQUOTA_ACCT) {
                if (mp->m_qflags & XFS_PQUOTA_ENFD)
                        seq_puts(m, "," MNTOPT_PRJQUOTA);
                else
                        seq_puts(m, "," MNTOPT_PQUOTANOENF);
-       } else if (mp->m_qflags & XFS_GQUOTA_ACCT) {
+       }
+
+       if (mp->m_qflags & XFS_GQUOTA_ACCT) {
                if (mp->m_qflags & XFS_GQUOTA_ENFD)
                        seq_puts(m, "," MNTOPT_GRPQUOTA);
                else
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 40460e8..e253089 100644
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -113,7 +113,7 @@ xfs_trans_dup_dqinfo(
        if(otp->t_flags & XFS_TRANS_DQ_DIRTY)
                ntp->t_flags |= XFS_TRANS_DQ_DIRTY;
 
-       for (j = 0; j < 2; j++) {
+       for (j = 0; j < 3; j++) {
                for (i = 0; i < XFS_QM_TRANS_MAXDQS; i++) {
                        if (oqa[i].qt_dquot == NULL)
                                break;
@@ -138,8 +138,13 @@ xfs_trans_dup_dqinfo(
                        oq->qt_ino_res = oq->qt_ino_res_used;
 
                }
-               oqa = otp->t_dqinfo->dqa_grpdquots;
-               nqa = ntp->t_dqinfo->dqa_grpdquots;
+               if (oqa == otp->t_dqinfo->dqa_usrdquots) {
+                       oqa = otp->t_dqinfo->dqa_grpdquots;
+                       nqa = ntp->t_dqinfo->dqa_grpdquots;
+               } else {
+                       oqa = otp->t_dqinfo->dqa_prjdquots;
+                       nqa = ntp->t_dqinfo->dqa_prjdquots;
+               }
        }
 }
 
@@ -166,8 +171,10 @@ xfs_trans_mod_dquot_byino(
 
        if (XFS_IS_UQUOTA_ON(mp) && ip->i_udquot)
                (void) xfs_trans_mod_dquot(tp, ip->i_udquot, field, delta);
-       if (XFS_IS_OQUOTA_ON(mp) && ip->i_gdquot)
+       if (XFS_IS_GQUOTA_ON(mp) && ip->i_gdquot)
                (void) xfs_trans_mod_dquot(tp, ip->i_gdquot, field, delta);
+       if (XFS_IS_PQUOTA_ON(mp) && ip->i_pdquot)
+               (void) xfs_trans_mod_dquot(tp, ip->i_pdquot, field, delta);
 }
 
 STATIC xfs_dqtrx_t *
@@ -178,8 +185,14 @@ xfs_trans_get_dqtrx(
        int             i;
        xfs_dqtrx_t     *qa;
 
-       qa = XFS_QM_ISUDQ(dqp) ?
-               tp->t_dqinfo->dqa_usrdquots : tp->t_dqinfo->dqa_grpdquots;
+       if (XFS_QM_ISUDQ(dqp))
+               qa = tp->t_dqinfo->dqa_usrdquots;
+       else if (XFS_QM_ISGDQ(dqp))
+               qa = tp->t_dqinfo->dqa_grpdquots;
+       else if (XFS_QM_ISPDQ(dqp))
+               qa = tp->t_dqinfo->dqa_prjdquots;
+       else
+               return NULL;
 
        for (i = 0; i < XFS_QM_TRANS_MAXDQS; i++) {
                if (qa[i].qt_dquot == NULL ||
@@ -340,9 +353,14 @@ xfs_trans_apply_dquot_deltas(
 
        ASSERT(tp->t_dqinfo);
        qa = tp->t_dqinfo->dqa_usrdquots;
-       for (j = 0; j < 2; j++) {
+
+       /* 0 - usr, 1 - grp, 2 - prj */
+       for (j = 0; j < 3; j++) {
                if (qa[0].qt_dquot == NULL) {
-                       qa = tp->t_dqinfo->dqa_grpdquots;
+                       if (qa == tp->t_dqinfo->dqa_usrdquots)
+                               qa = tp->t_dqinfo->dqa_grpdquots;
+                       else
+                               qa = tp->t_dqinfo->dqa_prjdquots;
                        continue;
                }
 
@@ -750,6 +768,7 @@ xfs_trans_reserve_quota_bydquots(
        xfs_mount_t     *mp,
        xfs_dquot_t     *udqp,
        xfs_dquot_t     *gdqp,
+       xfs_dquot_t     *pdqp,
        long            nblks,
        long            ninos,
        uint            flags)
@@ -816,6 +835,7 @@ xfs_trans_reserve_quota_nblks(
 
        ASSERT(ip->i_ino != mp->m_sb.sb_uquotino);
        ASSERT(ip->i_ino != mp->m_sb.sb_gquotino);
+       ASSERT(ip->i_ino != mp->m_sb.sb_pquotino);
 
        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
        ASSERT((flags & ~(XFS_QMOPT_FORCE_RES | XFS_QMOPT_ENOSPC)) ==
@@ -828,7 +848,8 @@ xfs_trans_reserve_quota_nblks(
         */
        return xfs_trans_reserve_quota_bydquots(tp, mp,
                                                ip->i_udquot, ip->i_gdquot,
-                                               nblks, ninos, flags);
+                                               ip->i_pdquot, nblks, ninos,
+                                               flags);
 }
 
 /*
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index b6a82d8..da5ddbf 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -849,6 +849,7 @@ xfs_create(
        prid_t                  prid;
        struct xfs_dquot        *udqp = NULL;
        struct xfs_dquot        *gdqp = NULL;
+       struct xfs_dquot        *pdqp = NULL;
        uint                    resblks;
        uint                    log_res;
        uint                    log_count;
@@ -867,7 +868,8 @@ xfs_create(
         * Make sure that we have allocated dquot(s) on disk.
         */
        error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid,
-                       XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
+                                  XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp,
+                                  &gdqp, &pdqp);
        if (error)
                return error;
 
@@ -919,7 +921,8 @@ xfs_create(
        /*
         * Reserve disk quota and the inode.
         */
-       error = xfs_trans_reserve_quota(tp, mp, udqp, gdqp, resblks, 1, 0);
+       error = xfs_trans_reserve_quota(tp, mp, udqp, gdqp, pdqp,
+                                       resblks, 1, 0);
        if (error)
                goto out_trans_cancel;
 
@@ -983,7 +986,7 @@ xfs_create(
         * These ids of the inode couldn't have changed since the new
         * inode has been locked ever since it was created.
         */
-       xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp);
+       xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp, pdqp);
 
        error = xfs_bmap_finish(&tp, &free_list, &committed);
        if (error)
@@ -995,6 +998,7 @@ xfs_create(
 
        xfs_qm_dqrele(udqp);
        xfs_qm_dqrele(gdqp);
+       xfs_qm_dqrele(pdqp);
 
        *ipp = ip;
        return 0;
@@ -1498,7 +1502,9 @@ xfs_symlink(
        int                     n;
        xfs_buf_t               *bp;
        prid_t                  prid;
-       struct xfs_dquot        *udqp, *gdqp;
+       struct xfs_dquot        *udqp;
+       struct xfs_dquot        *gdqp;
+       struct xfs_dquot        *pdqp;
        uint                    resblks;
 
        *ipp = NULL;
@@ -1518,7 +1524,7 @@ xfs_symlink(
        if (pathlen >= MAXPATHLEN)      /* total string too long */
                return XFS_ERROR(ENAMETOOLONG);
 
-       udqp = gdqp = NULL;
+       udqp = gdqp = pdqp = NULL;
        if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
                prid = xfs_get_projid(dp);
        else
@@ -1528,7 +1534,8 @@ xfs_symlink(
         * Make sure that we have allocated dquot(s) on disk.
         */
        error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid,
-                       XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
+                                  XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT,
+                                  &udqp, &gdqp, &pdqp);
        if (error)
                goto std_return;
 
@@ -1569,7 +1576,8 @@ xfs_symlink(
        /*
         * Reserve disk quota : blocks and inode.
         */
-       error = xfs_trans_reserve_quota(tp, mp, udqp, gdqp, resblks, 1, 0);
+       error = xfs_trans_reserve_quota(tp, mp, udqp, gdqp, pdqp,
+                                       resblks, 1, 0);
        if (error)
                goto error_return;
 
@@ -1607,7 +1615,7 @@ xfs_symlink(
        /*
         * Also attach the dquot(s) to it, if applicable.
         */
-       xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp);
+       xfs_qm_vop_create_dqattach(tp, ip, udqp, gdqp, pdqp);
 
        if (resblks)
                resblks -= XFS_IALLOC_SPACE_RES(mp);
@@ -1691,6 +1699,7 @@ xfs_symlink(
        error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);
        xfs_qm_dqrele(udqp);
        xfs_qm_dqrele(gdqp);
+       xfs_qm_dqrele(pdqp);
 
        *ipp = ip;
        return 0;
@@ -1704,6 +1713,7 @@ xfs_symlink(
        xfs_trans_cancel(tp, cancel_flags);
        xfs_qm_dqrele(udqp);
        xfs_qm_dqrele(gdqp);
+       xfs_qm_dqrele(pdqp);
 
        if (unlock_dp_on_error)
                xfs_iunlock(dp, XFS_ILOCK_EXCL);
@@ -2170,7 +2180,7 @@ xfs_free_file_space(
                }
                xfs_ilock(ip, XFS_ILOCK_EXCL);
                error = xfs_trans_reserve_quota(tp, mp,
-                               ip->i_udquot, ip->i_gdquot,
+                               ip->i_udquot, ip->i_gdquot, ip->i_pdquot,
                                resblks, 0, XFS_QMOPT_RES_REGBLKS);
                if (error)
                        goto error1;
-- 
1.7.4.1

<Prev in Thread] Current Thread [Next in Thread>