]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bcachefs: kill btree_trans_too_many_iters() in bch2_bucket_alloc_freelist()
authorKent Overstreet <kent.overstreet@linux.dev>
Wed, 17 Jul 2024 15:56:05 +0000 (11:56 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Fri, 19 Jul 2024 01:06:03 +0000 (21:06 -0400)
When we're called via
trans commit -> btree split -> allocator

We may have already arbitrarily many btree_paths, for the transaction
commit we're trying to do; when this happens, the
btree_trans_too_many_iters() call causes us to livelock.

Since the allocator calls btree_iter_dontneed to release paths as it
iterates, this shouldn't cause any problems.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/alloc_foreground.c

index cabf866c79563342d61c3c060d95ac57f8514679..618d2ff0292ec397813c15cd2fa9f5c0fb2ced91 100644 (file)
@@ -496,12 +496,6 @@ again:
                for (alloc_cursor = max(alloc_cursor, bkey_start_offset(k.k));
                     alloc_cursor < k.k->p.offset;
                     alloc_cursor++) {
-                       ret = btree_trans_too_many_iters(trans);
-                       if (ret) {
-                               ob = ERR_PTR(ret);
-                               break;
-                       }
-
                        s->buckets_seen++;
 
                        u64 bucket = alloc_cursor & ~(~0ULL << 56);