]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: s/bkey_invalid_flags/bch_validate_flags
authorKent Overstreet <kent.overstreet@linux.dev>
Wed, 8 May 2024 22:40:42 +0000 (18:40 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Thu, 9 May 2024 20:23:36 +0000 (16:23 -0400)
We're about to start using bch_validate_flags for superblock section
validation - it's no longer bkey specific.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
31 files changed:
fs/bcachefs/alloc_background.c
fs/bcachefs/alloc_background.h
fs/bcachefs/backpointers.c
fs/bcachefs/backpointers.h
fs/bcachefs/bkey.c
fs/bcachefs/bkey.h
fs/bcachefs/bkey_methods.c
fs/bcachefs/bkey_methods.h
fs/bcachefs/btree_trans_commit.c
fs/bcachefs/dirent.c
fs/bcachefs/dirent.h
fs/bcachefs/ec.c
fs/bcachefs/ec.h
fs/bcachefs/extents.c
fs/bcachefs/extents.h
fs/bcachefs/inode.c
fs/bcachefs/inode.h
fs/bcachefs/journal_io.c
fs/bcachefs/journal_io.h
fs/bcachefs/lru.c
fs/bcachefs/lru.h
fs/bcachefs/quota.c
fs/bcachefs/quota.h
fs/bcachefs/reflink.c
fs/bcachefs/reflink.h
fs/bcachefs/snapshot.c
fs/bcachefs/snapshot.h
fs/bcachefs/subvolume.c
fs/bcachefs/subvolume.h
fs/bcachefs/xattr.c
fs/bcachefs/xattr.h

index 66a1d57db25d4929571040eaf62fb9918517705e..346cd91f91f9998ca73cddc309acd76c4047b6f3 100644 (file)
@@ -195,7 +195,7 @@ static unsigned bch_alloc_v1_val_u64s(const struct bch_alloc *a)
 }
 
 int bch2_alloc_v1_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags,
+                         enum bch_validate_flags flags,
                          struct printbuf *err)
 {
        struct bkey_s_c_alloc a = bkey_s_c_to_alloc(k);
@@ -211,7 +211,7 @@ fsck_err:
 }
 
 int bch2_alloc_v2_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags,
+                         enum bch_validate_flags flags,
                          struct printbuf *err)
 {
        struct bkey_alloc_unpacked u;
@@ -225,7 +225,7 @@ fsck_err:
 }
 
 int bch2_alloc_v3_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags,
+                         enum bch_validate_flags flags,
                          struct printbuf *err)
 {
        struct bkey_alloc_unpacked u;
@@ -239,7 +239,7 @@ fsck_err:
 }
 
 int bch2_alloc_v4_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags, struct printbuf *err)
+                         enum bch_validate_flags flags, struct printbuf *err)
 {
        struct bkey_s_c_alloc_v4 a = bkey_s_c_to_alloc_v4(k);
        int ret = 0;
@@ -487,7 +487,7 @@ static unsigned alloc_gen(struct bkey_s_c k, unsigned offset)
 }
 
 int bch2_bucket_gens_invalid(struct bch_fs *c, struct bkey_s_c k,
-                            enum bkey_invalid_flags flags,
+                            enum bch_validate_flags flags,
                             struct printbuf *err)
 {
        int ret = 0;
index 5f42dc1e7fcc808abe89173394b1127c8c13e52e..ae31a94be6f9130ccd6eefb90622eb970e045c72 100644 (file)
@@ -8,7 +8,7 @@
 #include "debug.h"
 #include "super.h"
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 
 /* How out of date a pointer gen is allowed to be: */
 #define BUCKET_GC_GEN_MAX      96U
@@ -205,13 +205,13 @@ struct bkey_i_alloc_v4 *bch2_alloc_to_v4_mut(struct btree_trans *, struct bkey_s
 int bch2_bucket_io_time_reset(struct btree_trans *, unsigned, size_t, int);
 
 int bch2_alloc_v1_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 int bch2_alloc_v2_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 int bch2_alloc_v3_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 int bch2_alloc_v4_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 void bch2_alloc_v4_swab(struct bkey_s);
 void bch2_alloc_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
@@ -245,7 +245,7 @@ void bch2_alloc_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 })
 
 int bch2_bucket_gens_invalid(struct bch_fs *, struct bkey_s_c,
-                            enum bkey_invalid_flags, struct printbuf *);
+                            enum bch_validate_flags, struct printbuf *);
 void bch2_bucket_gens_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 #define bch2_bkey_ops_bucket_gens ((struct bkey_ops) { \
index 921d95c46cf7e2b7b97fe5cb6dd659c3ffa081eb..692b1c7d5018c876bb41883e8443e3517dbd3be8 100644 (file)
@@ -48,7 +48,7 @@ static bool extent_matches_bp(struct bch_fs *c,
 }
 
 int bch2_backpointer_invalid(struct bch_fs *c, struct bkey_s_c k,
-                            enum bkey_invalid_flags flags,
+                            enum bch_validate_flags flags,
                             struct printbuf *err)
 {
        struct bkey_s_c_backpointer bp = bkey_s_c_to_backpointer(k);
index 929f4a068a0a077c4a5dbb98c90fdd17d30478a0..6021de1c5e98de9879c04564db4865c8a2b1748b 100644 (file)
@@ -19,7 +19,7 @@ static inline u64 swab40(u64 x)
 }
 
 int bch2_backpointer_invalid(struct bch_fs *, struct bkey_s_c k,
-                            enum bkey_invalid_flags, struct printbuf *);
+                            enum bch_validate_flags, struct printbuf *);
 void bch2_backpointer_to_text(struct printbuf *, const struct bch_backpointer *);
 void bch2_backpointer_k_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 void bch2_backpointer_swab(struct bkey_s);
