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

Commit fed41f7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull splice fixups from Al Viro:
 "A couple of fixups for interaction of pipe-backed iov_iter with
  O_DIRECT reads + constification of a couple of primitives in uio.h
  missed by previous rounds.

  Kudos to davej - his fuzzing has caught those bugs"

* 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [btrfs] fix check_direct_IO() for non-iovec iterators
  constify iov_iter_count() and iter_is_iovec()
  fix ITER_PIPE interaction with direct_IO
parents abb5a14f cd27e455

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -8619,7 +8619,7 @@ static ssize_t check_direct_IO(struct btrfs_root *root, struct kiocb *iocb, 
		goto out;



	/* If this is a write we don't need to check anymore */

	if (iov_iter_rw(iter) == WRITE)

	if (iov_iter_rw(iter) != READ || !iter_is_iovec(iter))

		return 0;

	/*

	 * Check to make sure we don't have duplicate iov_base's in this

fs/splice.c

+3 −9
Original line number Diff line number Diff line
@@ -315,15 +315,9 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, 
		*ppos = kiocb.ki_pos;

		file_accessed(in);

	} else if (ret < 0) {

		if (WARN_ON(to.idx != idx || to.iov_offset)) {

			/*

			 * a bogus ->read_iter() has copied something and still

			 * returned an error instead of a short read.

			 */

		to.idx = idx;

		to.iov_offset = 0;

		iov_iter_advance(&to, 0); /* to free what was emitted */

		}

		/*

		 * callers of ->splice_read() expect -EAGAIN on

		 * "can't put anything in there", rather than -EFAULT.

fs/xfs/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ xfs_file_dio_aio_read( 
	data = *to;

	ret = __blockdev_direct_IO(iocb, inode, target->bt_bdev, &data,

			xfs_get_blocks_direct, NULL, NULL, 0);

	if (ret > 0) {

	if (ret >= 0) {

		iocb->ki_pos += ret;

		iov_iter_advance(to, ret);

	}

include/linux/uio.h

+2 −2
Original line number Diff line number Diff line
@@ -109,12 +109,12 @@ int iov_iter_npages(const struct iov_iter *i, int maxpages); 


const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags);



static inline size_t iov_iter_count(struct iov_iter *i)

static inline size_t iov_iter_count(const struct iov_iter *i)

{

	return i->count;

}



static inline bool iter_is_iovec(struct iov_iter *i)

static inline bool iter_is_iovec(const struct iov_iter *i)

{

	return !(i->type & (ITER_BVEC | ITER_KVEC | ITER_PIPE));

}

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -1941,7 +1941,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) 
		file_accessed(file);



		retval = mapping->a_ops->direct_IO(iocb, &data);

		if (retval > 0) {

		if (retval >= 0) {

			iocb->ki_pos += retval;

			iov_iter_advance(iter, retval);

		}