From b2d1d56b1d34bcfb6da77eb74a2fbcdea92514f9 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 13 Nov 2022 20:01:42 -0500 Subject: bcachefs: Fixes for building in userspace - Marking a non-static function as inline doesn't actually work and is now causing problems - drop that - Introduce BCACHEFS_LOG_PREFIX for when we want to prefix log messages with bcachefs (filesystem name) - Userspace doesn't have real percpu variables (maybe we can get this fixed someday), put an #ifdef around bch2_disk_reservation_add() fastpath Signed-off-by: Kent Overstreet --- fs/bcachefs/error.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'fs/bcachefs/error.c') diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c index 2fb5102ee31d..3e49d72d65b5 100644 --- a/fs/bcachefs/error.c +++ b/fs/bcachefs/error.c @@ -125,8 +125,10 @@ int bch2_fsck_err(struct bch_fs *c, unsigned flags, const char *fmt, ...) s->nr++; } +#ifdef BCACHEFS_LOG_PREFIX if (!strncmp(fmt, "bcachefs:", 9)) prt_printf(out, bch2_log_msg(c, "")); +#endif va_start(args, fmt); prt_vprintf(out, fmt, args); -- cgit v1.2.3