Commit d80f9407 authored by Jens Axboe's avatar Jens Axboe

io_uring/net: drop 'kmsg' parameter from io_req_msg_cleanup()

Now that iovec recycling is being done, the iovec is no longer being
freed in there. Hence the kmsg parameter is now useless.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 75191341
...@@ -410,7 +410,6 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) ...@@ -410,7 +410,6 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
} }
static void io_req_msg_cleanup(struct io_kiocb *req, static void io_req_msg_cleanup(struct io_kiocb *req,
struct io_async_msghdr *kmsg,
unsigned int issue_flags) unsigned int issue_flags)
{ {
req->flags &= ~REQ_F_NEED_CLEANUP; req->flags &= ~REQ_F_NEED_CLEANUP;
...@@ -458,7 +457,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags) ...@@ -458,7 +457,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
ret = -EINTR; ret = -EINTR;
req_set_fail(req); req_set_fail(req);
} }
io_req_msg_cleanup(req, kmsg, issue_flags); io_req_msg_cleanup(req, issue_flags);
if (ret >= 0) if (ret >= 0)
ret += sr->done_io; ret += sr->done_io;
else if (sr->done_io) else if (sr->done_io)
...@@ -512,7 +511,7 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags) ...@@ -512,7 +511,7 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)
ret += sr->done_io; ret += sr->done_io;
else if (sr->done_io) else if (sr->done_io)
ret = sr->done_io; ret = sr->done_io;
io_req_msg_cleanup(req, kmsg, issue_flags); io_req_msg_cleanup(req, issue_flags);
io_req_set_res(req, ret, 0); io_req_set_res(req, ret, 0);
return IOU_OK; return IOU_OK;
} }
...@@ -720,7 +719,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, ...@@ -720,7 +719,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret,
*ret = IOU_STOP_MULTISHOT; *ret = IOU_STOP_MULTISHOT;
else else
*ret = IOU_OK; *ret = IOU_OK;
io_req_msg_cleanup(req, kmsg, issue_flags); io_req_msg_cleanup(req, issue_flags);
return true; return true;
} }
...@@ -1206,7 +1205,7 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags) ...@@ -1206,7 +1205,7 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags)
*/ */
if (!(issue_flags & IO_URING_F_UNLOCKED)) { if (!(issue_flags & IO_URING_F_UNLOCKED)) {
io_notif_flush(zc->notif); io_notif_flush(zc->notif);
io_req_msg_cleanup(req, kmsg, 0); io_req_msg_cleanup(req, 0);
} }
io_req_set_res(req, ret, IORING_CQE_F_MORE); io_req_set_res(req, ret, IORING_CQE_F_MORE);
return IOU_OK; return IOU_OK;
...@@ -1268,7 +1267,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) ...@@ -1268,7 +1267,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
*/ */
if (!(issue_flags & IO_URING_F_UNLOCKED)) { if (!(issue_flags & IO_URING_F_UNLOCKED)) {
io_notif_flush(sr->notif); io_notif_flush(sr->notif);
io_req_msg_cleanup(req, kmsg, 0); io_req_msg_cleanup(req, 0);
} }
io_req_set_res(req, ret, IORING_CQE_F_MORE); io_req_set_res(req, ret, IORING_CQE_F_MORE);
return IOU_OK; return IOU_OK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment