Update bcachefs sources to 3e0c5b0722 fixup! bcachefs: Btree write buffer

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

diff --git a/libbcachefs/dirent.c b/libbcachefs/dirent.c
index 281959885bb05e2bb90c05f3457f9effa53d48af..4c85d3399fb4cf4b93f5467ec50c8d409c05b25d 100644 (file)
--- a/libbcachefs/dirent.c
+++ b/libbcachefs/dirent.c
@@ -84,54 +84,54 @@ const struct bch_hash_desc bch2_dirent_hash_desc = {
 };
 
 int bch2_dirent_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_dirent d = bkey_s_c_to_dirent(k);
        unsigned len;
 
        if (bkey_val_bytes(k.k) < sizeof(struct bch_dirent)) {
-               pr_buf(err, "incorrect value size (%zu < %zu)",
+               prt_printf(err, "incorrect value size (%zu < %zu)",
                       bkey_val_bytes(k.k), sizeof(*d.v));
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        len = bch2_dirent_name_bytes(d);
        if (!len) {
-               pr_buf(err, "empty name");
-               return -EINVAL;
+               prt_printf(err, "empty name");
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (bkey_val_u64s(k.k) > dirent_val_u64s(len)) {
-               pr_buf(err, "value too big (%zu > %u)",
-                      bkey_val_u64s(k.k),dirent_val_u64s(len));
-               return -EINVAL;
+               prt_printf(err, "value too big (%zu > %u)",
+                      bkey_val_u64s(k.k), dirent_val_u64s(len));
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (len > BCH_NAME_MAX) {
-               pr_buf(err, "dirent name too big (%u > %lu)",
+               prt_printf(err, "dirent name too big (%u > %u)",
                       len, BCH_NAME_MAX);
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (len == 1 && !memcmp(d.v->d_name, ".", 1)) {
-               pr_buf(err, "invalid name");
-               return -EINVAL;
+               prt_printf(err, "invalid name");
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (len == 2 && !memcmp(d.v->d_name, "..", 2)) {
-               pr_buf(err, "invalid name");
-               return -EINVAL;
+               prt_printf(err, "invalid name");
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (memchr(d.v->d_name, '/', len)) {
-               pr_buf(err, "invalid name");
-               return -EINVAL;
+               prt_printf(err, "invalid name");
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (d.v->d_type != DT_SUBVOL &&
            le64_to_cpu(d.v->d_inum) == d.k->p.inode) {
-               pr_buf(err, "dirent points to own directory");
-               return -EINVAL;
+               prt_printf(err, "dirent points to own directory");
+               return -BCH_ERR_invalid_bkey;
        }
 
        return 0;
@@ -142,7 +142,7 @@ void bch2_dirent_to_text(struct printbuf *out, struct bch_fs *c,
 {
        struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);
 
-       pr_buf(out, "%.*s -> %llu type %s",
+       prt_printf(out, "%.*s -> %llu type %s",
               bch2_dirent_name_bytes(d),
               d.v->d_name,
               d.v->d_type != DT_SUBVOL
@@ -350,8 +350,8 @@ int bch2_dirent_rename(struct btree_trans *trans,
                bkey_init(&new_src->k);
                new_src->k.p = src_iter.pos;
 
-               if (bkey_cmp(dst_pos, src_iter.pos) <= 0 &&
-                   bkey_cmp(src_iter.pos, dst_iter.pos) < 0) {
+               if (bkey_le(dst_pos, src_iter.pos) &&
+                   bkey_lt(src_iter.pos, dst_iter.pos)) {
                        /*
                         * We have a hash collision for the new dst key,
                         * and new_src - the key we're deleting - is between
@@ -471,7 +471,7 @@ retry:
 
        ret = __bch2_dirent_lookup_trans(&trans, &iter, dir, hash_info,
                                          name, inum, 0);
-       if (ret == -EINTR)
+       if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
                goto retry;
        if (!ret)
                bch2_trans_iter_exit(&trans, &iter);
@@ -556,7 +556,7 @@ retry:
        }
        bch2_trans_iter_exit(&trans, &iter);
 err:
-       if (ret == -EINTR)
+       if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
                goto retry;
 
        bch2_trans_exit(&trans);