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

Commit 4d4be482 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] add a FMODE flag to make XFS invisible I/O less hacky 



XFS has a mode called invisble I/O that doesn't update any of the
timestamps.  It's used for HSM-style applications and exposed through
the nasty open by handle ioctl.

Instead of doing directly assignment of file operations that set an
internal flag for it add a new FMODE_NOCMTIME flag that we can check
in the normal file operations.

(addition of the generic VFS flag has been ACKed by Al as an interims
 solution)

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 6d73cf13

fs/xfs/linux-2.6/xfs_file.c

+20 −125
Original line number Diff line number Diff line
@@ -45,80 +45,44 @@ 


static struct vm_operations_struct xfs_file_vm_ops;



STATIC_INLINE ssize_t

__xfs_file_read(

STATIC ssize_t

xfs_file_aio_read(

	struct kiocb		*iocb,

	const struct iovec	*iov,

	unsigned long		nr_segs,

	int			ioflags,

	loff_t			pos)

{

	struct file		*file = iocb->ki_filp;

	int			ioflags = IO_ISAIO;



	BUG_ON(iocb->ki_pos != pos);

	if (unlikely(file->f_flags & O_DIRECT))

		ioflags |= IO_ISDIRECT;

	if (file->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;

	return xfs_read(XFS_I(file->f_path.dentry->d_inode), iocb, iov,

				nr_segs, &iocb->ki_pos, ioflags);

}



STATIC ssize_t

xfs_file_aio_read(

	struct kiocb		*iocb,

	const struct iovec	*iov,

	unsigned long		nr_segs,

	loff_t			pos)

{

	return __xfs_file_read(iocb, iov, nr_segs, IO_ISAIO, pos);

}



STATIC ssize_t

xfs_file_aio_read_invis(

	struct kiocb		*iocb,

	const struct iovec	*iov,

	unsigned long		nr_segs,

	loff_t			pos)

{

	return __xfs_file_read(iocb, iov, nr_segs, IO_ISAIO|IO_INVIS, pos);

}



STATIC_INLINE ssize_t

__xfs_file_write(

xfs_file_aio_write(

	struct kiocb		*iocb,

	const struct iovec	*iov,

	unsigned long		nr_segs,

	int			ioflags,

	loff_t			pos)

{

	struct file		*file = iocb->ki_filp;

	int			ioflags = IO_ISAIO;



	BUG_ON(iocb->ki_pos != pos);

	if (unlikely(file->f_flags & O_DIRECT))

		ioflags |= IO_ISDIRECT;

	if (file->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;

	return xfs_write(XFS_I(file->f_mapping->host), iocb, iov, nr_segs,

				&iocb->ki_pos, ioflags);

}



STATIC ssize_t

xfs_file_aio_write(

	struct kiocb		*iocb,

	const struct iovec	*iov,

	unsigned long		nr_segs,

	loff_t			pos)

{

	return __xfs_file_write(iocb, iov, nr_segs, IO_ISAIO, pos);

}



STATIC ssize_t

xfs_file_aio_write_invis(

	struct kiocb		*iocb,

	const struct iovec	*iov,

	unsigned long		nr_segs,

	loff_t			pos)

{

	return __xfs_file_write(iocb, iov, nr_segs, IO_ISAIO|IO_INVIS, pos);

}



STATIC ssize_t

xfs_file_splice_read(

	struct file		*infilp,
@@ -127,20 +91,13 @@ xfs_file_splice_read( 
	size_t			len,

	unsigned int		flags)

{

	return xfs_splice_read(XFS_I(infilp->f_path.dentry->d_inode),

				   infilp, ppos, pipe, len, flags, 0);

}

	int			ioflags = 0;



	if (infilp->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;



STATIC ssize_t

xfs_file_splice_read_invis(

	struct file		*infilp,

	loff_t			*ppos,

	struct pipe_inode_info	*pipe,

	size_t			len,

	unsigned int		flags)

{

	return xfs_splice_read(XFS_I(infilp->f_path.dentry->d_inode),

				   infilp, ppos, pipe, len, flags, IO_INVIS);

				   infilp, ppos, pipe, len, flags, ioflags);

}



STATIC ssize_t
@@ -151,20 +108,13 @@ xfs_file_splice_write( 
	size_t			len,

	unsigned int		flags)

{

	return xfs_splice_write(XFS_I(outfilp->f_path.dentry->d_inode),

				    pipe, outfilp, ppos, len, flags, 0);

}

	int			ioflags = 0;



	if (outfilp->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;



STATIC ssize_t

xfs_file_splice_write_invis(

	struct pipe_inode_info	*pipe,

	struct file		*outfilp,

	loff_t			*ppos,

	size_t			len,

	unsigned int		flags)

{

	return xfs_splice_write(XFS_I(outfilp->f_path.dentry->d_inode),

				    pipe, outfilp, ppos, len, flags, IO_INVIS);

				    pipe, outfilp, ppos, len, flags, ioflags);

}



STATIC int
@@ -275,42 +225,6 @@ xfs_file_mmap( 
	return 0;

}



STATIC long

xfs_file_ioctl(

	struct file	*filp,

	unsigned int	cmd,

	unsigned long	p)

{

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





	/* NOTE:  some of the ioctl's return positive #'s as a

	 *	  byte count indicating success, such as

	 *	  readlink_by_handle.  So we don't "sign flip"

	 *	  like most other routines.  This means true

	 *	  errors need to be returned as a negative value.

	 */

	return xfs_ioctl(XFS_I(inode), filp, 0, cmd, (void __user *)p);

}



STATIC long

xfs_file_ioctl_invis(

	struct file	*filp,

	unsigned int	cmd,

	unsigned long	p)

{

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





	/* NOTE:  some of the ioctl's return positive #'s as a

	 *	  byte count indicating success, such as

	 *	  readlink_by_handle.  So we don't "sign flip"

	 *	  like most other routines.  This means true

	 *	  errors need to be returned as a negative value.

	 */

	return xfs_ioctl(XFS_I(inode), filp, IO_INVIS, cmd, (void __user *)p);

}



/*

 * mmap()d file has taken write protection fault and is being made

 * writable. We can set the page state up correctly for a writable
@@ -346,25 +260,6 @@ const struct file_operations xfs_file_operations = { 
#endif

};



const struct file_operations xfs_invis_file_operations = {

	.llseek		= generic_file_llseek,

	.read		= do_sync_read,

	.write		= do_sync_write,

	.aio_read	= xfs_file_aio_read_invis,

	.aio_write	= xfs_file_aio_write_invis,

	.splice_read	= xfs_file_splice_read_invis,

	.splice_write	= xfs_file_splice_write_invis,

	.unlocked_ioctl	= xfs_file_ioctl_invis,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= xfs_file_compat_invis_ioctl,

#endif

	.mmap		= xfs_file_mmap,

	.open		= xfs_file_open,

	.release	= xfs_file_release,

	.fsync		= xfs_file_fsync,

};





const struct file_operations xfs_dir_file_operations = {

	.open		= xfs_dir_open,

	.read		= generic_read_dir,

fs/xfs/linux-2.6/xfs_ioctl.c

+20 −9
Original line number Diff line number Diff line
@@ -319,10 +319,11 @@ xfs_open_by_handle( 
		put_unused_fd(new_fd);

		return -XFS_ERROR(-PTR_ERR(filp));

	}



	if (inode->i_mode & S_IFREG) {

		/* invisible operation should not change atime */

		filp->f_flags |= O_NOATIME;

		filp->f_op = &xfs_invis_file_operations;

		filp->f_mode |= FMODE_NOCMTIME;

	}



	fd_install(new_fd, filp);
@@ -1328,21 +1329,31 @@ xfs_ioc_getbmapx( 
	return 0;

}



int

xfs_ioctl(

	xfs_inode_t		*ip,

/*

 * Note: some of the ioctl's return positive numbers as a

 * byte count indicating success, such as readlink_by_handle.

 * So we don't "sign flip" like most other routines.  This means

 * true errors need to be returned as a negative value.

 */

long

xfs_file_ioctl(

	struct file		*filp,

	int			ioflags,

	unsigned int		cmd,

	void			__user *arg)

	unsigned long		p)

{

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

	xfs_mount_t		*mp = ip->i_mount;

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_mount	*mp = ip->i_mount;

	void			__user *arg = (void __user *)p;

	int			ioflags = 0;

	int			error;



	xfs_itrace_entry(XFS_I(inode));

	switch (cmd) {

	if (filp->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;



	xfs_itrace_entry(ip);



	switch (cmd) {

	case XFS_IOC_ALLOCSP:

	case XFS_IOC_FREESP:

	case XFS_IOC_RESVSP:

fs/xfs/linux-2.6/xfs_ioctl.h

+4 −4
Original line number Diff line number Diff line
@@ -68,13 +68,13 @@ xfs_attrmulti_attr_remove( 
	__uint32_t		flags);



extern long

xfs_file_compat_ioctl(

	struct file		*file,

xfs_file_ioctl(

	struct file		*filp,

	unsigned int		cmd,

	unsigned long		arg);

	unsigned long		p);



extern long

xfs_file_compat_invis_ioctl(

xfs_file_compat_ioctl(

	struct file		*file,

	unsigned int		cmd,

	unsigned long		arg);

fs/xfs/linux-2.6/xfs_ioctl32.c

+19 −37
Original line number Diff line number Diff line
@@ -599,19 +599,24 @@ xfs_compat_fssetdm_by_handle( 
	return error;

}



STATIC long

xfs_compat_ioctl(

	xfs_inode_t	*ip,

long

xfs_file_compat_ioctl(

	struct file		*filp,

	int		ioflags,

	unsigned		cmd,

	void		__user *arg)

	unsigned long		p)

{

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

	xfs_mount_t	*mp = ip->i_mount;

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_mount	*mp = ip->i_mount;

	void			__user *arg = (void __user *)p;

	int			ioflags = 0;

	int			error;



	xfs_itrace_entry(XFS_I(inode));

	if (filp->f_mode & FMODE_NOCMTIME)

		ioflags |= IO_INVIS;



	xfs_itrace_entry(ip);



	switch (cmd) {

	/* No size or alignment issues on any arch */

	case XFS_IOC_DIOINFO:
@@ -632,7 +637,7 @@ xfs_compat_ioctl( 
	case XFS_IOC_GOINGDOWN:

	case XFS_IOC_ERROR_INJECTION:

	case XFS_IOC_ERROR_CLEARALL:

		return xfs_ioctl(ip, filp, ioflags, cmd, arg);

		return xfs_file_ioctl(filp, cmd, p);

#ifndef BROKEN_X86_ALIGNMENT

	/* These are handled fine if no alignment issues */

	case XFS_IOC_ALLOCSP:
@@ -646,7 +651,7 @@ xfs_compat_ioctl( 
	case XFS_IOC_FSGEOMETRY_V1:

	case XFS_IOC_FSGROWFSDATA:

	case XFS_IOC_FSGROWFSRT:

		return xfs_ioctl(ip, filp, ioflags, cmd, arg);

		return xfs_file_ioctl(filp, cmd, p);

#else

	case XFS_IOC_ALLOCSP_32:

	case XFS_IOC_FREESP_32:
@@ -687,7 +692,7 @@ xfs_compat_ioctl( 
	case XFS_IOC_SETXFLAGS_32:

	case XFS_IOC_GETVERSION_32:

		cmd = _NATIVE_IOC(cmd, long);

		return xfs_ioctl(ip, filp, ioflags, cmd, arg);

		return xfs_file_ioctl(filp, cmd, p);

	case XFS_IOC_SWAPEXT: {

		struct xfs_swapext	  sxp;

		struct compat_xfs_swapext __user *sxu = arg;
@@ -738,26 +743,3 @@ xfs_compat_ioctl( 
		return -XFS_ERROR(ENOIOCTLCMD);

	}

}
 


long

xfs_file_compat_ioctl(

	struct file		*filp,

	unsigned int		cmd,

	unsigned long		p)

{

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



	return xfs_compat_ioctl(XFS_I(inode), filp, 0, cmd, (void __user *)p);

}



long

xfs_file_compat_invis_ioctl(

	struct file		*filp,

	unsigned int		cmd,

	unsigned long		p)

{

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



	return xfs_compat_ioctl(XFS_I(inode), filp, IO_INVIS, cmd,

				(void __user *)p);

}

fs/xfs/linux-2.6/xfs_iops.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ struct xfs_inode; 


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 ssize_t xfs_vn_listxattr(struct dentry *, char *data, size_t size);