diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-20 20:47:55 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-20 20:47:55 -0400 |
| commit | 09021c38d3ffd53c54664a5cbabc3c6a37c46960 (patch) | |
| tree | fc45d73a95c5725a4eb6832b9a0ee71d1baae189 /libbcachefs/reflink.c | |
| parent | 9c0dc7b8d42e380e15822cc00d70958f8f10e0f3 (diff) | |
Update bcachefs sources to ac3ab6a511 bcachefs: Fix an uninitialized var
Diffstat (limited to 'libbcachefs/reflink.c')
| -rw-r--r-- | libbcachefs/reflink.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libbcachefs/reflink.c b/libbcachefs/reflink.c index 405a194d..c624fabe 100644 --- a/libbcachefs/reflink.c +++ b/libbcachefs/reflink.c @@ -155,7 +155,9 @@ static int bch2_make_extent_indirect(struct btree_trans *trans, *refcount = 0; memcpy(refcount + 1, &orig->v, bkey_val_bytes(&orig->k)); - bch2_trans_update(trans, reflink_iter, r_v, 0); + ret = bch2_trans_update(trans, reflink_iter, r_v, 0); + if (ret) + goto err; r_p = bch2_trans_kmalloc(trans, sizeof(*r_p)); if (IS_ERR(r_p)) { @@ -168,7 +170,7 @@ static int bch2_make_extent_indirect(struct btree_trans *trans, set_bkey_val_bytes(&r_p->k, sizeof(r_p->v)); r_p->v.idx = cpu_to_le64(bkey_start_offset(&r_v->k)); - bch2_trans_update(trans, extent_iter, &r_p->k_i, 0); + ret = bch2_trans_update(trans, extent_iter, &r_p->k_i, 0); err: if (!IS_ERR(reflink_iter)) c->reflink_hint = reflink_iter->pos.offset; @@ -291,7 +293,8 @@ s64 bch2_remap_range(struct bch_fs *c, ret = bch2_extent_update(&trans, dst_iter, new_dst.k, &disk_res, journal_seq, - new_i_size, i_sectors_delta); + new_i_size, i_sectors_delta, + true); bch2_disk_reservation_put(c, &disk_res); if (ret) continue; |