From: Kent Overstreet Date: Tue, 12 Oct 2021 18:25:13 +0000 (-0400) Subject: bcachefs: Fix deletion in __bch2_dev_usrdata_drop() X-Git-Tag: v6.7-rc1~201^2~1360 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=776eaddb2cef366b16dac8857899dbb4cc5dfdb1;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Fix deletion in __bch2_dev_usrdata_drop() With snapshots, __bch2_dev_usr_data_drop() now uses an ALL_SNAPSHOTS iterator, which isn't an extent iterator - meaning we shouldn't be inserting whiteouts with nonzero size to delete. This fixes a bug where we go RO because we tried to insert an invalid key in the device remove path. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index 9f9eb799337e2..94d5d99ffd2a4 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -73,6 +73,15 @@ static int __bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags */ bch2_extent_normalize(c, bkey_i_to_s(sk.k)); + /* + * Since we're not inserting through an extent iterator + * (BTREE_ITER_ALL_SNAPSHOTS iterators aren't extent iterators), + * we aren't using the extent overwrite path to delete, we're + * just using the normal key deletion path: + */ + if (bkey_deleted(&sk.k->k)) + sk.k->k.size = 0; + ret = bch2_btree_iter_traverse(&iter) ?: bch2_trans_update(&trans, &iter, sk.k, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?: