Commit ce6e7e79 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong
Browse files

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: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 3dbb9aa3

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_qm.c

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/xfs/xfs_qm.h

+22 −11
Original line number Diff line number Diff line
@@ -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__ */

fs/xfs/xfs_qm_syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_trans_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE