summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-06-03 11:41:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-06-03 11:41:00 -0700
commitec955023967cf9d8669c0bf62fc13aeea002ef9e (patch)
tree48532fa6ff40e3c2011b3c3ca4d6a1a0a1a300d5
parentfd2ff2774e90a0ba58f1158d7ea095af51f31644 (diff)
parent216e5835966a709bb87a4d94a7343dd90ab0bd64 (diff)
downloadlinux-ec955023967cf9d8669c0bf62fc13aeea002ef9e.tar.bz2
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
-rw-r--r--fs/io_uring.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 903458afd56c..42380ed563c4 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++;