diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-30 12:38:54 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-30 12:51:13 -0500 |
| commit | 0c7db4eca3e6519043c10288cb41f8a0ee634a0b (patch) | |
| tree | fd788cd46ea5b14e287b48677a94384a5abcce27 /cmd_migrate.c | |
| parent | bca8b084ad754afc54e628d9db7721b90d9480b7 (diff) | |
Update bcachefs sources to 62de7539dc bcachefs: Make bkey types globally unique
Diffstat (limited to 'cmd_migrate.c')
| -rw-r--r-- | cmd_migrate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd_migrate.c b/cmd_migrate.c index 497a4182..7863dec7 100644 --- a/cmd_migrate.c +++ b/cmd_migrate.c @@ -333,7 +333,7 @@ static void link_data(struct bch_fs *c, struct bch_inode_unpacked *dst, e->k.p.inode = dst->bi_inum; e->k.p.offset = logical + sectors; e->k.size = sectors; - extent_ptr_append(e, (struct bch_extent_ptr) { + bch2_bkey_append_ptr(&e->k_i, (struct bch_extent_ptr) { .offset = physical, .dev = 0, .gen = bucket(ca, b)->mark.gen, @@ -347,8 +347,7 @@ static void link_data(struct bch_fs *c, struct bch_inode_unpacked *dst, die("error reserving space in new filesystem: %s", strerror(-ret)); - bch2_mark_bkey_replicas(c, BCH_DATA_USER, - extent_i_to_s_c(e).s_c); + bch2_mark_bkey_replicas(c, extent_i_to_s_c(e).s_c); ret = bch2_btree_insert(c, BTREE_ID_EXTENTS, &e->k_i, &res, NULL, 0); |