diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:04:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:04:49 -0700 |
| commit | abb5a14fa20fdd400995926134b7be9eb8ce6048 (patch) | |
| tree | 085add41cae3193b8c8293d25b453fd1ecae0c19 /lib/iov_iter.c | |
| parent | 911f9dab301e8583143c7e75b552eadd434ea0a8 (diff) | |
| parent | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (diff) | |
| download | linux-rpi3-abb5a14fa20fdd400995926134b7be9eb8ce6048.tar.gz linux-rpi3-abb5a14fa20fdd400995926134b7be9eb8ce6048.tar.bz2 linux-rpi3-abb5a14fa20fdd400995926134b7be9eb8ce6048.zip | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted misc bits and pieces.
There are several single-topic branches left after this (rename2
series from Miklos, current_time series from Deepa Dinamani, xattr
series from Andreas, uaccess stuff from from me) and I'd prefer to
send those separately"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (39 commits)
proc: switch auxv to use of __mem_open()
hpfs: support FIEMAP
cifs: get rid of unused arguments of CIFSSMBWrite()
posix_acl: uapi header split
posix_acl: xattr representation cleanups
fs/aio.c: eliminate redundant loads in put_aio_ring_file
fs/internal.h: add const to ns_dentry_operations declaration
compat: remove compat_printk()
fs/buffer.c: make __getblk_slow() static
proc: unsigned file descriptors
fs/file: more unsigned file descriptors
fs: compat: remove redundant check of nr_segs
cachefiles: Fix attempt to read i_blocks after deleting file [ver #2]
cifs: don't use memcpy() to copy struct iov_iter
get rid of separate multipage fault-in primitives
fs: Avoid premature clearing of capabilities
fs: Give dentry to inode_change_ok() instead of inode
fuse: Propagate dentry down to inode_change_ok()
ceph: Propagate dentry down to inode_change_ok()
xfs: Propagate dentry down to inode_change_ok()
...
Diffstat (limited to 'lib/iov_iter.c')
| -rw-r--r-- | lib/iov_iter.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 48b8c27acabb..0ce341125195 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -396,8 +396,7 @@ int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes) if (!(i->type & (ITER_BVEC|ITER_KVEC))) { iterate_iovec(i, bytes, v, iov, skip, ({ - err = fault_in_multipages_readable(v.iov_base, - v.iov_len); + err = fault_in_pages_readable(v.iov_base, v.iov_len); if (unlikely(err)) return err; 0;})) |