diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-11-13 20:01:42 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:46 -0400 |
commit | b2d1d56b1d34bcfb6da77eb74a2fbcdea92514f9 (patch) | |
tree | 01c678f5b0e103d80567273497fd3429ae265dbb /fs/bcachefs/btree_locking.c | |
parent | a7ecd30c8300624448c4e66cd7a7e7209b96ea61 (diff) | |
download | linux-b2d1d56b1d34bcfb6da77eb74a2fbcdea92514f9.tar.gz linux-b2d1d56b1d34bcfb6da77eb74a2fbcdea92514f9.tar.bz2 linux-b2d1d56b1d34bcfb6da77eb74a2fbcdea92514f9.zip |
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 <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_locking.c')
-rw-r--r-- | fs/bcachefs/btree_locking.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c index 1530457f0e69..9d4be3c9cfd7 100644 --- a/fs/bcachefs/btree_locking.c +++ b/fs/bcachefs/btree_locking.c @@ -179,10 +179,9 @@ static noinline int break_cycle(struct lock_graph *g, struct printbuf *cycle) } if (unlikely(!best)) { - struct bch_fs *c = g->g->trans->c; struct printbuf buf = PRINTBUF; - bch_err(c, "cycle of nofail locks"); + prt_printf(&buf, bch2_fmt(g->g->trans->c, "cycle of nofail locks")); for (i = g->g; i < g->g + g->nr; i++) { struct btree_trans *trans = i->trans; |