Commit 0a74cd19 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files

[XFS] kill struct bhv_vnode 



Now that struct bhv_vnode is empty we can just kill it. Retain bhv_vnode_t
as a typedef for struct inode for the time being until all the fallout is
cleaned up.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29500a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 2aeaa258

fs/xfs/linux-2.6/xfs_iops.c

+3 −4
Original line number Diff line number Diff line
@@ -65,9 +65,8 @@ xfs_synchronize_atime( 


	vp = XFS_ITOV_NULL(ip);

	if (vp) {

		struct inode *inode = &vp->v_inode;

		ip->i_d.di_atime.t_sec = (__int32_t)inode->i_atime.tv_sec;

		ip->i_d.di_atime.t_nsec = (__int32_t)inode->i_atime.tv_nsec;

		ip->i_d.di_atime.t_sec = (__int32_t)vp->i_atime.tv_sec;

		ip->i_d.di_atime.t_nsec = (__int32_t)vp->i_atime.tv_nsec;

	}

}
@@ -327,7 +326,7 @@ xfs_vn_mknod( 
		if (!error) {

			error = _ACL_INHERIT(vp, &vattr, default_acl);

			if (!error)

				xfs_iflags_set(XFS_I(&vp->v_inode), XFS_IMODIFIED);

				xfs_iflags_set(XFS_I(vp), XFS_IMODIFIED);

			else

				xfs_cleanup_inode(dir, vp, dentry, mode);

		}

fs/xfs/linux-2.6/xfs_lrw.h

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#define __XFS_LRW_H__



struct bhv_desc;

struct bhv_vnode;

struct xfs_mount;

struct xfs_iocore;

struct xfs_inode;
@@ -75,7 +74,7 @@ extern int xfsbdstrat(struct xfs_mount *, struct xfs_buf *); 
extern int xfs_bdstrat_cb(struct xfs_buf *);

extern int xfs_dev_is_read_only(struct xfs_mount *, char *);



extern int xfs_zero_eof(struct bhv_vnode *, struct xfs_iocore *, xfs_off_t,

extern int xfs_zero_eof(struct inode *, struct xfs_iocore *, xfs_off_t,

				xfs_fsize_t);



#endif	/* __XFS_LRW_H__ */

fs/xfs/linux-2.6/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ xfs_fs_fill_super( 
	void			*data,

	int			silent)

{

	struct bhv_vnode	*rootvp;

	struct inode		*rootvp;

	struct bhv_vfs		*vfsp = vfs_allocate(sb);

	struct xfs_mount_args	*args = xfs_args_allocate(sb, silent);

	struct kstatfs		statvfs;

fs/xfs/linux-2.6/xfs_vfs.c

+4 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ vfs_mntupdate( 
int

vfs_root(

	struct bhv_desc		*bdp,

	struct bhv_vnode	**vpp)

	bhv_vnode_t		**vpp)

{

	struct bhv_desc		*next = bdp;
@@ -117,7 +117,7 @@ int 
vfs_statvfs(

	struct bhv_desc		*bdp,

	bhv_statvfs_t		*statp,

	struct bhv_vnode	*vp)

	bhv_vnode_t		*vp)

{

	struct bhv_desc		*next = bdp;
@@ -144,7 +144,7 @@ vfs_sync( 
int

vfs_vget(

	struct bhv_desc		*bdp,

	struct bhv_vnode	**vpp,

	bhv_vnode_t		**vpp,

	struct fid		*fidp)

{

	struct bhv_desc		*next = bdp;
@@ -186,7 +186,7 @@ vfs_quotactl( 
void

vfs_init_vnode(

	struct bhv_desc		*bdp,

	struct bhv_vnode	*vp,

	bhv_vnode_t		*vp,

	struct xfs_inode	*ip,

	int			unlock)

{

fs/xfs/linux-2.6/xfs_vfs.h

+9 −9
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "xfs_fs.h"



struct bhv_vfs;

struct bhv_vnode;

struct inode;



struct fid;

struct cred;
@@ -124,15 +124,15 @@ typedef int (*vfs_showargs_t)(bhv_desc_t *, struct seq_file *); 
typedef int	(*vfs_unmount_t)(bhv_desc_t *, int, struct cred *);

typedef int	(*vfs_mntupdate_t)(bhv_desc_t *, int *,

				struct xfs_mount_args *);

typedef int	(*vfs_root_t)(bhv_desc_t *, struct bhv_vnode **);

typedef int	(*vfs_root_t)(bhv_desc_t *, struct inode **);

typedef int	(*vfs_statvfs_t)(bhv_desc_t *, bhv_statvfs_t *,

				struct bhv_vnode *);

				struct inode *);

typedef int	(*vfs_sync_t)(bhv_desc_t *, int, struct cred *);

typedef int	(*vfs_vget_t)(bhv_desc_t *, struct bhv_vnode **, struct fid *);

typedef int	(*vfs_vget_t)(bhv_desc_t *, struct inode **, struct fid *);

typedef int	(*vfs_dmapiops_t)(bhv_desc_t *, caddr_t);

typedef int	(*vfs_quotactl_t)(bhv_desc_t *, int, int, caddr_t);

typedef void	(*vfs_init_vnode_t)(bhv_desc_t *,

				struct bhv_vnode *, struct xfs_inode *, int);

				struct inode *, struct xfs_inode *, int);

typedef void	(*vfs_force_shutdown_t)(bhv_desc_t *, int, char *, int);

typedef void	(*vfs_freeze_t)(bhv_desc_t *);
@@ -196,13 +196,13 @@ extern int vfs_parseargs(bhv_desc_t *, char *, struct xfs_mount_args *, int); 
extern int vfs_showargs(bhv_desc_t *, struct seq_file *);

extern int vfs_unmount(bhv_desc_t *, int, struct cred *);

extern int vfs_mntupdate(bhv_desc_t *, int *, struct xfs_mount_args *);

extern int vfs_root(bhv_desc_t *, struct bhv_vnode **);

extern int vfs_statvfs(bhv_desc_t *, bhv_statvfs_t *, struct bhv_vnode *);

extern int vfs_root(bhv_desc_t *, struct inode **);

extern int vfs_statvfs(bhv_desc_t *, bhv_statvfs_t *, struct inode *);

extern int vfs_sync(bhv_desc_t *, int, struct cred *);

extern int vfs_vget(bhv_desc_t *, struct bhv_vnode **, struct fid *);

extern int vfs_vget(bhv_desc_t *, struct inode **, struct fid *);

extern int vfs_dmapiops(bhv_desc_t *, caddr_t);

extern int vfs_quotactl(bhv_desc_t *, int, int, caddr_t);

extern void vfs_init_vnode(bhv_desc_t *, struct bhv_vnode *, struct xfs_inode *, int);

extern void vfs_init_vnode(bhv_desc_t *, struct inode *, struct xfs_inode *, int);

extern void vfs_force_shutdown(bhv_desc_t *, int, char *, int);

extern void vfs_freeze(bhv_desc_t *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE