Commit ec955023 authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents fd2ff277 216e5835
...@@ -8228,6 +8228,7 @@ static int io_buffer_account_pin(struct io_ring_ctx *ctx, struct page **pages, ...@@ -8228,6 +8228,7 @@ static int io_buffer_account_pin(struct io_ring_ctx *ctx, struct page **pages,
{ {
int i, ret; int i, ret;
imu->acct_pages = 0;
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
if (!PageCompound(pages[i])) { if (!PageCompound(pages[i])) {
imu->acct_pages++; imu->acct_pages++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment