Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshots

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

diff --git a/libbcachefs/dirent.c b/libbcachefs/dirent.c
index 6f699b736b348e366b6c1e43567cf7a65c78b8a4..1544fc56974f213d51c978756033482bd205c512 100644 (file)
--- a/libbcachefs/dirent.c
+++ b/libbcachefs/dirent.c
@@ -83,38 +83,52 @@ const struct bch_hash_desc bch2_dirent_hash_desc = {
        .is_visible     = dirent_is_visible,
 };
 
-const char *bch2_dirent_invalid(const struct bch_fs *c, struct bkey_s_c k)
+int bch2_dirent_invalid(const struct bch_fs *c, struct bkey_s_c k,
+                       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))
-               return "value too small";
-
        len = bch2_dirent_name_bytes(d);
-       if (!len)
-               return "empty name";
+       if (!len) {
+               prt_printf(err, "empty name");
+               return -BCH_ERR_invalid_bkey;
+       }
 
-       if (bkey_val_u64s(k.k) > dirent_val_u64s(len))
-               return "value too big";
+       if (bkey_val_u64s(k.k) > dirent_val_u64s(len)) {
+               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)
-               return "dirent name too big";
+       if (len > BCH_NAME_MAX) {
+               prt_printf(err, "dirent name too big (%u > %u)",
+                      len, BCH_NAME_MAX);
+               return -BCH_ERR_invalid_bkey;
+       }
 
-       if (len == 1 && !memcmp(d.v->d_name, ".", 1))
-               return "invalid name";
+       if (len == 1 && !memcmp(d.v->d_name, ".", 1)) {
+               prt_printf(err, "invalid name");
+               return -BCH_ERR_invalid_bkey;
+       }
 
-       if (len == 2 && !memcmp(d.v->d_name, "..", 2))
-               return "invalid name";
+       if (len == 2 && !memcmp(d.v->d_name, "..", 2)) {
+               prt_printf(err, "invalid name");
+               return -BCH_ERR_invalid_bkey;
+       }
 
-       if (memchr(d.v->d_name, '/', len))
-               return "invalid name";
+       if (memchr(d.v->d_name, '/', len)) {
+               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)
-               return "dirent points to own directory";
+           le64_to_cpu(d.v->d_inum) == d.k->p.inode) {
+               prt_printf(err, "dirent points to own directory");
+               return -BCH_ERR_invalid_bkey;
+       }
 
-       return NULL;
+       return 0;
 }
 
 void bch2_dirent_to_text(struct printbuf *out, struct bch_fs *c,
@@ -122,9 +136,9 @@ void bch2_dirent_to_text(struct printbuf *out, struct bch_fs *c,
 {
        struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);
 
-       bch_scnmemcpy(out, d.v->d_name,
-                     bch2_dirent_name_bytes(d));
-       pr_buf(out, " -> %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
               ? le64_to_cpu(d.v->d_inum)
               : le32_to_cpu(d.v->d_child_subvol),
@@ -330,8 +344,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
@@ -451,7 +465,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);
@@ -470,16 +484,13 @@ int bch2_empty_dir_trans(struct btree_trans *trans, subvol_inum dir)
        if (ret)
                return ret;
 
-       for_each_btree_key_norestart(trans, iter, BTREE_ID_dirents,
-                          SPOS(dir.inum, 0, snapshot), 0, k, ret) {
-               if (k.k->p.inode > dir.inum)
-                       break;
-
+       for_each_btree_key_upto_norestart(trans, iter, BTREE_ID_dirents,
+                          SPOS(dir.inum, 0, snapshot),
+                          POS(dir.inum, U64_MAX), 0, k, ret)
                if (k.k->type == KEY_TYPE_dirent) {
                        ret = -ENOTEMPTY;
                        break;
                }
-       }
        bch2_trans_iter_exit(trans, &iter);
 
        return ret;
@@ -503,11 +514,9 @@ retry:
        if (ret)
                goto err;
 
-       for_each_btree_key_norestart(&trans, iter, BTREE_ID_dirents,
-                          SPOS(inum.inum, ctx->pos, snapshot), 0, k, ret) {
-               if (k.k->p.inode > inum.inum)
-                       break;
-
+       for_each_btree_key_upto_norestart(&trans, iter, BTREE_ID_dirents,
+                          SPOS(inum.inum, ctx->pos, snapshot),
+                          POS(inum.inum, U64_MAX), 0, k, ret) {
                if (k.k->type != KEY_TYPE_dirent)
                        continue;
 
@@ -541,7 +550,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);