]> www.infradead.org Git - linux.git/commitdiff
bcachefs: trivial open_bucket_add_buckets() cleanup
authorKent Overstreet <kent.overstreet@linux.dev>
Wed, 7 Aug 2024 19:44:57 +0000 (15:44 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Mon, 9 Sep 2024 13:41:48 +0000 (09:41 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/alloc_foreground.c

index 8563c2d268476e7f9f66457dfa62bbdb67747511..084b03b8c6e99600967b782176174434da2d6a11 100644 (file)
@@ -1022,9 +1022,6 @@ static int __open_bucket_add_buckets(struct btree_trans *trans,
        open_bucket_for_each(c, ptrs, ob, i)
                __clear_bit(ob->dev, devs.d);
 
-       if (erasure_code && ec_open_bucket(c, ptrs))
-               return 0;
-
        ret = bucket_alloc_set_writepoint(c, ptrs, wp, &devs,
                                 nr_replicas, nr_effective,
                                 have_cache, erasure_code, flags);
@@ -1079,7 +1076,7 @@ static int open_bucket_add_buckets(struct btree_trans *trans,
 {
        int ret;
 
-       if (erasure_code) {
+       if (erasure_code && !ec_open_bucket(trans->c, ptrs)) {
                ret = __open_bucket_add_buckets(trans, ptrs, wp,
                                devs_have, target, erasure_code,
                                nr_replicas, nr_effective, have_cache,