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

Commit f2d67614 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove xfs_iput 



xfs_iput is just a small wrapper for xfs_iunlock + IRELE.  Having this
out of line wrapper means the trace events in those two can't track
their caller properly.  So just remove the wrapper and opencode the
unlock + rele in the few callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent ef35e925

fs/xfs/quota/xfs_qm.c

+4 −2
Original line number Diff line number Diff line
@@ -1662,7 +1662,8 @@ xfs_qm_dqusage_adjust( 
	 * making us disable quotas for the file system.

	 */

	if ((error = xfs_qm_dqget_noattach(ip, &udqp, &gdqp))) {

		xfs_iput(ip, XFS_ILOCK_EXCL);

		xfs_iunlock(ip, XFS_ILOCK_EXCL);

		IRELE(ip);

		*res = BULKSTAT_RV_GIVEUP;

		return error;

	}
@@ -1675,7 +1676,8 @@ xfs_qm_dqusage_adjust( 
		 * Walk thru the extent list and count the realtime blocks.

		 */

		if ((error = xfs_qm_get_rtblks(ip, &rtblks))) {

			xfs_iput(ip, XFS_ILOCK_EXCL);

			xfs_iunlock(ip, XFS_ILOCK_EXCL);

			IRELE(ip);

			if (udqp)

				xfs_qm_dqput(udqp);

			if (gdqp)

fs/xfs/quota/xfs_qm_syscalls.c

+6 −3
Original line number Diff line number Diff line
@@ -865,8 +865,9 @@ xfs_dqrele_inode( 
		xfs_qm_dqrele(ip->i_gdquot);

		ip->i_gdquot = NULL;

	}

	xfs_iput(ip, XFS_ILOCK_EXCL);

	xfs_iunlock(ip, XFS_ILOCK_EXCL);



	IRELE(ip);

	return 0;

}
@@ -1133,7 +1134,8 @@ xfs_qm_internalqcheck_adjust( 
	 * of those now.

	 */

	if (! ipreleased) {

		xfs_iput(ip, lock_flags);

		xfs_iunlock(ip, lock_flags);

		IRELE(ip);

		ipreleased = B_TRUE;

		goto again;

	}
@@ -1150,7 +1152,8 @@ xfs_qm_internalqcheck_adjust( 
		ASSERT(gd);

		xfs_qm_internalqcheck_dqadjust(ip, gd);

	}

	xfs_iput(ip, lock_flags);

	xfs_iunlock(ip, lock_flags);

	IRELE(ip);

	*res = BULKSTAT_RV_DIDONE;

	return (0);

}

fs/xfs/xfs_iget.c

+0 −17
Original line number Diff line number Diff line
@@ -417,23 +417,6 @@ xfs_iget( 
	return error;

}



/*

 * Decrement reference count of an inode structure and unlock it.

 *

 * ip -- the inode being released

 * lock_flags -- this parameter indicates the inode's locks to be

 *       to be released.  See the comment on xfs_iunlock() for a list

 *	 of valid values.

 */

void

xfs_iput(xfs_inode_t	*ip,

	 uint		lock_flags)

{

	xfs_itrace_entry(ip);

	xfs_iunlock(ip, lock_flags);

	IRELE(ip);

}



/*

 * This is called free all the memory associated with an inode.

 * It must free the inode itself and any buffers allocated for

fs/xfs/xfs_inode.h

+0 −1
Original line number Diff line number Diff line
@@ -443,7 +443,6 @@ static inline void xfs_ifunlock(xfs_inode_t *ip) 
 */

int		xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,

			 uint, uint, xfs_inode_t **);

void		xfs_iput(xfs_inode_t *, uint);

void		xfs_ilock(xfs_inode_t *, uint);

int		xfs_ilock_nowait(xfs_inode_t *, uint);

void		xfs_iunlock(xfs_inode_t *, uint);

fs/xfs/xfs_inode_item.c

+4 −2
Original line number Diff line number Diff line
@@ -660,8 +660,10 @@ xfs_inode_item_unlock( 


	lock_flags = iip->ili_lock_flags;

	iip->ili_lock_flags = 0;

	if (lock_flags)

		xfs_iput(iip->ili_inode, lock_flags);

	if (lock_flags) {

		xfs_iunlock(iip->ili_inode, lock_flags);

		IRELE(iip->ili_inode);

	}

}



/*