Commit c51df733 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: stop using q_core.d_id in the quota code 



Add a dquot id field to the incore dquot, and use that instead of the
one in qcore.  This eliminates a bunch of endian conversions and will
eventually allow us to remove qcore entirely.

We also rearrange the start of xfs_dquot to remove padding holes, saving
8 bytes.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
parent 0b0fa1d1

fs/xfs/scrub/quota.c

+12 −7
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ xchk_quota_item( 
	unsigned long long	icount;

	unsigned long long	rcount;

	xfs_ino_t		fs_icount;

	xfs_dqid_t		id = be32_to_cpu(d->d_id);

	int			error = 0;



	if (xchk_should_terminate(sc, &error))
@@ -102,11 +101,11 @@ xchk_quota_item( 
	 * Except for the root dquot, the actual dquot we got must either have

	 * the same or higher id as we saw before.

	 */

	offset = id / qi->qi_dqperchunk;

	if (id && id <= sqi->last_id)

	offset = dq->q_id / qi->qi_dqperchunk;

	if (dq->q_id && dq->q_id <= sqi->last_id)

		xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, offset);



	sqi->last_id = id;

	sqi->last_id = dq->q_id;



	/* Did we get the dquot type we wanted? */

	if (dqtype != (d->d_flags & XFS_DQ_ALLTYPES))
@@ -175,13 +174,19 @@ xchk_quota_item( 
	 * lower limit than the actual usage.  However, we flag it for

	 * admin review.

	 */

	if (id != 0 && bhard != 0 && bcount > bhard)

	if (dq->q_id == 0)

		goto out;



	if (bhard != 0 && bcount > bhard)

		xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset);

	if (id != 0 && ihard != 0 && icount > ihard)



	if (ihard != 0 && icount > ihard)

		xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset);

	if (id != 0 && rhard != 0 && rcount > rhard)



	if (rhard != 0 && rcount > rhard)

		xchk_fblock_set_warning(sc, XFS_DATA_FORK, offset);



out:

	if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)

		return -EFSCORRUPTED;

fs/xfs/xfs_dquot.c

