io_uring/net: make POLL_FIRST receive side checks consistent
Jens Axboe
maintainerPATCH 1/1 io_uring/net: make POLL_FIRST receive side checks consistent
io_recv() and io_recvzc() are the odd ones out, as they checks for whether POLL_FIRST should be honored before checking if the file is a socket. It doesn't really matter, but might as well make it consistent across all receive and send types.
Signed-off-by Jens Axboe <[email protected]>
---
io_uring/net.c +8 -8
@@ -1216,14 +1216,14 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)bool force_nonblock = issue_flags &IO_URING_F_NONBLOCK ;bool mshot_finished; -if (!(req->flags &REQ_F_POLLED ) && - (sr->flags &IORING_RECVSEND_POLL_FIRST )) -return -EAGAIN ; - sock =sock_from_file (req->file);if (unlikely (!sock))return -ENOTSOCK ; +if (!(req->flags &REQ_F_POLLED ) && + (sr->flags &IORING_RECVSEND_POLL_FIRST )) +return -EAGAIN ; + flags = sr->msg_flags;if (force_nonblock) flags |=MSG_DONTWAIT ;
@@ -1328,14 +1328,14 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags)unsigned int len;int ret; -if (!(req->flags &REQ_F_POLLED ) && - (zc->flags &IORING_RECVSEND_POLL_FIRST )) -return -EAGAIN ; - sock =sock_from_file (req->file);if (unlikely (!sock))return -ENOTSOCK ; +if (!(req->flags &REQ_F_POLLED ) && + (zc->flags &IORING_RECVSEND_POLL_FIRST )) +return -EAGAIN ; + len = zc->len; ret =io_zcrx_recv (req, zc->ifq, sock,0 , issue_flags, &zc->len);if (len && zc->len ==0 ) {
Signature · 1 line
Jens Axboe