Commit 0093a50f authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

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: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 4529ae09
...@@ -744,7 +744,6 @@ static int ec_stripe_bkey_insert(struct bch_fs *c, ...@@ -744,7 +744,6 @@ static int ec_stripe_bkey_insert(struct bch_fs *c,
static int ec_stripe_bkey_update(struct btree_trans *trans, static int ec_stripe_bkey_update(struct btree_trans *trans,
struct bkey_i_stripe *new) struct bkey_i_stripe *new)
{ {
struct bch_fs *c = trans->c;
struct btree_iter *iter; struct btree_iter *iter;
struct bkey_s_c k; struct bkey_s_c k;
const struct bch_stripe *existing; const struct bch_stripe *existing;
...@@ -759,7 +758,7 @@ static int ec_stripe_bkey_update(struct btree_trans *trans, ...@@ -759,7 +758,7 @@ static int ec_stripe_bkey_update(struct btree_trans *trans,
goto err; goto err;
if (!k.k || k.k->type != KEY_TYPE_stripe) { 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; ret = -ENOENT;
goto err; goto err;
} }
...@@ -767,7 +766,7 @@ static int ec_stripe_bkey_update(struct btree_trans *trans, ...@@ -767,7 +766,7 @@ static int ec_stripe_bkey_update(struct btree_trans *trans,
existing = bkey_s_c_to_stripe(k).v; existing = bkey_s_c_to_stripe(k).v;
if (existing->nr_blocks != new->v.nr_blocks) { 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; ret = -EINVAL;
goto err; goto err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment