diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 20:11:29 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 20:19:25 -0400 |
| commit | 2ab2ab0f781ae750473763e8a042c900a982d399 (patch) | |
| tree | 2d76ee40a4cf6b6a54c180a9100216cc45c26f91 /libbcachefs/migrate.c | |
| parent | e288c9f1de8a1b21a77cbfb80dfec37f2515e33c (diff) | |
Update bcachefs sources to b12d1535f3 bcachefs: fix bounds checks in bch2_bio_map()
Diffstat (limited to 'libbcachefs/migrate.c')
| -rw-r--r-- | libbcachefs/migrate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c index f5cbf44d..c0dfe1c6 100644 --- a/libbcachefs/migrate.c +++ b/libbcachefs/migrate.c @@ -50,7 +50,7 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags) !(ret = btree_iter_err(k))) { if (!bkey_extent_is_data(k.k) || !bch2_extent_has_device(bkey_s_c_to_extent(k), dev_idx)) { - ret = bch2_mark_bkey_replicas(c, BCH_DATA_USER, k); + ret = bch2_mark_bkey_replicas(c, BKEY_TYPE_EXTENTS, k); if (ret) break; bch2_btree_iter_next(&iter); @@ -71,7 +71,7 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags) */ bch2_extent_normalize(c, e.s); - ret = bch2_mark_bkey_replicas(c, BCH_DATA_USER, + ret = bch2_mark_bkey_replicas(c, BKEY_TYPE_EXTENTS, bkey_i_to_s_c(&tmp.key)); if (ret) break; @@ -134,7 +134,7 @@ retry: */ bch2_btree_iter_downgrade(&iter); - ret = bch2_mark_bkey_replicas(c, BCH_DATA_BTREE, + ret = bch2_mark_bkey_replicas(c, BKEY_TYPE_BTREE, bkey_i_to_s_c(&b->key)); if (ret) goto err; |