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

Commit e4f75291 authored by David Chinner's avatar David Chinner Committed by Lachlan McIlroy
Browse files

[XFS] Kill shouty XFS_ITOV() macro 



Replace XFS_ITOV() with the new VFS_I() inline.

SGI-PV: 981498

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

Signed-off-by: default avatarDavid Chinner <david@fromorbit.com>
Signed-off-by: default avatarNiv Sardi <xaiki@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 705db4a2

fs/xfs/linux-2.6/xfs_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ xfs_vget_fsop_handlereq( 


	xfs_iunlock(ip, XFS_ILOCK_SHARED);



	*inode = XFS_ITOV(ip);

	*inode = VFS_I(ip);

	return 0;

}
@@ -927,7 +927,7 @@ STATIC void 
xfs_diflags_to_linux(

	struct xfs_inode	*ip)

{

	struct inode		*inode = XFS_ITOV(ip);

	struct inode		*inode = VFS_I(ip);

	unsigned int		xflags = xfs_ip2xflags(ip);



	if (xflags & XFS_XFLAG_IMMUTABLE)

fs/xfs/linux-2.6/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ xfs_ichgtime( 
	xfs_inode_t	*ip,

	int		flags)

{

	struct inode	*inode = vn_to_inode(XFS_ITOV(ip));

	struct inode	*inode = VFS_I(ip);

	timespec_t	tv;



	nanotime(&tv);

fs/xfs/linux-2.6/xfs_linux.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ 
#define xfs_sort(a,n,s,fn)	sort(a,n,s,fn,NULL)

#define xfs_stack_trace()	dump_stack()

#define xfs_itruncate_data(ip, off)	\

	(-vmtruncate(vn_to_inode(XFS_ITOV(ip)), (off)))

	(-vmtruncate(vn_to_inode(VFS_I(ip)), (off)))





/* Move the kernel do_div definition off to one side */

fs/xfs/linux-2.6/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ void 
xfs_flush_device(

	xfs_inode_t	*ip)

{

	struct inode	*inode = vn_to_inode(XFS_ITOV(ip));

	struct inode	*inode = VFS_I(ip);



	igrab(inode);

	xfs_syncd_queue_work(ip->i_mount, inode, xfs_flush_device_work);

fs/xfs/quota/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ xfs_qm_dqalloc( 
	 * when it unlocks the inode. Since we want to keep the quota

	 * inode around, we bump the vnode ref count now.

	 */

	VN_HOLD(XFS_ITOV(quotip));

	VN_HOLD(VFS_I(quotip));



	xfs_trans_ijoin(tp, quotip, XFS_ILOCK_EXCL);

	nmaps = 1;