From: Kent Overstreet <kent.overstreet@linux.dev>
To: linux-bcachefs@vger.kernel.org
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Subject: [PATCH 1/3] bcachefs: fix disk reservation accounting in bch2_folio_reservation_get()
Date: Fri, 18 Oct 2024 00:40:01 -0400 [thread overview]
Message-ID: <20241018044006.4067521-2-kent.overstreet@linux.dev> (raw)
In-Reply-To: <20241018044006.4067521-1-kent.overstreet@linux.dev>
bch2_disk_reservation_put() zeroes out the reservation - oops.
This fixes a disk reservation leak when getting a quota reservation
returned an error.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---
fs/bcachefs/fs-io-pagecache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/bcachefs/fs-io-pagecache.c b/fs/bcachefs/fs-io-pagecache.c
index af3a24546aa3..cde3a0445ee9 100644
--- a/fs/bcachefs/fs-io-pagecache.c
+++ b/fs/bcachefs/fs-io-pagecache.c
@@ -431,9 +431,9 @@ int bch2_folio_reservation_get(struct bch_fs *c,
ret = bch2_quota_reservation_add(c, inode, &res->quota, quota_sectors, true);
if (unlikely(ret)) {
struct disk_reservation tmp = { .sectors = disk_sectors };
+ res->disk.sectors -= disk_sectors;
bch2_disk_reservation_put(c, &tmp);
- res->disk.sectors -= disk_sectors;
return ret;
}
}
--
2.45.2
next prev parent reply other threads:[~2024-10-18 4:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-18 4:40 [PATCH 0/3] fix buffered write path on -ENOSPC Kent Overstreet
2024-10-18 4:40 ` Kent Overstreet [this message]
2024-10-18 11:49 ` [PATCH 1/3] bcachefs: fix disk reservation accounting in bch2_folio_reservation_get() wangjianjian (C)
2024-10-18 4:40 ` [PATCH 2/3] bcachefs: bch2_folio_reservation_get_partial() is now better behaved Kent Overstreet
2024-10-18 4:40 ` [PATCH 3/3] bcachefs: Fix data corruption on -ENOSPC in buffered write path Kent Overstreet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241018044006.4067521-2-kent.overstreet@linux.dev \
--to=kent.overstreet@linux.dev \
--cc=linux-bcachefs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox