X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs%2Fjournal_seq_blacklist.c;h=f9d9aa95bf3a64640d3d1e6012fc319ca7aad05e;hb=3798bbae98cb82e13df18ddf095488b98afe0ddd;hp=d6b9f2cdf8e7df2664abd4f30df9d67559e0d926;hpb=56c5542c969adbad6bcce80323ff4618c26f83a9;p=bcachefs-tools-debian

diff --git a/libbcachefs/journal_seq_blacklist.c b/libbcachefs/journal_seq_blacklist.c
index d6b9f2c..f9d9aa9 100644
--- a/libbcachefs/journal_seq_blacklist.c
+++ b/libbcachefs/journal_seq_blacklist.c
@@ -58,8 +58,8 @@ blacklist_entry_try_merge(struct bch_fs *c,
 			&bl->start[i + 1],
 			sizeof(bl->start[0]) * (nr - i));
 
-		bl = bch2_sb_resize_journal_seq_blacklist(&c->disk_sb,
-							sb_blacklist_u64s(nr));
+		bl = bch2_sb_field_resize(&c->disk_sb, journal_seq_blacklist,
+					  sb_blacklist_u64s(nr));
 		BUG_ON(!bl);
 	}
 
@@ -79,7 +79,7 @@ int bch2_journal_seq_blacklist_add(struct bch_fs *c, u64 start, u64 end)
 	int ret = 0;
 
 	mutex_lock(&c->sb_lock);
-	bl = bch2_sb_get_journal_seq_blacklist(c->disk_sb.sb);
+	bl = bch2_sb_field_get(c->disk_sb.sb, journal_seq_blacklist);
 	nr = blacklist_nr_entries(bl);
 
 	for (i = 0; i < nr; i++) {
@@ -100,8 +100,8 @@ int bch2_journal_seq_blacklist_add(struct bch_fs *c, u64 start, u64 end)
 		}
 	}
 
-	bl = bch2_sb_resize_journal_seq_blacklist(&c->disk_sb,
-					sb_blacklist_u64s(nr + 1));
+	bl = bch2_sb_field_resize(&c->disk_sb, journal_seq_blacklist,
+				  sb_blacklist_u64s(nr + 1));
 	if (!bl) {
 		ret = -BCH_ERR_ENOSPC_sb_journal_seq_blacklist;
 		goto out;
@@ -158,7 +158,7 @@ bool bch2_journal_seq_is_blacklisted(struct bch_fs *c, u64 seq,
 int bch2_blacklist_table_initialize(struct bch_fs *c)
 {
 	struct bch_sb_field_journal_seq_blacklist *bl =
-		bch2_sb_get_journal_seq_blacklist(c->disk_sb.sb);
+		bch2_sb_field_get(c->disk_sb.sb, journal_seq_blacklist);
 	struct journal_seq_blacklist_table *t;
 	unsigned i, nr = blacklist_nr_entries(bl);
 
@@ -250,20 +250,18 @@ void bch2_blacklist_entries_gc(struct work_struct *work)
 	struct journal_seq_blacklist_table *t;
 	struct bch_sb_field_journal_seq_blacklist *bl;
 	struct journal_seq_blacklist_entry *src, *dst;
-	struct btree_trans trans;
+	struct btree_trans *trans = bch2_trans_get(c);
 	unsigned i, nr, new_nr;
 	int ret;
 
-	bch2_trans_init(&trans, c, 0, 0);
-
 	for (i = 0; i < BTREE_ID_NR; i++) {
 		struct btree_iter iter;
 		struct btree *b;
 
-		bch2_trans_node_iter_init(&trans, &iter, i, POS_MIN,
+		bch2_trans_node_iter_init(trans, &iter, i, POS_MIN,
 					  0, 0, BTREE_ITER_PREFETCH);
 retry:
-		bch2_trans_begin(&trans);
+		bch2_trans_begin(trans);
 
 		b = bch2_btree_iter_peek_node(&iter);
 
@@ -275,15 +273,15 @@ retry:
 		if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
 			goto retry;
 
-		bch2_trans_iter_exit(&trans, &iter);
+		bch2_trans_iter_exit(trans, &iter);
 	}
 
-	bch2_trans_exit(&trans);
+	bch2_trans_put(trans);
 	if (ret)
 		return;
 
 	mutex_lock(&c->sb_lock);
-	bl = bch2_sb_get_journal_seq_blacklist(c->disk_sb.sb);
+	bl = bch2_sb_field_get(c->disk_sb.sb, journal_seq_blacklist);
 	if (!bl)
 		goto out;
 
@@ -308,7 +306,7 @@ retry:
 	bch_info(c, "nr blacklist entries was %u, now %u", nr, new_nr);
 
 	if (new_nr != nr) {
-		bl = bch2_sb_resize_journal_seq_blacklist(&c->disk_sb,
+		bl = bch2_sb_field_resize(&c->disk_sb, journal_seq_blacklist,
 				new_nr ? sb_blacklist_u64s(new_nr) : 0);
 		BUG_ON(new_nr && !bl);