Commit 2d288745 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Kent Overstreet
Browse files

bcachefs: Fix type of flags parameter for some ->trigger() implementations 



When building with clang's -Wincompatible-function-pointer-types-strict
(a warning designed to catch potential kCFI failures at build time),
there are several warnings along the lines of:

  fs/bcachefs/bkey_methods.c:118:2: error: incompatible function pointer types initializing 'int (*)(struct btree_trans *, enum btree_id, unsigned int, struct bkey_s_c, struct bkey_s, enum btree_iter_update_trigger_flags)' with an expression of type 'int (struct btree_trans *, enum btree_id, unsigned int, struct bkey_s_c, struct bkey_s, unsigned int)' [-Werror,-Wincompatible-function-pointer-types-strict]
    118 |         BCH_BKEY_TYPES()
        |         ^~~~~~~~~~~~~~~~
  fs/bcachefs/bcachefs_format.h:394:2: note: expanded from macro 'BCH_BKEY_TYPES'
    394 |         x(inode,                8)                      \
        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
  fs/bcachefs/bkey_methods.c:117:41: note: expanded from macro 'x'
    117 | #define x(name, nr) [KEY_TYPE_##name]   = bch2_bkey_ops_##name,
        |                                           ^~~~~~~~~~~~~~~~~~~~
  <scratch space>:277:1: note: expanded from here
    277 | bch2_bkey_ops_inode
        | ^~~~~~~~~~~~~~~~~~~
  fs/bcachefs/inode.h:26:13: note: expanded from macro 'bch2_bkey_ops_inode'
     26 |         .trigger        = bch2_trigger_inode,           \
      |                           ^~~~~~~~~~~~~~~~~~

There are several functions that did not have their flags parameter
converted to 'enum btree_iter_update_trigger_flags' in the recent
unification, which will cause kCFI failures at runtime because the
types, while ABI compatible (hence no warning from the non-strict
version of this warning), do not match exactly.

Fix up these functions (as well as a few other obvious functions that
should have it, even if there are no warnings currently) to resolve the
warnings and potential kCFI runtime failures.

Fixes: 31e4ef3280c8 ("bcachefs: iter/update/trigger/str_hash flag cleanup")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 24b27975

fs/bcachefs/alloc_background.c

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static noinline int bch2_bucket_gen_update(struct btree_trans *trans, 
int bch2_trigger_alloc(struct btree_trans *trans,

		       enum btree_id btree, unsigned level,

		       struct bkey_s_c old, struct bkey_s new,

		       unsigned flags)

		       enum btree_iter_update_trigger_flags flags)

{

	struct bch_fs *c = trans->c;

	int ret = 0;

fs/bcachefs/alloc_background.h

+2 −1
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ static inline bool bkey_is_alloc(const struct bkey *k) 
int bch2_alloc_read(struct bch_fs *);



int bch2_trigger_alloc(struct btree_trans *, enum btree_id, unsigned,

		       struct bkey_s_c, struct bkey_s, unsigned);

		       struct bkey_s_c, struct bkey_s,

		       enum btree_iter_update_trigger_flags);

int bch2_check_alloc_info(struct bch_fs *);

int bch2_check_alloc_to_lru_refs(struct bch_fs *);

void bch2_do_discards(struct bch_fs *);

fs/bcachefs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ int bch2_trigger_inode(struct btree_trans *trans, 
		       enum btree_id btree_id, unsigned level,

		       struct bkey_s_c old,

		       struct bkey_s new,

		       unsigned flags)

		       enum btree_iter_update_trigger_flags flags)

{

	s64 nr = (s64) bkey_is_inode(new.k) - (s64) bkey_is_inode(old.k);

fs/bcachefs/inode.h

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ int bch2_inode_v3_invalid(struct bch_fs *, struct bkey_s_c, 
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,

			  struct bkey_s_c, struct bkey_s, unsigned);

		       struct bkey_s_c, struct bkey_s,

		       enum btree_iter_update_trigger_flags);



#define bch2_bkey_ops_inode ((struct bkey_ops) {	\

	.key_invalid	= bch2_inode_invalid,		\

fs/bcachefs/reflink.c

+4 −2
Original line number Diff line number Diff line
@@ -285,7 +285,9 @@ bool bch2_reflink_v_merge(struct bch_fs *c, struct bkey_s _l, struct bkey_s_c _r 
}

#endif



static inline void check_indirect_extent_deleting(struct bkey_s new, unsigned *flags)

static inline void

check_indirect_extent_deleting(struct bkey_s new,

			       enum btree_iter_update_trigger_flags *flags)

{

	if ((*flags & BTREE_TRIGGER_insert) && !*bkey_refcount(new)) {

		new.k->type = KEY_TYPE_deleted;
@@ -330,7 +332,7 @@ void bch2_indirect_inline_data_to_text(struct printbuf *out, 
int bch2_trigger_indirect_inline_data(struct btree_trans *trans,

			      enum btree_id btree_id, unsigned level,

			      struct bkey_s_c old, struct bkey_s new,

			      unsigned flags)

			      enum btree_iter_update_trigger_flags flags)

{

	check_indirect_extent_deleting(new, &flags);