GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-07 23:11:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[XFS] kill shouty XFS_ITOV_NULL macro

Browse source 
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:
David Chinner 2008-08-13 15:47:43 +10:00 • committed by Lachlan McIlroy
parent 0165164625
commit 705db4a24e
6 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/linux-2.6/xfs_vnode.c
View file

@ -108,7 +108,7 @@ vn_hold(
*/ */
static inline int xfs_icount(struct xfs_inode *ip) 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) if (vp)
return vn_count(vp); return vn_count(vp);

2
fs/xfs/quota/xfs_qm_syscalls.c
View file

@ -1059,7 +1059,7 @@ again:
ip = ip->i_mnext; ip = ip->i_mnext;
continue; continue;
} }
vp = XFS_ITOV_NULL(ip); vp = VFS_I(ip);
if (!vp) { if (!vp) {
ASSERT(ip->i_udquot == NULL); ASSERT(ip->i_udquot == NULL);
ASSERT(ip->i_gdquot == NULL); ASSERT(ip->i_gdquot == NULL);

4
fs/xfs/xfs_inode.c
View file

@ -1077,7 +1077,7 @@ xfs_ialloc(
} }
ASSERT(ip != NULL); ASSERT(ip != NULL);
vp = XFS_ITOV(ip); vp = VFS_I(ip);
ip->i_d.di_mode = (__uint16_t)mode; ip->i_d.di_mode = (__uint16_t)mode;
ip->i_d.di_onlink = 0; ip->i_d.di_onlink = 0;
ip->i_d.di_nlink = nlink; ip->i_d.di_nlink = nlink;
@ -3480,7 +3480,7 @@ xfs_iflush_all(
continue; continue;
} }
vp = XFS_ITOV_NULL(ip); vp = VFS_I(ip);
if (!vp) { if (!vp) {
XFS_MOUNT_IUNLOCK(mp); XFS_MOUNT_IUNLOCK(mp);
xfs_finish_reclaim(ip, 0, XFS_IFLUSH_ASYNC); xfs_finish_reclaim(ip, 0, XFS_IFLUSH_ASYNC);

1
fs/xfs/xfs_inode.h
View file

@ -280,7 +280,6 @@ static inline struct inode *VFS_I(struct xfs_inode *ip)
return (struct inode *)ip->i_vnode; return (struct inode *)ip->i_vnode;
} }
#define XFS_ITOV(ip) VFS_I(ip) #define XFS_ITOV(ip) VFS_I(ip)
#define XFS_ITOV_NULL(ip) VFS_I(ip)
/* /*
* i_flags helper functions * i_flags helper functions

2
fs/xfs/xfs_vfsops.c
View file

@ -404,7 +404,7 @@ xfs_sync_inodes(
continue; continue;
} }
vp = XFS_ITOV_NULL(ip); vp = VFS_I(ip);
/* /*
* If the vnode is gone then this is being torn down, * If the vnode is gone then this is being torn down,

2
fs/xfs/xfs_vnodeops.c
View file

@ -2933,7 +2933,7 @@ xfs_finish_reclaim(
int sync_mode) int sync_mode)
{ {
xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino); 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)) if (vp && VN_BAD(vp))
goto reclaim; goto reclaim;