Merge rsync://oss.sgi.com/git/xfs-2.6

1 files changed, 64 insertions, 31 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 25a526629b12..1377c868f3f4 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -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);
         }
@@ -499,8 +507,6 @@ xfs_setattr(
                  * that the group ID supplied to the chown() function
                  * shall be equal to either the group ID or one of the
                  * supplementary group IDs of the calling process.
-                 *
-                 * XXX: How does restricted_chown affect projid?
                  */
                 if (restricted_chown &&
                     (iuid != uid || (igid != gid &&
@@ -510,10 +516,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 +781,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 +790,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
@@ -843,6 +858,8 @@ xfs_setattr(
                                 di_flags |= XFS_DIFLAG_NOATIME;
                         if (vap->va_xflags & XFS_XFLAG_NODUMP)
                                 di_flags |= XFS_DIFLAG_NODUMP;
+                        if (vap->va_xflags & XFS_XFLAG_PROJINHERIT)
+                                di_flags |= XFS_DIFLAG_PROJINHERIT;
                         if ((ip->i_d.di_mode & S_IFMT) == S_IFDIR) {
                                 if (vap->va_xflags & XFS_XFLAG_RTINHERIT)
                                         di_flags |= XFS_DIFLAG_RTINHERIT;
@@ -1898,7 +1915,9 @@ xfs_create(
         /* Return through std_return after this point. */
 
         udqp = gdqp = NULL;
-        if (vap->va_mask & XFS_AT_PROJID)
+        if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
+                prid = dp->i_d.di_projid;
+        else if (vap->va_mask & XFS_AT_PROJID)
                 prid = (xfs_prid_t)vap->va_projid;
         else
                 prid = (xfs_prid_t)dfltprid;
@@ -1907,7 +1926,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;
@@ -2604,17 +2623,7 @@ xfs_link(
         if (src_vp->v_type == VDIR)
                 return XFS_ERROR(EPERM);
 
-        /*
-         * For now, manually find the XFS behavior descriptor for
-         * the source vnode.  If it doesn't exist then something
-         * is wrong and we should just return an error.
-         * Eventually we need to figure out how link is going to
-         * work in the face of stacked vnodes.
-         */
         src_bdp = vn_bhv_lookup_unlocked(VN_BHV_HEAD(src_vp), &xfs_vnodeops);
-        if (src_bdp == NULL) {
-                return XFS_ERROR(EXDEV);
-        }
         sip = XFS_BHVTOI(src_bdp);
         tdp = XFS_BHVTOI(target_dir_bdp);
         mp = tdp->i_mount;
@@ -2681,6 +2690,17 @@ xfs_link(
                 goto error_return;
         }
 
+        /*
+         * If we are using project inheritance, we only allow hard link
+         * creation in our tree when the project IDs are the same; else
+         * the tree quota mechanism could be circumvented.
+         */
+        if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
+                     (tdp->i_d.di_projid != sip->i_d.di_projid))) {
+                error = XFS_ERROR(EPERM);
+                goto error_return;
+        }
+
         if (resblks == 0 &&
             (error = XFS_DIR_CANENTER(mp, tp, tdp, target_name,
                         target_namelen)))
@@ -2803,7 +2823,9 @@ xfs_mkdir(
 
         mp = dp->i_mount;
         udqp = gdqp = NULL;
-        if (vap->va_mask & XFS_AT_PROJID)
+        if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
+                prid = dp->i_d.di_projid;
+        else if (vap->va_mask & XFS_AT_PROJID)
                 prid = (xfs_prid_t)vap->va_projid;
         else
                 prid = (xfs_prid_t)dfltprid;
@@ -2812,7 +2834,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;
@@ -3357,7 +3379,9 @@ xfs_symlink(
         /* Return through std_return after this point. */
 
         udqp = gdqp = NULL;
-        if (vap->va_mask & XFS_AT_PROJID)
+        if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
+                prid = dp->i_d.di_projid;
+        else if (vap->va_mask & XFS_AT_PROJID)
                 prid = (xfs_prid_t)vap->va_projid;
         else
                 prid = (xfs_prid_t)dfltprid;
@@ -3366,7 +3390,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;
@@ -4028,7 +4052,7 @@ xfs_finish_reclaim_all(xfs_mount_t *mp, int noblock)
  *      errno on error
  *
  */
-int
+STATIC int
 xfs_alloc_file_space(
         xfs_inode_t             *ip,
         xfs_off_t               offset,
@@ -4151,9 +4175,8 @@ retry:
                         break;
                 }
                 xfs_ilock(ip, XFS_ILOCK_EXCL);
-                error = XFS_TRANS_RESERVE_QUOTA_BYDQUOTS(mp, tp,
-                                ip->i_udquot, ip->i_gdquot, resblks, 0, rt ?
-                                XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS);
+                error = XFS_TRANS_RESERVE_QUOTA(mp, tp,
+                                ip->i_udquot, ip->i_gdquot, resblks, 0, 0);
                 if (error)
                         goto error1;
 
@@ -4305,6 +4328,7 @@ xfs_free_file_space(
         xfs_off_t               len,
         int                     attr_flags)
 {
+        vnode_t                 *vp;
         int                     committed;
         int                     done;
         xfs_off_t               end_dmi_offset;
@@ -4325,9 +4349,11 @@ xfs_free_file_space(
         xfs_trans_t             *tp;
         int                     need_iolock = 1;
 
-        vn_trace_entry(XFS_ITOV(ip), __FUNCTION__, (inst_t *)__return_address);
+        vp = XFS_ITOV(ip);
         mp = ip->i_mount;
 
+        vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);
+
         if ((error = XFS_QM_DQATTACH(mp, ip, 0)))
                 return error;
 
@@ -4344,7 +4370,7 @@ xfs_free_file_space(
             DM_EVENT_ENABLED(XFS_MTOVFS(mp), ip, DM_EVENT_WRITE)) {
                 if (end_dmi_offset > ip->i_d.di_size)
                         end_dmi_offset = ip->i_d.di_size;
-                error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, XFS_ITOV(ip),
+                error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, vp,
                                 offset, end_dmi_offset - offset,
                                 AT_DELAY_FLAG(attr_flags), NULL);
                 if (error)
@@ -4363,7 +4389,14 @@ xfs_free_file_space(
         ioffset = offset & ~(rounding - 1);
         if (ilen & (rounding - 1))
                 ilen = (ilen + rounding) & ~(rounding - 1);
-        xfs_inval_cached_pages(XFS_ITOV(ip), &(ip->i_iocore), ioffset, 0, 0);
+
+        if (VN_CACHED(vp) != 0) {
+                xfs_inval_cached_trace(&ip->i_iocore, ioffset, -1,
+                                ctooff(offtoct(ioffset)), -1);
+                VOP_FLUSHINVAL_PAGES(vp, ctooff(offtoct(ioffset)),
+                                -1, FI_REMAPF_LOCKED);
+        }
+
         /*
          * Need to zero the stuff we're not freeing, on disk.
          * If its a realtime file & can't use unwritten extents then we