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

Commit 8285fb58 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Resolve a namespace collision on remaining vtypes for FreeBSD 


porters.

SGI-PV: 953338
SGI-Modid: xfs-linux-melb:xfs-kern:26108a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 67fcaa73

fs/xfs/linux-2.6/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ xfs_ioc_xattr( 
	void			__user *arg)

{

	struct fsxattr		fa;

	struct vattr		*vattr;

	struct bhv_vattr	*vattr;

	int			error = 0;

	int			attr_flags;

	unsigned int		flags;

fs/xfs/linux-2.6/xfs_iops.c

+8 −8
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ xfs_ichgtime_fast( 
STATIC void

xfs_validate_fields(

	struct inode	*ip,

	struct vattr	*vattr)

	bhv_vattr_t	*vattr)

{

	vattr->va_mask = XFS_AT_NLINK|XFS_AT_SIZE|XFS_AT_NBLOCKS;

	if (!bhv_vop_getattr(vn_from_inode(ip), vattr, ATTR_LAZY, NULL)) {
@@ -290,7 +290,7 @@ xfs_vn_mknod( 
	dev_t		rdev)

{

	struct inode	*ip;

	vattr_t		vattr = { 0 };

	bhv_vattr_t	vattr = { 0 };

	bhv_vnode_t	*vp = NULL, *dvp = vn_from_inode(dir);

	xfs_acl_t	*default_acl = NULL;

	attrexists_t	test_default_acl = _ACL_DEFAULT_EXISTS;
@@ -417,7 +417,7 @@ xfs_vn_link( 
	struct inode	*ip;	/* inode of guy being linked to */

	bhv_vnode_t	*tdvp;	/* target directory for new name/link */

	bhv_vnode_t	*vp;	/* vp of name being linked */

	vattr_t		vattr;

	bhv_vattr_t	vattr;

	int		error;



	ip = old_dentry->d_inode;	/* inode being linked to */
@@ -444,7 +444,7 @@ xfs_vn_unlink( 
{

	struct inode	*inode;

	bhv_vnode_t	*dvp;	/* directory containing name to remove */

	vattr_t		vattr;

	bhv_vattr_t	vattr;

	int		error;



	inode = dentry->d_inode;
@@ -465,7 +465,7 @@ xfs_vn_symlink( 
	const char	*symname)

{

	struct inode	*ip;

	vattr_t		va = { 0 };

	bhv_vattr_t	va = { 0 };

	bhv_vnode_t	*dvp;	/* directory containing name of symlink */

	bhv_vnode_t	*cvp;	/* used to lookup symlink to put in dentry */

	int		error;
@@ -499,7 +499,7 @@ xfs_vn_rmdir( 
{

	struct inode	*inode = dentry->d_inode;

	bhv_vnode_t	*dvp = vn_from_inode(dir);

	vattr_t		vattr;

	bhv_vattr_t	vattr;

	int		error;



	error = bhv_vop_rmdir(dvp, dentry, NULL);
@@ -520,7 +520,7 @@ xfs_vn_rename( 
	struct inode	*new_inode = ndentry->d_inode;

	bhv_vnode_t	*fvp;	/* from directory */

	bhv_vnode_t	*tvp;	/* target directory */

	vattr_t		vattr;

	bhv_vattr_t	vattr;

	int		error;



	fvp = vn_from_inode(odir);
@@ -643,7 +643,7 @@ xfs_vn_setattr( 
	struct inode	*inode = dentry->d_inode;

	unsigned int	ia_valid = attr->ia_valid;

	bhv_vnode_t	*vp = vn_from_inode(inode);

	vattr_t		vattr = { 0 };

	bhv_vattr_t	vattr = { 0 };

	int		flags = 0;

	int		error;

fs/xfs/linux-2.6/xfs_lrw.c

+5 −5
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ xfs_read( 


	if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ) &&

	    !(ioflags & IO_INVIS)) {

		vrwlock_t locktype = VRWLOCK_READ;

		bhv_vrwlock_t locktype = VRWLOCK_READ;

		int dmflags = FILP_DELAY_FLAG(file) | DM_SEM_FLAG_RD(ioflags);



		ret = -XFS_SEND_DATA(mp, DM_EVENT_READ,
@@ -313,7 +313,7 @@ xfs_sendfile( 


	if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) &&

	    (!(ioflags & IO_INVIS))) {

		vrwlock_t locktype = VRWLOCK_READ;

		bhv_vrwlock_t locktype = VRWLOCK_READ;

		int error;



		error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp),
@@ -357,7 +357,7 @@ xfs_splice_read( 


	if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) &&

	    (!(ioflags & IO_INVIS))) {

		vrwlock_t locktype = VRWLOCK_READ;

		bhv_vrwlock_t locktype = VRWLOCK_READ;

		int error;



		error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp),
@@ -401,7 +401,7 @@ xfs_splice_write( 


	if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_WRITE) &&

	    (!(ioflags & IO_INVIS))) {

		vrwlock_t locktype = VRWLOCK_WRITE;

		bhv_vrwlock_t locktype = VRWLOCK_WRITE;

		int error;



		error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, BHV_TO_VNODE(bdp),
@@ -630,7 +630,7 @@ xfs_write( 
	unsigned long		seg;

	int			iolock;

	int			eventsent = 0;

	vrwlock_t		locktype;

	bhv_vrwlock_t		locktype;

	size_t			ocount = 0, count;

	loff_t			pos;

	int			need_i_mutex = 1, need_flush = 0;

fs/xfs/linux-2.6/xfs_vfs.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ vfs_root( 
int

vfs_statvfs(

	struct bhv_desc		*bdp,

	xfs_statfs_t		*sp,

	bhv_statvfs_t		*statp,

	struct bhv_vnode	*vp)

{

	struct bhv_desc		*next = bdp;
@@ -125,7 +125,7 @@ vfs_statvfs( 
	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_statvfs)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_statvfs)(next, sp, vp));

	return ((*bhvtovfsops(next)->vfs_statvfs)(next, statp, vp));

}



int

fs/xfs/linux-2.6/xfs_vfs.h

+4 −4
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 


struct bhv_vfs;

struct bhv_vnode;



struct fid;

struct cred;

struct statfs;

struct seq_file;

struct super_block;

struct xfs_mount_args;



typedef struct kstatfs xfs_statfs_t;

typedef struct kstatfs	bhv_statvfs_t;



typedef struct bhv_vfs_sync_work {

	struct list_head	w_list;
@@ -109,7 +109,7 @@ 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_statvfs_t)(bhv_desc_t *, xfs_statfs_t *,

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

				struct bhv_vnode *);

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

typedef int	(*vfs_vget_t)(bhv_desc_t *, struct bhv_vnode **, struct fid *);
@@ -181,7 +181,7 @@ 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 *, xfs_statfs_t *, struct bhv_vnode *);

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

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_dmapiops(bhv_desc_t *, caddr_t);