summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2022-11-04 10:59:44 +0000
committerJens Axboe <axboe@kernel.dk>2022-11-21 07:38:31 -0700
commitbedd20bcf3b08c5d2f03f30a83a10022bde5e596 (patch)
treeb1cce235f256b92d9afc74d2c748c90fb89a68ca
parent7fa8e84192fd8dbc97b4c8c1acfd10017c3dd7b6 (diff)
io_uring/net: inline io_notif_flush()
io_notif_flush() is pretty simple, we can inline it. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/332359e7bd124138dfe51340bbec829c9b265c18.1667557923.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--io_uring/notif.c10
-rw-r--r--io_uring/notif.h11
2 files changed, 10 insertions, 11 deletions
diff --git a/io_uring/notif.c b/io_uring/notif.c
index 5b0e7bb1198f..c287adf24e66 100644
--- a/io_uring/notif.c
+++ b/io_uring/notif.c
@@ -67,13 +67,3 @@ struct io_kiocb *io_alloc_notif(struct io_ring_ctx *ctx)
refcount_set(&nd->uarg.refcnt, 1);
return notif;
}
-
-void io_notif_flush(struct io_kiocb *notif)
- __must_hold(&slot->notif->ctx->uring_lock)
-{
- struct io_notif_data *nd = io_notif_to_data(notif);
-
- /* drop slot's master ref */
- if (refcount_dec_and_test(&nd->uarg.refcnt))
- io_req_task_work_add(notif);
-}
diff --git a/io_uring/notif.h b/io_uring/notif.h
index 4ae696273c78..7f00176020d3 100644
--- a/io_uring/notif.h
+++ b/io_uring/notif.h
@@ -18,7 +18,6 @@ struct io_notif_data {
bool zc_copied;
};
-void io_notif_flush(struct io_kiocb *notif);
struct io_kiocb *io_alloc_notif(struct io_ring_ctx *ctx);
static inline struct io_notif_data *io_notif_to_data(struct io_kiocb *notif)
@@ -26,6 +25,16 @@ static inline struct io_notif_data *io_notif_to_data(struct io_kiocb *notif)
return io_kiocb_to_cmd(notif, struct io_notif_data);
}
+static inline void io_notif_flush(struct io_kiocb *notif)
+ __must_hold(&notif->ctx->uring_lock)
+{
+ struct io_notif_data *nd = io_notif_to_data(notif);
+
+ /* drop slot's master ref */
+ if (refcount_dec_and_test(&nd->uarg.refcnt))
+ io_req_task_work_add(notif);
+}
+
static inline int io_notif_account_mem(struct io_kiocb *notif, unsigned len)
{
struct io_ring_ctx *ctx = notif->ctx;