xfs
[Top] [All Lists]

[PATCH 10/10] quota: drop permission checks from xfs_fs_set_xstate/xfs_f

To: jack@xxxxxxx
Subject: [PATCH 10/10] quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Tue, 16 Feb 2010 03:44:56 -0500
Cc: swhiteho@xxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
References: <20100216084446.377980079@xxxxxxxxxxxxxxxxxxxxxx>
User-agent: quilt/0.47-1
We already do these checks in the generic code.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: linux-2.6/fs/xfs/linux-2.6/xfs_quotaops.c
===================================================================
--- linux-2.6.orig/fs/xfs/linux-2.6/xfs_quotaops.c      2010-02-16 
00:15:27.709004380 +0100
+++ linux-2.6/fs/xfs/linux-2.6/xfs_quotaops.c   2010-02-16 00:25:10.992007173 
+0100
@@ -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);
 }

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