Merge branch 'master' of git+ssh://git.melbourne.sgi.com/git/xfs (4d9d4ebf) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/xfs/linux-2.6/xfs_buf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1085,7 +1085,7 @@ xfs_bawrite(
		bp->b_flags &= ~(XBF_READ \| XBF_DELWRI \| XBF_READ_AHEAD);
		bp->b_flags \|= (XBF_WRITE \| XBF_ASYNC \| _XBF_RUN_QUEUES);

		bp->b_fspriv3 = mp;
		bp->b_mount = mp;
		bp->b_strat = xfs_bdstrat_cb;
		return xfs_bdstrat_cb(bp);
		}
		@@ -1098,7 +1098,7 @@ xfs_bdwrite(
		XB_TRACE(bp, "bdwrite", 0);

		bp->b_strat = xfs_bdstrat_cb;
		bp->b_fspriv3 = mp;
		bp->b_mount = mp;

		bp->b_flags &= ~XBF_READ;
		bp->b_flags \|= (XBF_DELWRI \| XBF_ASYNC);

fs/xfs/linux-2.6/xfs_buf.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ typedef struct xfs_buf {
		struct completion b_iowait; /* queue for I/O waiters */
		void *b_fspriv;
		void *b_fspriv2;
		void *b_fspriv3;
		struct xfs_mount *b_mount;
		unsigned short b_error; /* error code on I/O */
		unsigned int b_page_count; /* size of page array */
		unsigned int b_offset; /* page offset in first page */
		@@ -335,8 +335,6 @@ extern void xfs_buf_trace(xfs_buf_t , char , void , void );
		#define XFS_BUF_SET_FSPRIVATE(bp, val) ((bp)->b_fspriv = (void*)(val))
		#define XFS_BUF_FSPRIVATE2(bp, type) ((type)(bp)->b_fspriv2)
		#define XFS_BUF_SET_FSPRIVATE2(bp, val) ((bp)->b_fspriv2 = (void*)(val))
		#define XFS_BUF_FSPRIVATE3(bp, type) ((type)(bp)->b_fspriv3)
		#define XFS_BUF_SET_FSPRIVATE3(bp, val) ((bp)->b_fspriv3 = (void*)(val))
		#define XFS_BUF_SET_START(bp) do { } while (0)
		#define XFS_BUF_SET_BRELSE_FUNC(bp, func) ((bp)->b_relse = (func))

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);