missing bits of "iov_iter: Separate type from direction and use accessor functions"

Al Viro · Al Viro · commit 0e9b4a827102 · 2018-11-01T18:19:03.000-04:00
sunrpc patches from nfs tree conflict with calling conventions change done
in iov_iter work.  Trivial fixup...

Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
@@ -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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ static ssize_t`
`361`	`361`	`xs_read_kvec(struct socket sock, struct msghdr msg, int flags,`
`362`	`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`	`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`	`370`	`struct bio_vec *bvec, unsigned long nr, size_t count,`
`371`	`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`	`374`	`return xs_sock_recvmsg(sock, msg, flags, seek);`
`375`	`375`	`}`
`376`	`376`