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

ec955023 · Linus Torvalds <[email protected]> · 2021-06-03 11:41:00 -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

Commit: ec955023967cf9d8669c0bf62fc13aeea002ef9e
Parents: fd2ff277 · 216e5835

Merge commit. Changes below are compared with the first parent: fd2ff277.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
fs/io_uring.c	modified	+1	−0	View file

fs/io_uring.c

View file

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 903458a..42380ed 100644
--- 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++;