Update bcachefs sources to eb83f1f842bb mean and variance: Promote to lib/math

1 files changed, 27 insertions, 42 deletions

diff --git a/libbcachefs/lru.c b/libbcachefs/lru.c
index 82c08a98..e6d081c0 100644
--- a/libbcachefs/lru.c
+++ b/libbcachefs/lru.c
@@ -40,8 +40,8 @@ void bch2_lru_pos_to_text(struct printbuf *out, struct bpos lru)
 		   u64_to_bucket(lru.offset).offset);
 }
 
-static inline int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
-				 u64 dev_bucket, u64 time, bool set)
+static int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
+			  u64 dev_bucket, u64 time, bool set)
 {
 	return time
 		? bch2_btree_bit_mod(trans, BTREE_ID_lru,
@@ -51,12 +51,12 @@ static inline int __bch2_lru_set(struct btree_trans *trans, u16 lru_id,
 
 int bch2_lru_del(struct btree_trans *trans, u16 lru_id, u64 dev_bucket, u64 time)
 {
-	return __bch2_lru_set(trans, lru_id, dev_bucket, time, false);
+	return __bch2_lru_set(trans, lru_id, dev_bucket, time, KEY_TYPE_deleted);
 }
 
 int bch2_lru_set(struct btree_trans *trans, u16 lru_id, u64 dev_bucket, u64 time)
 {
-	return __bch2_lru_set(trans, lru_id, dev_bucket, time, true);
+	return __bch2_lru_set(trans, lru_id, dev_bucket, time, KEY_TYPE_set);
 }
 
 int bch2_lru_change(struct btree_trans *trans,
@@ -66,8 +66,8 @@ int bch2_lru_change(struct btree_trans *trans,
 	if (old_time == new_time)
 		return 0;
 
-	return  __bch2_lru_set(trans, lru_id, dev_bucket, old_time, false) ?:
-		__bch2_lru_set(trans, lru_id, dev_bucket, new_time, true);
+	return  bch2_lru_del(trans, lru_id, dev_bucket, old_time) ?:
+		bch2_lru_set(trans, lru_id, dev_bucket, new_time);
 }
 
 static const char * const bch2_lru_types[] = {
@@ -77,11 +77,10 @@ static const char * const bch2_lru_types[] = {
 	NULL
 };
 
-/* Returns 1 if key has been deleted */
-int bch2_check_lru_key(struct btree_trans *trans,
-		       struct btree_iter *lru_iter,
-		       struct bkey_s_c lru_k,
-		       struct bpos *last_flushed_pos)
+static int bch2_check_lru_key(struct btree_trans *trans,
+			      struct btree_iter *lru_iter,
+			      struct bkey_s_c lru_k,
+			      struct bpos *last_flushed_pos)
 {
 	struct bch_fs *c = trans->c;
 	struct btree_iter iter;
@@ -90,6 +89,7 @@ int bch2_check_lru_key(struct btree_trans *trans,
 	const struct bch_alloc_v4 *a;
 	struct printbuf buf1 = PRINTBUF;
 	struct printbuf buf2 = PRINTBUF;
+	enum bch_lru_type type = lru_type(lru_k);
 	struct bpos alloc_pos = u64_to_bucket(lru_k.k->p.offset);
 	u64 idx;
 	int ret;
@@ -98,7 +98,7 @@ int bch2_check_lru_key(struct btree_trans *trans,
 			lru_entry_to_invalid_bucket,
 			"lru key points to nonexistent device:bucket %llu:%llu",
 			alloc_pos.inode, alloc_pos.offset))
-		goto delete;
+		return bch2_btree_delete_at(trans, lru_iter, 0);
 
 	k = bch2_bkey_get_iter(trans, &iter, BTREE_ID_alloc, alloc_pos, 0);
 	ret = bkey_err(k);
@@ -107,7 +107,6 @@ int bch2_check_lru_key(struct btree_trans *trans,
 
 	a = bch2_alloc_to_v4(k, &a_convert);
 
-	enum bch_lru_type type = lru_type(lru_k);
 	switch (type) {
 	case BCH_LRU_read:
 		idx = alloc_lru_idx_read(*a);
@@ -115,34 +114,27 @@ int bch2_check_lru_key(struct btree_trans *trans,
 	case BCH_LRU_fragmentation:
 		idx = a->fragmentation_lru;
 		break;
-	default:
-		/* unknown LRU type, don't check: */
-		goto out;
 	}
 
 	if (lru_k.k->type != KEY_TYPE_set ||
 	    lru_pos_time(lru_k.k->p) != idx) {
 		if (!bpos_eq(*last_flushed_pos, lru_k.k->p)) {
-			ret = bch2_btree_write_buffer_flush_sync(trans);
-			if (!ret) {
-				*last_flushed_pos = lru_k.k->p;
-				ret = -BCH_ERR_transaction_restart_write_buffer_flush;
-			}
+			*last_flushed_pos = lru_k.k->p;
+			ret = bch2_btree_write_buffer_flush_sync(trans) ?:
+				-BCH_ERR_transaction_restart_write_buffer_flush;
 			goto out;
 		}
 
-		if ((c->opts.reconstruct_alloc &&
-		     c->curr_recovery_pass <= BCH_RECOVERY_PASS_check_lrus) ||
+		if (c->opts.reconstruct_alloc ||
 		    fsck_err(c, lru_entry_bad,
 			     "incorrect lru entry: lru %s time %llu\n"
 			     "  %s\n"
-			     "for\n"
-			     "  %s",
+			     "  for %s",
 			     bch2_lru_types[type],
 			     lru_pos_time(lru_k.k->p),
 			     (bch2_bkey_val_to_text(&buf1, c, lru_k), buf1.buf),
 			     (bch2_bkey_val_to_text(&buf2, c, k), buf2.buf)))
-			goto delete;
+			ret = bch2_btree_delete_at(trans, lru_iter, 0);
 	}
 out:
 err:
@@ -151,14 +143,6 @@ fsck_err:
 	printbuf_exit(&buf2);
 	printbuf_exit(&buf1);
 	return ret;
-delete:
-	ret =   bch2_btree_delete_at(trans, lru_iter, 0) ?:
-		bch2_trans_commit(trans, NULL, NULL,
-				  BCH_WATERMARK_btree|
-				  BCH_TRANS_COMMIT_lazy_rw|
-				  BCH_TRANS_COMMIT_no_enospc) ?:
-		1;
-	goto out;
 }
 
 int bch2_check_lrus(struct bch_fs *c)
@@ -166,14 +150,15 @@ int bch2_check_lrus(struct bch_fs *c)
 	struct btree_iter iter;
 	struct bkey_s_c k;
 	struct bpos last_flushed_pos = POS_MIN;
+	int ret = 0;
 
-	int ret = bch2_trans_run(c,
-		for_each_btree_key2(trans, iter,
-				BTREE_ID_lru, POS_MIN, BTREE_ITER_PREFETCH, k, ({
-			int ret2 = bch2_check_lru_key(trans, &iter, k, &last_flushed_pos);
-
-			ret2 < 0 ? ret2 : 0;
-		})));
-	bch_err_fn(c, ret);
+	ret = bch2_trans_run(c,
+		for_each_btree_key_commit(trans, iter,
+				BTREE_ID_lru, POS_MIN, BTREE_ITER_PREFETCH, k,
+				NULL, NULL, BCH_TRANS_COMMIT_no_enospc|BCH_TRANS_COMMIT_lazy_rw,
+			bch2_check_lru_key(trans, &iter, k, &last_flushed_pos)));
+	if (ret)
+		bch_err_fn(c, ret);
 	return ret;
+
 }