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

xfs: refactor XFS_QMOPT_DQNEXT out of existence 



There's only one caller of DQNEXT and its semantics can be moved into a
separate function, so create the function and get rid of the flag.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 609001bc

fs/xfs/libxfs/xfs_quota_defs.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ typedef uint16_t xfs_qwarncnt_t; 
#define XFS_QMOPT_SBVERSION	0x0000040 /* change superblock version num */

#define XFS_QMOPT_GQUOTA	0x0002000 /* group dquot requested */

#define XFS_QMOPT_ENOSPC	0x0004000 /* enospc instead of edquot (prj) */

#define XFS_QMOPT_DQNEXT	0x0008000 /* return next dquot >= this ID */



/*

 * flags to xfs_trans_mod_dquot to indicate which field needs to be

fs/xfs/scrub/quota.c

+1 −2
Original line number Diff line number Diff line
@@ -268,8 +268,7 @@ xfs_scrub_quota( 
		if (xfs_scrub_should_terminate(sc, &error))

			break;



		error = xfs_qm_dqget(mp, NULL, id, dqtype, XFS_QMOPT_DQNEXT,

				&dq);

		error = xfs_qm_dqget_next(mp, id, dqtype, &dq);

		if (error == -ENOENT)

			break;

		if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK,

fs/xfs/xfs_dquot.c

+33 −30
Original line number Diff line number Diff line
@@ -736,18 +736,6 @@ xfs_qm_dqget( 
			goto restart;

		}



		/* uninit / unused quota found in radix tree, keep looking  */

		if (flags & XFS_QMOPT_DQNEXT) {

			if (XFS_IS_DQUOT_UNINITIALIZED(dqp)) {

				xfs_dqunlock(dqp);

				mutex_unlock(&qi->qi_tree_lock);

				error = xfs_dq_get_next_id(mp, type, &id);

				if (error)

					return error;

				goto restart;

			}

		}



		dqp->q_nrefs++;

		mutex_unlock(&qi->qi_tree_lock);
@@ -774,13 +762,6 @@ xfs_qm_dqget( 
	if (ip)

		xfs_ilock(ip, XFS_ILOCK_EXCL);



	/* If we are asked to find next active id, keep looking */

	if (error == -ENOENT && (flags & XFS_QMOPT_DQNEXT)) {

		error = xfs_dq_get_next_id(mp, type, &id);

		if (!error)

			goto restart;

	}



	if (error)

		return error;
@@ -831,17 +812,6 @@ xfs_qm_dqget( 
	qi->qi_dquots++;

	mutex_unlock(&qi->qi_tree_lock);



	/* If we are asked to find next active id, keep looking */

	if (flags & XFS_QMOPT_DQNEXT) {

		if (XFS_IS_DQUOT_UNINITIALIZED(dqp)) {

			xfs_qm_dqput(dqp);

			error = xfs_dq_get_next_id(mp, type, &id);

			if (error)

				return error;

			goto restart;

		}

	}



 dqret:

	ASSERT((ip == NULL) || xfs_isilocked(ip, XFS_ILOCK_EXCL));

	trace_xfs_dqget_miss(dqp);
@@ -849,6 +819,39 @@ xfs_qm_dqget( 
	return 0;

}



/*

 * Starting at @id and progressing upwards, look for an initialized incore

 * dquot, lock it, and return it.

 */

int

xfs_qm_dqget_next(

	struct xfs_mount	*mp,

	xfs_dqid_t		id,

	uint			type,

	struct xfs_dquot	**dqpp)

{

	struct xfs_dquot	*dqp;

	int			error = 0;



	*dqpp = NULL;

	for (; !error; error = xfs_dq_get_next_id(mp, type, &id)) {

		error = xfs_qm_dqget(mp, NULL, id, type, 0, &dqp);

		if (error == -ENOENT)

			continue;

		else if (error != 0)

			break;



		if (!XFS_IS_DQUOT_UNINITIALIZED(dqp)) {

			*dqpp = dqp;

			return 0;

		}



		xfs_qm_dqput(dqp);

	}



	return error;

}



/*

 * Release a reference to the dquot (decrement ref-count) and unlock it.

 *

fs/xfs/xfs_dquot.h

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ extern void xfs_qm_adjust_dqlimits(struct xfs_mount *, 
					       struct xfs_dquot *);

extern int		xfs_qm_dqget(xfs_mount_t *, xfs_inode_t *,

					xfs_dqid_t, uint, uint, xfs_dquot_t **);

extern int		xfs_qm_dqget_next(struct xfs_mount *mp, xfs_dqid_t id,

					uint type, struct xfs_dquot **dqpp);

extern void		xfs_qm_dqput(xfs_dquot_t *);



extern void		xfs_dqlock2(struct xfs_dquot *, struct xfs_dquot *);

fs/xfs/xfs_qm.h

+4 −2
Original line number Diff line number Diff line
@@ -170,8 +170,10 @@ extern void xfs_qm_dqrele_all_inodes(struct xfs_mount *, uint); 


/* quota ops */

extern int		xfs_qm_scall_trunc_qfiles(struct xfs_mount *, uint);

extern int		xfs_qm_scall_getquota(struct xfs_mount *, xfs_dqid_t *,

					uint, struct qc_dqblk *, uint);

extern int		xfs_qm_scall_getquota(struct xfs_mount *, xfs_dqid_t,

					uint, struct qc_dqblk *);

extern int		xfs_qm_scall_getquota_next(struct xfs_mount *,

					xfs_dqid_t *, uint, struct qc_dqblk *);

extern int		xfs_qm_scall_setqlim(struct xfs_mount *, xfs_dqid_t, uint,

					struct qc_dqblk *);

extern int		xfs_qm_scall_quotaon(struct xfs_mount *, uint);