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

Commit ec86dc02 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Complete transition away from linvfs naming convention, finally. 



SGI-PV: 947038
SGI-Modid: xfs-linux-melb:xfs-kern:25474a

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

fs/xfs/linux-2.6/xfs_aops.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ xfs_page_trace( 
	int		mask)

	int		mask)

{

{

	xfs_inode_t	*ip;

	xfs_inode_t	*ip;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	loff_t		isize = i_size_read(inode);

	loff_t		isize = i_size_read(inode);

	loff_t		offset = page_offset(page);

	loff_t		offset = page_offset(page);

	int		delalloc = -1, unmapped = -1, unwritten = -1;

	int		delalloc = -1, unmapped = -1, unwritten = -1;
@@ -214,7 +214,7 @@ xfs_alloc_ioend( 
	ioend->io_uptodate = 1; /* cleared if any I/O fails */

	ioend->io_uptodate = 1; /* cleared if any I/O fails */

	ioend->io_list = NULL;

	ioend->io_list = NULL;

	ioend->io_type = type;

	ioend->io_type = type;

	ioend->io_vnode = LINVFS_GET_VP(inode);

	ioend->io_vnode = vn_from_inode(inode);

	ioend->io_buffer_head = NULL;

	ioend->io_buffer_head = NULL;

	ioend->io_buffer_tail = NULL;

	ioend->io_buffer_tail = NULL;

	atomic_inc(&ioend->io_vnode->v_iocount);

	atomic_inc(&ioend->io_vnode->v_iocount);
@@ -239,7 +239,7 @@ xfs_map_blocks( 
	xfs_iomap_t		*mapp,

	xfs_iomap_t		*mapp,

	int			flags)

	int			flags)

{

{

	vnode_t			*vp = LINVFS_GET_VP(inode);

	vnode_t			*vp = vn_from_inode(inode);

	int			error, nmaps = 1;

	int			error, nmaps = 1;





	VOP_BMAP(vp, offset, count, flags, mapp, &nmaps, error);

	VOP_BMAP(vp, offset, count, flags, mapp, &nmaps, error);
@@ -1229,7 +1229,7 @@ __xfs_get_block( 
	int			direct,

	int			direct,

	bmapi_flags_t		flags)

	bmapi_flags_t		flags)

{

{

	vnode_t			*vp = LINVFS_GET_VP(inode);

	vnode_t			*vp = vn_from_inode(inode);

	xfs_iomap_t		iomap;

	xfs_iomap_t		iomap;

	xfs_off_t		offset;

	xfs_off_t		offset;

	ssize_t			size;

	ssize_t			size;
@@ -1371,7 +1371,7 @@ xfs_vm_direct_IO( 
{

{

	struct file	*file = iocb->ki_filp;

	struct file	*file = iocb->ki_filp;

	struct inode	*inode = file->f_mapping->host;

	struct inode	*inode = file->f_mapping->host;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	xfs_iomap_t	iomap;

	xfs_iomap_t	iomap;

	int		maps = 1;

	int		maps = 1;

	int		error;

	int		error;
@@ -1410,7 +1410,7 @@ xfs_vm_bmap( 
	sector_t		block)

	sector_t		block)

{

{

	struct inode		*inode = (struct inode *)mapping->host;

	struct inode		*inode = (struct inode *)mapping->host;

	vnode_t			*vp = LINVFS_GET_VP(inode);

	vnode_t			*vp = vn_from_inode(inode);

	int			error;

	int			error;





	vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);

	vn_trace_entry(vp, __FUNCTION__, (inst_t *)__return_address);

fs/xfs/linux-2.6/xfs_export.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ xfs_fs_encode_fh( 
	int			len;

	int			len;

	int			is64 = 0;

	int			is64 = 0;

#if XFS_BIG_INUMS

#if XFS_BIG_INUMS

	vfs_t			*vfs = LINVFS_GET_VFS(inode->i_sb);

	vfs_t			*vfs = vfs_from_sb(inode->i_sb);





	if (!(vfs->vfs_flag & VFS_32BITINODES)) {

	if (!(vfs->vfs_flag & VFS_32BITINODES)) {

		/* filesystem may contain 64bit inode numbers */

		/* filesystem may contain 64bit inode numbers */
@@ -139,14 +139,14 @@ xfs_fs_get_dentry( 
	vnode_t			*vp;

	vnode_t			*vp;

	struct inode		*inode;

	struct inode		*inode;

	struct dentry		*result;

	struct dentry		*result;

	vfs_t			*vfsp = LINVFS_GET_VFS(sb);

	vfs_t			*vfsp = vfs_from_sb(sb);

	int			error;

	int			error;





	VFS_VGET(vfsp, &vp, (fid_t *)data, error);

	VFS_VGET(vfsp, &vp, (fid_t *)data, error);

	if (error || vp == NULL)

	if (error || vp == NULL)

		return ERR_PTR(-ESTALE) ;

		return ERR_PTR(-ESTALE) ;





	inode = LINVFS_GET_IP(vp);

	inode = vn_to_inode(vp);

	result = d_alloc_anon(inode);

	result = d_alloc_anon(inode);

        if (!result) {

        if (!result) {

		iput(inode);

		iput(inode);
@@ -164,12 +164,12 @@ xfs_fs_get_parent( 
	struct dentry		*parent;

	struct dentry		*parent;





	cvp = NULL;

	cvp = NULL;

	vp = LINVFS_GET_VP(child->d_inode);

	vp = vn_from_inode(child->d_inode);

	VOP_LOOKUP(vp, &dotdot, &cvp, 0, NULL, NULL, error);

	VOP_LOOKUP(vp, &dotdot, &cvp, 0, NULL, NULL, error);

	if (unlikely(error))

	if (unlikely(error))

		return ERR_PTR(-error);

		return ERR_PTR(-error);





	parent = d_alloc_anon(LINVFS_GET_IP(cvp));

	parent = d_alloc_anon(vn_to_inode(cvp));

	if (unlikely(!parent)) {

	if (unlikely(!parent)) {

		VN_RELE(cvp);

		VN_RELE(cvp);

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);

fs/xfs/linux-2.6/xfs_file.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ __xfs_file_read( 
{

{

	struct iovec		iov = {buf, count};

	struct iovec		iov = {buf, count};

	struct file		*file = iocb->ki_filp;

	struct file		*file = iocb->ki_filp;

	vnode_t			*vp = LINVFS_GET_VP(file->f_dentry->d_inode);

	vnode_t			*vp = vn_from_inode(file->f_dentry->d_inode);

	ssize_t			rval;

	ssize_t			rval;





	BUG_ON(iocb->ki_pos != pos);

	BUG_ON(iocb->ki_pos != pos);
@@ -102,7 +102,7 @@ __xfs_file_write( 
	struct iovec	iov = {(void __user *)buf, count};

	struct iovec	iov = {(void __user *)buf, count};

	struct file	*file = iocb->ki_filp;

	struct file	*file = iocb->ki_filp;

	struct inode	*inode = file->f_mapping->host;

	struct inode	*inode = file->f_mapping->host;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	ssize_t		rval;

	ssize_t		rval;





	BUG_ON(iocb->ki_pos != pos);

	BUG_ON(iocb->ki_pos != pos);
@@ -144,7 +144,7 @@ __xfs_file_readv( 
	loff_t			*ppos)

	loff_t			*ppos)

{

{

	struct inode	*inode = file->f_mapping->host;

	struct inode	*inode = file->f_mapping->host;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	struct kiocb	kiocb;

	struct kiocb	kiocb;

	ssize_t		rval;

	ssize_t		rval;
@@ -189,7 +189,7 @@ __xfs_file_writev( 
	loff_t			*ppos)

	loff_t			*ppos)

{

{

	struct inode	*inode = file->f_mapping->host;

	struct inode	*inode = file->f_mapping->host;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	struct kiocb	kiocb;

	struct kiocb	kiocb;

	ssize_t		rval;

	ssize_t		rval;
@@ -233,7 +233,7 @@ xfs_file_sendfile( 
	read_actor_t		actor,

	read_actor_t		actor,

	void			*target)

	void			*target)

{

{

	vnode_t			*vp = LINVFS_GET_VP(filp->f_dentry->d_inode);

	vnode_t			*vp = vn_from_inode(filp->f_dentry->d_inode);

	ssize_t			rval;

	ssize_t			rval;





	VOP_SENDFILE(vp, filp, ppos, 0, count, actor, target, NULL, rval);

	VOP_SENDFILE(vp, filp, ppos, 0, count, actor, target, NULL, rval);
@@ -246,7 +246,7 @@ xfs_file_open( 
	struct inode	*inode,

	struct inode	*inode,

	struct file	*filp)

	struct file	*filp)

{

{

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	int		error;

	int		error;





	if (!(filp->f_flags & O_LARGEFILE) && i_size_read(inode) > MAX_NON_LFS)

	if (!(filp->f_flags & O_LARGEFILE) && i_size_read(inode) > MAX_NON_LFS)
@@ -263,7 +263,7 @@ xfs_file_release( 
	struct inode	*inode,

	struct inode	*inode,

	struct file	*filp)

	struct file	*filp)

{

{

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	int		error = 0;

	int		error = 0;





	if (vp)

	if (vp)
@@ -279,7 +279,7 @@ xfs_file_fsync( 
	int		datasync)

	int		datasync)

{

{

	struct inode	*inode = dentry->d_inode;

	struct inode	*inode = dentry->d_inode;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	int		error;

	int		error;

	int		flags = FSYNC_WAIT;

	int		flags = FSYNC_WAIT;
@@ -307,7 +307,7 @@ xfs_vm_nopage( 
	int			*type)

	int			*type)

{

{

	struct inode	*inode = area->vm_file->f_dentry->d_inode;

	struct inode	*inode = area->vm_file->f_dentry->d_inode;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	xfs_mount_t	*mp = XFS_VFSTOM(vp->v_vfsp);

	xfs_mount_t	*mp = XFS_VFSTOM(vp->v_vfsp);

	int		error;

	int		error;
@@ -340,7 +340,7 @@ xfs_file_readdir( 
	xfs_off_t	start_offset, curr_offset;

	xfs_off_t	start_offset, curr_offset;

	xfs_dirent_t	*dbp = NULL;

	xfs_dirent_t	*dbp = NULL;





	vp = LINVFS_GET_VP(filp->f_dentry->d_inode);

	vp = vn_from_inode(filp->f_dentry->d_inode);

	ASSERT(vp);

	ASSERT(vp);





	/* Try fairly hard to get memory */

	/* Try fairly hard to get memory */
@@ -409,7 +409,7 @@ xfs_file_mmap( 
	struct vm_area_struct *vma)

	struct vm_area_struct *vma)

{

{

	struct inode	*ip = filp->f_dentry->d_inode;

	struct inode	*ip = filp->f_dentry->d_inode;

	vnode_t		*vp = LINVFS_GET_VP(ip);

	vnode_t		*vp = vn_from_inode(ip);

	vattr_t		vattr;

	vattr_t		vattr;

	int		error;

	int		error;
@@ -437,7 +437,7 @@ xfs_file_ioctl( 
{

{

	int		error;

	int		error;

	struct inode	*inode = filp->f_dentry->d_inode;

	struct inode	*inode = filp->f_dentry->d_inode;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);





	VOP_IOCTL(vp, inode, filp, 0, cmd, (void __user *)arg, error);

	VOP_IOCTL(vp, inode, filp, 0, cmd, (void __user *)arg, error);

	VMODIFY(vp);

	VMODIFY(vp);
@@ -459,7 +459,7 @@ xfs_file_ioctl_invis( 
{

{

	int		error;

	int		error;

	struct inode	*inode = filp->f_dentry->d_inode;

	struct inode	*inode = filp->f_dentry->d_inode;

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);





	ASSERT(vp);

	ASSERT(vp);

	VOP_IOCTL(vp, inode, filp, IO_INVIS, cmd, (void __user *)arg, error);

	VOP_IOCTL(vp, inode, filp, IO_INVIS, cmd, (void __user *)arg, error);
@@ -481,7 +481,7 @@ xfs_vm_mprotect( 
	struct vm_area_struct *vma,

	struct vm_area_struct *vma,

	unsigned int	newflags)

	unsigned int	newflags)

{

{

	vnode_t		*vp = LINVFS_GET_VP(vma->vm_file->f_dentry->d_inode);

	vnode_t		*vp = vn_from_inode(vma->vm_file->f_dentry->d_inode);

	int		error = 0;

	int		error = 0;





	if (vp->v_vfsp->vfs_flag & VFS_DMI) {

	if (vp->v_vfsp->vfs_flag & VFS_DMI) {
@@ -507,7 +507,7 @@ STATIC int 
xfs_file_open_exec(

xfs_file_open_exec(

	struct inode	*inode)

	struct inode	*inode)

{

{

	vnode_t		*vp = LINVFS_GET_VP(inode);

	vnode_t		*vp = vn_from_inode(inode);

	xfs_mount_t	*mp = XFS_VFSTOM(vp->v_vfsp);

	xfs_mount_t	*mp = XFS_VFSTOM(vp->v_vfsp);

	int		error = 0;

	int		error = 0;

	xfs_inode_t	*ip;

	xfs_inode_t	*ip;

fs/xfs/linux-2.6/xfs_fs_subr.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ fs_tosspages( 
	int		fiopt)

	int		fiopt)

{

{

	vnode_t		*vp = BHV_TO_VNODE(bdp);

	vnode_t		*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = LINVFS_GET_IP(vp);

	struct inode	*ip = vn_to_inode(vp);





	if (VN_CACHED(vp))

	if (VN_CACHED(vp))

		truncate_inode_pages(ip->i_mapping, first);

		truncate_inode_pages(ip->i_mapping, first);
@@ -76,7 +76,7 @@ fs_flushinval_pages( 
	int		fiopt)

	int		fiopt)

{

{

	vnode_t		*vp = BHV_TO_VNODE(bdp);

	vnode_t		*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = LINVFS_GET_IP(vp);

	struct inode	*ip = vn_to_inode(vp);





	if (VN_CACHED(vp)) {

	if (VN_CACHED(vp)) {

		filemap_write_and_wait(ip->i_mapping);

		filemap_write_and_wait(ip->i_mapping);
@@ -98,7 +98,7 @@ fs_flush_pages( 
	int		fiopt)

	int		fiopt)

{

{

	vnode_t		*vp = BHV_TO_VNODE(bdp);

	vnode_t		*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = LINVFS_GET_IP(vp);

	struct inode	*ip = vn_to_inode(vp);





	if (VN_CACHED(vp)) {

	if (VN_CACHED(vp)) {

		filemap_fdatawrite(ip->i_mapping);

		filemap_fdatawrite(ip->i_mapping);

fs/xfs/linux-2.6/xfs_ioctl.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ xfs_find_handle( 
	}

	}





	/* we need the vnode */

	/* we need the vnode */

	vp = LINVFS_GET_VP(inode);

	vp = vn_from_inode(inode);





	/* now we can grab the fsid */

	/* now we can grab the fsid */

	memcpy(&handle.ha_fsid, vp->v_vfsp->vfs_altfsid, sizeof(xfs_fsid_t));

	memcpy(&handle.ha_fsid, vp->v_vfsp->vfs_altfsid, sizeof(xfs_fsid_t));
@@ -256,7 +256,7 @@ xfs_vget_fsop_handlereq( 
	}

	}





	vpp = XFS_ITOV(ip);

	vpp = XFS_ITOV(ip);

	inodep = LINVFS_GET_IP(vpp);

	inodep = vn_to_inode(vpp);

	xfs_iunlock(ip, XFS_ILOCK_SHARED);

	xfs_iunlock(ip, XFS_ILOCK_SHARED);





	*vp = vpp;

	*vp = vpp;
@@ -715,7 +715,7 @@ xfs_ioctl( 
	xfs_inode_t		*ip;

	xfs_inode_t		*ip;

	xfs_mount_t		*mp;

	xfs_mount_t		*mp;





	vp = LINVFS_GET_VP(inode);

	vp = vn_from_inode(inode);





	vn_trace_entry(vp, "xfs_ioctl", (inst_t *)__return_address);

	vn_trace_entry(vp, "xfs_ioctl", (inst_t *)__return_address);
@@ -1270,7 +1270,7 @@ xfs_ioc_xattr( 
	}

	}





	case XFS_IOC_GETVERSION: {

	case XFS_IOC_GETVERSION: {

		flags = LINVFS_GET_IP(vp)->i_generation;

		flags = vn_to_inode(vp)->i_generation;

		if (copy_to_user(arg, &flags, sizeof(flags)))

		if (copy_to_user(arg, &flags, sizeof(flags)))

			error = -EFAULT;

			error = -EFAULT;

		break;

		break;