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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
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:
pgp_2b85QkLrD.pgp
Description: OpenPGP digital signature
