diff options
| author | Sasha Levin | 2026-03-12 07:35:07 -0400 |
|---|---|---|
| committer | Sasha Levin | 2026-03-12 07:35:07 -0400 |
| commit | ee6bf57ad14c891455f6ea6f3e7b96d841b436b8 (patch) | |
| tree | a71179a386eba8a95075de3c3ac665db2d02ba9b /io_uring/net.c | |
| parent | 2c8fedbbbb8266b792c1bfec0dbcbed77d61fa8d (diff) | |
| parent | 0d87da0c7e74868a63d2b856454122b5fb30d341 (diff) | |
Merge 6.19.7
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'io_uring/net.c')
| -rw-r--r-- | io_uring/net.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 2e21a4294407..d9a4b83804a2 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -110,7 +110,6 @@ enum sr_retry_flags { struct io_recvzc { struct file *file; - unsigned msg_flags; u16 flags; u32 len; struct io_zcrx_ifq *ifq; @@ -1257,8 +1256,7 @@ int io_recvzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) zc->len = READ_ONCE(sqe->len); zc->flags = READ_ONCE(sqe->ioprio); - zc->msg_flags = READ_ONCE(sqe->msg_flags); - if (zc->msg_flags) + if (READ_ONCE(sqe->msg_flags)) return -EINVAL; if (zc->flags & ~(IORING_RECVSEND_POLL_FIRST | IORING_RECV_MULTISHOT)) return -EINVAL; @@ -1287,8 +1285,7 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags) return -ENOTSOCK; len = zc->len; - ret = io_zcrx_recv(req, zc->ifq, sock, zc->msg_flags | MSG_DONTWAIT, - issue_flags, &zc->len); + ret = io_zcrx_recv(req, zc->ifq, sock, 0, issue_flags, &zc->len); if (len && zc->len == 0) { io_req_set_res(req, 0, 0); |