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

Commit 43355099 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] remove most calls to VN_RELE 



Most VN_RELE calls either directly contain a XFS_ITOV or have the
corresponding xfs_inode already in scope. Use the IRELE helper instead of
VN_RELE to clarify the code. With a little more work we can kill VN_RELE
altogether and define IRELE in terms of iput directly.

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30710a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent df26cfe8

fs/xfs/quota/xfs_qm.c

+3 −3
Original line number Diff line number Diff line
@@ -1810,7 +1810,7 @@ xfs_qm_dqusage_adjust( 
	 * Now release the inode. This will send it to 'inactive', and

	 * possibly even free blocks.

	 */

	VN_RELE(XFS_ITOV(ip));

	IRELE(ip);



	/*

	 * Goto next inode.
@@ -1968,7 +1968,7 @@ xfs_qm_init_quotainos( 
			if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,

					     0, 0, &gip, 0))) {

				if (uip)

					VN_RELE(XFS_ITOV(uip));

					IRELE(uip);

				return XFS_ERROR(error);

			}

		}
@@ -1999,7 +1999,7 @@ xfs_qm_init_quotainos( 
					  sbflags | XFS_SB_GQUOTINO, flags);

		if (error) {

			if (uip)

				VN_RELE(XFS_ITOV(uip));

				IRELE(uip);



			return XFS_ERROR(error);

		}

fs/xfs/quota/xfs_qm_syscalls.c

+5 −5
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ xfs_qm_scall_trunc_qfiles( 
		error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, 0, 0, &qip, 0);

		if (! error) {

			(void) xfs_truncate_file(mp, qip);

			VN_RELE(XFS_ITOV(qip));

			IRELE(qip);

		}

	}
@@ -395,7 +395,7 @@ xfs_qm_scall_trunc_qfiles( 
		error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, 0, 0, &qip, 0);

		if (! error) {

			(void) xfs_truncate_file(mp, qip);

			VN_RELE(XFS_ITOV(qip));

			IRELE(qip);

		}

	}
@@ -552,13 +552,13 @@ xfs_qm_scall_getqstat( 
		out->qs_uquota.qfs_nblks = uip->i_d.di_nblocks;

		out->qs_uquota.qfs_nextents = uip->i_d.di_nextents;

		if (tempuqip)

			VN_RELE(XFS_ITOV(uip));

			IRELE(uip);

	}

	if (gip) {

		out->qs_gquota.qfs_nblks = gip->i_d.di_nblocks;

		out->qs_gquota.qfs_nextents = gip->i_d.di_nextents;

		if (tempgqip)

			VN_RELE(XFS_ITOV(gip));

			IRELE(gip);

	}

	if (mp->m_quotainfo) {

		out->qs_incoredqs = XFS_QI_MPLNDQUOTS(mp);
@@ -1095,7 +1095,7 @@ xfs_qm_dqrele_all_inodes( 
		 * inactive code in hell.

		 */

		if (vnode_refd)

			VN_RELE(vp);

			IRELE(ip);

		XFS_MOUNT_ILOCK(mp);

		/*

		 * If an inode was inserted or removed, we gotta

fs/xfs/xfs_log_recover.c

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "xfs_trans_priv.h"

#include "xfs_quota.h"

#include "xfs_rw.h"

#include "xfs_utils.h"



STATIC int	xlog_find_zeroed(xlog_t *, xfs_daddr_t *);

STATIC int	xlog_clear_stale_blocks(xlog_t *, xfs_lsn_t);
@@ -3248,7 +3249,7 @@ xlog_recover_process_iunlinks( 
					if (ip->i_d.di_mode == 0)

						xfs_iput_new(ip, 0);

					else

						VN_RELE(XFS_ITOV(ip));

						IRELE(ip);

				} else {

					/*

					 * We can't read in the inode

fs/xfs/xfs_mount.c

+2 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "xfs_rw.h"

#include "xfs_quota.h"

#include "xfs_fsops.h"

#include "xfs_utils.h"



STATIC void	xfs_mount_log_sb(xfs_mount_t *, __int64_t);

STATIC int	xfs_uuid_mount(xfs_mount_t *);
@@ -956,7 +957,6 @@ xfs_mountfs( 
{

	xfs_sb_t	*sbp = &(mp->m_sb);

	xfs_inode_t	*rip;

	bhv_vnode_t	*rvp = NULL;

	__uint64_t	resblks;

	__int64_t	update_flags = 0LL;

	uint		quotamount, quotaflags;
@@ -1158,7 +1158,6 @@ xfs_mountfs( 
	}



	ASSERT(rip != NULL);

	rvp = XFS_ITOV(rip);



	if (unlikely((rip->i_d.di_mode & S_IFMT) != S_IFDIR)) {

		cmn_err(CE_WARN, "XFS: corrupted root inode");
@@ -1241,7 +1240,7 @@ xfs_mountfs( 
	/*

	 * Free up the root inode.

	 */

	VN_RELE(rvp);

	IRELE(rip);

 error3:

	xfs_log_unmount_dealloc(mp);

 error2:

fs/xfs/xfs_rtalloc.c

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "xfs_rw.h"

#include "xfs_inode_item.h"

#include "xfs_trans_space.h"

#include "xfs_utils.h"





/*
@@ -2278,7 +2279,7 @@ xfs_rtmount_inodes( 
	ASSERT(sbp->sb_rsumino != NULLFSINO);

	error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip, 0);

	if (error) {

		VN_RELE(XFS_ITOV(mp->m_rbmip));

		IRELE(mp->m_rbmip);

		return error;

	}

	ASSERT(mp->m_rsumip != NULL);