diff options
| author | Dan Robertson <dan@dlrobertson.com> | 2021-06-29 18:52:13 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-06 13:03:52 -0400 |
| commit | 405319f81535544237b421cc6d08a5ea8c8ace6d (patch) | |
| tree | 33b97081b199ef283ee0ed97e0c6b3b1a2946ae7 | |
| parent | 208b2e5df04bd5dd0574775c937cf350db273157 (diff) | |
bcachefs: ensure iter->should_be_locked is set
Ensure that iter->should_be_locked is set to true before we
call bch2_trans_update in __bch2_dev_usrdata_drop.
Signed-off-by: Dan Robertson <dan@dlrobertson.com>
| -rw-r--r-- | fs/bcachefs/migrate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index 6ebe49ba2248..91a9f584dd6d 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -73,7 +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)); - ret = bch2_trans_update(&trans, iter, sk.k, 0) ?: + ret = bch2_btree_iter_traverse(iter) ?: + bch2_trans_update(&trans, iter, sk.k, 0) ?: bch2_trans_commit(&trans, NULL, NULL, BTREE_INSERT_NOFAIL); |