io-uring.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH for-6.1 1/1] io_uring: remove notif leftovers
@ 2022-10-04  2:19 Pavel Begunkov
  2022-10-04 14:03 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: Pavel Begunkov @ 2022-10-04  2:19 UTC (permalink / raw)
  To: io-uring; +Cc: Jens Axboe, asml.silence

Notifications were killed but there is a couple of fields and struct
declarations left, remove them.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 include/linux/io_uring_types.h | 5 -----
 io_uring/io_uring.c            | 1 -
 2 files changed, 6 deletions(-)

diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h
index aa4d90a53866..f5b687a787a3 100644
--- a/include/linux/io_uring_types.h
+++ b/include/linux/io_uring_types.h
@@ -34,9 +34,6 @@ struct io_file_table {
 	unsigned int alloc_hint;
 };
 
-struct io_notif;
-struct io_notif_slot;
-
 struct io_hash_bucket {
 	spinlock_t		lock;
 	struct hlist_head	list;
@@ -242,8 +239,6 @@ struct io_ring_ctx {
 		unsigned		nr_user_files;
 		unsigned		nr_user_bufs;
 		struct io_mapped_ubuf	**user_bufs;
-		struct io_notif_slot	*notif_slots;
-		unsigned		nr_notif_slots;
 
 		struct io_submit_state	submit_state;
 
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 73b841d4cfd0..5e7c086685bf 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2625,7 +2625,6 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
 	}
 #endif
 	WARN_ON_ONCE(!list_empty(&ctx->ltimeout_list));
-	WARN_ON_ONCE(ctx->notif_slots || ctx->nr_notif_slots);
 
 	if (ctx->mm_account) {
 		mmdrop(ctx->mm_account);
-- 
2.37.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH for-6.1 1/1] io_uring: remove notif leftovers
  2022-10-04  2:19 [PATCH for-6.1 1/1] io_uring: remove notif leftovers Pavel Begunkov
@ 2022-10-04 14:03 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2022-10-04 14:03 UTC (permalink / raw)
  To: io-uring, Pavel Begunkov

On Tue, 4 Oct 2022 03:19:25 +0100, Pavel Begunkov wrote:
> Notifications were killed but there is a couple of fields and struct
> declarations left, remove them.
> 
> 

Applied, thanks!

[1/1] io_uring: remove notif leftovers
      commit: 50dedbd905c7e6e40871ff5765622eed6109788c

Best regards,
-- 
Jens Axboe



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-04 14:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-04  2:19 [PATCH for-6.1 1/1] io_uring: remove notif leftovers Pavel Begunkov
2022-10-04 14:03 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).