2d288745eb
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: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
84 lines
2.7 KiB
C
84 lines
2.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _BCACHEFS_REFLINK_H
|
|
#define _BCACHEFS_REFLINK_H
|
|
|
|
enum bkey_invalid_flags;
|
|
|
|
int bch2_reflink_p_invalid(struct bch_fs *, struct bkey_s_c,
|
|
enum bkey_invalid_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);
|
|
int bch2_trigger_reflink_p(struct btree_trans *, enum btree_id, unsigned,
|
|
struct bkey_s_c, struct bkey_s,
|
|
enum btree_iter_update_trigger_flags);
|
|
|
|
#define bch2_bkey_ops_reflink_p ((struct bkey_ops) { \
|
|
.key_invalid = bch2_reflink_p_invalid, \
|
|
.val_to_text = bch2_reflink_p_to_text, \
|
|
.key_merge = bch2_reflink_p_merge, \
|
|
.trigger = bch2_trigger_reflink_p, \
|
|
.min_val_size = 16, \
|
|
})
|
|
|
|
int bch2_reflink_v_invalid(struct bch_fs *, struct bkey_s_c,
|
|
enum bkey_invalid_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,
|
|
struct bkey_s_c, struct bkey_s,
|
|
enum btree_iter_update_trigger_flags);
|
|
|
|
#define bch2_bkey_ops_reflink_v ((struct bkey_ops) { \
|
|
.key_invalid = bch2_reflink_v_invalid, \
|
|
.val_to_text = bch2_reflink_v_to_text, \
|
|
.swab = bch2_ptr_swab, \
|
|
.trigger = bch2_trigger_reflink_v, \
|
|
.min_val_size = 8, \
|
|
})
|
|
|
|
int bch2_indirect_inline_data_invalid(struct bch_fs *, struct bkey_s_c,
|
|
enum bkey_invalid_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 *,
|
|
enum btree_id, unsigned,
|
|
struct bkey_s_c, struct bkey_s,
|
|
enum btree_iter_update_trigger_flags);
|
|
|
|
#define bch2_bkey_ops_indirect_inline_data ((struct bkey_ops) { \
|
|
.key_invalid = bch2_indirect_inline_data_invalid, \
|
|
.val_to_text = bch2_indirect_inline_data_to_text, \
|
|
.trigger = bch2_trigger_indirect_inline_data, \
|
|
.min_val_size = 8, \
|
|
})
|
|
|
|
static inline const __le64 *bkey_refcount_c(struct bkey_s_c k)
|
|
{
|
|
switch (k.k->type) {
|
|
case KEY_TYPE_reflink_v:
|
|
return &bkey_s_c_to_reflink_v(k).v->refcount;
|
|
case KEY_TYPE_indirect_inline_data:
|
|
return &bkey_s_c_to_indirect_inline_data(k).v->refcount;
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static inline __le64 *bkey_refcount(struct bkey_s k)
|
|
{
|
|
switch (k.k->type) {
|
|
case KEY_TYPE_reflink_v:
|
|
return &bkey_s_to_reflink_v(k).v->refcount;
|
|
case KEY_TYPE_indirect_inline_data:
|
|
return &bkey_s_to_indirect_inline_data(k).v->refcount;
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
s64 bch2_remap_range(struct bch_fs *, subvol_inum, u64,
|
|
subvol_inum, u64, u64, u64, s64 *);
|
|
|
|
#endif /* _BCACHEFS_REFLINK_H */
|