Skip to content

Commit 78ef223

Browse files
author
Baoquan He
committed
use less confusing names for iov_iter direction initializers
JIRA: https://issues.redhat.com/browse/RHEL-32199 Upstream Status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Note: The core of this patch was already backported in commit 0d33f8e. And later commit a9e6d79 back ported cifs part. This patch tries to back port the remaining parts which doesn't have conficts. This change is easing code reading and understanding, not related to functionality or features, hence leave those parts to module developer to back port when dependency is met. commit de4eda9 Author: Al Viro <viro@zeniv.linux.org.uk> Date: Thu Sep 15 20:25:47 2022 -0400 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 <viro@zeniv.linux.org.uk> Signed-off-by: Baoquan He <bhe@redhat.com>
1 parent 805ddef commit 78ef223

File tree

28 files changed

+59
-59
lines changed

28 files changed

+59
-59
lines changed

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
@@ -769,7 +769,7 @@ static int build_cipher_test_sglists(struct cipher_test_sglists *tsgls,
769769
struct iov_iter input;
770770
int err;
771771

772-
iov_iter_kvec(&input, WRITE, inputs, nr_inputs, src_total_len);
772+
iov_iter_kvec(&input, ITER_SOURCE, inputs, nr_inputs, src_total_len);
773773
err = build_test_sglist(&tsgls->src, cfg->src_divs, alignmask,
774774
cfg->inplace_mode != OUT_OF_PLACE ?
775775
max(dst_total_len, src_total_len) :
@@ -1226,7 +1226,7 @@ static int build_hash_sglist(struct test_sglist *tsgl,
12261226

12271227
kv.iov_base = (void *)vec->plaintext;
12281228
kv.iov_len = vec->psize;
1229-
iov_iter_kvec(&input, WRITE, &kv, 1, vec->psize);
1229+
iov_iter_kvec(&input, ITER_SOURCE, &kv, 1, vec->psize);
12301230
return build_test_sglist(tsgl, cfg->src_divs, alignmask, vec->psize,
12311231
&input, divs);
12321232
}

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
@@ -1823,7 +1823,7 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock,
18231823

18241824
/* THINK if (signal_pending) return ... ? */
18251825

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

18281828
if (sock == connection->data.socket) {
18291829
rcu_read_lock();

drivers/block/drbd/drbd_receiver.c

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

drivers/block/loop.c

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

244-
iov_iter_bvec(&i, WRITE, bvec, 1, bvec->bv_len);
244+
iov_iter_bvec(&i, ITER_SOURCE, bvec, 1, bvec->bv_len);
245245

246246
file_start_write(file);
247247
bw = vfs_iter_write(file, &i, ppos, 0);
@@ -284,7 +284,7 @@ static int lo_read_simple(struct loop_device *lo, struct request *rq,
284284
ssize_t len;
285285

286286
rq_for_each_segment(bvec, rq, iter) {
287-
iov_iter_bvec(&i, READ, &bvec, 1, bvec.bv_len);
287+
iov_iter_bvec(&i, ITER_DEST, &bvec, 1, bvec.bv_len);
288288
len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);
289289
if (len < 0)
290290
return len;
@@ -390,7 +390,7 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret)
390390
}
391391

392392
static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
393-
loff_t pos, bool rw)
393+
loff_t pos, int rw)
394394
{
395395
struct iov_iter iter;
396396
struct req_iterator rq_iter;
@@ -446,7 +446,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
446446
cmd->iocb.ki_flags = IOCB_DIRECT;
447447
cmd->iocb.ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0);
448448

449-
if (rw == WRITE)
449+
if (rw == ITER_SOURCE)
450450
ret = call_write_iter(file, &cmd->iocb, &iter);
451451
else
452452
ret = call_read_iter(file, &cmd->iocb, &iter);
@@ -488,12 +488,12 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
488488
return lo_fallocate(lo, rq, pos, FALLOC_FL_PUNCH_HOLE);
489489
case REQ_OP_WRITE:
490490
if (cmd->use_aio)
491-
return lo_rw_aio(lo, cmd, pos, WRITE);
491+
return lo_rw_aio(lo, cmd, pos, ITER_SOURCE);
492492
else
493493
return lo_write_simple(lo, rq, pos);
494494
case REQ_OP_READ:
495495
if (cmd->use_aio)
496-
return lo_rw_aio(lo, cmd, pos, READ);
496+
return lo_rw_aio(lo, cmd, pos, ITER_DEST);
497497
else
498498
return lo_read_simple(lo, rq, pos);
499499
default:

drivers/char/random.c

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

1430-
ret = import_single_range(READ, ubuf, len, &iov, &iter);
1430+
ret = import_single_range(ITER_DEST, ubuf, len, &iov, &iter);
14311431
if (unlikely(ret))
14321432
return ret;
14331433
return get_random_bytes_user(&iter);
@@ -1552,7 +1552,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
15521552
return -EINVAL;
15531553
if (get_user(len, p++))
15541554
return -EFAULT;
1555-
ret = import_single_range(WRITE, p, len, &iov, &iter);
1555+
ret = import_single_range(ITER_SOURCE, p, len, &iov, &iter);
15561556
if (unlikely(ret))
15571557
return ret;
15581558
ret = write_pool_user(&iter);

drivers/misc/vmw_vmci/vmci_queue_pair.c

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

3045-
iov_iter_kvec(&from, WRITE, &v, 1, buf_size);
3045+
iov_iter_kvec(&from, ITER_SOURCE, &v, 1, buf_size);
30463046

30473047
qp_lock(qpair);
30483048

@@ -3086,7 +3086,7 @@ ssize_t vmci_qpair_dequeue(struct vmci_qp *qpair,
30863086
if (!qpair || !buf)
30873087
return VMCI_ERROR_INVALID_ARGS;
30883088

3089-
iov_iter_kvec(&to, READ, &v, 1, buf_size);
3089+
iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size);
30903090

30913091
qp_lock(qpair);
30923092

@@ -3131,7 +3131,7 @@ ssize_t vmci_qpair_peek(struct vmci_qp *qpair,
31313131
if (!qpair || !buf)
31323132
return VMCI_ERROR_INVALID_ARGS;
31333133

3134-
iov_iter_kvec(&to, READ, &v, 1, buf_size);
3134+
iov_iter_kvec(&to, ITER_DEST, &v, 1, buf_size);
31353135

31363136
qp_lock(qpair);
31373137

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

fs/9p/vfs_addr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq)
4040
size_t len = subreq->len - subreq->transferred;
4141
int total, err;
4242

43-
iov_iter_xarray(&to, READ, &rreq->mapping->i_pages, pos, len);
43+
iov_iter_xarray(&to, ITER_DEST, &rreq->mapping->i_pages, pos, len);
4444

4545
total = p9_client_read(fid, pos, &to, &err);
4646

@@ -169,7 +169,7 @@ static int v9fs_vfs_write_folio_locked(struct folio *folio)
169169

170170
len = min_t(loff_t, i_size - start, len);
171171

172-
iov_iter_xarray(&from, WRITE, &folio_mapping(folio)->i_pages, start, len);
172+
iov_iter_xarray(&from, ITER_SOURCE, &folio_mapping(folio)->i_pages, start, len);
173173

174174
/* We should have writeback_fid always set */
175175
BUG_ON(!v9inode->writeback_fid);

0 commit comments

Comments
 (0)