diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:38:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:38:49 -0700 |
| commit | fed41f7d039bad02f94cad9059e4b14cd81d13f2 (patch) | |
| tree | fb9de8dfd1e706a0657e213d5d3cd9368b9e58e4 /fs/btrfs/inode.c | |
| parent | Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | [btrfs] fix check_direct_IO() for non-iovec iterators (diff) | |
| download | linux-dev-fed41f7d039bad02f94cad9059e4b14cd81d13f2.tar.xz linux-dev-fed41f7d039bad02f94cad9059e4b14cd81d13f2.zip | |
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
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 92346a403a89..a0d3016f6c26 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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 |