diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-04-04 22:12:56 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-04-04 22:15:29 -0400 |
| commit | 209695dedf49425ad9e91ba2b2239c3a040ea159 (patch) | |
| tree | fac7a385d53f0fb72551622c5a95f353346a393b /libbcachefs/migrate.c | |
| parent | f46437f06e8f3b67c81c5e1648a62279aed5f525 (diff) | |
Update bcachefs sources to f26267fc82 bcachefs: kill bset_tree->max_key
Diffstat (limited to 'libbcachefs/migrate.c')
| -rw-r--r-- | libbcachefs/migrate.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c index 1403616b..ef69a19f 100644 --- a/libbcachefs/migrate.c +++ b/libbcachefs/migrate.c @@ -88,6 +88,7 @@ static int __bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags if (ret) break; } + bch2_trans_iter_put(&trans, iter); ret = bch2_trans_exit(&trans) ?: ret; bch2_bkey_buf_exit(&sk, c); @@ -135,20 +136,24 @@ retry: dev_idx, flags, true); if (ret) { bch_err(c, "Cannot drop device without losing data"); - goto err; + break; } ret = bch2_btree_node_update_key(c, iter, b, k.k); if (ret == -EINTR) { b = bch2_btree_iter_peek_node(iter); + ret = 0; goto retry; } if (ret) { bch_err(c, "Error updating btree node key: %i", ret); - goto err; + break; } } bch2_trans_iter_free(&trans, iter); + + if (ret) + goto err; } /* flush relevant btree updates */ |