mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-16 09:56:46 +00:00
[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: David Chinner <david@fromorbit.com> Signed-off-by: Niv Sardi <xaiki@sgi.com> Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
parent
0165164625
commit
705db4a24e
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -2933,7 +2933,7 @@ xfs_finish_reclaim(
|
||||
int sync_mode)
|
||||
{
|
||||
xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino);
|
||||
bhv_vnode_t *vp = XFS_ITOV_NULL(ip);
|
||||
bhv_vnode_t *vp = VFS_I(ip);
|
||||
|
||||
if (vp && VN_BAD(vp))
|
||||
goto reclaim;
|
||||
|
Loading…
x
Reference in New Issue
Block a user