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>
This commit is contained in:
Родитель
3dbb9aa310
Коммит
ce6e7e79ce
|
@ -75,7 +75,7 @@ xfs_qm_adjust_dqlimits(
|
||||||
int prealloc = 0;
|
int prealloc = 0;
|
||||||
|
|
||||||
ASSERT(d->d_id);
|
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) {
|
if (defq->bsoftlimit && !d->d_blk_softlimit) {
|
||||||
d->d_blk_softlimit = cpu_to_be64(defq->bsoftlimit);
|
d->d_blk_softlimit = cpu_to_be64(defq->bsoftlimit);
|
||||||
|
|
|
@ -558,7 +558,7 @@ xfs_qm_set_defquota(
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ddqp = &dqp->q_core;
|
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
|
* Timers and warnings have been already set, let's just set the
|
||||||
|
|
|
@ -113,6 +113,17 @@ xfs_quota_inode(xfs_mount_t *mp, uint dq_flags)
|
||||||
return NULL;
|
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,
|
extern void xfs_trans_mod_dquot(struct xfs_trans *tp, struct xfs_dquot *dqp,
|
||||||
uint field, int64_t delta);
|
uint field, int64_t delta);
|
||||||
extern void xfs_trans_dqjoin(struct xfs_trans *, struct xfs_dquot *);
|
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);
|
extern int xfs_qm_scall_quotaoff(struct xfs_mount *, uint);
|
||||||
|
|
||||||
static inline struct xfs_def_quota *
|
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;
|
switch (type) {
|
||||||
|
case XFS_DQ_USER:
|
||||||
if (XFS_QM_ISUDQ(dqp))
|
return &qi->qi_usr_default;
|
||||||
defq = &qi->qi_usr_default;
|
case XFS_DQ_GROUP:
|
||||||
else if (XFS_QM_ISGDQ(dqp))
|
return &qi->qi_grp_default;
|
||||||
defq = &qi->qi_grp_default;
|
case XFS_DQ_PROJ:
|
||||||
else {
|
return &qi->qi_prj_default;
|
||||||
ASSERT(XFS_QM_ISPDQ(dqp));
|
default:
|
||||||
defq = &qi->qi_prj_default;
|
ASSERT(0);
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
return defq;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __XFS_QM_H__ */
|
#endif /* __XFS_QM_H__ */
|
||||||
|
|
|
@ -479,7 +479,7 @@ xfs_qm_scall_setqlim(
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
defq = xfs_get_defquota(dqp, q);
|
defq = xfs_get_defquota(q, xfs_dquot_type(dqp));
|
||||||
xfs_dqunlock(dqp);
|
xfs_dqunlock(dqp);
|
||||||
|
|
||||||
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_setqlim, 0, 0, 0, &tp);
|
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_setqlim, 0, 0, 0, &tp);
|
||||||
|
|
|
@ -591,7 +591,7 @@ xfs_trans_dqresv(
|
||||||
|
|
||||||
xfs_dqlock(dqp);
|
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) {
|
if (flags & XFS_TRANS_DQ_RES_BLKS) {
|
||||||
hardlimit = be64_to_cpu(dqp->q_core.d_blk_hardlimit);
|
hardlimit = be64_to_cpu(dqp->q_core.d_blk_hardlimit);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче