From 0093a50f2759f6e58fe44bafb80146fd2ef4d6a2 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 27 Jan 2021 19:36:09 -0500 Subject: [PATCH] bcachefs: Fix build in userspace The userspace bch_err() macro doesn't use the filesystem argument. Could also be fixed with a better macro. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/ec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c index f280ca20d4574..78bea3e5fa9ac 100644 --- a/fs/bcachefs/ec.c +++ b/fs/bcachefs/ec.c @@ -744,7 +744,6 @@ err: static int ec_stripe_bkey_update(struct btree_trans *trans, struct bkey_i_stripe *new) { - struct bch_fs *c = trans->c; struct btree_iter *iter; struct bkey_s_c k; const struct bch_stripe *existing; @@ -759,7 +758,7 @@ static int ec_stripe_bkey_update(struct btree_trans *trans, goto err; if (!k.k || k.k->type != KEY_TYPE_stripe) { - bch_err(c, "error updating stripe: not found"); + bch_err(trans->c, "error updating stripe: not found"); ret = -ENOENT; goto err; } @@ -767,7 +766,7 @@ static int ec_stripe_bkey_update(struct btree_trans *trans, existing = bkey_s_c_to_stripe(k).v; if (existing->nr_blocks != new->v.nr_blocks) { - bch_err(c, "error updating stripe: nr_blocks does not match"); + bch_err(trans->c, "error updating stripe: nr_blocks does not match"); ret = -EINVAL; goto err; } -- 2.30.2