From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kent Overstreet <kent.overstreet@linux•dev>
Cc: 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 bcachefs tree
Date: Mon, 11 Nov 2024 09:32:51 +1100 [thread overview]
Message-ID: <20241111093251.12fe136c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2310 bytes --]
Hi all,
After merging the bcachefs tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/bcachefs/btree_update_interior.c:1446:13: error: redefinition of 'key_deleted_in_insert'
1446 | static bool key_deleted_in_insert(struct keylist *insert_keys, struct bpos pos)
| ^~~~~~~~~~~~~~~~~~~~~
fs/bcachefs/btree_update_interior.c:1437:13: note: previous definition of 'key_deleted_in_insert' with type 'bool(struct keylist *, struct bpos)' {aka '_Bool(struct keylist *, struct bpos)'}
1437 | static bool key_deleted_in_insert(struct keylist *insert_keys, struct bpos pos)
| ^~~~~~~~~~~~~~~~~~~~~
fs/bcachefs/btree_update_interior.c:1437:13: error: 'key_deleted_in_insert' defined but not used [-Werror=unused-function]
cc1: all warnings being treated as errors
Caused by commit
85a62009bd05 ("bcachefs: Fix topology errors on split after merge")
badly merging with
cec136d348e0 ("bcachefs: Fix topology errors on split after merge")
Just one of the problems with having duplicate patches :-(
I applied the following merge fix patch or today.
From bc58e02f03f7f111092cbef0f7b2137edbb44372 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 11 Nov 2024 08:59:47 +1100
Subject: [PATCH] fix up for "bcachefs: Fix topology errors on split after merge"
being duplicated and causing a bad automatic merge.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/bcachefs/btree_update_interior.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 5b7def78308a..55bd9e7816e2 100644
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -1443,15 +1443,6 @@ static bool key_deleted_in_insert(struct keylist *insert_keys, struct bpos pos)
return false;
}
-static bool key_deleted_in_insert(struct keylist *insert_keys, struct bpos pos)
-{
- if (insert_keys)
- for_each_keylist_key(insert_keys, k)
- if (bkey_deleted(&k->k) && bpos_eq(k->k.p, pos))
- return true;
- return false;
-}
-
/*
* Move keys from n1 (original replacement node, now lower node) to n2 (higher
* node)
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-11-10 22:32 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-10 22:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-02 23:47 linux-next: build failure after merge of the bcachefs tree Stephen Rothwell
2025-05-21 23:14 Stephen Rothwell
2025-04-22 0:56 Stephen Rothwell
2025-03-26 2:28 Stephen Rothwell
2025-03-27 0:54 ` Stephen Rothwell
2025-03-27 3:01 ` Kent Overstreet
2024-10-13 23:28 Stephen Rothwell
2024-10-14 6:17 ` Greg Kroah-Hartman
2024-10-14 6:18 ` Kent Overstreet
2024-09-27 0:46 Stephen Rothwell
2024-10-10 5:50 ` Stephen Rothwell
2024-10-10 6:10 ` Kent Overstreet
2024-10-10 7:44 ` Stephen Rothwell
2024-09-11 1:44 Stephen Rothwell
2024-02-11 23:54 Stephen Rothwell
2024-02-14 0:16 ` Kees Cook
2024-02-14 0:29 ` Kent Overstreet
2024-02-14 0:39 ` Darrick J. Wong
2024-02-14 1:09 ` Kees Cook
2024-02-07 0:57 Stephen Rothwell
2024-02-08 22:46 ` Stephen Rothwell
2024-02-08 23:59 ` Kent Overstreet
2023-11-15 23:02 Stephen Rothwell
2023-11-12 22:30 Stephen Rothwell
2023-09-12 2:04 Stephen Rothwell
2023-09-12 2:47 ` Qi Zheng
2023-09-12 23:35 ` Stephen Rothwell
2023-09-13 1:10 ` Qi Zheng
2023-09-13 20:23 ` Andrew Morton
2023-09-13 22:31 ` Stephen Rothwell
2023-11-01 0:32 ` Stephen Rothwell
2023-11-01 0:53 ` Kent Overstreet
2023-11-01 1:14 ` Stephen Rothwell
2023-09-13 22:14 ` 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=20241111093251.12fe136c@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 \
/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