Hi all,

After merging the btrfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from fs/btrfs/disk-io.h:12,
                 from fs/btrfs/super.c:34:
fs/btrfs/bio.h:100:14: error: duplicate member 'can_use_append'
  100 |         bool can_use_append;
      |              ^~~~~~~~~~~~~~

(and several others similar)

Caused by commits

  a9e53c29f361 ("btrfs: shrink the size of btrfs_bio")
  009334649b08 ("btrfs: zoned: don't zone append to conventional zone")

interacting with commit

  ad93f92010a1 ("btrfs: zoned: don't zone append to conventional zone")

from the btrfs-fixes tree.

I applied the following merge fix patch for today, but please clean up
your trees.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Dec 2025 09:21:11 +1100
Subject: [PATCH] fix up for "btrfs: shrink the size of btrfs_bio"

interacting with commit

  ad93f92010a1 ("btrfs: zoned: don't zone append to conventional zone")

from the btrfs-fixes tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/btrfs/bio.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fs/btrfs/bio.h b/fs/btrfs/bio.h
index 4d0f416a8be0..157cdfa2f78a 100644
--- a/fs/btrfs/bio.h
+++ b/fs/btrfs/bio.h
@@ -96,9 +96,6 @@ struct btrfs_bio {
 	/* Whether the bio is written using zone append. */
 	bool can_use_append:1;
 
-	/* Whether the bio is written using zone append. */
-	bool can_use_append;
-
 	/*
 	 * This member must come last, bio_alloc_bioset will allocate enough
 	 * bytes for entire btrfs_bio but relies on bio being last.
-- 
2.52.0

-- 
Cheers,
Stephen Rothwell

On Thu, Dec 18, 2025 at 09:26:55AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the btrfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from fs/btrfs/disk-io.h:12,
>                  from fs/btrfs/super.c:34:
> fs/btrfs/bio.h:100:14: error: duplicate member 'can_use_append'
>   100 |         bool can_use_append;
>       |              ^~~~~~~~~~~~~~
> 
> (and several others similar)
> 
> Caused by commits
> 
>   a9e53c29f361 ("btrfs: shrink the size of btrfs_bio")
>   009334649b08 ("btrfs: zoned: don't zone append to conventional zone")
> 
> interacting with commit
> 
>   ad93f92010a1 ("btrfs: zoned: don't zone append to conventional zone")
> 
> from the btrfs-fixes tree.
> 
> I applied the following merge fix patch for today, but please clean up
> your trees.

Thanks, I'd fixed the build failure locally but forgot to push the
updated branch. It'll be fixed in todays for-next snapshot.