Commit 993386c1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files

[XFS] decontaminate vnode operations from behavior details 



All vnode ops now take struct xfs_inode pointers and the behaviour related
glue is split out into methods of it's own. This required fixing
xfs_create/mkdir/symlink to not mess with the inode pointer but rather use
a separate boolean for error handling. Thanks to Dave Chinner for that
fix.

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

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 b93bd20c

fs/xfs/Makefile-linux-2.6

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ xfs-y += xfs_alloc.o \ 
				   xfs_utils.o \

				   xfs_vfsops.o \

				   xfs_vnodeops.o \

				   xfs_vnodeops_bhv.o \

				   xfs_rw.o \

				   xfs_dmops.o \

				   xfs_qmops.o

fs/xfs/linux-2.6/xfs_fs_subr.c

+31 −17
Original line number Diff line number Diff line
@@ -16,66 +16,80 @@ 
 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include "xfs.h"

#include "xfs_vnodeops.h"



/*

 * The following six includes are needed so that we can include

 * xfs_inode.h.  What a mess..

 */

#include "xfs_bmap_btree.h"

#include "xfs_inum.h"

#include "xfs_dir2.h"

#include "xfs_dir2_sf.h"

#include "xfs_attr_sf.h"

#include "xfs_dinode.h"



#include "xfs_inode.h"



int  fs_noerr(void) { return 0; }

int  fs_nosys(void) { return ENOSYS; }

void fs_noval(void) { return; }



void

