New upstream release

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

diff --git a/libbcachefs/dirent.c b/libbcachefs/dirent.c
index 288f46b55876b72bf0ca004904a6d67452956a90..065ea59ee9fa5ecd8dcd68f12dd2ef8bd8e29497 100644 (file)
--- a/libbcachefs/dirent.c
+++ b/libbcachefs/dirent.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include "bcachefs.h"
+#include "bkey_buf.h"
 #include "bkey_methods.h"
 #include "btree_update.h"
 #include "extents.h"
@@ -84,54 +85,49 @@ 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)
+                       enum bkey_invalid_flags 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)) {
-               prt_printf(err, "incorrect value size (%zu < %zu)",
-                      bkey_val_bytes(k.k), sizeof(*d.v));
-               return -EINVAL;
-       }
-
        len = bch2_dirent_name_bytes(d);
        if (!len) {
                prt_printf(err, "empty name");
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        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 -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (len > BCH_NAME_MAX) {
                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)) {
                prt_printf(err, "invalid name");
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (len == 2 && !memcmp(d.v->d_name, "..", 2)) {
                prt_printf(err, "invalid name");
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (memchr(d.v->d_name, '/', len)) {
                prt_printf(err, "invalid name");
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        if (d.v->d_type != DT_SUBVOL &&
            le64_to_cpu(d.v->d_inum) == d.k->p.inode) {
                prt_printf(err, "dirent points to own directory");
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        return 0;
@@ -224,7 +220,7 @@ int bch2_dirent_read_target(struct btree_trans *trans, subvol_inum dir,
        int ret = 0;
 
        if (d.v->d_type == DT_SUBVOL &&
-           d.v->d_parent_subvol != dir.subvol)
+           le32_to_cpu(d.v->d_parent_subvol) != dir.subvol)
                return 1;
 
        if (likely(d.v->d_type != DT_SUBVOL)) {
@@ -350,8 +346,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
@@ -510,8 +506,10 @@ int bch2_readdir(struct bch_fs *c, subvol_inum inum, struct dir_context *ctx)
        struct bkey_s_c_dirent dirent;
        subvol_inum target;
        u32 snapshot;
+       struct bkey_buf sk;
        int ret;
 
+       bch2_bkey_buf_init(&sk);
        bch2_trans_init(&trans, c, 0, 0);
 retry:
        bch2_trans_begin(&trans);
@@ -534,10 +532,11 @@ retry:
                if (ret)
                        continue;
 
-               /*
-                * XXX: dir_emit() can fault and block, while we're holding
-                * locks
-                */
+               /* dir_emit() can fault and block: */
+               bch2_bkey_buf_reassemble(&sk, c, k);
+               dirent = bkey_i_to_s_c_dirent(sk.k);
+               bch2_trans_unlock(&trans);
+
                ctx->pos = dirent.k->p.offset;
                if (!dir_emit(ctx, dirent.v->d_name,
                              bch2_dirent_name_bytes(dirent),
@@ -560,6 +559,7 @@ err:
                goto retry;
 
        bch2_trans_exit(&trans);
+       bch2_bkey_buf_exit(&sk, c);
 
        return ret;
 }