alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-02 00:00:03 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update bcachefs sources to 799716df00 bcachefs: Delete an incorrect bch2_trans_unlock()

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-05-19 09:50:11 -04:00
parent 5ef62f56ab
commit b8b8dcfaed
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
400f275d46228e0ca08d8c931a674a534db0f4fb
799716df00709f7480f575e8fd626915bafba006

2
libbcachefs/alloc_background.h
View File

@ -184,7 +184,7 @@ void bch2_alloc_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
.swab = bch2_alloc_v4_swab, \
.trans_trigger = bch2_trans_mark_alloc, \
.atomic_trigger = bch2_mark_alloc, \
.min_val_size = 56, \
.min_val_size = 48, \
})
int bch2_bucket_gens_invalid(const struct bch_fs *, struct bkey_s_c, unsigned, struct printbuf *);

2
libbcachefs/bkey.c
View File

@ -360,7 +360,7 @@ bool bch2_bkey_pack(struct bkey_packed *out, const struct bkey_i *in,
memmove_u64s((u64 *) out + format->key_u64s,
&in->v,
bkey_val_u64s(&in->k));
memcpy_u64s(out, &tmp, format->key_u64s);
memcpy_u64s_small(out, &tmp, format->key_u64s);
return true;
}

2
libbcachefs/bkey_sort.c
View File

@ -188,7 +188,7 @@ unsigned bch2_sort_keys(struct bkey_packed *dst,
}
if (bkey_deleted(in)) {
memcpy_u64s(out, in, bkeyp_key_u64s(f, in));
memcpy_u64s_small(out, in, bkeyp_key_u64s(f, in));
set_bkeyp_val_u64s(f, out, 0);
} else {
bkey_copy(out, in);

2
libbcachefs/bset.c
View File

@ -1022,7 +1022,7 @@ void bch2_bset_insert(struct btree *b,
set_btree_bset_end(b, t);
}
memcpy_u64s(where, src,
memcpy_u64s_small(where, src,
bkeyp_key_u64s(f, src));
memcpy_u64s(bkeyp_val(f, where), &insert->v,
bkeyp_val_u64s(f, src));

1
libbcachefs/move.c
View File

@ -583,7 +583,6 @@ static int __bch2_move_data(struct moving_context *ctxt,
*/
bch2_bkey_buf_reassemble(&sk, c, k);
k = bkey_i_to_s_c(sk.k);
bch2_trans_unlock(&trans);
ret2 = bch2_move_extent(&trans, &iter, ctxt, NULL,
io_opts, btree_id, k, data_opts);