Subject: linux-next: build failure after merge of the origin tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 30 Sep 2024 13:38:13 +1000

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 <[email-masked]>
Date: Mon, 30 Sep 2024 13:31:16 +1000
Subject: [PATCH] fix up for "bcachefs: rename version -> bversion"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 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