From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kent Overstreet <kent.overstreet@linux•dev>
Cc: Linus Torvalds <torvalds@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the origin tree
Date: Mon, 30 Sep 2024 13:38:13 +1000 [thread overview]
Message-ID: <20240930133813.3c8157df@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 8964 bytes --]
Hi all,
After merging the origin tree, today's linux-next build (s390 defconfig)
failed like this:
In file included from fs/bcachefs/bset.h:9,
from fs/bcachefs/btree_iter.h:5,
from fs/bcachefs/str_hash.h:5,
from fs/bcachefs/xattr.h:5,
from fs/bcachefs/acl.c:6:
fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key':
fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \
| ^~~~~~~~
fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x'
578 | #define x(id, field) __bkey_format_add(s, id, k->field);
| ^~~~~
fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields'
579 | bkey_fields()
| ^~~~~~~~~~~
fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
558 | x(BKEY_FIELD_VERSION_LO, bversion.lo)
| ^~~~~~~~
fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x'
578 | #define x(id, field) __bkey_format_add(s, id, k->field);
| ^~~~~
fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields'
579 | bkey_fields()
| ^~~~~~~~~~~
In file included from fs/bcachefs/bset.h:10:
fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable':
fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
73 | !bversion_cmp(l->bversion, r->bversion) &&
| ^~~~~~~~
| version
fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
73 | !bversion_cmp(l->bversion, r->bversion) &&
| ^~~~~~~~
| version
In file included from fs/bcachefs/extents.h:6,
from fs/bcachefs/buckets.h:12,
from fs/bcachefs/alloc_background.h:7,
from fs/bcachefs/alloc_foreground.c:15:
fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key':
fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \
| ^~~~~~~~
fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x'
578 | #define x(id, field) __bkey_format_add(s, id, k->field);
| ^~~~~
fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields'
579 | bkey_fields()
| ^~~~~~~~~~~
fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
558 | x(BKEY_FIELD_VERSION_LO, bversion.lo)
| ^~~~~~~~
fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x'
578 | #define x(id, field) __bkey_format_add(s, id, k->field);
| ^~~~~
fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields'
579 | bkey_fields()
| ^~~~~~~~~~~
In file included from fs/bcachefs/btree_cache.h:7,
from fs/bcachefs/backpointers.h:5,
from fs/bcachefs/alloc_foreground.c:17:
fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable':
fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
73 | !bversion_cmp(l->bversion, r->bversion) &&
| ^~~~~~~~
| version
fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
73 | !bversion_cmp(l->bversion, r->bversion) &&
| ^~~~~~~~
| version
In file included from fs/bcachefs/extents.h:6,
from fs/bcachefs/buckets.h:12,
from fs/bcachefs/alloc_background.h:7,
from fs/bcachefs/alloc_background.c:3:
fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key':
fs/bcachefs/bkey.h:557:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
557 | x(BKEY_FIELD_VERSION_HI, bversion.hi) \
| ^~~~~~~~
fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x'
578 | #define x(id, field) __bkey_format_add(s, id, k->field);
| ^~~~~
fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields'
579 | bkey_fields()
| ^~~~~~~~~~~
fs/bcachefs/bkey.h:558:41: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
558 | x(BKEY_FIELD_VERSION_LO, bversion.lo)
| ^~~~~~~~
fs/bcachefs/bkey.h:578:50: note: in definition of macro 'x'
578 | #define x(id, field) __bkey_format_add(s, id, k->field);
| ^~~~~
fs/bcachefs/bkey.h:579:9: note: in expansion of macro 'bkey_fields'
579 | bkey_fields()
| ^~~~~~~~~~~
In file included from fs/bcachefs/btree_cache.h:7,
from fs/bcachefs/backpointers.h:5,
from fs/bcachefs/alloc_background.c:5:
fs/bcachefs/bkey_methods.h: In function 'bch2_bkey_maybe_mergable':
fs/bcachefs/bkey_methods.h:73:34: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
73 | !bversion_cmp(l->bversion, r->bversion) &&
| ^~~~~~~~
| version
fs/bcachefs/bkey_methods.h:73:47: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
73 | !bversion_cmp(l->bversion, r->bversion) &&
| ^~~~~~~~
| version
In file included from fs/bcachefs/btree_write_buffer.h:6,
from fs/bcachefs/alloc_background.c:13:
fs/bcachefs/disk_accounting.h: In function 'bch2_accounting_accumulate':
fs/bcachefs/disk_accounting.h:39:33: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'?
39 | if (bversion_cmp(dst->k.bversion, src.k->bversion) < 0)
| ^~~~~~~~
| version
fs/bcachefs/disk_accounting.h:39:50: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
39 | if (bversion_cmp(dst->k.bversion, src.k->bversion) < 0)
| ^~~~~~~~
| version
fs/bcachefs/disk_accounting.h:40:24: error: 'struct bkey' has no member named 'bversion'; did you mean 'version'?
40 | dst->k.bversion = src.k->bversion;
| ^~~~~~~~
| version
fs/bcachefs/disk_accounting.h:40:42: error: 'const struct bkey' has no member named 'bversion'; did you mean 'version'?
40 | dst->k.bversion = src.k->bversion;
| ^~~~~~~~
| version
Caused by commit
cf49f8a8c277 ("bcachefs: rename version -> bversion")
I have applied the following fix patch for today.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 30 Sep 2024 13:31:16 +1000
Subject: [PATCH] fix up for "bcachefs: rename version -> bversion"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/bcachefs/bcachefs_format.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index 203ee627cab5..84832c2d4df9 100644
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -223,7 +223,7 @@ struct bkey {
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
struct bpos p;
__u32 size; /* extent size, in sectors */
- struct bversion version;
+ struct bversion bversion;
__u8 pad[1];
#endif
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-09-30 3:38 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-30 3:38 Stephen Rothwell [this message]
2024-09-30 10:28 ` linux-next: build failure after merge of the origin tree Krzysztof Kozlowski
2024-09-30 10:50 ` Kent Overstreet
2024-09-30 11:00 ` Krzysztof Kozlowski
-- strict thread matches above, loose matches on Subject: below --
2026-05-28 12:43 Mark Brown
2026-05-28 13:23 ` Miguel Ojeda
2026-05-28 13:26 ` Mark Brown
2024-12-18 4:13 Stephen Rothwell
2024-12-18 8:03 ` Jürgen Groß
2023-06-30 2:59 Stephen Rothwell
2023-06-30 3:43 ` Linus Torvalds
2021-09-19 23:42 Stephen Rothwell
2021-09-14 0:08 Stephen Rothwell
2021-09-14 0:19 ` Linus Torvalds
2021-09-14 0:24 ` Linus Torvalds
2021-09-14 0:58 ` Stephen Rothwell
2021-09-14 1:29 ` Linus Torvalds
2021-09-14 1:37 ` Linus Torvalds
2021-09-14 2:03 ` Linus Torvalds
2021-09-14 2:08 ` Stephen Rothwell
2021-09-14 2:12 ` Linus Torvalds
2021-09-14 2:50 ` Michael Ellerman
2021-09-14 12:21 ` Michael Ellerman
2021-09-14 2:39 ` Stephen Rothwell
2021-09-07 23:07 Stephen Rothwell
2021-09-07 23:09 ` Stephen Rothwell
2021-09-07 23:17 ` Marco Elver
2021-09-07 23:38 ` Miguel Ojeda
2020-07-30 22:58 Stephen Rothwell
2020-07-30 23:15 ` Stephen Rothwell
2020-07-29 23:08 Stephen Rothwell
2020-07-29 23:43 ` Linus Torvalds
2020-07-30 0:09 ` Linus Torvalds
2020-07-30 2:12 ` Linus Torvalds
2020-07-30 2:30 ` Willy Tarreau
2020-07-30 3:17 ` Kees Cook
2020-07-30 3:22 ` Willy Tarreau
2020-07-30 6:14 ` Willy Tarreau
2020-07-30 9:59 ` Marc Zyngier
2020-07-30 10:09 ` Catalin Marinas
2020-07-30 15:00 ` Will Deacon
2020-07-30 17:49 ` Kees Cook
2020-07-30 18:24 ` Linus Torvalds
2020-07-30 18:47 ` Kees Cook
2020-06-04 22:37 Stephen Rothwell
2020-06-05 0:04 ` Josh Poimboeuf
2020-06-05 9:48 ` Jessica Yu
2020-04-20 10:23 Stephen Rothwell
2020-01-31 4:12 Stephen Rothwell
2020-01-31 4:17 ` Randy Dunlap
2020-01-31 9:39 ` Daniel Lezcano
2012-10-09 23:21 Stephen Rothwell
2012-10-09 23:45 ` Andrew Morton
2012-10-09 23:52 ` Yasuaki Ishimatsu
2012-10-10 3:12 ` Stephen Rothwell
2012-10-10 0:07 ` Stephen Rothwell
2012-06-04 2:57 Stephen Rothwell
2012-06-04 7:39 ` Paul Mundt
2012-01-18 23:31 Stephen Rothwell
2012-01-19 8:21 ` Jens Axboe
2012-01-19 8:23 ` Jens Axboe
2011-11-06 23:12 Stephen Rothwell
2011-11-07 1:52 ` David Miller
2011-11-07 2:47 ` Stephen Rothwell
2011-11-07 3:36 ` David Miller
2011-11-07 5:29 ` Kirsher, Jeffrey T
2011-11-07 16:46 ` Rose, Gregory V
2011-11-07 17:46 ` Rose, Gregory V
2011-07-25 1:16 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240930133813.3c8157df@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=kent.overstreet@linux$(echo .)dev \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox