Skip to content

Commit de4eda9

Browse files
author
Al Viro
committed
use less confusing names for iov_iter direction initializers
READ/WRITE proved to be actively confusing - the meanings are "data destination, as used with read(2)" and "data source, as used with write(2)", but people keep interpreting those as "we read data from it" and "we write data to it", i.e. exactly the wrong way. Call them ITER_DEST and ITER_SOURCE - at least that is harder to misinterpret... Signed-off-by: Al Viro <[email protected]>
1 parent a41dad9 commit de4eda9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+195
-191
lines changed

‎arch/s390/kernel/crash_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ int copy_oldmem_kernel(void *dst, unsigned long src, size_t count)
153153

154154
kvec.iov_base = dst;
155155
kvec.iov_len = count;
156-
iov_iter_kvec(&iter, READ, &kvec, 1, count);
156+
iov_iter_kvec(&iter, ITER_DEST, &kvec, 1, count);
157157
if (copy_oldmem_iter(&iter, src, count) < count)
158158
return -EFAULT;
159159
return 0;

‎arch/s390/mm/maccess.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ int memcpy_real(void *dest, unsigned long src, size_t count)
128128

129129
kvec.iov_base = dest;
130130
kvec.iov_len = count;
131-
iov_iter_kvec(&iter, READ, &kvec, 1, count);
131+
iov_iter_kvec(&iter, ITER_DEST, &kvec, 1, count);
132132
if (memcpy_real_iter(&iter, src, count) < count)
133133
return -EFAULT;
134134
return 0;

‎arch/x86/kernel/cpu/microcode/intel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
908908

909909
kvec.iov_base = (void *)firmware->data;
910910
kvec.iov_len = firmware->size;
911-
iov_iter_kvec(&iter, WRITE, &kvec, 1, firmware->size);
911+
iov_iter_kvec(&iter, ITER_SOURCE, &kvec, 1, firmware->size);
912912
ret = generic_load_microcode(cpu, &iter);
913913

914914
release_firmware(firmware);

‎arch/x86/kernel/crash_dump_64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos)
5757
struct kvec kvec = { .iov_base = buf, .iov_len = count };
5858
struct iov_iter iter;
5959

60-
iov_iter_kvec(&iter, READ, &kvec, 1, count);
60+
iov_iter_kvec(&iter, ITER_DEST, &kvec, 1, count);
6161

6262
return read_from_oldmem(&iter, count, ppos,
6363
cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT));

‎crypto/testmgr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ static int build_cipher_test_sglists(struct cipher_test_sglists *tsgls,
766766
struct iov_iter input;
767767
int err;
768768

769-
iov_iter_kvec(&input, WRITE, inputs, nr_inputs, src_total_len);
769+
iov_iter_kvec(&input, ITER_SOURCE, inputs, nr_inputs, src_total_len);
770770
err = build_test_sglist(&tsgls->src, cfg->src_divs, alignmask,
771771
cfg->inplace_mode != OUT_OF_PLACE ?
772772
max(dst_total_len, src_total_len) :
@@ -1180,7 +1180,7 @@ static int build_hash_sglist(struct test_sglist *tsgl,
11801180

11811181
kv.iov_base = (void *)vec->plaintext;
11821182
kv.iov_len = vec->psize;
1183-
iov_iter_kvec(&input, WRITE, &kv, 1, vec->psize);
1183+
iov_iter_kvec(&input, ITER_SOURCE, &kv, 1, vec->psize);
11841184
return build_test_sglist(tsgl, cfg->src_divs, alignmask, vec->psize,
11851185
&input, divs);
11861186
}

‎drivers/acpi/pfr_update.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ static ssize_t pfru_write(struct file *file, const char __user *buf,
455455

456456
iov.iov_base = (void __user *)buf;
457457
iov.iov_len = len;
458-
iov_iter_init(&iter, WRITE, &iov, 1, len);
458+
iov_iter_init(&iter, ITER_SOURCE, &iov, 1, len);
459459

460460
/* map the communication buffer */
461461
phy_addr = (phys_addr_t)((buf_info.addr_hi << 32) | buf_info.addr_lo);

‎drivers/block/drbd/drbd_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,7 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock,
18161816

18171817
/* THINK if (signal_pending) return ... ? */
18181818

1819-
iov_iter_kvec(&msg.msg_iter, WRITE, &iov, 1, size);
1819+
iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, &iov, 1, size);
18201820

18211821
if (sock == connection->data.socket) {
18221822
rcu_read_lock();

‎drivers/block/drbd/drbd_receiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ static int drbd_recv_short(struct socket *sock, void *buf, size_t size, int flag
507507
struct msghdr msg = {
508508
.msg_flags = (flags ? flags : MSG_WAITALL | MSG_NOSIGNAL)
509509
};
510-
iov_iter_kvec(&msg.msg_iter, READ, &iov, 1, size);
510+
iov_iter_kvec(&msg.msg_iter, ITER_DEST, &iov, 1, size);
511511
return sock_recvmsg(sock, &msg, msg.msg_flags);
512512
}
513513

‎drivers/block/loop.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos)
243243
struct iov_iter i;
244244
ssize_t bw;
245245

246-
iov_iter_bvec(&i, WRITE, bvec, 1, bvec->bv_len);
246+
iov_iter_bvec(&i, ITER_SOURCE, bvec, 1, bvec->bv_len);
247247

248248
file_start_write(file);
249249
bw = vfs_iter_write(file, &i, ppos, 0);
@@ -286,7 +286,7 @@ static int lo_read_simple(struct loop_device *lo, struct request *rq,
286286
ssize_t len;
287287

288288
rq_for_each_segment(bvec, rq, iter) {
289-
iov_iter_bvec(&i, READ, &bvec, 1, bvec.bv_len);
289+
iov_iter_bvec(&i, ITER_DEST, &bvec, 1, bvec.bv_len);
290290
len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
291291
if (len < 0)
292292
return len;
@@ -392,7 +392,7 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret)
392392
}
393393

394394
static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
395-
loff_t pos, bool rw)
395+
loff_t pos, int rw)
396396
{
397397
struct iov_iter iter;
398398
struct req_iterator rq_iter;
@@ -448,7 +448,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
448448
cmd->iocb.ki_flags = IOCB_DIRECT;
449449
cmd->iocb.ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0);
450450

