From dcbadc74682292d442176db92dac01b50e0d6b1f Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 16 Feb 2010 03:44:56 -0500 Subject: [PATCH] --- yaml --- r: 186099 b: refs/heads/master c: ac0e773718dc20551e72900d2e7eada96ac91100 h: refs/heads/master i: 186097: d616ee06390dda8b0cbb128b357a5addbcc2550d 186095: e1dc820244a076ab0a36bdca2f4ecabe3f5372a0 v: v3 --- [refs] | 2 +- trunk/fs/xfs/linux-2.6/xfs_quotaops.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 68ec5aff6faa..c40c92890a29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5582c76f901d240f57329212b59b4d957ea8d6cf +refs/heads/master: ac0e773718dc20551e72900d2e7eada96ac91100 diff --git a/trunk/fs/xfs/linux-2.6/xfs_quotaops.c b/trunk/fs/xfs/linux-2.6/xfs_quotaops.c index 07d67c624922..1947514ce1ad 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_quotaops.c +++ b/trunk/fs/xfs/linux-2.6/xfs_quotaops.c @@ -68,8 +68,6 @@ xfs_fs_set_xstate( return -EROFS; if (op != Q_XQUOTARM && !XFS_IS_QUOTA_RUNNING(mp)) return -ENOSYS; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; if (uflags & XFS_QUOTA_UDQ_ACCT) flags |= XFS_UQUOTA_ACCT; @@ -130,8 +128,6 @@ xfs_fs_set_xquota( return -ENOSYS; if (!XFS_IS_QUOTA_ON(mp)) return -ESRCH; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; return -xfs_qm_scall_setqlim(mp, id, xfs_quota_type(type), fdq); }