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

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

[XFS] kill shouty XFS_ITOV_NULL macro 



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

SGI-PV: 981498

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

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 01651646

fs/xfs/linux-2.6/xfs_vnode.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ vn_hold( 
 */

static inline int xfs_icount(struct xfs_inode *ip)

{

	bhv_vnode_t *vp = XFS_ITOV_NULL(ip);

	bhv_vnode_t *vp = VFS_I(ip);



	if (vp)

		return vn_count(vp);

fs/xfs/quota/xfs_qm_syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ again: 
			ip = ip->i_mnext;

			continue;

		}

		vp = XFS_ITOV_NULL(ip);

		vp = VFS_I(ip);

		if (!vp) {

			ASSERT(ip->i_udquot == NULL);

			ASSERT(ip->i_gdquot == NULL);

fs/xfs/xfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ xfs_ialloc( 
	}

	ASSERT(ip != NULL);



	vp = XFS_ITOV(ip);

	vp = VFS_I(ip);

	ip->i_d.di_mode = (__uint16_t)mode;

	ip->i_d.di_onlink = 0;

	ip->i_d.di_nlink = nlink;
@@ -3480,7 +3480,7 @@ xfs_iflush_all( 
			continue;

		}



		vp = XFS_ITOV_NULL(ip);

		vp = VFS_I(ip);

		if (!vp) {

			XFS_MOUNT_IUNLOCK(mp);

			xfs_finish_reclaim(ip, 0, XFS_IFLUSH_ASYNC);

fs/xfs/xfs_inode.h

+0 −1
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ static inline struct inode *VFS_I(struct xfs_inode *ip) 
	return (struct inode *)ip->i_vnode;

}

#define	XFS_ITOV(ip)		VFS_I(ip)

#define	XFS_ITOV_NULL(ip)	VFS_I(ip)



/*

 * i_flags helper functions

fs/xfs/xfs_vfsops.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ xfs_sync_inodes( 
			continue;

		}



		vp = XFS_ITOV_NULL(ip);

		vp = VFS_I(ip);



		/*

		 * If the vnode is gone then this is being torn down,