451-
if (rw == WRITE)
451+
if (rw == ITER_SOURCE)
452452
ret = call_write_iter(file, &cmd->iocb, &iter);
453453
else
454454
ret = call_read_iter(file, &cmd->iocb, &iter);
@@ -490,12 +490,12 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
490490
return lo_fallocate(lo, rq, pos, FALLOC_FL_PUNCH_HOLE);
491491
case REQ_OP_WRITE:
492492
if (cmd->use_aio)
493-
return lo_rw_aio(lo, cmd, pos, WRITE);
493+
return lo_rw_aio(lo, cmd, pos, ITER_SOURCE);
494494
else
495495
return lo_write_simple(lo, rq, pos);
496496
case REQ_OP_READ:
497497
if (cmd->use_aio)
498-
return lo_rw_aio(lo, cmd, pos, READ);
498+
return lo_rw_aio(lo, cmd, pos, ITER_DEST);
499499
else
500500
return lo_read_simple(lo, rq, pos);
501501
default:

‎drivers/block/nbd.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
563563
u32 nbd_cmd_flags = 0;
564564
int sent = nsock->sent, skip = 0;
565565

566-
iov_iter_kvec(&from, WRITE, &iov, 1, sizeof(request));
566+
iov_iter_kvec(&from, ITER_SOURCE, &iov, 1, sizeof(request));
567567

568568
type = req_to_nbd_cmd_type(req);
569569
if (type == U32_MAX)
@@ -649,7 +649,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
649649

