xfs: switch xfs_get_defquota to take explicit type

xfs_get_defquota() currently takes an xfs_dquot, and from that obtains
the type of default quota we should get (user/group/project).

But early in init, we don't have access to a fully set up quota, so
that's not possible.  The next patch needs go set up default quota
timers early, so switch xfs_get_defquota to take an explicit type
and add a helper function to obtain that type from an xfs_dquot
for the existing callers.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 714eceacbab2f5487d89e1b752c3f5e46870df6d..6196f7c52b24239e6b9b8229b32610ffc5e8d0d7 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -75,7 +75,7 @@ xfs_qm_adjust_dqlimits(
        int                     prealloc = 0;
 
        ASSERT(d->d_id);
-       defq = xfs_get_defquota(dq, q);
+       defq = xfs_get_defquota(q, xfs_dquot_type(dq));
 
        if (defq->bsoftlimit && !d->d_blk_softlimit) {
                d->d_blk_softlimit = cpu_to_be64(defq->bsoftlimit);

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 6609b4bb1628a2593a9bc504d19d44941999c50d..ac0b5e7f85229fdd934d40a94bf32c95d9e04a39 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -558,7 +558,7 @@ xfs_qm_set_defquota(
                return;
 
        ddqp = &dqp->q_core;
-       defq = xfs_get_defquota(dqp, qinf);
+       defq = xfs_get_defquota(qinf, xfs_dquot_type(dqp));
 
        /*
         * Timers and warnings have been already set, let's just set the

diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index 3a850401b1028bdfb2fac3f27ce372cffd86f191..c6f83171357e9c330a4bb0ce0fd171c30f6511c6 100644 (file)
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -113,6 +113,17 @@ xfs_quota_inode(xfs_mount_t *mp, uint dq_flags)
        return NULL;
 }
 
+static inline int
+xfs_dquot_type(struct xfs_dquot *dqp)
+{
+       if (XFS_QM_ISUDQ(dqp))
+               return XFS_DQ_USER;
+       if (XFS_QM_ISGDQ(dqp))
+               return XFS_DQ_GROUP;
+       ASSERT(XFS_QM_ISPDQ(dqp));
+       return XFS_DQ_PROJ;
+}
+
 extern void    xfs_trans_mod_dquot(struct xfs_trans *tp, struct xfs_dquot *dqp,
                                    uint field, int64_t delta);
 extern void    xfs_trans_dqjoin(struct xfs_trans *, struct xfs_dquot *);
@@ -164,19 +175,19 @@ extern int                xfs_qm_scall_quotaon(struct xfs_mount *, uint);
 extern int             xfs_qm_scall_quotaoff(struct xfs_mount *, uint);
 
 static inline struct xfs_def_quota *
-xfs_get_defquota(struct xfs_dquot *dqp, struct xfs_quotainfo *qi)
+xfs_get_defquota(struct xfs_quotainfo *qi, int type)
 {
-       struct xfs_def_quota *defq;
-
-       if (XFS_QM_ISUDQ(dqp))
-               defq = &qi->qi_usr_default;
-       else if (XFS_QM_ISGDQ(dqp))
-               defq = &qi->qi_grp_default;
-       else {
-               ASSERT(XFS_QM_ISPDQ(dqp));
-               defq = &qi->qi_prj_default;
+       switch (type) {
+       case XFS_DQ_USER:
+               return &qi->qi_usr_default;
+       case XFS_DQ_GROUP:
+               return &qi->qi_grp_default;
+       case XFS_DQ_PROJ:
+               return &qi->qi_prj_default;
+       default:
+               ASSERT(0);
+               return NULL;
        }
-       return defq;
 }
 
 #endif /* __XFS_QM_H__ */

diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index bd0f005570affb976a0971c32331c29b036407d8..6fa08ae0b5f539373de31ef8e1a60a6cc9660f2d 100644 (file)
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -479,7 +479,7 @@ xfs_qm_scall_setqlim(
                goto out_unlock;
        }
 
-       defq = xfs_get_defquota(dqp, q);
+       defq = xfs_get_defquota(q, xfs_dquot_type(dqp));
        xfs_dqunlock(dqp);
 
        error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_setqlim, 0, 0, 0, &tp);

diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 20542076e32ad97834a552ad92fa97c3c10c442b..edde366ca8e9851ef5131636f81699d1bb72fa3c 100644 (file)
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -591,7 +591,7 @@ xfs_trans_dqresv(
 
        xfs_dqlock(dqp);
 
-       defq = xfs_get_defquota(dqp, q);
+       defq = xfs_get_defquota(q, xfs_dquot_type(dqp));
 
        if (flags & XFS_TRANS_DQ_RES_BLKS) {
                hardlimit = be64_to_cpu(dqp->q_core.d_blk_hardlimit);