From 17e2f2775be6e10b966cd958bc0461aab662571a Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 27 Jun 2018 14:41:51 -0400 Subject: Update bcachefs sources to 2cb70a82bc bcachefs: delete some debug code --- libbcachefs/migrate.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'libbcachefs/migrate.c') diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c index ea519102..215c5aa5 100644 --- a/libbcachefs/migrate.c +++ b/libbcachefs/migrate.c @@ -126,7 +126,13 @@ static int bch2_dev_metadata_drop(struct bch_fs *c, unsigned dev_idx, int flags) retry: if (!bch2_extent_has_device(bkey_i_to_s_c_extent(&b->key), dev_idx)) { - bch2_btree_iter_set_locks_want(&iter, 0); + /* + * we might have found a btree node key we + * needed to update, and then tried to update it + * but got -EINTR after upgrading the iter, but + * then raced and the node is now gone: + */ + bch2_btree_iter_downgrade(&iter); ret = bch2_mark_bkey_replicas(c, BCH_DATA_BTREE, bkey_i_to_s_c(&b->key)); @@ -141,11 +147,6 @@ retry: if (ret) goto err; - if (!bch2_btree_iter_set_locks_want(&iter, U8_MAX)) { - b = bch2_btree_iter_peek_node(&iter); - goto retry; - } - ret = bch2_btree_node_update_key(c, &iter, b, new_key); if (ret == -EINTR) { b = bch2_btree_iter_peek_node(&iter); @@ -160,7 +161,7 @@ retry: ret = 0; out: - bch2_replicas_gc_end(c, ret); + ret = bch2_replicas_gc_end(c, ret); mutex_unlock(&c->replicas_gc_lock); return ret; -- cgit v1.2.3