Merge tag 'io_uring-5.13-2021-06-03' of git://git.kernel.dk/linux-block

torvalds · torvalds · commit ec955023967c · 2021-06-03T11:41:00.000-07:00
Pull io_uring fix from Jens Axboe:
 "Just a single one-liner fix for an accounting regression in this
  release"

* tag 'io_uring-5.13-2021-06-03' of git://git.kernel.dk/linux-block:
  io_uring: fix misaccounting fix buf pinned pages
diff --git a/fs/io_uring.c b/fs/io_uring.c
@@ -8228,6 +8228,7 @@ static int io_buffer_account_pin(struct io_ring_ctx *ctx, struct page **pages,
 {
 	int i, ret;
 
+	imu->acct_pages = 0;
 	for (i = 0; i < nr_pages; i++) {
 		if (!PageCompound(pages[i])) {
 			imu->acct_pages++;

Original file line number	Diff line number	Diff line change
`@@ -8228,6 +8228,7 @@ static int io_buffer_account_pin(struct io_ring_ctx ctx, struct page *pages,`
`8228`	`8228`	`{`
`8229`	`8229`	`int i, ret;`
`8230`	`8230`
	`8231`	`+ imu->acct_pages = 0;`
`8231`	`8232`	`for (i = 0; i < nr_pages; i++) {`
`8232`	`8233`	`if (!PageCompound(pages[i])) {`
`8233`	`8234`	`imu->acct_pages++;`