diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:14:13 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:15:08 +0300 |
| commit | 537c2e91d3549e5d6020bb0576cf9b54a845255f (patch) | |
| tree | c09e8a1b7d733cde19b0c72678c28fb2bc97ff6b /fs/bcachefs/error.h | |
| parent | 237bb5f7f7f55ec5f773469a974c61a49c298625 (diff) | |
| parent | cba9ffdb9913dfe6be29f049ce920ce451ce7cc4 (diff) | |
| download | linux-537c2e91d3549e5d6020bb0576cf9b54a845255f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/bcachefs/error.h')
| -rw-r--r-- | fs/bcachefs/error.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/error.h b/fs/bcachefs/error.h index fec17d1353d1..ae1d6674c512 100644 --- a/fs/bcachefs/error.h +++ b/fs/bcachefs/error.h @@ -30,7 +30,7 @@ struct work_struct; bool bch2_inconsistent_error(struct bch_fs *); -void bch2_topology_error(struct bch_fs *); +int bch2_topology_error(struct bch_fs *); #define bch2_fs_inconsistent(c, ...) \ ({ \ @@ -191,9 +191,9 @@ do { \ void bch2_fatal_error(struct bch_fs *); -#define bch2_fs_fatal_error(c, ...) \ +#define bch2_fs_fatal_error(c, _msg, ...) \ do { \ - bch_err(c, __VA_ARGS__); \ + bch_err(c, "%s(): fatal error " _msg, __func__, ##__VA_ARGS__); \ bch2_fatal_error(c); \ } while (0) |