+11 −14
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ xfs_qm_adjust_dqlimits( 
	struct xfs_def_quota	*defq;

	int			prealloc = 0;



	ASSERT(d->d_id);

	ASSERT(dq->q_id);

	defq = xfs_get_defquota(q, xfs_dquot_type(dq));



	if (defq->bsoftlimit && !d->d_blk_softlimit) {
@@ -121,7 +121,7 @@ xfs_qm_adjust_dqtimers( 
	struct xfs_disk_dquot	*d = &dq->q_core;

	struct xfs_def_quota	*defq;



	ASSERT(d->d_id);

	ASSERT(dq->q_id);

	defq = xfs_get_defquota(qi, xfs_dquot_type(dq));



#ifdef DEBUG
@@ -366,7 +366,7 @@ xfs_dquot_disk_alloc( 
	 * Make a chunk of dquots out of this buffer and log

	 * the entire thing.

	 */

	xfs_qm_init_dquot_blk(tp, mp, be32_to_cpu(dqp->q_core.d_id),

	xfs_qm_init_dquot_blk(tp, mp, dqp->q_id,

			      dqp->dq_flags & XFS_DQ_ALLTYPES, bp);

	xfs_buf_set_ref(bp, XFS_DQUOT_REF);
@@ -479,7 +479,7 @@ xfs_dquot_alloc( 
	dqp = kmem_zone_zalloc(xfs_qm_dqzone, 0);



	dqp->dq_flags = type;

	dqp->q_core.d_id = cpu_to_be32(id);

	dqp->q_id = id;

	dqp->q_mount = mp;

	INIT_LIST_HEAD(&dqp->q_lru);

	mutex_init(&dqp->q_qlock);
@@ -537,10 +537,10 @@ xfs_dquot_from_disk( 
	 * Everything else was checked by the dquot buffer verifier.

	 */

	if ((ddqp->d_flags & XFS_DQ_ALLTYPES) != dqp->dq_flags ||

	    ddqp->d_id != dqp->q_core.d_id) {

	    be32_to_cpu(ddqp->d_id) != dqp->q_id) {

		xfs_alert_tag(bp->b_mount, XFS_PTAG_VERIFIER_ERROR,

			  "Metadata corruption detected at %pS, quota %u",

			  __this_address, be32_to_cpu(dqp->q_core.d_id));

			  __this_address, dqp->q_id);

		xfs_alert(bp->b_mount, "Unmount and run xfs_repair");

		return -EFSCORRUPTED;

	}
@@ -1187,11 +1187,10 @@ xfs_qm_dqflush( 
	ddqp = &dqb->dd_diskdq;



	/* sanity check the in-core structure before we flush */

	fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(dqp->q_core.d_id),

			      0);

	fa = xfs_dquot_verify(mp, &dqp->q_core, dqp->q_id, 0);

	if (fa) {

		xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",

				be32_to_cpu(dqp->q_core.d_id), fa);

				dqp->q_id, fa);

		xfs_buf_relse(bp);

		error = -EFSCORRUPTED;

		goto out_abort;
@@ -1200,7 +1199,7 @@ xfs_qm_dqflush( 
	fa = xfs_qm_dqflush_check(dqp);

	if (fa) {

		xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",

				be32_to_cpu(dqp->q_core.d_id), fa);

				dqp->q_id, fa);

		xfs_buf_relse(bp);

		error = -EFSCORRUPTED;

		goto out_abort;
@@ -1273,8 +1272,7 @@ xfs_dqlock2( 
{

	if (d1 && d2) {

		ASSERT(d1 != d2);

		if (be32_to_cpu(d1->q_core.d_id) >

		    be32_to_cpu(d2->q_core.d_id)) {

		if (d1->q_id > d2->q_id) {

			mutex_lock(&d2->q_qlock);

			mutex_lock_nested(&d1->q_qlock, XFS_QLOCK_NESTED);

		} else {
@@ -1342,9 +1340,8 @@ xfs_qm_dqiterate( 
			return error;



		error = iter_fn(dq, dqtype, priv);

		id = be32_to_cpu(dq->q_core.d_id);

		id = dq->q_id;

		xfs_qm_dqput(dq);

		id++;

	} while (error == 0 && id != 0);



	return error;

fs/xfs/xfs_dquot.h

+2 −1
Original line number Diff line number Diff line
@@ -35,9 +35,10 @@ struct xfs_dquot { 
	struct xfs_mount	*q_mount;

	uint8_t			dq_flags;

	uint16_t		q_flags;

	xfs_dqid_t		q_id;

	uint			q_nrefs;

	xfs_daddr_t		q_blkno;

	int			q_bufoffset;

	xfs_daddr_t		q_blkno;

	xfs_fileoff_t		q_fileoffset;



	struct xfs_disk_dquot	q_core;

fs/xfs/xfs_dquot_item.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ xfs_qm_dquot_logitem_format( 
	qlf = xlog_prepare_iovec(lv, &vecp, XLOG_REG_TYPE_QFORMAT);

	qlf->qlf_type = XFS_LI_DQUOT;

	qlf->qlf_size = 2;

	qlf->qlf_id = be32_to_cpu(qlip->qli_dquot->q_core.d_id);

	qlf->qlf_id = qlip->qli_dquot->q_id;

	qlf->qlf_blkno = qlip->qli_dquot->q_blkno;

	qlf->qlf_len = 1;

	qlf->qlf_boffset = qlip->qli_dquot->q_bufoffset;

fs/xfs/xfs_qm.c

+10 −12
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ xfs_qm_dquot_walk( 
		for (i = 0; i < nr_found; i++) {

			struct xfs_dquot *dqp = batch[i];



			next_index = be32_to_cpu(dqp->q_core.d_id) + 1;

			next_index = dqp->q_id + 1;



			error = execute(batch[i], data);

			if (error == -EAGAIN) {
@@ -161,8 +161,7 @@ xfs_qm_dqpurge( 
	xfs_dqfunlock(dqp);

	xfs_dqunlock(dqp);



	radix_tree_delete(xfs_dquot_tree(qi, dqp->q_core.d_flags),

			  be32_to_cpu(dqp->q_core.d_id));

	radix_tree_delete(xfs_dquot_tree(qi, dqp->q_core.d_flags), dqp->q_id);

	qi->qi_dquots--;



	/*
@@ -1108,7 +1107,7 @@ xfs_qm_quotacheck_dqadjust( 
	 *

	 * There are no timers for the default values set in the root dquot.

	 */

	if (dqp->q_core.d_id) {

	if (dqp->q_id) {

		xfs_qm_adjust_dqlimits(mp, dqp);

		xfs_qm_adjust_dqtimers(mp, dqp);

	}
@@ -1594,8 +1593,7 @@ xfs_qm_dqfree_one( 
	struct xfs_quotainfo	*qi = mp->m_quotainfo;



	mutex_lock(&qi->qi_tree_lock);

	radix_tree_delete(xfs_dquot_tree(qi, dqp->q_core.d_flags),

			  be32_to_cpu(dqp->q_core.d_id));

	radix_tree_delete(xfs_dquot_tree(qi, dqp->q_core.d_flags), dqp->q_id);



	qi->qi_dquots--;

	mutex_unlock(&qi->qi_tree_lock);
@@ -1819,7 +1817,7 @@ xfs_qm_vop_chown_reserve( 
			XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS;



	if (XFS_IS_UQUOTA_ON(mp) && udqp &&

	    i_uid_read(VFS_I(ip)) != be32_to_cpu(udqp->q_core.d_id)) {

	    i_uid_read(VFS_I(ip)) != udqp->q_id) {

		udq_delblks = udqp;

		/*

		 * If there are delayed allocation blocks, then we have to
@@ -1832,7 +1830,7 @@ xfs_qm_vop_chown_reserve( 
		}

	}

	if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp &&

	    i_gid_read(VFS_I(ip)) != be32_to_cpu(gdqp->q_core.d_id)) {

	    i_gid_read(VFS_I(ip)) != gdqp->q_id) {

		gdq_delblks = gdqp;

		if (delblks) {

			ASSERT(ip->i_gdquot);
@@ -1841,7 +1839,7 @@ xfs_qm_vop_chown_reserve( 
	}



	if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp &&

	    ip->i_d.di_projid != be32_to_cpu(pdqp->q_core.d_id)) {

	    ip->i_d.di_projid != pdqp->q_id) {

		pdq_delblks = pdqp;

		if (delblks) {

			ASSERT(ip->i_pdquot);
@@ -1925,21 +1923,21 @@ xfs_qm_vop_create_dqattach( 


	if (udqp && XFS_IS_UQUOTA_ON(mp)) {

		ASSERT(ip->i_udquot == NULL);

		ASSERT(i_uid_read(VFS_I(ip)) == be32_to_cpu(udqp->q_core.d_id));

		ASSERT(i_uid_read(VFS_I(ip)) == udqp->q_id);



		ip->i_udquot = xfs_qm_dqhold(udqp);

		xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1);

	}

	if (gdqp && XFS_IS_GQUOTA_ON(mp)) {

		ASSERT(ip->i_gdquot == NULL);

		ASSERT(i_gid_read(VFS_I(ip)) == be32_to_cpu(gdqp->q_core.d_id));

		ASSERT(i_gid_read(VFS_I(ip)) == gdqp->q_id);



		ip->i_gdquot = xfs_qm_dqhold(gdqp);

		xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1);

	}

	if (pdqp && XFS_IS_PQUOTA_ON(mp)) {

		ASSERT(ip->i_pdquot == NULL);

		ASSERT(ip->i_d.di_projid == be32_to_cpu(pdqp->q_core.d_id));

		ASSERT(ip->i_d.di_projid == pdqp->q_id);



		ip->i_pdquot = xfs_qm_dqhold(pdqp);

		xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1);