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>

diff --git a/io_uring/notif.c b/io_uring/notif.c
index 5b0e7bb1198f86488d1892374e1847d32ec764a5..c287adf24e667bdafbf78bce3934a6a8c69ea169 100644 (file)
--- 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 4ae696273c781a125c20a3e5f03ad4b9ae84b17e..7f00176020d3c6ed590d5c43713f765c6ac09af2 100644 (file)
--- 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;