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

Commit 5ec7f8c7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] kill bhv_vnode_t 



All remaining bhv_vnode_t instance are in code that's more or less Linux
specific. (Well, for xfs_acl.c that could be argued, but that code is on
the removal list, too). So just do an s/bhv_vnode_t/struct inode/ over the
whole tree. We can clean up variable naming and some useless helpers
later.

SGI-PV: 981498

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

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent df80c933

fs/xfs/linux-2.6/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -2038,7 +2038,7 @@ xfs_free_trace_bufs(void) 
STATIC int __init

xfs_init_zones(void)

{

	xfs_vnode_zone = kmem_zone_init_flags(sizeof(bhv_vnode_t), "xfs_vnode",

	xfs_vnode_zone = kmem_zone_init_flags(sizeof(struct inode), "xfs_vnode",

					KM_ZONE_HWALIGN | KM_ZONE_RECLAIM |

					KM_ZONE_SPREAD,

					xfs_fs_inode_init_once);

fs/xfs/linux-2.6/xfs_super.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct block_device; 


extern __uint64_t xfs_max_file_offset(unsigned int);



extern void xfs_initialize_vnode(struct xfs_mount *mp, bhv_vnode_t *vp,

extern void xfs_initialize_vnode(struct xfs_mount *mp, struct inode *vp,

		struct xfs_inode *ip);



extern void xfs_flush_inode(struct xfs_inode *);

fs/xfs/linux-2.6/xfs_vnode.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ vn_ioerror( 
 */

static inline int xfs_icount(struct xfs_inode *ip)

{

	bhv_vnode_t *vp = VFS_I(ip);

	struct inode *vp = VFS_I(ip);



	if (vp)

		return vn_count(vp);

fs/xfs/linux-2.6/xfs_vnode.h

+6 −8
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ struct file; 
struct xfs_iomap;

struct attrlist_cursor_kern;



typedef struct inode	bhv_vnode_t;



/*

 * Return values for xfs_inactive.  A return value of

 * VN_INACTIVE_NOCACHE implies that the file system behavior
@@ -64,7 +62,7 @@ extern void vn_iowait(struct xfs_inode *ip); 
extern void	vn_iowake(struct xfs_inode *ip);

extern void	vn_ioerror(struct xfs_inode *ip, int error, char *f, int l);



static inline int vn_count(bhv_vnode_t *vp)

static inline int vn_count(struct inode *vp)

{

	return atomic_read(&vp->i_count);

}
@@ -82,7 +80,7 @@ do { \ 
	iput(VFS_I(ip)); \

} while (0)



static inline bhv_vnode_t *vn_grab(bhv_vnode_t *vp)

static inline struct inode *vn_grab(struct inode *vp)

{

	return igrab(vp);

}
@@ -90,7 +88,7 @@ static inline bhv_vnode_t *vn_grab(bhv_vnode_t *vp) 
/*

 * Dealing with bad inodes

 */

static inline int VN_BAD(bhv_vnode_t *vp)

static inline int VN_BAD(struct inode *vp)

{

	return is_bad_inode(vp);

}
@@ -98,18 +96,18 @@ static inline int VN_BAD(bhv_vnode_t *vp) 
/*

 * Extracting atime values in various formats

 */

static inline void vn_atime_to_bstime(bhv_vnode_t *vp, xfs_bstime_t *bs_atime)

static inline void vn_atime_to_bstime(struct inode *vp, xfs_bstime_t *bs_atime)

{

	bs_atime->tv_sec = vp->i_atime.tv_sec;

	bs_atime->tv_nsec = vp->i_atime.tv_nsec;

}



static inline void vn_atime_to_timespec(bhv_vnode_t *vp, struct timespec *ts)

static inline void vn_atime_to_timespec(struct inode *vp, struct timespec *ts)

{

	*ts = vp->i_atime;

}



static inline void vn_atime_to_time_t(bhv_vnode_t *vp, time_t *tt)

static inline void vn_atime_to_time_t(struct inode *vp, time_t *tt)

{

	*tt = vp->i_atime.tv_sec;

}

fs/xfs/quota/xfs_qm_syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ xfs_qm_dqrele_all_inodes( 
{

	xfs_inode_t	*ip, *topino;

	uint		ireclaims;

	bhv_vnode_t	*vp;

	struct inode	*vp;

	boolean_t	vnode_refd;



	ASSERT(mp->m_quotainfo);