diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2014-05-05 03:25:50 -0400 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-05 03:25:50 -0400 |
| commit | 9da93f9b7cdf8ab28da6b364cdc1fafc8670b4dc (patch) | |
| tree | a0315376046dce4cfcfd498af5617e4088c8e86c /fs/xfs | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
xfs: fix Q_XQUOTARM ioctl
The Q_XQUOTARM quotactl was not working properly, because
we weren't passing around proper flags. The xfs_fs_set_xstate()
ioctl handler used the same flags for Q_XQUOTAON/OFF as
well as for Q_XQUOTARM, but Q_XQUOTAON/OFF look for
XFS_UQUOTA_ACCT, XFS_UQUOTA_ENFD, XFS_GQUOTA_ACCT etc,
i.e. quota type + state, while Q_XQUOTARM looks only for
the type of quota, i.e. XFS_DQ_USER, XFS_DQ_GROUP etc.
Unfortunately these flag spaces overlap a bit, so we
got semi-random results for Q_XQUOTARM; i.e. the value
for XFS_DQ_USER == XFS_UQUOTA_ACCT, etc. yeargh.
Add a new quotactl op vector specifically for the QUOTARM
operation, since it operates with a different flag space.
This has been broken more or less forever, AFAICT.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Acked-by: Jan Kara <jack@suse.cz>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_quotaops.c | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c index af33cafe69b6..2ad1b9822e92 100644 --- a/fs/xfs/xfs_quotaops.c +++ b/fs/xfs/xfs_quotaops.c | |||
| @@ -100,16 +100,36 @@ xfs_fs_set_xstate( | |||
| 100 | if (!XFS_IS_QUOTA_ON(mp)) | 100 | if (!XFS_IS_QUOTA_ON(mp)) |
| 101 | return -EINVAL; | 101 | return -EINVAL; |
| 102 | return -xfs_qm_scall_quotaoff(mp, flags); | 102 | return -xfs_qm_scall_quotaoff(mp, flags); |
| 103 | case Q_XQUOTARM: | ||
| 104 | if (XFS_IS_QUOTA_ON(mp)) | ||
| 105 | return -EINVAL; | ||
| 106 | return -xfs_qm_scall_trunc_qfiles(mp, flags); | ||
| 107 | } | 103 | } |
| 108 | 104 | ||
| 109 | return -EINVAL; | 105 | return -EINVAL; |
| 110 | } | 106 | } |
| 111 | 107 | ||
| 112 | STATIC int | 108 | STATIC int |
| 109 | xfs_fs_rm_xquota( | ||
| 110 | struct super_block *sb, | ||
| 111 | unsigned int uflags) | ||
| 112 | { | ||
| 113 | struct xfs_mount *mp = XFS_M(sb); | ||
| 114 | unsigned int flags = 0; | ||
| 115 | |||
| 116 | if (sb->s_flags & MS_RDONLY) | ||
| 117 | return -EROFS; | ||
| 118 | |||
| 119 | if (XFS_IS_QUOTA_ON(mp)) | ||
| 120 | return -EINVAL; | ||
| 121 | |||
| 122 | if (uflags & FS_USER_QUOTA) | ||
| 123 | flags |= XFS_DQ_USER; | ||
| 124 | if (uflags & FS_GROUP_QUOTA) | ||
| 125 | flags |= XFS_DQ_GROUP; | ||
| 126 | if (uflags & FS_USER_QUOTA) | ||
| 127 | flags |= XFS_DQ_PROJ; | ||
| 128 | |||
| 129 | return -xfs_qm_scall_trunc_qfiles(mp, flags); | ||
| 130 | } | ||
| 131 | |||
| 132 | STATIC int | ||
| 113 | xfs_fs_get_dqblk( | 133 | xfs_fs_get_dqblk( |
| 114 | struct super_block *sb, | 134 | struct super_block *sb, |
| 115 | struct kqid qid, | 135 | struct kqid qid, |
| @@ -149,6 +169,7 @@ const struct quotactl_ops xfs_quotactl_operations = { | |||
| 149 | .get_xstatev = xfs_fs_get_xstatev, | 169 | .get_xstatev = xfs_fs_get_xstatev, |
| 150 | .get_xstate = xfs_fs_get_xstate, | 170 | .get_xstate = xfs_fs_get_xstate, |
| 151 | .set_xstate = xfs_fs_set_xstate, | 171 | .set_xstate = xfs_fs_set_xstate, |
| 172 | .rm_xquota = xfs_fs_rm_xquota, | ||
| 152 | .get_dqblk = xfs_fs_get_dqblk, | 173 | .get_dqblk = xfs_fs_get_dqblk, |
| 153 | .set_dqblk = xfs_fs_set_dqblk, | 174 | .set_dqblk = xfs_fs_set_dqblk, |
| 154 | }; | 175 | }; |