xfs: move the flags argument of xfs_qm_scall_trunc_qfiles to XFS_QMOPT_*

Since xfs_qm_scall_trunc_qfiles can take a bitset of quota types that we
want to truncate, change the flags argument to take XFS_QMOPT_[UGP}QUOTA
so that the next patch can start to deprecate XFS_DQ_*.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 7effd7a281365674b8500c25ad1c760dab602a2f..35fad348e3a22529b66b289bb2498ecf7c8ef645 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -322,23 +322,23 @@ xfs_qm_scall_trunc_qfiles(
        int             error = -EINVAL;
 
        if (!xfs_sb_version_hasquota(&mp->m_sb) || flags == 0 ||
-           (flags & ~XFS_DQ_ALLTYPES)) {
+           (flags & ~XFS_QMOPT_QUOTALL)) {
                xfs_debug(mp, "%s: flags=%x m_qflags=%x",
                        __func__, flags, mp->m_qflags);
                return -EINVAL;
        }
 
-       if (flags & XFS_DQ_USER) {
+       if (flags & XFS_QMOPT_UQUOTA) {
                error = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_uquotino);
                if (error)
                        return error;
        }
-       if (flags & XFS_DQ_GROUP) {
+       if (flags & XFS_QMOPT_GQUOTA) {
                error = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_gquotino);
                if (error)
                        return error;
        }
-       if (flags & XFS_DQ_PROJ)
+       if (flags & XFS_QMOPT_PQUOTA)
                error = xfs_qm_scall_trunc_qfile(mp, mp->m_sb.sb_pquotino);
 
        return error;

diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index bf809b77a31606af739b02afeee6edb9a9e69dcb..0868e6ee22191b4bf0cd52778c23cb612c7a0b32 100644 (file)
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -205,11 +205,11 @@ xfs_fs_rm_xquota(
                return -EINVAL;
 
        if (uflags & FS_USER_QUOTA)
-               flags |= XFS_DQ_USER;
+               flags |= XFS_QMOPT_UQUOTA;
        if (uflags & FS_GROUP_QUOTA)
-               flags |= XFS_DQ_GROUP;
+               flags |= XFS_QMOPT_GQUOTA;
        if (uflags & FS_PROJ_QUOTA)
-               flags |= XFS_DQ_PROJ;
+               flags |= XFS_QMOPT_PQUOTA;
 
        return xfs_qm_scall_trunc_qfiles(mp, flags);
 }