650650
dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n",
651651
req, bvec.bv_len);
652-
iov_iter_bvec(&from, WRITE, &bvec, 1, bvec.bv_len);
652+
iov_iter_bvec(&from, ITER_SOURCE, &bvec, 1, bvec.bv_len);
653653
if (skip) {
654654
if (skip >= iov_iter_count(&from)) {
655655
skip -= iov_iter_count(&from);
@@ -701,7 +701,7 @@ static int nbd_read_reply(struct nbd_device *nbd, int index,
701701
int result;
702702

703703
reply->magic = 0;
704-
iov_iter_kvec(&to, READ, &iov, 1, sizeof(*reply));
704+
iov_iter_kvec(&to, ITER_DEST, &iov, 1, sizeof(*reply));
705705
result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL);
706706
if (result < 0) {
707707
if (!nbd_disconnected(nbd->config))
@@ -790,7 +790,7 @@ static struct nbd_cmd *nbd_handle_reply(struct nbd_device *nbd, int index,
790790
struct iov_iter to;
791791

792792
rq_for_each_segment(bvec, req, iter) {
793-
iov_iter_bvec(&to, READ, &bvec, 1, bvec.bv_len);
793+
iov_iter_bvec(&to, ITER_DEST, &bvec, 1, bvec.bv_len);
794794
result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL);
795795
if (result < 0) {
796796
dev_err(disk_to_dev(nbd->disk), "Receive data failed (result %d)\n",
@@ -1267,7 +1267,7 @@ static void send_disconnects(struct nbd_device *nbd)
12671267
for (i = 0; i < config->num_connections; i++) {
12681268
struct nbd_sock *nsock = config->socks[i];
12691269

1270-
iov_iter_kvec(&from, WRITE, &iov, 1, sizeof(request));
1270+
iov_iter_kvec(&from, ITER_SOURCE, &iov, 1, sizeof(request));
12711271
mutex_lock(&nsock->tx_lock);
12721272
ret = sock_xmit(nbd, i, 1, &from, 0, NULL);
12731273
if (ret < 0)

‎drivers/char/random.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags
12911291
return ret;
12921292
}
12931293

1294-
ret = import_single_range(READ, ubuf, len, &iov, &iter);
1294+
ret = import_single_range(ITER_DEST, ubuf, len, &iov, &iter);
12951295
if (unlikely(ret))
12961296
return ret;
12971297
return get_random_bytes_user(&iter);
@@ -1409,7 +1409,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
14091409
return -EINVAL;
14101410
if (get_user(len, p++))
14111411
return -EFAULT;
1412-
ret = import_single_range(WRITE, p, len, &iov, &iter);
1412+
ret = import_single_range(ITER_SOURCE, p, len, &iov, &iter);
14131413
if (unlikely(ret))
14141414
return ret;
14151415
ret = write_pool_user(&iter);

‎drivers/fsi/fsi-sbefifo.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ static void sbefifo_collect_async_ffdc(struct sbefifo *sbefifo)
659659
}
660660
ffdc_iov.iov_base = ffdc;
661661
ffdc_iov.iov_len = SBEFIFO_MAX_FFDC_SIZE;
662-
iov_iter_kvec(&ffdc_iter, READ, &ffdc_iov, 1, SBEFIFO_MAX_FFDC_SIZE);
662+
iov_iter_kvec(&ffdc_iter, ITER_DEST, &ffdc_iov, 1, SBEFIFO_MAX_FFDC_SIZE);
663663
cmd[0] = cpu_to_be32(2);
664664
cmd[1] = cpu_to_be32(SBEFIFO_CMD_GET_SBE_FFDC);
665665
rc = sbefifo_do_command(sbefifo, cmd, 2, &ffdc_iter);
@@ -756,7 +756,7 @@ int sbefifo_submit(struct device *dev, const __be32 *command, size_t cmd_len,
756756
rbytes = (*resp_len) * sizeof(__be32);
757757
resp_iov.iov_base = response;
758758
resp_iov.iov_len = rbytes;
759-
iov_iter_kvec(&resp_iter, READ, &resp_iov, 1, rbytes);
759+
iov_iter_kvec(&resp_iter, ITER_DEST, &resp_iov, 1, rbytes);
760760

761761
/* Perform the command */
762762
rc = mutex_lock_interruptible(&sbefifo->lock);
@@ -839,7 +839,7 @@ static ssize_t sbefifo_user_read(struct file *file, char __user *buf,
839839
/* Prepare iov iterator */
840840
resp_iov.iov_base = buf;
841841
resp_iov.iov_len = len;
842-
iov_iter_init(&resp_iter, READ, &resp_iov, 1, len);
842+
iov_iter_init(&resp_iter, ITER_DEST, &resp_iov, 1, len);
843843

844844
/* Perform the command */
845845
rc = mutex_lock_interruptible(&sbefifo->lock);

‎drivers/infiniband/ulp/rtrs/rtrs-clt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ static void rtrs_clt_init_req(struct rtrs_clt_io_req *req,
966966
refcount_set(&req->ref, 1);
967967
req->mp_policy = clt_path->clt->mp_policy;
968968

969-
iov_iter_kvec(&iter, WRITE, vec, 1, usr_len);
969+
iov_iter_kvec(&iter, ITER_SOURCE, vec, 1, usr_len);
970970
len = _copy_from_iter(req->iu->buf, usr_len, &iter);
971971
WARN_ON(len != usr_len);
972972

‎drivers/isdn/mISDN/l1oip_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ l1oip_socket_thread(void *data)
706706
printk(KERN_DEBUG "%s: socket created and open\n",
707707
__func__);
708708
while (!signal_pending(current)) {
709-
iov_iter_kvec(&msg.msg_iter, READ, &iov, 1, recvbuf_size);
709+
iov_iter_kvec(&msg.msg_iter, ITER_DEST, &iov, 1, recvbuf_size);
710710
recvlen = sock_recvmsg(socket, &msg, 0);
711711
if (recvlen > 0) {
712712
l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen);

‎drivers/misc/vmw_vmci/vmci_queue_pair.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3044,7 +3044,7 @@ ssize_t vmci_qpair_enqueue(struct vmci_qp *qpair,
30443044
if (!qpair || !buf)
30453045
return VMCI_ERROR_INVALID_ARGS;
30463046

3047-
iov_iter_kvec(&from, WRITE, &v, 1, buf_size);
3047+
iov_iter_kvec(&from, ITER_SOURCE, &v, 1, buf_size);
30483048

30493049
qp_lock(qpair);
30503050

@@ -3088,7 +3088,7 @@ ssize_t vmci_qpair_dequeue(struct vmci_qp *qpair,
30883088
if (!qpair || !buf)
30893089
return VMCI_ERROR_INVALID_ARGS;
30903090

3091-
iov_iter_kvec(&to, READ, &v, 1, buf_size);
3091+
iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size);
30923092

30933093
qp_lock(qpair);
30943094

@@ -3133,7 +3133,7 @@ ssize_t vmci_qpair_peek(struct vmci_qp *qpair,
31333133
if (!qpair || !buf)
31343134
return VMCI_ERROR_INVALID_ARGS;
31353135

3136-
iov_iter_kvec(&to, READ, &v, 1, buf_size);
3136+
iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size);
31373137

31383138
qp_lock(qpair);
31393139

‎drivers/net/ppp/ppp_generic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
480480
ret = -EFAULT;
481481
iov.iov_base = buf;
482482
iov.iov_len = count;
483-
iov_iter_init(&to, READ, &iov, 1, count);
483+
iov_iter_init(&to, ITER_DEST, &iov, 1, count);
484484
if (skb_copy_datagram_iter(skb, 0, &to, skb->len))
485485
goto outf;
486486
ret = skb->len;

‎drivers/nvme/host/tcp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ static inline void nvme_tcp_advance_req(struct nvme_tcp_request *req,
301301
if (!iov_iter_count(&req->iter) &&
302302
req->data_sent < req->data_len) {
303303
req->curr_bio = req->curr_bio->bi_next;
304-
nvme_tcp_init_iter(req, WRITE);
304+
nvme_tcp_init_iter(req, ITER_SOURCE);
305305
}
306306
}
307307

@@ -781,7 +781,7 @@ static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,
781781
nvme_tcp_init_recv_ctx(queue);
782782
return -EIO;
783783
}
784-
nvme_tcp_init_iter(req, READ);
784+
nvme_tcp_init_iter(req, ITER_DEST);
785785
}
786786

787787
/* we can read only from what is left in this bio */

‎drivers/nvme/target/io-cmd-file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos,
102102
if (req->cmd->rw.control & cpu_to_le16(NVME_RW_FUA))
103103
ki_flags |= IOCB_DSYNC;
104104
call_iter = req->ns->file->f_op->write_iter;
105-
rw = WRITE;
105+
rw = ITER_SOURCE;
106106
} else {
107107
call_iter = req->ns->file->f_op->read_iter;
108-
rw = READ;
108+
rw = ITER_DEST;
109109
}
110110

111111
iov_iter_bvec(&iter, rw, req->f.bvec, nr_segs, count);

‎drivers/nvme/target/tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ static void nvmet_tcp_build_pdu_iovec(struct nvmet_tcp_cmd *cmd)
331331
sg_offset = 0;
332332
}
333333

334-
iov_iter_bvec(&cmd->recv_msg.msg_iter, READ, cmd->iov,
334+
iov_iter_bvec(&cmd->recv_msg.msg_iter, ITER_DEST, cmd->iov,
335335
nr_pages, cmd->pdu_len);
336336
}
337337

‎drivers/s390/char/zcore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static inline int memcpy_hsa_kernel(void *dst, unsigned long src, size_t count)
103103

104104
kvec.iov_base = dst;
105105
kvec.iov_len = count;
106-
iov_iter_kvec(&iter, READ, &kvec, 1, count);
106+
iov_iter_kvec(&iter, ITER_DEST, &kvec, 1, count);
107107
if (memcpy_hsa_iter(&iter, src, count) < count)
108108
return -EIO;
109109
return 0;

‎drivers/scsi/sg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)
17261726
Sg_scatter_hold *rsv_schp = &sfp->reserve;
17271727
struct request_queue *q = sfp->parentdp->device->request_queue;
17281728
struct rq_map_data *md, map_data;
1729-
int rw = hp->dxfer_direction == SG_DXFER_TO_DEV ? WRITE : READ;
1729+
int rw = hp->dxfer_direction == SG_DXFER_TO_DEV ? ITER_SOURCE : ITER_DEST;
17301730
struct scsi_cmnd *scmd;
17311731

17321732
SCSI_LOG_TIMEOUT(4, sg_printk(KERN_INFO, sfp->parentdp,

‎drivers/target/iscsi/iscsi_target_util.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ int rx_data(
12251225
return -1;
12261226

12271227
memset(&msg, 0, sizeof(struct msghdr));
1228-
iov_iter_kvec(&msg.msg_iter, READ, iov, iov_count, data);
1228+
iov_iter_kvec(&msg.msg_iter, ITER_DEST, iov, iov_count, data);
12291229

12301230
while (msg_data_left(&msg)) {
12311231
rx_loop = sock_recvmsg(conn->sock, &msg, MSG_WAITALL);
@@ -1261,7 +1261,7 @@ int tx_data(
12611261

12621262
memset(&msg, 0, sizeof(struct msghdr));
12631263

1264-
iov_iter_kvec(&msg.msg_iter, WRITE, iov, iov_count, data);
1264+
iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, iov, iov_count, data);
12651265

12661266
while (msg_data_left(&msg)) {
12671267
int tx_loop = sock_sendmsg(conn->sock, &msg);

‎drivers/target/target_core_file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ fd_execute_write_same(struct se_cmd *cmd)
473473
len += se_dev->dev_attrib.block_size;
474474
}
475475

476-
iov_iter_bvec(&iter, WRITE, bvec, nolb, len);
476+
iov_iter_bvec(&iter, ITER_SOURCE, bvec, nolb, len);
477477
ret = vfs_iter_write(fd_dev->fd_file, &iter, &pos, 0);
478478

479479
kfree(bvec);

‎drivers/usb/usbip/usbip_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ int usbip_recv(struct socket *sock, void *buf, int size)
309309
if (!sock || !buf || !size)
310310
return -EINVAL;
311311

312-
iov_iter_kvec(&msg.msg_iter, READ, &iov, 1, size);
312+
iov_iter_kvec(&msg.msg_iter, ITER_DEST, &iov, 1, size);
313313

314314
usbip_dbg_xmit("enter\n");
315315

‎drivers/vhost/net.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ static size_t init_iov_iter(struct vhost_virtqueue *vq, struct iov_iter *iter,
611611
/* Skip header. TODO: support TSO. */
612612
size_t len = iov_length(vq->iov, out);
613613

614-
iov_iter_init(iter, WRITE, vq->iov, out, len);
614+
iov_iter_init(iter, ITER_SOURCE, vq->iov, out, len);
615615
iov_iter_advance(iter, hdr_size);
616616

617617
return iov_iter_count(iter);
@@ -1184,14 +1184,14 @@ static void handle_rx(struct vhost_net *net)
11841184
msg.msg_control = vhost_net_buf_consume(&nvq->rxq);
11851185
/* On overrun, truncate and discard */
11861186
if (unlikely(headcount > UIO_MAXIOV)) {
1187-
iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1);
1187+
iov_iter_init(&msg.msg_iter, ITER_DEST, vq->iov, 1, 1);
11881188
err = sock->ops->recvmsg(sock, &msg,
11891189
1, MSG_DONTWAIT | MSG_TRUNC);
11901190
pr_debug("Discarded rx packet: len %zd\n", sock_len);
11911191
continue;
11921192
}
11931193
/* We don't need to be notified again. */
1194-
iov_iter_init(&msg.msg_iter, READ, vq->iov, in, vhost_len);
1194+
iov_iter_init(&msg.msg_iter, ITER_DEST, vq->iov, in, vhost_len);
11951195
fixup = msg.msg_iter;
11961196
if (unlikely((vhost_hlen))) {
11971197
/* We will supply the header ourselves

0 commit comments

Comments
 (0)