diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2018-11-01 18:19:03 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-11-01 18:19:03 -0400 |
commit | 0e9b4a82710220c04100892fb7277b78fd33a747 (patch) | |
tree | 43b2cd2f20a46708f48ae5adf6595db20af33d58 | |
parent | 78a63f1235deb1ab9c0780b332d9cc18270247e2 (diff) |
missing bits of "iov_iter: Separate type from direction and use accessor functions"
sunrpc patches from nfs tree conflict with calling conventions change done
in iov_iter work. Trivial fixup...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | net/sunrpc/xprtsock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 1b51e04d3566..ae77c71c1f64 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -361,7 +361,7 @@ static ssize_t | |||
361 | xs_read_kvec(struct socket *sock, struct msghdr *msg, int flags, | 361 | xs_read_kvec(struct socket *sock, struct msghdr *msg, int flags, |
362 | struct kvec *kvec, size_t count, size_t seek) | 362 | struct kvec *kvec, size_t count, size_t seek) |
363 | { | 363 | { |
364 | iov_iter_kvec(&msg->msg_iter, READ | ITER_KVEC, kvec, 1, count); | 364 | iov_iter_kvec(&msg->msg_iter, READ, kvec, 1, count); |
365 | return xs_sock_recvmsg(sock, msg, flags, seek); | 365 | return xs_sock_recvmsg(sock, msg, flags, seek); |
366 | } | 366 | } |
367 | 367 | ||
@@ -370,7 +370,7 @@ xs_read_bvec(struct socket *sock, struct msghdr *msg, int flags, | |||
370 | struct bio_vec *bvec, unsigned long nr, size_t count, | 370 | struct bio_vec *bvec, unsigned long nr, size_t count, |
371 | size_t seek) | 371 | size_t seek) |
372 | { | 372 | { |
373 | iov_iter_bvec(&msg->msg_iter, READ | ITER_BVEC, bvec, nr, count); | 373 | iov_iter_bvec(&msg->msg_iter, READ, bvec, nr, count); |
374 | return xs_sock_recvmsg(sock, msg, flags, seek); | 374 | return xs_sock_recvmsg(sock, msg, flags, seek); |
375 | } | 375 | } |
376 | 376 | ||