diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-19 09:50:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-19 09:50:24 -0400 |
| commit | b8b8dcfaed641eabeec8ba070e1e23665bc4ceb2 (patch) | |
| tree | 69382780a02b9f84a75248e4a0878cca1c5eb27b | |
| parent | 5ef62f56ab50c5799f713e3a42f5c7ad7e8283d3 (diff) | |
| download | bcachefs-tools-b8b8dcfaed641eabeec8ba070e1e23665bc4ceb2.tar.gz | |
Update bcachefs sources to 799716df00 bcachefs: Delete an incorrect bch2_trans_unlock()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/alloc_background.h | 2 | ||||
| -rw-r--r-- | libbcachefs/bkey.c | 2 | ||||
| -rw-r--r-- | libbcachefs/bkey_sort.c | 2 | ||||
| -rw-r--r-- | libbcachefs/bset.c | 2 | ||||
| -rw-r--r-- | libbcachefs/move.c | 1 |
6 files changed, 5 insertions, 6 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index 711614af..1f415ca7 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -400f275d46228e0ca08d8c931a674a534db0f4fb +799716df00709f7480f575e8fd626915bafba006 diff --git a/libbcachefs/alloc_background.h b/libbcachefs/alloc_background.h index fc4420f4..94b3c057 100644 --- a/libbcachefs/alloc_background.h +++ b/libbcachefs/alloc_background.h @@ -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 *); diff --git a/libbcachefs/bkey.c b/libbcachefs/bkey.c index ff5d01e6..b58b876f 100644 --- a/libbcachefs/bkey.c +++ b/libbcachefs/bkey.c @@ -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; } diff --git a/libbcachefs/bkey_sort.c b/libbcachefs/bkey_sort.c index cdef41db..b9aa027c 100644 --- a/libbcachefs/bkey_sort.c +++ b/libbcachefs/bkey_sort.c @@ -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); diff --git a/libbcachefs/bset.c b/libbcachefs/bset.c index a4c06e85..4d550115 100644 --- a/libbcachefs/bset.c +++ b/libbcachefs/bset.c @@ -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)); diff --git a/libbcachefs/move.c b/libbcachefs/move.c index 7e22176a..2ec30a3f 100644 --- a/libbcachefs/move.c +++ b/libbcachefs/move.c @@ -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); |