Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e9b4a82 authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 78a63f12

net/sunrpc/xprtsock.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static ssize_t 
xs_read_kvec(struct socket *sock, struct msghdr *msg, int flags,

		struct kvec *kvec, size_t count, size_t seek)

{

	iov_iter_kvec(&msg->msg_iter, READ | ITER_KVEC, kvec, 1, count);

	iov_iter_kvec(&msg->msg_iter, READ, kvec, 1, count);

	return xs_sock_recvmsg(sock, msg, flags, seek);

}
@@ -370,7 +370,7 @@ xs_read_bvec(struct socket *sock, struct msghdr *msg, int flags, 
		struct bio_vec *bvec, unsigned long nr, size_t count,

		size_t seek)

{

	iov_iter_bvec(&msg->msg_iter, READ | ITER_BVEC, bvec, nr, count);

	iov_iter_bvec(&msg->msg_iter, READ, bvec, nr, count);

	return xs_sock_recvmsg(sock, msg, flags, seek);

}