Re: [PATCH -next 1/3] bcache: Add missing #include <linux/prefetch.h>

[Kent Overstreet <koverstreet@google.com>]

On Wed, Mar 27, 2013 at 11:27:58AM -0700, Randy Dunlap wrote:
> On 03/27/13 11:21, Kent Overstreet wrote:
> > On Wed, Mar 27, 2013 at 06:56:28PM +0100, Geert Uytterhoeven wrote:
> >> m68k/allmodconfig:
> >>
> >> drivers/md/bcache/bset.c: In function ‘bset_search_tree’:
> >> drivers/md/bcache/bset.c:727: error: implicit declaration of function ‘prefetch’
> >>
> >> drivers/md/bcache/btree.c: In function ‘bch_btree_node_get’:
> >> drivers/md/bcache/btree.c:933: error: implicit declaration of function ‘prefetch’
> > 
> > Thanks, applied! The other two I already have a patch queued up for.
> 
> 
> On i386 and x86_64, I also see this build problem:
> 
> drivers/md/bcache/bset.c:885:4: error: implicit declaration of function '__WARN' [-Werror=implicit-function-declaration]
> 
> 
> Do you also have a patch for it?

Nope - looks like __WARN() doesn't exist if CONFIG_BUG=n, whoops.

Adding this to the queue:

commit 796c213186b850b3e6e8d5fd5799b0fd74721ea3
Author: Kent Overstreet <koverstreet@google.com>
Date:   Wed Mar 27 12:47:45 2013 -0700

    bcache: Use WARN_ONCE() instead of __WARN()
    
    Signed-off-by: Kent Overstreet <koverstreet@google.com>

diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index d4f2164..cb4578a 100644
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -883,7 +883,7 @@ struct bkey *bch_btree_iter_next(struct btree_iter *iter)
 		iter->data->k = bkey_next(iter->data->k);
 
 		if (iter->data->k > iter->data->end) {
-			__WARN();
+			WARN_ONCE(1, "bset was corrupt!\n");
 			iter->data->k = iter->data->end;
 		}