Commit af1db8f1 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: remove unnecessary quota type masking

When XFS' quota functions take a parameter for the quota type, they only
care about the three quota record types (user, group, project).
Internal state flags and whatnot should never be passed by callers and
are an error.  Now that we've moved responsibility for filtering out
internal state to the callers, we can drop the masking everywhere else.

In other words, if you call a quota function, you must only pass in
one of XFS_DQTYPE_{USER,GROUP,PROJ}.
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 0b04dd5d
...@@ -136,7 +136,7 @@ xfs_dquot_type(const struct xfs_dquot *dqp) ...@@ -136,7 +136,7 @@ xfs_dquot_type(const struct xfs_dquot *dqp)
static inline int xfs_this_quota_on(struct xfs_mount *mp, int type) static inline int xfs_this_quota_on(struct xfs_mount *mp, int type)
{ {
switch (type & XFS_DQTYPE_REC_MASK) { switch (type) {
case XFS_DQTYPE_USER: case XFS_DQTYPE_USER:
return XFS_IS_UQUOTA_ON(mp); return XFS_IS_UQUOTA_ON(mp);
case XFS_DQTYPE_GROUP: case XFS_DQTYPE_GROUP:
...@@ -150,7 +150,7 @@ static inline int xfs_this_quota_on(struct xfs_mount *mp, int type) ...@@ -150,7 +150,7 @@ static inline int xfs_this_quota_on(struct xfs_mount *mp, int type)
static inline struct xfs_dquot *xfs_inode_dquot(struct xfs_inode *ip, int type) static inline struct xfs_dquot *xfs_inode_dquot(struct xfs_inode *ip, int type)
{ {
switch (type & XFS_DQTYPE_REC_MASK) { switch (type) {
case XFS_DQTYPE_USER: case XFS_DQTYPE_USER:
return ip->i_udquot; return ip->i_udquot;
case XFS_DQTYPE_GROUP: case XFS_DQTYPE_GROUP:
......
...@@ -88,7 +88,7 @@ xfs_dquot_tree( ...@@ -88,7 +88,7 @@ xfs_dquot_tree(
static inline struct xfs_inode * static inline struct xfs_inode *
xfs_quota_inode(xfs_mount_t *mp, uint dq_flags) xfs_quota_inode(xfs_mount_t *mp, uint dq_flags)
{ {
switch (dq_flags & XFS_DQTYPE_REC_MASK) { switch (dq_flags) {
case XFS_DQTYPE_USER: case XFS_DQTYPE_USER:
return mp->m_quotainfo->qi_uquotaip; return mp->m_quotainfo->qi_uquotaip;
case XFS_DQTYPE_GROUP: case XFS_DQTYPE_GROUP:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment