diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-26 16:34:57 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-02 00:41:47 -0400 |
| commit | 6b1f79d5df9f2735192ed1a40c711cf131d4f43e (patch) | |
| tree | 67f007fabd01964145cac4f273902f1c12927e8b /libbcachefs/migrate.c | |
| parent | c1a8e27a3fad202750a1b66a1fd1fa82a8a5bd92 (diff) | |
Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshotsv0.29
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
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 d93db07f..0898fa49 100644 --- a/libbcachefs/migrate.c +++ b/libbcachefs/migrate.c @@ -49,7 +49,7 @@ static int bch2_dev_usrdata_drop_key(struct btree_trans *trans, if (!bch2_bkey_has_device_c(k, dev_idx)) return 0; - n = bch2_bkey_make_mut(trans, k); + n = bch2_bkey_make_mut(trans, iter, k, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE); ret = PTR_ERR_OR_ZERO(n); if (ret) return ret; @@ -73,8 +73,7 @@ static int bch2_dev_usrdata_drop_key(struct btree_trans *trans, */ if (bkey_deleted(&n->k)) n->k.size = 0; - - return bch2_trans_update(trans, iter, n, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE); + return 0; } static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags) |