From 5a22068080d3f4e1f7403bb5d5bf5b535f79c664 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 4 Apr 2020 13:50:02 -0400 Subject: foo --- fs/bcachefs/btree_iter.c | 2 +- fs/bcachefs/extent_update.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 94659560d6b7..6c1336769c4d 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1949,7 +1949,7 @@ static struct btree_iter *btree_trans_iter_alloc(struct btree_trans *trans) struct btree_iter *iter; trans_for_each_iter(trans, iter) { - pr_err("iter: btree %s pos %llu:%llu%s%s%s %pf", + pr_err("iter: btree %s pos %llu:%llu%s%s%s %pF", bch2_btree_ids[iter->btree_id], iter->pos.inode, iter->pos.offset, diff --git a/fs/bcachefs/extent_update.c b/fs/bcachefs/extent_update.c index 2a7d913bdda3..ae5a56a58412 100644 --- a/fs/bcachefs/extent_update.c +++ b/fs/bcachefs/extent_update.c @@ -75,7 +75,7 @@ static int count_iters_for_insert(struct btree_trans *trans, POS(0, idx + sectors)) >= 0) break; - *nr_iters += 1 + bch2_bkey_nr_alloc_ptrs(r_k); + *nr_iters += 2 + bch2_bkey_nr_alloc_ptrs(r_k); if (*nr_iters >= max_iters) { struct bpos pos = bkey_start_pos(k.k); -- cgit v1.2.3