VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / fs / xfs / xfs_vnodeops.c

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 2777aca..05ab682 100644 (file)
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -411,11 +411,6 @@ xfs_setattr(
 
        xfs_ilock(ip, lock_flags);
 
-       if (_MAC_XFS_IACCESS(ip, MACWRITE, credp)) {
-               code = XFS_ERROR(EACCES);
-               goto error_return;
-       }
-
        /* boolean: are we the file owner? */
        file_owner = (current_fsuid(credp) == ip->i_d.di_uid);
 
@@ -2450,11 +2445,6 @@ xfs_remove(
                xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
        }
 
-       if ((error = _MAC_XFS_IACCESS(ip, MACWRITE, credp))) {
-               REMOVE_DEBUG_TRACE(__LINE__);
-               goto error_return;
-       }
-
        /*
         * Entry must exist since we did a lookup in xfs_lock_dir_and_entry.
         */
@@ -2540,8 +2530,6 @@ xfs_remove(
  error1:
        xfs_bmap_cancel(&free_list);
        cancel_flags |= XFS_TRANS_ABORT;
-
- error_return:
        xfs_trans_cancel(tp, cancel_flags);
        goto std_return;
 
@@ -3109,10 +3097,6 @@ xfs_rmdir(
        ITRACE(cdp);
        xfs_trans_ijoin(tp, cdp, XFS_ILOCK_EXCL);
 
-       if ((error = _MAC_XFS_IACCESS(cdp, MACWRITE, credp))) {
-               goto error_return;
-       }
-
        ASSERT(cdp->i_d.di_nlink >= 2);
        if (cdp->i_d.di_nlink != 2) {
                error = XFS_ERROR(ENOTEMPTY);