diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-17 18:02:44 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-27 18:12:24 -0400 |
commit | 4bce9f6ee8f84fdf333d0fd7fcf7f0d8c7cce7fa (patch) | |
tree | a5d3f51f67b05e37d3de3ed9201794924b66efc2 /fs/ntfs | |
parent | 08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff) | |
download | op-kernel-dev-4bce9f6ee8f84fdf333d0fd7fcf7f0d8c7cce7fa.zip op-kernel-dev-4bce9f6ee8f84fdf333d0fd7fcf7f0d8c7cce7fa.tar.gz |
get rid of separate multipage fault-in primitives
* the only remaining callers of "short" fault-ins are just as happy with generic
variants (both in lib/iov_iter.c); switch them to multipage variants, kill the
"short" ones
* rename the multipage variants to now available plain ones.
* get rid of compat macro defining iov_iter_fault_in_multipage_readable by
expanding it in its only user.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ntfs')
-rw-r--r-- | fs/ntfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index f548629..bf72a2c 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -1850,7 +1850,7 @@ again: * pages being swapped out between us bringing them into memory * and doing the actual copying. */ - if (unlikely(iov_iter_fault_in_multipages_readable(i, bytes))) { + if (unlikely(iov_iter_fault_in_readable(i, bytes))) { status = -EFAULT; break; } |