Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e7ade5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

xfs: kill xfs_qm_idtodq 



This function doesn't help the code flow, so merge the dquot allocation and
transaction handling into xfs_qm_dqread.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 49d35a5c

fs/xfs/xfs_dquot.c

+50 −87
Original line number Diff line number Diff line
@@ -550,36 +550,62 @@ xfs_qm_dqtobp( 
 * Read in the ondisk dquot using dqtobp() then copy it to an incore version,

 * and release the buffer immediately.

 *

 * If XFS_QMOPT_DQALLOC is set, allocate a dquot on disk if it needed.

 */

/* ARGSUSED */

STATIC int

xfs_qm_dqread(

	xfs_trans_t	**tpp,

	struct xfs_mount	*mp,

	xfs_dqid_t		id,

	xfs_dquot_t	*dqp,	/* dquot to get filled in */

	uint		flags)

	uint			type,

	uint			flags,

	struct xfs_dquot	**O_dqpp)

{

	xfs_disk_dquot_t *ddqp;

	xfs_buf_t	 *bp;

	struct xfs_dquot	*dqp;

	struct xfs_disk_dquot	*ddqp;

	struct xfs_buf		*bp;

	struct xfs_trans	*tp = NULL;

	int			error;

	xfs_trans_t	 *tp;

	int			cancelflags = 0;



	ASSERT(tpp);

	dqp = xfs_qm_dqinit(mp, id, type);



	trace_xfs_dqread(dqp);



	if (flags & XFS_QMOPT_DQALLOC) {

		tp = xfs_trans_alloc(mp, XFS_TRANS_QM_DQALLOC);

		error = xfs_trans_reserve(tp, XFS_QM_DQALLOC_SPACE_RES(mp),

				XFS_WRITE_LOG_RES(mp) +

				/*

				 * Round the chunklen up to the next multiple

				 * of 128 (buf log item chunk size)).

				 */

				BBTOB(mp->m_quotainfo->qi_dqchunklen) - 1 + 128,

				0,

				XFS_TRANS_PERM_LOG_RES,

				XFS_WRITE_LOG_COUNT);

		if (error)

			goto error1;

		cancelflags = XFS_TRANS_RELEASE_LOG_RES;

	}



	/*

	 * get a pointer to the on-disk dquot and the buffer containing it

	 * dqp already knows its own type (GROUP/USER).

	 */

	if ((error = xfs_qm_dqtobp(tpp, dqp, &ddqp, &bp, flags))) {

		return (error);

	error = xfs_qm_dqtobp(&tp, dqp, &ddqp, &bp, flags);

	if (error) {

		/*

		 * This can happen if quotas got turned off (ESRCH),

		 * or if the dquot didn't exist on disk and we ask to

		 * allocate (ENOENT).

		 */

		trace_xfs_dqread_fail(dqp);

		cancelflags |= XFS_TRANS_ABORT;

		goto error1;

	}

	tp = *tpp;



	/* copy everything from disk dquot to the incore dquot */

	memcpy(&dqp->q_core, ddqp, sizeof(xfs_disk_dquot_t));

	ASSERT(be32_to_cpu(dqp->q_core.d_id) == id);

	xfs_qm_dquot_logitem_init(dqp);



	/*
@@ -608,77 +634,22 @@ xfs_qm_dqread( 
	ASSERT(xfs_buf_islocked(bp));

	xfs_trans_brelse(tp, bp);



	return (error);

}





/*

 * allocate an incore dquot from the kernel heap,

 * and fill its core with quota information kept on disk.

 * If XFS_QMOPT_DQALLOC is set, it'll allocate a dquot on disk

 * if it wasn't already allocated.

 */

STATIC int

xfs_qm_idtodq(

	xfs_mount_t	*mp,

	xfs_dqid_t	id,	 /* gid or uid, depending on type */

	uint		type,	 /* UDQUOT or GDQUOT */

	uint		flags,	 /* DQALLOC, DQREPAIR */

	xfs_dquot_t	**O_dqpp)/* OUT : incore dquot, not locked */

{

	xfs_dquot_t	*dqp;

	int		error;

	xfs_trans_t	*tp;

	int		cancelflags=0;



	dqp = xfs_qm_dqinit(mp, id, type);

	tp = NULL;

	if (flags & XFS_QMOPT_DQALLOC) {

		tp = xfs_trans_alloc(mp, XFS_TRANS_QM_DQALLOC);

		error = xfs_trans_reserve(tp, XFS_QM_DQALLOC_SPACE_RES(mp),

				XFS_WRITE_LOG_RES(mp) +

				BBTOB(mp->m_quotainfo->qi_dqchunklen) - 1 +

				128,

				0,

				XFS_TRANS_PERM_LOG_RES,

				XFS_WRITE_LOG_COUNT);

		if (error) {

			cancelflags = 0;

			goto error0;

		}

		cancelflags = XFS_TRANS_RELEASE_LOG_RES;

	}



	/*

	 * Read it from disk; xfs_dqread() takes care of

	 * all the necessary initialization of dquot's fields (locks, etc)

	 */

	if ((error = xfs_qm_dqread(&tp, id, dqp, flags))) {

		/*

		 * This can happen if quotas got turned off (ESRCH),

		 * or if the dquot didn't exist on disk and we ask to

		 * allocate (ENOENT).

		 */

		trace_xfs_dqread_fail(dqp);

		cancelflags |= XFS_TRANS_ABORT;

		goto error0;

	}

	if (tp) {

		if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES)))

			goto error1;

		error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES);

		if (error)

			goto error0;

	}



	*O_dqpp = dqp;

	return (0);

	return error;



 error0:

	ASSERT(error);

error1:

	if (tp)

		xfs_trans_cancel(tp, cancelflags);

 error1:

error0:

	xfs_qm_dqdestroy(dqp);

	*O_dqpp = NULL;

	return (error);

	return error;

}



/*
@@ -832,19 +803,11 @@ xfs_qm_dqget( 
	version = h->qh_version;

	mutex_unlock(&h->qh_lock);



	/*

	 * Allocate the dquot on the kernel heap, and read the ondisk

	 * portion off the disk. Also, do all the necessary initialization

	 * This can return ENOENT if dquot didn't exist on disk and we didn't

	 * ask it to allocate; ESRCH if quotas got turned off suddenly.

	 */

	if ((error = xfs_qm_idtodq(mp, id, type,

				  flags & (XFS_QMOPT_DQALLOC|XFS_QMOPT_DQREPAIR|

					   XFS_QMOPT_DOWARN),

				  &dqp))) {

	error = xfs_qm_dqread(mp, id, type, flags, &dqp);

	if (error) {

		if (ip)

			xfs_ilock(ip, XFS_ILOCK_EXCL);

		return (error);

		return error;

	}



	/*