linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

Hi all,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

mm/kasan/quarantine.c: In function 'quarantine_put':
mm/kasan/quarantine.c:198:3: error: 'return' with no value, in function returning non-void [-Werror=return-type]
  198 |   return;
      |   ^~~~~~
mm/kasan/quarantine.c:171:6: note: declared here
  171 | bool quarantine_put(struct kmem_cache *cache, void *object)
      |      ^~~~~~~~~~~~~~
mm/kasan/quarantine.c:200:16: error: 'info' undeclared (first use in this function)
  200 |  qlist_put(q, &info->quarantine_link, cache->size);
      |                ^~~~
mm/kasan/quarantine.c:200:16: note: each undeclared identifier is reported only once for each function it appears in

Caused by commits

  d6e0eb793f88 ("kasan: rename get_alloc/free_info")
  453989cf05d6 ("kasan: sanitize objects when metadata doesn't fit")

interacting with commit

  2ac05f7fcf5b ("kasan: fix object remaining in offline per-cpu quarantine")

from the akmp-current tree.

This goes on and on :-(

I have applied the following patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 10 Dec 2020 20:24:01 +1100
Subject: [PATCH] fixup for "kasan: rename get_alloc/free_info"

and "kasan: sanitize objects when metadata doesn't fit"
and "kasan: fix object remaining in offline per-cpu quarantine"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 mm/kasan/quarantine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c
index c0331656f112..55783125a767 100644
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@ -195,9 +195,9 @@ bool quarantine_put(struct kmem_cache *cache, void *object)
 	q = this_cpu_ptr(&cpu_quarantine);
 	if (q->offline) {
 		local_irq_restore(flags);
-		return;
+		return false;
 	}
-	qlist_put(q, &info->quarantine_link, cache->size);
+	qlist_put(q, &meta->quarantine_link, cache->size);
 	if (unlikely(q->bytes > QUARANTINE_PERCPU_SIZE)) {
 		qlist_move_all(q, &temp);
 
-- 
2.29.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpvMQ5tb1z2I.pgp
Description: OpenPGP digital signature