From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>,
Alasdair G Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@kernel.org>
Cc: Matthias Kaehlcke <mka@chromium.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 kspp tree
Date: Thu, 28 Jul 2022 20:55:43 +1000 [thread overview]
Message-ID: <20220728205404.645f7c12@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2603 bytes --]
Hi all,
After merging the kspp tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/md/dm-verity-loadpin.c: In function 'dm_verity_loadpin_is_bdev_trusted':
drivers/md/dm-verity-loadpin.c:61:13: error: implicit declaration of function 'dm_table_get_num_targets'; did you mean 'dm_table_resume_targets'? [-Werror=implicit-function-declaration]
61 | if (dm_table_get_num_targets(table) != 1)
| ^~~~~~~~~~~~~~~~~~~~~~~~
| dm_table_resume_targets
drivers/md/dm-verity-loadpin.c:64:14: error: implicit declaration of function 'dm_table_get_target'; did you mean 'dm_table_add_target'? [-Werror=implicit-function-declaration]
64 | ti = dm_table_get_target(table, 0);
| ^~~~~~~~~~~~~~~~~~~
| dm_table_add_target
drivers/md/dm-verity-loadpin.c:64:12: error: assignment to 'struct dm_target *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
64 | ti = dm_table_get_target(table, 0);
| ^
Caused by commit
b6c1c5745ccc ("dm: Add verity helpers for LoadPin")
interacting with commits
2aec377a2925 ("dm table: remove dm_table_get_num_targets() wrapper")
564b5c5476cd ("dm table: audit all dm_table_get_target() callers")
from the device-mapper tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Jul 2022 20:28:41 +1000
Subject: [PATCH] fix up for "dm: Add verity helpers for LoadPin"
interacting with
2aec377a2925 ("dm table: remove dm_table_get_num_targets() wrapper")
564b5c5476cd ("dm table: audit all dm_table_get_target() callers")
from the device-mapper tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/md/dm-verity-loadpin.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/md/dm-verity-loadpin.c b/drivers/md/dm-verity-loadpin.c
index 10c18bc1652c..387ec43aef72 100644
--- a/drivers/md/dm-verity-loadpin.c
+++ b/drivers/md/dm-verity-loadpin.c
@@ -5,6 +5,7 @@
#include <linux/dm-verity-loadpin.h>
#include "dm.h"
+#include "dm-core.h"
#include "dm-verity.h"
#define DM_MSG_PREFIX "verity-loadpin"
@@ -58,7 +59,7 @@ bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev)
table = dm_get_live_table(md, &srcu_idx);
- if (dm_table_get_num_targets(table) != 1)
+ if (table->num_targets != 1)
goto out;
ti = dm_table_get_target(table, 0);
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-07-28 10:55 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 10:55 Stephen Rothwell [this message]
2022-07-28 15:12 ` linux-next: build failure after merge of the kspp tree Matthias Kaehlcke
-- strict thread matches above, loose matches on Subject: below --
2024-03-05 3:50 Stephen Rothwell
2024-03-05 9:54 ` Kees Cook
2023-09-14 1:50 Stephen Rothwell
2023-09-14 3:07 ` Kees Cook
2023-01-05 2:25 Stephen Rothwell
2023-01-05 3:22 ` Kees Cook
2023-01-05 4:24 ` Stephen Rothwell
2022-12-01 3:07 Stephen Rothwell
2022-12-01 16:31 ` Kees Cook
2022-05-05 7:40 Stephen Rothwell
2022-05-07 17:18 ` Kees Cook
2022-03-16 7:32 Stephen Rothwell
2022-03-17 1:01 ` Linus Walleij
2022-03-17 8:24 ` Marc Zyngier
2022-03-09 10:10 Stephen Rothwell
2022-03-09 16:52 ` Kees Cook
2022-03-09 16:58 ` Hans de Goede
2022-03-09 17:18 ` Kees Cook
2022-02-28 22:27 Stephen Rothwell
2022-02-28 23:02 ` Kees Cook
2022-03-02 9:16 ` Stephen Rothwell
2022-03-03 7:29 ` Stephen Rothwell
2022-01-30 23:09 Stephen Rothwell
2022-01-31 4:04 ` Kees Cook
2022-01-31 4:59 ` Stephen Rothwell
2022-01-31 6:19 ` Kees Cook
2022-01-31 19:10 ` Saeed Mahameed
2022-01-31 21:06 ` Kees Cook
2022-01-30 22:34 Stephen Rothwell
2022-01-30 23:24 ` Herbert Xu
2022-01-31 0:15 ` Stephen Rothwell
2022-01-31 0:20 ` Herbert Xu
2022-01-31 0:41 ` Stephen Rothwell
2022-01-25 3:50 Stephen Rothwell
2022-01-25 7:44 ` Kees Cook
2022-01-25 13:27 ` Masami Hiramatsu
2022-01-25 14:01 ` Steven Rostedt
2022-01-25 17:53 ` Kees Cook
2022-01-25 14:31 ` Masami Hiramatsu
2022-01-25 15:49 ` Steven Rostedt
2022-01-25 17:54 ` Kees Cook
2022-01-25 18:41 ` Steven Rostedt
2022-01-25 20:57 ` Kees Cook
2022-01-25 21:23 ` Steven Rostedt
2022-01-25 21:28 ` Steven Rostedt
2022-01-25 22:07 ` Kees Cook
2022-01-25 22:21 ` Steven Rostedt
2022-01-26 0:35 ` Masami Hiramatsu
2022-01-26 1:16 ` Steven Rostedt
2022-01-26 3:18 ` Kees Cook
2022-01-26 3:26 ` Steven Rostedt
2022-01-26 19:41 ` Beau Belgrave
2022-01-26 21:00 ` Steven Rostedt
2022-01-26 3:52 ` Masami Hiramatsu
2022-01-26 4:06 ` Steven Rostedt
2022-01-26 3:17 ` Kees Cook
2022-01-25 22:01 ` Kees Cook
2022-01-25 3:24 Stephen Rothwell
2022-01-25 3:43 ` Kees Cook
2022-02-08 4:42 ` Stephen Rothwell
2022-02-08 6:13 ` Kees Cook
2022-01-25 2:55 Stephen Rothwell
2022-01-25 3:02 ` Stephen Rothwell
2022-01-25 3:22 ` Kees Cook
2022-01-25 0:57 Stephen Rothwell
2022-01-25 3:35 ` Kees Cook
2022-01-25 14:07 ` David Sterba
2021-09-16 3:34 Stephen Rothwell
2021-09-16 6:00 ` Kees Cook
2021-08-26 7:52 Stephen Rothwell
2021-08-26 15:38 ` Kees Cook
2020-06-23 3:51 Stephen Rothwell
2020-06-23 3:56 ` David Miller
2020-06-21 13:48 Stephen Rothwell
2020-06-21 15:36 ` Kees Cook
2018-07-27 9:02 Stephen Rothwell
2018-07-27 9:06 ` Stephen Rothwell
2018-07-27 10:55 ` Stephen Rothwell
2018-07-27 12:55 ` Will Deacon
2018-07-27 13:01 ` Will Deacon
2018-07-27 13:27 ` Will Deacon
2018-07-27 16:00 ` Kees Cook
2018-07-30 7:33 ` Stephen Rothwell
2018-07-30 14:47 ` Laura Abbott
2018-07-30 16:37 ` Will Deacon
2018-07-31 10:09 ` Will Deacon
2018-07-31 11:27 ` Stephen Rothwell
2017-11-08 5:23 Stephen Rothwell
2017-11-08 23:43 ` Kees Cook
2017-11-09 0:18 ` Darrick J. Wong
2017-11-09 0:31 ` Kees Cook
2017-06-20 4:56 Stephen Rothwell
2017-06-20 5:39 ` Kees Cook
2017-06-20 5:42 ` John Johansen
2017-06-20 5:39 ` John Johansen
2017-06-26 18:19 ` Kees Cook
2017-06-27 3:33 ` James Morris
2017-06-27 22:16 ` Kees Cook
2017-06-28 5:48 ` James Morris
2017-06-16 1:30 Stephen Rothwell
2017-06-16 2:51 ` Daniel Micay
2017-06-16 2:52 ` Daniel Micay
2017-06-16 3:20 ` Kees Cook
2017-06-16 3:31 ` Stephen Rothwell
2017-06-19 0:23 ` Stephen Rothwell
2017-06-19 21:01 ` Kees Cook
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=20220728205404.645f7c12@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agk@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mka@chromium.org \
--cc=snitzer@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).