fs_tosspages(

	bhv_desc_t	*bdp,

xfs_tosspages(

	xfs_inode_t	*ip,

	xfs_off_t	first,

	xfs_off_t	last,

	int		fiopt)

{

	bhv_vnode_t	*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = vn_to_inode(vp);

	bhv_vnode_t	*vp = XFS_ITOV(ip);

	struct inode	*inode = vn_to_inode(vp);



	if (VN_CACHED(vp))

		truncate_inode_pages(ip->i_mapping, first);

		truncate_inode_pages(inode->i_mapping, first);

}



int

fs_flushinval_pages(

	bhv_desc_t	*bdp,

xfs_flushinval_pages(

	xfs_inode_t	*ip,

	xfs_off_t	first,

	xfs_off_t	last,

	int		fiopt)

{

	bhv_vnode_t	*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = vn_to_inode(vp);

	bhv_vnode_t	*vp = XFS_ITOV(ip);

	struct inode	*inode = vn_to_inode(vp);

	int		ret = 0;



	if (VN_CACHED(vp)) {

		if (VN_TRUNC(vp))

			VUNTRUNCATE(vp);

		ret = filemap_write_and_wait(ip->i_mapping);

		ret = filemap_write_and_wait(inode->i_mapping);

		if (!ret)

			truncate_inode_pages(ip->i_mapping, first);

			truncate_inode_pages(inode->i_mapping, first);

	}

	return ret;

}



int

fs_flush_pages(

	bhv_desc_t	*bdp,

xfs_flush_pages(

	xfs_inode_t	*ip,

	xfs_off_t	first,

	xfs_off_t	last,

	uint64_t	flags,

	int		fiopt)

{

	bhv_vnode_t	*vp = BHV_TO_VNODE(bdp);

	struct inode	*ip = vn_to_inode(vp);

	bhv_vnode_t	*vp = XFS_ITOV(ip);

	struct inode	*inode = vn_to_inode(vp);

	int		ret = 0;

	int		ret2;



	if (VN_DIRTY(vp)) {

		if (VN_TRUNC(vp))

			VUNTRUNCATE(vp);

		ret = filemap_fdatawrite(ip->i_mapping);

		ret = filemap_fdatawrite(inode->i_mapping);

		if (flags & XFS_B_ASYNC)

			return ret;

		ret2 = filemap_fdatawait(ip->i_mapping);

		ret2 = filemap_fdatawait(inode->i_mapping);

		if (!ret)

			ret = ret2;

	}

fs/xfs/linux-2.6/xfs_fs_subr.h

+0 −4
Original line number Diff line number Diff line
@@ -18,12 +18,8 @@ 
#ifndef	__XFS_FS_SUBR_H__

#define __XFS_FS_SUBR_H__



struct cred;

extern int  fs_noerr(void);

extern int  fs_nosys(void);

extern void fs_noval(void);

extern void fs_tosspages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

extern int  fs_flushinval_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, int);

extern int  fs_flush_pages(bhv_desc_t *, xfs_off_t, xfs_off_t, uint64_t, int);



#endif	/* __XFS_FS_SUBR_H__ */

fs/xfs/linux-2.6/xfs_ioctl.c

+21 −27
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "xfs_utils.h"

#include "xfs_dfrag.h"

#include "xfs_fsops.h"

#include "xfs_vnodeops.h"



#include <linux/capability.h>

#include <linux/dcache.h>
@@ -436,7 +437,6 @@ xfs_fssetdm_by_handle( 
	struct fsdmidata	fsd;

	xfs_fsop_setdm_handlereq_t dmhreq;

	struct inode		*inode;

	bhv_desc_t		*bdp;

	bhv_vnode_t		*vp;



	if (!capable(CAP_MKNOD))
@@ -458,8 +458,8 @@ xfs_fssetdm_by_handle( 
		return -XFS_ERROR(EFAULT);

	}



	bdp = bhv_base_unlocked(VN_BHV_HEAD(vp));

	error = xfs_set_dmattrs(bdp, fsd.fsd_dmevmask, fsd.fsd_dmstate, NULL);

	error = xfs_set_dmattrs(xfs_vtoi(vp),

			fsd.fsd_dmevmask, fsd.fsd_dmstate);



	VN_RELE(vp);

	if (error)
@@ -676,7 +676,7 @@ xfs_attrmulti_by_handle( 


STATIC int

xfs_ioc_space(

	bhv_desc_t		*bdp,

	struct xfs_inode	*ip,

	struct inode		*inode,

	struct file		*filp,

	int			flags,
@@ -709,37 +709,31 @@ xfs_ioc_xattr( 


STATIC int

xfs_ioc_getbmap(

	bhv_desc_t		*bdp,

	struct xfs_inode	*ip,

	int			flags,

	unsigned int		cmd,

	void			__user *arg);



STATIC int

xfs_ioc_getbmapx(

	bhv_desc_t		*bdp,

	struct xfs_inode	*ip,

	void			__user *arg);



int

xfs_ioctl(

	bhv_desc_t		*bdp,

	struct inode		*inode,

	xfs_inode_t		*ip,

	struct file		*filp,

	int			ioflags,

	unsigned int		cmd,

	void			__user *arg)

{

	struct inode		*inode = filp->f_path.dentry->d_inode;

	bhv_vnode_t		*vp = vn_from_inode(inode);

	xfs_mount_t		*mp = ip->i_mount;

	int			error;

	bhv_vnode_t		*vp;

	xfs_inode_t		*ip;

	xfs_mount_t		*mp;



	vp = vn_from_inode(inode);



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



	ip = XFS_BHVTOI(bdp);

	mp = ip->i_mount;



	switch (cmd) {



	case XFS_IOC_ALLOCSP:
@@ -758,7 +752,7 @@ xfs_ioctl( 
		    !capable(CAP_SYS_ADMIN))

			return -EPERM;



		return xfs_ioc_space(bdp, inode, filp, ioflags, cmd, arg);

		return xfs_ioc_space(ip, inode, filp, ioflags, cmd, arg);



	case XFS_IOC_DIOINFO: {

		struct dioattr	da;
@@ -801,17 +795,17 @@ xfs_ioctl( 
		if (copy_from_user(&dmi, arg, sizeof(dmi)))

			return -XFS_ERROR(EFAULT);



		error = xfs_set_dmattrs(bdp, dmi.fsd_dmevmask, dmi.fsd_dmstate,

							NULL);

		error = xfs_set_dmattrs(ip, dmi.fsd_dmevmask,

				dmi.fsd_dmstate);

		return -error;

	}



	case XFS_IOC_GETBMAP:

	case XFS_IOC_GETBMAPA:

		return xfs_ioc_getbmap(bdp, ioflags, cmd, arg);

		return xfs_ioc_getbmap(ip, ioflags, cmd, arg);



	case XFS_IOC_GETBMAPX:

		return xfs_ioc_getbmapx(bdp, arg);

		return xfs_ioc_getbmapx(ip, arg);



	case XFS_IOC_FD_TO_HANDLE:

	case XFS_IOC_PATH_TO_HANDLE:
@@ -981,7 +975,7 @@ xfs_ioctl( 


STATIC int

xfs_ioc_space(

	bhv_desc_t		*bdp,

	struct xfs_inode	*ip,

	struct inode		*inode,

	struct file		*filp,

	int			ioflags,
@@ -1009,7 +1003,7 @@ xfs_ioc_space( 
	if (ioflags & IO_INVIS)

		attr_flags |= ATTR_DMI;



	error = xfs_change_file_space(bdp, cmd, &bf, filp->f_pos,

	error = xfs_change_file_space(ip, cmd, &bf, filp->f_pos,

					      NULL, attr_flags);

	return -error;

}
@@ -1295,7 +1289,7 @@ xfs_ioc_xattr( 


STATIC int

xfs_ioc_getbmap(

	bhv_desc_t		*bdp,

	struct xfs_inode	*ip,

	int			ioflags,

	unsigned int		cmd,

	void			__user *arg)
@@ -1314,7 +1308,7 @@ xfs_ioc_getbmap( 
	if (ioflags & IO_INVIS)

		iflags |= BMV_IF_NO_DMAPI_READ;



	error = xfs_getbmap(bdp, &bm, (struct getbmap __user *)arg+1, iflags);

	error = xfs_getbmap(ip, &bm, (struct getbmap __user *)arg+1, iflags);

	if (error)

		return -error;
@@ -1325,7 +1319,7 @@ xfs_ioc_getbmap( 


STATIC int

xfs_ioc_getbmapx(

	bhv_desc_t		*bdp,

	struct xfs_inode	*ip,

	void			__user *arg)

{

	struct getbmapx		bmx;
@@ -1352,7 +1346,7 @@ xfs_ioc_getbmapx( 


	iflags |= BMV_IF_EXTENDED;



	error = xfs_getbmap(bdp, &bm, (struct getbmapx __user *)arg+1, iflags);

	error = xfs_getbmap(ip, &bm, (struct getbmapx __user *)arg+1, iflags);

	if (error)

		return -error;

fs/xfs/linux-2.6/xfs_iops.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ extern const struct file_operations xfs_file_operations; 
extern const struct file_operations xfs_dir_file_operations;

extern const struct file_operations xfs_invis_file_operations;



extern int xfs_ioctl(struct bhv_desc *, struct inode *, struct file *,

                        int, unsigned int, void __user *);



struct xfs_inode;

extern void xfs_ichgtime(struct xfs_inode *, int);

CRA Git | Maintained and supported by SUSTech CRA and CCSE