index 952299a2e416388122341e8ff5ea243bc65fd1c8..f46978e5cb7c63d441ea6c4a7a38c936e493b2b1 100644 (file)
@@ -640,7 +640,7 @@ struct bkey_format bch2_bkey_format_done(struct bkey_format_state *s)
 
 int bch2_bkey_format_invalid(struct bch_fs *c,
                             struct bkey_format *f,
-                            enum bkey_invalid_flags flags,
+                            enum bch_validate_flags flags,
                             struct printbuf *err)
 {
        unsigned i, bits = KEY_PACKED_BITS_START;
index 1bb0bd4371b0422cefbe8e452cf70d5d11d3182d..fcd43915df07928cb0cbfd287bc1a9cb961d707e 100644 (file)
@@ -9,10 +9,10 @@
 #include "util.h"
 #include "vstructs.h"
 
-enum bkey_invalid_flags {
-       BKEY_INVALID_WRITE              = (1U << 0),
-       BKEY_INVALID_COMMIT             = (1U << 1),
-       BKEY_INVALID_JOURNAL            = (1U << 2),
+enum bch_validate_flags {
+       BCH_VALIDATE_write              = (1U << 0),
+       BCH_VALIDATE_commit             = (1U << 1),
+       BCH_VALIDATE_journal            = (1U << 2),
 };
 
 #if 0
@@ -598,7 +598,7 @@ static inline bool bch2_bkey_format_field_overflows(struct bkey_format *f, unsig
 }
 
 int bch2_bkey_format_invalid(struct bch_fs *, struct bkey_format *,
-                            enum bkey_invalid_flags, struct printbuf *);
+                            enum bch_validate_flags, struct printbuf *);
 void bch2_bkey_format_to_text(struct printbuf *, const struct bkey_format *);
 
 #endif /* _BCACHEFS_BKEY_H */
index a275a9e8e341aa0669073625d6b39d376139739a..f692f9d8f00da4067e7bd48b4e05643274d59a27 100644 (file)
@@ -27,7 +27,7 @@ const char * const bch2_bkey_types[] = {
 };
 
 static int deleted_key_invalid(struct bch_fs *c, struct bkey_s_c k,
-                              enum bkey_invalid_flags flags, struct printbuf *err)
+                              enum bch_validate_flags flags, struct printbuf *err)
 {
        return 0;
 }
@@ -41,7 +41,7 @@ static int deleted_key_invalid(struct bch_fs *c, struct bkey_s_c k,
 })
 
 static int empty_val_key_invalid(struct bch_fs *c, struct bkey_s_c k,
-                                enum bkey_invalid_flags flags, struct printbuf *err)
+                                enum bch_validate_flags flags, struct printbuf *err)
 {
        int ret = 0;
 
@@ -58,7 +58,7 @@ fsck_err:
 })
 
 static int key_type_cookie_invalid(struct bch_fs *c, struct bkey_s_c k,
-                                  enum bkey_invalid_flags flags, struct printbuf *err)
+                                  enum bch_validate_flags flags, struct printbuf *err)
 {
        return 0;
 }
@@ -82,7 +82,7 @@ static void key_type_cookie_to_text(struct printbuf *out, struct bch_fs *c,
 })
 
 static int key_type_inline_data_invalid(struct bch_fs *c, struct bkey_s_c k,
-                                       enum bkey_invalid_flags flags, struct printbuf *err)
+                                       enum bch_validate_flags flags, struct printbuf *err)
 {
        return 0;
 }
@@ -123,7 +123,7 @@ const struct bkey_ops bch2_bkey_null_ops = {
 };
 
 int bch2_bkey_val_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags,
