Skip to content

Commit

Permalink
io_uring/net: rename io_sendzc()
Browse files Browse the repository at this point in the history
Simple renaming of io_sendzc*() functions in preparatio to adding
a zerocopy sendmsg variant.

Signed-off-by: Pavel Begunkov <[email protected]>
Link: https://lore.kernel.org/r/265af46829e6076dd220011b1858dc3151969226.1663668091.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
isilence authored and axboe committed Sep 21, 2022
1 parent 516e82f commit b0e9b55
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions io_uring/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
return ret;
}

void io_sendzc_cleanup(struct io_kiocb *req)
void io_send_zc_cleanup(struct io_kiocb *req)
{
struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg);

Expand All @@ -913,7 +913,7 @@ void io_sendzc_cleanup(struct io_kiocb *req)
zc->notif = NULL;
}

int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg);
struct io_ring_ctx *ctx = req->ctx;
Expand Down Expand Up @@ -1022,7 +1022,7 @@ static int io_sg_from_iter(struct sock *sk, struct sk_buff *skb,
return ret;
}

int io_sendzc(struct io_kiocb *req, unsigned int issue_flags)
int io_send_zc(struct io_kiocb *req, unsigned int issue_flags)
{
struct sockaddr_storage __address;
struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg);
Expand Down
6 changes: 3 additions & 3 deletions io_uring/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ int io_connect_prep_async(struct io_kiocb *req);
int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
int io_connect(struct io_kiocb *req, unsigned int issue_flags);

int io_sendzc(struct io_kiocb *req, unsigned int issue_flags);
int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
void io_sendzc_cleanup(struct io_kiocb *req);
int io_send_zc(struct io_kiocb *req, unsigned int issue_flags);
int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
void io_send_zc_cleanup(struct io_kiocb *req);
void io_send_zc_fail(struct io_kiocb *req);

void io_netmsg_cache_free(struct io_cache_entry *entry);
Expand Down
6 changes: 3 additions & 3 deletions io_uring/opdef.c
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,10 @@ const struct io_op_def io_op_defs[] = {
.manual_alloc = 1,
#if defined(CONFIG_NET)
.async_size = sizeof(struct io_async_msghdr),
.prep = io_sendzc_prep,
.issue = io_sendzc,
.prep = io_send_zc_prep,
.issue = io_send_zc,
.prep_async = io_send_prep_async,
.cleanup = io_sendzc_cleanup,
.cleanup = io_send_zc_cleanup,
.fail = io_send_zc_fail,
#else
.prep = io_eopnotsupp_prep,
Expand Down

0 comments on commit b0e9b55

Please sign in to comment.