renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2016-10-10 13:38:49 -07:00
commit fed41f7d03
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/inode.c
View File

@ -8619,7 +8619,7 @@ static ssize_t check_direct_IO(struct btrfs_root *root, struct kiocb *iocb,
goto out; goto out;
/* If this is a write we don't need to check anymore */ /* 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; return 0;
/* /*
* Check to make sure we don't have duplicate iov_base's in this * Check to make sure we don't have duplicate iov_base's in this

12
fs/splice.c
View File

@ -315,15 +315,9 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
*ppos = kiocb.ki_pos; *ppos = kiocb.ki_pos;
file_accessed(in); file_accessed(in);
} else if (ret < 0) { } else if (ret < 0) {
if (WARN_ON(to.idx != idx || to.iov_offset)) { to.idx = idx;
/* to.iov_offset = 0;
* a bogus ->read_iter() has copied something and still iov_iter_advance(&to, 0); /* to free what was emitted */
* 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 * callers of ->splice_read() expect -EAGAIN on
* "can't put anything in there", rather than -EFAULT. * "can't put anything in there", rather than -EFAULT.

2
fs/xfs/xfs_file.c
View File

@ -319,7 +319,7 @@ xfs_file_dio_aio_read(
data = *to; data = *to;
ret = __blockdev_direct_IO(iocb, inode, target->bt_bdev, &data, ret = __blockdev_direct_IO(iocb, inode, target->bt_bdev, &data,
xfs_get_blocks_direct, NULL, NULL, 0); xfs_get_blocks_direct, NULL, NULL, 0);
if (ret > 0) { if (ret >= 0) {
iocb->ki_pos += ret; iocb->ki_pos += ret;
iov_iter_advance(to, ret); iov_iter_advance(to, ret);
} }

4
include/linux/uio.h
View File

@ -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); 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; 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)); return !(i->type & (ITER_BVEC | ITER_KVEC | ITER_PIPE));
} }

2
mm/filemap.c
View File

@ -1941,7 +1941,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
file_accessed(file); file_accessed(file);
retval = mapping->a_ops->direct_IO(iocb, &data); retval = mapping->a_ops->direct_IO(iocb, &data);
if (retval > 0) { if (retval >= 0) {
iocb->ki_pos += retval; iocb->ki_pos += retval;
iov_iter_advance(iter, retval); iov_iter_advance(iter, retval);
} }