Merge branch 'for-7.1/io_uring' into for-next

axboe · axboe · commit 7fa8af91b150 · 2026-03-31T07:36:43.000-06:00
* for-7.1/io_uring:
  io_uring/rsrc: use io_cache_free() to free node
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
@@ -961,7 +961,7 @@ int io_buffer_register_bvec(struct io_uring_cmd *cmd, struct request *rq,
 	 */
 	imu = io_alloc_imu(ctx, blk_rq_nr_phys_segments(rq));
 	if (!imu) {
-		kfree(node);
+		io_cache_free(&ctx->node_cache, node);
 		ret = -ENOMEM;
 		goto unlock;
 	}

Original file line number	Diff line number	Diff line change
`@@ -961,7 +961,7 @@ int io_buffer_register_bvec(struct io_uring_cmd cmd, struct request rq,`
`961`	`961`	`*/`
`962`	`962`	`imu = io_alloc_imu(ctx, blk_rq_nr_phys_segments(rq));`
`963`	`963`	`if (!imu) {`
`964`		`- kfree(node);`
	`964`	`+ io_cache_free(&ctx->node_cache, node);`
`965`	`965`	`ret = -ENOMEM;`
`966`	`966`	`goto unlock;`
`967`	`967`	`}`