Update bcachefs sources to 50847e296b34 bcachefs: Check subvol <-> inode pointers...

[bcachefs-tools-debian] / libbcachefs / io_misc.c

diff --git a/libbcachefs/io_misc.c b/libbcachefs/io_misc.c
index 197ff7a4c5415636fd9328043c3a3ddb68563f0b..1baf78594ccaf85d7d89fea4fc938a7f700d6dc0 100644 (file)
--- a/libbcachefs/io_misc.c
+++ b/libbcachefs/io_misc.c
@@ -58,7 +58,7 @@ int bch2_extent_fallocate(struct btree_trans *trans,
         */
        ret = bch2_disk_reservation_get(c, &disk_res, sectors, new_replicas, 0);
        if (unlikely(ret))
-               goto err;
+               goto err_noprint;
 
        bch2_bkey_buf_reassemble(&old, c, k);
 
@@ -118,7 +118,7 @@ err:
                        inum.inum,
                        iter->pos.offset << 9,
                        "%s(): error: %s", __func__, bch2_err_str(ret));
-
+err_noprint:
        bch2_open_buckets_put(c, &open_buckets);
        bch2_disk_reservation_put(c, &disk_res);
        bch2_bkey_buf_exit(&new, c);
@@ -442,9 +442,7 @@ case LOGGED_OP_FINSERT_shift_extents:
 
                op->v.pos = cpu_to_le64(insert ? bkey_start_offset(&delete.k) : delete.k.p.offset);
 
-               ret =   bch2_bkey_set_needs_rebalance(c, copy,
-                                       opts.background_target,
-                                       opts.background_compression) ?:
+               ret =   bch2_bkey_set_needs_rebalance(c, copy, &opts) ?:
                        bch2_btree_insert_trans(trans, BTREE_ID_extents, &delete, 0) ?:
                        bch2_btree_insert_trans(trans, BTREE_ID_extents, copy, 0) ?:
                        bch2_logged_op_update(trans, &op->k_i) ?: