Merge branch 'io_uring-6.16' into for-next

axboe · axboe · commit 5e409aa01a23 · 2025-07-07T19:42:06.000-06:00
* io_uring-6.16:
  io_uring/zcrx: fix pp destruction warnings
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c
@@ -863,10 +863,7 @@ static int io_pp_zc_init(struct page_pool *pp)
 static void io_pp_zc_destroy(struct page_pool *pp)
 {
 	struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);
-	struct io_zcrx_area *area = ifq->area;
 
-	if (WARN_ON_ONCE(area->free_count != area->nia.num_niovs))
-		return;
 	percpu_ref_put(&ifq->ctx->refs);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -863,10 +863,7 @@ static int io_pp_zc_init(struct page_pool *pp)`
`863`	`863`	`static void io_pp_zc_destroy(struct page_pool *pp)`
`864`	`864`	`{`
`865`	`865`	`struct io_zcrx_ifq *ifq = io_pp_to_ifq(pp);`
`866`		`- struct io_zcrx_area *area = ifq->area;`
`867`	`866`
`868`		`- if (WARN_ON_ONCE(area->free_count != area->nia.num_niovs))`
`869`		`- return;`
`870`	`867`	`percpu_ref_put(&ifq->ctx->refs);`
`871`	`868`	`}`
`872`	`869`