1 files changed, 25 insertions, 8 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 5703783991fa..695978b27497 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -351,21 +351,28 @@ xfs_setattr(
          * If the IDs do change before we take the ilock, we're covered
          * because the i_*dquot fields will get updated anyway.
          */
-        if (XFS_IS_QUOTA_ON(mp) && (mask & (XFS_AT_UID|XFS_AT_GID))) {
+        if (XFS_IS_QUOTA_ON(mp) &&
+            (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID))) {
                 uint    qflags = 0;
 
-                if (mask & XFS_AT_UID) {
+                if ((mask & XFS_AT_UID) && XFS_IS_UQUOTA_ON(mp)) {
                         uid = vap->va_uid;
                         qflags |= XFS_QMOPT_UQUOTA;
                 } else {
                         uid = ip->i_d.di_uid;
                 }
-                if (mask & XFS_AT_GID) {
+                if ((mask & XFS_AT_GID) && XFS_IS_GQUOTA_ON(mp)) {
                         gid = vap->va_gid;
                         qflags |= XFS_QMOPT_GQUOTA;
                 }  else {
                         gid = ip->i_d.di_gid;
                 }
+                if ((mask & XFS_AT_PROJID) && XFS_IS_PQUOTA_ON(mp)) {
+                        projid = vap->va_projid;
+                        qflags |= XFS_QMOPT_PQUOTA;
+                }  else {
+                        projid = ip->i_d.di_projid;
+                }
                 /*
                  * We take a reference when we initialize udqp and gdqp,
                  * so it is important that we never blindly double trip on
@@ -373,7 +380,8 @@ xfs_setattr(
                  */
                 ASSERT(udqp == NULL);
                 ASSERT(gdqp == NULL);
-                code = XFS_QM_DQVOPALLOC(mp, ip, uid,gid, qflags, &udqp, &gdqp);
+                code = XFS_QM_DQVOPALLOC(mp, ip, uid, gid, projid, qflags,
+                                         &udqp, &gdqp);
                 if (code)
                         return (code);
         }
@@ -510,10 +518,11 @@ xfs_setattr(
                         goto error_return;
                 }
                 /*
-                 * Do a quota reservation only if uid or gid is actually
+                 * Do a quota reservation only if uid/projid/gid is actually
                  * going to change.
                  */
                 if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
+                    (XFS_IS_PQUOTA_ON(mp) && iprojid != projid) ||
                     (XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
                         ASSERT(tp);
                         code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
@@ -774,6 +783,7 @@ xfs_setattr(
                 }
                 if (igid != gid) {
                         if (XFS_IS_GQUOTA_ON(mp)) {
+                                ASSERT(!XFS_IS_PQUOTA_ON(mp));
                                 ASSERT(mask & XFS_AT_GID);
                                 ASSERT(gdqp);
                                 olddquot2 = XFS_QM_DQVOPCHOWN(mp, tp, ip,
@@ -782,6 +792,13 @@ xfs_setattr(
                         ip->i_d.di_gid = gid;
                 }
                 if (iprojid != projid) {
+                        if (XFS_IS_PQUOTA_ON(mp)) {
+                                ASSERT(!XFS_IS_GQUOTA_ON(mp));
+                                ASSERT(mask & XFS_AT_PROJID);
+                                ASSERT(gdqp);
+                                olddquot2 = XFS_QM_DQVOPCHOWN(mp, tp, ip,
+                                                        &ip->i_gdquot, gdqp);
+                        }
                         ip->i_d.di_projid = projid;
                         /*
                          * We may have to rev the inode as well as
@@ -1907,7 +1924,7 @@ xfs_create(
          * Make sure that we have allocated dquot(s) on disk.
          */
         error = XFS_QM_DQVOPALLOC(mp, dp,
-                        current_fsuid(credp), current_fsgid(credp),
+                        current_fsuid(credp), current_fsgid(credp), prid,
                         XFS_QMOPT_QUOTALL|XFS_QMOPT_INHERIT, &udqp, &gdqp);
         if (error)
                 goto std_return;
@@ -2812,7 +2829,7 @@ xfs_mkdir(
          * Make sure that we have allocated dquot(s) on disk.
          */
         error = XFS_QM_DQVOPALLOC(mp, dp,
-                        current_fsuid(credp), current_fsgid(credp),
+                        current_fsuid(credp), current_fsgid(credp), prid,
                         XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
         if (error)
                 goto std_return;
@@ -3366,7 +3383,7 @@ xfs_symlink(
          * Make sure that we have allocated dquot(s) on disk.
          */
         error = XFS_QM_DQVOPALLOC(mp, dp,
-                        current_fsuid(credp), current_fsgid(credp),
+                        current_fsuid(credp), current_fsgid(credp), prid,
                         XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp);
         if (error)
                 goto std_return;