From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Fri, 11 Jun 2021 03:33:27 +0000 (-0400)
Subject: bcachefs: Don't underflow c->sectors_available
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=290448ed2e0ac1165d2dd7a37da8b1e58e69bc08;p=users%2Fwilly%2Fxarray.git

bcachefs: Don't underflow c->sectors_available

This rarely used error path should've been checking for underflow -
oops.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index c0e4cec21b74..da24c4038fc9 100644
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -1437,7 +1437,14 @@ void bch2_trans_fs_usage_apply(struct btree_trans *trans,
 	 */
 	should_not_have_added = added - (s64) disk_res_sectors;
 	if (unlikely(should_not_have_added > 0)) {
-		atomic64_sub(should_not_have_added, &c->sectors_available);
+		u64 old, new, v = atomic64_read(&c->sectors_available);
+
+		do {
+			old = v;
+			new = max_t(s64, 0, old - should_not_have_added);
+		} while ((v = atomic64_cmpxchg(&c->sectors_available,
+					       old, new)) != old);
+
 		added -= should_not_have_added;
 		warn = true;
 	}