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

Commit 26cc0021 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Niv Sardi
Browse files

[XFS] s/XFS_PURGE_INODE/IRELE/g s/VN_HOLD(XFS_ITOV())/IHOLD()/ 



SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:31405a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 62a877e3

fs/xfs/quota/xfs_qm.c

+5 −5
Original line number Diff line number Diff line
@@ -445,11 +445,11 @@ xfs_qm_unmount_quotas( 
		}

	}

	if (uqp) {

		 XFS_PURGE_INODE(uqp);

		 IRELE(uqp);

		 mp->m_quotainfo->qi_uquotaip = NULL;

	}

	if (gqp) {

		XFS_PURGE_INODE(gqp);

		IRELE(gqp);

		mp->m_quotainfo->qi_gquotaip = NULL;

	}

out:
@@ -1240,11 +1240,11 @@ xfs_qm_destroy_quotainfo( 
	xfs_qm_list_destroy(&qi->qi_dqlist);



	if (qi->qi_uquotaip) {

		XFS_PURGE_INODE(qi->qi_uquotaip);

		IRELE(qi->qi_uquotaip);

		qi->qi_uquotaip = NULL; /* paranoia */

	}

	if (qi->qi_gquotaip) {

		XFS_PURGE_INODE(qi->qi_gquotaip);

		IRELE(qi->qi_gquotaip);

		qi->qi_gquotaip = NULL;

	}

	mutex_destroy(&qi->qi_quotaofflock);
@@ -1394,7 +1394,7 @@ xfs_qm_qino_alloc( 
	 * locked exclusively and joined to the transaction already.

	 */

	ASSERT(xfs_isilocked(*ip, XFS_ILOCK_EXCL));

	VN_HOLD(XFS_ITOV((*ip)));

	IHOLD(*ip);



	/*

	 * Make the changes in the superblock, and log those too.

fs/xfs/quota/xfs_qm_syscalls.c

+2 −2
Original line number Diff line number Diff line
@@ -362,11 +362,11 @@ xfs_qm_scall_quotaoff( 
	 * if we don't need them anymore.

	 */

	if ((dqtype & XFS_QMOPT_UQUOTA) && XFS_QI_UQIP(mp)) {

		XFS_PURGE_INODE(XFS_QI_UQIP(mp));

		IRELE(XFS_QI_UQIP(mp));

		XFS_QI_UQIP(mp) = NULL;

	}

	if ((dqtype & (XFS_QMOPT_GQUOTA|XFS_QMOPT_PQUOTA)) && XFS_QI_GQIP(mp)) {

		XFS_PURGE_INODE(XFS_QI_GQIP(mp));

		IRELE(XFS_QI_GQIP(mp));

		XFS_QI_GQIP(mp) = NULL;

	}

out_error:

fs/xfs/quota/xfs_quota_priv.h

+0 −3
Original line number Diff line number Diff line
@@ -158,9 +158,6 @@ for ((dqp) = (qlist)->qh_next; (dqp) != (xfs_dquot_t *)(qlist); \ 
#define XFS_IS_SUSER_DQUOT(dqp)		\

	(!((dqp)->q_core.d_id))



#define XFS_PURGE_INODE(ip)		\

	IRELE(ip);



#define DQFLAGTO_TYPESTR(d)	(((d)->dq_flags & XFS_DQ_USER) ? "USR" : \

				 (((d)->dq_flags & XFS_DQ_GROUP) ? "GRP" : \

				 (((d)->dq_flags & XFS_DQ_PROJ) ? "PRJ":"???")))