diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-07 13:30:40 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-08 22:55:14 -0400 |
| commit | 58ae103b0a2b5d881d6e8ff68fe17bb822148ce7 (patch) | |
| tree | 4c794fc614fdf2d5e2521d335ef721b4c17f1d1e /libbcachefs/migrate.c | |
| parent | f6d87e9a87859dbf9b15269d4de165cf3aadf661 (diff) | |
Update bcachefs sources to e3a7cee503 bcachefs: Don't mark superblocks past end of usable space
Diffstat (limited to 'libbcachefs/migrate.c')
| -rw-r--r-- | libbcachefs/migrate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c index ef69a19f..6ebe49ba 100644 --- a/libbcachefs/migrate.c +++ b/libbcachefs/migrate.c @@ -73,9 +73,8 @@ static int __bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags bch2_btree_iter_set_pos(iter, bkey_start_pos(&sk.k->k)); - bch2_trans_update(&trans, iter, sk.k, 0); - - ret = bch2_trans_commit(&trans, NULL, NULL, + ret = bch2_trans_update(&trans, iter, sk.k, 0) ?: + bch2_trans_commit(&trans, NULL, NULL, BTREE_INSERT_NOFAIL); /* |