2018-03-27 02:41:54

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the device-mapper tree

Hi all,

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

/home/sfr/next/next/drivers/md/dm-table.c: In function 'dm_table_set_restrictions':
/home/sfr/next/next/drivers/md/dm-table.c:1899:3: error: implicit declaration of function 'queue_flag_set_unlocked'; did you mean 'lookup_one_len_unlocked'? [-Werror=implicit-function-declaration]
queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, q);
^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

9723d9db1a84 ("dm: add support for secure erase forwarding")

interacting with commit

8a0ac14b8da9 ("block: Move the queue_flag_*() functions from a public into a private header file")

from the block tree.

I have added the following merge fix patch:

From: Stephen Rothwell <[email protected]>
Date: Tue, 27 Mar 2018 13:36:49 +1100
Subject: [PATCH] dm: merge fix for queue_flag_set_unlocked to
blk_queue_flag_set API change

Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/md/dm-table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index d5db9df7ea4b..0589a4da12bb 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1896,7 +1896,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);

if (dm_table_supports_secure_erase(t))
- queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, q);
+ blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);

if (dm_table_supports_flush(t, (1UL << QUEUE_FLAG_WC))) {
wc = true;
--
2.16.1

--
Cheers,
Stephen Rothwell

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2018-03-27 15:40:45

by Bart Van Assche

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the device-mapper tree

On 03/26/18 19:39, Stephen Rothwell wrote:
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index d5db9df7ea4b..0589a4da12bb 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -1896,7 +1896,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
> blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
>
> if (dm_table_supports_secure_erase(t))
> - queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, q);
> + blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);
>
> if (dm_table_supports_flush(t, (1UL << QUEUE_FLAG_WC))) {
> wc = true;
>

The above patch looks fine to me. Thank you Stephen for having resolved
this merge conflict.

Bart.