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, 4 insertions, 4 deletions

diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c
index b1092fbefa63..2e5d845b5091 100644
--- a/drivers/xen/pvcalls-back.c
+++ b/drivers/xen/pvcalls-back.c
@@ -137,13 +137,13 @@ static void pvcalls_conn_back_read(void *opaque)
         if (masked_prod < masked_cons) {
                 vec[0].iov_base = data->in + masked_prod;
                 vec[0].iov_len = wanted;
-                iov_iter_kvec(&msg.msg_iter, ITER_KVEC|WRITE, vec, 1, wanted);
+                iov_iter_kvec(&msg.msg_iter, WRITE, vec, 1, wanted);
         } else {
                 vec[0].iov_base = data->in + masked_prod;
                 vec[0].iov_len = array_size - masked_prod;
                 vec[1].iov_base = data->in;
                 vec[1].iov_len = wanted - vec[0].iov_len;
-                iov_iter_kvec(&msg.msg_iter, ITER_KVEC|WRITE, vec, 2, wanted);
+                iov_iter_kvec(&msg.msg_iter, WRITE, vec, 2, wanted);
         }
 
         atomic_set(&map->read, 0);
@@ -195,13 +195,13 @@ static void pvcalls_conn_back_write(struct sock_mapping *map)
         if (pvcalls_mask(prod, array_size) > pvcalls_mask(cons, array_size)) {
                 vec[0].iov_base = data->out + pvcalls_mask(cons, array_size);
                 vec[0].iov_len = size;
-                iov_iter_kvec(&msg.msg_iter, ITER_KVEC|READ, vec, 1, size);
+                iov_iter_kvec(&msg.msg_iter, READ, vec, 1, size);
         } else {
                 vec[0].iov_base = data->out + pvcalls_mask(cons, array_size);
                 vec[0].iov_len = array_size - pvcalls_mask(cons, array_size);
                 vec[1].iov_base = data->out;
                 vec[1].iov_len = size - vec[0].iov_len;
-                iov_iter_kvec(&msg.msg_iter, ITER_KVEC|READ, vec, 2, size);
+                iov_iter_kvec(&msg.msg_iter, READ, vec, 2, size);
         }
 
         atomic_set(&map->write, 0);