Commit 65eaf4e2 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: s/bkey_invalid_flags/bch_validate_flags 



We're about to start using bch_validate_flags for superblock section
validation - it's no longer bkey specific.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent d09a8468

fs/bcachefs/alloc_background.c

+5 −5
Original line number Diff line number Diff line
@@ -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 @@ int bch2_alloc_v1_invalid(struct bch_fs *c, struct bkey_s_c k, 
}



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 @@ int bch2_alloc_v2_invalid(struct bch_fs *c, struct bkey_s_c k, 
}



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 @@ int bch2_alloc_v3_invalid(struct bch_fs *c, struct bkey_s_c k, 
}



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;

fs/bcachefs/alloc_background.h

+6 −6
Original line number Diff line number Diff line
@@ -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) {	\

fs/bcachefs/backpointers.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/bcachefs/backpointers.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/bcachefs/bkey.c

+1 −1
Original line number Diff line number Diff line
@@ -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;