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

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 711614af9e03b58e10c3846b043399c2c2cd774d..1f415ca7aa3c24a93d5e5131795a9ddd21f1214b 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-400f275d46228e0ca08d8c931a674a534db0f4fb
+799716df00709f7480f575e8fd626915bafba006

diff --git a/libbcachefs/alloc_background.h b/libbcachefs/alloc_background.h
index fc4420f4bc21fc7a430f7a8225f091abf5dafbb1..94b3c057cd62539fce10598c673bbc45ebbfe54f 100644 (file)
--- 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 ff5d01e6e6747226a96835ed7a05b50153786785..b58b876fdc7181aa13d46968a7098b0e4d4ea441 100644 (file)
--- 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 cdef41db76925c235e218974e0dba760da61e55c..b9aa027c881b14458394ae8fdad6d93f53e1cbbf 100644 (file)
--- 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 a4c06e856c2e67c0cb1202443712fba11d735a07..4d55011551e0187e83ceaabb845b0f4855abf20f 100644 (file)
--- 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 7e22176a5c7e5b4351b5b18227e70f1122979355..2ec30a3fd19377937768172386b49cf2ef093610 100644 (file)
--- 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);