bcachefs: kill bch2_dev_bkey_exists() in data_update_init()
authorKent Overstreet <kent.overstreet@linux.dev>
Wed, 1 May 2024 22:06:35 +0000 (18:06 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Wed, 8 May 2024 21:29:23 +0000 (17:29 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/data_update.c

index 7aad6085ef53ef2cd47703e4f394fb0ce2a41f03..1dee93eee7add377d743ed75158e7050e13d769d 100644 (file)
@@ -544,8 +544,16 @@ int bch2_data_update_init(struct btree_trans *trans,
        m->op.compression_opt   = background_compression(io_opts);
        m->op.watermark         = m->data_opts.btree_insert_flags & BCH_WATERMARK_MASK;
 
-       bkey_for_each_ptr(ptrs, ptr)
-               bch2_dev_get(bch2_dev_bkey_exists(c, ptr->dev));
+       bkey_for_each_ptr(ptrs, ptr) {
+               if (!bch2_dev_tryget(c, ptr->dev)) {
+                       bkey_for_each_ptr(ptrs, ptr2) {
+                               if (ptr2 == ptr)
+                                       break;
+                               bch2_dev_put(bch2_dev_have_ref(c, ptr2->dev));
+                       }
+                       return -BCH_ERR_data_update_done;
+               }
+       }
 
        unsigned durability_have = 0, durability_removing = 0;