+                         enum bch_validate_flags flags,
                          struct printbuf *err)
 {
        const struct bkey_ops *ops = bch2_bkey_type_ops(k.k->type);
@@ -159,7 +159,7 @@ const char *bch2_btree_node_type_str(enum btree_node_type type)
 
 int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,
                        enum btree_node_type type,
-                       enum bkey_invalid_flags flags,
+                       enum bch_validate_flags flags,
                        struct printbuf *err)
 {
        int ret = 0;
@@ -172,7 +172,7 @@ int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,
                return 0;
 
        bkey_fsck_err_on(k.k->type < KEY_TYPE_MAX &&
-                        (type == BKEY_TYPE_btree || (flags & BKEY_INVALID_COMMIT)) &&
+                        (type == BKEY_TYPE_btree || (flags & BCH_VALIDATE_commit)) &&
                         !(bch2_key_types_allowed[type] & BIT_ULL(k.k->type)), c, err,
                         bkey_invalid_type_for_btree,
                         "invalid key type for btree %s (%s)",
@@ -224,7 +224,7 @@ fsck_err:
 
 int bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,
                      enum btree_node_type type,
-                     enum bkey_invalid_flags flags,
+                     enum bch_validate_flags flags,
                      struct printbuf *err)
 {
        return __bch2_bkey_invalid(c, k, type, flags, err) ?:
index 7351c0d38534fce170917688a7138a2b3fa4ebe9..726ef74837638f3f8f9c7deb2311a5eded810aa1 100644 (file)
@@ -22,7 +22,7 @@ extern const struct bkey_ops bch2_bkey_null_ops;
  */
 struct bkey_ops {
        int             (*key_invalid)(struct bch_fs *c, struct bkey_s_c k,
-                                      enum bkey_invalid_flags flags, struct printbuf *err);
+                                      enum bch_validate_flags flags, struct printbuf *err);
        void            (*val_to_text)(struct printbuf *, struct bch_fs *,
                                       struct bkey_s_c);
        void            (*swab)(struct bkey_s);
@@ -49,11 +49,11 @@ static inline const struct bkey_ops *bch2_bkey_type_ops(enum bch_bkey_type type)
 }
 
 int bch2_bkey_val_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 int __bch2_bkey_invalid(struct bch_fs *, struct bkey_s_c, enum btree_node_type,
-                       enum bkey_invalid_flags, struct printbuf *);
+                       enum bch_validate_flags, struct printbuf *);
 int bch2_bkey_invalid(struct bch_fs *, struct bkey_s_c, enum btree_node_type,
-                     enum bkey_invalid_flags, struct printbuf *);
+                     enum bch_validate_flags, struct printbuf *);
 int bch2_bkey_in_btree_node(struct bch_fs *, struct btree *,
                            struct bkey_s_c, struct printbuf *);
 
