Merge tag 'libnvdimm-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[linux-2.6-microblaze.git] / fs / xfs / xfs_quotaops.c

diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 88d70c2..07989bd 100644 (file)
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -60,18 +60,18 @@ xfs_fs_get_quota_state(
        struct xfs_quotainfo *q = mp->m_quotainfo;
 
        memset(state, 0, sizeof(*state));
-       if (!XFS_IS_QUOTA_RUNNING(mp))
+       if (!XFS_IS_QUOTA_ON(mp))
                return 0;
        state->s_incoredqs = q->qi_dquots;
-       if (XFS_IS_UQUOTA_RUNNING(mp))
+       if (XFS_IS_UQUOTA_ON(mp))
                state->s_state[USRQUOTA].flags |= QCI_ACCT_ENABLED;
        if (XFS_IS_UQUOTA_ENFORCED(mp))
                state->s_state[USRQUOTA].flags |= QCI_LIMITS_ENFORCED;
-       if (XFS_IS_GQUOTA_RUNNING(mp))
+       if (XFS_IS_GQUOTA_ON(mp))
                state->s_state[GRPQUOTA].flags |= QCI_ACCT_ENABLED;
        if (XFS_IS_GQUOTA_ENFORCED(mp))
                state->s_state[GRPQUOTA].flags |= QCI_LIMITS_ENFORCED;
-       if (XFS_IS_PQUOTA_RUNNING(mp))
+       if (XFS_IS_PQUOTA_ON(mp))
                state->s_state[PRJQUOTA].flags |= QCI_ACCT_ENABLED;
        if (XFS_IS_PQUOTA_ENFORCED(mp))
                state->s_state[PRJQUOTA].flags |= QCI_LIMITS_ENFORCED;
@@ -114,10 +114,8 @@ xfs_fs_set_info(
 
        if (sb_rdonly(sb))
                return -EROFS;
-       if (!XFS_IS_QUOTA_RUNNING(mp))
-               return -ENOSYS;
        if (!XFS_IS_QUOTA_ON(mp))
-               return -ESRCH;
+               return -ENOSYS;
        if (info->i_fieldmask & ~XFS_QC_SETINFO_MASK)
                return -EINVAL;
        if ((info->i_fieldmask & XFS_QC_SETINFO_MASK) == 0)
@@ -164,7 +162,7 @@ xfs_quota_enable(
 
        if (sb_rdonly(sb))
                return -EROFS;
-       if (!XFS_IS_QUOTA_RUNNING(mp))
+       if (!XFS_IS_QUOTA_ON(mp))
                return -ENOSYS;
 
        return xfs_qm_scall_quotaon(mp, xfs_quota_flags(uflags));
@@ -179,10 +177,8 @@ xfs_quota_disable(
 
        if (sb_rdonly(sb))
                return -EROFS;
-       if (!XFS_IS_QUOTA_RUNNING(mp))
-               return -ENOSYS;
        if (!XFS_IS_QUOTA_ON(mp))
-               return -EINVAL;
+               return -ENOSYS;
 
        return xfs_qm_scall_quotaoff(mp, xfs_quota_flags(uflags));
 }
@@ -223,10 +219,8 @@ xfs_fs_get_dqblk(
        struct xfs_mount        *mp = XFS_M(sb);
        xfs_dqid_t              id;
 
-       if (!XFS_IS_QUOTA_RUNNING(mp))
-               return -ENOSYS;
        if (!XFS_IS_QUOTA_ON(mp))
-               return -ESRCH;
+               return -ENOSYS;
 
        id = from_kqid(&init_user_ns, qid);
        return xfs_qm_scall_getquota(mp, id, xfs_quota_type(qid.type), qdq);
@@ -243,10 +237,8 @@ xfs_fs_get_nextdqblk(
        struct xfs_mount        *mp = XFS_M(sb);
        xfs_dqid_t              id;
 
-       if (!XFS_IS_QUOTA_RUNNING(mp))
-               return -ENOSYS;
        if (!XFS_IS_QUOTA_ON(mp))
-               return -ESRCH;
+               return -ENOSYS;
 
        id = from_kqid(&init_user_ns, *qid);
        ret = xfs_qm_scall_getquota_next(mp, &id, xfs_quota_type(qid->type),
@@ -269,10 +261,8 @@ xfs_fs_set_dqblk(
 
        if (sb_rdonly(sb))
                return -EROFS;
-       if (!XFS_IS_QUOTA_RUNNING(mp))
-               return -ENOSYS;
        if (!XFS_IS_QUOTA_ON(mp))
-               return -ESRCH;
+               return -ENOSYS;
 
        return xfs_qm_scall_setqlim(mp, from_kqid(&init_user_ns, qid),
                                     xfs_quota_type(qid.type), qdq);