Update bcachefs sources to 070ec8d07b bcachefs: Snapshot depth, skiplist fields

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

diff --git a/libbcachefs/inode.c b/libbcachefs/inode.c
index 7ccbc00b7156ed9f7ad9e2f16326555b475a5760..fa435d8655de8e512aacd7a718c51677a384bb54 100644 (file)
--- a/libbcachefs/inode.c
+++ b/libbcachefs/inode.c
@@ -329,15 +329,14 @@ int bch2_inode_peek(struct btree_trans *trans,
        if (ret)
                return ret;
 
-       bch2_trans_iter_init(trans, iter, BTREE_ID_inodes,
-                            SPOS(0, inum.inum, snapshot),
-                            flags|BTREE_ITER_CACHED);
-       k = bch2_btree_iter_peek_slot(iter);
+       k = bch2_bkey_get_iter(trans, iter, BTREE_ID_inodes,
+                              SPOS(0, inum.inum, snapshot),
+                              flags|BTREE_ITER_CACHED);
        ret = bkey_err(k);
        if (ret)
-               goto err;
+               return ret;
 
-       ret = bkey_is_inode(k.k) ? 0 : -ENOENT;
+       ret = bkey_is_inode(k.k) ? 0 : -BCH_ERR_ENOENT_inode;
        if (ret)
                goto err;
 
@@ -433,16 +432,11 @@ static int __bch2_inode_invalid(struct bkey_s_c k, struct printbuf *err)
 }
 
 int bch2_inode_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                      unsigned flags, struct printbuf *err)
+                      enum bkey_invalid_flags flags,
+                      struct printbuf *err)
 {
        struct bkey_s_c_inode inode = bkey_s_c_to_inode(k);
 
-       if (bkey_val_bytes(k.k) < sizeof(*inode.v)) {
-               prt_printf(err, "incorrect value size (%zu < %zu)",
-                      bkey_val_bytes(k.k), sizeof(*inode.v));
-               return -BCH_ERR_invalid_bkey;
-       }
-
        if (INODE_STR_HASH(inode.v) >= BCH_STR_HASH_NR) {
                prt_printf(err, "invalid str hash type (%llu >= %u)",
                       INODE_STR_HASH(inode.v), BCH_STR_HASH_NR);
@@ -453,16 +447,11 @@ int bch2_inode_invalid(const struct bch_fs *c, struct bkey_s_c k,
 }
 
 int bch2_inode_v2_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                         unsigned flags, struct printbuf *err)
+                         enum bkey_invalid_flags flags,
+                         struct printbuf *err)
 {
        struct bkey_s_c_inode_v2 inode = bkey_s_c_to_inode_v2(k);
 
-       if (bkey_val_bytes(k.k) < sizeof(*inode.v)) {
-               prt_printf(err, "incorrect value size (%zu < %zu)",
-                      bkey_val_bytes(k.k), sizeof(*inode.v));
-               return -BCH_ERR_invalid_bkey;
-       }
-
        if (INODEv2_STR_HASH(inode.v) >= BCH_STR_HASH_NR) {
                prt_printf(err, "invalid str hash type (%llu >= %u)",
                       INODEv2_STR_HASH(inode.v), BCH_STR_HASH_NR);
@@ -473,16 +462,11 @@ int bch2_inode_v2_invalid(const struct bch_fs *c, struct bkey_s_c k,
 }
 
 int bch2_inode_v3_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                         unsigned flags, struct printbuf *err)
+                         enum bkey_invalid_flags flags,
+                         struct printbuf *err)
 {
        struct bkey_s_c_inode_v3 inode = bkey_s_c_to_inode_v3(k);
 
-       if (bkey_val_bytes(k.k) < sizeof(*inode.v)) {
-               prt_printf(err, "incorrect value size (%zu < %zu)",
-                      bkey_val_bytes(k.k), sizeof(*inode.v));
-               return -BCH_ERR_invalid_bkey;
-       }
-
        if (INODEv3_FIELDS_START(inode.v) < INODEv3_FIELDS_START_INITIAL ||
            INODEv3_FIELDS_START(inode.v) > bkey_val_u64s(inode.k)) {
                prt_printf(err, "invalid fields_start (got %llu, min %u max %zu)",
@@ -536,19 +520,14 @@ void bch2_inode_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c
 }
 
 int bch2_inode_generation_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                                 unsigned flags, struct printbuf *err)
+                                 enum bkey_invalid_flags flags,
+                                 struct printbuf *err)
 {
        if (k.k->p.inode) {
                prt_printf(err, "nonzero k.p.inode");
                return -BCH_ERR_invalid_bkey;
        }
 
-       if (bkey_val_bytes(k.k) != sizeof(struct bch_inode_generation)) {
-               prt_printf(err, "incorrect value size (%zu != %zu)",
-                      bkey_val_bytes(k.k), sizeof(struct bch_inode_generation));
-               return -BCH_ERR_invalid_bkey;
-       }
-
        return 0;
 }
 
@@ -784,11 +763,9 @@ retry:
        if (ret)
                goto err;
 
-       bch2_trans_iter_init(&trans, &iter, BTREE_ID_inodes,
-                            SPOS(0, inum.inum, snapshot),
-                            BTREE_ITER_INTENT|BTREE_ITER_CACHED);
-       k = bch2_btree_iter_peek_slot(&iter);
-
+       k = bch2_bkey_get_iter(&trans, &iter, BTREE_ID_inodes,
+                              SPOS(0, inum.inum, snapshot),
+                              BTREE_ITER_INTENT|BTREE_ITER_CACHED);
        ret = bkey_err(k);
        if (ret)
                goto err;