tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

io_uring/zctx: rename flags var for more clarity

The name "flags" is too overloaded, so rename the variable in
io_sendmsg_zc() into msg_flags to stress that it contains MSG_*.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Pavel Begunkov and committed by
Jens Axboe c279fcd9 bdb489ad

+6 -6
+6 -6
io_uring/net.c
··· 1526 1526 struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg); 1527 1527 struct io_async_msghdr *kmsg = req->async_data; 1528 1528 struct socket *sock; 1529 - unsigned flags; 1529 + unsigned msg_flags; 1530 1530 int ret, min_ret = 0; 1531 1531 1532 1532 if (req->flags & REQ_F_IMPORT_BUFFER) { ··· 1552 1552 (sr->flags & IORING_RECVSEND_POLL_FIRST)) 1553 1553 return -EAGAIN; 1554 1554 1555 - flags = sr->msg_flags; 1555 + msg_flags = sr->msg_flags; 1556 1556 if (issue_flags & IO_URING_F_NONBLOCK) 1557 - flags |= MSG_DONTWAIT; 1558 - if (flags & MSG_WAITALL) 1557 + msg_flags |= MSG_DONTWAIT; 1558 + if (msg_flags & MSG_WAITALL) 1559 1559 min_ret = iov_iter_count(&kmsg->msg.msg_iter); 1560 1560 1561 1561 kmsg->msg.msg_control_user = sr->msg_control; 1562 1562 kmsg->msg.msg_ubuf = &io_notif_to_data(sr->notif)->uarg; 1563 - ret = __sys_sendmsg_sock(sock, &kmsg->msg, flags); 1563 + ret = __sys_sendmsg_sock(sock, &kmsg->msg, msg_flags); 1564 1564 1565 1565 if (unlikely(ret < min_ret)) { 1566 1566 if (ret == -EAGAIN && (issue_flags & IO_URING_F_NONBLOCK)) 1567 1567 return -EAGAIN; 1568 1568 1569 - if (ret > 0 && io_net_retry(sock, flags)) { 1569 + if (ret > 0 && io_net_retry(sock, msg_flags)) { 1570 1570 sr->done_io += ret; 1571 1571 return -EAGAIN; 1572 1572 }