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

Commit e2494582 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: remove XFS_QM_LOCK/XFS_QM_UNLOCK/XFS_QM_HOLD/XFS_QM_RELE 



Remove these macros which only obsfucated the code in rather nast ways.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
parent 517b5e8c

fs/xfs/quota/xfs_qm.c

+6 −7
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ xfs_qm_hold_quotafs_ref( 
	 * the structure could disappear between the entry to this routine and

	 * a HOLD operation if not locked.

	 */

	XFS_QM_LOCK(xfs_Gqm);

	mutex_lock(&xfs_Gqm_lock);



	if (xfs_Gqm == NULL)

		xfs_Gqm = xfs_Gqm_init();
@@ -228,8 +228,8 @@ xfs_qm_hold_quotafs_ref( 
	 * debugging and statistical purposes, but ...

	 * Just take a reference and get out.

	 */

	XFS_QM_HOLD(xfs_Gqm);

	XFS_QM_UNLOCK(xfs_Gqm);

	xfs_Gqm->qm_nrefs++;

	mutex_unlock(&xfs_Gqm_lock);



	return 0;

}
@@ -277,13 +277,12 @@ xfs_qm_rele_quotafs_ref( 
	 * Destroy the entire XQM. If somebody mounts with quotaon, this'll

	 * be restarted.

	 */

	XFS_QM_LOCK(xfs_Gqm);

	XFS_QM_RELE(xfs_Gqm);

	if (xfs_Gqm->qm_nrefs == 0) {

	mutex_lock(&xfs_Gqm_lock);

	if (--xfs_Gqm->qm_nrefs == 0) {

		xfs_qm_destroy(xfs_Gqm);

		xfs_Gqm = NULL;

	}

	XFS_QM_UNLOCK(xfs_Gqm);

	mutex_unlock(&xfs_Gqm_lock);

}



/*

fs/xfs/quota/xfs_qm.h

+0 −5
Original line number Diff line number Diff line
@@ -158,11 +158,6 @@ typedef struct xfs_dquot_acct { 
#define XFS_QM_IWARNLIMIT	5

#define XFS_QM_RTBWARNLIMIT	5



#define XFS_QM_LOCK(xqm)	(mutex_lock(&xqm##_lock))

#define XFS_QM_UNLOCK(xqm)	(mutex_unlock(&xqm##_lock))

#define XFS_QM_HOLD(xqm)	((xqm)->qm_nrefs++)

#define XFS_QM_RELE(xqm)	((xqm)->qm_nrefs--)



extern void		xfs_qm_destroy_quotainfo(xfs_mount_t *);

extern void		xfs_qm_mount_quotas(xfs_mount_t *);

extern int		xfs_qm_quotacheck(xfs_mount_t *);