]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
io_uring/zctx: rename flags var for more clarity
authorPavel Begunkov <asml.silence@gmail.com>
Mon, 16 Feb 2026 11:45:53 +0000 (11:45 +0000)
committerJens Axboe <axboe@kernel.dk>
Mon, 9 Mar 2026 13:21:53 +0000 (07:21 -0600)
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>
io_uring/net.c

index d27adbe3f20be50d80d20987050cf8cd5161ed38..07f002c1d7df1c148b142776317f9076bf53fff5 100644 (file)
@@ -1526,7 +1526,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
        struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
        struct io_async_msghdr *kmsg = req->async_data;
        struct socket *sock;
-       unsigned flags;
+       unsigned msg_flags;
        int ret, min_ret = 0;
 
        if (req->flags & REQ_F_IMPORT_BUFFER) {
@@ -1552,21 +1552,21 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
            (sr->flags & IORING_RECVSEND_POLL_FIRST))
                return -EAGAIN;
 
-       flags = sr->msg_flags;
+       msg_flags = sr->msg_flags;
        if (issue_flags & IO_URING_F_NONBLOCK)
-               flags |= MSG_DONTWAIT;
-       if (flags & MSG_WAITALL)
+               msg_flags |= MSG_DONTWAIT;
+       if (msg_flags & MSG_WAITALL)
                min_ret = iov_iter_count(&kmsg->msg.msg_iter);
 
        kmsg->msg.msg_control_user = sr->msg_control;
        kmsg->msg.msg_ubuf = &io_notif_to_data(sr->notif)->uarg;
-       ret = __sys_sendmsg_sock(sock, &kmsg->msg, flags);
+       ret = __sys_sendmsg_sock(sock, &kmsg->msg, msg_flags);
 
        if (unlikely(ret < min_ret)) {
                if (ret == -EAGAIN && (issue_flags & IO_URING_F_NONBLOCK))
                        return -EAGAIN;
 
-               if (ret > 0 && io_net_retry(sock, flags)) {
+               if (ret > 0 && io_net_retry(sock, msg_flags)) {
                        sr->done_io += ret;
                        return -EAGAIN;
                }