Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull AFS updates from Al Viro:
 "AFS series, with some iov_iter bits included"

* 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
  missing bits of "iov_iter: Separate type from direction and use accessor functions"
  afs: Probe multiple fileservers simultaneously
  afs: Fix callback handling
  afs: Eliminate the address pointer from the address list cursor
  afs: Allow dumping of server cursor on operation failure
  afs: Implement YFS support in the fs client
  afs: Expand data structure fields to support YFS
  afs: Get the target vnode in afs_rmdir() and get a callback on it
  afs: Calc callback expiry in op reply delivery
  afs: Fix FS.FetchStatus delivery from updating wrong vnode
  afs: Implement the YFS cache manager service
  afs: Remove callback details from afs_callback_break struct
  afs: Commit the status on a new file/dir/symlink
  afs: Increase to 64-bit volume ID and 96-bit vnode ID for YFS
  afs: Don't invoke the server to read data beyond EOF
  afs: Add a couple of tracepoints to log I/O errors
  afs: Handle EIO from delivery function
  afs: Fix TTL on VL server and address lists
  afs: Implement VL server rotation
  afs: Improve FS server rotation error handling
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/net/socket.c b/net/socket.c
index 99c96851469f..593826e11a53 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -635,7 +635,7 @@ EXPORT_SYMBOL(sock_sendmsg);
 int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
                    struct kvec *vec, size_t num, size_t size)
 {
-        iov_iter_kvec(&msg->msg_iter, WRITE | ITER_KVEC, vec, num, size);
+        iov_iter_kvec(&msg->msg_iter, WRITE, vec, num, size);
         return sock_sendmsg(sock, msg);
 }
 EXPORT_SYMBOL(kernel_sendmsg);
@@ -648,7 +648,7 @@ int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg,
         if (!sock->ops->sendmsg_locked)
                 return sock_no_sendmsg_locked(sk, msg, size);
 
-        iov_iter_kvec(&msg->msg_iter, WRITE | ITER_KVEC, vec, num, size);
+        iov_iter_kvec(&msg->msg_iter, WRITE, vec, num, size);
 
         return sock->ops->sendmsg_locked(sk, msg, msg_data_left(msg));
 }
@@ -823,7 +823,7 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
         mm_segment_t oldfs = get_fs();
         int result;
 
-        iov_iter_kvec(&msg->msg_iter, READ | ITER_KVEC, vec, num, size);
+        iov_iter_kvec(&msg->msg_iter, READ, vec, num, size);
         set_fs(KERNEL_DS);
         result = sock_recvmsg(sock, msg, flags);
         set_fs(oldfs);