Update bcachefs sources to 8fd009dd76 bcachefs: Rip out code for storing backpointers...

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

diff --git a/libbcachefs/reflink.c b/libbcachefs/reflink.c
index d5c14bb2992d5d7fc4281a207140861a0cdefd1f..d8426e754cdf0cd9cef8ed9c71a26c367294987b 100644 (file)
--- a/libbcachefs/reflink.c
+++ b/libbcachefs/reflink.c
@@ -26,7 +26,7 @@ static inline unsigned bkey_type_to_indirect(const struct bkey *k)
 /* reflink pointers */
 
 int bch2_reflink_p_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                          int rw, struct printbuf *err)
+                          unsigned flags, struct printbuf *err)
 {
        struct bkey_s_c_reflink_p p = bkey_s_c_to_reflink_p(k);
 
@@ -78,17 +78,17 @@ bool bch2_reflink_p_merge(struct bch_fs *c, struct bkey_s _l, struct bkey_s_c _r
 /* indirect extents */
 
 int bch2_reflink_v_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                          int rw, struct printbuf *err)
+                          unsigned flags, struct printbuf *err)
 {
        struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(k);
 
        if (bkey_val_bytes(r.k) < sizeof(*r.v)) {
                prt_printf(err, "incorrect value size (%zu < %zu)",
                       bkey_val_bytes(r.k), sizeof(*r.v));
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
-       return bch2_bkey_ptrs_invalid(c, k, rw, err);
+       return bch2_bkey_ptrs_invalid(c, k, flags, err);
 }
 
 void bch2_reflink_v_to_text(struct printbuf *out, struct bch_fs *c,
@@ -131,12 +131,12 @@ int bch2_trans_mark_reflink_v(struct btree_trans *trans,
 /* indirect inline data */
 
 int bch2_indirect_inline_data_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                                     int rw, struct printbuf *err)
+                                     unsigned flags, struct printbuf *err)
 {
        if (bkey_val_bytes(k.k) < sizeof(struct bch_indirect_inline_data)) {
                prt_printf(err, "incorrect value size (%zu < %zu)",
                       bkey_val_bytes(k.k), sizeof(struct bch_indirect_inline_data));
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        return 0;
@@ -189,7 +189,7 @@ static int bch2_make_extent_indirect(struct btree_trans *trans,
 
        for_each_btree_key_norestart(trans, reflink_iter, BTREE_ID_reflink,
                           POS(0, c->reflink_hint),
-                          BTREE_ITER_INTENT|BTREE_ITER_SLOTS, k, ret) {
+                          BTREE_ITER_SLOTS, k, ret) {
                if (reflink_iter.pos.inode) {
                        bch2_btree_iter_set_pos(&reflink_iter, POS_MIN);
                        continue;
@@ -233,7 +233,13 @@ static int bch2_make_extent_indirect(struct btree_trans *trans,
        orig->k.type = KEY_TYPE_reflink_p;
        r_p = bkey_i_to_reflink_p(orig);
        set_bkey_val_bytes(&r_p->k, sizeof(r_p->v));
+
+       /* FORTIFY_SOURCE is broken here, and doesn't provide unsafe_memset() */
+#if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
+       __underlying_memset(&r_p->v, 0, sizeof(r_p->v));
+#else
        memset(&r_p->v, 0, sizeof(r_p->v));
+#endif
 
        r_p->v.idx = cpu_to_le64(bkey_start_offset(&r_v->k));
 
@@ -251,15 +257,15 @@ static struct bkey_s_c get_next_src(struct btree_iter *iter, struct bpos end)
        struct bkey_s_c k;
        int ret;
 
-       for_each_btree_key_continue_norestart(*iter, 0, k, ret) {
-               if (bkey_cmp(iter->pos, end) >= 0)
-                       break;
+       for_each_btree_key_upto_continue_norestart(*iter, end, 0, k, ret) {
+               if (bkey_extent_is_unwritten(k))
+                       continue;
 
                if (bkey_extent_is_data(k.k))
                        return k;
        }
 
-       if (bkey_cmp(iter->pos, end) >= 0)
+       if (bkey_ge(iter->pos, end))
                bch2_btree_iter_set_pos(iter, end);
        return ret ? bkey_s_c_err(ret) : bkey_s_c_null;
 }
@@ -282,8 +288,8 @@ s64 bch2_remap_range(struct bch_fs *c,
        u32 dst_snapshot, src_snapshot;
        int ret = 0, ret2 = 0;
 
-       if (!percpu_ref_tryget_live(&c->writes))
-               return -EROFS;
+       if (!bch2_write_ref_tryget(c, BCH_WRITE_REF_reflink))
+               return -BCH_ERR_erofs_no_writes;
 
        bch2_check_set_feature(c, BCH_FEATURE_reflink);
 
@@ -301,7 +307,7 @@ s64 bch2_remap_range(struct bch_fs *c,
 
        while ((ret == 0 ||
                bch2_err_matches(ret, BCH_ERR_transaction_restart)) &&
-              bkey_cmp(dst_iter.pos, dst_end) < 0) {
+              bkey_lt(dst_iter.pos, dst_end)) {
                struct disk_reservation disk_res = { 0 };
 
                bch2_trans_begin(&trans);
@@ -334,7 +340,7 @@ s64 bch2_remap_range(struct bch_fs *c,
                if (ret)
                        continue;
 
-               if (bkey_cmp(src_want, src_iter.pos) < 0) {
+               if (bkey_lt(src_want, src_iter.pos)) {
                        ret = bch2_fpunch_at(&trans, &dst_iter, dst_inum,
                                        min(dst_end.offset,
                                            dst_iter.pos.offset +
@@ -378,7 +384,7 @@ s64 bch2_remap_range(struct bch_fs *c,
                                    dst_end.offset - dst_iter.pos.offset));
 
                ret = bch2_extent_update(&trans, dst_inum, &dst_iter,
-                                        new_dst.k, &disk_res, NULL,
+                                        new_dst.k, &disk_res,
                                         new_i_size, i_sectors_delta,
                                         true);
                bch2_disk_reservation_put(c, &disk_res);
@@ -386,8 +392,8 @@ s64 bch2_remap_range(struct bch_fs *c,
        bch2_trans_iter_exit(&trans, &dst_iter);
        bch2_trans_iter_exit(&trans, &src_iter);
 
-       BUG_ON(!ret && bkey_cmp(dst_iter.pos, dst_end));
-       BUG_ON(bkey_cmp(dst_iter.pos, dst_end) > 0);
+       BUG_ON(!ret && !bkey_eq(dst_iter.pos, dst_end));
+       BUG_ON(bkey_gt(dst_iter.pos, dst_end));
 
        dst_done = dst_iter.pos.offset - dst_start.offset;
        new_i_size = min(dst_iter.pos.offset << 9, new_i_size);
@@ -416,7 +422,7 @@ s64 bch2_remap_range(struct bch_fs *c,
        bch2_bkey_buf_exit(&new_src, c);
        bch2_bkey_buf_exit(&new_dst, c);
 
-       percpu_ref_put(&c->writes);
+       bch2_write_ref_put(c, BCH_WRITE_REF_reflink);
 
        return dst_done ?: ret ?: ret2;
 }