index a219a87e9ef07928f30ae636271172f37a7931cf..74e1ff225674c671fa10be121763c80e6190d9bb 100644 (file)
@@ -790,7 +790,7 @@ static noinline void bch2_drop_overwrites_from_journal(struct btree_trans *trans
 }
 
 static noinline int bch2_trans_commit_bkey_invalid(struct btree_trans *trans,
-                                                  enum bkey_invalid_flags flags,
+                                                  enum bch_validate_flags flags,
                                                   struct btree_insert_entry *i,
                                                   struct printbuf *err)
 {
@@ -1025,10 +1025,10 @@ int __bch2_trans_commit(struct btree_trans *trans, unsigned flags)
 
        trans_for_each_update(trans, i) {
                struct printbuf buf = PRINTBUF;
-               enum bkey_invalid_flags invalid_flags = 0;
+               enum bch_validate_flags invalid_flags = 0;
 
                if (!(flags & BCH_TRANS_COMMIT_no_journal_res))
-                       invalid_flags |= BKEY_INVALID_WRITE|BKEY_INVALID_COMMIT;
+                       invalid_flags |= BCH_VALIDATE_write|BCH_VALIDATE_commit;
 
                if (unlikely(bch2_bkey_invalid(c, bkey_i_to_s_c(i->k),
                                               i->bkey_type, invalid_flags, &buf)))
@@ -1043,10 +1043,10 @@ int __bch2_trans_commit(struct btree_trans *trans, unsigned flags)
        for (struct jset_entry *i = trans->journal_entries;
             i != (void *) ((u64 *) trans->journal_entries + trans->journal_entries_u64s);
             i = vstruct_next(i)) {
-               enum bkey_invalid_flags invalid_flags = 0;
+               enum bch_validate_flags invalid_flags = 0;
 
                if (!(flags & BCH_TRANS_COMMIT_no_journal_res))
-                       invalid_flags |= BKEY_INVALID_WRITE|BKEY_INVALID_COMMIT;
+                       invalid_flags |= BCH_VALIDATE_write|BCH_VALIDATE_commit;
 
                if (unlikely(bch2_journal_entry_validate(c, NULL, i,
                                        bcachefs_metadata_version_current,
index dd9de8e5a28a988fe178a22d6acb0c5592b52c4d..6bbf9a7d9e4d2cd17ea1742284176a4b43b7343c 100644 (file)
@@ -98,7 +98,7 @@ const struct bch_hash_desc bch2_dirent_hash_desc = {
 };
 
 int bch2_dirent_invalid(struct bch_fs *c, struct bkey_s_c k,
-                       enum bkey_invalid_flags flags,
+                       enum bch_validate_flags flags,
                        struct printbuf *err)
 {
        struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);
@@ -118,7 +118,7 @@ int bch2_dirent_invalid(struct bch_fs *c, struct bkey_s_c k,
         * Check new keys don't exceed the max length
         * (older keys may be larger.)
         */
-       bkey_fsck_err_on((flags & BKEY_INVALID_COMMIT) && d_name.len > BCH_NAME_MAX, c, err,
+       bkey_fsck_err_on((flags & BCH_VALIDATE_commit) && d_name.len > BCH_NAME_MAX, c, err,
                         dirent_name_too_long,
                         "dirent name too big (%u > %u)",
                         d_name.len, BCH_NAME_MAX);
index 635ceb3c07fbc8e0200788f39df543bba0771459..24037e6e0a0948d0cb3cc6c78e1f530cd3f79e6e 100644 (file)
@@ -4,11 +4,11 @@
 
 #include "str_hash.h"
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 extern const struct bch_hash_desc bch2_dirent_hash_desc;
 
 int bch2_dirent_invalid(struct bch_fs *, struct bkey_s_c,
-                       enum bkey_invalid_flags, struct printbuf *);
+                       enum bch_validate_flags, struct printbuf *);
 void bch2_dirent_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 #define bch2_bkey_ops_dirent ((struct bkey_ops) {      \
index 055be0ca925078e1a1def0e6155c50a9460fe2e4..b26dc7424662390b07c4d205d245403fbd1cde69 100644 (file)
@@ -107,7 +107,7 @@ struct ec_bio {
 /* Stripes btree keys: */
 
 int bch2_stripe_invalid(struct bch_fs *c, struct bkey_s_c k,
-                       enum bkey_invalid_flags flags,
+                       enum bch_validate_flags flags,
                        struct printbuf *err)
 {
        const struct bch_stripe *s = bkey_s_c_to_stripe(k).v;
index a1c2bc74ef4582cfa9d78d9fbe9f510b2c02fe2a..84a23eeb62495e1d4f9d620fff8c654dbbbd9b2a 100644 (file)
@@ -6,10 +6,10 @@
 #include "buckets_types.h"
 #include "extents_types.h"
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 
 int bch2_stripe_invalid(struct bch_fs *, struct bkey_s_c,
-                       enum bkey_invalid_flags, struct printbuf *);
+                       enum bch_validate_flags, struct printbuf *);
 void bch2_stripe_to_text(struct printbuf *, struct bch_fs *,
                         struct bkey_s_c);
 int bch2_trigger_stripe(struct btree_trans *, enum btree_id, unsigned,
index 094caf1cdb35b29220162f5ee3d24519294b16a8..469037929685bc3411fc3b9b3df3ff090a150cbf 100644 (file)
@@ -172,7 +172,7 @@ int bch2_bkey_pick_read_device(struct bch_fs *c, struct bkey_s_c k,
 /* KEY_TYPE_btree_ptr: */
 
 int bch2_btree_ptr_invalid(struct bch_fs *c, struct bkey_s_c k,
-                          enum bkey_invalid_flags flags,
+                          enum bch_validate_flags flags,
                           struct printbuf *err)
 {
        int ret = 0;
@@ -193,7 +193,7 @@ void bch2_btree_ptr_to_text(struct printbuf *out, struct bch_fs *c,
 }
 
 int bch2_btree_ptr_v2_invalid(struct bch_fs *c, struct bkey_s_c k,
-                             enum bkey_invalid_flags flags,
+                             enum bch_validate_flags flags,
                              struct printbuf *err)
 {
        struct bkey_s_c_btree_ptr_v2 bp = bkey_s_c_to_btree_ptr_v2(k);
@@ -208,7 +208,7 @@ int bch2_btree_ptr_v2_invalid(struct bch_fs *c, struct bkey_s_c k,
                         c, err, btree_ptr_v2_min_key_bad,
                         "min_key > key");
 
-       if (flags & BKEY_INVALID_WRITE)
+       if (flags & BCH_VALIDATE_write)
                bkey_fsck_err_on(!bp.v->sectors_written,
                                 c, err, btree_ptr_v2_written_0,
                                 "sectors_written == 0");
@@ -400,7 +400,7 @@ bool bch2_extent_merge(struct bch_fs *c, struct bkey_s l, struct bkey_s_c r)
 /* KEY_TYPE_reservation: */
 
 int bch2_reservation_invalid(struct bch_fs *c, struct bkey_s_c k,
-                            enum bkey_invalid_flags flags,
+                            enum bch_validate_flags flags,
                             struct printbuf *err)
 {
        struct bkey_s_c_reservation r = bkey_s_c_to_reservation(k);
@@ -1095,7 +1095,7 @@ void bch2_bkey_ptrs_to_text(struct printbuf *out, struct bch_fs *c,
 
 static int extent_ptr_invalid(struct bch_fs *c,
                              struct bkey_s_c k,
-                             enum bkey_invalid_flags flags,
+                             enum bch_validate_flags flags,
                              const struct bch_extent_ptr *ptr,
                              unsigned size_ondisk,
                              bool metadata,
@@ -1138,7 +1138,7 @@ fsck_err:
 }
 
 int bch2_bkey_ptrs_invalid(struct bch_fs *c, struct bkey_s_c k,
-                          enum bkey_invalid_flags flags,
+                          enum bch_validate_flags flags,
                           struct printbuf *err)
 {
        struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
@@ -1214,7 +1214,7 @@ int bch2_bkey_ptrs_invalid(struct bch_fs *c, struct bkey_s_c k,
 
                        bkey_fsck_err_on(crc_is_encoded(crc) &&
                                         (crc.uncompressed_size > c->opts.encoded_extent_max >> 9) &&
-                                        (flags & (BKEY_INVALID_WRITE|BKEY_INVALID_COMMIT)), c, err,
+                                        (flags & (BCH_VALIDATE_write|BCH_VALIDATE_commit)), c, err,
                                         ptr_crc_uncompressed_size_too_big,
                                         "too large encoded extent");
 
index 10e1817e83e3bcea6cb9a4bc4513fa855215d458..1ade959652b2e6f34a3774f3ca084690bc20f600 100644 (file)
@@ -8,7 +8,7 @@
 
 struct bch_fs;
 struct btree_trans;
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 
 /* extent entries: */
 
@@ -406,12 +406,12 @@ int bch2_bkey_pick_read_device(struct bch_fs *, struct bkey_s_c,
 /* KEY_TYPE_btree_ptr: */
 
 int bch2_btree_ptr_invalid(struct bch_fs *, struct bkey_s_c,
-                          enum bkey_invalid_flags, struct printbuf *);
+                          enum bch_validate_flags, struct printbuf *);
 void bch2_btree_ptr_to_text(struct printbuf *, struct bch_fs *,
                            struct bkey_s_c);
 
 int bch2_btree_ptr_v2_invalid(struct bch_fs *, struct bkey_s_c,
-                             enum bkey_invalid_flags, struct printbuf *);
+                             enum bch_validate_flags, struct printbuf *);
 void bch2_btree_ptr_v2_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 void bch2_btree_ptr_v2_compat(enum btree_id, unsigned, unsigned,
                              int, struct bkey_s);
@@ -448,7 +448,7 @@ bool bch2_extent_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
 /* KEY_TYPE_reservation: */
 
 int bch2_reservation_invalid(struct bch_fs *, struct bkey_s_c,
-                            enum bkey_invalid_flags, struct printbuf *);
+                            enum bch_validate_flags, struct printbuf *);
 void bch2_reservation_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 bool bch2_reservation_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
 
@@ -680,7 +680,7 @@ void bch2_extent_ptr_to_text(struct printbuf *out, struct bch_fs *, const struct
 void bch2_bkey_ptrs_to_text(struct printbuf *, struct bch_fs *,
                            struct bkey_s_c);
 int bch2_bkey_ptrs_invalid(struct bch_fs *, struct bkey_s_c,
-                          enum bkey_invalid_flags, struct printbuf *);
+                          enum bch_validate_flags, struct printbuf *);
 
 void bch2_ptr_swab(struct bkey_s);
 
index 91572e05d5f06bff2ec364aa040ae55a06f73bb9..aafa79fa63514bfe99a79077ec6042faacfdb7c9 100644 (file)
@@ -473,7 +473,7 @@ fsck_err:
 }
 
 int bch2_inode_invalid(struct bch_fs *c, struct bkey_s_c k,
-                      enum bkey_invalid_flags flags,
+                      enum bch_validate_flags flags,
                       struct printbuf *err)
 {
        struct bkey_s_c_inode inode = bkey_s_c_to_inode(k);
@@ -490,7 +490,7 @@ fsck_err:
 }
 
 int bch2_inode_v2_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags,
+                         enum bch_validate_flags flags,
                          struct printbuf *err)
 {
        struct bkey_s_c_inode_v2 inode = bkey_s_c_to_inode_v2(k);
@@ -507,7 +507,7 @@ fsck_err:
 }
 
 int bch2_inode_v3_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags,
+                         enum bch_validate_flags flags,
                          struct printbuf *err)
 {
        struct bkey_s_c_inode_v3 inode = bkey_s_c_to_inode_v3(k);
@@ -635,7 +635,7 @@ int bch2_trigger_inode(struct btree_trans *trans,
 }
 
 int bch2_inode_generation_invalid(struct bch_fs *c, struct bkey_s_c k,
-                                 enum bkey_invalid_flags flags,
+                                 enum bch_validate_flags flags,
                                  struct printbuf *err)
 {
        int ret = 0;
index abdfb1f3e4d08f1ef7b6ca6e952aabcc032496d8..679f5f5e5d154187806326493a09db1ae5210aea 100644 (file)
@@ -6,15 +6,15 @@
 #include "bkey_methods.h"
 #include "opts.h"
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 extern const char * const bch2_inode_opts[];
 
 int bch2_inode_invalid(struct bch_fs *, struct bkey_s_c,
-                      enum bkey_invalid_flags, struct printbuf *);
+                      enum bch_validate_flags, struct printbuf *);
 int bch2_inode_v2_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 int bch2_inode_v3_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 void bch2_inode_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 int bch2_trigger_inode(struct btree_trans *, enum btree_id, unsigned,
@@ -50,7 +50,7 @@ static inline bool bkey_is_inode(const struct bkey *k)
 }
 
 int bch2_inode_generation_invalid(struct bch_fs *, struct bkey_s_c,
-                                 enum bkey_invalid_flags, struct printbuf *);
+                                 enum bch_validate_flags, struct printbuf *);
 void bch2_inode_generation_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 #define bch2_bkey_ops_inode_generation ((struct bkey_ops) {    \
index 56f4d46ef094154c1821ab4766358bf417edcd41..cdcb1ad49af42e7febf88adc0987ee7dfede42f3 100644 (file)
@@ -299,7 +299,7 @@ static void journal_entry_err_msg(struct printbuf *out,
        journal_entry_err_msg(&_buf, version, jset, entry);             \
        prt_printf(&_buf, msg, ##__VA_ARGS__);                          \
                                                                        \
-       switch (flags & BKEY_INVALID_WRITE) {                           \
+       switch (flags & BCH_VALIDATE_write) {                           \
        case READ:                                                      \
                mustfix_fsck_err(c, _err, "%s", _buf.buf);              \
                break;                                                  \
@@ -328,9 +328,9 @@ static int journal_validate_key(struct bch_fs *c,
                                unsigned level, enum btree_id btree_id,
                                struct bkey_i *k,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
-       int write = flags & BKEY_INVALID_WRITE;
+       int write = flags & BCH_VALIDATE_write;
        void *next = vstruct_next(entry);
        struct printbuf buf = PRINTBUF;
        int ret = 0;
@@ -403,7 +403,7 @@ static int journal_entry_btree_keys_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        struct bkey_i *k = entry->start;
 
@@ -412,7 +412,7 @@ static int journal_entry_btree_keys_validate(struct bch_fs *c,
                                               entry->level,
                                               entry->btree_id,
                                               k, version, big_endian,
-                                              flags|BKEY_INVALID_JOURNAL);
+                                              flags|BCH_VALIDATE_journal);
                if (ret == FSCK_DELETED_KEY)
                        continue;
 
@@ -443,7 +443,7 @@ static int journal_entry_btree_root_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        struct bkey_i *k = entry->start;
        int ret = 0;
@@ -482,7 +482,7 @@ static int journal_entry_prio_ptrs_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        /* obsolete, don't care: */
        return 0;
@@ -497,7 +497,7 @@ static int journal_entry_blacklist_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        int ret = 0;
 
@@ -524,7 +524,7 @@ static int journal_entry_blacklist_v2_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        struct jset_entry_blacklist_v2 *bl_entry;
        int ret = 0;
@@ -566,7 +566,7 @@ static int journal_entry_usage_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        struct jset_entry_usage *u =
                container_of(entry, struct jset_entry_usage, entry);
@@ -600,7 +600,7 @@ static int journal_entry_data_usage_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        struct jset_entry_data_usage *u =
                container_of(entry, struct jset_entry_data_usage, entry);
@@ -644,7 +644,7 @@ static int journal_entry_clock_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        struct jset_entry_clock *clock =
                container_of(entry, struct jset_entry_clock, entry);
@@ -684,7 +684,7 @@ static int journal_entry_dev_usage_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        struct jset_entry_dev_usage *u =
                container_of(entry, struct jset_entry_dev_usage, entry);
@@ -735,7 +735,7 @@ static int journal_entry_log_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        return 0;
 }
@@ -753,7 +753,7 @@ static int journal_entry_overwrite_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        return journal_entry_btree_keys_validate(c, jset, entry,
                                version, big_endian, READ);
@@ -769,7 +769,7 @@ static int journal_entry_write_buffer_keys_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        return journal_entry_btree_keys_validate(c, jset, entry,
                                version, big_endian, READ);
@@ -785,7 +785,7 @@ static int journal_entry_datetime_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        unsigned bytes = vstruct_bytes(entry);
        unsigned expected = 16;
@@ -815,7 +815,7 @@ static void journal_entry_datetime_to_text(struct printbuf *out, struct bch_fs *
 struct jset_entry_ops {
        int (*validate)(struct bch_fs *, struct jset *,
                        struct jset_entry *, unsigned, int,
-                       enum bkey_invalid_flags);
+                       enum bch_validate_flags);
        void (*to_text)(struct printbuf *, struct bch_fs *, struct jset_entry *);
 };
 
@@ -833,7 +833,7 @@ int bch2_journal_entry_validate(struct bch_fs *c,
                                struct jset *jset,
                                struct jset_entry *entry,
                                unsigned version, int big_endian,
-                               enum bkey_invalid_flags flags)
+                               enum bch_validate_flags flags)
 {
        return entry->type < BCH_JSET_ENTRY_NR
                ? bch2_jset_entry_ops[entry->type].validate(c, jset, entry,
@@ -853,7 +853,7 @@ void bch2_journal_entry_to_text(struct printbuf *out, struct bch_fs *c,
 }
 
 static int jset_validate_entries(struct bch_fs *c, struct jset *jset,
-                                enum bkey_invalid_flags flags)
+                                enum bch_validate_flags flags)
 {
        unsigned version = le32_to_cpu(jset->version);
        int ret = 0;
@@ -879,7 +879,7 @@ fsck_err:
 static int jset_validate(struct bch_fs *c,
                         struct bch_dev *ca,
                         struct jset *jset, u64 sector,
-                        enum bkey_invalid_flags flags)
+                        enum bch_validate_flags flags)
 {
        unsigned version;
        int ret = 0;
@@ -934,7 +934,7 @@ static int jset_validate_early(struct bch_fs *c,
 {
        size_t bytes = vstruct_bytes(jset);
        unsigned version;
-       enum bkey_invalid_flags flags = BKEY_INVALID_JOURNAL;
+       enum bch_validate_flags flags = BCH_VALIDATE_journal;
        int ret = 0;
 
        if (le64_to_cpu(jset->magic) != jset_magic(c))
@@ -1235,7 +1235,7 @@ int bch2_journal_read(struct bch_fs *c,
         * those entries will be blacklisted:
         */
        genradix_for_each_reverse(&c->journal_entries, radix_iter, _i) {
-               enum bkey_invalid_flags flags = BKEY_INVALID_JOURNAL;
+               enum bch_validate_flags flags = BCH_VALIDATE_journal;
 
                i = *_i;
 
index 43cfed58ef33f0dae7243efc08e2ebbb6132109e..2ca9cde30ea8da0fdabbc2fa084be8df140ba3fa 100644 (file)
@@ -63,7 +63,7 @@ static inline struct jset_entry *__jset_entry_type_next(struct jset *jset,
 
 int bch2_journal_entry_validate(struct bch_fs *, struct jset *,
                                struct jset_entry *, unsigned, int,
-                               enum bkey_invalid_flags);
+                               enum bch_validate_flags);
 void bch2_journal_entry_to_text(struct printbuf *, struct bch_fs *,
                                struct jset_entry *);
 
index 19285fcd252c5f7cfaf468f8a383626222bde96b..a40d116224edd9f3ef71464b4756b51262fb143e 100644 (file)
@@ -11,7 +11,7 @@
 
 /* KEY_TYPE_lru is obsolete: */
 int bch2_lru_invalid(struct bch_fs *c, struct bkey_s_c k,
-                    enum bkey_invalid_flags flags,
+                    enum bch_validate_flags flags,
                     struct printbuf *err)
 {
        int ret = 0;
index 429dca816df5c5049c85e31ea20eb1e92ea694cf..fb11ab0dd00ea9afe872d604c66240b374bef781 100644 (file)
@@ -49,7 +49,7 @@ static inline enum bch_lru_type lru_type(struct bkey_s_c l)
 }
 
 int bch2_lru_invalid(struct bch_fs *, struct bkey_s_c,
-                    enum bkey_invalid_flags, struct printbuf *);
+                    enum bch_validate_flags, struct printbuf *);
 void bch2_lru_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 void bch2_lru_pos_to_text(struct printbuf *, struct bpos);
index 9d7498e774e205346cd1c56ea71dc995a2c6419b..d86381e9ac8696aedc60d813a2f9d318a6feff1a 100644 (file)
@@ -60,7 +60,7 @@ const struct bch_sb_field_ops bch_sb_field_ops_quota = {
 };
 
 int bch2_quota_invalid(struct bch_fs *c, struct bkey_s_c k,
-                      enum bkey_invalid_flags flags,
+                      enum bch_validate_flags flags,
                       struct printbuf *err)
 {
        int ret = 0;
index 884f601f41c425b711f14ea05be3c8fc26f12158..02d37a332218a80f5688a0eb36061db32a14e4f1 100644 (file)
@@ -5,11 +5,11 @@
 #include "inode.h"
 #include "quota_types.h"
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 extern const struct bch_sb_field_ops bch_sb_field_ops_quota;
 
 int bch2_quota_invalid(struct bch_fs *, struct bkey_s_c,
-                      enum bkey_invalid_flags, struct printbuf *);
+                      enum bch_validate_flags, struct printbuf *);
 void bch2_quota_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 #define bch2_bkey_ops_quota ((struct bkey_ops) {       \
index fb31a68148ff9895aae4dff24b515dce5da79283..9ac6cf21cfbf78db63827ba47dcd5b3b57a8956e 100644 (file)
@@ -30,7 +30,7 @@ static inline unsigned bkey_type_to_indirect(const struct bkey *k)
 /* reflink pointers */
 
 int bch2_reflink_p_invalid(struct bch_fs *c, struct bkey_s_c k,
-                          enum bkey_invalid_flags flags,
+                          enum bch_validate_flags flags,
                           struct printbuf *err)
 {
        struct bkey_s_c_reflink_p p = bkey_s_c_to_reflink_p(k);
@@ -257,7 +257,7 @@ int bch2_trigger_reflink_p(struct btree_trans *trans,
 /* indirect extents */
 
 int bch2_reflink_v_invalid(struct bch_fs *c, struct bkey_s_c k,
-                          enum bkey_invalid_flags flags,
+                          enum bch_validate_flags flags,
                           struct printbuf *err)
 {
        return bch2_bkey_ptrs_invalid(c, k, flags, err);
@@ -312,7 +312,7 @@ int bch2_trigger_reflink_v(struct btree_trans *trans,
 /* indirect inline data */
 
 int bch2_indirect_inline_data_invalid(struct bch_fs *c, struct bkey_s_c k,
-                                     enum bkey_invalid_flags flags,
+                                     enum bch_validate_flags flags,
                                      struct printbuf *err)
 {
        return 0;
index 59d4dbae3fb1f48d0c5367ebf5f3ebc5c4543bb4..e894f3a2c67ac6225fc2edecc8de0d538520aa4e 100644 (file)
@@ -2,10 +2,10 @@
 #ifndef _BCACHEFS_REFLINK_H
 #define _BCACHEFS_REFLINK_H
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 
 int bch2_reflink_p_invalid(struct bch_fs *, struct bkey_s_c,
-                          enum bkey_invalid_flags, struct printbuf *);
+                          enum bch_validate_flags, struct printbuf *);
 void bch2_reflink_p_to_text(struct printbuf *, struct bch_fs *,
                            struct bkey_s_c);
 bool bch2_reflink_p_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
@@ -22,7 +22,7 @@ int bch2_trigger_reflink_p(struct btree_trans *, enum btree_id, unsigned,
 })
 
 int bch2_reflink_v_invalid(struct bch_fs *, struct bkey_s_c,
-                          enum bkey_invalid_flags, struct printbuf *);
+                          enum bch_validate_flags, struct printbuf *);
 void bch2_reflink_v_to_text(struct printbuf *, struct bch_fs *,
                            struct bkey_s_c);
 int bch2_trigger_reflink_v(struct btree_trans *, enum btree_id, unsigned,
@@ -38,7 +38,7 @@ int bch2_trigger_reflink_v(struct btree_trans *, enum btree_id, unsigned,
 })
 
 int bch2_indirect_inline_data_invalid(struct bch_fs *, struct bkey_s_c,
-                                     enum bkey_invalid_flags, struct printbuf *);
+                                     enum bch_validate_flags, struct printbuf *);
 void bch2_indirect_inline_data_to_text(struct printbuf *,
                                struct bch_fs *, struct bkey_s_c);
 int bch2_trigger_indirect_inline_data(struct btree_trans *,
index 3aa4686cc71fcc318516a35e2f2e61dda54fae33..629900a5e6411c2ee78e9be528646c973b500b09 100644 (file)
@@ -32,7 +32,7 @@ void bch2_snapshot_tree_to_text(struct printbuf *out, struct bch_fs *c,
 }
 
 int bch2_snapshot_tree_invalid(struct bch_fs *c, struct bkey_s_c k,
-                              enum bkey_invalid_flags flags,
+                              enum bch_validate_flags flags,
                               struct printbuf *err)
 {
        int ret = 0;
@@ -223,7 +223,7 @@ void bch2_snapshot_to_text(struct printbuf *out, struct bch_fs *c,
 }
 
 int bch2_snapshot_invalid(struct bch_fs *c, struct bkey_s_c k,
-                         enum bkey_invalid_flags flags,
+                         enum bch_validate_flags flags,
                          struct printbuf *err)
 {
        struct bkey_s_c_snapshot s;
index b3c43d57954028ea1b70024ce6caf08feeff7913..bd5d74269d15a6e293dfe8455ed7f7b8c8aa6919 100644 (file)
@@ -2,11 +2,11 @@
 #ifndef _BCACHEFS_SNAPSHOT_H
 #define _BCACHEFS_SNAPSHOT_H
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 
 void bch2_snapshot_tree_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 int bch2_snapshot_tree_invalid(struct bch_fs *, struct bkey_s_c,
-                              enum bkey_invalid_flags, struct printbuf *);
+                              enum bch_validate_flags, struct printbuf *);
 
 #define bch2_bkey_ops_snapshot_tree ((struct bkey_ops) {       \
        .key_invalid    = bch2_snapshot_tree_invalid,           \
@@ -20,7 +20,7 @@ int bch2_snapshot_tree_lookup(struct btree_trans *, u32, struct bch_snapshot_tre
 
 void bch2_snapshot_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 int bch2_snapshot_invalid(struct bch_fs *, struct bkey_s_c,
-                         enum bkey_invalid_flags, struct printbuf *);
+                         enum bch_validate_flags, struct printbuf *);
 int bch2_mark_snapshot(struct btree_trans *, enum btree_id, unsigned,
                       struct bkey_s_c, struct bkey_s,
                       enum btree_iter_update_trigger_flags);
index 3341285e75317af2c449c79c71296fa8c592ae40..132213761ef6436c04ee96020d2fe297a6eb130c 100644 (file)
@@ -208,7 +208,7 @@ int bch2_check_subvol_children(struct bch_fs *c)
 /* Subvolumes: */
 
 int bch2_subvolume_invalid(struct bch_fs *c, struct bkey_s_c k,
-                          enum bkey_invalid_flags flags, struct printbuf *err)
+                          enum bch_validate_flags flags, struct printbuf *err)
 {
        int ret = 0;
 
index 1530a10327ab36432376b0d920a3d93b7df24e1c..afa5e871efb252db7304d62287f1fdc0bbfc89f6 100644 (file)
@@ -5,13 +5,13 @@
 #include "darray.h"
 #include "subvolume_types.h"
 
-enum bkey_invalid_flags;
+enum bch_validate_flags;
 
 int bch2_check_subvols(struct bch_fs *);
 int bch2_check_subvol_children(struct bch_fs *);
 
 int bch2_subvolume_invalid(struct bch_fs *, struct bkey_s_c,
-                          enum bkey_invalid_flags, struct printbuf *);
+                          enum bch_validate_flags, struct printbuf *);
 void bch2_subvolume_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 int bch2_subvolume_trigger(struct btree_trans *, enum btree_id, unsigned,
                           struct bkey_s_c, struct bkey_s,
index 786ccd7a7662d4c5e722d6e47377c68a84526a02..c11bf6dacc2c767006e97fa5ac00b29b192e0ecd 100644 (file)
@@ -71,7 +71,7 @@ const struct bch_hash_desc bch2_xattr_hash_desc = {
 };
 
 int bch2_xattr_invalid(struct bch_fs *c, struct bkey_s_c k,
-                      enum bkey_invalid_flags flags,
+                      enum bch_validate_flags flags,
                       struct printbuf *err)
 {
        struct bkey_s_c_xattr xattr = bkey_s_c_to_xattr(k);
index 1337f31a5c492c8401eefefdcd56c4a450d73514..1574b9eb4c850566039596aac97a7ba600609a3f 100644 (file)
@@ -7,7 +7,7 @@
 extern const struct bch_hash_desc bch2_xattr_hash_desc;
 
 int bch2_xattr_invalid(struct bch_fs *, struct bkey_s_c,
-                      enum bkey_invalid_flags, struct printbuf *);
+                      enum bch_validate_flags, struct printbuf *);
 void bch2_xattr_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 #define bch2_bkey_ops_xattr ((struct bkey_ops) {       \