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>
47 lines
1.6 KiB
C
47 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _BCACHEFS_SUBVOLUME_H
|
|
#define _BCACHEFS_SUBVOLUME_H
|
|
|
|
#include "darray.h"
|
|
#include "subvolume_types.h"
|
|
|
|
enum bkey_invalid_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 *);
|
|
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,
|
|
enum btree_iter_update_trigger_flags);
|
|
|
|
#define bch2_bkey_ops_subvolume ((struct bkey_ops) { \
|
|
.key_invalid = bch2_subvolume_invalid, \
|
|
.val_to_text = bch2_subvolume_to_text, \
|
|
.trigger = bch2_subvolume_trigger, \
|
|
.min_val_size = 16, \
|
|
})
|
|
|
|
int bch2_subvol_has_children(struct btree_trans *, u32);
|
|
int bch2_subvolume_get(struct btree_trans *, unsigned,
|
|
bool, int, struct bch_subvolume *);
|
|
int bch2_subvolume_get_snapshot(struct btree_trans *, u32, u32 *);
|
|
|
|
int bch2_subvol_is_ro_trans(struct btree_trans *, u32);
|
|
int bch2_subvol_is_ro(struct bch_fs *, u32);
|
|
|
|
int bch2_delete_dead_snapshots(struct bch_fs *);
|
|
void bch2_delete_dead_snapshots_async(struct bch_fs *);
|
|
|
|
int bch2_subvolume_unlink(struct btree_trans *, u32);
|
|
int bch2_subvolume_create(struct btree_trans *, u64, u32, u32, u32 *, u32 *, bool);
|
|
|
|
int bch2_initialize_subvolumes(struct bch_fs *);
|
|
int bch2_fs_upgrade_for_subvolumes(struct bch_fs *);
|
|
|
|
int bch2_fs_subvolumes_init(struct bch_fs *);
|
|
|
|
#endif /* _BCACHEFS_SUBVOLUME_H */
|