]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: Fix build in userspace
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 28 Jan 2021 00:36:09 +0000 (19:36 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:52 +0000 (17:08 -0400)
The userspace bch_err() macro doesn't use the filesystem argument. Could
also be fixed with a better macro.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/ec.c

index f280ca20d4574627b8acadd68516a125f449d353..78bea3e5fa9acfb42fc5890a08936bee75af7e0f 100644 (file)
@@ -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;
        }