xfs: fix Q_XQUOTARM ioctl

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / xfs / xfs_quotaops.c

diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index af33caf..2ad1b98 100644 (file)
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -100,16 +100,36 @@ xfs_fs_set_xstate(
                if (!XFS_IS_QUOTA_ON(mp))
                        return -EINVAL;
                return -xfs_qm_scall_quotaoff(mp, flags);
-       case Q_XQUOTARM:
-               if (XFS_IS_QUOTA_ON(mp))
-                       return -EINVAL;
-               return -xfs_qm_scall_trunc_qfiles(mp, flags);
        }
 
        return -EINVAL;
 }
 
 STATIC int
+xfs_fs_rm_xquota(
+       struct super_block      *sb,
+       unsigned int            uflags)
+{
+       struct xfs_mount        *mp = XFS_M(sb);
+       unsigned int            flags = 0;
+       
+       if (sb->s_flags & MS_RDONLY)
+               return -EROFS;
+
+       if (XFS_IS_QUOTA_ON(mp))
+               return -EINVAL;
+
+       if (uflags & FS_USER_QUOTA)
+               flags |= XFS_DQ_USER;
+       if (uflags & FS_GROUP_QUOTA)
+               flags |= XFS_DQ_GROUP;
+       if (uflags & FS_USER_QUOTA)
+               flags |= XFS_DQ_PROJ;
+
+       return -xfs_qm_scall_trunc_qfiles(mp, flags);
+}      
+
+STATIC int
 xfs_fs_get_dqblk(
        struct super_block      *sb,
        struct kqid             qid,
@@ -149,6 +169,7 @@ const struct quotactl_ops xfs_quotactl_operations = {
        .get_xstatev            = xfs_fs_get_xstatev,
        .get_xstate             = xfs_fs_get_xstate,
        .set_xstate             = xfs_fs_set_xstate,
+       .rm_xquota              = xfs_fs_rm_xquota,
        .get_dqblk              = xfs_fs_get_dqblk,
        .set_dqblk              = xfs_fs_set_dqblk,
 };