From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 14 Jun 2022 21:51:20 +0000 (-0400)
Subject: bcachefs: Split out dev_buckets_free()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=30f0349d62429effd729ae9272c6fb57f47d1436;p=linux.git

bcachefs: Split out dev_buckets_free()

Previously, dev_buckets_available() only counted buckets that are
eligible to be allocated right now - i.e. buckets that don't have cached
data, or need discard, or need gc gens, etc.

But most users of this function want to know how many buckets are
eligible to be allocated from without moving data around - copygc,
allocator striping, which means we should be including cached data
buckets etc.

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

diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
index ef8f10a51489d..174b3a745ab8f 100644
--- a/fs/bcachefs/alloc_foreground.c
+++ b/fs/bcachefs/alloc_foreground.c
@@ -526,7 +526,7 @@ static struct open_bucket *bch2_bucket_alloc_trans(struct btree_trans *trans,
 	bool waiting = false;
 again:
 	usage = bch2_dev_usage_read(ca);
-	avail = __dev_buckets_available(ca, usage,reserve);
+	avail = dev_buckets_free(ca, usage,reserve);
 
 	if (usage.d[BCH_DATA_need_discard].buckets > avail)
 		bch2_do_discards(c);
diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index 327022cd0f7ac..080bcb20a5b02 100644
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -144,12 +144,25 @@ static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum alloc_reser
 	return reserved;
 }
 
+static inline u64 dev_buckets_free(struct bch_dev *ca,
+				   struct bch_dev_usage usage,
+				   enum alloc_reserve reserve)
+{
+	return max_t(s64, 0,
+		     usage.d[BCH_DATA_free].buckets -
+		     ca->nr_open_buckets -
+		     bch2_dev_buckets_reserved(ca, reserve));
+}
+
 static inline u64 __dev_buckets_available(struct bch_dev *ca,
 					  struct bch_dev_usage usage,
 					  enum alloc_reserve reserve)
 {
 	return max_t(s64, 0,
 		     usage.d[BCH_DATA_free].buckets -
+		     usage.d[BCH_DATA_cached].buckets -
+		     usage.d[BCH_DATA_need_gc_gens].buckets -
+		     usage.d[BCH_DATA_need_discard].buckets -
 		     ca->nr_open_buckets -
 		     bch2_dev_buckets_reserved(ca, reserve));
 }