diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2014-05-05 17:25:50 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-05 17:25:50 +1000 |
| commit | 9da93f9b7cdf8ab28da6b364cdc1fafc8670b4dc (patch) | |
| tree | a0315376046dce4cfcfd498af5617e4088c8e86c /include | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
| download | op-kernel-dev-9da93f9b7cdf8ab28da6b364cdc1fafc8670b4dc.zip op-kernel-dev-9da93f9b7cdf8ab28da6b364cdc1fafc8670b4dc.tar.gz | |
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 'include')
| -rw-r--r-- | include/linux/quota.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/quota.h b/include/linux/quota.h index cc7494a..0f3c5d3 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -329,6 +329,7 @@ struct quotactl_ops { int (*get_xstate)(struct super_block *, struct fs_quota_stat *); int (*set_xstate)(struct super_block *, unsigned int, int); int (*get_xstatev)(struct super_block *, struct fs_quota_statv *); + int (*rm_xquota)(struct super_block *, unsigned int); }; struct quota_format_type { |
