io_uring/rsrc: clear 'slot' entry upfront

axboe · axboe · commit 021b153f7d41 · 2024-09-11T13:52:17.000-06:00
No functional changes in this patch, but clearing the slot pointer
earlier will be required by a later change.

Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
@@ -114,14 +114,14 @@ static void io_buffer_unmap(struct io_ring_ctx *ctx, struct io_mapped_ubuf **slo
 	struct io_mapped_ubuf *imu = *slot;
 	unsigned int i;
 
+	*slot = NULL;
 	if (imu != &dummy_ubuf) {
 		for (i = 0; i < imu->nr_bvecs; i++)
 			unpin_user_page(imu->bvec[i].bv_page);
 		if (imu->acct_pages)
 			io_unaccount_mem(ctx, imu->acct_pages);
 		kvfree(imu);
 	}
-	*slot = NULL;
 }
 
 static void io_rsrc_put_work(struct io_rsrc_node *node)

Original file line number	Diff line number	Diff line change
`@@ -114,14 +114,14 @@ static void io_buffer_unmap(struct io_ring_ctx ctx, struct io_mapped_ubuf *slo`
`114`	`114`	`struct io_mapped_ubuf imu = slot;`
`115`	`115`	`unsigned int i;`
`116`	`116`
	`117`	`+ *slot = NULL;`
`117`	`118`	`if (imu != &dummy_ubuf) {`
`118`	`119`	`for (i = 0; i < imu->nr_bvecs; i++)`
`119`	`120`	`unpin_user_page(imu->bvec[i].bv_page);`
`120`	`121`	`if (imu->acct_pages)`
`121`	`122`	`io_unaccount_mem(ctx, imu->acct_pages);`
`122`	`123`	`kvfree(imu);`
`123`	`124`	`}`
`124`		`- *slot = NULL;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`static void io_rsrc_put_work(struct io_rsrc_node *node)`